391 files changed, 39252 insertions, 37675 deletions

diff --git a/AUTHORS b/AUTHORS
index a7d544d2f..a0e3d6cbc 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -50,6 +50,8 @@ Laurentiu Buzdugan <[email protected]> Translations [ro]
 
 Magda Procha'zkova'  <[email protected]> Translations [cs]
 
+Meng Jie <[email protected]> Translations [zh_CN]
+
 Michael Roth  <[email protected]>  Assigns changes.
     (wrote cipher/des.c., changes and bug fixes all over the place)
 
@@ -94,7 +96,8 @@ Rafael Caetano dos Santos <[email protected]> Translations [pt_BR]
 
 Toomas Soome <[email protected]> Translations [et]
 
-Urko Lusa <[email protected]> Translations [es_ES]
+Urko Lusa <[email protected]> Translations [es]
+Jaime Sua'rez <[email protected]> Translations [es]
 
 Walter Koch <[email protected]>  Translations [de]
 
diff --git a/COPYING b/COPYING
index d60c31a97..3912109b5 100644
--- a/COPYING
+++ b/COPYING
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 Also add information on how to contact you by electronic and paper mail.
@@ -313,7 +313,7 @@ Also add information on how to contact you by electronic and paper mail.
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision version 69, Copyright (C) year name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
diff --git a/ChangeLog b/ChangeLog
index 1c611141c..7a0859e2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-05-31  Werner Koch  <[email protected]>
+
+	Released 1.4.2rc1.
+
+	* README: Add a note on GnuPG 1.9.
+
+	Updated FSF address in all files.
+
 2005-05-26  David Shaw  <[email protected]>
 
 	* NEWS: Note command completion and the new curl-based HKP helper.
diff --git a/Makefile.am b/Makefile.am
index 22ff33b83..3f1d670b8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,7 +14,7 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 ## Process this file with automake to produce Makefile.in
 
diff --git a/NEWS b/NEWS
index 245e62915..602f988ac 100644
--- a/NEWS
+++ b/NEWS
@@ -4,13 +4,13 @@ Noteworthy changes in version 1.4.2
     * New command "verify" in the card-edit menu to display
       the Private-DO-3.  The Admin command has been enhanced to take
       the optional arguments "on", "off" and "verify".  The latter may
-      be used to verify the ADmin Pin without modifying data; this
-      allows displayin the Private-DO-4 with the "list" command.
+      be used to verify the Admin Pin without modifying data; this
+      allows displaying the Private-DO-4 with the "list" command.
 
     * Rewrote large parts of the card code to optionally make use of a
       running gpg-agent.  If --use-agent is being used and a gpg-agent
       with enabled scdaemon is active, gpg will now divert all card
-      operations to that daemon.  This is required because bot,
+      operations to that daemon.  This is required because both,
       scdaemon and gpg require exclusive access to the card reader. By
       delegating the work to scdaemon, both can peacefully coexist and
       scdaemon is able to control the use of the reader.  Note that
@@ -817,7 +817,7 @@ Noteworthy changes in version 1.0.5 (2001-04-29)
     * Large File Support (LFS) is now working.
 
     * New options: --ignore-crc-error, --no-sig-create-check, 
-      --no-sig-cache, --fixed_list_mode, --no-expensive-trust-checks,
+      --no-sig-cache, --fixed-list-mode, --no-expensive-trust-checks,
       --enable-special-filenames and --use-agent.  See man page.
 
     * New command --pipemode, which can be used to run gpg as a
diff --git a/README b/README
index 9d9c8a319..967b2580c 100644
--- a/README
+++ b/README
@@ -735,6 +735,20 @@
     rpm in /usr/src/redhat/SRPMS
 
 
+
+    GnuPG 1.4 and GnuPG 1.9
+    -----------------------
+    GnuPG 1.4 is the stable version of GnuPG; GnuPG 1.9 is the
+    development branch.  However, large parts of GnuPG 1.9 are also
+    considered to be stable and useful.  In particular the tools
+    "gpg-agent" (private key operations and passphrase caching) and
+    "gpgsm" (S/MIME cousin of "gpg") are considered stable.  Both
+    packages (1.4.x and 1.9.x) may be installed at the same time and
+    it is actually suggested to do this if you need S/MIME support or
+    want to make use of gpg-agent.
+
+
+
     How to Get More Information
     ---------------------------
 
@@ -750,10 +764,17 @@
 	[email protected]    For important announcements like
 				    new versions and such stuff.
 				    This is a moderated list and has
-				    very low traffic.
+				    very low traffic.  Do not post to
+				    this list.
 
 	[email protected]	    For general user discussion and
-				    help.
+				    help (English).
+
+        [email protected]          German speaking counterpart of
+                                    gnupg-users.
+
+        [email protected]          Russian speaking counterpart of
+                                    gnupg-users.
 
 	[email protected]	    GnuPG developers main forum.
 
@@ -768,9 +789,10 @@
 
     Please direct questions about GnuPG to the users mailing list or
     one of the pgp newsgroups; please do not direct questions to one
-    of the authors directly as we are busy working on improvements
-    and bug fixes.  Both mailing lists are watched by the authors
-    and we try to answer questions when time allows us to do so.
+    of the authors directly as we are busy working on improvements and
+    bug fixes.  The English and German mailing lists are watched by
+    the authors and we try to answer questions when time allows us to
+    do so.
 
     Commercial grade support for GnuPG is available; please see
     the GNU service directory or check out http://g10code.com.
diff --git a/THANKS b/THANKS
index 6958e5e05..231aa96c3 100644
--- a/THANKS
+++ b/THANKS
@@ -171,6 +171,7 @@ Reinhard Wobst		   [email protected]
 R�mi Guyomarch		   [email protected]
 Reuben Sumner		   [email protected]
 Richard Outerbridge	   [email protected]
+Richard Patterson          [email protected]
 Robert Joop                [email protected]
 Roddy Strachan		   [email protected]
 Roger Sondermann           [email protected]
diff --git a/TODO b/TODO
index a6aff8e49..b1f9edf49 100644
--- a/TODO
+++ b/TODO
@@ -6,11 +6,6 @@
     20% faster and the crc32 code about 50% faster. Some memory leaks were
     also fixed according to the ChangeLog.
     
-  * Do we need a configure test for putenv?
-
-  * Describe some pitfalls when using EGD.  Check that ~/.gnupg/entropy
-    really is the default.  What about needed permission?  
-
   * Using an expired key for signing should give an error message
     "expired key" and not "unusable key'.  Furthermore the error should
     also be thrown when the default key has expired.  Reported by
@@ -48,11 +43,6 @@
 
   * Add a way to show the fingerprint of an key signator's keys
 
-  * Add an is_valid flag to each user ID.
-
-  * Replace the printing of the user name by [self-signature] when
-    appropriate so that a key listing does not get clobbered.
-
   * Concatenated encryption messages don't work corectly - only the
     first one is processed.
 
@@ -61,14 +51,8 @@
 
   * --disable-asm should still assemble _udiv_qrnnd when needed
 
-  * Get new assembler stuff from gmp 3.1
-
   * add test cases for invalid data (scrambled armor or other random data)
 
-  * add checking of armor trailers.  Try to detect garbled header
-    lines.  Often one dash is missing due to sloppy cut+paste; so add
-    a warning note like the one for QP.
-
   * the pubkey encrypt functions should do some sanity checks.
 
   * "gpg filename.tar.gz.asc" should work like --verify (-sab).
@@ -87,11 +71,6 @@
 
   * keyflags don't distinguish between {certify,signature}-only.
 
-  * Instead of issuing a "signature packet without keyid" gpg should
-    try to get the keyID from a corresponding one-pass signature
-    packet (See bug report 817).  This is not easy to do as we don't
-    store the one-pass packets.
-
   * cat foo | gpg --sign | gpg --list-packets
     Does not list the signature packet.
 
@@ -102,18 +81,4 @@
 
   * Add the NEWSIG status.
 
-  * When generating a key on the card we should try to also set the
-    display name or provide the display name as a default in the key
-    generation.  The problem however is that the display name must be
-    given with an indication of the surname and the usable characters
-    are also restricted.
-
   * Delete a card key as well as a wiping.
-
-
-Things we won't do
-------------------
-
-  * New option --file-remove path-to-wipe-program ? 
-
-
diff --git a/acinclude.m4 b/acinclude.m4
index 2dcf25aba..97ed3ea0d 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -15,7 +15,7 @@ dnl GNU General Public License for more details.
 dnl 
 dnl You should have received a copy of the GNU General Public License
 dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 dnl GNUPG_MSG_PRINT(STRING)
 dnl print a message
diff --git a/checks/Makefile.am b/checks/Makefile.am
index 88918ee9b..d240b955b 100644
--- a/checks/Makefile.am
+++ b/checks/Makefile.am
@@ -14,7 +14,7 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 # Process this file with automake to create Makefile.in
 
diff --git a/cipher/Makefile.am b/cipher/Makefile.am
index 85b0a47dd..12c4bb0b5 100644
--- a/cipher/Makefile.am
+++ b/cipher/Makefile.am
@@ -14,7 +14,7 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 ## Process this file with automake to produce Makefile.in
 
diff --git a/cipher/algorithms.h b/cipher/algorithms.h
index 36fc8442e..8c125611c 100644
--- a/cipher/algorithms.h
+++ b/cipher/algorithms.h
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 #ifndef GNUPG_ALGORITHMS_H
 #define GNUPG_ALGORITHMS_H 1
diff --git a/cipher/bithelp.h b/cipher/bithelp.h
index d6eae8edf..64209bacd 100644
--- a/cipher/bithelp.h
+++ b/cipher/bithelp.h
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 #ifndef G10_BITHELP_H
 #define G10_BITHELP_H
diff --git a/cipher/blowfish.c b/cipher/blowfish.c
index 8d359da05..1a1ce5678 100644
--- a/cipher/blowfish.c
+++ b/cipher/blowfish.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * For a description of the algorithm, see:
  *   Bruce Schneier: Applied Cryptography. John Wiley & Sons, 1996.
diff --git a/cipher/cast5.c b/cipher/cast5.c
index efa4e0e3e..043aa7aed 100644
--- a/cipher/cast5.c
+++ b/cipher/cast5.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 /* Test vectors:
diff --git a/cipher/cipher.c b/cipher/cipher.c
index b3bd6688f..950f625cf 100644
--- a/cipher/cipher.c
+++ b/cipher/cipher.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/cipher/des.c b/cipher/des.c
index f4cba21dc..6ad799395 100644
--- a/cipher/des.c
+++ b/cipher/des.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  *
  * According to the definition of DES in FIPS PUB 46-2 from December 1993.
diff --git a/cipher/dsa.c b/cipher/dsa.c
index b1543c049..1fdb29ae4 100644
--- a/cipher/dsa.c
+++ b/cipher/dsa.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/cipher/dsa.h b/cipher/dsa.h
index 97e14e2b3..6902b548c 100644
--- a/cipher/dsa.h
+++ b/cipher/dsa.h
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef G10_DSA_H
diff --git a/cipher/dynload.c b/cipher/dynload.c
index 38c6a0c35..3f0e2b720 100644
--- a/cipher/dynload.c
+++ b/cipher/dynload.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/cipher/elgamal.c b/cipher/elgamal.c
index eb69a655c..95ff38ccc 100644
--- a/cipher/elgamal.c
+++ b/cipher/elgamal.c
@@ -20,7 +20,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/cipher/elgamal.h b/cipher/elgamal.h
index 6c8184219..416f49cc5 100644
--- a/cipher/elgamal.h
+++ b/cipher/elgamal.h
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef G10_ELGAMAL_H
diff --git a/cipher/gost.c b/cipher/gost.c
index 4a527722f..1b6be38c5 100644
--- a/cipher/gost.c
+++ b/cipher/gost.c
@@ -19,7 +19,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/cipher/gost.h b/cipher/gost.h
index d8e7ebfc5..bbe8bc522 100644
--- a/cipher/gost.h
+++ b/cipher/gost.h
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 #ifndef G10_GOST_H
 #define G10_GOST_H
diff --git a/cipher/idea-stub.c b/cipher/idea-stub.c
index 539c9bb58..fc19baeed 100644
--- a/cipher/idea-stub.c
+++ b/cipher/idea-stub.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 /* IDEA is a patented algorithm and therefore the use of IDEA in
diff --git a/cipher/md.c b/cipher/md.c
index 1821882e9..66a8b0540 100644
--- a/cipher/md.c
+++ b/cipher/md.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/cipher/md5.c b/cipher/md5.c
index 631df17eb..270e3fe3e 100644
--- a/cipher/md5.c
+++ b/cipher/md5.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  * According to the definition of MD5 in RFC 1321 from April 1992.
  * NOTE: This is *not* the same file as the one from glibc.
diff --git a/cipher/primegen.c b/cipher/primegen.c
index dda9012b5..98d63696a 100644
--- a/cipher/primegen.c
+++ b/cipher/primegen.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * ***********************************************************************
  * The algorithm used to generate practically save primes is due to
diff --git a/cipher/pubkey.c b/cipher/pubkey.c
index b74b17bae..d6d1ff1f2 100644
--- a/cipher/pubkey.c
+++ b/cipher/pubkey.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/cipher/rand-internal.h b/cipher/rand-internal.h
index ab01bc6db..cb398877a 100644
--- a/cipher/rand-internal.h
+++ b/cipher/rand-internal.h
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 #ifndef G10_RAND_INTERNAL_H
 #define G10_RAND_INTERNAL_H
diff --git a/cipher/random.c b/cipher/random.c
index baee65c49..0aa75cda4 100644
--- a/cipher/random.c
+++ b/cipher/random.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 
diff --git a/cipher/random.h b/cipher/random.h
index f4ba918bd..08d1e2ddd 100644
--- a/cipher/random.h
+++ b/cipher/random.h
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 #ifndef G10_RANDOM_H
 #define G10_RANDOM_H
diff --git a/cipher/rijndael.c b/cipher/rijndael.c
index 083b10399..adf276531 100644
--- a/cipher/rijndael.c
+++ b/cipher/rijndael.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *******************************************************************
  * The code here is based on the optimized implementation taken from
  * http://www.esat.kuleuven.ac.be/~rijmen/rijndael/ on Oct 2, 2000,
diff --git a/cipher/rmd.h b/cipher/rmd.h
index 917e04a26..1313bb78b 100644
--- a/cipher/rmd.h
+++ b/cipher/rmd.h
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 #ifndef G10_RMD_H
 #define G10_RMD_H
diff --git a/cipher/rmd160.c b/cipher/rmd160.c
index 6f4f5664c..7a7230f38 100644
--- a/cipher/rmd160.c
+++ b/cipher/rmd160.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/cipher/rmd160test.c b/cipher/rmd160test.c
index 49f948989..94912269b 100644
--- a/cipher/rmd160test.c
+++ b/cipher/rmd160test.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/cipher/rndegd.c b/cipher/rndegd.c
index df31ce189..f2e2a020a 100644
--- a/cipher/rndegd.c
+++ b/cipher/rndegd.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/cipher/rndlinux.c b/cipher/rndlinux.c
index 1284bc7ee..ca42eea8a 100644
--- a/cipher/rndlinux.c
+++ b/cipher/rndlinux.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 
diff --git a/cipher/rndriscos.c b/cipher/rndriscos.c
index a0fbbc228..5565e1fee 100644
--- a/cipher/rndriscos.c
+++ b/cipher/rndriscos.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/cipher/rndw32.c b/cipher/rndw32.c
index 28602fd5f..b59ae6fbe 100644
--- a/cipher/rndw32.c
+++ b/cipher/rndw32.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  *************************************************************************
  * The code here is based on code from Cryptlib 3.0 beta by Peter Gutmann.
diff --git a/cipher/rsa.c b/cipher/rsa.c
index e41ff2481..f23f3fcaa 100644
--- a/cipher/rsa.c
+++ b/cipher/rsa.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 /* This code uses an algorithm protected by U.S. Patent #4,405,829
diff --git a/cipher/rsa.h b/cipher/rsa.h
index 13c6e92e4..e6ea42356 100644
--- a/cipher/rsa.h
+++ b/cipher/rsa.h
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef G10_RSA_H
diff --git a/cipher/sha1.c b/cipher/sha1.c
index f5f223feb..d150fad1e 100644
--- a/cipher/sha1.c
+++ b/cipher/sha1.c
@@ -17,7 +17,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 
diff --git a/cipher/sha256.c b/cipher/sha256.c
index b71025ecb..47c754101 100644
--- a/cipher/sha256.c
+++ b/cipher/sha256.c
@@ -17,7 +17,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 
diff --git a/cipher/sha512.c b/cipher/sha512.c
index ed67fe45a..523579d25 100644
--- a/cipher/sha512.c
+++ b/cipher/sha512.c
@@ -17,7 +17,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 
diff --git a/cipher/smallprime.c b/cipher/smallprime.c
index 941f4ce9a..b110fbbd1 100644
--- a/cipher/smallprime.c
+++ b/cipher/smallprime.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/configure.ac b/configure.ac
index b61b8dbde..42b964dbd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,17 +16,17 @@ dnl GNU General Public License for more details.
 dnl 
 dnl You should have received a copy of the GNU General Public License
 dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
+dnl MA 02110-1301, USA
 dnl
 dnl (Process this file with autoconf to produce a configure script.)
-dnlAC_REVISION($Revision$)dnl
 
 AC_PREREQ(2.59)
 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.2-cvs, [email protected])
+AC_INIT(gnupg, 1.4.2rc1, [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/Makefile.am b/doc/Makefile.am
index dc421aa5e..34b9ddf65 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -14,7 +14,7 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 ## Process this file with automake to create Makefile.in
 
diff --git a/doc/README.W32 b/doc/README.W32
index 5f09e0806..a82e63861 100644
--- a/doc/README.W32
+++ b/doc/README.W32
@@ -134,8 +134,8 @@ GnuPG is
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-  02111-1307, USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+  02110-1301, USA
 
 See the files AUTHORS and THANKS for credits, further legal
 information and bug reporting addresses pertaining to GnuPG.
diff --git a/doc/faq.raw b/doc/faq.raw
index 2369fd977..cbab76b0c 100644
--- a/doc/faq.raw
+++ b/doc/faq.raw
@@ -1338,7 +1338,7 @@ you could search in the mailing list archive.
 [H hr]
 
 Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.,
-59 Temple Place - Suite 330, Boston, MA 02111, USA
+51 Franklin Street, Fifth Floor, Boston, MA 02111, USA
 
 Verbatim copying and distribution of this entire article is permitted in
 any medium, provided this notice is preserved.
diff --git a/doc/fr/FAQ b/doc/fr/FAQ
index 48c28ae76..b15da515b 100644
--- a/doc/fr/FAQ
+++ b/doc/fr/FAQ
@@ -1105,7 +1105,7 @@ avoir fourni le script permettant de générer cette FAQ,
 qu'il utilise d'autre part pour son excellente FAQ Solaris2 ;-)
 
 Copyright (C) 2000 Free Software Foundation, Inc. , 
-59 Temple Place - Suite 330, Boston, MA 02111, USA 
+51 Franklin Street, Fifth Floor, Boston, MA 02111, USA 
 
 Verbatim copying and distribution of this entire article is permitted in
 any medium, provided this notice is preserved.
diff --git a/doc/gpg.ru.sgml b/doc/gpg.ru.sgml
index 2d23dd953..5c7be9c78 100644
--- a/doc/gpg.ru.sgml
+++ b/doc/gpg.ru.sgml
@@ -18,7 +18,8 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA
 -->
 <!-- This file should be processed by docbook-to-man to
      create a manual page.  This program has currently the bug
diff --git a/doc/gpg.sgml b/doc/gpg.sgml
index 28da9a53f..6a084e7a4 100644
--- a/doc/gpg.sgml
+++ b/doc/gpg.sgml
@@ -16,7 +16,8 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA
 -->
 <!-- This file should be processed by docbook-to-man to
      create a manual page.  This program has currently the bug
diff --git a/doc/gpgv.sgml b/doc/gpgv.sgml
index 8412b708c..6b865e013 100644
--- a/doc/gpgv.sgml
+++ b/doc/gpgv.sgml
@@ -15,7 +15,8 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
 -->
 <!-- This file should be processed by docbook-to-man to
      create a manual page.  This program has currently the bug
diff --git a/g10/ChangeLog b/g10/ChangeLog
index ad94ca703..274c673d8 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,12 @@
+2005-05-31  Werner Koch  <[email protected]>
+
+	* armor.c (check_input): Don't bail out on invalid header lines
+	unless in struict rfc2440 mode.  Suggested by Richard Patterson.
+
+2005-05-30  Werner Koch  <[email protected]>
+
+	* tlv.c: Add hack to compile without gpg-error.h.
+
 2005-05-30  David Shaw  <[email protected]>
 
 	* trustdb.h, trustdb.c (clean_subkeys_from_key): New.  Walk
diff --git a/g10/Makefile.am b/g10/Makefile.am
index 160d7b4cd..887f4c595 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -15,7 +15,7 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 ## Process this file with automake to produce Makefile.in
 
diff --git a/g10/apdu.c b/g10/apdu.c
index 53d8b06b4..316af68cc 100644
--- a/g10/apdu.c
+++ b/g10/apdu.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * $Id$
  */
diff --git a/g10/apdu.h b/g10/apdu.h
index e0f50b72b..395d98d89 100644
--- a/g10/apdu.h
+++ b/g10/apdu.h
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * $Id$
  */
diff --git a/g10/app-common.h b/g10/app-common.h
index 613ad61f6..756624c5b 100644
--- a/g10/app-common.h
+++ b/g10/app-common.h
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * $Id$
  */
diff --git a/g10/app-openpgp.c b/g10/app-openpgp.c
index 14483869b..f129b16a8 100644
--- a/g10/app-openpgp.c
+++ b/g10/app-openpgp.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * $Id$
  */
diff --git a/g10/armor.c b/g10/armor.c
index 55698da91..162997df7 100644
--- a/g10/armor.c
+++ b/g10/armor.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
@@ -430,9 +431,9 @@ check_input( armor_filter_context_t *afx, IOBUF a )
 	} while( !maxlen );
     }
 
-    /* parse the header lines */
+    /* Parse the header lines.  */
     while(len) {
-	/* read the next line (skip all truncated lines) */
+	/* Read the next line (skip all truncated lines). */
 	do {
 	    maxlen = MAX_LINELEN;
 	    afx->buffer_len = iobuf_read_line( a, &afx->buffer,
@@ -443,7 +444,7 @@ check_input( armor_filter_context_t *afx, IOBUF a )
 
 	i = parse_header_line( afx, line, len );
 	if( i <= 0 ) {
-	    if( i )
+	    if (i && RFC2440)
 		rc = G10ERR_INVALID_ARMOR;
 	    break;
 	}
diff --git a/g10/build-packet.c b/g10/build-packet.c
index e1aeae235..88b683546 100644
--- a/g10/build-packet.c
+++ b/g10/build-packet.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/card-util.c b/g10/card-util.c
index 8874935e3..7077cd996 100644
--- a/g10/card-util.c
+++ b/g10/card-util.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/cardglue.c b/g10/cardglue.c
index a4ecee06f..ae4d37ab0 100644
--- a/g10/cardglue.c
+++ b/g10/cardglue.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/cardglue.h b/g10/cardglue.h
index a679dbb95..8d7ec369e 100644
--- a/g10/cardglue.h
+++ b/g10/cardglue.h
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 #ifndef GNUPG_G10_CARDGLUE_H
 #define GNUPG_G10_CARDGLUE_H 
diff --git a/g10/ccid-driver.c b/g10/ccid-driver.c
index 9ac655e63..05ad29b2f 100644
--- a/g10/ccid-driver.c
+++ b/g10/ccid-driver.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * ALTERNATIVELY, this file may be distributed under the terms of the
  * following license, in which case the provisions of this license are
diff --git a/g10/ccid-driver.h b/g10/ccid-driver.h
index 82feed5c9..1b9ac2f85 100644
--- a/g10/ccid-driver.h
+++ b/g10/ccid-driver.h
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * ALTERNATIVELY, this file may be distributed under the terms of the
  * following license, in which case the provisions of this license are
diff --git a/g10/cipher.c b/g10/cipher.c
index ab7c9b676..f7332ba3e 100644
--- a/g10/cipher.c
+++ b/g10/cipher.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/compress-bz2.c b/g10/compress-bz2.c
index cebfa5388..0454143b1 100644
--- a/g10/compress-bz2.c
+++ b/g10/compress-bz2.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/compress.c b/g10/compress.c
index cb5b9e52e..5c74255b9 100644
--- a/g10/compress.c
+++ b/g10/compress.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 /* Note that the code in compress-bz2.c is nearly identical to the
diff --git a/g10/dearmor.c b/g10/dearmor.c
index 355820d9f..8d7c60a5f 100644
--- a/g10/dearmor.c
+++ b/g10/dearmor.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/decrypt.c b/g10/decrypt.c
index 90130872c..ad1f5ff6c 100644
--- a/g10/decrypt.c
+++ b/g10/decrypt.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/delkey.c b/g10/delkey.c
index 531738507..354851d1f 100644
--- a/g10/delkey.c
+++ b/g10/delkey.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/encode.c b/g10/encode.c
index 90735c1b1..c70ed163b 100644
--- a/g10/encode.c
+++ b/g10/encode.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/encr-data.c b/g10/encr-data.c
index f9fabc8f0..8cb526004 100644
--- a/g10/encr-data.c
+++ b/g10/encr-data.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/exec.c b/g10/exec.c
index e9c9554f7..32f23b4b5 100644
--- a/g10/exec.c
+++ b/g10/exec.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/exec.h b/g10/exec.h
index 81e578bc6..90fc3b31d 100644
--- a/g10/exec.h
+++ b/g10/exec.h
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef _EXEC_H_
diff --git a/g10/export.c b/g10/export.c
index b91c0442e..d936cce59 100644
--- a/g10/export.c
+++ b/g10/export.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/filter.h b/g10/filter.h
index b8e3edac6..bb06ecc6e 100644
--- a/g10/filter.h
+++ b/g10/filter.h
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 #ifndef G10_FILTER_H
 #define G10_FILTER_H
diff --git a/g10/free-packet.c b/g10/free-packet.c
index 7a99187ee..a4dadb417 100644
--- a/g10/free-packet.c
+++ b/g10/free-packet.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/g10.c b/g10/g10.c
index 680f48852..f258a9312 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/getkey.c b/g10/getkey.c
index 25da9bac9..2647cf373 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/global.h b/g10/global.h
index 3c4e59ec4..1b2f872b1 100644
--- a/g10/global.h
+++ b/g10/global.h
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef GPG_GLOBAL_H
diff --git a/g10/gpgv.c b/g10/gpgv.c
index 403504660..29211075f 100644
--- a/g10/gpgv.c
+++ b/g10/gpgv.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/helptext.c b/g10/helptext.c
index 5a8c0065c..e1f785191 100644
--- a/g10/helptext.c
+++ b/g10/helptext.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/import.c b/g10/import.c
index 0554e4dbb..b95a9e8eb 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/iso7816.c b/g10/iso7816.c
index 9eff9d3f7..afd863858 100644
--- a/g10/iso7816.c
+++ b/g10/iso7816.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * $Id$
  */
diff --git a/g10/iso7816.h b/g10/iso7816.h
index b9ba1800b..848a6f05e 100644
--- a/g10/iso7816.h
+++ b/g10/iso7816.h
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * $Id$
  */
diff --git a/g10/kbnode.c b/g10/kbnode.c
index 5df6d8d74..ecfac8264 100644
--- a/g10/kbnode.c
+++ b/g10/kbnode.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/keydb.c b/g10/keydb.c
index 8501143fd..5c7e2ed9d 100644
--- a/g10/keydb.c
+++ b/g10/keydb.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/keydb.h b/g10/keydb.h
index 81caf4993..e2b32e32e 100644
--- a/g10/keydb.h
+++ b/g10/keydb.h
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef G10_KEYDB_H
diff --git a/g10/keyedit.c b/g10/keyedit.c
index 741204933..e0e57826b 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/keygen.c b/g10/keygen.c
index b5408a6aa..fb7270d2c 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/keyid.c b/g10/keyid.c
index 03e816958..eeeaeedde 100644
--- a/g10/keyid.c
+++ b/g10/keyid.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/keylist.c b/g10/keylist.c
index 642598939..5a6ae909b 100644
--- a/g10/keylist.c
+++ b/g10/keylist.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/keyring.c b/g10/keyring.c
index 2ac39a551..49e114e1d 100644
--- a/g10/keyring.c
+++ b/g10/keyring.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/keyring.h b/g10/keyring.h
index 9b63f3235..8c4ea73d4 100644
--- a/g10/keyring.h
+++ b/g10/keyring.h
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef GPG_KEYRING_H
diff --git a/g10/keyserver-internal.h b/g10/keyserver-internal.h
index 2fbfd5431..2ead5a067 100644
--- a/g10/keyserver-internal.h
+++ b/g10/keyserver-internal.h
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef _KEYSERVER_INTERNAL_H_
diff --git a/g10/keyserver.c b/g10/keyserver.c
index 90013f990..e98802528 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/main.h b/g10/main.h
index 6c0925505..5024e5d01 100644
--- a/g10/main.h
+++ b/g10/main.h
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 #ifndef G10_MAIN_H
 #define G10_MAIN_H
diff --git a/g10/mainproc.c b/g10/mainproc.c
index a95696089..74d626543 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/mdfilter.c b/g10/mdfilter.c
index d6ccacecf..3605db8bf 100644
--- a/g10/mdfilter.c
+++ b/g10/mdfilter.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/misc.c b/g10/misc.c
index 175590ce2..70667cf7e 100644
--- a/g10/misc.c
+++ b/g10/misc.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/openfile.c b/g10/openfile.c
index 5454d10c0..121b46dd0 100644
--- a/g10/openfile.c
+++ b/g10/openfile.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/options.h b/g10/options.h
index deedc561b..e1391523a 100644
--- a/g10/options.h
+++ b/g10/options.h
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 #ifndef G10_OPTIONS_H
 #define G10_OPTIONS_H
diff --git a/g10/packet.h b/g10/packet.h
index 040a0a641..cbbc0d7b6 100644
--- a/g10/packet.h
+++ b/g10/packet.h
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef G10_PACKET_H
diff --git a/g10/parse-packet.c b/g10/parse-packet.c
index 71d3d2fba..8cc979e77 100644
--- a/g10/parse-packet.c
+++ b/g10/parse-packet.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/passphrase.c b/g10/passphrase.c
index 740ac549b..9606a78b1 100644
--- a/g10/passphrase.c
+++ b/g10/passphrase.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/photoid.c b/g10/photoid.c
index 385a6818e..6457a48e9 100644
--- a/g10/photoid.c
+++ b/g10/photoid.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/photoid.h b/g10/photoid.h
index 187ca5ba2..031c0fee6 100644
--- a/g10/photoid.h
+++ b/g10/photoid.h
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 /* Photo ID functions */
diff --git a/g10/pipemode.c b/g10/pipemode.c
index f3351277e..750aa3b54 100644
--- a/g10/pipemode.c
+++ b/g10/pipemode.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/pkclist.c b/g10/pkclist.c
index 088d6ec63..452abe6f6 100644
--- a/g10/pkclist.c
+++ b/g10/pkclist.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/plaintext.c b/g10/plaintext.c
index 0c74b1e6f..0b869e4c8 100644
--- a/g10/plaintext.c
+++ b/g10/plaintext.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/progress.c b/g10/progress.c
index 5c0725ae4..0f42aae79 100644
--- a/g10/progress.c
+++ b/g10/progress.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/pubkey-enc.c b/g10/pubkey-enc.c
index 02a091300..a3a60e1e6 100644
--- a/g10/pubkey-enc.c
+++ b/g10/pubkey-enc.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/revoke.c b/g10/revoke.c
index 591ff7776..7ffb5c7e8 100644
--- a/g10/revoke.c
+++ b/g10/revoke.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/seckey-cert.c b/g10/seckey-cert.c
index fc318d0ae..aca29e348 100644
--- a/g10/seckey-cert.c
+++ b/g10/seckey-cert.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/seskey.c b/g10/seskey.c
index cc58154ad..7ed20d92c 100644
--- a/g10/seskey.c
+++ b/g10/seskey.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/sig-check.c b/g10/sig-check.c
index 81d0d605f..2f2199ad7 100644
--- a/g10/sig-check.c
+++ b/g10/sig-check.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/sign.c b/g10/sign.c
index 7d6cc04f0..e5c5cbfa0 100644
--- a/g10/sign.c
+++ b/g10/sign.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/signal.c b/g10/signal.c
index 7f91070f3..7250eedd4 100644
--- a/g10/signal.c
+++ b/g10/signal.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/skclist.c b/g10/skclist.c
index 69157d8e7..abe8fbc37 100644
--- a/g10/skclist.c
+++ b/g10/skclist.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/status.c b/g10/status.c
index a0c9511d9..e5eebd255 100644
--- a/g10/status.c
+++ b/g10/status.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/status.h b/g10/status.h
index 8be77e4a8..afcfdbc95 100644
--- a/g10/status.h
+++ b/g10/status.h
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 #ifndef G10_STATUS_H
 #define G10_STATUS_H
diff --git a/g10/tdbdump.c b/g10/tdbdump.c
index f3ec27df9..09ce11949 100644
--- a/g10/tdbdump.c
+++ b/g10/tdbdump.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/tdbio.c b/g10/tdbio.c
index 5b34bc8ed..ae04d1059 100644
--- a/g10/tdbio.c
+++ b/g10/tdbio.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/tdbio.h b/g10/tdbio.h
index 708e06d2b..80a70d9f4 100644
--- a/g10/tdbio.h
+++ b/g10/tdbio.h
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef G10_TDBIO_H
diff --git a/g10/textfilter.c b/g10/textfilter.c
index a029b727c..3694cb33a 100644
--- a/g10/textfilter.c
+++ b/g10/textfilter.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/tlv.c b/g10/tlv.c
index b5dcd4021..bb7f99902 100644
--- a/g10/tlv.c
+++ b/g10/tlv.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
@@ -25,7 +26,12 @@
 #include <string.h>
 #include <assert.h>
 
+#if GNUPG_MAJOR_VERSION == 1
+#include "cardglue.h"
+#else
 #include <gpg-error.h>
+#endif
+
 
 #include "tlv.h"
 
diff --git a/g10/tlv.h b/g10/tlv.h
index f587dd9df..877573d25 100644
--- a/g10/tlv.h
+++ b/g10/tlv.h
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef SCD_TLV_H
diff --git a/g10/trustdb.c b/g10/trustdb.c
index d5e4e2333..826f83bad 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/trustdb.h b/g10/trustdb.h
index 1e1929400..fe3795dcc 100644
--- a/g10/trustdb.h
+++ b/g10/trustdb.h
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef G10_TRUSTDB_H
diff --git a/g10/verify.c b/g10/verify.c
index df60b7d71..d5ac9f592 100644
--- a/g10/verify.c
+++ b/g10/verify.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/include/_regex.h b/include/_regex.h
index fac441dc6..88acc352d 100644
--- a/include/_regex.h
+++ b/include/_regex.h
@@ -17,7 +17,7 @@
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   02110-1301 USA.  */
 
 #ifndef _REGEX_H
 #define _REGEX_H 1
diff --git a/include/assuan.h b/include/assuan.h
index d39b774cf..683f55bc1 100644
--- a/include/assuan.h
+++ b/include/assuan.h
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA. 
  */
 
 /* Please note that this is a stripped down and modified version of
diff --git a/include/cipher.h b/include/cipher.h
index da3a7d8f3..2df5784dc 100644
--- a/include/cipher.h
+++ b/include/cipher.h
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 #ifndef G10_CIPHER_H
 #define G10_CIPHER_H
diff --git a/include/dynload.h b/include/dynload.h
index dfae2f0cd..acdf5c879 100644
--- a/include/dynload.h
+++ b/include/dynload.h
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef GNUPG_DYNLOAD_H
diff --git a/include/errors.h b/include/errors.h
index c014c91a0..a42d402ef 100644
--- a/include/errors.h
+++ b/include/errors.h
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 #ifndef G10_ERRORS_H
 #define G10_ERRORS_H
diff --git a/include/host2net.h b/include/host2net.h
index 0f12a8e1d..d72b828d0 100644
--- a/include/host2net.h
+++ b/include/host2net.h
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef G10_HOST2NET_H
diff --git a/include/http.h b/include/http.h
index 2ecd9b4b3..3437bcde3 100644
--- a/include/http.h
+++ b/include/http.h
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef G10_HTTP_H
diff --git a/include/i18n.h b/include/i18n.h
index 12def28b8..6abd2dce3 100644
--- a/include/i18n.h
+++ b/include/i18n.h
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef G10_I18N_H
diff --git a/include/iobuf.h b/include/iobuf.h
index bc2f0a156..ae5da421c 100644
--- a/include/iobuf.h
+++ b/include/iobuf.h
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef G10_IOBUF_H
diff --git a/include/keyserver.h b/include/keyserver.h
index 35a8a0f1c..8900dbe6e 100644
--- a/include/keyserver.h
+++ b/include/keyserver.h
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef _KEYSERVER_H_
diff --git a/include/memory.h b/include/memory.h
index 4ab5cc470..029c89ebb 100644
--- a/include/memory.h
+++ b/include/memory.h
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef G10_MEMORY_H
diff --git a/include/mpi.h b/include/mpi.h
index 00313b22d..f8588cc9d 100644
--- a/include/mpi.h
+++ b/include/mpi.h
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/include/ttyio.h b/include/ttyio.h
index 85a7100a6..2c52fc3e9 100644
--- a/include/ttyio.h
+++ b/include/ttyio.h
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 #ifndef G10_TTYIO_H
 #define G10_TTYIO_H
diff --git a/include/types.h b/include/types.h
index 8abfa6e87..3b85b10e1 100644
--- a/include/types.h
+++ b/include/types.h
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef G10_TYPES_H
diff --git a/include/util.h b/include/util.h
index b32d771af..31e18879d 100644
--- a/include/util.h
+++ b/include/util.h
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 #ifndef G10_UTIL_H
 #define G10_UTIL_H
diff --git a/include/zlib-riscos.h b/include/zlib-riscos.h
index fad556bcb..6a27b86ef 100644
--- a/include/zlib-riscos.h
+++ b/include/zlib-riscos.h
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 #ifndef G10_ZLIB_RISCOS_H
 #define G10_ZLIB_RISCOS_H
diff --git a/intl/Makefile.in b/intl/Makefile.in
index 05f15329e..1ad087adf 100644
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -13,7 +13,7 @@
 #
 # You should have received a copy of the GNU Library General Public
 # License along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
 # USA.
 
 PACKAGE = @PACKAGE@
diff --git a/intl/bindtextdom.c b/intl/bindtextdom.c
index dcdc40085..7a2606264 100644
--- a/intl/bindtextdom.c
+++ b/intl/bindtextdom.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/intl/config.charset b/intl/config.charset
index 43d45fb75..d4964dc4e 100755
--- a/intl/config.charset
+++ b/intl/config.charset
@@ -15,7 +15,7 @@
 #
 #   You should have received a copy of the GNU Library General Public
 #   License along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+#   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
 #   USA.
 #
 # The table consists of lines of the form
diff --git a/intl/dcgettext.c b/intl/dcgettext.c
index 850acdee9..c2a63f08e 100644
--- a/intl/dcgettext.c
+++ b/intl/dcgettext.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/intl/dcigettext.c b/intl/dcigettext.c
index 35238e2cb..22b7cd2f6 100644
--- a/intl/dcigettext.c
+++ b/intl/dcigettext.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 /* Tell glibc's <string.h> to provide a prototype for mempcpy().
diff --git a/intl/dcngettext.c b/intl/dcngettext.c
index 48a3e09e0..eb368336c 100644
--- a/intl/dcngettext.c
+++ b/intl/dcngettext.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/intl/dgettext.c b/intl/dgettext.c
index b64b0f5d3..9b0d0de6c 100644
--- a/intl/dgettext.c
+++ b/intl/dgettext.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/intl/dngettext.c b/intl/dngettext.c
index 7815637f0..3278438fe 100644
--- a/intl/dngettext.c
+++ b/intl/dngettext.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/intl/eval-plural.h b/intl/eval-plural.h
index 01bd5af5f..dacd003db 100644
--- a/intl/eval-plural.h
+++ b/intl/eval-plural.h
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 #ifndef STATIC
diff --git a/intl/explodename.c b/intl/explodename.c
index 52c25e727..1361418df 100644
--- a/intl/explodename.c
+++ b/intl/explodename.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/intl/finddomain.c b/intl/finddomain.c
index 4992a8c9e..498f858ff 100644
--- a/intl/finddomain.c
+++ b/intl/finddomain.c
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/intl/gettext.c b/intl/gettext.c
index 92c42faa7..d82d439c0 100644
--- a/intl/gettext.c
+++ b/intl/gettext.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/intl/gettext.h b/intl/gettext.h
index 6f5d76055..605b63dac 100644
--- a/intl/gettext.h
+++ b/intl/gettext.h
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 #ifndef _GETTEXT_H
diff --git a/intl/gettextP.h b/intl/gettextP.h
index 4d66c3de3..ccd5e87bb 100644
--- a/intl/gettextP.h
+++ b/intl/gettextP.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 #ifndef _GETTEXTP_H
diff --git a/intl/gmo.h b/intl/gmo.h
index e7c9cc14b..26515feb2 100644
--- a/intl/gmo.h
+++ b/intl/gmo.h
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 #ifndef _GETTEXT_H
diff --git a/intl/hash-string.h b/intl/hash-string.h
index 093e3b1c1..2c9a3a57e 100644
--- a/intl/hash-string.h
+++ b/intl/hash-string.h
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 /* @@ end of prolog @@ */
diff --git a/intl/intl-compat.c b/intl/intl-compat.c
index 96f9d955d..15be09cbc 100644
--- a/intl/intl-compat.c
+++ b/intl/intl-compat.c
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/intl/l10nflist.c b/intl/l10nflist.c
index eb995aafa..e62aa5c90 100644
--- a/intl/l10nflist.c
+++ b/intl/l10nflist.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 /* Tell glibc's <string.h> to provide a prototype for stpcpy().
diff --git a/intl/libgettext.h b/intl/libgettext.h
index c5be54a80..e939e2ae7 100644
--- a/intl/libgettext.h
+++ b/intl/libgettext.h
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 #ifndef _LIBGETTEXT_H
diff --git a/intl/libgnuintl.h.in b/intl/libgnuintl.h.in
index 3be7eb990..c8c5620de 100644
--- a/intl/libgnuintl.h.in
+++ b/intl/libgnuintl.h.in
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 #ifndef _LIBINTL_H
diff --git a/intl/loadinfo.h b/intl/loadinfo.h
index 65e5ebd1f..d6408f2a3 100644
--- a/intl/loadinfo.h
+++ b/intl/loadinfo.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 #ifndef _LOADINFO_H
diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c
index 99c51b4c5..0d59ad8f7 100644
--- a/intl/loadmsgcat.c
+++ b/intl/loadmsgcat.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 /* Tell glibc's <string.h> to provide a prototype for mempcpy().
diff --git a/intl/localcharset.c b/intl/localcharset.c
index 4865f1037..449ffc7b3 100644
--- a/intl/localcharset.c
+++ b/intl/localcharset.c
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 /* Written by Bruno Haible <[email protected]>.  */
diff --git a/intl/localcharset.h b/intl/localcharset.h
index 3b137e73c..129e4a4a3 100644
--- a/intl/localcharset.h
+++ b/intl/localcharset.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 #ifndef _LOCALCHARSET_H
diff --git a/intl/locale.alias b/intl/locale.alias
index bd6bb2562..faa696918 100644
--- a/intl/locale.alias
+++ b/intl/locale.alias
@@ -13,7 +13,7 @@
 #
 # You should have received a copy of the GNU Library General Public
 # License along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
 # USA.
 
 # The format of this file is the same as for the corresponding file of
diff --git a/intl/localealias.c b/intl/localealias.c
index 2eaf8813e..7a092a0df 100644
--- a/intl/localealias.c
+++ b/intl/localealias.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 /* Tell glibc's <string.h> to provide a prototype for mempcpy().
diff --git a/intl/localename.c b/intl/localename.c
index 5662e54ff..9d651461a 100644
--- a/intl/localename.c
+++ b/intl/localename.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 /* Written by Ulrich Drepper <[email protected]>, 1995.  */
diff --git a/intl/log.c b/intl/log.c
index cb6076e80..89f82dfd1 100644
--- a/intl/log.c
+++ b/intl/log.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 /* Written by Bruno Haible <[email protected]>.  */
diff --git a/intl/ngettext.c b/intl/ngettext.c
index e73e00c48..a33529c20 100644
--- a/intl/ngettext.c
+++ b/intl/ngettext.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/intl/os2compat.c b/intl/os2compat.c
index c8dc33e7c..d041de2af 100644
--- a/intl/os2compat.c
+++ b/intl/os2compat.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 #define OS2_AWARE
diff --git a/intl/os2compat.h b/intl/os2compat.h
index 4f74e8c03..a18d582cd 100644
--- a/intl/os2compat.h
+++ b/intl/os2compat.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 /* When included from os2compat.h we need all the original definitions */
diff --git a/intl/osdep.c b/intl/osdep.c
index b37259838..d2d8575ec 100644
--- a/intl/osdep.c
+++ b/intl/osdep.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 #if defined __EMX__
diff --git a/intl/plural-exp.c b/intl/plural-exp.c
index 8c04e6426..1873be90b 100644
--- a/intl/plural-exp.c
+++ b/intl/plural-exp.c
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/intl/plural-exp.h b/intl/plural-exp.h
index 49e2c5bfc..f54018471 100644
--- a/intl/plural-exp.h
+++ b/intl/plural-exp.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 #ifndef _PLURAL_EXP_H
diff --git a/intl/plural.c b/intl/plural.c
index 72494f9eb..c73008b39 100644
--- a/intl/plural.c
+++ b/intl/plural.c
@@ -34,7 +34,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 /* The bison generated parser uses alloca.  AIX 3 forces us to put this
@@ -315,8 +315,8 @@ static const short yycheck[] =
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, when this file is copied by Bison into a
    Bison output file, you may use that output file without restriction.
diff --git a/intl/plural.y b/intl/plural.y
index 4d33bd7c7..fe791120b 100644
--- a/intl/plural.y
+++ b/intl/plural.y
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 /* The bison generated parser uses alloca.  AIX 3 forces us to put this
diff --git a/intl/printf-args.c b/intl/printf-args.c
index f6f3219e7..f97590147 100644
--- a/intl/printf-args.c
+++ b/intl/printf-args.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/intl/printf-args.h b/intl/printf-args.h
index f11e64c04..625b8036a 100644
--- a/intl/printf-args.h
+++ b/intl/printf-args.h
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 #ifndef _PRINTF_ARGS_H
diff --git a/intl/printf-parse.c b/intl/printf-parse.c
index d19f903d7..20240e379 100644
--- a/intl/printf-parse.c
+++ b/intl/printf-parse.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/intl/printf-parse.h b/intl/printf-parse.h
index 8aec50e2a..e78533895 100644
--- a/intl/printf-parse.h
+++ b/intl/printf-parse.h
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 #ifndef _PRINTF_PARSE_H
diff --git a/intl/printf.c b/intl/printf.c
index 878646c2d..5e112b69b 100644
--- a/intl/printf.c
+++ b/intl/printf.c
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/intl/ref-add.sin b/intl/ref-add.sin
index 167374e3c..3678c2892 100644
--- a/intl/ref-add.sin
+++ b/intl/ref-add.sin
@@ -14,7 +14,7 @@
 #
 #   You should have received a copy of the GNU Library General Public
 #   License along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+#   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
 #   USA.
 #
 # Written by Bruno Haible <[email protected]>.
diff --git a/intl/ref-del.sin b/intl/ref-del.sin
index 613cf37f3..0c12d8e95 100644
--- a/intl/ref-del.sin
+++ b/intl/ref-del.sin
@@ -14,7 +14,7 @@
 #
 #   You should have received a copy of the GNU Library General Public
 #   License along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+#   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
 #   USA.
 #
 # Written by Bruno Haible <[email protected]>.
diff --git a/intl/relocatable.c b/intl/relocatable.c
index bf7c70854..a2e5aa7ab 100644
--- a/intl/relocatable.c
+++ b/intl/relocatable.c
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 
diff --git a/intl/relocatable.h b/intl/relocatable.h
index 48c5b71e2..614e64e2f 100644
--- a/intl/relocatable.h
+++ b/intl/relocatable.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 #ifndef _RELOCATABLE_H
diff --git a/intl/textdomain.c b/intl/textdomain.c
index 8745a8435..2bf62407d 100644
--- a/intl/textdomain.c
+++ b/intl/textdomain.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/intl/vasnprintf.c b/intl/vasnprintf.c
index 8a62282d7..f192f2088 100644
--- a/intl/vasnprintf.c
+++ b/intl/vasnprintf.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 /* Tell glibc's <stdio.h> to provide a prototype for snprintf().
diff --git a/intl/vasnprintf.h b/intl/vasnprintf.h
index 65f1bc13d..5c62fb28b 100644
--- a/intl/vasnprintf.h
+++ b/intl/vasnprintf.h
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 #ifndef _VASNPRINTF_H
diff --git a/intl/vasnwprintf.h b/intl/vasnwprintf.h
index d3cef4cbc..6ff03ce16 100644
--- a/intl/vasnwprintf.h
+++ b/intl/vasnwprintf.h
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 #ifndef _VASNWPRINTF_H
diff --git a/intl/wprintf-parse.h b/intl/wprintf-parse.h
index 24a2cfc28..600b89adc 100644
--- a/intl/wprintf-parse.h
+++ b/intl/wprintf-parse.h
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 #ifndef _WPRINTF_PARSE_H
diff --git a/intl/xsize.h b/intl/xsize.h
index 362e24b72..b3023a7d4 100644
--- a/intl/xsize.h
+++ b/intl/xsize.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 #ifndef _XSIZE_H
diff --git a/keyserver/Makefile.am b/keyserver/Makefile.am
index c0b1c272e..01c059070 100644
--- a/keyserver/Makefile.am
+++ b/keyserver/Makefile.am
@@ -14,7 +14,7 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 ## Process this file with automake to produce Makefile.in
 
diff --git a/keyserver/curl-shim.c b/keyserver/curl-shim.c
index d72bb66d2..33619df51 100644
--- a/keyserver/curl-shim.c
+++ b/keyserver/curl-shim.c
@@ -17,7 +17,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/keyserver/curl-shim.h b/keyserver/curl-shim.h
index 505393635..36aa880a9 100644
--- a/keyserver/curl-shim.h
+++ b/keyserver/curl-shim.h
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef _CURL_SHIM_H_
diff --git a/keyserver/gpgkeys_curl.c b/keyserver/gpgkeys_curl.c
index c827253f6..e935bb879 100644
--- a/keyserver/gpgkeys_curl.c
+++ b/keyserver/gpgkeys_curl.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/keyserver/gpgkeys_finger.c b/keyserver/gpgkeys_finger.c
index a16bbe159..57d310b44 100644
--- a/keyserver/gpgkeys_finger.c
+++ b/keyserver/gpgkeys_finger.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/keyserver/gpgkeys_hkp.c b/keyserver/gpgkeys_hkp.c
index a7d7b92be..a9cbf0350 100644
--- a/keyserver/gpgkeys_hkp.c
+++ b/keyserver/gpgkeys_hkp.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/keyserver/gpgkeys_http.c b/keyserver/gpgkeys_http.c
index 61d333959..b11970989 100644
--- a/keyserver/gpgkeys_http.c
+++ b/keyserver/gpgkeys_http.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/keyserver/gpgkeys_ldap.c b/keyserver/gpgkeys_ldap.c
index fd99ae197..da7b2c7e2 100644
--- a/keyserver/gpgkeys_ldap.c
+++ b/keyserver/gpgkeys_ldap.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/keyserver/gpgkeys_mailto.in b/keyserver/gpgkeys_mailto.in
index 7167c3afd..c20706ce8 100755
--- a/keyserver/gpgkeys_mailto.in
+++ b/keyserver/gpgkeys_mailto.in
@@ -17,7 +17,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 use Getopt::Std;
 $Getopt::Std::STANDARD_HELP_VERSION=1;
diff --git a/keyserver/gpgkeys_oldhkp.c b/keyserver/gpgkeys_oldhkp.c
index b29ff2590..43162d485 100644
--- a/keyserver/gpgkeys_oldhkp.c
+++ b/keyserver/gpgkeys_oldhkp.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 /* This is the original version that uses the iobuf library for
diff --git a/keyserver/gpgkeys_test.in b/keyserver/gpgkeys_test.in
index 909552457..07b63489d 100755
--- a/keyserver/gpgkeys_test.in
+++ b/keyserver/gpgkeys_test.in
@@ -17,7 +17,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 use Getopt::Std;
 $Getopt::Std::STANDARD_HELP_VERSION=1;
diff --git a/keyserver/ksutil.c b/keyserver/ksutil.c
index 4626a847f..365cbddbf 100644
--- a/keyserver/ksutil.c
+++ b/keyserver/ksutil.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/keyserver/ksutil.h b/keyserver/ksutil.h
index 9711b798a..1e3315bee 100644
--- a/keyserver/ksutil.h
+++ b/keyserver/ksutil.h
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef _KSUTIL_H_
diff --git a/mpi/Makefile.am b/mpi/Makefile.am
index 35135c24d..84d77571b 100644
--- a/mpi/Makefile.am
+++ b/mpi/Makefile.am
@@ -14,7 +14,7 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 ## Process this file with automake to produce Makefile.in
 
diff --git a/mpi/alpha/mpih-add1.S b/mpi/alpha/mpih-add1.S
index a2ee8eb17..6ea8e38f1 100644
--- a/mpi/alpha/mpih-add1.S
+++ b/mpi/alpha/mpih-add1.S
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 
diff --git a/mpi/alpha/mpih-lshift.S b/mpi/alpha/mpih-lshift.S
index 4ce4879af..45919f51f 100644
--- a/mpi/alpha/mpih-lshift.S
+++ b/mpi/alpha/mpih-lshift.S
@@ -17,7 +17,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/alpha/mpih-mul1.S b/mpi/alpha/mpih-mul1.S
index e62ccbdb7..65b2d5c7e 100644
--- a/mpi/alpha/mpih-mul1.S
+++ b/mpi/alpha/mpih-mul1.S
@@ -18,7 +18,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 
diff --git a/mpi/alpha/mpih-mul2.S b/mpi/alpha/mpih-mul2.S
index 595af99d3..e62ceb982 100644
--- a/mpi/alpha/mpih-mul2.S
+++ b/mpi/alpha/mpih-mul2.S
@@ -18,7 +18,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 
diff --git a/mpi/alpha/mpih-mul3.S b/mpi/alpha/mpih-mul3.S
index fa3df92a5..de8b0839b 100644
--- a/mpi/alpha/mpih-mul3.S
+++ b/mpi/alpha/mpih-mul3.S
@@ -17,7 +17,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 
diff --git a/mpi/alpha/mpih-rshift.S b/mpi/alpha/mpih-rshift.S
index e15542de5..242d2b631 100644
--- a/mpi/alpha/mpih-rshift.S
+++ b/mpi/alpha/mpih-rshift.S
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/alpha/mpih-sub1.S b/mpi/alpha/mpih-sub1.S
index a32b470e2..2dea14f30 100644
--- a/mpi/alpha/mpih-sub1.S
+++ b/mpi/alpha/mpih-sub1.S
@@ -17,7 +17,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 
diff --git a/mpi/alpha/udiv-qrnnd.S b/mpi/alpha/udiv-qrnnd.S
index 0079c3cae..d715908eb 100644
--- a/mpi/alpha/udiv-qrnnd.S
+++ b/mpi/alpha/udiv-qrnnd.S
@@ -17,7 +17,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/config.links b/mpi/config.links
index 44f021739..451a5bf69 100644
--- a/mpi/config.links
+++ b/mpi/config.links
@@ -16,7 +16,7 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 # sourced by ../configure to get the list of files to link
 # this should set $mpi_ln_list.
diff --git a/mpi/generic/mpih-add1.c b/mpi/generic/mpih-add1.c
index d9c3cbb66..ebcd13208 100644
--- a/mpi/generic/mpih-add1.c
+++ b/mpi/generic/mpih-add1.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/generic/mpih-lshift.c b/mpi/generic/mpih-lshift.c
index fba8c052e..e55cb49c1 100644
--- a/mpi/generic/mpih-lshift.c
+++ b/mpi/generic/mpih-lshift.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/generic/mpih-mul1.c b/mpi/generic/mpih-mul1.c
index 83a81add0..2c5c4aeb1 100644
--- a/mpi/generic/mpih-mul1.c
+++ b/mpi/generic/mpih-mul1.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/generic/mpih-mul2.c b/mpi/generic/mpih-mul2.c
index ff8f998f2..89ef6b938 100644
--- a/mpi/generic/mpih-mul2.c
+++ b/mpi/generic/mpih-mul2.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/generic/mpih-mul3.c b/mpi/generic/mpih-mul3.c
index 80eedcc4c..ac473a0d7 100644
--- a/mpi/generic/mpih-mul3.c
+++ b/mpi/generic/mpih-mul3.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/generic/mpih-rshift.c b/mpi/generic/mpih-rshift.c
index be73adfb8..7aefc59ec 100644
--- a/mpi/generic/mpih-rshift.c
+++ b/mpi/generic/mpih-rshift.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/generic/mpih-sub1.c b/mpi/generic/mpih-sub1.c
index c618fee49..2230457c2 100644
--- a/mpi/generic/mpih-sub1.c
+++ b/mpi/generic/mpih-sub1.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/generic/udiv-w-sdiv.c b/mpi/generic/udiv-w-sdiv.c
index dd0285037..de71011d7 100644
--- a/mpi/generic/udiv-w-sdiv.c
+++ b/mpi/generic/udiv-w-sdiv.c
@@ -17,7 +17,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/mpi/hppa/mpih-add1.S b/mpi/hppa/mpih-add1.S
index 7a2a2c2cb..fbe93ed7f 100644
--- a/mpi/hppa/mpih-add1.S
+++ b/mpi/hppa/mpih-add1.S
@@ -18,7 +18,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/hppa/mpih-lshift.S b/mpi/hppa/mpih-lshift.S
index 6a8b2c4ce..0c4de141b 100644
--- a/mpi/hppa/mpih-lshift.S
+++ b/mpi/hppa/mpih-lshift.S
@@ -17,7 +17,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 
diff --git a/mpi/hppa/mpih-rshift.S b/mpi/hppa/mpih-rshift.S
index b1e6a6795..d7e691b49 100644
--- a/mpi/hppa/mpih-rshift.S
+++ b/mpi/hppa/mpih-rshift.S
@@ -17,7 +17,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 
diff --git a/mpi/hppa/mpih-sub1.S b/mpi/hppa/mpih-sub1.S
index 870009e95..c1e20d55b 100644
--- a/mpi/hppa/mpih-sub1.S
+++ b/mpi/hppa/mpih-sub1.S
@@ -18,7 +18,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/hppa/udiv-qrnnd.S b/mpi/hppa/udiv-qrnnd.S
index c8a52412b..a2024ba17 100644
--- a/mpi/hppa/udiv-qrnnd.S
+++ b/mpi/hppa/udiv-qrnnd.S
@@ -17,7 +17,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/hppa1.1/mpih-mul1.S b/mpi/hppa1.1/mpih-mul1.S
index ac9baced4..d1272a76b 100644
--- a/mpi/hppa1.1/mpih-mul1.S
+++ b/mpi/hppa1.1/mpih-mul1.S
@@ -18,7 +18,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/hppa1.1/mpih-mul2.S b/mpi/hppa1.1/mpih-mul2.S
index c73397e3e..18c4dfe03 100644
--- a/mpi/hppa1.1/mpih-mul2.S
+++ b/mpi/hppa1.1/mpih-mul2.S
@@ -18,7 +18,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/hppa1.1/mpih-mul3.S b/mpi/hppa1.1/mpih-mul3.S
index f9ccb1b57..c5b3925ee 100644
--- a/mpi/hppa1.1/mpih-mul3.S
+++ b/mpi/hppa1.1/mpih-mul3.S
@@ -18,7 +18,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/hppa1.1/udiv-qrnnd.S b/mpi/hppa1.1/udiv-qrnnd.S
index 9c08785c0..a086822a8 100644
--- a/mpi/hppa1.1/udiv-qrnnd.S
+++ b/mpi/hppa1.1/udiv-qrnnd.S
@@ -18,7 +18,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/i386/mpih-add1.S b/mpi/i386/mpih-add1.S
index da7e7f8b3..cc96014c5 100644
--- a/mpi/i386/mpih-add1.S
+++ b/mpi/i386/mpih-add1.S
@@ -18,7 +18,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/i386/mpih-lshift.S b/mpi/i386/mpih-lshift.S
index a7dad2c96..9233824fb 100644
--- a/mpi/i386/mpih-lshift.S
+++ b/mpi/i386/mpih-lshift.S
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/i386/mpih-mul1.S b/mpi/i386/mpih-mul1.S
index cf87046f5..a5f83a50a 100644
--- a/mpi/i386/mpih-mul1.S
+++ b/mpi/i386/mpih-mul1.S
@@ -17,7 +17,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/i386/mpih-mul2.S b/mpi/i386/mpih-mul2.S
index f134af70e..6b6c80605 100644
--- a/mpi/i386/mpih-mul2.S
+++ b/mpi/i386/mpih-mul2.S
@@ -18,7 +18,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/i386/mpih-mul3.S b/mpi/i386/mpih-mul3.S
index 2907ed039..81e1e432c 100644
--- a/mpi/i386/mpih-mul3.S
+++ b/mpi/i386/mpih-mul3.S
@@ -18,7 +18,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/i386/mpih-rshift.S b/mpi/i386/mpih-rshift.S
index 4886a98ca..43afecec4 100644
--- a/mpi/i386/mpih-rshift.S
+++ b/mpi/i386/mpih-rshift.S
@@ -17,7 +17,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/i386/mpih-sub1.S b/mpi/i386/mpih-sub1.S
index 2339334fe..9f0dbd8ba 100644
--- a/mpi/i386/mpih-sub1.S
+++ b/mpi/i386/mpih-sub1.S
@@ -18,7 +18,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/i386/syntax.h b/mpi/i386/syntax.h
index 035c01960..b656166cb 100644
--- a/mpi/i386/syntax.h
+++ b/mpi/i386/syntax.h
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/i586/mpih-add1.S b/mpi/i586/mpih-add1.S
index 248b0c0b2..bf9ba2757 100644
--- a/mpi/i586/mpih-add1.S
+++ b/mpi/i586/mpih-add1.S
@@ -18,7 +18,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 
diff --git a/mpi/i586/mpih-lshift.S b/mpi/i586/mpih-lshift.S
index ed040912d..366f92944 100644
--- a/mpi/i586/mpih-lshift.S
+++ b/mpi/i586/mpih-lshift.S
@@ -17,7 +17,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/i586/mpih-mul1.S b/mpi/i586/mpih-mul1.S
index 42bcde6bd..198782564 100644
--- a/mpi/i586/mpih-mul1.S
+++ b/mpi/i586/mpih-mul1.S
@@ -18,7 +18,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/i586/mpih-mul2.S b/mpi/i586/mpih-mul2.S
index 54c5df96b..39c0bbdae 100644
--- a/mpi/i586/mpih-mul2.S
+++ b/mpi/i586/mpih-mul2.S
@@ -18,7 +18,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/i586/mpih-mul3.S b/mpi/i586/mpih-mul3.S
index 0d61ff267..6c1414f66 100644
--- a/mpi/i586/mpih-mul3.S
+++ b/mpi/i586/mpih-mul3.S
@@ -18,7 +18,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/i586/mpih-rshift.S b/mpi/i586/mpih-rshift.S
index 2e3316216..aeacb689c 100644
--- a/mpi/i586/mpih-rshift.S
+++ b/mpi/i586/mpih-rshift.S
@@ -17,7 +17,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/i586/mpih-sub1.S b/mpi/i586/mpih-sub1.S
index a54be0e91..7d3045d65 100644
--- a/mpi/i586/mpih-sub1.S
+++ b/mpi/i586/mpih-sub1.S
@@ -18,7 +18,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/longlong.h b/mpi/longlong.h
index f2c806beb..c0f845c5f 100644
--- a/mpi/longlong.h
+++ b/mpi/longlong.h
@@ -16,8 +16,8 @@ License for more details.
 
 You should have received a copy of the GNU Lesser General Public License
 along with this file; see the file COPYING.LIB.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+MA 02110-1301, USA. */
 
 /* You have to define the following before including this file:
 
diff --git a/mpi/m68k/mc68020/mpih-mul1.S b/mpi/m68k/mc68020/mpih-mul1.S
index 4872b9ba7..c24305d12 100644
--- a/mpi/m68k/mc68020/mpih-mul1.S
+++ b/mpi/m68k/mc68020/mpih-mul1.S
@@ -18,7 +18,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/m68k/mc68020/mpih-mul2.S b/mpi/m68k/mc68020/mpih-mul2.S
index 7c492ffb2..2684d7d17 100644
--- a/mpi/m68k/mc68020/mpih-mul2.S
+++ b/mpi/m68k/mc68020/mpih-mul2.S
@@ -18,7 +18,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/m68k/mc68020/mpih-mul3.S b/mpi/m68k/mc68020/mpih-mul3.S
index 1e4ac45d6..c03115238 100644
--- a/mpi/m68k/mc68020/mpih-mul3.S
+++ b/mpi/m68k/mc68020/mpih-mul3.S
@@ -18,7 +18,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/m68k/mpih-add1.S b/mpi/m68k/mpih-add1.S
index 1e9cc6406..c294f9d34 100644
--- a/mpi/m68k/mpih-add1.S
+++ b/mpi/m68k/mpih-add1.S
@@ -18,7 +18,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/m68k/mpih-lshift.S b/mpi/m68k/mpih-lshift.S
index cc9dfba69..2256828f8 100644
--- a/mpi/m68k/mpih-lshift.S
+++ b/mpi/m68k/mpih-lshift.S
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/m68k/mpih-rshift.S b/mpi/m68k/mpih-rshift.S
index cc86166a7..e9c20d22f 100644
--- a/mpi/m68k/mpih-rshift.S
+++ b/mpi/m68k/mpih-rshift.S
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/m68k/mpih-sub1.S b/mpi/m68k/mpih-sub1.S
index 1847fbd65..b5de0b96a 100644
--- a/mpi/m68k/mpih-sub1.S
+++ b/mpi/m68k/mpih-sub1.S
@@ -18,7 +18,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/m68k/syntax.h b/mpi/m68k/syntax.h
index 316518fef..ad27a32ba 100644
--- a/mpi/m68k/syntax.h
+++ b/mpi/m68k/syntax.h
@@ -17,7 +17,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/mips3/mpih-add1.S b/mpi/mips3/mpih-add1.S
index a998420d7..d3ea91d10 100644
--- a/mpi/mips3/mpih-add1.S
+++ b/mpi/mips3/mpih-add1.S
@@ -18,7 +18,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 
diff --git a/mpi/mips3/mpih-lshift.S b/mpi/mips3/mpih-lshift.S
index 112383f90..7eca648d1 100644
--- a/mpi/mips3/mpih-lshift.S
+++ b/mpi/mips3/mpih-lshift.S
@@ -17,7 +17,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 /*******************
diff --git a/mpi/mips3/mpih-mul1.S b/mpi/mips3/mpih-mul1.S
index 70409e8db..0562f4f59 100644
--- a/mpi/mips3/mpih-mul1.S
+++ b/mpi/mips3/mpih-mul1.S
@@ -18,7 +18,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 
diff --git a/mpi/mips3/mpih-mul2.S b/mpi/mips3/mpih-mul2.S
index 1bddd0530..de5635538 100644
--- a/mpi/mips3/mpih-mul2.S
+++ b/mpi/mips3/mpih-mul2.S
@@ -18,7 +18,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 
diff --git a/mpi/mips3/mpih-mul3.S b/mpi/mips3/mpih-mul3.S
index 82fe47d53..960c5c274 100644
--- a/mpi/mips3/mpih-mul3.S
+++ b/mpi/mips3/mpih-mul3.S
@@ -18,7 +18,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 
diff --git a/mpi/mips3/mpih-rshift.S b/mpi/mips3/mpih-rshift.S
index 74a6cc96d..2229c504e 100644
--- a/mpi/mips3/mpih-rshift.S
+++ b/mpi/mips3/mpih-rshift.S
@@ -17,7 +17,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 /*******************
diff --git a/mpi/mips3/mpih-sub1.S b/mpi/mips3/mpih-sub1.S
index 72f506ea2..d23ff9bd2 100644
--- a/mpi/mips3/mpih-sub1.S
+++ b/mpi/mips3/mpih-sub1.S
@@ -18,7 +18,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 
diff --git a/mpi/mpi-add.c b/mpi/mpi-add.c
index bbd1ac70e..d8bd46b85 100644
--- a/mpi/mpi-add.c
+++ b/mpi/mpi-add.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/mpi-bit.c b/mpi/mpi-bit.c
index 440e35212..da9d0091d 100644
--- a/mpi/mpi-bit.c
+++ b/mpi/mpi-bit.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/mpi/mpi-cmp.c b/mpi/mpi-cmp.c
index 612198885..083edbf8a 100644
--- a/mpi/mpi-cmp.c
+++ b/mpi/mpi-cmp.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/mpi/mpi-div.c b/mpi/mpi-div.c
index a86df2daf..f29493e68 100644
--- a/mpi/mpi-div.c
+++ b/mpi/mpi-div.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/mpi-gcd.c b/mpi/mpi-gcd.c
index efd703b32..6f384cea7 100644
--- a/mpi/mpi-gcd.c
+++ b/mpi/mpi-gcd.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/mpi/mpi-inline.c b/mpi/mpi-inline.c
index 787d897dd..8e29b0615 100644
--- a/mpi/mpi-inline.c
+++ b/mpi/mpi-inline.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/mpi/mpi-inline.h b/mpi/mpi-inline.h
index d25230ff6..db2c6a970 100644
--- a/mpi/mpi-inline.h
+++ b/mpi/mpi-inline.h
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/mpi-internal.h b/mpi/mpi-internal.h
index a99558622..4676fcd59 100644
--- a/mpi/mpi-internal.h
+++ b/mpi/mpi-internal.h
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/mpi-inv.c b/mpi/mpi-inv.c
index 436d08533..bc4d589ff 100644
--- a/mpi/mpi-inv.c
+++ b/mpi/mpi-inv.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/mpi/mpi-mpow.c b/mpi/mpi-mpow.c
index 44d8e51fd..956d97077 100644
--- a/mpi/mpi-mpow.c
+++ b/mpi/mpi-mpow.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/mpi/mpi-mul.c b/mpi/mpi-mul.c
index 8748a3863..97e08ec83 100644
--- a/mpi/mpi-mul.c
+++ b/mpi/mpi-mul.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/mpi-pow.c b/mpi/mpi-pow.c
index 73d28970c..8fcce5c47 100644
--- a/mpi/mpi-pow.c
+++ b/mpi/mpi-pow.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/mpi-scan.c b/mpi/mpi-scan.c
index fe093adea..c76f4bb0a 100644
--- a/mpi/mpi-scan.c
+++ b/mpi/mpi-scan.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h> 
diff --git a/mpi/mpicoder.c b/mpi/mpicoder.c
index ab913861d..c0ae5f4be 100644
--- a/mpi/mpicoder.c
+++ b/mpi/mpicoder.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/mpi/mpih-cmp.c b/mpi/mpih-cmp.c
index 03d41557c..4c12c715a 100644
--- a/mpi/mpih-cmp.c
+++ b/mpi/mpih-cmp.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/mpih-div.c b/mpi/mpih-div.c
index cd772c0b5..1e962a158 100644
--- a/mpi/mpih-div.c
+++ b/mpi/mpih-div.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/mpih-mul.c b/mpi/mpih-mul.c
index db6c1aeb8..b35f4618b 100644
--- a/mpi/mpih-mul.c
+++ b/mpi/mpih-mul.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/mpiutil.c b/mpi/mpiutil.c
index 2fc9c0168..f0a0f69c0 100644
--- a/mpi/mpiutil.c
+++ b/mpi/mpiutil.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
  */
 
 #include <config.h>
diff --git a/mpi/pa7100/mpih-lshift.S b/mpi/pa7100/mpih-lshift.S
index 76368fe78..55b48faef 100644
--- a/mpi/pa7100/mpih-lshift.S
+++ b/mpi/pa7100/mpih-lshift.S
@@ -18,7 +18,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 
diff --git a/mpi/pa7100/mpih-rshift.S b/mpi/pa7100/mpih-rshift.S
index 3bada7ce9..81906f9f8 100644
--- a/mpi/pa7100/mpih-rshift.S
+++ b/mpi/pa7100/mpih-rshift.S
@@ -18,7 +18,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 
diff --git a/mpi/power/mpih-add1.S b/mpi/power/mpih-add1.S
index 7313ac618..ae8b1a60e 100644
--- a/mpi/power/mpih-add1.S
+++ b/mpi/power/mpih-add1.S
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include "sysdep.h"
diff --git a/mpi/power/mpih-lshift.S b/mpi/power/mpih-lshift.S
index 20cf45353..07eb929d1 100644
--- a/mpi/power/mpih-lshift.S
+++ b/mpi/power/mpih-lshift.S
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include "sysdep.h"
diff --git a/mpi/power/mpih-mul1.S b/mpi/power/mpih-mul1.S
index 03fff4f98..214dbce9c 100644
--- a/mpi/power/mpih-mul1.S
+++ b/mpi/power/mpih-mul1.S
@@ -17,7 +17,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include "sysdep.h"
diff --git a/mpi/power/mpih-mul2.S b/mpi/power/mpih-mul2.S
index 3d7fc153c..571d54e9e 100644
--- a/mpi/power/mpih-mul2.S
+++ b/mpi/power/mpih-mul2.S
@@ -17,7 +17,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include "sysdep.h"
diff --git a/mpi/power/mpih-mul3.S b/mpi/power/mpih-mul3.S
index f94018ca9..192c6f4c4 100644
--- a/mpi/power/mpih-mul3.S
+++ b/mpi/power/mpih-mul3.S
@@ -17,7 +17,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include "sysdep.h"
diff --git a/mpi/power/mpih-rshift.S b/mpi/power/mpih-rshift.S
index 04fb5942d..3214f869e 100644
--- a/mpi/power/mpih-rshift.S
+++ b/mpi/power/mpih-rshift.S
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include "sysdep.h"
diff --git a/mpi/power/mpih-sub1.S b/mpi/power/mpih-sub1.S
index 375a5be88..d7703ee9d 100644
--- a/mpi/power/mpih-sub1.S
+++ b/mpi/power/mpih-sub1.S
@@ -17,7 +17,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include "sysdep.h"
diff --git a/mpi/powerpc32/mpih-add1.S b/mpi/powerpc32/mpih-add1.S
index 81c4e20f7..d8f78da02 100644
--- a/mpi/powerpc32/mpih-add1.S
+++ b/mpi/powerpc32/mpih-add1.S
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include "sysdep.h"
@@ -78,8 +79,8 @@ Lend:	stw	7,4(3)		# store ultimate result limb
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.	*/
+   write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.	*/
 
 #include "sysdep.h"
 #include "asm-syntax.h"
diff --git a/mpi/powerpc32/mpih-lshift.S b/mpi/powerpc32/mpih-lshift.S
index 20ca7f922..4e5da5b7f 100644
--- a/mpi/powerpc32/mpih-lshift.S
+++ b/mpi/powerpc32/mpih-lshift.S
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include "sysdep.h"
@@ -90,8 +91,8 @@ Lend2:	slw	0,10,6
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.	*/
+   write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.	*/
 
 /* mp_limb_t mpn_lshift (mp_ptr wp, mp_srcptr up, mp_size_t usize,
 			unsigned int cnt)  */
diff --git a/mpi/powerpc32/mpih-mul1.S b/mpi/powerpc32/mpih-mul1.S
index b3cb62f3e..9f251f10c 100644
--- a/mpi/powerpc32/mpih-mul1.S
+++ b/mpi/powerpc32/mpih-mul1.S
@@ -18,7 +18,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include "sysdep.h"
@@ -88,8 +89,8 @@ Lend:	stw	7,4(3)
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.	*/
+   write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.	*/
 
 
 /* mp_limb_t mpn_mul_1 (mp_ptr res_ptr, mp_srcptr s1_ptr,
diff --git a/mpi/powerpc32/mpih-mul2.S b/mpi/powerpc32/mpih-mul2.S
index d3b39bc01..b562ea699 100644
--- a/mpi/powerpc32/mpih-mul2.S
+++ b/mpi/powerpc32/mpih-mul2.S
@@ -17,7 +17,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include "sysdep.h"
@@ -92,8 +93,8 @@ Lend:	stw	8,4(3)
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.	*/
+   write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.	*/
 
 
 /* mp_limb_t mpn_addmul_1 (mp_ptr res_ptr, mp_srcptr s1_ptr,
diff --git a/mpi/powerpc32/mpih-mul3.S b/mpi/powerpc32/mpih-mul3.S
index d84f853ba..3b813f9f2 100644
--- a/mpi/powerpc32/mpih-mul3.S
+++ b/mpi/powerpc32/mpih-mul3.S
@@ -17,7 +17,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include "sysdep.h"
@@ -93,8 +94,8 @@ Lend:	stw	8,4(3)
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.	*/
+   write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.	*/
 
 /* mp_limb_t mpn_submul_1 (mp_ptr res_ptr, mp_srcptr s1_ptr,
 			   mp_size_t s1_size, mp_limb_t s2_limb)
diff --git a/mpi/powerpc32/mpih-rshift.S b/mpi/powerpc32/mpih-rshift.S
index e9704db93..4a826b41a 100644
--- a/mpi/powerpc32/mpih-rshift.S
+++ b/mpi/powerpc32/mpih-rshift.S
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 
@@ -89,8 +90,8 @@ Lend2:	srw	0,10,6
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.	*/
+   write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.	*/
 
 
 /* INPUT PARAMETERS
diff --git a/mpi/powerpc32/mpih-sub1.S b/mpi/powerpc32/mpih-sub1.S
index 8c67d988f..89028649a 100644
--- a/mpi/powerpc32/mpih-sub1.S
+++ b/mpi/powerpc32/mpih-sub1.S
@@ -17,7 +17,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include "sysdep.h"
@@ -79,8 +80,8 @@ Lend:	stw	7,4(3)		# store ultimate result limb
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.	*/
+   write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.	*/
 
 /* mp_limb_t mpn_sub_n (mp_ptr res_ptr, mp_srcptr s1_ptr, mp_srcptr s2_ptr,
 			mp_size_t size)
diff --git a/mpi/powerpc32/syntax.h b/mpi/powerpc32/syntax.h
index 19f797273..64d9c8611 100644
--- a/mpi/powerpc32/syntax.h
+++ b/mpi/powerpc32/syntax.h
@@ -16,8 +16,8 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.	*/
+   write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.	*/
 
 
 #define USE_PPC_PATCHES 1
diff --git a/mpi/sparc32/mpih-add1.S b/mpi/sparc32/mpih-add1.S
index b8faadb5f..8cd6db628 100644
--- a/mpi/sparc32/mpih-add1.S
+++ b/mpi/sparc32/mpih-add1.S
@@ -18,7 +18,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 
diff --git a/mpi/sparc32/mpih-lshift.S b/mpi/sparc32/mpih-lshift.S
index b217d5e62..2099574ff 100644
--- a/mpi/sparc32/mpih-lshift.S
+++ b/mpi/sparc32/mpih-lshift.S
@@ -17,7 +17,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 
diff --git a/mpi/sparc32/mpih-rshift.S b/mpi/sparc32/mpih-rshift.S
index 62902cbe3..b20dba92a 100644
--- a/mpi/sparc32/mpih-rshift.S
+++ b/mpi/sparc32/mpih-rshift.S
@@ -17,7 +17,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 ! INPUT PARAMETERS
diff --git a/mpi/sparc32/udiv.S b/mpi/sparc32/udiv.S
index 752d07193..e4028a61d 100644
--- a/mpi/sparc32/udiv.S
+++ b/mpi/sparc32/udiv.S
@@ -18,7 +18,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/sparc32v8/mpih-mul1.S b/mpi/sparc32v8/mpih-mul1.S
index 551450060..52c911aa8 100644
--- a/mpi/sparc32v8/mpih-mul1.S
+++ b/mpi/sparc32v8/mpih-mul1.S
@@ -18,7 +18,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/sparc32v8/mpih-mul2.S b/mpi/sparc32v8/mpih-mul2.S
index 55f37814b..641b76ade 100644
--- a/mpi/sparc32v8/mpih-mul2.S
+++ b/mpi/sparc32v8/mpih-mul2.S
@@ -18,7 +18,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/sparc32v8/mpih-mul3.S b/mpi/sparc32v8/mpih-mul3.S
index cfd0a1576..b11e05a14 100644
--- a/mpi/sparc32v8/mpih-mul3.S
+++ b/mpi/sparc32v8/mpih-mul3.S
@@ -18,7 +18,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/supersparc/udiv.S b/mpi/supersparc/udiv.S
index 31b7387c7..9a1234806 100644
--- a/mpi/supersparc/udiv.S
+++ b/mpi/supersparc/udiv.S
@@ -19,7 +19,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/po/ChangeLog b/po/ChangeLog
index 1b2d03adc..ebc243e71 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,10 @@
+2005-05-31  Werner Koch  <[email protected]>
+
+o	* zh_TW.po, zh_CN.po, es.po, ro.po: Updated.
+
+	* tr.po: Updated from TP.  Note: this is an exception in general
+	translations from the Robot are not anymore accepted.
+
 2005-03-30  Werner Koch  <[email protected]>
 
 	* de.po: Fixed typo in "|AN|New Admin PIN"; the leading bar was
@@ -570,7 +577,8 @@ Fri Mar 13 09:43:19 1998  Werner Koch  ([email protected])
 
 
 
- Copyright 1998, 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
+ Copyright 1998, 1999, 2000, 2001, 2004,
+	   2005 Free Software Foundation, Inc.
 
  This file is free software; as a special exception the author gives
  unlimited permission to copy and/or distribute it, with or without
diff --git a/po/be.po b/po/be.po
index ee3346ba4..92ee32892 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: 2005-03-15 16:35+0100\n"
+"POT-Creation-Date: 2005-05-31 10:05+0200\n"
 "PO-Revision-Date: 2003-10-30 16:35+0200\n"
 "Last-Translator: Ales Nyakhaychyk <[email protected]>\n"
 "Language-Team: Belarusian <[email protected]>\n"
@@ -15,80 +15,80 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: cipher/primegen.c:120
+#: cipher/primegen.c:121
 #, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr ""
 
-#: cipher/primegen.c:311
+#: cipher/primegen.c:312
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr ""
 
-#: cipher/random.c:163
+#: cipher/random.c:164
 msgid "no entropy gathering module detected\n"
 msgstr ""
 
-#: cipher/random.c:387 g10/card-util.c:656 g10/card-util.c:725
-#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2255
-#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
-#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
-#: g10/tdbio.c:600
+#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
+#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
+#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
+#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
+#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/tdbio.c:601
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr ""
 
-#: cipher/random.c:391
+#: cipher/random.c:392
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr ""
 
-#: cipher/random.c:396
+#: cipher/random.c:397
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:401
+#: cipher/random.c:402
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:407
+#: cipher/random.c:408
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 
-#: cipher/random.c:415
+#: cipher/random.c:416
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr ""
 
-#: cipher/random.c:453
+#: cipher/random.c:454
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2723
-#: g10/keygen.c:2753 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
-#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr ""
 
-#: cipher/random.c:480
+#: cipher/random.c:481
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr ""
 
-#: cipher/random.c:483
+#: cipher/random.c:484
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr ""
 
-#: cipher/random.c:728
+#: cipher/random.c:729
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 
-#: cipher/random.c:729
+#: cipher/random.c:730
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -97,14 +97,14 @@ msgid ""
 "\n"
 msgstr ""
 
-#: cipher/rndegd.c:204
+#: cipher/rndegd.c:205
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
 "of the entropy.\n"
 msgstr ""
 
-#: cipher/rndlinux.c:134
+#: cipher/rndlinux.c:135
 #, c-format
 msgid ""
 "\n"
@@ -112,45 +112,62 @@ msgid ""
 "the OS a chance to collect more entropy! (Need %d more bytes)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:547
+#: g10/app-openpgp.c:596
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:560
+#: g10/app-openpgp.c:609
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
+#: g10/app-openpgp.c:977
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "грамадскі ключ ня знойдзены"
+
+#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+msgid "response does not contain the public key data\n"
+msgstr ""
+
+#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
-#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
+#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
+#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/app-openpgp.c:836
+#: g10/app-openpgp.c:1310
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:857
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:862
+#: g10/app-openpgp.c:1336
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -158,343 +175,349 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:869
+#: g10/app-openpgp.c:1343
 msgid "|A|Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1018
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:1492
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1018
+#: g10/app-openpgp.c:1492
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1022
+#: g10/app-openpgp.c:1496
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
+#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
 msgid "error reading application data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
+#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/app-openpgp.c:1104
+#: g10/app-openpgp.c:1562
 #, fuzzy
 msgid "key already exists\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/app-openpgp.c:1108
+#: g10/app-openpgp.c:1566
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1110
+#: g10/app-openpgp.c:1568
 #, fuzzy
 msgid "generating new key\n"
 msgstr "стварыць новую пару ключоў"
 
-#: g10/app-openpgp.c:1120
-msgid "please wait while key is being generated ...\n"
+#: g10/app-openpgp.c:1735
+msgid "creation timestamp missing\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1135
-#, fuzzy
-msgid "generating key failed\n"
-msgstr "стварыць новую пару ключоў"
+#: g10/app-openpgp.c:1742
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1749
 #, c-format
-msgid "key generation completed (%d seconds)\n"
+msgid "RSA public exponent missing or largerr than %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
-msgid "response does not contain the public key data\n"
+#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
-msgid "response does not contain the RSA modulus\n"
+#: g10/app-openpgp.c:1827
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
+
+#: g10/app-openpgp.c:1886
+msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
-msgid "response does not contain the RSA public exponent\n"
+#: g10/app-openpgp.c:1901
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "стварыць новую пару ключоў"
+
+#: g10/app-openpgp.c:1904
+#, c-format
+msgid "key generation completed (%d seconds)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1195
+#: g10/app-openpgp.c:1961
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1356
+#: g10/app-openpgp.c:2130
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1364
+#: g10/app-openpgp.c:2138
 #, c-format
-msgid "PIN [sigs done: %lu]"
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
-#, c-format
-msgid "can't access %s - invalid OpenPGP card?\n"
+#: g10/app-openpgp.c:2399
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1731
-#, fuzzy, c-format
-msgid "error getting serial number: %s\n"
-msgstr "памылка стварэньня \"%s\": %s\n"
-
-#: g10/app-openpgp.c:1826
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
-
-#: g10/app-openpgp.c:1868
-msgid "reading the key failed\n"
+#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
+#, c-format
+msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
 
-#: g10/armor.c:317
+#: g10/armor.c:318
 #, c-format
 msgid "armor: %s\n"
 msgstr ""
 
-#: g10/armor.c:346
+#: g10/armor.c:347
 msgid "invalid armor header: "
 msgstr ""
 
-#: g10/armor.c:353
+#: g10/armor.c:354
 msgid "armor header: "
 msgstr ""
 
-#: g10/armor.c:364
+#: g10/armor.c:365
 msgid "invalid clearsig header\n"
 msgstr ""
 
-#: g10/armor.c:416
+#: g10/armor.c:417
 msgid "nested clear text signatures\n"
 msgstr ""
 
-#: g10/armor.c:551
+#: g10/armor.c:552
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "нечаканыя даньні"
 
-#: g10/armor.c:563
+#: g10/armor.c:564
 msgid "invalid dash escaped line: "
 msgstr ""
 
-#: g10/armor.c:715 g10/armor.c:1322
+#: g10/armor.c:716 g10/armor.c:1323
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr ""
 
-#: g10/armor.c:758
+#: g10/armor.c:759
 msgid "premature eof (no CRC)\n"
 msgstr ""
 
-#: g10/armor.c:792
+#: g10/armor.c:793
 msgid "premature eof (in CRC)\n"
 msgstr ""
 
-#: g10/armor.c:800
+#: g10/armor.c:801
 msgid "malformed CRC\n"
 msgstr ""
 
-#: g10/armor.c:804 g10/armor.c:1359
+#: g10/armor.c:805 g10/armor.c:1360
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "памылка CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:824
+#: g10/armor.c:825
 msgid "premature eof (in trailer)\n"
 msgstr ""
 
-#: g10/armor.c:828
+#: g10/armor.c:829
 msgid "error in trailer line\n"
 msgstr ""
 
-#: g10/armor.c:1137
+#: g10/armor.c:1138
 msgid "no valid OpenPGP data found.\n"
 msgstr ""
 
-#: g10/armor.c:1142
+#: g10/armor.c:1143
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr ""
 
-#: g10/armor.c:1146
+#: g10/armor.c:1147
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 
-#: g10/card-util.c:58 g10/card-util.c:295
+#: g10/card-util.c:63 g10/card-util.c:303
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/card-util.c:63
+#: g10/card-util.c:68
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1329 g10/delkey.c:127 g10/keyedit.c:1430
-#: g10/keygen.c:2439 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1510
+#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
 msgid "can't do this in batch mode\n"
 msgstr ""
 
-#: g10/card-util.c:97 g10/card-util.c:1108 g10/card-util.c:1191
-#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
-#: g10/keygen.c:1365
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
+#: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr ""
 
-#: g10/card-util.c:206 g10/card-util.c:256
+#: g10/card-util.c:213 g10/card-util.c:263
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:391
+#: g10/card-util.c:410
 msgid "male"
 msgstr ""
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 msgid "female"
 msgstr ""
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 msgid "unspecified"
 msgstr ""
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 #, fuzzy
 msgid "not forced"
 msgstr "непадтрымліваецца"
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:497
+#: g10/card-util.c:516
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:499
+#: g10/card-util.c:518
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:501
+#: g10/card-util.c:520
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:518
+#: g10/card-util.c:537
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:539
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:538
+#: g10/card-util.c:557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:559
+#: g10/card-util.c:578
 msgid "URL to retrieve public key: "
 msgstr ""
 
-#: g10/card-util.c:567
+#: g10/card-util.c:586
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:665 g10/card-util.c:734 g10/import.c:261
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr ""
 
-#: g10/card-util.c:673
+#: g10/card-util.c:692
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:683
+#: g10/card-util.c:702
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:742
+#: g10/card-util.c:761
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:752
+#: g10/card-util.c:771
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:772
+#: g10/card-util.c:791
 #, fuzzy
 msgid "Language preferences: "
 msgstr "за шмат пераваг для \"%c\"\n"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:799
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:808
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:829
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:824
+#: g10/card-util.c:843
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:845
+#: g10/card-util.c:864
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:868
+#: g10/card-util.c:887
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:916
+#: g10/card-util.c:935
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/card-util.c:917
+#: g10/card-util.c:936
 msgid "not an OpenPGP card"
 msgstr ""
 
-#: g10/card-util.c:926
+#: g10/card-util.c:945
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1030
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1030 g10/card-util.c:1039
+#: g10/card-util.c:1051 g10/card-util.c:1060
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1051
+#: g10/card-util.c:1072
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1060
+#: g10/card-util.c:1081
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -502,395 +525,399 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1099
+#: g10/card-util.c:1120
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/card-util.c:1101 g10/card-util.c:1182
+#: g10/card-util.c:1122 g10/card-util.c:1203
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/card-util.c:1102 g10/card-util.c:1184
+#: g10/card-util.c:1123 g10/card-util.c:1205
 msgid "   (2) Encryption key\n"
 msgstr ""
 
-#: g10/card-util.c:1103 g10/card-util.c:1186
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1119 g10/card-util.c:1202 g10/keyedit.c:908
-#: g10/keygen.c:1404 g10/revoke.c:642
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
+#: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr ""
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1200
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/card-util.c:1214
+#: g10/card-util.c:1235
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "невядомы альгарытм сьцісканьня"
 
-#: g10/card-util.c:1219
+#: g10/card-util.c:1240
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/card-util.c:1224
+#: g10/card-util.c:1245
 msgid "secret key already stored on a card\n"
 msgstr ""
 
-#: g10/card-util.c:1294 g10/keyedit.c:1317
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr ""
 
-#: g10/card-util.c:1296
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "show admin commands"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1297 g10/keyedit.c:1320
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "паказаць гэтую даведку"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "list all available data"
 msgstr "Даведка адсутнічае"
 
-#: g10/card-util.c:1302
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1303
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1304
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1305
+#: g10/card-util.c:1327
 msgid "change the login name"
 msgstr ""
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the language preferences"
 msgstr "за шмат пераваг для \"%c\"\n"
 
-#: g10/card-util.c:1307
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1308
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1310
+#: g10/card-util.c:1332
 #, fuzzy
 msgid "generate new keys"
 msgstr "стварыць новую пару ключоў"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1377 g10/keyedit.c:1526
+#: g10/card-util.c:1334
+msgid "verify the PIN and list all data"
+msgstr ""
+
+#: g10/card-util.c:1454 g10/keyedit.c:1609
 msgid "Command> "
 msgstr "Загад> "
 
-#: g10/card-util.c:1412
+#: g10/card-util.c:1492
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1430
+#: g10/card-util.c:1525
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/card-util.c:1499 g10/keyedit.c:2104
+#: g10/card-util.c:1599 g10/keyedit.c:2210
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Нерэчаісны загад (паспрабуйце \"help\")\n"
 
-#: g10/cardglue.c:287
+#: g10/cardglue.c:396
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:519
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:380
+#: g10/cardglue.c:527
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:852
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:853
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:854
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:691
+#: g10/cardglue.c:855
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:705
+#: g10/cardglue.c:872
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Паўтарыце пароль: "
 
-#: g10/cardglue.c:719
+#: g10/cardglue.c:886
 msgid "PIN not correctly repeated; try again"
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
-#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "немагчыма адкрыць \"%s\"\n"
 
-#: g10/decrypt.c:104 g10/encode.c:859
+#: g10/decrypt.c:105 g10/encode.c:846
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3167 g10/keyserver.c:1511
-#: g10/revoke.c:226
+#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3346 g10/keyserver.c:1541
+#: g10/revoke.c:227
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2300 g10/keyserver.c:1525
-#: g10/revoke.c:232 g10/revoke.c:439
+#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr ""
 
-#: g10/delkey.c:128 g10/delkey.c:135
+#: g10/delkey.c:129 g10/delkey.c:136
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr ""
 
-#: g10/delkey.c:134
+#: g10/delkey.c:135
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr ""
 
-#: g10/delkey.c:146
+#: g10/delkey.c:147
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
 
-#: g10/delkey.c:154
+#: g10/delkey.c:155
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr ""
 
-#: g10/delkey.c:164
+#: g10/delkey.c:165
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr ""
 
-#: g10/delkey.c:174
+#: g10/delkey.c:175
 msgid "ownertrust information cleared\n"
 msgstr ""
 
-#: g10/delkey.c:205
+#: g10/delkey.c:206
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr ""
 
-#: g10/delkey.c:207
+#: g10/delkey.c:208
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 
-#: g10/encode.c:210 g10/sign.c:1186
+#: g10/encode.c:211 g10/sign.c:1218
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr ""
 
-#: g10/encode.c:215
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 
-#: g10/encode.c:228
+#: g10/encode.c:229
 #, fuzzy, c-format
 msgid "using cipher %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/encode.c:238 g10/encode.c:558
+#: g10/encode.c:239 g10/encode.c:545
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr ""
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
+#: g10/encode.c:302 g10/encode.c:591 g10/sign.c:566
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr ""
 
-#: g10/encode.c:472
+#: g10/encode.c:466
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 
-#: g10/encode.c:494
+#: g10/encode.c:488
 #, c-format
 msgid "reading from `%s'\n"
 msgstr ""
 
-#: g10/encode.c:530
+#: g10/encode.c:517
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 
-#: g10/encode.c:540
+#: g10/encode.c:527
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:635 g10/sign.c:899
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr ""
 
-#: g10/encode.c:735
+#: g10/encode.c:722
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:805 g10/pkclist.c:721 g10/pkclist.c:757
+#: g10/encode.c:792 g10/pkclist.c:722 g10/pkclist.c:758
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr ""
 
-#: g10/encode.c:832
+#: g10/encode.c:819
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr ""
 
-#: g10/encr-data.c:66 g10/mainproc.c:301
+#: g10/encr-data.c:67 g10/mainproc.c:302
 #, c-format
 msgid "%s encrypted data\n"
 msgstr ""
 
-#: g10/encr-data.c:68 g10/mainproc.c:305
+#: g10/encr-data.c:69 g10/mainproc.c:306
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr ""
 
-#: g10/encr-data.c:92
+#: g10/encr-data.c:93
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 
-#: g10/encr-data.c:103
+#: g10/encr-data.c:104
 msgid "problem handling encrypted packet\n"
 msgstr ""
 
-#: g10/exec.c:48
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr ""
 
-#: g10/exec.c:184 g10/openfile.c:406
+#: g10/exec.c:173 g10/openfile.c:410
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/exec.c:325
+#: g10/exec.c:314
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 
-#: g10/exec.c:355
+#: g10/exec.c:344
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 
-#: g10/exec.c:433
+#: g10/exec.c:422
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: g10/exec.c:436
+#: g10/exec.c:425
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: g10/exec.c:521
+#: g10/exec.c:510
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr ""
 
-#: g10/exec.c:532 g10/exec.c:598
+#: g10/exec.c:521 g10/exec.c:587
 msgid "unnatural exit of external program\n"
 msgstr ""
 
-#: g10/exec.c:547
+#: g10/exec.c:536
 msgid "unable to execute external program\n"
 msgstr ""
 
-#: g10/exec.c:563
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr ""
 
-#: g10/exec.c:609 g10/exec.c:616
+#: g10/exec.c:598 g10/exec.c:605
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr ""
 
-#: g10/exec.c:621
+#: g10/exec.c:610
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr ""
 
-#: g10/export.c:183
+#: g10/export.c:184
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/export.c:212
+#: g10/export.c:213
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "Ключ абаронены.\n"
 
-#: g10/export.c:220
+#: g10/export.c:221
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr ""
 
-#: g10/export.c:395
+#: g10/export.c:398
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:427
+#: g10/export.c:430
 msgid "WARNING: nothing exported\n"
 msgstr ""
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid ""
 "@Commands:\n"
 " "
@@ -898,128 +925,128 @@ msgstr ""
 "@Загады:\n"
 " "
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "|[file]|make a signature"
 msgstr "|[файл]|зрабіць подпіс"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "|[file]|make a clear text signature"
 msgstr "|[файл]|зрабіць чысты тэкставы подпіс"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "make a detached signature"
 msgstr "зрабіць адчэплены подпіс"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encrypt data"
 msgstr "зашыфраваць даньні"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "encryption only with symmetric cipher"
 msgstr "шыфраваньне толькі сымэтрычнымі шыфрамі"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "decrypt data (default)"
 msgstr "разшыфраваць даньні (дапомна)"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "verify a signature"
 msgstr "праверыць подпіс"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys"
 msgstr "паказаць сьпіс ключоў"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and signatures"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "праверыць подпісы ключа"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "list keys and fingerprints"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "list secret keys"
 msgstr "паказаць сакрэтныя ключы"
 
-#: g10/g10.c:379
+#: g10/g10.c:381
 msgid "generate a new key pair"
 msgstr "стварыць новую пару ключоў"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the public keyring"
 msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "remove keys from the secret keyring"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign a key"
 msgstr "падпісаць ключ"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "sign a key locally"
 msgstr "падпісаць ключ толькі мясцова"
 
-#: g10/g10.c:385
+#: g10/g10.c:387
 msgid "sign or edit a key"
 msgstr "падпісаць ці рэдагаваць ключ"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "generate a revocation certificate"
 msgstr ""
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "export keys"
 msgstr "экспарт ключоў"
 
-#: g10/g10.c:389
+#: g10/g10.c:391
 msgid "export keys to a key server"
 msgstr "экспартаваць ключы на паслужнік ключоў"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "import keys from a key server"
 msgstr "імпартаваць ключы з паслужніка ключоў"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "search for keys on a key server"
 msgstr ""
 
-#: g10/g10.c:394
+#: g10/g10.c:396
 msgid "update all keys from a keyserver"
 msgstr "абнавіць усе ключы з паслужніка ключоў"
 
-#: g10/g10.c:397
+#: g10/g10.c:399
 msgid "import/merge keys"
 msgstr "імпартаваць/аб'яднаць ключы"
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "print the card status"
 msgstr ""
 
-#: g10/g10.c:401
+#: g10/g10.c:403
 msgid "change data on a card"
 msgstr ""
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/g10.c:410
+#: g10/g10.c:412
 msgid "update the trust database"
 msgstr ""
 
-#: g10/g10.c:417
+#: g10/g10.c:419
 msgid "|algo [files]|print message digests"
 msgstr ""
 
-#: g10/g10.c:421 g10/gpgv.c:66
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1029,51 +1056,51 @@ msgstr ""
 "Выбары:\n"
 " "
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "create ascii armored output"
 msgstr ""
 
-#: g10/g10.c:425
+#: g10/g10.c:427
 msgid "|NAME|encrypt for NAME"
 msgstr "|ІМЯ|   зашыфраваць для вылучанай асобы"
 
-#: g10/g10.c:436
+#: g10/g10.c:438
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 
-#: g10/g10.c:437
+#: g10/g10.c:439
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "use canonical text mode"
 msgstr ""
 
-#: g10/g10.c:452
+#: g10/g10.c:458
 msgid "use as output file"
 msgstr "выкарыстоўваць у якасьці файла вываду"
 
-#: g10/g10.c:454 g10/gpgv.c:68
+#: g10/g10.c:460 g10/gpgv.c:73
 msgid "verbose"
 msgstr "шматслоўнасьць"
 
-#: g10/g10.c:465
+#: g10/g10.c:471
 msgid "do not make any changes"
 msgstr "не рабіць ніякіх зьменаў"
 
-#: g10/g10.c:466
+#: g10/g10.c:472
 msgid "prompt before overwriting"
 msgstr "пытацца перад перазапісам"
 
-#: g10/g10.c:507
+#: g10/g10.c:513
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:508
+#: g10/g10.c:514
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:536
+#: g10/g10.c:542
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1081,7 +1108,7 @@ msgstr ""
 "@\n"
 "(Глядзіце man старонку, для больш поўнага апісаньня ўсіх загадаў і выбараў)\n"
 
-#: g10/g10.c:539
+#: g10/g10.c:545
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1101,15 +1128,15 @@ msgstr ""
 " --list-keys [назвы]        паказаць ключы\n"
 " --fingerprint [назвы]      паказаць адбіткі пальцаў\n"
 
-#: g10/g10.c:720 g10/gpgv.c:93
+#: g10/g10.c:724 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Калі ласка, паведамляйце пра памылкі на <[email protected]>.\n"
 
-#: g10/g10.c:737
+#: g10/g10.c:741
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: g10/g10.c:740
+#: g10/g10.c:744
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1119,7 +1146,7 @@ msgstr ""
 "sign, check, encrypt ці decrypt\n"
 "Дапомнае дзеяньне залежыць ад уваходных даньняў\n"
 
-#: g10/g10.c:751
+#: g10/g10.c:755
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1127,542 +1154,556 @@ msgstr ""
 "\n"
 "Альгарытмы, якія падтрымліваюцца:\n"
 
-#: g10/g10.c:754
+#: g10/g10.c:758
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/g10.c:760 g10/keyedit.c:2141
+#: g10/g10.c:764 g10/keyedit.c:2248
 msgid "Cipher: "
 msgstr ""
 
-#: g10/g10.c:766
+#: g10/g10.c:770
 msgid "Hash: "
 msgstr ""
 
-#: g10/g10.c:772 g10/keyedit.c:2187
+#: g10/g10.c:776 g10/keyedit.c:2294
 msgid "Compression: "
 msgstr ""
 
-#: g10/g10.c:855
+#: g10/g10.c:859
 msgid "usage: gpg [options] "
 msgstr "Выкарыстаньне: gpg [выбары] "
 
-#: g10/g10.c:1003
+#: g10/g10.c:1007
 msgid "conflicting commands\n"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/g10.c:1021
+#: g10/g10.c:1025
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1218
+#: g10/g10.c:1222
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1221
+#: g10/g10.c:1225
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1224
+#: g10/g10.c:1228
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1230
+#: g10/g10.c:1234
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1233
+#: g10/g10.c:1237
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1236
+#: g10/g10.c:1240
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1242
+#: g10/g10.c:1246
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1245
+#: g10/g10.c:1249
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1248
+#: g10/g10.c:1252
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1254
+#: g10/g10.c:1258
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1257
+#: g10/g10.c:1261
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1260
+#: g10/g10.c:1264
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1401
+#: g10/g10.c:1405
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1802
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr ""
 
-#: g10/g10.c:1838
+#: g10/g10.c:1844
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1842
+#: g10/g10.c:1848
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr ""
 
-#: g10/g10.c:1849
+#: g10/g10.c:1855
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr ""
 
-#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/g10.c:2076
+#: g10/g10.c:2082
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/g10.c:2293
+#: g10/g10.c:2236 g10/g10.c:2248
+#, fuzzy, c-format
+msgid "`%s' is not a valid signature expiration\n"
+msgstr "%s - гэта недапушчальнае мноства знакаў\n"
+
+#: g10/g10.c:2321
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3683
+#: g10/g10.c:2340 g10/keyedit.c:3862
 msgid "could not parse keyserver URL\n"
 msgstr ""
 
-#: g10/g10.c:2318
+#: g10/g10.c:2346
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2349
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2356
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2359
 msgid "invalid import options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2366
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2369
 msgid "invalid export options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2376
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2379
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2401
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2404
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2411
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:2573
+#: g10/g10.c:2602
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/g10.c:2577
+#: g10/g10.c:2606
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:2586
+#: g10/g10.c:2615
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не дазваляецца разам з %s!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2618
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/g10.c:2603
+#: g10/g10.c:2625
+#, c-format
+msgid "NOTE: %s is not available in this version\n"
+msgstr ""
+
+#: g10/g10.c:2640
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "запіс у stdout\n"
 
-#: g10/g10.c:2617
+#: g10/g10.c:2654
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:2623
+#: g10/g10.c:2660
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:2629
+#: g10/g10.c:2666
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:2642
+#: g10/g10.c:2679
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/g10.c:2712 g10/g10.c:2736
+#: g10/g10.c:2746 g10/g10.c:2770
 msgid "selected cipher algorithm is invalid\n"
 msgstr ""
 
-#: g10/g10.c:2718 g10/g10.c:2742
+#: g10/g10.c:2752 g10/g10.c:2776
 msgid "selected digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/g10.c:2724
+#: g10/g10.c:2758
 msgid "selected compression algorithm is invalid\n"
 msgstr ""
 
-#: g10/g10.c:2730
+#: g10/g10.c:2764
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/g10.c:2745
+#: g10/g10.c:2779
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/g10.c:2747
+#: g10/g10.c:2781
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/g10.c:2749
+#: g10/g10.c:2783
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:2751
+#: g10/g10.c:2785
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 
-#: g10/g10.c:2753
+#: g10/g10.c:2787
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 
-#: g10/g10.c:2756
+#: g10/g10.c:2790
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 
-#: g10/g10.c:2760
+#: g10/g10.c:2794
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr ""
 
-#: g10/g10.c:2767
+#: g10/g10.c:2801
 msgid "invalid default preferences\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/g10.c:2776
+#: g10/g10.c:2810
 msgid "invalid personal cipher preferences\n"
 msgstr ""
 
-#: g10/g10.c:2780
+#: g10/g10.c:2814
 msgid "invalid personal digest preferences\n"
 msgstr ""
 
-#: g10/g10.c:2784
+#: g10/g10.c:2818
 msgid "invalid personal compress preferences\n"
 msgstr ""
 
-#: g10/g10.c:2817
+#: g10/g10.c:2851
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/g10.c:2864
+#: g10/g10.c:2898
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2869
+#: g10/g10.c:2903
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2874
+#: g10/g10.c:2908
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2970
+#: g10/g10.c:3004
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr ""
 
-#: g10/g10.c:2981
+#: g10/g10.c:3015
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/g10.c:2992
+#: g10/g10.c:3026
 msgid "--store [filename]"
 msgstr "--store [назва_файла]"
 
-#: g10/g10.c:2999
+#: g10/g10.c:3033
 msgid "--symmetric [filename]"
 msgstr "--symmetric [назва_файла]"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3035
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/g10.c:3011
+#: g10/g10.c:3045
 msgid "--encrypt [filename]"
 msgstr "--encrypt [назва_файла]"
 
-#: g10/g10.c:3024
+#: g10/g10.c:3058
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3060
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3029
+#: g10/g10.c:3063
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:3047
+#: g10/g10.c:3081
 msgid "--sign [filename]"
 msgstr "--sign [назва_файла]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3094
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/g10.c:3075
+#: g10/g10.c:3109
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/g10.c:3077
+#: g10/g10.c:3111
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3080
+#: g10/g10.c:3114
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:3100
+#: g10/g10.c:3134
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [назва_файла]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3143
 msgid "--clearsign [filename]"
 msgstr "--clearsign [назва_файла]"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3168
 msgid "--decrypt [filename]"
 msgstr "--decrypt [назва_файла]"
 
-#: g10/g10.c:3142
+#: g10/g10.c:3176
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:3146
+#: g10/g10.c:3180
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:3167
+#: g10/g10.c:3201
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [загады]"
 
-#: g10/g10.c:3238
+#: g10/g10.c:3272
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr ""
 
-#: g10/g10.c:3275
+#: g10/g10.c:3309
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/g10.c:3277
+#: g10/g10.c:3311
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3313
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/g10.c:3290
+#: g10/g10.c:3324
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/g10.c:3300
+#: g10/g10.c:3334
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/g10.c:3341
+#: g10/g10.c:3375
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr ""
 
-#: g10/g10.c:3349
+#: g10/g10.c:3383
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr ""
 
-#: g10/g10.c:3436
+#: g10/g10.c:3470
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/g10.c:3559
+#: g10/g10.c:3593
 msgid "[filename]"
 msgstr "[назва_файла]"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3597
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/g10.c:3853
+#: g10/g10.c:3887
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
 
-#: g10/g10.c:3861
+#: g10/g10.c:3895
 msgid "a user notation name must contain the '@' character\n"
 msgstr ""
 
-#: g10/g10.c:3871
+#: g10/g10.c:3900
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr ""
+
+#: g10/g10.c:3911
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 
-#: g10/g10.c:3905
+#: g10/g10.c:3945
 msgid "the given certification policy URL is invalid\n"
 msgstr ""
 
-#: g10/g10.c:3907
+#: g10/g10.c:3947
 msgid "the given signature policy URL is invalid\n"
 msgstr ""
 
-#: g10/g10.c:3940
+#: g10/g10.c:3980
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr ""
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:186 g10/getkey.c:2750
+#: g10/getkey.c:187 g10/getkey.c:2757
 msgid "[User ID not found]"
 msgstr ""
 
-#: g10/getkey.c:1677
+#: g10/getkey.c:1684
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2228
+#: g10/getkey.c:2235
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 
-#: g10/getkey.c:2459
+#: g10/getkey.c:2466
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/getkey.c:2506
+#: g10/getkey.c:2513
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:74
 msgid "be somewhat more quiet"
 msgstr "працаваць менш шматслоўна"
 
-#: g10/gpgv.c:70
+#: g10/gpgv.c:75
 #, fuzzy
 msgid "take the keys from this keyring"
 msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:77
 msgid "make timestamp conflicts only a warning"
 msgstr ""
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:78
 msgid "|FD|write status info to this FD"
 msgstr ""
 
-#: g10/gpgv.c:97
+#: g10/gpgv.c:102
 #, fuzzy
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:105
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
 
-#: g10/helptext.c:48
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
 "to do with the (implicitly created) web-of-certificates."
 msgstr ""
 
-#: g10/helptext.c:54
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1670,16 +1711,16 @@ msgid ""
 "ultimately trusted\n"
 msgstr ""
 
-#: g10/helptext.c:61
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 
-#: g10/helptext.c:65
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr ""
 
-#: g10/helptext.c:69
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1693,23 +1734,23 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:83
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
 "Please consult your security expert first."
 msgstr ""
 
-#: g10/helptext.c:90
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr ""
 
-#: g10/helptext.c:94 g10/helptext.c:99 g10/helptext.c:111 g10/helptext.c:143
-#: g10/helptext.c:171 g10/helptext.c:176 g10/helptext.c:181
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr ""
 
-#: g10/helptext.c:104
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1717,19 +1758,19 @@ msgid ""
 "the given value as an interval."
 msgstr ""
 
-#: g10/helptext.c:116
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr ""
 
-#: g10/helptext.c:121
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr ""
 
-#: g10/helptext.c:125
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr ""
 
-#: g10/helptext.c:130
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1738,11 +1779,11 @@ msgid ""
 "Q  to to quit the key generation."
 msgstr ""
 
-#: g10/helptext.c:139
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr ""
 
-#: g10/helptext.c:147
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -1783,28 +1824,28 @@ msgid ""
 "If you don't know what the right answer is, answer \"0\"."
 msgstr ""
 
-#: g10/helptext.c:185
+#: g10/helptext.c:186
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr ""
 
-#: g10/helptext.c:189
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
 msgstr ""
 
-#: g10/helptext.c:194
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr ""
 
-#: g10/helptext.c:199
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
 "trust connection to the key or another key certified by this key."
 msgstr ""
 
-#: g10/helptext.c:204
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -1812,13 +1853,13 @@ msgid ""
 "a trust connection through another already certified key."
 msgstr ""
 
-#: g10/helptext.c:210
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr ""
 
-#: g10/helptext.c:214
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -1827,36 +1868,36 @@ msgid ""
 "a second one is available."
 msgstr ""
 
-#: g10/helptext.c:222
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
 "self-signatures will be advanced by one second.\n"
 msgstr ""
 
-#: g10/helptext.c:229
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr ""
 
-#: g10/helptext.c:235
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 
-#: g10/helptext.c:239
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr ""
 
-#: g10/helptext.c:244
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Адкажыце \"так\", калі Вы згодны з перазапісам файла"
 
-#: g10/helptext.c:249
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
 msgstr ""
 
-#: g10/helptext.c:255
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -1872,471 +1913,476 @@ msgid ""
 "      this is normally used to mark an email address invalid.\n"
 msgstr ""
 
-#: g10/helptext.c:271
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
 "An empty line ends the text.\n"
 msgstr ""
 
-#: g10/helptext.c:286
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "Даведка адсутнічае"
 
-#: g10/helptext.c:294
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Для \"%s\" даведка адсутнічае"
 
-#: g10/import.c:247
+#: g10/import.c:248
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr ""
 
-#: g10/import.c:256
+#: g10/import.c:257
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr ""
 
-#: g10/import.c:273
+#: g10/import.c:274
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr ""
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr ""
 
-#: g10/import.c:278
+#: g10/import.c:279
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "              imported: %lu"
 msgstr ""
 
-#: g10/import.c:286
+#: g10/import.c:287
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr ""
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr ""
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr ""
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr ""
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr ""
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr ""
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr ""
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr ""
 
-#: g10/import.c:543
+#: g10/import.c:544
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:545
+#: g10/import.c:546
 msgid "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:582
+#: g10/import.c:583
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:594
+#: g10/import.c:595
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/import.c:606
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:620
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:646
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:694 g10/import.c:1048
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:713
+#: g10/import.c:714
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr ""
 
-#: g10/import.c:728
+#: g10/import.c:729
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:734
+#: g10/import.c:735
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:736
+#: g10/import.c:737
 msgid "this may be caused by a missing self-signature\n"
 msgstr ""
 
-#: g10/import.c:746 g10/import.c:1168
+#: g10/import.c:747 g10/import.c:1169
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/import.c:752
+#: g10/import.c:753
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr ""
 
-#: g10/import.c:761
+#: g10/import.c:762
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr ""
 
-#: g10/import.c:766 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr ""
 
-#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
-#: g10/import.c:2314 g10/import.c:2336
+#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
+#: g10/import.c:2315 g10/import.c:2337
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr ""
 
-#: g10/import.c:791
+#: g10/import.c:792
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr ""
 
-#: g10/import.c:815
+#: g10/import.c:816
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr ""
 
-#: g10/import.c:832 g10/import.c:1186
+#: g10/import.c:833 g10/import.c:1187
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/import.c:840 g10/import.c:1193
+#: g10/import.c:841 g10/import.c:1194
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr ""
 
-#: g10/import.c:875
+#: g10/import.c:876
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr ""
 
-#: g10/import.c:878
+#: g10/import.c:879
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:881
+#: g10/import.c:882
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:884
+#: g10/import.c:885
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr ""
 
-#: g10/import.c:887
+#: g10/import.c:888
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr ""
 
-#: g10/import.c:908
+#: g10/import.c:909
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr ""
 
-#: g10/import.c:1053
+#: g10/import.c:1054
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 
-#: g10/import.c:1064
+#: g10/import.c:1065
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/import.c:1081 g10/import.c:2329
+#: g10/import.c:1082 g10/import.c:2330
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr ""
 
-#: g10/import.c:1092
+#: g10/import.c:1093
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr ""
 
-#: g10/import.c:1121
+#: g10/import.c:1122
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/import.c:1131
+#: g10/import.c:1132
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/import.c:1161
+#: g10/import.c:1162
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 
-#: g10/import.c:1204
+#: g10/import.c:1205
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 
-#: g10/import.c:1236
+#: g10/import.c:1237
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr ""
 
-#: g10/import.c:1301
+#: g10/import.c:1302
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr ""
 
-#: g10/import.c:1316
+#: g10/import.c:1317
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:1336
+#: g10/import.c:1337
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr ""
 
-#: g10/import.c:1347 g10/import.c:1397
+#: g10/import.c:1348 g10/import.c:1398
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr ""
 
-#: g10/import.c:1349
+#: g10/import.c:1350
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr ""
 
-#: g10/import.c:1364
+#: g10/import.c:1365
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr ""
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr ""
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/import.c:1414
+#: g10/import.c:1415
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr ""
 
-#: g10/import.c:1456
+#: g10/import.c:1457
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:1477
+#: g10/import.c:1478
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr ""
 
-#: g10/import.c:1504
+#: g10/import.c:1505
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "Ключ абаронены.\n"
 
-#: g10/import.c:1514
+#: g10/import.c:1515
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 
-#: g10/import.c:1531
+#: g10/import.c:1532
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr ""
 
-#: g10/import.c:1545
+#: g10/import.c:1546
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 
-#: g10/import.c:1553
+#: g10/import.c:1554
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 
-#: g10/import.c:1574
+#: g10/import.c:1575
 #, fuzzy, c-format
 msgid "key %s: expired signature from key %s - skipped\n"
 msgstr "Ключ абаронены.\n"
 
-#: g10/import.c:1677
+#: g10/import.c:1678
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:1739
+#: g10/import.c:1740
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 
-#: g10/import.c:1753
+#: g10/import.c:1754
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 
-#: g10/import.c:1812
+#: g10/import.c:1813
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr ""
 
-#: g10/import.c:1846
+#: g10/import.c:1847
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "%s: тэчка створана\n"
 
-#: g10/import.c:2235
+#: g10/import.c:2236
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2243
+#: g10/import.c:2244
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr ""
 
-#: g10/import.c:2245
+#: g10/import.c:2246
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr ""
 
-#: g10/keydb.c:167
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr ""
 
-#: g10/keydb.c:174
+#: g10/keydb.c:175
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr ""
 
-#: g10/keydb.c:685
+#: g10/keydb.c:316 g10/keydb.c:319
+#, fuzzy, c-format
+msgid "keyblock resource `%s': %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
+#: g10/keydb.c:698
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr ""
 
-#: g10/keyedit.c:255
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr ""
 
-#: g10/keyedit.c:333 g10/keylist.c:405
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr ""
 
-#: g10/keyedit.c:335 g10/keylist.c:407
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr ""
 
-#: g10/keyedit.c:337 g10/keylist.c:409
+#: g10/keyedit.c:344 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr ""
 
-#: g10/keyedit.c:339 g10/keylist.c:411
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr ""
 
-#: g10/keyedit.c:341 g10/keylist.c:413
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr ""
 
-#: g10/keyedit.c:343 g10/keylist.c:415
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr ""
 
-#: g10/keyedit.c:345
+#: g10/keyedit.c:352
 msgid "1 user ID without valid self-signature detected\n"
 msgstr ""
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:354
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 
-#: g10/keyedit.c:403 g10/pkclist.c:262
+#: g10/keyedit.c:410 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2344,234 +2390,244 @@ msgid ""
 "etc.)\n"
 msgstr ""
 
-#: g10/keyedit.c:407 g10/pkclist.c:274
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr ""
 
-#: g10/keyedit.c:408 g10/pkclist.c:276
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr ""
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:434
 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:443
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr ""
 
-#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
-#: g10/keyedit.c:858 g10/keyedit.c:1642
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1728
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
-#: g10/keyedit.c:1648
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
+#: g10/keyedit.c:1734
 msgid "  Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr ""
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:650
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr ""
 
-#: g10/keyedit.c:676
+#: g10/keyedit.c:678
+#, c-format
+msgid "User ID \"%s\" is signable.  "
+msgstr ""
+
+#: g10/keyedit.c:680
+#, fuzzy
+msgid "Sign it? (y/N) "
+msgstr "Перазапісаць (y/N)?"
+
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:711
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:699
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr ""
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:729
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:724
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:754
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:749
+#: g10/keyedit.c:775
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:752
+#: g10/keyedit.c:778
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:783
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:805
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "Гэты ключ згубіў састарэў!"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr ""
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:844
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:882
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:884
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr ""
 
-#: g10/keyedit.c:878
+#: g10/keyedit.c:909
 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:883
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:895
+#: g10/keyedit.c:926
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:950
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
 "key \"%s\" (%s)\n"
 msgstr ""
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:957
 msgid "This will be a self-signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:963
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:971
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:981
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:988
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:995
 msgid "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1000
 msgid "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1005
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1015
 msgid "Really sign? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1029 g10/keyedit.c:4132 g10/keyedit.c:4223 g10/keyedit.c:4287
-#: g10/keyedit.c:4348 g10/sign.c:369
+#: g10/keyedit.c:1060 g10/keyedit.c:4350 g10/keyedit.c:4441 g10/keyedit.c:4505
+#: g10/keyedit.c:4566 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1105 g10/keygen.c:3057
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr ""
 
-#: g10/keyedit.c:1109 g10/keygen.c:3045
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 msgid "Secret parts of primary key are not available.\n"
 msgstr ""
 
-#: g10/keyedit.c:1113 g10/keygen.c:3060
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/keyedit.c:1117 g10/keygen.c:3064
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "Ключ абаронены.\n"
 
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2579,191 +2635,191 @@ msgstr ""
 "Увядзіце новы пароль для гэтага сакрэтнага ключа.\n"
 "\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:1825
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr ""
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1195
 msgid "Do you really want to do this? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1235
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr ""
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr ""
 
-#: g10/keyedit.c:1322
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/keyedit.c:1323
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr ""
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1358
 msgid "select subkey N"
 msgstr ""
 
-#: g10/keyedit.c:1327
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "праверыць подпісы ключа"
 
-#: g10/keyedit.c:1330
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1335
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "падпісаць ключ толькі мясцова"
 
-#: g10/keyedit.c:1337
+#: g10/keyedit.c:1369
 msgid "sign selected user IDs with a trust signature"
 msgstr ""
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1343
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr ""
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr ""
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "add a subkey"
 msgstr "дрэнны ключ"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "паказаць сакрэтныя ключы"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr ""
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1400
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1402
 msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1404
 msgid "flag the selected user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1406
 msgid "toggle between the secret and public key listings"
 msgstr ""
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr ""
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr ""
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1413
 msgid "set preference list for the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1418
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr ""
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr ""
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1426
 msgid "revoke signatures on the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1433
 msgid "revoke key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "enable key"
 msgstr "падпісаць ключ"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "disable key"
 msgstr "паказаць сьпіс ключоў"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1436
 msgid "show selected photo IDs"
 msgstr ""
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1556
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/keyedit.c:1494
+#: g10/keyedit.c:1574
 msgid "Secret key is available.\n"
 msgstr "Даступны сакрэтны ключ.\n"
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1655
 msgid "Need the secret key to do this.\n"
 msgstr ""
 
-#: g10/keyedit.c:1579
+#: g10/keyedit.c:1663
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1682
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -2771,622 +2827,660 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1722
 msgid "Key is revoked."
 msgstr ""
 
-#: g10/keyedit.c:1657
+#: g10/keyedit.c:1741
 msgid "Really sign all user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1660
-msgid "Hint: Select the user IDs to sign\n"
-msgstr ""
-
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1748
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1771
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1713 g10/keyedit.c:1733 g10/keyedit.c:1899
+#: g10/keyedit.c:1793 g10/keyedit.c:1813 g10/keyedit.c:1979
 msgid "You must select at least one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:1715
+#: g10/keyedit.c:1795
 msgid "You can't delete the last user ID!\n"
 msgstr ""
 
-#: g10/keyedit.c:1717
+#: g10/keyedit.c:1797
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1718
+#: g10/keyedit.c:1798
 msgid "Really remove this user ID? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1848
 msgid "Really move the primary key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1780
+#: g10/keyedit.c:1860
 msgid "You must select exactly one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1808
+#: g10/keyedit.c:1888
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1822
+#: g10/keyedit.c:1902
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1919
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/keyedit.c:1863
+#: g10/keyedit.c:1943
 msgid "You must select at least one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1946
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1867
+#: g10/keyedit.c:1947
 msgid "Do you really want to delete this key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1982
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1983
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1921
+#: g10/keyedit.c:2001
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1932
+#: g10/keyedit.c:2012
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1934
+#: g10/keyedit.c:2014
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1975
+#: g10/keyedit.c:2055
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2007
+#: g10/keyedit.c:2087
 msgid "Set preference list to:\n"
 msgstr ""
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2093
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2095
 msgid "Really update the preferences? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2065
+#: g10/keyedit.c:2157
+#, fuzzy, c-format
+msgid "Unable to clean `%s'\n"
+msgstr "немагчыма адкрыць %s: %s\n"
+
+#: g10/keyedit.c:2160
+msgid "Please specify item to clean: `sigs', `uids', or `all'\n"
+msgstr ""
+
+#: g10/keyedit.c:2171
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Захаваць зьмены? "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2174
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Выйсьці не захаваўшы зьмены? "
 
-#: g10/keyedit.c:2078
+#: g10/keyedit.c:2184
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2191
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2092
+#: g10/keyedit.c:2198
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:2164
+#: g10/keyedit.c:2271
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2323
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2227
+#: g10/keyedit.c:2334
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2242 g10/keylist.c:307
+#: g10/keyedit.c:2349 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2473
+#: g10/keyedit.c:2580
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2494
+#: g10/keyedit.c:2601
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr ""
 
-#: g10/keyedit.c:2500
+#: g10/keyedit.c:2607
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2516 g10/keyedit.c:2572 g10/keyedit.c:2684 g10/keyedit.c:2699
-#: g10/keylist.c:193 g10/keyserver.c:422
+#: g10/keyedit.c:2623 g10/keyedit.c:2679 g10/keyedit.c:2792 g10/keyedit.c:2807
+#: g10/keylist.c:194 g10/keyserver.c:421
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2519 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:931
+#: g10/keyedit.c:2626 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:948
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2521 g10/keylist.c:757 g10/keylist.c:886
+#: g10/keyedit.c:2628 g10/keylist.c:758 g10/keylist.c:887
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyedit.c:2523 g10/keyedit.c:2574 g10/keyedit.c:2686 g10/keyedit.c:2701
-#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
-#: g10/keylist.c:913 g10/keyserver.c:428 g10/mainproc.c:937
+#: g10/keyedit.c:2630 g10/keyedit.c:2681 g10/keyedit.c:2794 g10/keyedit.c:2809
+#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
+#: g10/keylist.c:914 g10/keyserver.c:427 g10/mainproc.c:954
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyedit.c:2525
+#: g10/keyedit.c:2632
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2540
+#: g10/keyedit.c:2647
 #, c-format
 msgid "trust: %s"
 msgstr ""
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2651
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2658
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:2579 g10/keylist.c:199
+#: g10/keyedit.c:2686 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2754
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2654
+#: g10/keyedit.c:2762
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2718 g10/keyserver.c:432 g10/mainproc.c:1577
-#: g10/trustdb.c:1178
+#: g10/keyedit.c:2826 g10/keyedit.c:3201 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1690
 msgid "revoked"
 msgstr ""
 
-#: g10/keyedit.c:2720 g10/keyserver.c:436 g10/mainproc.c:1579
-#: g10/trustdb.c:531
+#: g10/keyedit.c:2828 g10/keyedit.c:3203 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1692
 msgid "expired"
 msgstr ""
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2893
 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:2845
+#: g10/keyedit.c:2953
 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:2850 g10/keyedit.c:3128
+#: g10/keyedit.c:2958 g10/keyedit.c:3307
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2856
+#: g10/keyedit.c:2964
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2996
+#: g10/keyedit.c:3104
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3114
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3010
+#: g10/keyedit.c:3118
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3016
+#: g10/keyedit.c:3124
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:3030
+#: g10/keyedit.c:3138
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3139
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:3034
+#: g10/keyedit.c:3142
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:3123
+#: g10/keyedit.c:3167
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed.\n"
+msgstr "паказаць сьпіс ключоў і подпісаў"
+
+#: g10/keyedit.c:3168
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed.\n"
+msgstr "паказаць сьпіс ключоў і подпісаў"
+
+#: g10/keyedit.c:3173
+#, c-format
+msgid "User ID \"%s\": already clean.\n"
+msgstr ""
+
+#: g10/keyedit.c:3205 g10/trustdb.c:1694
+msgid "invalid"
+msgstr ""
+
+#: g10/keyedit.c:3207
+#, fuzzy, c-format
+msgid "User ID \"%s\" removed: %s\n"
+msgstr "грамадскі ключ ня знойдзены"
+
+#: g10/keyedit.c:3214
+msgid "No user IDs are removable.\n"
+msgstr ""
+
+#: g10/keyedit.c:3302
 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:3134
+#: g10/keyedit.c:3313
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3154
+#: g10/keyedit.c:3333
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3356
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3371
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3214
+#: g10/keyedit.c:3393
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3233
+#: g10/keyedit.c:3412
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3239
+#: g10/keyedit.c:3418
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3300
+#: g10/keyedit.c:3479
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3306
+#: g10/keyedit.c:3485
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/keyedit.c:3310
+#: g10/keyedit.c:3489
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:3313
+#: g10/keyedit.c:3492
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3359
+#: g10/keyedit.c:3538
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3554
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3455
+#: g10/keyedit.c:3634
 msgid "Please select exactly one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:3494 g10/keyedit.c:3604 g10/keyedit.c:3724
+#: g10/keyedit.c:3673 g10/keyedit.c:3783 g10/keyedit.c:3903
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr ""
 
-#: g10/keyedit.c:3665
+#: g10/keyedit.c:3844
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3745
+#: g10/keyedit.c:3924
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3746
+#: g10/keyedit.c:3925
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3987
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:3854
+#: g10/keyedit.c:4045
+#, c-format
+msgid "No user ID with hash %s\n"
+msgstr ""
+
+#: g10/keyedit.c:4072
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:3971
+#: g10/keyedit.c:4189
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:3974 g10/keyedit.c:4038 g10/keyedit.c:4081
+#: g10/keyedit.c:4192 g10/keyedit.c:4256 g10/keyedit.c:4299
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:3976 g10/keyedit.c:4040 g10/keyedit.c:4083
+#: g10/keyedit.c:4194 g10/keyedit.c:4258 g10/keyedit.c:4301
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:3980
+#: g10/keyedit.c:4198
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr ""
 
-#: g10/keyedit.c:3984
+#: g10/keyedit.c:4202
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3988
+#: g10/keyedit.c:4206
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4015
+#: g10/keyedit.c:4233
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:4041
+#: g10/keyedit.c:4259
 msgid " (non-revocable)"
 msgstr ""
 
-#: g10/keyedit.c:4048
+#: g10/keyedit.c:4266
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4070
+#: g10/keyedit.c:4288
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:4090
+#: g10/keyedit.c:4308
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4120
+#: g10/keyedit.c:4338
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4408
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr ""
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4425
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4271
+#: g10/keyedit.c:4489
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/keyedit.c:4333
+#: g10/keyedit.c:4551
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4646
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 
-#: g10/keygen.c:293
+#: g10/keygen.c:258
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr ""
 
-#: g10/keygen.c:300
+#: g10/keygen.c:265
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "за шмат пераваг для \"%c\"\n"
 
-#: g10/keygen.c:302
+#: g10/keygen.c:267
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "за шмат пераваг для \"%c\"\n"
 
-#: g10/keygen.c:304
+#: g10/keygen.c:269
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "за шмат пераваг для \"%c\"\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:394
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/keygen.c:829
+#: g10/keygen.c:822
 msgid "writing direct signature\n"
 msgstr ""
 
-#: g10/keygen.c:868
+#: g10/keygen.c:861
 msgid "writing self signature\n"
 msgstr ""
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing key binding signature\n"
 msgstr ""
 
-#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2632
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2638
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1239
 msgid "Sign"
 msgstr ""
 
-#: g10/keygen.c:1252
+#: g10/keygen.c:1242
 #, fuzzy
 msgid "Encrypt"
 msgstr "зашыфраваць даньні"
 
-#: g10/keygen.c:1255
+#: g10/keygen.c:1245
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1263
+#: g10/keygen.c:1253
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1268
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1282
+#: g10/keygen.c:1272
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1287
+#: g10/keygen.c:1277
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1290
+#: g10/keygen.c:1280
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr ""
 
-#: g10/keygen.c:1293
+#: g10/keygen.c:1283
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1296
+#: g10/keygen.c:1286
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1340
 msgid "Please select what kind of key you want:\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1342
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr ""
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1343
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr ""
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1345
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr ""
 
-#: g10/keygen.c:1357
+#: g10/keygen.c:1347
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr ""
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1348
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr ""
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1350
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr ""
 
-#: g10/keygen.c:1362
+#: g10/keygen.c:1352
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr ""
 
-#: g10/keygen.c:1431 g10/keygen.c:2509
+#: g10/keygen.c:1421 g10/keygen.c:2506
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr ""
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1431
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1438
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr ""
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1452
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1468
+#: g10/keygen.c:1458
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1473 g10/keygen.c:1478
+#: g10/keygen.c:1463 g10/keygen.c:1468
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1515
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3396,7 +3490,7 @@ msgid ""
 "      <n>y = key expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1526
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3406,47 +3500,48 @@ msgid ""
 "      <n>y = signature expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1549
 msgid "Key is valid for? (0) "
 msgstr ""
 
-#: g10/keygen.c:1563
-msgid "Signature is valid for? (0) "
-msgstr ""
+#: g10/keygen.c:1554
+#, fuzzy, c-format
+msgid "Signature is valid for? (%s) "
+msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/keygen.c:1568
+#: g10/keygen.c:1572
 msgid "invalid value\n"
 msgstr ""
 
-#: g10/keygen.c:1575
+#: g10/keygen.c:1579
 msgid "Key does not expire at all\n"
 msgstr ""
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1580
 msgid "Signature does not expire at all\n"
 msgstr ""
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1585
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1586
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1592
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:1595
+#: g10/keygen.c:1597
 msgid "Is this correct? (y/N) "
 msgstr ""
 
-#: g10/keygen.c:1638
+#: g10/keygen.c:1641
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3456,44 +3551,44 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1651
+#: g10/keygen.c:1654
 msgid "Real name: "
 msgstr ""
 
-#: g10/keygen.c:1659
+#: g10/keygen.c:1662
 msgid "Invalid character in name\n"
 msgstr ""
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1664
 msgid "Name may not start with a digit\n"
 msgstr ""
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1666
 msgid "Name must be at least 5 characters long\n"
 msgstr ""
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1674
 msgid "Email address: "
 msgstr ""
 
-#: g10/keygen.c:1682
+#: g10/keygen.c:1685
 msgid "Not a valid email address\n"
 msgstr ""
 
-#: g10/keygen.c:1690
+#: g10/keygen.c:1693
 msgid "Comment: "
 msgstr ""
 
-#: g10/keygen.c:1696
+#: g10/keygen.c:1699
 msgid "Invalid character in comment\n"
 msgstr ""
 
-#: g10/keygen.c:1719
+#: g10/keygen.c:1722
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr ""
 
-#: g10/keygen.c:1725
+#: g10/keygen.c:1728
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3501,7 +3596,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1733
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
@@ -3516,34 +3611,34 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1746
+#: g10/keygen.c:1749
 msgid "NnCcEeOoQq"
 msgstr ""
 
-#: g10/keygen.c:1756
+#: g10/keygen.c:1759
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:1757
+#: g10/keygen.c:1760
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:1776
+#: g10/keygen.c:1779
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1816
+#: g10/keygen.c:1819
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1826 g10/passphrase.c:1105
+#: g10/keygen.c:1829 g10/passphrase.c:786
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1832
+#: g10/keygen.c:1835
 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"
@@ -3551,7 +3646,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1857
 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"
@@ -3559,432 +3654,413 @@ msgid ""
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:2578
+#: g10/keygen.c:2575
 msgid "Key generation canceled.\n"
 msgstr ""
 
-#: g10/keygen.c:2766 g10/keygen.c:2910
+#: g10/keygen.c:2774 g10/keygen.c:2918
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr ""
 
-#: g10/keygen.c:2768 g10/keygen.c:2913
+#: g10/keygen.c:2776 g10/keygen.c:2921
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "запіс у stdout\n"
 
-#: g10/keygen.c:2771 g10/keygen.c:2916
+#: g10/keygen.c:2779 g10/keygen.c:2924
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr ""
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2907
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr ""
 
-#: g10/keygen.c:2905
+#: g10/keygen.c:2913
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr ""
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2931
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr ""
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2938
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr ""
 
-#: g10/keygen.c:2953
+#: g10/keygen.c:2961
 msgid "public and secret key created and signed.\n"
 msgstr ""
 
-#: g10/keygen.c:2964
+#: g10/keygen.c:2972
 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:2976 g10/keygen.c:3105 g10/keygen.c:3220
+#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3028 g10/keygen.c:3156 g10/sign.c:290
+#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3030 g10/keygen.c:3158 g10/sign.c:292
+#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3039 g10/keygen.c:3169
+#: g10/keygen.c:3047 g10/keygen.c:3177
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:3078 g10/keygen.c:3202
+#: g10/keygen.c:3086 g10/keygen.c:3210
 msgid "Really create? (y/N) "
 msgstr ""
 
-#: g10/keygen.c:3355
+#: g10/keygen.c:3363
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keygen.c:3402
+#: g10/keygen.c:3410
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/keygen.c:3428
+#: g10/keygen.c:3436
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
 
-#: g10/keygen.c:3508
-#, c-format
-msgid "length of RSA modulus is not %d\n"
-msgstr ""
-
-#: g10/keygen.c:3514
-msgid "public exponent too large (more than 32 bits)\n"
-msgstr ""
-
-#: g10/keygen.c:3520 g10/keygen.c:3526
-#, c-format
-msgid "length of an RSA prime is not %d\n"
-msgstr ""
-
-#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
+#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
 msgid "never     "
 msgstr ""
 
-#: g10/keylist.c:264
+#: g10/keylist.c:265
 msgid "Critical signature policy: "
 msgstr ""
 
-#: g10/keylist.c:266
+#: g10/keylist.c:267
 msgid "Signature policy: "
 msgstr ""
 
-#: g10/keylist.c:305
+#: g10/keylist.c:306
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:354 g10/keylist.c:398
+#: g10/keylist.c:355 g10/keylist.c:399
 msgid "WARNING: invalid notation data found\n"
 msgstr ""
 
-#: g10/keylist.c:372
+#: g10/keylist.c:373
 msgid "Critical signature notation: "
 msgstr ""
 
-#: g10/keylist.c:374
+#: g10/keylist.c:375
 msgid "Signature notation: "
 msgstr ""
 
-#: g10/keylist.c:385
+#: g10/keylist.c:386
 msgid "not human readable"
 msgstr ""
 
-#: g10/keylist.c:486
+#: g10/keylist.c:487
 msgid "Keyring"
 msgstr ""
 
-#: g10/keylist.c:792
+#: g10/keylist.c:793
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keylist.c:1488
+#: g10/keylist.c:1489
 msgid "Primary key fingerprint:"
 msgstr ""
 
-#: g10/keylist.c:1490
+#: g10/keylist.c:1491
 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:1497
+#: g10/keylist.c:1498
 msgid " Primary key fingerprint:"
 msgstr ""
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1500
 msgid "      Subkey fingerprint:"
 msgstr ""
 
-#: g10/keylist.c:1503 g10/keylist.c:1507
+#: g10/keylist.c:1504 g10/keylist.c:1508
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/keylist.c:1574
+#: g10/keylist.c:1575
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1245
+#: g10/keyring.c:1246
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1252
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr ""
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1255
 #, c-format
 msgid "%s is the new one\n"
 msgstr ""
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1256
 msgid "Please fix this possible security flaw\n"
 msgstr ""
 
-#: g10/keyring.c:1375
+#: g10/keyring.c:1376
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "немагчыма адкрыць \"%s\"\n"
 
-#: g10/keyring.c:1421
+#: g10/keyring.c:1422
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/keyring.c:1433
+#: g10/keyring.c:1434
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/keyring.c:1504
+#: g10/keyring.c:1505
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: створаны зьвязак ключоў\n"
 
-#: g10/keyserver.c:107
+#: g10/keyserver.c:105
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 
-#: g10/keyserver.c:434
+#: g10/keyserver.c:433
 msgid "disabled"
 msgstr ""
 
-#: g10/keyserver.c:635
+#: g10/keyserver.c:634
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:718 g10/keyserver.c:1238
+#: g10/keyserver.c:717 g10/keyserver.c:1267
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/keyserver.c:808
+#: g10/keyserver.c:815
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyserver.c:810
+#: g10/keyserver.c:817
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "экспартаваць ключы на паслужнік ключоў"
 
-#: g10/keyserver.c:985
+#: g10/keyserver.c:1014
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "імпартаваць ключы з паслужніка ключоў"
 
-#: g10/keyserver.c:989
+#: g10/keyserver.c:1018
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1141
+#: g10/keyserver.c:1170
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyserver.c:1188
+#: g10/keyserver.c:1217
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1191
+#: g10/keyserver.c:1220
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1198 g10/keyserver.c:1293
+#: g10/keyserver.c:1227 g10/keyserver.c:1322
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1275
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1255
+#: g10/keyserver.c:1284
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1314
+#: g10/keyserver.c:1343
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1320
+#: g10/keyserver.c:1349
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1361
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1366
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1374
 #, c-format
-msgid "gpgkeys_%s does not support handler version %d\n"
+msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1351
+#: g10/keyserver.c:1381
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyserver.c:1356
+#: g10/keyserver.c:1386
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "агульная памылка"
 
-#: g10/keyserver.c:1365
+#: g10/keyserver.c:1395
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyserver.c:1390 g10/keyserver.c:1424
+#: g10/keyserver.c:1420 g10/keyserver.c:1454
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1681
+#: g10/keyserver.c:1711
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1703
+#: g10/keyserver.c:1733
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1705
+#: g10/keyserver.c:1735
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr ""
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:249
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:262
-#, c-format
-msgid "bad passphrase or unknown cipher algorithm (%d)\n"
-msgstr ""
-
-#: g10/mainproc.c:299
+#: g10/mainproc.c:300
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr ""
 
-#: g10/mainproc.c:309
+#: g10/mainproc.c:310
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:375
+#: g10/mainproc.c:376
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/mainproc.c:430
+#: g10/mainproc.c:431
 msgid "public key encrypted data: good DEK\n"
 msgstr ""
 
-#: g10/mainproc.c:463
+#: g10/mainproc.c:464
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "%u-бітавы %s ключ, ID %08lX, створаны %s"
 
-#: g10/mainproc.c:467 g10/pkclist.c:218
+#: g10/mainproc.c:468 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr ""
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:472
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Паўтарыце пароль\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:499
+#: g10/mainproc.c:500
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Паўтарыце пароль\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:502
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Паўтарыце пароль\n"
 
-#: g10/mainproc.c:529 g10/mainproc.c:551
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr ""
 
-#: g10/mainproc.c:537
+#: g10/mainproc.c:538
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:569
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:574
 msgid "WARNING: message was not integrity protected\n"
 msgstr ""
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:592
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr ""
@@ -3998,300 +4074,289 @@ msgstr ""
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:786
+#: g10/mainproc.c:803
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:1290
+#: g10/mainproc.c:1307
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1332 g10/mainproc.c:1342
+#: g10/mainproc.c:1349 g10/mainproc.c:1359
 msgid "can't handle these multiple signatures\n"
 msgstr ""
 
-#: g10/mainproc.c:1352
+#: g10/mainproc.c:1369
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/mainproc.c:1353
+#: g10/mainproc.c:1370
 #, c-format
 msgid "               using %s key %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1357
+#: g10/mainproc.c:1374
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/mainproc.c:1377
+#: g10/mainproc.c:1394
 #, fuzzy
 msgid "Key available at: "
 msgstr "Даведка адсутнічае"
 
-#: g10/mainproc.c:1482 g10/mainproc.c:1530
+#: g10/mainproc.c:1499 g10/mainproc.c:1547
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1484 g10/mainproc.c:1532
+#: g10/mainproc.c:1501 g10/mainproc.c:1549
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1486 g10/mainproc.c:1534
+#: g10/mainproc.c:1503 g10/mainproc.c:1551
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1538
+#: g10/mainproc.c:1555
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1570
+#: g10/mainproc.c:1587
 #, c-format
 msgid "                aka \"%s\""
 msgstr ""
 
-#: g10/mainproc.c:1664
+#: g10/mainproc.c:1681
 #, c-format
 msgid "Signature expired %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1669
+#: g10/mainproc.c:1686
 #, c-format
 msgid "Signature expires %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1672
+#: g10/mainproc.c:1689
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1673
+#: g10/mainproc.c:1690
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:1674
+#: g10/mainproc.c:1691
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1674 g10/trustdb.c:530
+#: g10/mainproc.c:1691 g10/trustdb.c:531
 #, fuzzy
 msgid "unknown"
 msgstr "невядомая вэрсыя"
 
-#: g10/mainproc.c:1694
+#: g10/mainproc.c:1711
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1762 g10/mainproc.c:1778 g10/mainproc.c:1864
+#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
 msgid "not a detached signature\n"
 msgstr ""
 
-#: g10/mainproc.c:1805
+#: g10/mainproc.c:1822
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:1813
+#: g10/mainproc.c:1830
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1887
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
 
-#: g10/mainproc.c:1880
+#: g10/mainproc.c:1897
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
-#: g10/misc.c:121
+#: g10/misc.c:122
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr ""
 
-#: g10/misc.c:141 g10/misc.c:169 g10/misc.c:241
+#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: g10/misc.c:206
+#: g10/misc.c:207
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr ""
 
-#: g10/misc.c:315
+#: g10/misc.c:316
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr ""
 
-#: g10/misc.c:330
+#: g10/misc.c:331
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr ""
 
-#: g10/misc.c:345
+#: g10/misc.c:346
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:351
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 
-#: g10/misc.c:446
+#: g10/misc.c:447
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:447
+#: g10/misc.c:448
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 
-#: g10/misc.c:680
+#: g10/misc.c:681
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr ""
 
-#: g10/misc.c:684
+#: g10/misc.c:685
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr ""
 
-#: g10/misc.c:686
+#: g10/misc.c:687
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:697
+#: g10/misc.c:694
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
+msgstr ""
+
+#: g10/misc.c:707
 msgid "Uncompressed"
 msgstr ""
 
-#: g10/misc.c:722
+#: g10/misc.c:732
 msgid "uncompressed|none"
 msgstr ""
 
-#: g10/misc.c:832
+#: g10/misc.c:842
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:989
+#: g10/misc.c:999
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr ""
 
-#: g10/misc.c:1014
+#: g10/misc.c:1024
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: g10/openfile.c:84
+#: g10/openfile.c:86
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Файл \"%s\" ужо йснуе. "
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Перазапісаць (y/N)?"
 
-#: g10/openfile.c:119
+#: g10/openfile.c:121
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr ""
 
-#: g10/openfile.c:141
+#: g10/openfile.c:143
 msgid "Enter new filename"
 msgstr "Увядзіце новае ймя файла"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:188
 msgid "writing to stdout\n"
 msgstr "запіс у stdout\n"
 
-#: g10/openfile.c:296
+#: g10/openfile.c:300
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr ""
 
-#: g10/openfile.c:375
+#: g10/openfile.c:379
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr ""
 
-#: g10/openfile.c:377
+#: g10/openfile.c:381
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 
-#: g10/openfile.c:409
+#: g10/openfile.c:413
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: тэчка створана\n"
 
-#: g10/parse-packet.c:137
+#: g10/parse-packet.c:138
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:707
+#: g10/parse-packet.c:708
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1132
+#: g10/parse-packet.c:1145
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:478 g10/passphrase.c:525
+#: g10/passphrase.c:305
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: g10/passphrase.c:486
-msgid "can't set client pid for the agent\n"
-msgstr ""
-
-#: g10/passphrase.c:494
-msgid "can't get server read FD for the agent\n"
-msgstr ""
-
-#: g10/passphrase.c:501
-msgid "can't get server write FD for the agent\n"
-msgstr ""
-
-#: g10/passphrase.c:534
+#: g10/passphrase.c:317
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/passphrase.c:547
+#: g10/passphrase.c:332
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr ""
 
-#: g10/passphrase.c:568
+#: g10/passphrase.c:345
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr ""
 
-#: g10/passphrase.c:590
-msgid "communication problem with gpg-agent\n"
-msgstr ""
-
-#: g10/passphrase.c:597 g10/passphrase.c:937 g10/passphrase.c:1049
+#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
 
-#: g10/passphrase.c:700 g10/passphrase.c:1209
+#: g10/passphrase.c:511 g10/passphrase.c:890
 #, c-format
 msgid " (main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:525
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4302,40 +4367,27 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-бітавы %s ключ, ID %08lX, створаны %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:550
 msgid "Repeat passphrase\n"
 msgstr "Паўтарыце пароль\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:552
 msgid "Enter passphrase\n"
 msgstr "Увядзіце пароль\n"
 
-#: g10/passphrase.c:781
-msgid "passphrase too long\n"
-msgstr "пароль занадта доўгі\n"
-
-#: g10/passphrase.c:794
-msgid "invalid response from agent\n"
-msgstr ""
-
-#: g10/passphrase.c:810 g10/passphrase.c:931
+#: g10/passphrase.c:628
 msgid "cancelled by user\n"
 msgstr "скасавана карыстальнікам\n"
 
-#: g10/passphrase.c:815 g10/passphrase.c:1020
-#, c-format
-msgid "problem with the agent: agent returns 0x%lx\n"
-msgstr ""
-
-#: g10/passphrase.c:1100 g10/passphrase.c:1263
+#: g10/passphrase.c:781 g10/passphrase.c:944
 msgid "can't query passphrase in batch mode\n"
 msgstr ""
 
-#: g10/passphrase.c:1107 g10/passphrase.c:1268
+#: g10/passphrase.c:788 g10/passphrase.c:949
 msgid "Enter passphrase: "
 msgstr "Увядзіце пароль: "
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:871
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4345,21 +4397,21 @@ msgstr ""
 "Вам неабходна ўвесьці пароль, каб адчыніць сакрэтны ключ для\n"
 "карыстальніка: \""
 
-#: g10/passphrase.c:1196
+#: g10/passphrase.c:877
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-бітавы %s ключ, ID %08lX, створаны %s"
 
-#: g10/passphrase.c:1205
+#: g10/passphrase.c:886
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1272
+#: g10/passphrase.c:953
 msgid "Repeat passphrase: "
 msgstr "Паўтарыце пароль: "
 
-#: g10/photoid.c:66
+#: g10/photoid.c:67
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4368,403 +4420,403 @@ msgid ""
 "Keeping the image close to 240x288 is a good size to use.\n"
 msgstr ""
 
-#: g10/photoid.c:80
+#: g10/photoid.c:81
 msgid "Enter JPEG filename for photo ID: "
 msgstr ""
 
-#: g10/photoid.c:94
+#: g10/photoid.c:95
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: g10/photoid.c:102
+#: g10/photoid.c:103
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:104
+#: g10/photoid.c:105
 msgid "Are you sure you want to use it? (y/N) "
 msgstr ""
 
-#: g10/photoid.c:119
+#: g10/photoid.c:120
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr ""
 
-#: g10/photoid.c:136
+#: g10/photoid.c:137
 msgid "Is this photo correct (y/N/q)? "
 msgstr ""
 
-#: g10/photoid.c:338
+#: g10/photoid.c:339
 msgid "unable to display photo ID!\n"
 msgstr ""
 
-#: g10/pkclist.c:61 g10/revoke.c:580
+#: g10/pkclist.c:62 g10/revoke.c:581
 msgid "No reason specified"
 msgstr ""
 
-#: g10/pkclist.c:63 g10/revoke.c:582
+#: g10/pkclist.c:64 g10/revoke.c:583
 msgid "Key is superseded"
 msgstr ""
 
-#: g10/pkclist.c:65 g10/revoke.c:581
+#: g10/pkclist.c:66 g10/revoke.c:582
 msgid "Key has been compromised"
 msgstr ""
 
-#: g10/pkclist.c:67 g10/revoke.c:583
+#: g10/pkclist.c:68 g10/revoke.c:584
 msgid "Key is no longer used"
 msgstr ""
 
-#: g10/pkclist.c:69 g10/revoke.c:584
+#: g10/pkclist.c:70 g10/revoke.c:585
 msgid "User ID is no longer valid"
 msgstr ""
 
-#: g10/pkclist.c:73
+#: g10/pkclist.c:74
 msgid "reason for revocation: "
 msgstr ""
 
-#: g10/pkclist.c:90
+#: g10/pkclist.c:91
 msgid "revocation comment: "
 msgstr ""
 
-#: g10/pkclist.c:205
+#: g10/pkclist.c:206
 msgid "iImMqQsS"
 msgstr ""
 
-#: g10/pkclist.c:213
+#: g10/pkclist.c:214
 msgid "No trust value assigned to:\n"
 msgstr ""
 
-#: g10/pkclist.c:245
+#: g10/pkclist.c:246
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr ""
 
-#: g10/pkclist.c:255
+#: g10/pkclist.c:256
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr ""
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:271
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr ""
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr ""
 
-#: g10/pkclist.c:278
+#: g10/pkclist.c:279
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr ""
 
-#: g10/pkclist.c:284
+#: g10/pkclist.c:285
 msgid "  m = back to the main menu\n"
 msgstr ""
 
-#: g10/pkclist.c:287
+#: g10/pkclist.c:288
 msgid "  s = skip this key\n"
 msgstr ""
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " q = quit [выйсьці]\n"
 
-#: g10/pkclist.c:292
+#: g10/pkclist.c:293
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:298 g10/revoke.c:609
+#: g10/pkclist.c:299 g10/revoke.c:610
 msgid "Your decision? "
 msgstr ""
 
-#: g10/pkclist.c:319
+#: g10/pkclist.c:320
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr ""
 
-#: g10/pkclist.c:333
+#: g10/pkclist.c:334
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr ""
 
-#: g10/pkclist.c:418
+#: g10/pkclist.c:419
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 
-#: g10/pkclist.c:423
+#: g10/pkclist.c:424
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 
-#: g10/pkclist.c:429
+#: g10/pkclist.c:430
 msgid "This key probably belongs to the named user\n"
 msgstr ""
 
-#: g10/pkclist.c:434
+#: g10/pkclist.c:435
 msgid "This key belongs to us\n"
 msgstr ""
 
-#: g10/pkclist.c:460
+#: g10/pkclist.c:461
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
 "you may answer the next question with yes.\n"
 msgstr ""
 
-#: g10/pkclist.c:467
+#: g10/pkclist.c:468
 msgid "Use this key anyway? (y/N) "
 msgstr ""
 
-#: g10/pkclist.c:501
+#: g10/pkclist.c:502
 msgid "WARNING: Using untrusted key!\n"
 msgstr ""
 
-#: g10/pkclist.c:508
+#: g10/pkclist.c:509
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 
-#: g10/pkclist.c:517
+#: g10/pkclist.c:518
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr ""
 
-#: g10/pkclist.c:520
+#: g10/pkclist.c:521
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr ""
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 msgid "         This could mean that the signature is forged.\n"
 msgstr ""
 
-#: g10/pkclist.c:527
+#: g10/pkclist.c:528
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr ""
 
-#: g10/pkclist.c:532
+#: g10/pkclist.c:533
 msgid "Note: This key has been disabled.\n"
 msgstr ""
 
-#: g10/pkclist.c:537
+#: g10/pkclist.c:538
 msgid "Note: This key has expired!\n"
 msgstr ""
 
-#: g10/pkclist.c:548
+#: g10/pkclist.c:549
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:551
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:559
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr ""
 
-#: g10/pkclist.c:559
+#: g10/pkclist.c:560
 msgid "         The signature is probably a FORGERY.\n"
 msgstr ""
 
-#: g10/pkclist.c:567
+#: g10/pkclist.c:568
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:570
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 
-#: g10/pkclist.c:734 g10/pkclist.c:767 g10/pkclist.c:936 g10/pkclist.c:996
+#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr ""
 
-#: g10/pkclist.c:744 g10/pkclist.c:968
+#: g10/pkclist.c:745 g10/pkclist.c:969
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr ""
 
-#: g10/pkclist.c:786
+#: g10/pkclist.c:787
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 
-#: g10/pkclist.c:802
+#: g10/pkclist.c:803
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:828
+#: g10/pkclist.c:829
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
 msgstr ""
 
-#: g10/pkclist.c:844
+#: g10/pkclist.c:845
 msgid "No such user ID.\n"
 msgstr ""
 
-#: g10/pkclist.c:849 g10/pkclist.c:911
+#: g10/pkclist.c:850 g10/pkclist.c:912
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 
-#: g10/pkclist.c:867
+#: g10/pkclist.c:868
 msgid "Public key is disabled.\n"
 msgstr ""
 
-#: g10/pkclist.c:874
+#: g10/pkclist.c:875
 msgid "skipped: public key already set\n"
 msgstr ""
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:904
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr ""
 
-#: g10/pkclist.c:948
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr ""
 
-#: g10/pkclist.c:1003
+#: g10/pkclist.c:1004
 msgid "no valid addressees\n"
 msgstr ""
 
-#: g10/plaintext.c:90
+#: g10/plaintext.c:91
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 
-#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
+#: g10/plaintext.c:136 g10/plaintext.c:141 g10/plaintext.c:159
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/plaintext.c:446
+#: g10/plaintext.c:447
 msgid "Detached signature.\n"
 msgstr ""
 
-#: g10/plaintext.c:450
+#: g10/plaintext.c:452
 msgid "Please enter name of data file: "
 msgstr "Калі ласка, задайце назву файла даньняў: "
 
-#: g10/plaintext.c:478
+#: g10/plaintext.c:481
 msgid "reading stdin ...\n"
 msgstr "чытаецца stdin ...\n"
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:515
 msgid "no signed data\n"
 msgstr ""
 
-#: g10/plaintext.c:526
+#: g10/plaintext.c:529
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:103
+#: g10/pubkey-enc.c:104
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:119
+#: g10/pubkey-enc.c:120
 msgid "okay, we are the anonymous recipient.\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:207
+#: g10/pubkey-enc.c:208
 msgid "old encoding of the DEK is not supported\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:228
+#: g10/pubkey-enc.c:229
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:266
+#: g10/pubkey-enc.c:267
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:287
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:292
+#: g10/pubkey-enc.c:293
 msgid "NOTE: key has been revoked"
 msgstr ""
 
-#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:545
+#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
+#: g10/revoke.c:188 g10/revoke.c:546
 #, fuzzy, c-format
 msgid "build_packet failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/revoke.c:146
+#: g10/revoke.c:147
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/revoke.c:272
+#: g10/revoke.c:273
 msgid "To be revoked by:\n"
 msgstr ""
 
-#: g10/revoke.c:276
+#: g10/revoke.c:277
 msgid "(This is a sensitive revocation key)\n"
 msgstr ""
 
-#: g10/revoke.c:280
+#: g10/revoke.c:281
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr ""
 
-#: g10/revoke.c:293 g10/revoke.c:511
+#: g10/revoke.c:294 g10/revoke.c:512
 msgid "ASCII armored output forced.\n"
 msgstr ""
 
-#: g10/revoke.c:307 g10/revoke.c:525
+#: g10/revoke.c:308 g10/revoke.c:526
 #, fuzzy, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/revoke.c:370
+#: g10/revoke.c:371
 msgid "Revocation certificate created.\n"
 msgstr ""
 
-#: g10/revoke.c:376
+#: g10/revoke.c:377
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr ""
 
-#: g10/revoke.c:432
+#: g10/revoke.c:433
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/revoke.c:461
+#: g10/revoke.c:462
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr ""
 
-#: g10/revoke.c:472
+#: g10/revoke.c:473
 msgid "public key does not match secret key!\n"
 msgstr ""
 
-#: g10/revoke.c:479
+#: g10/revoke.c:480
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr ""
 
-#: g10/revoke.c:496
+#: g10/revoke.c:497
 #, fuzzy
 msgid "unknown protection algorithm\n"
 msgstr "невядомы альгарытм сьцісканьня"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 #, fuzzy
 msgid "NOTE: This key is not protected!\n"
 msgstr "Ключ абаронены.\n"
 
-#: g10/revoke.c:551
+#: g10/revoke.c:552
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -4775,881 +4827,888 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/revoke.c:602
+#: g10/revoke.c:603
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:604
+#: g10/revoke.c:605
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:645
+#: g10/revoke.c:646
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 
-#: g10/revoke.c:673
+#: g10/revoke.c:674
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr ""
 
-#: g10/revoke.c:675
+#: g10/revoke.c:676
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 msgid "Is this okay? (y/N) "
 msgstr ""
 
-#: g10/seckey-cert.c:54
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr ""
 
-#: g10/seckey-cert.c:60
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr ""
 
-#: g10/seckey-cert.c:71
+#: g10/seckey-cert.c:72
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr ""
 
-#: g10/seckey-cert.c:265
+#: g10/seckey-cert.c:266
 msgid "Invalid passphrase; please try again"
 msgstr "Недапушчальны пароль. Калі ласка, паспрабуйце шчэ раз"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:267
 #, c-format
 msgid "%s ...\n"
 msgstr ""
 
-#: g10/seckey-cert.c:326
+#: g10/seckey-cert.c:327
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 
-#: g10/seckey-cert.c:364
+#: g10/seckey-cert.c:365
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 
-#: g10/seskey.c:52
+#: g10/seskey.c:53
 msgid "weak key created - retrying\n"
 msgstr ""
 
-#: g10/seskey.c:57
+#: g10/seskey.c:58
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 
-#: g10/seskey.c:213
+#: g10/seskey.c:214
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA патрабуе выкарыстаньня 160-і бітавага хэш-альгарытму\n"
 
-#: g10/sig-check.c:75
+#: g10/sig-check.c:76
 msgid "WARNING: signature digest conflict in message\n"
 msgstr ""
 
-#: g10/sig-check.c:99
+#: g10/sig-check.c:100
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 
-#: g10/sig-check.c:102
+#: g10/sig-check.c:103
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 
-#: g10/sig-check.c:168
+#: g10/sig-check.c:169
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr ""
 
-#: g10/sig-check.c:169
+#: g10/sig-check.c:170
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr ""
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:181
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:183
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:193
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr ""
 
-#: g10/sig-check.c:275
+#: g10/sig-check.c:276
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 
-#: g10/sig-check.c:532
+#: g10/sig-check.c:533
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
 
-#: g10/sig-check.c:558
+#: g10/sig-check.c:559
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
 
-#: g10/sign.c:85
+#: g10/sign.c:86
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:93
+#: g10/sign.c:94
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 
-#: g10/sign.c:112
+#: g10/sign.c:113
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:138
+#: g10/sign.c:139
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:146
+#: g10/sign.c:147
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:159
+#: g10/sign.c:160
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:187
+#: g10/sign.c:188
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:364
+#: g10/sign.c:365
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr ""
 
-#: g10/sign.c:373
+#: g10/sign.c:374
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/sign.c:741
+#: g10/sign.c:761
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:808
+#: g10/sign.c:830
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/sign.c:900
+#: g10/sign.c:922
 msgid "signing:"
 msgstr ""
 
-#: g10/sign.c:1007
+#: g10/sign.c:1034
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1180
+#: g10/sign.c:1212
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr ""
 
-#: g10/skclist.c:126 g10/skclist.c:190
+#: g10/skclist.c:127 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 
-#: g10/skclist.c:157
+#: g10/skclist.c:158
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr ""
 
-#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/skclist.c:170
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr ""
 
-#: g10/skclist.c:185
+#: g10/skclist.c:186
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 
-#: g10/tdbdump.c:59 g10/trustdb.c:365
+#: g10/tdbdump.c:60 g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr ""
 
-#: g10/tdbdump.c:104
+#: g10/tdbdump.c:105
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
 "# (Use \"gpg --import-ownertrust\" to restore them)\n"
 msgstr ""
 
-#: g10/tdbdump.c:159 g10/tdbdump.c:167 g10/tdbdump.c:172 g10/tdbdump.c:177
+#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/tdbdump.c:159
+#: g10/tdbdump.c:160
 #, fuzzy
 msgid "line too long"
 msgstr "пароль занадта доўгі\n"
 
-#: g10/tdbdump.c:167
+#: g10/tdbdump.c:168
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:173
+#: g10/tdbdump.c:174
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/tdbdump.c:178
+#: g10/tdbdump.c:179
 msgid "ownertrust value missing"
 msgstr ""
 
-#: g10/tdbdump.c:214
+#: g10/tdbdump.c:215
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/tdbdump.c:218
+#: g10/tdbdump.c:219
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "памылка чытаньня файла"
 
-#: g10/tdbdump.c:227 g10/trustdb.c:380
+#: g10/tdbdump.c:228 g10/trustdb.c:381
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:128 g10/tdbio.c:1440
+#: g10/tdbio.c:129 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:134 g10/tdbio.c:1447
+#: g10/tdbio.c:135 g10/tdbio.c:1448
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:244
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr ""
 
-#: g10/tdbio.c:497
+#: g10/tdbio.c:498
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: g10/tdbio.c:512
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr ""
 
-#: g10/tdbio.c:522 g10/tdbio.c:545 g10/tdbio.c:588
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/tdbio.c:524 g10/tdbio.c:591
+#: g10/tdbio.c:525 g10/tdbio.c:592
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "немагчыма адкрыць \"%s\"\n"
 
-#: g10/tdbio.c:550
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr ""
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr ""
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr ""
 
-#: g10/tdbio.c:597
+#: g10/tdbio.c:598
 msgid "NOTE: trustdb not writable\n"
 msgstr ""
 
-#: g10/tdbio.c:614
+#: g10/tdbio.c:615
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr ""
 
-#: g10/tdbio.c:646
+#: g10/tdbio.c:647
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: g10/tdbio.c:654
+#: g10/tdbio.c:655
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:671 g10/tdbio.c:691 g10/tdbio.c:707 g10/tdbio.c:721
-#: g10/tdbio.c:751 g10/tdbio.c:1373 g10/tdbio.c:1400
+#: g10/tdbio.c:672 g10/tdbio.c:692 g10/tdbio.c:708 g10/tdbio.c:722
+#: g10/tdbio.c:752 g10/tdbio.c:1374 g10/tdbio.c:1401
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:730
+#: g10/tdbio.c:731
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1169
+#: g10/tdbio.c:1170
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1177
+#: g10/tdbio.c:1178
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1198
+#: g10/tdbio.c:1199
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr ""
 
-#: g10/tdbio.c:1216
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr ""
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1222
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr ""
 
-#: g10/tdbio.c:1406
+#: g10/tdbio.c:1407
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1414
+#: g10/tdbio.c:1415
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1424
+#: g10/tdbio.c:1425
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1454
+#: g10/tdbio.c:1455
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1499
+#: g10/tdbio.c:1500
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 
-#: g10/textfilter.c:147
+#: g10/textfilter.c:148
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr ""
 
-#: g10/textfilter.c:244
+#: g10/textfilter.c:245
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr ""
 
-#: g10/trustdb.c:226
+#: g10/trustdb.c:227
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr ""
 
-#: g10/trustdb.c:257
+#: g10/trustdb.c:258
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr ""
 
-#: g10/trustdb.c:295
+#: g10/trustdb.c:296
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:310
+#: g10/trustdb.c:311
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 
-#: g10/trustdb.c:320
+#: g10/trustdb.c:321
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr ""
 
-#: g10/trustdb.c:344
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:350
+#: g10/trustdb.c:351
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr ""
 
-#: g10/trustdb.c:446
+#: g10/trustdb.c:447
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:452
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:506
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ revoked]"
 msgstr "памылка чытаньня файла"
 
-#: g10/trustdb.c:508 g10/trustdb.c:513
+#: g10/trustdb.c:509 g10/trustdb.c:514
 #, fuzzy
 msgid "[ expired]"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 #, fuzzy
 msgid "[ unknown]"
 msgstr "невядомая вэрсыя"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:536
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:576
+#: g10/trustdb.c:577
 msgid "no need for a trustdb check\n"
 msgstr ""
 
-#: g10/trustdb.c:582 g10/trustdb.c:2157
+#: g10/trustdb.c:583 g10/trustdb.c:2309
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr ""
 
-#: g10/trustdb.c:591
+#: g10/trustdb.c:592
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:606
+#: g10/trustdb.c:607
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:838 g10/trustdb.c:1276
+#: g10/trustdb.c:839 g10/trustdb.c:1277
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/trustdb.c:1033
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1037
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1901
+#: g10/trustdb.c:2053
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:1965
+#: g10/trustdb.c:2117
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:2131
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 
-#: g10/trustdb.c:2002
+#: g10/trustdb.c:2154
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2240
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2163
+#: g10/trustdb.c:2315
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 
-#: g10/verify.c:116
+#: g10/verify.c:117
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
 "should be the first file given on the command line.\n"
 msgstr ""
 
-#: g10/verify.c:189
+#: g10/verify.c:190
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "агульная памылка"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr ""
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "невядомая вэрсыя"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr ""
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr ""
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "дрэнны грамадскі ключ"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "дрэнны сакрэтны ключ"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr ""
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "памылка праверчае сумы"
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "дрэнны пароль"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr ""
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "немагчыма адчыніць зьвязак ключоў"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr ""
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr ""
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "карыстальнік з такім ID адсутнічае"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "сакрэтны ключ недаступны"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr ""
 
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "непадтрымліваецца"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "дрэнны ключ"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "памылка чытаньня файла"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "памылка запісу файла"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "невядомы альгарытм сьцісканьня"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "памылка адчыненьня файла"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "памылка стварэньня файла"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "нерэчаісны пароль"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr ""
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr ""
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr ""
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr ""
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "дрэнны MPI"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr ""
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr ""
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "дрэнны сэртыфікат"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr ""
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "памылка зачыненьня файла"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "памылка перайменаваньня файла"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "памылка выдаленьня файла"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "нечаканыя даньні"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr ""
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr ""
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr ""
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr ""
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr ""
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr ""
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr ""
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr ""
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr ""
 
-#: util/errors.c:103
+#: util/errors.c:104
 msgid "not processed"
 msgstr ""
 
-#: util/errors.c:105
+#: util/errors.c:106
 msgid "unusable public key"
 msgstr ""
 
-#: util/errors.c:106
+#: util/errors.c:107
 msgid "unusable secret key"
 msgstr ""
 
-#: util/errors.c:107
+#: util/errors.c:108
 msgid "keyserver error"
 msgstr ""
 
-#: util/errors.c:108
+#: util/errors.c:109
 #, fuzzy
 msgid "canceled"
 msgstr "скасавана карыстальнікам\n"
 
-#: util/errors.c:109
+#: util/errors.c:110
 msgid "no card"
 msgstr ""
 
-#: util/logger.c:157
+#: util/logger.c:158
 msgid "ERROR: "
 msgstr ""
 
-#: util/logger.c:160
+#: util/logger.c:161
 msgid "WARNING: "
 msgstr ""
 
-#: util/logger.c:223
+#: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr ""
 
-#: util/logger.c:229
+#: util/logger.c:230
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr ""
 
-#: util/miscutil.c:336 util/miscutil.c:373
+#: util/miscutil.c:330 util/miscutil.c:367
 #, fuzzy
 msgid "yes"
 msgstr "yes [так]"
 
-#: util/miscutil.c:337 util/miscutil.c:378
+#: util/miscutil.c:331 util/miscutil.c:372
 msgid "yY"
 msgstr "yY"
 
-#: util/miscutil.c:339 util/miscutil.c:375
+#: util/miscutil.c:333 util/miscutil.c:369
 msgid "no"
 msgstr "no [не]"
 
-#: util/miscutil.c:340 util/miscutil.c:379
+#: util/miscutil.c:334 util/miscutil.c:373
 msgid "nN"
 msgstr "nN"
 
-#: util/miscutil.c:377
+#: util/miscutil.c:371
 msgid "quit"
 msgstr "quit [выйсьці]"
 
-#: util/miscutil.c:380
+#: util/miscutil.c:374
 msgid "qQ"
 msgstr "qQ"
 
-#: util/miscutil.c:413
+#: util/miscutil.c:407
 msgid "okay|okay"
 msgstr ""
 
-#: util/miscutil.c:415
+#: util/miscutil.c:409
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:416
+#: util/miscutil.c:410
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:417
+#: util/miscutil.c:411
 msgid "cC"
 msgstr ""
 
-#: util/secmem.c:90
+#: util/secmem.c:91
 msgid "WARNING: using insecure memory!\n"
 msgstr "УВАГА! Выкарыстоўваецца небясьпечная памяць!\n"
 
-#: util/secmem.c:91
+#: util/secmem.c:92
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr ""
 "па больш падрабязныя зьвесткі шукайце на http://www.gnupg.org/faq.html\n"
 
-#: util/secmem.c:343
+#: util/secmem.c:344
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "дзеяньне немагчымае без распачатае бясьпечнае памяці\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:345
 msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "error getting serial number: %s\n"
+#~ msgstr "памылка стварэньня \"%s\": %s\n"
+
+#~ msgid "passphrase too long\n"
+#~ msgstr "пароль занадта доўгі\n"
+
 #~ msgid "--nrsign-key user-id"
 #~ msgstr "--nrsign-key user-id"
 
diff --git a/po/ca.po b/po/ca.po
index c901fd93d..155386e0d 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: 2005-03-15 16:35+0100\n"
+"POT-Creation-Date: 2005-05-31 10:05+0200\n"
 "PO-Revision-Date: 2005-02-04 02:04+0100\n"
 "Last-Translator: Jordi Mallach <[email protected]>\n"
 "Language-Team: Catalan <[email protected]>\n"
@@ -35,82 +35,82 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:120
+#: cipher/primegen.c:121
 #, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr "no s'ha pogut generar un prim amb pbits=%u qbits=%u\n"
 
-#: cipher/primegen.c:311
+#: cipher/primegen.c:312
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "no s'ha pogut generar un prim amb menys de %d bits\n"
 
-#: cipher/random.c:163
+#: cipher/random.c:164
 msgid "no entropy gathering module detected\n"
 msgstr "no s'ha trobat cap mòdul d'acumulació d'entropia\n"
 
-#: cipher/random.c:387 g10/card-util.c:656 g10/card-util.c:725
-#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2255
-#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
-#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
-#: g10/tdbio.c:600
+#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
+#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
+#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
+#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
+#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/tdbio.c:601
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no s'ha pogut obrir «%s»: %s\n"
 
-#: cipher/random.c:391
+#: cipher/random.c:392
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "no es pot fer stat de «%s»: %s\n"
 
 # Descartar, deixar passar...  ignorar és un anglicisme.  ivb
-#: cipher/random.c:396
+#: cipher/random.c:397
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "«%s» no és un fitxer regular: es descarta\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:402
 msgid "note: random_seed file is empty\n"
 msgstr "nota: el fitxer random_seed és buit\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:408
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "AVÍS: el tamany del fitxer random_seed no és vàlid - no s'usarà\n"
 
-#: cipher/random.c:415
+#: cipher/random.c:416
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "no s'ha pogut llegir «%s»: %s\n"
 
-#: cipher/random.c:453
+#: cipher/random.c:454
 msgid "note: random_seed file not updated\n"
 msgstr "nota: el fitxer random_seed no s'ha actualitzat\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2723
-#: g10/keygen.c:2753 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
-#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:481
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "no s'ha pogut escriure «%s»: %s\n"
 
 # No em passe! ;)  ivb
-#: cipher/random.c:483
+#: cipher/random.c:484
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "no s'ha pogut tancar «%s»: %s\n"
 
-#: cipher/random.c:728
+#: cipher/random.c:729
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVÍS: esteu usant un generador de nombres aleatoris insegur!!\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:730
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -124,7 +124,7 @@ msgstr ""
 "NO UTILITZEU CAP DADA GENERADA PER AQUEST PROGRAMA!!\n"
 "\n"
 
-#: cipher/rndegd.c:204
+#: cipher/rndegd.c:205
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -133,7 +133,7 @@ msgstr ""
 "Si us plau, espereu mentre es genera entropia. Feu alguna tasca si\n"
 "vos ajuda no avorrir-vos, ja que ajudarà a la qualitat de la entropia.\n"
 
-#: cipher/rndlinux.c:134
+#: cipher/rndlinux.c:135
 #, c-format
 msgid ""
 "\n"
@@ -144,45 +144,62 @@ msgstr ""
 "No hi ha prou bytes aleatoris. Per favor, feu alguna altra cosa per que el\n"
 "sistema tinga oportunitat de recollir més entropia. (Calen %d bytes més)\n"
 
-#: g10/app-openpgp.c:547
+#: g10/app-openpgp.c:596
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
 
-#: g10/app-openpgp.c:560
+#: g10/app-openpgp.c:609
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "no s'ha pogut reconstruir la memòria cau de l'anell: %s\n"
 
-#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
+#: g10/app-openpgp.c:977
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
+
+#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+msgid "response does not contain the public key data\n"
+msgstr ""
+
+#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
-#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
+#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
+#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: g10/app-openpgp.c:836
+#: g10/app-openpgp.c:1310
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:857
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:862
+#: g10/app-openpgp.c:1336
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -190,224 +207,229 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:869
+#: g10/app-openpgp.c:1343
 msgid "|A|Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1018
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:1492
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1018
+#: g10/app-openpgp.c:1492
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1022
+#: g10/app-openpgp.c:1496
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
+#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "s'ha produït un error en llegir el bloc de claus: %s\n"
 
-#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
+#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/app-openpgp.c:1104
+#: g10/app-openpgp.c:1562
 #, fuzzy
 msgid "key already exists\n"
 msgstr "«%s» ja està comprimida\n"
 
-#: g10/app-openpgp.c:1108
+#: g10/app-openpgp.c:1566
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1110
+#: g10/app-openpgp.c:1568
 #, fuzzy
 msgid "generating new key\n"
 msgstr "genera un nou parell de claus"
 
-#: g10/app-openpgp.c:1120
+#: g10/app-openpgp.c:1735
+msgid "creation timestamp missing\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1742
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1749
+#, c-format
+msgid "RSA public exponent missing or largerr than %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1827
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
+
+#: g10/app-openpgp.c:1886
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1135
+#: g10/app-openpgp.c:1901
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1904
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
-msgid "response does not contain the public key data\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
-msgid "response does not contain the RSA modulus\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
-msgid "response does not contain the RSA public exponent\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1195
+#: g10/app-openpgp.c:1961
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1356
+#: g10/app-openpgp.c:2130
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1364
+#: g10/app-openpgp.c:2138
 #, c-format
-msgid "PIN [sigs done: %lu]"
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
+#: g10/app-openpgp.c:2399
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1731
-#, fuzzy, c-format
-msgid "error getting serial number: %s\n"
-msgstr "error en la creació de la contrasenya: %s\n"
-
-#: g10/app-openpgp.c:1826
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
-
-#: g10/app-openpgp.c:1868
-#, fuzzy
-msgid "reading the key failed\n"
-msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
-
-#: g10/armor.c:317
+#: g10/armor.c:318
 #, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:346
+#: g10/armor.c:347
 msgid "invalid armor header: "
 msgstr "la capçalera d'armadura és invàlida: "
 
-#: g10/armor.c:353
+#: g10/armor.c:354
 msgid "armor header: "
 msgstr "capçalera d'armadura: "
 
-#: g10/armor.c:364
+#: g10/armor.c:365
 msgid "invalid clearsig header\n"
 msgstr "la capçalera de signatura clara és invàlida\n"
 
 # És un missatge d'error?  ivb
 # «Anidada» és un castellanisme.  Niuades?  Imbricades (SC)??  ivb
-#: g10/armor.c:416
+#: g10/armor.c:417
 msgid "nested clear text signatures\n"
 msgstr "signatures en text pla imbricades\n"
 
 # FIXME: un-indiar. jm
-#: g10/armor.c:551
+#: g10/armor.c:552
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "armadura inesperada:"
 
-#: g10/armor.c:563
+#: g10/armor.c:564
 msgid "invalid dash escaped line: "
 msgstr "la línia escapada amb guió és invàlida: "
 
-#: g10/armor.c:715 g10/armor.c:1322
+#: g10/armor.c:716 g10/armor.c:1323
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "el caràcter radix64 %02x invàlid s'ha omés\n"
 
-#: g10/armor.c:758
+#: g10/armor.c:759
 msgid "premature eof (no CRC)\n"
 msgstr "fi de fitxer prematur (no CRC)\n"
 
-#: g10/armor.c:792
+#: g10/armor.c:793
 msgid "premature eof (in CRC)\n"
 msgstr "fi de fitxer prematur (en CRC)\n"
 
-#: g10/armor.c:800
+#: g10/armor.c:801
 msgid "malformed CRC\n"
 msgstr "CRC malformat\n"
 
-#: g10/armor.c:804 g10/armor.c:1359
+#: g10/armor.c:805 g10/armor.c:1360
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "error de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:824
+#: g10/armor.c:825
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "fí de fitxer prematur (al final)\n"
 
-#: g10/armor.c:828
+#: g10/armor.c:829
 msgid "error in trailer line\n"
 msgstr "error en l'última línia\n"
 
-#: g10/armor.c:1137
+#: g10/armor.c:1138
 msgid "no valid OpenPGP data found.\n"
 msgstr "no s'han trobat dades OpenPGP vàlides.\n"
 
-#: g10/armor.c:1142
+#: g10/armor.c:1143
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "l'armadura és invàlida: la línia és més llarga que %d caràcters\n"
 
-#: g10/armor.c:1146
+#: g10/armor.c:1147
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "hi ha un caràcter «quoted printable» en l'armadura - probablement s'ha "
 "utilitzat un MTA amb errors\n"
 
-#: g10/card-util.c:58 g10/card-util.c:295
+#: g10/card-util.c:63 g10/card-util.c:303
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "la clau secreta no està disponible"
 
-#: g10/card-util.c:63
+#: g10/card-util.c:68
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 # Destès? ivb
 # Desatès, sí. jm
-#: g10/card-util.c:70 g10/card-util.c:1329 g10/delkey.c:127 g10/keyedit.c:1430
-#: g10/keygen.c:2439 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1510
+#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
 #, 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:97 g10/card-util.c:1108 g10/card-util.c:1191
-#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
-#: g10/keygen.c:1365
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
+#: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "La vostra selecció? "
 
-#: g10/card-util.c:206 g10/card-util.c:256
+#: g10/card-util.c:213 g10/card-util.c:263
 msgid "[not set]"
 msgstr "[no establert]"
 
-#: g10/card-util.c:391
+#: g10/card-util.c:410
 msgid "male"
 msgstr "home"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 msgid "female"
 msgstr "dóna"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 msgid "unspecified"
 msgstr "no especificat"
 
@@ -415,134 +437,134 @@ msgstr "no especificat"
 # Probablement és una clau, femení. jm
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 msgid "not forced"
 msgstr "no forçat"
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 msgid "forced"
 msgstr "forçat"
 
-#: g10/card-util.c:497
+#: g10/card-util.c:516
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:499
+#: g10/card-util.c:518
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:501
+#: g10/card-util.c:520
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:518
+#: g10/card-util.c:537
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:539
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:538
+#: g10/card-util.c:557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:559
+#: g10/card-util.c:578
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "no hi ha cap clau pública corresponent: %s\n"
 
-#: g10/card-util.c:567
+#: g10/card-util.c:586
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:665 g10/card-util.c:734 g10/import.c:261
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:692
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:683
+#: g10/card-util.c:702
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:742
+#: g10/card-util.c:761
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:752
+#: g10/card-util.c:771
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:772
+#: g10/card-util.c:791
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferències actualitzades"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:799
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "hi ha un caràcter invàlid en la cadena de preferència\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:808
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "hi ha un caràcter invàlid en la cadena de preferència\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:829
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:824
+#: g10/card-util.c:843
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/card-util.c:845
+#: g10/card-util.c:864
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Empremta digital:"
 
-#: g10/card-util.c:868
+#: g10/card-util.c:887
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/card-util.c:916
+#: g10/card-util.c:935
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: g10/card-util.c:917
+#: g10/card-util.c:936
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "no s'han trobat dades OpenPGP vàlides.\n"
 
-#: g10/card-util.c:926
+#: g10/card-util.c:945
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1030
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1030 g10/card-util.c:1039
+#: g10/card-util.c:1051 g10/card-util.c:1060
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1051
+#: g10/card-util.c:1072
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1060
+#: g10/card-util.c:1081
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -550,288 +572,292 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1099
+#: g10/card-util.c:1120
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Seleccioneu quin tipus de clau voleu:\n"
 
-#: g10/card-util.c:1101 g10/card-util.c:1182
+#: g10/card-util.c:1122 g10/card-util.c:1203
 msgid "   (1) Signature key\n"
 msgstr ""
 
-#: g10/card-util.c:1102 g10/card-util.c:1184
+#: g10/card-util.c:1123 g10/card-util.c:1205
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/card-util.c:1103 g10/card-util.c:1186
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1119 g10/card-util.c:1202 g10/keyedit.c:908
-#: g10/keygen.c:1404 g10/revoke.c:642
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
+#: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "La selecció és invàlida.\n"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1200
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Seleccioneu la raó de la revocació:\n"
 
-#: g10/card-util.c:1214
+#: g10/card-util.c:1235
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "l'algorisme de protecció és desconegut\n"
 
-#: g10/card-util.c:1219
+#: g10/card-util.c:1240
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
 
-#: g10/card-util.c:1224
+#: g10/card-util.c:1245
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: g10/card-util.c:1294 g10/keyedit.c:1317
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "ix del menú"
 
-#: g10/card-util.c:1296
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "show admin commands"
 msgstr "les ordres entren en conflicte\n"
 
 # «pantalla» o «ajuda»?  ivb
 # «ajuda», evidentment. jm
-#: g10/card-util.c:1297 g10/keyedit.c:1320
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "mostra aquesta ajuda"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "list all available data"
 msgstr "La clau és disponible en: "
 
-#: g10/card-util.c:1302
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1303
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1304
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1305
+#: g10/card-util.c:1327
 #, fuzzy
 msgid "change the login name"
 msgstr "canvia la data de caducitat"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the language preferences"
 msgstr "canvia la confiança"
 
-#: g10/card-util.c:1307
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1308
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra empremta"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1310
+#: g10/card-util.c:1332
 #, fuzzy
 msgid "generate new keys"
 msgstr "genera un nou parell de claus"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1377 g10/keyedit.c:1526
+#: g10/card-util.c:1334
+msgid "verify the PIN and list all data"
+msgstr ""
+
+#: g10/card-util.c:1454 g10/keyedit.c:1609
 msgid "Command> "
 msgstr "Ordre> "
 
-#: g10/card-util.c:1412
+#: g10/card-util.c:1492
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1523
 msgid "Admin commands are allowed\n"
 msgstr ""
 
-#: g10/card-util.c:1430
+#: g10/card-util.c:1525
 msgid "Admin commands are not allowed\n"
 msgstr ""
 
-#: g10/card-util.c:1499 g10/keyedit.c:2104
+#: g10/card-util.c:1599 g10/keyedit.c:2210
 msgid "Invalid command  (try \"help\")\n"
 msgstr "L'ordre no és vàlida (proveu «help»)\n"
 
-#: g10/cardglue.c:287
+#: g10/cardglue.c:396
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:519
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:380
+#: g10/cardglue.c:527
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:852
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Introduïu el nom d'usuari: "
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:853
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "Introduïu el nom d'usuari: "
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:854
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:691
+#: g10/cardglue.c:855
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Introduïu el nom d'usuari: "
 
-#: g10/cardglue.c:705
+#: g10/cardglue.c:872
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Repetiu la contrasenya: "
 
-#: g10/cardglue.c:719
+#: g10/cardglue.c:886
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
-#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no s'ha pogut obrir «%s»\n"
 
-#: g10/decrypt.c:104 g10/encode.c:859
+#: g10/decrypt.c:105 g10/encode.c:846
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona per a aquesta ordre\n"
 
-#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3167 g10/keyserver.c:1511
-#: g10/revoke.c:226
+#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3346 g10/keyserver.c:1541
+#: g10/revoke.c:227
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2300 g10/keyserver.c:1525
-#: g10/revoke.c:232 g10/revoke.c:439
+#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "s'ha produït un error en llegir el bloc de claus: %s\n"
 
-#: g10/delkey.c:128 g10/delkey.c:135
+#: g10/delkey.c:129 g10/delkey.c:136
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(a no ser que especifiqueu la clau per la empremta digital)\n"
 
 # Ahà!  Abans «batch» està tal qual.  Cal unificar.  ivb
 # Fet. jm
-#: g10/delkey.c:134
+#: g10/delkey.c:135
 #, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "no es pot fer això en el mode desatès sense «--yes»\n"
 
-#: g10/delkey.c:146
+#: g10/delkey.c:147
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Voleu esborrar aquesta clau de l'anell? "
 
-#: g10/delkey.c:154
+#: g10/delkey.c:155
 #, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "És una clau secreta! Voleu esborrar-la? "
 
-#: g10/delkey.c:164
+#: g10/delkey.c:165
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: g10/delkey.c:174
+#: g10/delkey.c:175
 msgid "ownertrust information cleared\n"
 msgstr "s'ha netejat la informació de la confiança\n"
 
-#: g10/delkey.c:205
+#: g10/delkey.c:206
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "hi ha una clau secreta per a la clau pública «%s»!\n"
 
-#: g10/delkey.c:207
+#: g10/delkey.c:208
 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:210 g10/sign.c:1186
+#: g10/encode.c:211 g10/sign.c:1218
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: g10/encode.c:215
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "no es pot usar un paquet asimètric ESK al estar en mode S2K\n"
 
-#: g10/encode.c:228
+#: g10/encode.c:229
 #, fuzzy, c-format
 msgid "using cipher %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
 
-#: g10/encode.c:238 g10/encode.c:558
+#: g10/encode.c:239 g10/encode.c:545
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "«%s» ja està comprimida\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
+#: g10/encode.c:302 g10/encode.c:591 g10/sign.c:566
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVÍS: «%s» és un fitxer buit\n"
 
-#: g10/encode.c:472
+#: g10/encode.c:466
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "només podeu xifrar a claus RSA de 2048 bits o menys en el mode --pgp2\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:488
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "s'està llegint des de «%s»\n"
 
-#: g10/encode.c:530
+#: g10/encode.c:517
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "no s'ha pogut utilitzar el xifratge IDEA per a totes les claus per a les que "
 "esteu xifrant.\n"
 
-#: g10/encode.c:540
+#: g10/encode.c:527
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forçar el xifrat asimètric %s (%d) viola les preferències del destinatari\n"
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:635 g10/sign.c:899
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -840,132 +866,132 @@ msgstr ""
 "forçar l'algoritme de compressió %s (%d) viola les preferències del "
 "destinatari\n"
 
-#: g10/encode.c:735
+#: g10/encode.c:722
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forçar el xifrat asimètric %s (%d) viola les preferències del destinatari\n"
 
-#: g10/encode.c:805 g10/pkclist.c:721 g10/pkclist.c:757
+#: g10/encode.c:792 g10/pkclist.c:722 g10/pkclist.c:758
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "no podeu usar %s mentre esteu en mode %s\n"
 
-#: g10/encode.c:832
+#: g10/encode.c:819
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s xifrat per a: «%s»\n"
 
-#: g10/encr-data.c:66 g10/mainproc.c:301
+#: g10/encr-data.c:67 g10/mainproc.c:302
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dades xifrades amb %s\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:305
+#: g10/encr-data.c:69 g10/mainproc.c:306
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "xifrat amb l'algoritme %d (desconegut)\n"
 
 # És no-wrap?  ivb
 # Com? jm
-#: g10/encr-data.c:92
+#: g10/encr-data.c:93
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ATENCIÓ: el missatge s'ha xifrat amb una clau feble durant el xifratge\n"
 "simètric.\n"
 
-#: g10/encr-data.c:103
+#: g10/encr-data.c:104
 msgid "problem handling encrypted packet\n"
 msgstr "problema en tractar amb un paquet xifrat\n"
 
 # Execució de programes remots, o execució remota de programes? jm
-#: g10/exec.c:48
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "no hi ha suport per a l'execució remota de programes\n"
 
-#: g10/exec.c:184 g10/openfile.c:406
+#: g10/exec.c:173 g10/openfile.c:410
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "no es pot crear el directori «%s»: %s\n"
 
-#: g10/exec.c:325
+#: g10/exec.c:314
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "les crides a programes externs estan inhabilitades per tindre el fitxer "
 "d'opcions permissos insegurs\n"
 
-#: g10/exec.c:355
+#: g10/exec.c:344
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "aquesta plataforma necessita fitxers temporals quan es crida a programes "
 "externs\n"
 
-#: g10/exec.c:433
+#: g10/exec.c:422
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "no s'ha pogut executar %s «%s»: %s\n"
 
-#: g10/exec.c:436
+#: g10/exec.c:425
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "no s'ha pogut executar %s «%s»: %s\n"
 
-#: g10/exec.c:521
+#: g10/exec.c:510
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "s'ha produït un error del sistema en cridar el programa extern: %s\n"
 
-#: g10/exec.c:532 g10/exec.c:598
+#: g10/exec.c:521 g10/exec.c:587
 msgid "unnatural exit of external program\n"
 msgstr "s'ha produït una eixida no natural del programa extern\n"
 
-#: g10/exec.c:547
+#: g10/exec.c:536
 msgid "unable to execute external program\n"
 msgstr "no s'ha pogut executar el programa extern\n"
 
-#: g10/exec.c:563
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "no s'ha pogut llegir la resposta del programa extern: %s\n"
 
-#: g10/exec.c:609 g10/exec.c:616
+#: g10/exec.c:598 g10/exec.c:605
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
 
-#: g10/exec.c:621
+#: g10/exec.c:610
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "AVÍS: no s'ha pogut eliminar el directori temporal «%s»: %s\n"
 
-#: g10/export.c:183
+#: g10/export.c:184
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: g10/export.c:212
+#: g10/export.c:213
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "clau %08lX: no està protegida - es descarta\n"
 
-#: g10/export.c:220
+#: g10/export.c:221
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "clau %08lX: clau d'estil PGP 2.x - es descarta\n"
 
-#: g10/export.c:395
+#: g10/export.c:398
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "AVÍS: la clau secreta %08lX no te una simple suma de comprovació SK\n"
 
-#: g10/export.c:427
+#: g10/export.c:430
 msgid "WARNING: nothing exported\n"
 msgstr "AVÍS: no s'ha exportat res\n"
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid ""
 "@Commands:\n"
 " "
@@ -973,130 +999,130 @@ msgstr ""
 "@Ordres:\n"
 " "
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "|[file]|make a signature"
 msgstr "|[fitxer]|crea una signatura"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "|[file]|make a clear text signature"
 msgstr "|[fitxer]|crea una signatura en text clar"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "make a detached signature"
 msgstr "crea una signatura separada"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encrypt data"
 msgstr "xifra dades"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "encryption only with symmetric cipher"
 msgstr "xifra només amb xifratge simètric"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "decrypt data (default)"
 msgstr "desxifra dades (predeterminat)"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "verify a signature"
 msgstr "verifica una signatura"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys"
 msgstr "llista claus"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and signatures"
 msgstr "llista claus i signatures"
 
 # «de les claus» o «de la clau»?  ivb
-#: g10/g10.c:376
+#: g10/g10.c:378
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "comprova les signatures de la claus"
 
 # «dactilars» o «digitals»?  ivb
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "list keys and fingerprints"
 msgstr "llista claus i empremtes digitals"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "list secret keys"
 msgstr "llista claus secretes"
 
-#: g10/g10.c:379
+#: g10/g10.c:381
 msgid "generate a new key pair"
 msgstr "genera un nou parell de claus"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the public keyring"
 msgstr "elimina claus de l'anell públic"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "remove keys from the secret keyring"
 msgstr "elimina claus de l'anell secret"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign a key"
 msgstr "signa una clau"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "sign a key locally"
 msgstr "signa una clau localment"
 
-#: g10/g10.c:385
+#: g10/g10.c:387
 msgid "sign or edit a key"
 msgstr "signa o edita una clau"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "generate a revocation certificate"
 msgstr "genera un certificat de revocació"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "export keys"
 msgstr "exporta claus"
 
-#: g10/g10.c:389
+#: g10/g10.c:391
 msgid "export keys to a key server"
 msgstr "exporta claus a un servidor de claus"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "import keys from a key server"
 msgstr "importa claus d'un servidor de claus"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "search for keys on a key server"
 msgstr "cerca claus en un servidor de claus"
 
-#: g10/g10.c:394
+#: g10/g10.c:396
 msgid "update all keys from a keyserver"
 msgstr "actualitza totes les claus des d'un servidor de claus"
 
-#: g10/g10.c:397
+#: g10/g10.c:399
 msgid "import/merge keys"
 msgstr "importa/fon claus"
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "print the card status"
 msgstr ""
 
-#: g10/g10.c:401
+#: g10/g10.c:403
 msgid "change data on a card"
 msgstr ""
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/g10.c:410
+#: g10/g10.c:412
 msgid "update the trust database"
 msgstr "actualitza la base de dades de confiança"
 
-#: g10/g10.c:417
+#: g10/g10.c:419
 msgid "|algo [files]|print message digests"
 msgstr "|algo [fitxers]|imprimeix resums de missatges"
 
-#: g10/g10.c:421 g10/gpgv.c:66
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1106,52 +1132,52 @@ msgstr ""
 "Opcions:\n"
 " "
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "create ascii armored output"
 msgstr "crea eixida amb armadura ascii"
 
-#: g10/g10.c:425
+#: g10/g10.c:427
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|xifra per a NOM"
 
-#: g10/g10.c:436
+#: g10/g10.c:438
 msgid "use this user-id to sign or decrypt"
 msgstr "usa aquest id per a signar o desxifrar"
 
-#: g10/g10.c:437
+#: g10/g10.c:439
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivell de compressió N (0 no comprimeix)"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "use canonical text mode"
 msgstr "usa el mode de text canònic"
 
-#: g10/g10.c:452
+#: g10/g10.c:458
 msgid "use as output file"
 msgstr "fitxer d'eixida"
 
 # Un dels dos és en la llista d'opcions amb --help. Urgh. jm
-#: g10/g10.c:454 g10/gpgv.c:68
+#: g10/g10.c:460 g10/gpgv.c:73
 msgid "verbose"
 msgstr "detall"
 
-#: g10/g10.c:465
+#: g10/g10.c:471
 msgid "do not make any changes"
 msgstr "no fa cap canvi"
 
-#: g10/g10.c:466
+#: g10/g10.c:472
 msgid "prompt before overwriting"
 msgstr "pregunta abans de sobreescriure"
 
-#: g10/g10.c:507
+#: g10/g10.c:513
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:508
+#: g10/g10.c:514
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:536
+#: g10/g10.c:542
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1162,7 +1188,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/g10.c:539
+#: g10/g10.c:545
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1182,15 +1208,15 @@ msgstr ""
 " --list-keys [noms]         mostra claus\n"
 " --fingerprint [noms]       mostra empremtes digitals\n"
 
-#: g10/g10.c:720 g10/gpgv.c:93
+#: g10/g10.c:724 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Si us plau, informeu sobre els errors a <[email protected]>.\n"
 
-#: g10/g10.c:737
+#: g10/g10.c:741
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: g10/g10.c:740
+#: g10/g10.c:744
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1205,7 +1231,7 @@ msgstr ""
 # Precissament acabem de parlar d'«implementat a la llista del GNOME
 # i s'ha dit que és erroni, igual que «suportat» :) Les alternatives
 # encara no m'agraden massa... jm
-#: g10/g10.c:751
+#: g10/g10.c:755
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1213,468 +1239,478 @@ msgstr ""
 "\n"
 "Algoritmes suportats:\n"
 
-#: g10/g10.c:754
+#: g10/g10.c:758
 msgid "Pubkey: "
 msgstr "Clau pública: "
 
-#: g10/g10.c:760 g10/keyedit.c:2141
+#: g10/g10.c:764 g10/keyedit.c:2248
 msgid "Cipher: "
 msgstr "Xifratge: "
 
-#: g10/g10.c:766
+#: g10/g10.c:770
 msgid "Hash: "
 msgstr "Dispersió: "
 
-#: g10/g10.c:772 g10/keyedit.c:2187
+#: g10/g10.c:776 g10/keyedit.c:2294
 msgid "Compression: "
 msgstr "Compressió: "
 
-#: g10/g10.c:855
+#: g10/g10.c:859
 msgid "usage: gpg [options] "
 msgstr "forma d'ús: gpg [opcions] "
 
-#: g10/g10.c:1003
+#: g10/g10.c:1007
 msgid "conflicting commands\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/g10.c:1021
+#: g10/g10.c:1025
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no s'ha trobat cap signe = a la definició de grup «%s»\n"
 
 # Indi. ivb
-#: g10/g10.c:1218
+#: g10/g10.c:1222
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
 
 # Indi. ivb
-#: g10/g10.c:1221
+#: g10/g10.c:1225
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
 
 # Indi. ivb
-#: g10/g10.c:1224
+#: g10/g10.c:1228
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
 
-#: g10/g10.c:1230
+#: g10/g10.c:1234
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
 
-#: g10/g10.c:1233
+#: g10/g10.c:1237
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1240
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
 
-#: g10/g10.c:1242
+#: g10/g10.c:1246
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n"
 
-#: g10/g10.c:1245
+#: g10/g10.c:1249
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n"
 
-#: g10/g10.c:1248
+#: g10/g10.c:1252
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1258
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n"
 
-#: g10/g10.c:1257
+#: g10/g10.c:1261
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n"
 
-#: g10/g10.c:1260
+#: g10/g10.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n"
 
-#: g10/g10.c:1401
+#: g10/g10.c:1405
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1802
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: es descarta el fitxer d'opcions predeterminades antic «%s»\n"
 
-#: g10/g10.c:1838
+#: g10/g10.c:1844
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existeix el fitxer d'opcions predeterminades «%s»\n"
 
-#: g10/g10.c:1842
+#: g10/g10.c:1848
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fitxer d'opcions «%s»: %s\n"
 
-#: g10/g10.c:1849
+#: g10/g10.c:1855
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "s'estan llegint opcions de «%s»\n"
 
-#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s no és per a ús normal!\n"
 
-#: g10/g10.c:2076
+#: g10/g10.c:2082
 #, 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/g10.c:2293
+#: g10/g10.c:2236 g10/g10.c:2248
+#, 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/g10.c:2321
 #, 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/g10.c:2312 g10/keyedit.c:3683
+#: g10/g10.c:2340 g10/keyedit.c:3862
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2346
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2349
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2356
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2359
 msgid "invalid import options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2366
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2369
 msgid "invalid export options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2376
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2379
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2401
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2404
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2411
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "no s'ha pogut fixar l'exec-path a %s\n"
 
-#: g10/g10.c:2573
+#: g10/g10.c:2602
 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/g10.c:2577
+#: g10/g10.c:2606
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVÍS: %s té preferència sobre %s\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2615
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s no és permés amb %s!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2618
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s no té sentit amb %s!\n"
 
-#: g10/g10.c:2603
+#: g10/g10.c:2625
+#, fuzzy, c-format
+msgid "NOTE: %s is not available in this version\n"
+msgstr "gpg-agent no està disponible en aquesta sessió\n"
+
+#: g10/g10.c:2640
 #, 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/g10.c:2617
+#: g10/g10.c:2654
 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/g10.c:2623
+#: g10/g10.c:2660
 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/g10.c:2629
+#: g10/g10.c:2666
 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/g10.c:2642
+#: g10/g10.c:2679
 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/g10.c:2712 g10/g10.c:2736
+#: g10/g10.c:2746 g10/g10.c:2770
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/g10.c:2718 g10/g10.c:2742
+#: g10/g10.c:2752 g10/g10.c:2776
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algorisme de resum seleccionat no és vàlid\n"
 
-#: g10/g10.c:2724
+#: g10/g10.c:2758
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2764
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algorisme de resum de certificació seleccionat no és vàlid\n"
 
-#: g10/g10.c:2745
+#: g10/g10.c:2779
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ha de ser major que 0\n"
 
-#: g10/g10.c:2747
+#: g10/g10.c:2781
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ha de ser major que 1\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2783
 #, 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/g10.c:2751
+#: g10/g10.c:2785
 #, 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/g10.c:2753
+#: g10/g10.c:2787
 #, 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/g10.c:2756
+#: g10/g10.c:2790
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el mode S2K simple (0) no és gens recomanable\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2794
 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/g10.c:2767
+#: g10/g10.c:2801
 msgid "invalid default preferences\n"
 msgstr "les preferències per defecte són invàlides\n"
 
-#: g10/g10.c:2776
+#: g10/g10.c:2810
 msgid "invalid personal cipher preferences\n"
 msgstr "les preferències personals de xifrat són invàlides\n"
 
-#: g10/g10.c:2780
+#: g10/g10.c:2814
 msgid "invalid personal digest preferences\n"
 msgstr "les preferències personals de digest són invàlides\n"
 
-#: g10/g10.c:2784
+#: g10/g10.c:2818
 msgid "invalid personal compress preferences\n"
 msgstr "les preferències personals de compressió són invàlides\n"
 
-#: g10/g10.c:2817
+#: g10/g10.c:2851
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s encara no funciona amb %s\n"
 
-#: g10/g10.c:2864
+#: g10/g10.c:2898
 #, 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/g10.c:2869
+#: g10/g10.c:2903
 #, 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/g10.c:2874
+#: g10/g10.c:2908
 #, 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/g10.c:2970
+#: g10/g10.c:3004
 #, 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/g10.c:2981
+#: g10/g10.c:3015
 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/g10.c:2992
+#: g10/g10.c:3026
 msgid "--store [filename]"
 msgstr "--store [nom_del_fitxer]"
 
-#: g10/g10.c:2999
+#: g10/g10.c:3033
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom_del_fitxer]"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3035
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/g10.c:3011
+#: g10/g10.c:3045
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom_del_fitxer]"
 
-#: g10/g10.c:3024
+#: g10/g10.c:3058
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3060
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3029
+#: g10/g10.c:3063
 #, 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/g10.c:3047
+#: g10/g10.c:3081
 msgid "--sign [filename]"
 msgstr "--sign [nom_del_fitxer]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3094
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/g10.c:3075
+#: g10/g10.c:3109
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/g10.c:3077
+#: g10/g10.c:3111
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3080
+#: g10/g10.c:3114
 #, 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/g10.c:3100
+#: g10/g10.c:3134
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom_del_fitxer]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3143
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom_del_fitxer]"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3168
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom_del_fitxer]"
 
-#: g10/g10.c:3142
+#: g10/g10.c:3176
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:3146
+#: g10/g10.c:3180
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:3167
+#: g10/g10.c:3201
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [ordres]"
 
-#: g10/g10.c:3238
+#: g10/g10.c:3272
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [anell]"
 
-#: g10/g10.c:3275
+#: g10/g10.c:3309
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: g10/g10.c:3277
+#: g10/g10.c:3311
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la recepció des del servidor de claus ha fallat: %s\n"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3313
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'exportació de la clau ha fallat: %s\n"
 
-#: g10/g10.c:3290
+#: g10/g10.c:3324
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ha fallat la cerca al servidor de claus: %s\n"
 
-#: g10/g10.c:3300
+#: g10/g10.c:3334
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "ha fallat el refresc des del servidor de claus: %s\n"
 
-#: g10/g10.c:3341
+#: g10/g10.c:3375
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "no s'ha pogut llevar l'armadura: %s\n"
 
-#: g10/g10.c:3349
+#: g10/g10.c:3383
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: g10/g10.c:3436
+#: g10/g10.c:3470
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
-#: g10/g10.c:3559
+#: g10/g10.c:3593
 msgid "[filename]"
 msgstr "[nom_del_fitxer]"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3597
 msgid "Go ahead and type your message ...\n"
 msgstr "Endavant, escriviu el missatge...\n"
 
-#: g10/g10.c:3853
+#: g10/g10.c:3887
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1682,81 +1718,86 @@ msgstr ""
 "un nom de notació només pot tenir caràcters imprimibles o espais i acabar "
 "amb el signe «=»\n"
 
-#: g10/g10.c:3861
+#: g10/g10.c:3895
 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/g10.c:3871
+#: g10/g10.c:3900
+#, 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/g10.c:3911
 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/g10.c:3905
+#: g10/g10.c:3945
 msgid "the given certification policy URL is invalid\n"
 msgstr "la URL de política de certificació donada no és vàlida\n"
 
-#: g10/g10.c:3907
+#: g10/g10.c:3947
 msgid "the given signature policy URL is invalid\n"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/g10.c:3940
+#: g10/g10.c:3980
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr ""
 "hi ha massa entrades en la memòria cau de claus públiques - desactivada\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2750
+#: g10/getkey.c:187 g10/getkey.c:2757
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[No s'ha trobat l'id d'usuari]"
 
-#: g10/getkey.c:1677
+#: g10/getkey.c:1684
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "La clau invàlida %08lX s'ha fet vàlida amb --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2228
+#: g10/getkey.c:2235
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "no hi ha una clau secreta per a la subclau pública %08lX - es descarta\n"
 
-#: g10/getkey.c:2459
+#: g10/getkey.c:2466
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "s'usarà la clau secundària %08lX en lloc de la primària %08lX\n"
 
-#: g10/getkey.c:2506
+#: g10/getkey.c:2513
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "clau %08lX: clau secreta sense clau pública - es descarta\n"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:74
 msgid "be somewhat more quiet"
 msgstr "una mica més silenciós"
 
-#: g10/gpgv.c:70
+#: g10/gpgv.c:75
 msgid "take the keys from this keyring"
 msgstr "pren les claus d'aquest anell"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:77
 msgid "make timestamp conflicts only a warning"
 msgstr "fes els conflictes de marques de temps només un avís"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:78
 msgid "|FD|write status info to this FD"
 msgstr "|FD|escriu informació d'estat en aquest FD"
 
-#: g10/gpgv.c:97
+#: g10/gpgv.c:102
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Forma d'ús: gpgv [opcions] [fitxers] (-h per a veure l'ajuda)"
 
 # Werner FIXME: should it use «Usage»?
-#: g10/gpgv.c:100
+#: g10/gpgv.c:105
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1764,7 +1805,7 @@ msgstr ""
 "Sintaxi: gpg [opcions] [fitxers]\n"
 "Comprova signatures amb claus conegudes amb confiança\n"
 
-#: g10/helptext.c:48
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1774,7 +1815,7 @@ msgstr ""
 "a cap tercer. Ho necessitem per a implementar la xarxa de confiança; no té\n"
 "res a veure amb la xarxa de certificats (creada implícitament)."
 
-#: g10/helptext.c:54
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1788,17 +1829,17 @@ msgstr ""
 
 # "clau no confiable"? jm
 # No fiable, no de confiança, no de fiar...  ivb
-#: g10/helptext.c:61
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Si voleu utilitzar aquesta clau no de confiança de totes maneres, dieu «sí»."
 
-#: g10/helptext.c:65
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Introduïu l'ID d'usuari de la persona a qui voleu enviar el missatge."
 
-#: g10/helptext.c:69
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1812,7 +1853,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:83
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -1822,16 +1863,16 @@ msgstr ""
 "xifrar. Aquest algoritme només s'hauria d'usar en tasques concretes.\n"
 "Si us plau, consulteu al vostre expert en seguretat primer."
 
-#: g10/helptext.c:90
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "Introduïu la grandària de la clau"
 
-#: g10/helptext.c:94 g10/helptext.c:99 g10/helptext.c:111 g10/helptext.c:143
-#: g10/helptext.c:171 g10/helptext.c:176 g10/helptext.c:181
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "Contesteu «sí» o «no»"
 
-#: g10/helptext.c:104
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1843,19 +1884,19 @@ msgstr ""
 "una bona resposta d'error - en canvi, el sistema tractarà d'interpretar\n"
 "el valor donat com un interval."
 
-#: g10/helptext.c:116
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "Introduïu el nom del propietari de la clau"
 
-#: g10/helptext.c:121
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr "introduïu una adreça de correu (opcional però molt recomanable)"
 
-#: g10/helptext.c:125
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "Introduïu un comentari opcional"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1869,11 +1910,11 @@ msgstr ""
 "O  continua la generació de les claus.\n"
 "Q  ix."
 
-#: g10/helptext.c:139
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Contesteu «sí» (o només «s») si és correcte generar la subclau."
 
-#: g10/helptext.c:147
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -1952,12 +1993,12 @@ msgstr ""
 "\n"
 "Si no sabeu quina és la resposta correcta, contesteu «0»."
 
-#: g10/helptext.c:185
+#: g10/helptext.c:186
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Contesteu «sí» si voleu signar TOTS els ID d'usuari"
 
-#: g10/helptext.c:189
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -1965,11 +2006,11 @@ msgstr ""
 "Contesteu «sí» si realment voleu eliminar aquest ID d'usuari.\n"
 "Tots els certificats també es perdran!"
 
-#: g10/helptext.c:194
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Contesteu «sí» si és correcte eliminar la subclau"
 
-#: g10/helptext.c:199
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -1980,7 +2021,7 @@ msgstr ""
 "una connexió de confiança a la clau o a un altra clau certificada\n"
 "per aquesta clau."
 
-#: g10/helptext.c:204
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -1993,7 +2034,7 @@ msgstr ""
 "podria establir una connexió de confiança a través d'una altra clau ja\n"
 "certificada."
 
-#: g10/helptext.c:210
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -2001,7 +2042,7 @@ msgstr ""
 "La signatura no és vàlida. Té sentit que l'elimineu de l'anell\n"
 "de claus."
 
-#: g10/helptext.c:214
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2015,7 +2056,7 @@ msgstr ""
 "que feu açò només si l'autosignatura no és vàlida per alguna raó i\n"
 "hi ha una segona disponible."
 
-#: g10/helptext.c:222
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2026,23 +2067,23 @@ msgstr ""
 "a la llista actual de preferències. Les marques de temps de totes les\n"
 "autosignatures afectades s'avançaran un segon.\n"
 
-#: g10/helptext.c:229
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: g10/helptext.c:235
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Per favor, repetiu l'última contrasenya per confirmar-la."
 
-#: g10/helptext.c:239
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "Doneu el nom del fitxer al qual s'aplica la signatura"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Contesteu «sí» si és correcte sobreescriure el fitxer"
 
-#: g10/helptext.c:249
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2050,7 +2091,7 @@ msgstr ""
 "Introduïu un nom de fitxer. Si premeu RETORN s'hi usarà el fitxer\n"
 "predeterminat (apareix entre claudàtors)."
 
-#: g10/helptext.c:255
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2079,7 +2120,7 @@ msgstr ""
 "      d'utilitzar més; açò s'utilitza normalment per a marcar una adreça\n"
 "      de correu com a invàlida.\n"
 
-#: g10/helptext.c:271
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2089,264 +2130,264 @@ msgstr ""
 "certificat de revocació. Per favor, sigueu concisos.\n"
 "Una línia buida indica el final del text.\n"
 
-#: g10/helptext.c:286
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "No hi ha ajuda disponible"
 
-#: g10/helptext.c:294
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "No hi ha ajuda disponible per a `%s'"
 
-#: g10/import.c:247
+#: g10/import.c:248
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "es descarta un bloc de tipus %d\n"
 
-#: g10/import.c:256
+#: g10/import.c:257
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "fins ara s'han processat %lu claus\n"
 
-#: g10/import.c:273
+#: g10/import.c:274
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Nombre total processat: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr " claus noves descartades: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:279
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "                sense ID: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importades: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:287
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "          no modificades: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "       ID d'usuaris nous: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "          subclaus noves: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        signatures noves: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "       noves revocacions: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " claus privades llegides: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "claus privades importades: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "claus privades no canviades: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "              importades: %lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:544
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:545
+#: g10/import.c:546
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Heu signat els següents ID d'usuari:\n"
 
-#: g10/import.c:582
+#: g10/import.c:583
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:594
+#: g10/import.c:595
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: g10/import.c:606
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:620
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:646
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:694 g10/import.c:1048
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "clau %08lX: sense ID\n"
 
-#: g10/import.c:713
+#: g10/import.c:714
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "clau %08lX: corrupció de la subclau HKP reparada\n"
 
-#: g10/import.c:728
+#: g10/import.c:729
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "clau %08lX: s'ha acceptat la ID d'usuari no autosignada «%s»\n"
 
-#: g10/import.c:734
+#: g10/import.c:735
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "clau %08lX: l'ID no és vàlid\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 msgid "this may be caused by a missing self-signature\n"
 msgstr "açò pot ser causat per l'absència d'autosignatura\n"
 
-#: g10/import.c:746 g10/import.c:1168
+#: g10/import.c:747 g10/import.c:1169
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "clau %08lX: no s'ha trobat la clau pública: %s\n"
 
-#: g10/import.c:752
+#: g10/import.c:753
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "clau %08lX: clau nova - es descarta \n"
 
-#: g10/import.c:761
+#: g10/import.c:762
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "no s'ha trobat cap anell escrivible: %s\n"
 
-#: g10/import.c:766 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "s'està escrivint en «%s»\n"
 
-#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
-#: g10/import.c:2314 g10/import.c:2336
+#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
+#: g10/import.c:2315 g10/import.c:2337
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
 
-#: g10/import.c:791
+#: g10/import.c:792
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "clau %08lX: s'ha importat la clau pública «%s»\n"
 
-#: g10/import.c:815
+#: g10/import.c:816
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "clau %08lX: no correspon a la nostra còpia\n"
 
-#: g10/import.c:832 g10/import.c:1186
+#: g10/import.c:833 g10/import.c:1187
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "clau %08lX: no s'ha trobat el bloc de claus original: %s\n"
 
-#: g10/import.c:840 g10/import.c:1193
+#: g10/import.c:841 g10/import.c:1194
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "clau %08lX: no s'ha pogut llegir el bloc de claus original: %s\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "clau %08lX: «%s» 1 ID d'usuari nou\n"
 
-#: g10/import.c:875
+#: g10/import.c:876
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
 
-#: g10/import.c:878
+#: g10/import.c:879
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "clau %08lX: «%s» 1 signatura nova\n"
 
-#: g10/import.c:881
+#: g10/import.c:882
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "clau %08lX: «%s» %d signatures noves\n"
 
-#: g10/import.c:884
+#: g10/import.c:885
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "clau %08lX: «%s» 1 subclau nova\n"
 
-#: g10/import.c:887
+#: g10/import.c:888
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "clau %08lX: «%s» %d subclaus noves\n"
 
-#: g10/import.c:908
+#: g10/import.c:909
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "clau %08lX: «%s» no ha estat modificada\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1054
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "clau %08lX: clau secreta amb xifrat %d no vàlid - es descarta\n"
 
-#: g10/import.c:1064
+#: g10/import.c:1065
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: g10/import.c:1081 g10/import.c:2329
+#: g10/import.c:1082 g10/import.c:2330
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "no hi ha anell secret predeterminat: %s\n"
 
-#: g10/import.c:1092
+#: g10/import.c:1093
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "clau %08lX: s'ha importat la clau secreta\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1122
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "clau %08lX: ja es troba en l'anell privat\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1132
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "clau %08lX: no s'ha trobat la clau secreta: %s\n"
 
-#: g10/import.c:1161
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
@@ -2356,22 +2397,22 @@ msgstr ""
 # O «rebutjara»? ivb
 # Per tots els canvis d'anglicisme «ignorat» -> «es descarta»,
 # «es rebutja» està bé. jm
-#: g10/import.c:1204
+#: g10/import.c:1205
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "clau %08lX: el certificat de revocació és invàlid: %s: es rebutja\n"
 
-#: g10/import.c:1236
+#: g10/import.c:1237
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "clau %08lX: s'ha importat el certificat de revocació «%s»\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1302
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "clau %08lX: no hi ha ID per a la signatura\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1317
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
@@ -2379,196 +2420,201 @@ msgstr ""
 "s»\n"
 "\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "clau %08lX: l'autosignatura no és vàlida en l'id d'usuari «%s»\n"
 
-#: g10/import.c:1336
+#: g10/import.c:1337
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "clau %08lX: no hi ha una subclau per a l'enllaç de la clau\n"
 
-#: g10/import.c:1347 g10/import.c:1397
+#: g10/import.c:1348 g10/import.c:1398
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "clau %08lX: l'algoritme de clau pública no és suportat\n"
 
-#: g10/import.c:1349
+#: g10/import.c:1350
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "clau %08lX: l'enllaç de subclau és invàlid\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1365
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "clau %08lX: s'ha eliminat un enllaç de subclau múltiple\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "clau %08lX: no hi ha una subclau per a la clau de revocació\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "clau %08lX: Subclau de revocació no vàlida\n"
 
-#: g10/import.c:1414
+#: g10/import.c:1415
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "clau %08lX: s'han eliminat subclaus de revocació múltiples\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1457
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "clau %08lX: es descarta l'ID d'usuari '"
 
-#: g10/import.c:1477
+#: g10/import.c:1478
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "clau %08lX: es descarta la subclau\n"
 
-#: g10/import.c:1504
+#: g10/import.c:1505
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "clau %08lX: la signatura és inexportable (classe %02x) - es descarta\n"
 
-#: g10/import.c:1514
+#: g10/import.c:1515
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "clau %08lX: el certificat de revocació és en el lloc equivocat - es "
 "descarta\n"
 
-#: g10/import.c:1531
+#: g10/import.c:1532
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "clau %08lX: el certificat de revocació és invàlid: %s - es descarta\n"
 
-#: g10/import.c:1545
+#: g10/import.c:1546
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 "clau %08lX: la signatura de la subclau és en el lloc equivocat - es "
 "descarta\n"
 
-#: g10/import.c:1553
+#: g10/import.c:1554
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 "clau %08lX: la classe de signatura és inesperada (0x%02x) - es descarta\n"
 
-#: g10/import.c:1574
+#: g10/import.c:1575
 #, fuzzy, c-format
 msgid "key %s: expired signature from key %s - skipped\n"
 msgstr ""
 "clau %08lX: la classe de signatura és inesperada (0x%02x) - es descarta\n"
 
-#: g10/import.c:1677
+#: g10/import.c:1678
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "clau %08lX: s'ha detectat un ID d'usuari duplicat - es fusiona\n"
 
-#: g10/import.c:1739
+#: g10/import.c:1740
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVÍS: la clau %08lX pot estar revocada: s'adquireix la clau de revocació %"
 "08lX\n"
 
-#: g10/import.c:1753
+#: g10/import.c:1754
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVÍS: la clau %08lX pot estar revocada: la clau de revocació %08lX no està "
 "present.\n"
 
-#: g10/import.c:1812
+#: g10/import.c:1813
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "clau %08lX: s'hi ha afegit el certificat de revocació «%s»\n"
 
-#: g10/import.c:1846
+#: g10/import.c:1847
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "clau %08lX: s'ha afegit la signatura de clau directa\n"
 
-#: g10/import.c:2235
+#: g10/import.c:2236
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "la clau pública no coincideix amb la clau secreta!\n"
 
-#: g10/import.c:2243
+#: g10/import.c:2244
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: g10/import.c:2245
+#: g10/import.c:2246
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: g10/keydb.c:167
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "error en crear l'anell «%s»: %s\n"
 
-#: g10/keydb.c:174
+#: g10/keydb.c:175
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "s'ha creat l'anell «%s»\n"
 
-#: g10/keydb.c:685
+#: g10/keydb.c:316 g10/keydb.c:319
+#, fuzzy, c-format
+msgid "keyblock resource `%s': %s\n"
+msgstr "error en crear «%s»: %s\n"
+
+#: g10/keydb.c:698
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "no s'ha pogut reconstruir la memòria cau de l'anell: %s\n"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[revocació]"
 
-#: g10/keyedit.c:255
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[autosignatura]"
 
-#: g10/keyedit.c:333 g10/keylist.c:405
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 signatura errònia\n"
 
-#: g10/keyedit.c:335 g10/keylist.c:407
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d signatures errònies\n"
 
-#: g10/keyedit.c:337 g10/keylist.c:409
+#: g10/keyedit.c:344 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signatura no comprovada per falta de clau\n"
 
-#: g10/keyedit.c:339 g10/keylist.c:411
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, 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:341 g10/keylist.c:413
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signatura no comprovada a causa d'un error\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:415
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signatures no comprovades a causa d'errors\n"
 
-#: g10/keyedit.c:345
+#: g10/keyedit.c:352
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Ha estat detectat 1 ID sense autosignatura vàlida\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:354
 #, 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:403 g10/pkclist.c:262
+#: g10/keyedit.c:410 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2580,55 +2626,65 @@ msgstr ""
 "verificar les claus d'altres usuaris (mirant passaports,\n"
 "comprovant empremtes de diferents fonts...)?\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:274
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Hi confie marginalment\n"
 
-#: g10/keyedit.c:408 g10/pkclist.c:276
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Hi confie plenament\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:434
 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:443
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "L'ID d'usuari «%s» està revocat."
 
-#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
-#: g10/keyedit.c:858 g10/keyedit.c:1642
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1728
 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:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
-#: g10/keyedit.c:1648
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
+#: g10/keyedit.c:1734
 msgid "  Unable to sign.\n"
 msgstr "  No es pot signar.\n"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "L'ID d'usuari «%s» ha caducat."
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:650
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "L'ID d'usuari «%s» no està autosignat."
 
-#: g10/keyedit.c:676
+#: g10/keyedit.c:678
+#, fuzzy, c-format
+msgid "User ID \"%s\" is signable.  "
+msgstr "L'ID d'usuari «%s» no està autosignat."
+
+#: g10/keyedit.c:680
+#, fuzzy
+msgid "Sign it? (y/N) "
+msgstr "Signar realment? "
+
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2637,11 +2693,11 @@ msgstr ""
 "La vostra signatura en «%s»\n"
 "és una signatura d'estil PGP 2.x.\n"
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:711
 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:699
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2650,11 +2706,11 @@ msgstr ""
 "La vostra signatura actual en «%s»\n"
 "ha caducat.\n"
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:729
 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:724
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2663,54 +2719,54 @@ msgstr ""
 "La vostra signatura en «%s»\n"
 "és una signatura local.\n"
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:754
 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:749
+#: g10/keyedit.c:775
 #, 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:752
+#: g10/keyedit.c:778
 #, 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:757
+#: g10/keyedit.c:783
 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:779
+#: g10/keyedit.c:805
 #, 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:794
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "La clau ha caducat!"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Aquesta clau caducarà el %s.\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:844
 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:851
+#: g10/keyedit.c:882
 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:853
+#: g10/keyedit.c:884
 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:878
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2720,32 +2776,32 @@ msgstr ""
 "pertany realment a la persona esmentada anteriorment? Si no sabeu què \n"
 "contestar, entreu «0».\n"
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) No vaig a contestar.%s\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:916
 #, 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:887
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) He fet algunes comprovacions.%s\n"
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) He fet comprovacions molt acurades.%s\n"
 
-#: g10/keyedit.c:895
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Seleccioneu una opció (introduïu «?» per obtindre més informació):"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:950
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2754,100 +2810,100 @@ msgstr ""
 "Esteu segur que voleu signar aquesta clau\n"
 "amb la vostra clau: \""
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Açò serà una autosignatura.\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:963
 #, 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:940
+#: g10/keyedit.c:971
 #, 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:950
+#: g10/keyedit.c:981
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "La signatura es marcarà com a inexportable.\n"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:988
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "La signatura es marcarà com a irrevocable.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:995
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "No he comprovat aquesta clau en absolut.\n"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1000
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "He fet algunes comprovacions a aquesta clau.\n"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1005
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "He comprovat aquesta clau amb molta cura.\n"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1015
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Signar realment? "
 
-#: g10/keyedit.c:1029 g10/keyedit.c:4132 g10/keyedit.c:4223 g10/keyedit.c:4287
-#: g10/keyedit.c:4348 g10/sign.c:369
+#: g10/keyedit.c:1060 g10/keyedit.c:4350 g10/keyedit.c:4441 g10/keyedit.c:4505
+#: g10/keyedit.c:4566 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1105 g10/keygen.c:3057
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "Aquesta clau no està protegida.\n"
 
-#: g10/keyedit.c:1109 g10/keygen.c:3045
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 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:1113 g10/keygen.c:3060
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 #, 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:1117 g10/keygen.c:3064
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "La clau està protegida.\n"
 
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "No es pot editar aquesta clau: %s\n"
 
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2855,11 +2911,11 @@ msgstr ""
 "Introduïu la nova contrasenya per a la clau secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:1825
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2868,65 +2924,65 @@ msgstr ""
 "\n"
 
 # No abusis dels pronoms!  (Rowan Atkinson @ Llei i Desordre)  ivb
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1195
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Esteu segur de voler fer açò? "
 
-#: g10/keyedit.c:1235
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "s'està posant la signatura al lloc correcte\n"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "desa i ix"
 
-#: g10/keyedit.c:1322
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra empremta"
 
-#: g10/keyedit.c:1323
+#: g10/keyedit.c:1355
 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:1325
+#: g10/keyedit.c:1357
 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:1326
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "tria l'ID d'usuari N"
 
-#: g10/keyedit.c:1327
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "revoca signatures"
 
-#: g10/keyedit.c:1330
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1335
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "signa la clau localment"
 
-#: g10/keyedit.c:1337
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Pista: Trieu els ID d'usuari que voleu signar\n"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1343
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "afegeix un ID d'usuari"
 
@@ -2934,139 +2990,139 @@ 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:1345
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "afegeix un photo ID"
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "esborra un ID d'usuari"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "esborra una clau secundària"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr "afegeix una clau de revocació"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1400
 #, 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:1370
+#: g10/keyedit.c:1402
 #, 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:1372
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "marca l'ID d'usuari com a primari"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "canvia entre el llistat de claus secretes i públiques"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "llista les preferències (expert)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "llista les preferències (detallat)"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1413
 #, 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:1386
+#: g10/keyedit.c:1418
 #, fuzzy
 msgid "set 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:1388
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "canvia la contrasenya"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "canvia la confiança"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1426
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Realment voleu revocar tots els ID d'usuari seleccionats? "
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revoca un ID d'usuari"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoca una clau secundària"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "enable key"
 msgstr "activa una clau"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "disable key"
 msgstr "desactiva una clau"
 
 # Igual que dalt.  ivb
 # Idem :) jm
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1436
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "mostra el photo ID"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1556
 #, 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:1494
+#: g10/keyedit.c:1574
 msgid "Secret key is available.\n"
 msgstr "La clau secreta està disponible.\n"
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1655
 msgid "Need the secret key to do this.\n"
 msgstr "Cal la clau secreta per a fer açò.\n"
 
-#: g10/keyedit.c:1579
+#: g10/keyedit.c:1663
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Useu l'ordre «toggle» abans.\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1682
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3074,241 +3130,246 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1722
 msgid "Key is revoked."
 msgstr "La clau està revocada."
 
-#: g10/keyedit.c:1657
+#: g10/keyedit.c:1741
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Realment voleu signar tots els ID d'usuari? "
 
-#: g10/keyedit.c:1660
-msgid "Hint: Select the user IDs to sign\n"
-msgstr "Pista: Trieu els ID d'usuari que voleu signar\n"
-
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1748
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "la classe de signatura és desconeguda"
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1771
 #, 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:1713 g10/keyedit.c:1733 g10/keyedit.c:1899
+#: g10/keyedit.c:1793 g10/keyedit.c:1813 g10/keyedit.c:1979
 msgid "You must select at least one user ID.\n"
 msgstr "Heu de seleccionar al menys un ID d'usuari.\n"
 
-#: g10/keyedit.c:1715
+#: g10/keyedit.c:1795
 msgid "You can't delete the last user ID!\n"
 msgstr "No podeu esborrar l'últim ID d'usuari!\n"
 
-#: g10/keyedit.c:1717
+#: g10/keyedit.c:1797
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Realment voleu eliminar tots els ID d'usuari seleccionats? "
 
-#: g10/keyedit.c:1718
+#: g10/keyedit.c:1798
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Realment voleu eliminar aquest ID d'usuari? "
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1848
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
 
-#: g10/keyedit.c:1780
+#: g10/keyedit.c:1860
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Heu de seleccionar, si més no, una clau.\n"
 
-#: g10/keyedit.c:1808
+#: g10/keyedit.c:1888
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1822
+#: g10/keyedit.c:1902
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "no s'ha pogut obrir «%s»: %s\n"
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1919
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "error en crear l'anell «%s»: %s\n"
 
-#: g10/keyedit.c:1863
+#: g10/keyedit.c:1943
 msgid "You must select at least one key.\n"
 msgstr "Heu de seleccionar, si més no, una clau.\n"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1946
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Realment voleu eliminar les claus seleccionades? "
 
-#: g10/keyedit.c:1867
+#: g10/keyedit.c:1947
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Realment voleu eliminar aquesta clau? "
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1982
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Realment voleu revocar tots els ID d'usuari seleccionats? "
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1983
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Realment voleu eliminar aquest ID d'usuari? "
 
-#: g10/keyedit.c:1921
+#: g10/keyedit.c:2001
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Realment voleu revocar aquesta clau? "
 
-#: g10/keyedit.c:1932
+#: g10/keyedit.c:2012
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Realment voleu revocar les claus seleccionades? "
 
-#: g10/keyedit.c:1934
+#: g10/keyedit.c:2014
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Realment voleu revocar aquesta clau? "
 
-#: g10/keyedit.c:1975
+#: g10/keyedit.c:2055
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2007
+#: g10/keyedit.c:2087
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "estableix la llista de preferències"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2093
 #, 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:2015
+#: g10/keyedit.c:2095
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Realment voleu actualitzar les preferències? "
 
-#: g10/keyedit.c:2065
+#: g10/keyedit.c:2157
+#, fuzzy, c-format
+msgid "Unable to clean `%s'\n"
+msgstr "no s'ha pogut executar %s «%s»: %s\n"
+
+#: g10/keyedit.c:2160
+msgid "Please specify item to clean: `sigs', `uids', or `all'\n"
+msgstr ""
+
+#: g10/keyedit.c:2171
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Voleu desar els canvis? "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2174
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Voleu eixir sense desar? "
 
-#: g10/keyedit.c:2078
+#: g10/keyedit.c:2184
 #, c-format
 msgid "update failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2191
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "ha fallat l'actualització de la clau secreta: %s\n"
 
-#: g10/keyedit.c:2092
+#: g10/keyedit.c:2198
 msgid "Key not changed so no update needed.\n"
 msgstr "La clau no ha canviat, per tant no cal actualització.\n"
 
-#: g10/keyedit.c:2164
+#: g10/keyedit.c:2271
 msgid "Digest: "
 msgstr "Resum: "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2323
 msgid "Features: "
 msgstr "Funcionalitats: "
 
-#: g10/keyedit.c:2227
+#: g10/keyedit.c:2334
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2242 g10/keylist.c:307
+#: g10/keyedit.c:2349 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
 # Potser %s haja d'anar darrere de «clau».  ivb
 # És cert. Nova funcionalitat de 1.2.0, IIRC. jm
-#: g10/keyedit.c:2473
+#: g10/keyedit.c:2580
 #, 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:2494
+#: g10/keyedit.c:2601
 #, 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:2500
+#: g10/keyedit.c:2607
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:2516 g10/keyedit.c:2572 g10/keyedit.c:2684 g10/keyedit.c:2699
-#: g10/keylist.c:193 g10/keyserver.c:422
+#: g10/keyedit.c:2623 g10/keyedit.c:2679 g10/keyedit.c:2792 g10/keyedit.c:2807
+#: g10/keylist.c:194 g10/keyserver.c:421
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "no s'ha pogut creat %s: %s\n"
 
-#: g10/keyedit.c:2519 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:931
+#: g10/keyedit.c:2626 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:948
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:2521 g10/keylist.c:757 g10/keylist.c:886
+#: g10/keyedit.c:2628 g10/keylist.c:758 g10/keylist.c:887
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2523 g10/keyedit.c:2574 g10/keyedit.c:2686 g10/keyedit.c:2701
-#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
-#: g10/keylist.c:913 g10/keyserver.c:428 g10/mainproc.c:937
+#: g10/keyedit.c:2630 g10/keyedit.c:2681 g10/keyedit.c:2794 g10/keyedit.c:2809
+#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
+#: g10/keylist.c:914 g10/keyserver.c:427 g10/mainproc.c:954
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2525
+#: g10/keyedit.c:2632
 #, c-format
 msgid "usage: %s"
 msgstr ""
 
-#: g10/keyedit.c:2540
+#: g10/keyedit.c:2647
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confiança: %c/%c"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2651
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2658
 msgid "This key has been disabled"
 msgstr "Aquesta clau ha estat desactivada"
 
-#: g10/keyedit.c:2579 g10/keylist.c:199
+#: g10/keyedit.c:2686 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2754
 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"
 
-#: g10/keyedit.c:2654
+#: g10/keyedit.c:2762
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3316,19 +3377,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:2718 g10/keyserver.c:432 g10/mainproc.c:1577
-#: g10/trustdb.c:1178
+#: g10/keyedit.c:2826 g10/keyedit.c:3201 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1690
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:2720 g10/keyserver.c:436 g10/mainproc.c:1579
-#: g10/trustdb.c:531
+#: g10/keyedit.c:2828 g10/keyedit.c:3203 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1692
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2893
 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"
@@ -3338,7 +3399,7 @@ msgstr ""
 "assumida.\n"
 
 # Photo ID com abans.  ivb
-#: g10/keyedit.c:2845
+#: g10/keyedit.c:2953
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3347,49 +3408,78 @@ msgstr ""
 "AVÍS: Aquesta és una clau d'estil PGP2. Afegir un photo ID pot fer que "
 "algunes versions de PGP rebutgen aquesta clau.\n"
 
-#: g10/keyedit.c:2850 g10/keyedit.c:3128
+#: g10/keyedit.c:2958 g10/keyedit.c:3307
 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:2856
+#: g10/keyedit.c:2964
 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:2996
+#: g10/keyedit.c:3104
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura correcta? (s/N/x)"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3114
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura invàlida? (s/N/x)"
 
-#: g10/keyedit.c:3010
+#: g10/keyedit.c:3118
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura desconeguda? (s/N/x)"
 
-#: g10/keyedit.c:3016
+#: g10/keyedit.c:3124
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keyedit.c:3030
+#: g10/keyedit.c:3138
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "S'ha esborrat %d signatura.\n"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3139
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "S'han esborrat %d signatures.\n"
 
-#: g10/keyedit.c:3034
+#: g10/keyedit.c:3142
 msgid "Nothing deleted.\n"
 msgstr "No s'hi ha eliminat res.\n"
 
-#: g10/keyedit.c:3123
+#: g10/keyedit.c:3167
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed.\n"
+msgstr "L'ID d'usuari «%s» està revocat."
+
+#: g10/keyedit.c:3168
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed.\n"
+msgstr "L'ID d'usuari «%s» està revocat."
+
+#: g10/keyedit.c:3173
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean.\n"
+msgstr "l'ID d'usuari «%s» ja està revocat\n"
+
+#: g10/keyedit.c:3205 g10/trustdb.c:1694
+msgid "invalid"
+msgstr "invàlida"
+
+#: g10/keyedit.c:3207
+#, fuzzy, c-format
+msgid "User ID \"%s\" removed: %s\n"
+msgstr "L'ID d'usuari «%s» està revocat."
+
+#: g10/keyedit.c:3214
+#, fuzzy
+msgid "No user IDs are removable.\n"
+msgstr "No hi ha usuari per a la clau\n"
+
+#: g10/keyedit.c:3302
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3398,348 +3488,353 @@ 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:3134
+#: g10/keyedit.c:3313
 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:3154
+#: g10/keyedit.c:3333
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduïu l'ID d'usuari del revocador designat: "
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3356
 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:3192
+#: g10/keyedit.c:3371
 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:3214
+#: g10/keyedit.c:3393
 #, 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:3233
+#: g10/keyedit.c:3412
 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:3239
+#: g10/keyedit.c:3418
 #, 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:3300
+#: g10/keyedit.c:3479
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Per favor, elimineu les seleccions de les claus secretes.\n"
 
-#: g10/keyedit.c:3306
+#: g10/keyedit.c:3485
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Per favor, seleccioneu com a molt una clau secundària.\n"
 
-#: g10/keyedit.c:3310
+#: g10/keyedit.c:3489
 #, 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:3313
+#: g10/keyedit.c:3492
 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:3359
+#: g10/keyedit.c:3538
 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:3375
+#: g10/keyedit.c:3554
 msgid "No corresponding signature in secret ring\n"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/keyedit.c:3455
+#: g10/keyedit.c:3634
 msgid "Please select exactly one user ID.\n"
 msgstr "Heu de seleccionar exactament un ID.\n"
 
-#: g10/keyedit.c:3494 g10/keyedit.c:3604 g10/keyedit.c:3724
+#: g10/keyedit.c:3673 g10/keyedit.c:3783 g10/keyedit.c:3903
 #, 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:3665
+#: g10/keyedit.c:3844
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3745
+#: g10/keyedit.c:3924
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:3746
+#: g10/keyedit.c:3925
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3987
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:3854
+#: g10/keyedit.c:4045
+#, 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:4072
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:3971
+#: g10/keyedit.c:4189
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID d'usuari: «"
 
-#: g10/keyedit.c:3974 g10/keyedit.c:4038 g10/keyedit.c:4081
+#: g10/keyedit.c:4192 g10/keyedit.c:4256 g10/keyedit.c:4299
 #, 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:3976 g10/keyedit.c:4040 g10/keyedit.c:4083
+#: g10/keyedit.c:4194 g10/keyedit.c:4258 g10/keyedit.c:4301
 msgid " (non-exportable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:3980
+#: g10/keyedit.c:4198
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Aquesta signatura va caducar el %s.\n"
 
-#: g10/keyedit.c:3984
+#: g10/keyedit.c:4202
 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:3988
+#: g10/keyedit.c:4206
 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:4015
+#: g10/keyedit.c:4233
 #, 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:4041
+#: g10/keyedit.c:4259
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:4048
+#: g10/keyedit.c:4266
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocat per %08lX el %s\n"
 
-#: g10/keyedit.c:4070
+#: g10/keyedit.c:4288
 msgid "You are about to revoke these signatures:\n"
 msgstr "Esteu a punt de revocar aquestes signatures:\n"
 
 # (s/N)?  ivb
-#: g10/keyedit.c:4090
+#: g10/keyedit.c:4308
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realment voleu crear els certificats de revocació? (s/N) "
 
-#: g10/keyedit.c:4120
+#: g10/keyedit.c:4338
 msgid "no secret key\n"
 msgstr "ho hi ha clau secreta\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4408
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4425
 #, 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:4271
+#: g10/keyedit.c:4489
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:4333
+#: g10/keyedit.c:4551
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4646
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "S'està mostrant el photo ID %s de mida %ld per a la clau 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:293
+#: g10/keygen.c:258
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "la preferència %c%lu és duplicada\n"
 
-#: g10/keygen.c:300
+#: g10/keygen.c:265
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "hi ha massa preferències «%c»\n"
 
-#: g10/keygen.c:302
+#: g10/keygen.c:267
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "hi ha massa preferències «%c»\n"
 
-#: g10/keygen.c:304
+#: g10/keygen.c:269
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "hi ha massa preferències «%c»\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:394
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "hi ha un caràcter invàlid en la cadena de preferència\n"
 
-#: g10/keygen.c:829
+#: g10/keygen.c:822
 msgid "writing direct signature\n"
 msgstr "s'està escrivint una signatura directa\n"
 
-#: g10/keygen.c:868
+#: g10/keygen.c:861
 msgid "writing self signature\n"
 msgstr "s'està escrivint l'autosignatura\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing key binding signature\n"
 msgstr "s'està escrivint la signatura de comprovació de la clau\n"
 
-#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2632
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
 #, 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:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2638
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
 #, 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:1249
+#: g10/keygen.c:1239
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1252
+#: g10/keygen.c:1242
 #, fuzzy
 msgid "Encrypt"
 msgstr "xifra dades"
 
-#: g10/keygen.c:1255
+#: g10/keygen.c:1245
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1263
+#: g10/keygen.c:1253
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1268
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1282
+#: g10/keygen.c:1272
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1287
+#: g10/keygen.c:1277
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1290
+#: g10/keygen.c:1280
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr ""
 
-#: g10/keygen.c:1293
+#: g10/keygen.c:1283
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1296
+#: g10/keygen.c:1286
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1340
 msgid "Please select what kind of key you want:\n"
 msgstr "Seleccioneu quin tipus de clau voleu:\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1342
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA i ElGamal (predeterminat)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1343
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (només signar)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1345
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (només signar)\n"
 
-#: g10/keygen.c:1357
+#: g10/keygen.c:1347
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (només xifrar)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1348
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (només signar)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1350
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/keygen.c:1362
+#: g10/keygen.c:1352
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/keygen.c:1431 g10/keygen.c:2509
+#: g10/keygen.c:1421 g10/keygen.c:2506
 #, 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:1441
+#: g10/keygen.c:1431
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1438
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Quina grandària voleu? (1024) "
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1452
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1468
+#: g10/keygen.c:1458
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La grandària sol·licitada és %u bits\n"
 
-#: g10/keygen.c:1473 g10/keygen.c:1478
+#: g10/keygen.c:1463 g10/keygen.c:1468
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrodonida fins a %u bits\n"
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1515
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3755,7 +3850,7 @@ msgstr ""
 "      <n>m = la clau caduca als n mesos\n"
 "      <n>y = la clau caduca als n anys\n"
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1526
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3771,41 +3866,42 @@ msgstr ""
 "      <n>m = la signatura caduca als n mesos\n"
 "      <n>y = la signatura caduca als n anys\n"
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1549
 msgid "Key is valid for? (0) "
 msgstr "Indiqueu la validesa de la clau (0) "
 
-#: g10/keygen.c:1563
-msgid "Signature is valid for? (0) "
+#: g10/keygen.c:1554
+#, fuzzy, c-format
+msgid "Signature is valid for? (%s) "
 msgstr "Indiqueu la validesa de la signatura (0) "
 
-#: g10/keygen.c:1568
+#: g10/keygen.c:1572
 msgid "invalid value\n"
 msgstr "el valor no és vàlid\n"
 
-#: g10/keygen.c:1575
+#: g10/keygen.c:1579
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s no caduca en absolut\n"
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1580
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s no caduca en absolut\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1585
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s caduca el %s\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1586
 #, 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:1590
+#: g10/keygen.c:1592
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3813,12 +3909,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:1595
+#: g10/keygen.c:1597
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "És correcte? (s/n)"
 
-#: g10/keygen.c:1638
+#: g10/keygen.c:1641
 #, fuzzy
 msgid ""
 "\n"
@@ -3835,44 +3931,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1651
+#: g10/keygen.c:1654
 msgid "Real name: "
 msgstr "Nom i cognoms: "
 
-#: g10/keygen.c:1659
+#: g10/keygen.c:1662
 msgid "Invalid character in name\n"
 msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1664
 msgid "Name may not start with a digit\n"
 msgstr "El nom no pot començar amb un dígit\n"
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1666
 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:1671
+#: g10/keygen.c:1674
 msgid "Email address: "
 msgstr "Adreça electrònica: "
 
-#: g10/keygen.c:1682
+#: g10/keygen.c:1685
 msgid "Not a valid email address\n"
 msgstr "No és una adreça vàlida\n"
 
-#: g10/keygen.c:1690
+#: g10/keygen.c:1693
 msgid "Comment: "
 msgstr "Comentari: "
 
-#: g10/keygen.c:1696
+#: g10/keygen.c:1699
 msgid "Invalid character in comment\n"
 msgstr "Hi ha un caràcter invàlid en el camp *comentari*\n"
 
-#: g10/keygen.c:1719
+#: g10/keygen.c:1722
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Esteu usant el joc de caràcters `%s'.\n"
 
-#: g10/keygen.c:1725
+#: g10/keygen.c:1728
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3883,7 +3979,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1733
 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"
 
@@ -3900,23 +3996,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:1746
+#: g10/keygen.c:1749
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoXx"
 
-#: g10/keygen.c:1756
+#: g10/keygen.c:1759
 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:1757
+#: g10/keygen.c:1760
 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:1776
+#: g10/keygen.c:1779
 msgid "Please correct the error first\n"
 msgstr "Corregiu l'error primer\n"
 
-#: g10/keygen.c:1816
+#: g10/keygen.c:1819
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3924,12 +4020,12 @@ msgstr ""
 "Cal una contrasenya per a protegir la clau secreta.\n"
 "\n"
 
-#: g10/keygen.c:1826 g10/passphrase.c:1105
+#: g10/keygen.c:1829 g10/passphrase.c:786
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1832
+#: g10/keygen.c:1835
 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"
@@ -3941,7 +4037,7 @@ msgstr ""
 "useu aquest programa amb l'opció \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1857
 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"
@@ -3953,53 +4049,53 @@ msgstr ""
 "nombres primers; açò dóna oportunitat al generador de nombres aleatoris\n"
 "d'aconseguir prou entropia.\n"
 
-#: g10/keygen.c:2578
+#: g10/keygen.c:2575
 msgid "Key generation canceled.\n"
 msgstr "La generació de claus ha estat cancel·lada.\n"
 
-#: g10/keygen.c:2766 g10/keygen.c:2910
+#: g10/keygen.c:2774 g10/keygen.c:2918
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "s'està escrivint la clau pública a «%s»\n"
 
-#: g10/keygen.c:2768 g10/keygen.c:2913
+#: g10/keygen.c:2776 g10/keygen.c:2921
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: g10/keygen.c:2771 g10/keygen.c:2916
+#: g10/keygen.c:2779 g10/keygen.c:2924
 #, 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:2899
+#: g10/keygen.c:2907
 #, 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:2905
+#: g10/keygen.c:2913
 #, 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:2923
+#: g10/keygen.c:2931
 #, 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:2930
+#: g10/keygen.c:2938
 #, 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:2953
+#: g10/keygen.c:2961
 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:2964
+#: g10/keygen.c:2972
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4008,13 +4104,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:2976 g10/keygen.c:3105 g10/keygen.c:3220
+#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
 #, 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:3028 g10/keygen.c:3156 g10/sign.c:290
+#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4023,7 +4119,7 @@ msgstr ""
 "amb el rellotge)\n"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keygen.c:3030 g10/keygen.c:3158 g10/sign.c:292
+#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4031,380 +4127,360 @@ 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:3039 g10/keygen.c:3169
+#: g10/keygen.c:3047 g10/keygen.c:3177
 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:3078 g10/keygen.c:3202
+#: g10/keygen.c:3086 g10/keygen.c:3210
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Crear realment? "
 
-#: g10/keygen.c:3355
+#: g10/keygen.c:3363
 #, 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:3402
+#: g10/keygen.c:3410
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: g10/keygen.c:3428
+#: g10/keygen.c:3436
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
 
-#: g10/keygen.c:3508
-#, c-format
-msgid "length of RSA modulus is not %d\n"
-msgstr ""
-
-#: g10/keygen.c:3514
-msgid "public exponent too large (more than 32 bits)\n"
-msgstr ""
-
-#: g10/keygen.c:3520 g10/keygen.c:3526
-#, c-format
-msgid "length of an RSA prime is not %d\n"
-msgstr ""
-
-#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
+#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
 msgid "never     "
 msgstr "mai       "
 
-#: g10/keylist.c:264
+#: g10/keylist.c:265
 msgid "Critical signature policy: "
 msgstr "Política de signatura crítica: "
 
-#: g10/keylist.c:266
+#: g10/keylist.c:267
 msgid "Signature policy: "
 msgstr "Política de signatura: "
 
-#: g10/keylist.c:305
+#: g10/keylist.c:306
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:354 g10/keylist.c:398
+#: 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:372
+#: g10/keylist.c:373
 msgid "Critical signature notation: "
 msgstr "Notació de signatura crítica: "
 
-#: g10/keylist.c:374
+#: g10/keylist.c:375
 msgid "Signature notation: "
 msgstr "Notació de signatura: "
 
-#: g10/keylist.c:385
+#: g10/keylist.c:386
 msgid "not human readable"
 msgstr "no llegible per humans"
 
-#: g10/keylist.c:486
+#: g10/keylist.c:487
 msgid "Keyring"
 msgstr "Anell"
 
-#: g10/keylist.c:792
+#: g10/keylist.c:793
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr " [caduca: %s]"
 
-#: g10/keylist.c:1488
+#: g10/keylist.c:1489
 msgid "Primary key fingerprint:"
 msgstr "Empremtes digital de la clau primària:"
 
-#: g10/keylist.c:1490
+#: g10/keylist.c:1491
 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:1497
+#: g10/keylist.c:1498
 msgid " Primary key fingerprint:"
 msgstr " Empremta digital de la clau primària:"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1500
 msgid "      Subkey fingerprint:"
 msgstr "      Empremta digital de la subclau:"
 
-#: g10/keylist.c:1503 g10/keylist.c:1507
+#: g10/keylist.c:1504 g10/keylist.c:1508
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Empremta digital ="
 
-#: g10/keylist.c:1574
+#: g10/keylist.c:1575
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1245
+#: g10/keyring.c:1246
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1252
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVÍS: hi ha 2 fitxers amb informació confidencial.\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s és el que no ha canviat\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1255
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s és el nou\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1256
 msgid "Please fix this possible security flaw\n"
 msgstr "Per favor, solucioneu aquest possible problema de seguretat\n"
 
-#: g10/keyring.c:1375
+#: g10/keyring.c:1376
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "s'està comprovant l'anell «%s»\n"
 
-#: g10/keyring.c:1421
+#: g10/keyring.c:1422
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "s'han comprovat %lu claus (%lu signatures)\n"
 
-#: g10/keyring.c:1433
+#: g10/keyring.c:1434
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "s'han comprovat %lu claus (%lu signatures)\n"
 
 # Fitxer indi fins final.  Hau!  ivb
 # Grrr. Com em tracten els esclaus ja... jm
-#: g10/keyring.c:1504
+#: g10/keyring.c:1505
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: s'ha creat l'anell\n"
 
-#: g10/keyserver.c:107
+#: g10/keyserver.c:105
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "AVÍS: les opcions en «%s» encara no estan actives durant aquesta execució\n"
 
-#: g10/keyserver.c:434
+#: g10/keyserver.c:433
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:635
+#: g10/keyserver.c:634
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:718 g10/keyserver.c:1238
+#: g10/keyserver.c:717 g10/keyserver.c:1267
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr ""
 
-#: g10/keyserver.c:808
+#: g10/keyserver.c:815
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/keyserver.c:810
+#: g10/keyserver.c:817
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/keyserver.c:985
+#: g10/keyserver.c:1014
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:989
+#: g10/keyserver.c:1018
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1141
+#: g10/keyserver.c:1170
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1188
+#: g10/keyserver.c:1217
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
-#: g10/keyserver.c:1191
+#: g10/keyserver.c:1220
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
 # «del servidor», «en el servidor»?  ivb
-#: g10/keyserver.c:1198 g10/keyserver.c:1293
+#: g10/keyserver.c:1227 g10/keyserver.c:1322
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "error de servidor de claus"
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1275
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1255
+#: g10/keyserver.c:1284
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1314
+#: g10/keyserver.c:1343
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "no es coneix cap servidor de claus (useu l'opció \"--keyserver\")\n"
 
-#: g10/keyserver.c:1320
+#: g10/keyserver.c:1349
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1361
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1366
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1374
 #, c-format
-msgid "gpgkeys_%s does not support handler version %d\n"
+msgid "%s does not support handler version %d\n"
 msgstr ""
 
 # «del servidor», «en el servidor»?  ivb
-#: g10/keyserver.c:1351
+#: g10/keyserver.c:1381
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "error de servidor de claus"
 
 # «del servidor», «en el servidor»?  ivb
-#: g10/keyserver.c:1356
+#: g10/keyserver.c:1386
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "error de servidor de claus"
 
-#: g10/keyserver.c:1365
+#: g10/keyserver.c:1395
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "la recepció des del servidor de claus ha fallat: %s\n"
 
-#: g10/keyserver.c:1390 g10/keyserver.c:1424
+#: g10/keyserver.c:1420 g10/keyserver.c:1454
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: no és un ID vàlid\n"
 
-#: g10/keyserver.c:1681
+#: g10/keyserver.c:1711
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
 
-#: g10/keyserver.c:1703
+#: g10/keyserver.c:1733
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1705
+#: g10/keyserver.c:1735
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:249
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "mida extranya per a una clau de sessió xifrada (%d)\n"
 
-#: g10/mainproc.c:262
-#, c-format
-msgid "bad passphrase or unknown cipher algorithm (%d)\n"
-msgstr ""
-"la contrasenya és incorrecta o l'algoritme de xifratge (%d) és desconegut\n"
-
-#: g10/mainproc.c:299
+#: g10/mainproc.c:300
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "clau de sessió xifrada amb %s\n"
 
-#: g10/mainproc.c:309
+#: g10/mainproc.c:310
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "xifrat amb l'algoritme %d (desconegut)\n"
 
-#: g10/mainproc.c:375
+#: g10/mainproc.c:376
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "la clau pública és %08lX\n"
 
-#: g10/mainproc.c:430
+#: g10/mainproc.c:431
 msgid "public key encrypted data: good DEK\n"
 msgstr "dades xifrades amb clau pública: bona clau de xifratge (DEK)\n"
 
-#: g10/mainproc.c:463
+#: g10/mainproc.c:464
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "xifrat amb una clau %2$s de %1$u bits, ID %3$08lX, creada en %4$s\n"
 
-#: g10/mainproc.c:467 g10/pkclist.c:218
+#: g10/mainproc.c:468 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr ""
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:472
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "xifrat amb una clau %s, ID %08lX\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "ha fallat el desxifratge amb la clau pública: %s\n"
 
-#: g10/mainproc.c:499
+#: g10/mainproc.c:500
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "xifrat amb %lu contrasenyes\n"
 
 # FIXME WK: Use ngettext
-#: g10/mainproc.c:501
+#: g10/mainproc.c:502
 msgid "encrypted with 1 passphrase\n"
 msgstr "xifrat amb 1 contrasenya\n"
 
 # I no serà «dades xifrades amb %s»?  ivb
 # Sembla que sí, ho marque per a mirar-ho més endavant. jm
-#: g10/mainproc.c:529 g10/mainproc.c:551
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "s'assumeixen dades xifrades amb %s\n"
 
 # L'optimístic és aquell que té una Fe Cega en que Tot Anirà Bé!  ivb
-#: g10/mainproc.c:537
+#: g10/mainproc.c:538
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "El xifratge IDEA no està disponible, s'intentarà utilitzar optimistament %s "
 "en el seu lloc\n"
 
-#: g10/mainproc.c:569
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr "desxifratge correcte\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:574
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVÍS: el missatge no tenia protecció d'integritat\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVÍS: el missatge xifrat ha estat manipulat!\n"
 
-#: g10/mainproc.c:592
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
@@ -4418,307 +4494,295 @@ 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:786
+#: g10/mainproc.c:803
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocació autònoma: useu \"gpg --import\" per a aplicar-la\n"
 
-#: g10/mainproc.c:1290
+#: g10/mainproc.c:1307
 msgid "signature verification suppressed\n"
 msgstr "s'ha eliminat la verificació de signatura\n"
 
-#: g10/mainproc.c:1332 g10/mainproc.c:1342
+#: g10/mainproc.c:1349 g10/mainproc.c:1359
 msgid "can't handle these multiple signatures\n"
 msgstr "no es poden tractar aquestes signatures múltiples\n"
 
-#: g10/mainproc.c:1352
+#: g10/mainproc.c:1369
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: g10/mainproc.c:1353
+#: g10/mainproc.c:1370
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "              alias \""
 
 # «%.*s» no serà una data?  Caldrà «el» al davant.  ivb
-#: g10/mainproc.c:1357
+#: g10/mainproc.c:1374
 #, 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:1377
+#: g10/mainproc.c:1394
 msgid "Key available at: "
 msgstr "La clau és disponible en: "
 
-#: g10/mainproc.c:1482 g10/mainproc.c:1530
+#: g10/mainproc.c:1499 g10/mainproc.c:1547
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Signatura INCORRECTA de \""
 
-#: g10/mainproc.c:1484 g10/mainproc.c:1532
+#: g10/mainproc.c:1501 g10/mainproc.c:1549
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signatura caducada de \""
 
-#: g10/mainproc.c:1486 g10/mainproc.c:1534
+#: g10/mainproc.c:1503 g10/mainproc.c:1551
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Signatura correcta de \""
 
-#: g10/mainproc.c:1538
+#: g10/mainproc.c:1555
 msgid "[uncertain]"
 msgstr "[incert]"
 
-#: g10/mainproc.c:1570
+#: g10/mainproc.c:1587
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1664
+#: g10/mainproc.c:1681
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: g10/mainproc.c:1669
+#: g10/mainproc.c:1686
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Aquesta signatura caduca el %s\n"
 
-#: g10/mainproc.c:1672
+#: g10/mainproc.c:1689
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: g10/mainproc.c:1673
+#: g10/mainproc.c:1690
 msgid "binary"
 msgstr "binari"
 
-#: g10/mainproc.c:1674
+#: g10/mainproc.c:1691
 msgid "textmode"
 msgstr "mode text"
 
-#: g10/mainproc.c:1674 g10/trustdb.c:530
+#: g10/mainproc.c:1691 g10/trustdb.c:531
 msgid "unknown"
 msgstr "desconeguda"
 
-#: g10/mainproc.c:1694
+#: g10/mainproc.c:1711
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "No s'ha pogut comprovar la signatura: %s\n"
 
-#: g10/mainproc.c:1762 g10/mainproc.c:1778 g10/mainproc.c:1864
+#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
 msgid "not a detached signature\n"
 msgstr "no és una signatura separada\n"
 
-#: g10/mainproc.c:1805
+#: g10/mainproc.c:1822
 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:1813
+#: g10/mainproc.c:1830
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signatura autònoma de classe 0x%02x\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1887
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatura de l'estil antic (PGP 2.x)\n"
 
-#: g10/mainproc.c:1880
+#: g10/mainproc.c:1897
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "s'ha detectat un paquet arrel invàlid en proc_tree()\n"
 
 # bolcats de memòria?  ivb
-#: g10/misc.c:121
+#: g10/misc.c:122
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "no s'han pogut desactivar els bolcats de memòria: %s\n"
 
-#: g10/misc.c:141 g10/misc.c:169 g10/misc.c:241
+#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "ha fallat l'actualització de la base de dades de confiança: %s\n"
 
-#: g10/misc.c:206
+#: g10/misc.c:207
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "base de dades de confiança: ha fallat la lectura (n=%d): %s\n"
 
-#: g10/misc.c:315
+#: g10/misc.c:316
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "no es pot treballar amb l'algoritme de clau pública %d\n"
 
-#: g10/misc.c:330
+#: g10/misc.c:331
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "l'algoritme de xifratge no és implementat"
 
-#: g10/misc.c:345
+#: g10/misc.c:346
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:351
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
 
-#: g10/misc.c:446
+#: g10/misc.c:447
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "el mòdul de xifratge IDEA no està present\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:448
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr "vegeu http://www.gnupg.org/why-not-idea.html per a més informació\n"
 
-#: g10/misc.c:680
+#: g10/misc.c:681
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: l'opció «%s» està desaconsellada.\n"
 
-#: g10/misc.c:684
+#: g10/misc.c:685
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
 
-#: g10/misc.c:686
+#: g10/misc.c:687
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "si us plau, utilitzeu «%s%s» en el seu lloc\n"
 
+#: g10/misc.c:694
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
+msgstr "AVÍS: %s és una opció desaconsellada.\n"
+
 # Gènere?  Nombre?  Passat, futur?  ivb
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
-#: g10/misc.c:697
+#: g10/misc.c:707
 msgid "Uncompressed"
 msgstr "No comprimit"
 
 # Gènere?  Nombre?  Passat, futur?  ivb
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
-#: g10/misc.c:722
+#: g10/misc.c:732
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "No comprimit"
 
-#: g10/misc.c:832
+#: g10/misc.c:842
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "aquest missatge pot no ser usable per %s\n"
 
-#: g10/misc.c:989
+#: g10/misc.c:999
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "s'estan llegint opcions de «%s»\n"
 
-#: g10/misc.c:1014
+#: g10/misc.c:1024
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
 
-#: g10/openfile.c:84
+#: g10/openfile.c:86
 #, c-format
 msgid "File `%s' exists. "
 msgstr "El fitxer «%s» existeix. "
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Voleu sobreescriure? (s/N) "
 
-#: g10/openfile.c:119
+#: g10/openfile.c:121
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: el sufix és desconegut\n"
 
-#: g10/openfile.c:141
+#: g10/openfile.c:143
 msgid "Enter new filename"
 msgstr "Introduïu el nou nom del fitxer"
 
 # Indi?  ivb
-#: g10/openfile.c:184
+#: g10/openfile.c:188
 msgid "writing to stdout\n"
 msgstr "s'està escrivint en stdout\n"
 
-#: g10/openfile.c:296
+#: g10/openfile.c:300
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "s'asumeix que hi ha dades signades en «%s»\n"
 
-#: g10/openfile.c:375
+#: g10/openfile.c:379
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
 
-#: g10/openfile.c:377
+#: g10/openfile.c:381
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 "AVÍS: les opcions en «%s» encara no estan actives durant aquesta execució\n"
 
-#: g10/openfile.c:409
+#: g10/openfile.c:413
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: s'ha creat el directori\n"
 
-#: g10/parse-packet.c:137
+#: g10/parse-packet.c:138
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "no es pot treballar amb l'algoritme de clau pública %d\n"
 
-#: g10/parse-packet.c:707
+#: g10/parse-packet.c:708
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVÍS: la clau de sessió pot estar xifrada simètricament de forma insegura\n"
 
-#: g10/parse-packet.c:1132
+#: g10/parse-packet.c:1145
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquet de tipus %d té el bit crític activat\n"
 
-#: g10/passphrase.c:478 g10/passphrase.c:525
+#: g10/passphrase.c:305
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
 
-#: g10/passphrase.c:486
-msgid "can't set client pid for the agent\n"
-msgstr "no es pot establir el pid del client per l'agent\n"
-
-# llija/llegisca/llegesca.  ivb
-#: g10/passphrase.c:494
-msgid "can't get server read FD for the agent\n"
-msgstr "no es pot fer que el servidor llegesca el DF per a l'agent\n"
-
-#: g10/passphrase.c:501
-msgid "can't get server write FD for the agent\n"
-msgstr "no es pot fer que el servidor escriga el DF per a l'agent\n"
-
-#: g10/passphrase.c:534
+#: g10/passphrase.c:317
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "la variable d'entorn GPG_AGENT_INFO és malformada\n"
 
-#: g10/passphrase.c:547
+#: g10/passphrase.c:332
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "la versió %d del protocol de gpg-agent no està suportada\n"
 
-#: g10/passphrase.c:568
+#: g10/passphrase.c:345
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "no s'ha pogut connectar amb «%s»: %s\n"
 
-#: g10/passphrase.c:590
-msgid "communication problem with gpg-agent\n"
-msgstr "hi ha un problema de comunicació amb el gpg-agent\n"
-
-#: g10/passphrase.c:597 g10/passphrase.c:937 g10/passphrase.c:1049
+#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
 msgid "problem with the agent - disabling agent use\n"
 msgstr "hi ha un problema amb l'agent: es deshabilitarà el seu ús\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1209
+#: g10/passphrase.c:511 g10/passphrase.c:890
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID de la clau principal %08lX)"
@@ -4734,7 +4798,7 @@ msgstr " (ID de la clau principal %08lX)"
 # Se't passava l'argument «*».  printf(3), hieroglyph(7).  ivb
 # Ah!  Prova-ho, no casque alguna cosa :P  ivb
 # Ah, ja veig! Moltes gràcies! Aquest msgstr ha quedat curiós :) jm
-#: g10/passphrase.c:714
+#: g10/passphrase.c:525
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4745,41 +4809,28 @@ msgstr ""
 "«%2$.*1$s»\n"
 "clau %4$s de %3$u bits, ID %5$08lX, creada en %6$s%7$s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:550
 msgid "Repeat passphrase\n"
 msgstr "Repetiu la contrasenya\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:552
 msgid "Enter passphrase\n"
 msgstr "Introduïu la contrasenya\n"
 
-#: g10/passphrase.c:781
-msgid "passphrase too long\n"
-msgstr "la contrasenya és massa llarga\n"
-
-#: g10/passphrase.c:794
-msgid "invalid response from agent\n"
-msgstr "la resposta de l'agent és invàlida\n"
-
-#: g10/passphrase.c:810 g10/passphrase.c:931
+#: g10/passphrase.c:628
 msgid "cancelled by user\n"
 msgstr "s'ha cancel·lat per l'usuari\n"
 
-#: g10/passphrase.c:815 g10/passphrase.c:1020
-#, c-format
-msgid "problem with the agent: agent returns 0x%lx\n"
-msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
-
-#: g10/passphrase.c:1100 g10/passphrase.c:1263
+#: g10/passphrase.c:781 g10/passphrase.c:944
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "no es pot demanar la contrasenya en mode desatès\n"
 
-#: g10/passphrase.c:1107 g10/passphrase.c:1268
+#: g10/passphrase.c:788 g10/passphrase.c:949
 msgid "Enter passphrase: "
 msgstr "Introduïu la contrasenya: "
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:871
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4789,21 +4840,21 @@ msgstr ""
 "Necessiteu la contrasenya per desblocar la clau secreta de\n"
 "l'usuari: \""
 
-#: g10/passphrase.c:1196
+#: g10/passphrase.c:877
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "clau %2$s de %1$u bits, ID %3$08lX, creada en %4$s"
 
-#: g10/passphrase.c:1205
+#: g10/passphrase.c:886
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1272
+#: g10/passphrase.c:953
 msgid "Repeat passphrase: "
 msgstr "Repetiu la contrasenya: "
 
-#: g10/photoid.c:66
+#: g10/photoid.c:67
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4818,161 +4869,161 @@ msgstr ""
 "molt gran!\n"
 "Es recomana una imatge amb una mida aproximada de 240x288.\n"
 
-#: g10/photoid.c:80
+#: g10/photoid.c:81
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Introduïu el nom del fitxer JPEG per al photo ID: "
 
-#: g10/photoid.c:94
+#: g10/photoid.c:95
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "No s'ha pogut obrir la foto «%s»: %s\n"
 
-#: g10/photoid.c:102
+#: g10/photoid.c:103
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:104
+#: g10/photoid.c:105
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/photoid.c:119
+#: g10/photoid.c:120
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "«%s» no és un fitxer JPEG\n"
 
-#: g10/photoid.c:136
+#: g10/photoid.c:137
 msgid "Is this photo correct (y/N/q)? "
 msgstr "És aquesta foto correcta (s/N/x)? "
 
-#: g10/photoid.c:338
+#: g10/photoid.c:339
 msgid "unable to display photo ID!\n"
 msgstr "no s'ha pogut mostrar el photo ID!\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:580
+#: g10/pkclist.c:62 g10/revoke.c:581
 msgid "No reason specified"
 msgstr "No s'ha especificat cap raó"
 
-#: g10/pkclist.c:63 g10/revoke.c:582
+#: g10/pkclist.c:64 g10/revoke.c:583
 msgid "Key is superseded"
 msgstr "La clau ha estat substituïda"
 
-#: g10/pkclist.c:65 g10/revoke.c:581
+#: g10/pkclist.c:66 g10/revoke.c:582
 msgid "Key has been compromised"
 msgstr "La clau ha estat compromesa"
 
-#: g10/pkclist.c:67 g10/revoke.c:583
+#: g10/pkclist.c:68 g10/revoke.c:584
 msgid "Key is no longer used"
 msgstr "La clau ja no s'usa"
 
-#: g10/pkclist.c:69 g10/revoke.c:584
+#: g10/pkclist.c:70 g10/revoke.c:585
 msgid "User ID is no longer valid"
 msgstr "L'ID d'usuari ja no és vàlid"
 
-#: g10/pkclist.c:73
+#: g10/pkclist.c:74
 msgid "reason for revocation: "
 msgstr "raó de la revocació: "
 
-#: g10/pkclist.c:90
+#: g10/pkclist.c:91
 msgid "revocation comment: "
 msgstr "comentari de la revocació: "
 
-#: g10/pkclist.c:205
+#: g10/pkclist.c:206
 msgid "iImMqQsS"
 msgstr "iImMxXoO"
 
-#: g10/pkclist.c:213
+#: g10/pkclist.c:214
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "No hi ha cap valor de confiança assignat a:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:245
+#: g10/pkclist.c:246
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr ""
 
-#: g10/pkclist.c:255
+#: g10/pkclist.c:256
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr ""
 "%08lX: No hi ha res que indique que la signatura pertany al seu propietari.\n"
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:271
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = No ho sé\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = NO confie\n"
 
-#: g10/pkclist.c:278
+#: g10/pkclist.c:279
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Hi confie absolutament\n"
 
-#: g10/pkclist.c:284
+#: g10/pkclist.c:285
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = torna al menú principal\n"
 
-#: g10/pkclist.c:287
+#: g10/pkclist.c:288
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " o = omet aquesta clau\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " x = ix\n"
 
-#: g10/pkclist.c:292
+#: g10/pkclist.c:293
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:298 g10/revoke.c:609
+#: g10/pkclist.c:299 g10/revoke.c:610
 msgid "Your decision? "
 msgstr "La vostra decisió? "
 
-#: g10/pkclist.c:319
+#: g10/pkclist.c:320
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Realment voleu assignar confiança absoluta a aquesta clau? "
 
-#: g10/pkclist.c:333
+#: g10/pkclist.c:334
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificats que duen a una clau de confiança absoluta:\n"
 
-#: g10/pkclist.c:418
+#: g10/pkclist.c:419
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: No hi ha res que indique que la signatura pertany al seu propietari.\n"
 
-#: g10/pkclist.c:423
+#: g10/pkclist.c:424
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: No hi ha res que indique que la signatura pertany al seu propietari.\n"
 
-#: g10/pkclist.c:429
+#: g10/pkclist.c:430
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Aquesta clau pertany probablement al seu propietari\n"
 
-#: g10/pkclist.c:434
+#: g10/pkclist.c:435
 msgid "This key belongs to us\n"
 msgstr "Aquesta clau és nostra\n"
 
-#: g10/pkclist.c:460
+#: g10/pkclist.c:461
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -4984,94 +5035,94 @@ msgstr ""
 "«sí» a la següent pregunta\n"
 "\n"
 
-#: g10/pkclist.c:467
+#: g10/pkclist.c:468
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Voleu usar de tota manera aquesta clau?"
 
-#: g10/pkclist.c:501
+#: g10/pkclist.c:502
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVÍS: S'està usant una clau no fiable!\n"
 
-#: g10/pkclist.c:508
+#: g10/pkclist.c:509
 #, fuzzy
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "AVÍS: la clau %08lX pot estar revocada: la clau de revocació %08lX no està "
 "present.\n"
 
-#: g10/pkclist.c:517
+#: g10/pkclist.c:518
 #, fuzzy
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "AVÍS: Aquesta clau ha estat revocada pel propietari!\n"
 
-#: g10/pkclist.c:520
+#: g10/pkclist.c:521
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVÍS: Aquesta clau ha estat revocada pel propietari!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "      Açò podria significar que la signatura és falsificada.\n"
 
-#: g10/pkclist.c:527
+#: g10/pkclist.c:528
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVÍS: Aquesta subclau ha estat revocada pel propietari!\n"
 
-#: g10/pkclist.c:532
+#: g10/pkclist.c:533
 msgid "Note: This key has been disabled.\n"
 msgstr "Nota: Aquesta clau ha estat desactivada.\n"
 
-#: g10/pkclist.c:537
+#: g10/pkclist.c:538
 msgid "Note: This key has expired!\n"
 msgstr "Nota: La clau ha caducat!\n"
 
-#: g10/pkclist.c:548
+#: g10/pkclist.c:549
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVÍS: Aquesta clau no ve certificada per una signatura de confiança!\n"
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:551
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "    No hi ha res que indique que la signatura pertany al seu propietari.\n"
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:559
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVÍS: La clau NO és de confiança!\n"
 
-#: g10/pkclist.c:559
+#: g10/pkclist.c:560
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "          Probablement la signatura és FALSA.\n"
 
-#: g10/pkclist.c:567
+#: g10/pkclist.c:568
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "AVÍS: Aquesta clau no ve certificada per signatures prou fiables!\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:570
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "No és segur que la signatura pertanya al seu propietari.\n"
 
-#: g10/pkclist.c:734 g10/pkclist.c:767 g10/pkclist.c:936 g10/pkclist.c:996
+#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: es descarta: %s\n"
 
-#: g10/pkclist.c:744 g10/pkclist.c:968
+#: g10/pkclist.c:745 g10/pkclist.c:969
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: es descarta: la clau pública ja està present\n"
 
-#: g10/pkclist.c:786
+#: g10/pkclist.c:787
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "No heu especificat un ID d'usuari. (podeu usar «-r»)\n"
 
-#: g10/pkclist.c:802
+#: g10/pkclist.c:803
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:828
+#: g10/pkclist.c:829
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5079,172 +5130,172 @@ msgstr ""
 "\n"
 "Introduïu l'ID d'usuari. Finalitzeu amb una línia en blanc: "
 
-#: g10/pkclist.c:844
+#: g10/pkclist.c:845
 msgid "No such user ID.\n"
 msgstr "Usuari inexistent.\n"
 
-#: g10/pkclist.c:849 g10/pkclist.c:911
+#: g10/pkclist.c:850 g10/pkclist.c:912
 msgid "skipped: public key already set as default recipient\n"
 msgstr "es descarta: la clau pública ja s'ha especificat com a destinatari\n"
 
-#: g10/pkclist.c:867
+#: g10/pkclist.c:868
 msgid "Public key is disabled.\n"
 msgstr "La clau pública està desactivada.\n"
 
-#: g10/pkclist.c:874
+#: g10/pkclist.c:875
 msgid "skipped: public key already set\n"
 msgstr "es descarta: la clau pública ja està establida\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:904
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
 
-#: g10/pkclist.c:948
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: es descarta: la clau pública està desactivada\n"
 
-#: g10/pkclist.c:1003
+#: g10/pkclist.c:1004
 msgid "no valid addressees\n"
 msgstr "no hi ha adreces vàlides\n"
 
-#: g10/plaintext.c:90
+#: g10/plaintext.c:91
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "les dades no s'han desat; useu l'opció \"--output\" per desar-les\n"
 
-#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
+#: g10/plaintext.c:136 g10/plaintext.c:141 g10/plaintext.c:159
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "error en crear «%s»: %s\n"
 
 # Indi? ivb
 # Em pense que no. jm
-#: g10/plaintext.c:446
+#: g10/plaintext.c:447
 msgid "Detached signature.\n"
 msgstr "Signatura separada.\n"
 
-#: g10/plaintext.c:450
+#: g10/plaintext.c:452
 msgid "Please enter name of data file: "
 msgstr "Introduïu el nom del fitxer de dades: "
 
-#: g10/plaintext.c:478
+#: g10/plaintext.c:481
 msgid "reading stdin ...\n"
 msgstr "s'està llegint d'stdin...\n"
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:515
 msgid "no signed data\n"
 msgstr "no hi ha dades signades\n"
 
-#: g10/plaintext.c:526
+#: g10/plaintext.c:529
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "no s'han pogut obrir les dades signades `%s'\n"
 
 # Indi? ivb
 # Yeh... jm
-#: g10/pubkey-enc.c:103
+#: g10/pubkey-enc.c:104
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "el destinatari és anònim; es provarà la clau secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:119
+#: g10/pubkey-enc.c:120
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "d'acord, som el destinatari anònim.\n"
 
-#: g10/pubkey-enc.c:207
+#: g10/pubkey-enc.c:208
 msgid "old encoding of the DEK is not supported\n"
 msgstr "la codificació antiga del DEK no està suportada\n"
 
-#: g10/pubkey-enc.c:228
+#: g10/pubkey-enc.c:229
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "l'algoritme de xifratge %d%s és desconegut o està desactivat\n"
 
-#: g10/pubkey-enc.c:266
+#: g10/pubkey-enc.c:267
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "NOTA: no s'ha trobat l'algoritme de xifratge %d en les preferències\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:287
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTA: la clau secreta %08lX caduca el %s\n"
 
-#: g10/pubkey-enc.c:292
+#: g10/pubkey-enc.c:293
 msgid "NOTE: key has been revoked"
 msgstr "NOTA: aquesta clau ha estat revocada!"
 
-#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:545
+#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
+#: g10/revoke.c:188 g10/revoke.c:546
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "ha fallat build_packet: %s\n"
 
-#: g10/revoke.c:146
+#: g10/revoke.c:147
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "clau %08lX: sense ID\n"
 
-#: g10/revoke.c:272
+#: g10/revoke.c:273
 msgid "To be revoked by:\n"
 msgstr "A ser revocada per:\n"
 
-#: g10/revoke.c:276
+#: g10/revoke.c:277
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Aquesta és una clau de revocació sensible)\n"
 
-#: g10/revoke.c:280
+#: g10/revoke.c:281
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Voleu crear un certificat de revocació per a aquesta clau? "
 
-#: g10/revoke.c:293 g10/revoke.c:511
+#: g10/revoke.c:294 g10/revoke.c:512
 msgid "ASCII armored output forced.\n"
 msgstr "s'ha forçat l'eixida d'armadura ASCII.\n"
 
-#: g10/revoke.c:307 g10/revoke.c:525
+#: g10/revoke.c:308 g10/revoke.c:526
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "ha fallat make_keysig_packet: %s\n"
 
-#: g10/revoke.c:370
+#: g10/revoke.c:371
 msgid "Revocation certificate created.\n"
 msgstr "S'ha creat el certificat de revocació.\n"
 
-#: g10/revoke.c:376
+#: g10/revoke.c:377
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "no s'han ttrobat claus de revocació per a «%s»\n"
 
-#: g10/revoke.c:432
+#: g10/revoke.c:433
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
 
-#: g10/revoke.c:461
+#: g10/revoke.c:462
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "no hi ha cap clau pública corresponent: %s\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:473
 msgid "public key does not match secret key!\n"
 msgstr "la clau pública no coincideix amb la clau secreta!\n"
 
-#: g10/revoke.c:479
+#: g10/revoke.c:480
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Voleu crear un certificat de revocació per a aquesta clau? "
 
-#: g10/revoke.c:496
+#: g10/revoke.c:497
 msgid "unknown protection algorithm\n"
 msgstr "l'algorisme de protecció és desconegut\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOTA: Aquesta clau no està protegida!\n"
 
-#: g10/revoke.c:551
+#: g10/revoke.c:552
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5263,115 +5314,115 @@ msgstr ""
 "d'impressió de la vostra màquina podria emmagatzemar les dades i fer-les\n"
 "disponibles a altres!\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid "Please select the reason for the revocation:\n"
 msgstr "Seleccioneu la raó de la revocació:\n"
 
-#: g10/revoke.c:602
+#: g10/revoke.c:603
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: g10/revoke.c:604
+#: g10/revoke.c:605
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Segurament voleu seleccionar %d ací)\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:646
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "Introduïu una descripció opcional; finalitzeu amb una línia en blanc:\n"
 
-#: g10/revoke.c:673
+#: g10/revoke.c:674
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Raó de la revocació: %s\n"
 
-#: g10/revoke.c:675
+#: g10/revoke.c:676
 msgid "(No description given)\n"
 msgstr "(No es va donar una descripció)\n"
 
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "És açò correcte? "
 
 # Parts?  Peces?  ivb
-#: g10/seckey-cert.c:54
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "parts de la clau secreta no estan disponbles\n"
 
-#: g10/seckey-cert.c:60
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "l'algoritme de protecció %d%s no està suportat\n"
 
-#: g10/seckey-cert.c:71
+#: g10/seckey-cert.c:72
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "l'algoritme de protecció %d%s no està suportat\n"
 
-#: g10/seckey-cert.c:265
+#: g10/seckey-cert.c:266
 msgid "Invalid passphrase; please try again"
 msgstr "La contrasenya no és vàlida; torneu a intentar-ho"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:267
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:326
+#: g10/seckey-cert.c:327
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "AVÍS: la clau és feble; per favor, canvieu la contrasenya.\n"
 
-#: g10/seckey-cert.c:364
+#: g10/seckey-cert.c:365
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "s'està generant la suma de comprovació desaconsellada de 16-bits per a la "
 "protecció de la clau secreta\n"
 
-#: g10/seskey.c:52
+#: g10/seskey.c:53
 msgid "weak key created - retrying\n"
 msgstr "s'hi ha creat una clau feble - reintent\n"
 
 # És no-wrap?  ivb
-#: g10/seskey.c:57
+#: g10/seskey.c:58
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "no s'ha pogut evitar una clau feble per a xifratge simètric;\n"
 "hi ha hagut %d intents!\n"
 
-#: g10/seskey.c:213
+#: g10/seskey.c:214
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA requereix l'ús d'un algoritme de dispersió de 160 bits\n"
 
-#: g10/sig-check.c:75
+#: g10/sig-check.c:76
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "AVÍS: conflicte de signatures digest en el missatge\n"
 
-#: g10/sig-check.c:99
+#: g10/sig-check.c:100
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 
-#: g10/sig-check.c:102
+#: g10/sig-check.c:103
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "AVÍS: no es pot desfer la nominació d'una clau com a revocador designat!\n"
 
-#: g10/sig-check.c:168
+#: g10/sig-check.c:169
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "la clau pública %08lX és %lu segons anterior a la signatura\n"
 
-#: g10/sig-check.c:169
+#: g10/sig-check.c:170
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "la clau pública %08lX és %lu segons anterior a la signatura\n"
 
 # Werner FIXME: Use ngettext. jm
-#: g10/sig-check.c:180
+#: g10/sig-check.c:181
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5380,7 +5431,7 @@ msgstr ""
 "amb el rellotge)\n"
 
 # Werner FIXME: use ngettext. jm
-#: g10/sig-check.c:182
+#: g10/sig-check.c:183
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5388,61 +5439,61 @@ msgstr ""
 "la clau s'ha creat %lu segons en el futur (salt en el temps o problemes\n"
 "amb el rellotge)\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:193
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTA: la clau de signatura %08lX va caducar el %s\n"
 
-#: g10/sig-check.c:275
+#: g10/sig-check.c:276
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "es supossa una signatura incorrecta de la clau %08lX a causa d'un bit crític "
 "desconegut\n"
 
-#: g10/sig-check.c:532
+#: g10/sig-check.c:533
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
 "clau %08lX: no hi ha una subclau per al paquet de la subclau de revocació\n"
 
-#: g10/sig-check.c:558
+#: g10/sig-check.c:559
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
 "clau %08lX: no hi ha una subclau per a la signatura de l'enllaç de la "
 "subclau\n"
 
-#: g10/sign.c:85
+#: g10/sign.c:86
 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:93
+#: g10/sign.c:94
 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:112
+#: g10/sign.c:113
 #, 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:138
+#: g10/sign.c:139
 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:146
+#: g10/sign.c:147
 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:159
+#: g10/sign.c:160
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5450,7 +5501,7 @@ msgstr ""
 "AVÍS: no s'ha pogut %%-expandir l'url de política (massa gran). S'utilitza "
 "no expandida.\n"
 
-#: g10/sign.c:187
+#: g10/sign.c:188
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5459,76 +5510,76 @@ msgstr ""
 "AVÍS: no s'ha pogut %%-expandir l'url de política (massa gran). S'utilitza "
 "no expandida.\n"
 
-#: g10/sign.c:364
+#: g10/sign.c:365
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 
-#: g10/sign.c:373
+#: g10/sign.c:374
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s signatura de: «%s»\n"
 
-#: g10/sign.c:741
+#: g10/sign.c:761
 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:808
+#: g10/sign.c:830
 #, 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:900
+#: g10/sign.c:922
 msgid "signing:"
 msgstr "signatura:"
 
-#: g10/sign.c:1007
+#: g10/sign.c:1034
 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:1180
+#: g10/sign.c:1212
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "s'utilitzarà xifratge %s\n"
 
-#: g10/skclist.c:126 g10/skclist.c:190
+#: g10/skclist.c:127 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "la clau no està marcada com a insegura - no es pot utilitzar amb el GNA "
 "fals!\n"
 
-#: g10/skclist.c:157
+#: g10/skclist.c:158
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "es descarta «%s»: duplicat\n"
 
-#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "es descarta «%s»: %s\n"
 
-#: g10/skclist.c:170
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: g10/skclist.c:185
+#: g10/skclist.c:186
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "es descarta «%s»: és una clau ElGamal generada per PGP que no és segura per "
 "a signatures!\n"
 
-#: g10/tdbdump.c:59 g10/trustdb.c:365
+#: g10/tdbdump.c:60 g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "registre de confiança %lu, tipus %d: no s'ha pogut escriure: %s\n"
 
-#: g10/tdbdump.c:104
+#: g10/tdbdump.c:105
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5537,361 +5588,361 @@ msgstr ""
 "# Llista de valors de confiança assignats, creat el %s\n"
 "# (Utilitzeu «gpg --import-ownertrust» per a restaurar-les)\n"
 
-#: g10/tdbdump.c:159 g10/tdbdump.c:167 g10/tdbdump.c:172 g10/tdbdump.c:177
+#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: g10/tdbdump.c:159
+#: g10/tdbdump.c:160
 #, fuzzy
 msgid "line too long"
 msgstr "la línia és massa llarga\n"
 
-#: g10/tdbdump.c:167
+#: g10/tdbdump.c:168
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:173
+#: g10/tdbdump.c:174
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/tdbdump.c:178
+#: g10/tdbdump.c:179
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr "importa els valors de confiança"
 
-#: g10/tdbdump.c:214
+#: g10/tdbdump.c:215
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "error en trobar el registre de confiança: %s\n"
 
-#: g10/tdbdump.c:218
+#: g10/tdbdump.c:219
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "error de lectura: %s\n"
 
-#: g10/tdbdump.c:227 g10/trustdb.c:380
+#: g10/tdbdump.c:228 g10/trustdb.c:381
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de dades de confiança: no s'ha pogut sincronitzar: %s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1440
+#: g10/tdbio.c:129 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "reg de la base de dades de confiança %lu: ha fallat lseek: %s\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1447
+#: g10/tdbio.c:135 g10/tdbio.c:1448
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 "reg de la base de dades de confiança %lu: ha fallat la escriptura (n=%d): %"
 "s\n"
 
-#: g10/tdbio.c:244
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "la transacció de la base de dades de confiança és massa gran\n"
 
 # No em passe! ;)  ivb
-#: g10/tdbio.c:497
+#: g10/tdbio.c:498
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "no s'ha pogut tancar «%s»: %s\n"
 
-#: g10/tdbio.c:512
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: el directori no existeix!\n"
 
-#: g10/tdbio.c:522 g10/tdbio.c:545 g10/tdbio.c:588
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "no es pot crear el directori «%s»: %s\n"
 
-#: g10/tdbio.c:524 g10/tdbio.c:591
+#: g10/tdbio.c:525 g10/tdbio.c:592
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "no s'ha pogut obrir «%s»\n"
 
-#: g10/tdbio.c:550
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: no s'ha pogut crear un registre de versió: %s"
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: s'ha creat una base de dades de confiança invàlida\n"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: s'ha creat la base de dades de confiança\n"
 
-#: g10/tdbio.c:597
+#: g10/tdbio.c:598
 msgid "NOTE: trustdb not writable\n"
 msgstr "NOTA: no es pot escriure en la base de dades de confiança\n"
 
-#: g10/tdbio.c:614
+#: g10/tdbio.c:615
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: la base de dades de confiança és invàlida\n"
 
-#: g10/tdbio.c:646
+#: g10/tdbio.c:647
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: no s'ha pogut crear la taula de dispersió: %s\n"
 
-#: g10/tdbio.c:654
+#: g10/tdbio.c:655
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: error en actualitzar el registre de la versió: %s\n"
 
-#: g10/tdbio.c:671 g10/tdbio.c:691 g10/tdbio.c:707 g10/tdbio.c:721
-#: g10/tdbio.c:751 g10/tdbio.c:1373 g10/tdbio.c:1400
+#: g10/tdbio.c:672 g10/tdbio.c:692 g10/tdbio.c:708 g10/tdbio.c:722
+#: g10/tdbio.c:752 g10/tdbio.c:1374 g10/tdbio.c:1401
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: error en llegir el registre de la versió: %s\n"
 
-#: g10/tdbio.c:730
+#: g10/tdbio.c:731
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: error en escriure el registre de la versió: %s\n"
 
-#: g10/tdbio.c:1169
+#: g10/tdbio.c:1170
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de dades de confiança: ha fallat lseek: %s\n"
 
-#: g10/tdbio.c:1177
+#: g10/tdbio.c:1178
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de dades de confiança: ha fallat la lectura (n=%d): %s\n"
 
-#: g10/tdbio.c:1198
+#: g10/tdbio.c:1199
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s no és un fitxer de base de dades de confiança\n"
 
-#: g10/tdbio.c:1216
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registre de versió amb número de registre %lu\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1222
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: la versió de fitxer %d és invàlida\n"
 
-#: g10/tdbio.c:1406
+#: g10/tdbio.c:1407
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: error en llegir el registre lliure: %s\n"
 
-#: g10/tdbio.c:1414
+#: g10/tdbio.c:1415
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: error en escriure el registre de directoris: %s\n"
 
-#: g10/tdbio.c:1424
+#: g10/tdbio.c:1425
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: no s'ha pogut posar a zero un registre: %s\n"
 
-#: g10/tdbio.c:1454
+#: g10/tdbio.c:1455
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: no s'ha pogut afegir un registre: %s\n"
 
-#: g10/tdbio.c:1499
+#: g10/tdbio.c:1500
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "la base de dades de confiança està corrompuda; per favor, executeu «gpg --"
 "fix-trustdb».\n"
 
-#: g10/textfilter.c:147
+#: g10/textfilter.c:148
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "no es poden tractar línies més llargues de %d caràcters\n"
 
-#: g10/textfilter.c:244
+#: g10/textfilter.c:245
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "la línia d'entrada és superior a %d caràcters\n"
 
-#: g10/trustdb.c:226
+#: g10/trustdb.c:227
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "«%s» no és un ID de clau llarg vàlid\n"
 
-#: g10/trustdb.c:257
+#: g10/trustdb.c:258
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "clau %08lX: s'accepta com a clau fiable\n"
 
-#: g10/trustdb.c:295
+#: g10/trustdb.c:296
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr ""
 "la clau %08lX apareix més d'una vegada en la base de dades de confiança\n"
 
-#: g10/trustdb.c:310
+#: g10/trustdb.c:311
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "clau %08lX: no hi ha una clau pública per a la clau fiable - es descarta\n"
 
-#: g10/trustdb.c:320
+#: g10/trustdb.c:321
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "s'ha marcat la clau com a de confiança absoluta.\n"
 
-#: g10/trustdb.c:344
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "registre de confiança %lu, tipus %d: no s'ha pogut llegir: %s\n"
 
-#: g10/trustdb.c:350
+#: g10/trustdb.c:351
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "el registre de confiança %lu no és del tipus demanat %d\n"
 
-#: g10/trustdb.c:446
+#: g10/trustdb.c:447
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:452
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:506
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[revocada]"
 
-#: g10/trustdb.c:508 g10/trustdb.c:513
+#: g10/trustdb.c:509 g10/trustdb.c:514
 #, fuzzy
 msgid "[ expired]"
 msgstr "[caducada]"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 #, fuzzy
 msgid "[ unknown]"
 msgstr "desconeguda"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 #, fuzzy
 msgid "never"
 msgstr "mai       "
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:536
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:576
+#: 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:582 g10/trustdb.c:2157
+#: g10/trustdb.c:583 g10/trustdb.c:2309
 #, 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:591
+#: 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:606
+#: 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:838 g10/trustdb.c:1276
+#: 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:1033
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr "si us plau, feu un --check-trustdb\n"
 
-#: g10/trustdb.c:1037
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "s'està comprovant la base de dades de confiança\n"
 
-#: g10/trustdb.c:1901
+#: g10/trustdb.c:2053
 #, 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:1965
+#: g10/trustdb.c:2117
 msgid "no ultimately trusted keys found\n"
 msgstr "no s'han trobat claus amb confiança absoluta\n"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:2131
 #, 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:2002
+#: g10/trustdb.c:2154
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2240
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2163
+#: g10/trustdb.c:2315
 #, 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"
 
-#: g10/verify.c:116
+#: g10/verify.c:117
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -5902,210 +5953,210 @@ msgstr ""
 "ha de ser el primer que figure en la línia d'ordres.\n"
 
 # LF -> fi de línia?  ivb
-#: g10/verify.c:189
+#: g10/verify.c:190
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "la línia d'entrada %u és massa llarga o hi falta un fí de línia\n"
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "error general"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "el tipus de paquet és desconegut"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "la versió és desconeguda"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "l'algoritme de clau pública és desconegut"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "l'algoritme de resum és desconegut"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "la clau pública és errònia"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "la clau secreta és errònia"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "la signatura és errònia"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "la suma de control és errònia"
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "la contrasenya és errònia"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "no s'ha trobat la clau pública"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "l'algoritme de xifratge és desconegut"
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "no s'ha pogut obrir l'anell"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "el paquet és invàlid"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "l'armadura és invàlida"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "no s'ha trobat l'id de l'usuari"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "la clau secreta no està disponible"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "s'ha utilitzat una clau secreta incorrecta"
 
 # Gènere?  Nombre?  ivb
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "no és suportat"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "la clau és incorrecta"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "error de lectura"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "error d'escriptura"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "l'algoritme de compressió és desconegut"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "error en l'obertura del fitxer"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "error en la creació del fitxer"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "la contrasenya és invàlida"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "l'algoritme de clau pública no és implementat"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "l'algoritme de xifratge no és implementat"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "la classe de signatura és desconeguda"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "error de la base de dades de confiança"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "l'MPI és erroni"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "límit de recursos"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "l'anell no és vàlid"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "el certificat és incorrecte"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "l'id d'usuari és malformat"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "error en el tancament del fitxer"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "error en el reanomenament del fitxer"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "error en l'eliminació del fitxer"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "dades inesperades"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "conflicte de data"
 
 # Ací veus pq jo pose «no és vàlid» en comptes de «és invàlid».  ivb
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "l'algoritme de clau pública és inusable"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "el fitxer existeix"
 
 # Segons context: la clau és feble?  ivb
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "clau feble"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "l'argument és invàlid"
 
 # La «U» és masculina o femenina?  ivb
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "l'URI és errònia"
 
 # Ídem.  ivb
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "l'URI no és suportada"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "error de la xarxa"
 
 # Gènere?  Nombre?  ivb
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "no és xifrat"
 
@@ -6113,24 +6164,24 @@ msgstr "no és xifrat"
 # Probablement és una clau, femení. jm
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
-#: util/errors.c:103
+#: util/errors.c:104
 msgid "not processed"
 msgstr "no processat"
 
-#: util/errors.c:105
+#: util/errors.c:106
 msgid "unusable public key"
 msgstr "ls clau pública és inusable"
 
-#: util/errors.c:106
+#: util/errors.c:107
 msgid "unusable secret key"
 msgstr "la clau secreta és inusable"
 
 # «del servidor», «en el servidor»?  ivb
-#: util/errors.c:107
+#: util/errors.c:108
 msgid "keyserver error"
 msgstr "error de servidor de claus"
 
-#: util/errors.c:108
+#: util/errors.c:109
 #, fuzzy
 msgid "canceled"
 msgstr "Cancel·la"
@@ -6138,90 +6189,124 @@ msgstr "Cancel·la"
 # Gènere?  Nombre?  ivb
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
-#: util/errors.c:109
+#: util/errors.c:110
 #, fuzzy
 msgid "no card"
 msgstr "no és xifrat"
 
-#: util/logger.c:157
+#: util/logger.c:158
 msgid "ERROR: "
 msgstr ""
 
-#: util/logger.c:160
+#: util/logger.c:161
 msgid "WARNING: "
 msgstr ""
 
-#: util/logger.c:223
+#: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... açò és un bug (%s:%d:%s)\n"
 
-#: util/logger.c:229
+#: util/logger.c:230
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "heu trobat un bug... (%s:%d)\n"
 
-#: util/miscutil.c:336 util/miscutil.c:373
+#: util/miscutil.c:330 util/miscutil.c:367
 msgid "yes"
 msgstr "sí|si"
 
-#: util/miscutil.c:337 util/miscutil.c:378
+#: util/miscutil.c:331 util/miscutil.c:372
 msgid "yY"
 msgstr "sS"
 
-#: util/miscutil.c:339 util/miscutil.c:375
+#: util/miscutil.c:333 util/miscutil.c:369
 msgid "no"
 msgstr "no"
 
-#: util/miscutil.c:340 util/miscutil.c:379
+#: util/miscutil.c:334 util/miscutil.c:373
 msgid "nN"
 msgstr "nN"
 
-#: util/miscutil.c:377
+#: util/miscutil.c:371
 msgid "quit"
 msgstr "ix"
 
 # «xX»?  ivb
-#: util/miscutil.c:380
+#: util/miscutil.c:374
 msgid "qQ"
 msgstr "xX"
 
-#: util/miscutil.c:413
+#: util/miscutil.c:407
 msgid "okay|okay"
 msgstr ""
 
-#: util/miscutil.c:415
+#: util/miscutil.c:409
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:416
+#: util/miscutil.c:410
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:417
+#: util/miscutil.c:411
 #, fuzzy
 msgid "cC"
 msgstr "c"
 
-#: util/secmem.c:90
+#: util/secmem.c:91
 msgid "WARNING: using insecure memory!\n"
 msgstr "AVÍS: esteu usant memòria insegura!\n"
 
-#: util/secmem.c:91
+#: util/secmem.c:92
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr ""
 "si us plau, visiteu http://www.gnupg.org/faq.html per a més informació\n"
 
 # Últimament pense si «iniciar» no serà millor que «inicialitzar»?  ivb
 # Segons SC, hi ha diferència. jm
-#: util/secmem.c:343
+#: util/secmem.c:344
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "l'operació no és possible sense memòria segura inicialitzada\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:345
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(potser heu utilitzat el programa erroni per a aquesta tasca)\n"
 
+#, fuzzy
+#~ msgid "error getting serial number: %s\n"
+#~ msgstr "error en la creació de la contrasenya: %s\n"
+
+#~ msgid "Hint: Select the user IDs to sign\n"
+#~ msgstr "Pista: Trieu els ID d'usuari que voleu signar\n"
+
+#~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+#~ msgstr ""
+#~ "la contrasenya és incorrecta o l'algoritme de xifratge (%d) és "
+#~ "desconegut\n"
+
+#~ msgid "can't set client pid for the agent\n"
+#~ msgstr "no es pot establir el pid del client per l'agent\n"
+
+# llija/llegisca/llegesca.  ivb
+#~ msgid "can't get server read FD for the agent\n"
+#~ msgstr "no es pot fer que el servidor llegesca el DF per a l'agent\n"
+
+#~ msgid "can't get server write FD for the agent\n"
+#~ msgstr "no es pot fer que el servidor escriga el DF per a l'agent\n"
+
+#~ msgid "communication problem with gpg-agent\n"
+#~ msgstr "hi ha un problema de comunicació amb el gpg-agent\n"
+
+#~ msgid "passphrase too long\n"
+#~ msgstr "la contrasenya és massa llarga\n"
+
+#~ msgid "invalid response from agent\n"
+#~ msgstr "la resposta de l'agent és invàlida\n"
+
+#~ msgid "problem with the agent: agent returns 0x%lx\n"
+#~ msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
+
 #~ msgid "select secondary key N"
 #~ msgstr "tria la clau secundària N"
 
@@ -7112,11 +7197,5 @@ msgstr "(potser heu utilitzat el programa erroni per a aquesta tasca)\n"
 #~ msgid "No key for user ID\n"
 #~ msgstr "No hi ha clau per a l'usuari\n"
 
-#~ msgid "No user ID for key\n"
-#~ msgstr "No hi ha usuari per a la clau\n"
-
-#~ msgid "invalid"
-#~ msgstr "invàlida"
-
 #~ msgid "no secret key for decryption available\n"
 #~ msgstr "no hi ha clau secreta disponible per al desxifratge\n"
diff --git a/po/cs.po b/po/cs.po
index 1fcb182ca..b09a1845c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.3.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-03-15 16:35+0100\n"
+"POT-Creation-Date: 2005-05-31 10:05+0200\n"
 "PO-Revision-Date: 2004-11-26 09:12+0200\n"
 "Last-Translator: Roman Pavlik <[email protected]>\n"
 "Language-Team: Czech <[email protected]>\n"
@@ -13,80 +13,80 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:120
+#: cipher/primegen.c:121
 #, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr "nemohu vygenerovat prvo��slo s  pbits=%u qbits=%u\n"
 
-#: cipher/primegen.c:311
+#: cipher/primegen.c:312
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "nemohu vygenerovat prvo��slo s m�n� ne� %d bity\n"
 
-#: cipher/random.c:163
+#: cipher/random.c:164
 msgid "no entropy gathering module detected\n"
 msgstr "nebyl detekov�n ��dn� modul pro z�sk�n� entropie\n"
 
-#: cipher/random.c:387 g10/card-util.c:656 g10/card-util.c:725
-#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2255
-#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
-#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
-#: g10/tdbio.c:600
+#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
+#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
+#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
+#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
+#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/tdbio.c:601
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nemohu otev��t `%s': %s\n"
 
-#: cipher/random.c:391
+#: cipher/random.c:392
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "nemohu pou��t p��kaz stat na `%s': %s\n"
 
-#: cipher/random.c:396
+#: cipher/random.c:397
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' nen� norm�ln� soubor - ignoruji\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:402
 msgid "note: random_seed file is empty\n"
 msgstr "pozn�mka: soubor random_seed je pr�zdn�\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:408
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "VAROV�N�: neplatn� velikost random_seed - soubor nepou�it\n"
 
-#: cipher/random.c:415
+#: cipher/random.c:416
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "nemohu ��st `%s': %s\n"
 
-#: cipher/random.c:453
+#: cipher/random.c:454
 msgid "note: random_seed file not updated\n"
 msgstr "pozn�mka: soubor random_seed nen� aktualizov�n\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2723
-#: g10/keygen.c:2753 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
-#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nemohu vytvo�it `%s': %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:481
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "nemohu zapisovat do `%s': %s\n"
 
-#: cipher/random.c:483
+#: cipher/random.c:484
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "nemohu zav��t `%s': %s\n"
 
-#: cipher/random.c:728
+#: cipher/random.c:729
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "VAROV�N�: pou�it� gener�tor n�hodn�ch ��sel nen� bezpe�n�!!\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:730
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -100,7 +100,7 @@ msgstr ""
 "NEPOU��VEJTE JAK�KOLIV DATA VYTVO�EN� T�MTO PROGRAMEM!!\n"
 "\n"
 
-#: cipher/rndegd.c:204
+#: cipher/rndegd.c:205
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -109,7 +109,7 @@ msgstr ""
 "Pros�m �ekejte, je nutn� z�skat dostatek entropie. Aby jste se nenudili,\n"
 "m��ete na po��ta�i d�lat n�co jin�ho, zv���te tak kvalitu entropie.\n"
 
-#: cipher/rndlinux.c:134
+#: cipher/rndlinux.c:135
 #, c-format
 msgid ""
 "\n"
@@ -120,45 +120,62 @@ msgstr ""
 "Nedostatek n�hodn�ch bajt�. Pros�m, pracujte s opera�n�m syst�mem, abyste\n"
 "mu umo�nili z�skat v�ce entropie (je pot�eba %d bajt�).\n"
 
-#: g10/app-openpgp.c:547
+#: g10/app-openpgp.c:596
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "ulo�en� fingerprintu se nezda�ilo: %s\n"
 
-#: g10/app-openpgp.c:560
+#: g10/app-openpgp.c:609
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "ulo�en� datumu vytvo�en� se nezda�ilo: %s\n"
 
-#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
+#: g10/app-openpgp.c:977
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "�ten� kl��e se nezda�ilo\n"
+
+#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+msgid "response does not contain the public key data\n"
+msgstr "odpov�� neobsahuje ve�ejn� kl��\n"
+
+#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+msgid "response does not contain the RSA modulus\n"
+msgstr "odpov�� neobsahuje RSA modulus\n"
+
+#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+msgid "response does not contain the RSA public exponent\n"
+msgstr "odpov�� neobsahuje ve�ejn� RSA exponent\n"
+
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "funkce PIN callback zkon�ila chybou: %s\n"
 
-#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN pro CHV%d je p��li� kr�tk�; minim�ln� d�lka je %d\n"
 
-#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
-#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
+#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
+#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verifikace CHV%d se nezda�ila: %s\n"
 
-#: g10/app-openpgp.c:836
+#: g10/app-openpgp.c:1310
 msgid "access to admin commands is not configured\n"
 msgstr "p��stup k administr�torsk�m p��kaz�m nen� nakonfigurov�n\n"
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
 msgid "error retrieving CHV status from card\n"
 msgstr "chyba p�i z�sk�n� CHV z karty\n"
 
-#: g10/app-openpgp.c:857
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
 msgid "card is permanently locked!\n"
 msgstr "karta je trvale uzam�ena!\n"
 
-#: g10/app-openpgp.c:862
+#: g10/app-openpgp.c:1336
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -167,340 +184,346 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:869
+#: g10/app-openpgp.c:1343
 #, fuzzy
 msgid "|A|Admin PIN"
 msgstr "PIN administr�tora"
 
-#: g10/app-openpgp.c:1018
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:1492
 #, fuzzy
 msgid "|AN|New Admin PIN"
 msgstr "PIN administr�tora"
 
-#: g10/app-openpgp.c:1018
+#: g10/app-openpgp.c:1492
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1022
+#: g10/app-openpgp.c:1496
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "chyba p�i z�sk�n� s�riov�ho ��sla: %s\n"
 
-#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
+#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "chyba p�i �ten� bloku kl��e: %s\n"
 
-#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
+#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: chyba p�i �ten� voln�ho z�znamu: %s\n"
 
-#: g10/app-openpgp.c:1104
+#: g10/app-openpgp.c:1562
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' je ji� zkomprimov�n\n"
 
-#: g10/app-openpgp.c:1108
+#: g10/app-openpgp.c:1566
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1110
+#: g10/app-openpgp.c:1568
 #, fuzzy
 msgid "generating new key\n"
 msgstr "vytvo�it nov� p�r kl���"
 
-#: g10/app-openpgp.c:1120
+#: g10/app-openpgp.c:1735
+msgid "creation timestamp missing\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1742
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1749
+#, fuzzy, c-format
+msgid "RSA public exponent missing or largerr than %d bits\n"
+msgstr "ve�ejn� RSA exponent je p��li� dlouh� (v�ce ne� 32 bit�)\n"
+
+#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1827
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "nelze ulo�it kl��: %s\n"
+
+#: g10/app-openpgp.c:1886
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1135
+#: g10/app-openpgp.c:1901
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "�ten� kl��e se nezda�ilo\n"
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1904
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Vytvo�en� kl��e se nepoda�ilo: %s\n"
 
-#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
-msgid "response does not contain the public key data\n"
-msgstr "odpov�� neobsahuje ve�ejn� kl��\n"
-
-#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
-msgid "response does not contain the RSA modulus\n"
-msgstr "odpov�� neobsahuje RSA modulus\n"
-
-#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
-msgid "response does not contain the RSA public exponent\n"
-msgstr "odpov�� neobsahuje ve�ejn� RSA exponent\n"
-
-#: g10/app-openpgp.c:1195
+#: g10/app-openpgp.c:1961
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1356
+#: g10/app-openpgp.c:2130
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1364
-#, c-format
-msgid "PIN [sigs done: %lu]"
+#: g10/app-openpgp.c:2138
+#, fuzzy, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "PIN [podpis hotov: %lu]"
 
-#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
+#: g10/app-openpgp.c:2399
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "p��stup na %s se nezda�il - vadn� OpenPGP karta?\n"
 
-#: g10/app-openpgp.c:1731
-#, c-format
-msgid "error getting serial number: %s\n"
-msgstr "chyba p�i z�sk�n� s�riov�ho ��sla: %s\n"
-
-#: g10/app-openpgp.c:1826
-#, c-format
-msgid "failed to store the key: %s\n"
-msgstr "nelze ulo�it kl��: %s\n"
-
-#: g10/app-openpgp.c:1868
-msgid "reading the key failed\n"
-msgstr "�ten� kl��e se nezda�ilo\n"
-
-#: g10/armor.c:317
+#: g10/armor.c:318
 #, c-format
 msgid "armor: %s\n"
 msgstr "ASCII k�dov�n�: %s\n"
 
-#: g10/armor.c:346
+#: g10/armor.c:347
 msgid "invalid armor header: "
 msgstr "neplatn� hlavi�ka ASCII k�dov�n�: "
 
-#: g10/armor.c:353
+#: g10/armor.c:354
 msgid "armor header: "
 msgstr "ASCII hlavi�ka: "
 
-#: g10/armor.c:364
+#: g10/armor.c:365
 msgid "invalid clearsig header\n"
 msgstr "neplatn� hlavi�ka podpisu v �iteln�m form�tu\n"
 
-#: g10/armor.c:416
+#: g10/armor.c:417
 msgid "nested clear text signatures\n"
 msgstr "vno�en� podpisy v �iteln�m form�tu\n"
 
-#: g10/armor.c:551
+#: g10/armor.c:552
 msgid "unexpected armor: "
 msgstr "neo�ek�van� ASCII armor: "
 
-#: g10/armor.c:563
+#: g10/armor.c:564
 msgid "invalid dash escaped line: "
 msgstr "nespr�vn� ozna�en� ��dku m�nusy: "
 
-#: g10/armor.c:715 g10/armor.c:1322
+#: g10/armor.c:716 g10/armor.c:1323
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "neplatn� radix64 znak %02X byl p�esko�en\n"
 
-#: g10/armor.c:758
+#: g10/armor.c:759
 msgid "premature eof (no CRC)\n"
 msgstr "p�ed�asn� konec souboru (��dn� CRC)\n"
 
-#: g10/armor.c:792
+#: g10/armor.c:793
 msgid "premature eof (in CRC)\n"
 msgstr "p�ed�asn� konec souboru (��dn� CRC)\n"
 
-#: g10/armor.c:800
+#: g10/armor.c:801
 msgid "malformed CRC\n"
 msgstr "�patn� form�t CRC\n"
 
-#: g10/armor.c:804 g10/armor.c:1359
+#: g10/armor.c:805 g10/armor.c:1360
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Chyba CRC; %06lX - %06lX\n"
 
-#: g10/armor.c:824
+#: g10/armor.c:825
 msgid "premature eof (in trailer)\n"
 msgstr "p�ed�asn� konec souboru (v pati�ce)\n"
 
-#: g10/armor.c:828
+#: g10/armor.c:829
 msgid "error in trailer line\n"
 msgstr "chyba v pati�ce\n"
 
-#: g10/armor.c:1137
+#: g10/armor.c:1138
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenalezena ��dn� platn� data ve form�tu OpenPGP.\n"
 
-#: g10/armor.c:1142
+#: g10/armor.c:1143
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "neplatn� k�dov�n� ASCII: ��dek je del�� ne� %d znak�\n"
 
-#: g10/armor.c:1146
+#: g10/armor.c:1147
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "neplatn� znak (quoted-printable) v ASCII k�dov�n� - pravd�podobn� byl pou�it "
 "�patn� MTA\n"
 
-#: g10/card-util.c:58 g10/card-util.c:295
+#: g10/card-util.c:63 g10/card-util.c:303
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGp karta nen� dostupn�: %s\n"
 
-#: g10/card-util.c:63
+#: g10/card-util.c:68
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Nalezena OpenPGP karta ��slo %s\n"
 
-#: g10/card-util.c:70 g10/card-util.c:1329 g10/delkey.c:127 g10/keyedit.c:1430
-#: g10/keygen.c:2439 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1510
+#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
 msgid "can't do this in batch mode\n"
 msgstr "nelze prov�st v d�vkov�m m�du\n"
 
-#: g10/card-util.c:97 g10/card-util.c:1108 g10/card-util.c:1191
-#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
-#: g10/keygen.c:1365
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
+#: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "V� v�b�r? "
 
-#: g10/card-util.c:206 g10/card-util.c:256
+#: g10/card-util.c:213 g10/card-util.c:263
 msgid "[not set]"
 msgstr "[nen� nastaven]"
 
-#: g10/card-util.c:391
+#: g10/card-util.c:410
 msgid "male"
 msgstr "mu�"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 msgid "female"
 msgstr "�ena"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 msgid "unspecified"
 msgstr "neuvedeno"
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 msgid "not forced"
 msgstr "nen� vy�adov�no"
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 msgid "forced"
 msgstr "vy�adov�no"
 
-#: g10/card-util.c:497
+#: g10/card-util.c:516
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Chyba: V sou�asn� verzi je povolenou pouze plain ASCII.\n"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:518
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Chyba: Znak \"<\" nelze pou��t.\n"
 
-#: g10/card-util.c:501
+#: g10/card-util.c:520
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Chyba: V�ce mezer nen� povoleno.\n"
 
-#: g10/card-util.c:518
+#: g10/card-util.c:537
 msgid "Cardholder's surname: "
 msgstr "P��jmen� dr�itele karty: "
 
-#: g10/card-util.c:520
+#: g10/card-util.c:539
 msgid "Cardholder's given name: "
 msgstr "Jm�no (k�estn�) dr�itele karty: "
 
-#: g10/card-util.c:538
+#: g10/card-util.c:557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Chyba: jm�no a p��jmen� je p��li� dlouh� (limit je %d znak�).\n"
 
-#: g10/card-util.c:559
+#: g10/card-util.c:578
 msgid "URL to retrieve public key: "
 msgstr "URL pro z�sk�n� ve�ejn�ho kl��e: "
 
-#: g10/card-util.c:567
+#: g10/card-util.c:586
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Chyba: URL je p��li� dlouh� (limit je %d znak�).\n"
 
-#: g10/card-util.c:665 g10/card-util.c:734 g10/import.c:261
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:692
 msgid "Login data (account name): "
 msgstr "Login (jm�nu ��tu): "
 
-#: g10/card-util.c:683
+#: g10/card-util.c:702
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Chyba: Login je p��li� dlouh� (limit je %d znak�).\n"
 
-#: g10/card-util.c:742
+#: g10/card-util.c:761
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:752
+#: g10/card-util.c:771
 #, fuzzy, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Chyba: URL je p��li� dlouh� (limit je %d znak�).\n"
 
-#: g10/card-util.c:772
+#: g10/card-util.c:791
 msgid "Language preferences: "
 msgstr "Jazykov� p�edvolby: "
 
-#: g10/card-util.c:780
+#: g10/card-util.c:799
 msgid "Error: invalid length of preference string.\n"
 msgstr "Chyba: neplatn� d�lka �etezce s p�edvolbami.\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:808
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Chyba: neplatn� znak v �et�zci s p�edvolbami\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:829
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Zadejte pohlav�: M - mu�sk�, F - �ensk� nebo stisn�te mezern�k: "
 
-#: g10/card-util.c:824
+#: g10/card-util.c:843
 msgid "Error: invalid response.\n"
 msgstr "Chyba: neplatn� odpov��.\n"
 
-#: g10/card-util.c:845
+#: g10/card-util.c:864
 msgid "CA fingerprint: "
 msgstr "CA fingerprint: "
 
-#: g10/card-util.c:868
+#: g10/card-util.c:887
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Chyba: nespr�vn� naform�tovan� fingerprint.\n"
 
-#: g10/card-util.c:916
+#: g10/card-util.c:935
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "operace s kl��em nen� mo�n�: %s\n"
 
-#: g10/card-util.c:917
+#: g10/card-util.c:936
 msgid "not an OpenPGP card"
 msgstr "toto nen� OpenPGP karta"
 
-#: g10/card-util.c:926
+#: g10/card-util.c:945
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "chyba p�i z�sk�n� informac� o aktu�ln�m kl��i: %s\n"
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1030
 msgid "Replace existing key? (y/N) "
 msgstr "P�epsat existuj�c� kl��? (a/N) "
 
-#: g10/card-util.c:1030 g10/card-util.c:1039
+#: g10/card-util.c:1051 g10/card-util.c:1060
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Vytvo�it z�lohu �ifrovac�ho kl��e mimo kartu? (A/n) "
 
-#: g10/card-util.c:1051
+#: g10/card-util.c:1072
 msgid "Replace existing keys? (y/N) "
 msgstr "P�epsat existuj�c� kl��e? (a/N) "
 
-#: g10/card-util.c:1060
+#: g10/card-util.c:1081
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -511,124 +534,128 @@ msgstr ""
 "   PIN = `%s'     PIN administr�tora = `%s'\n"
 "Toto nastaven� m��ete zm�nit p��kazem --change-pin\n"
 
-#: g10/card-util.c:1099
+#: g10/card-util.c:1120
 msgid "Please select the type of key to generate:\n"
 msgstr "Pros�m, vyberte druh kl��e, kter� chcete generovat:\n"
 
-#: g10/card-util.c:1101 g10/card-util.c:1182
+#: g10/card-util.c:1122 g10/card-util.c:1203
 msgid "   (1) Signature key\n"
 msgstr "   (1) Podepisovac� kl��\n"
 
-#: g10/card-util.c:1102 g10/card-util.c:1184
+#: g10/card-util.c:1123 g10/card-util.c:1205
 msgid "   (2) Encryption key\n"
 msgstr "   (2) �ifrovac� kl��\n"
 
-#: g10/card-util.c:1103 g10/card-util.c:1186
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiza�n� kl��\n"
 
-#: g10/card-util.c:1119 g10/card-util.c:1202 g10/keyedit.c:908
-#: g10/keygen.c:1404 g10/revoke.c:642
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
+#: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "Neplatn� v�b�r.\n"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1200
 msgid "Please select where to store the key:\n"
 msgstr "Pros�m vyberte m�sto pro uchov�n� kl��e:\n"
 
-#: g10/card-util.c:1214
+#: g10/card-util.c:1235
 msgid "unknown key protection algorithm\n"
 msgstr "nezn�m� algoritmus pro ochranu kl��e\n"
 
-#: g10/card-util.c:1219
+#: g10/card-util.c:1240
 msgid "secret parts of key are not available\n"
 msgstr "tajn� ��sti kl�e nejsou dostupn�\n"
 
-#: g10/card-util.c:1224
+#: g10/card-util.c:1245
 msgid "secret key already stored on a card\n"
 msgstr "tajn� kl�� je na kart� ulo�en\n"
 
-#: g10/card-util.c:1294 g10/keyedit.c:1317
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "ukon�it toto menu"
 
-#: g10/card-util.c:1296
+#: g10/card-util.c:1318
 msgid "show admin commands"
 msgstr "zobraz administr�torsk� p��kazy"
 
-#: g10/card-util.c:1297 g10/keyedit.c:1320
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "uk�zat tuto pomoc"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1321
 msgid "list all available data"
 msgstr "vypi� v�echna dostupn� data"
 
-#: g10/card-util.c:1302
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr "zm�n� jm�no majitele karty"
 
-#: g10/card-util.c:1303
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr "zm�n� URL pro z�sk�n� kl��e"
 
-#: g10/card-util.c:1304
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr "z�sk� kl�� specifikovan� v URL karty"
 
-#: g10/card-util.c:1305
+#: g10/card-util.c:1327
 msgid "change the login name"
 msgstr "zm�nit login name"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1328
 msgid "change the language preferences"
 msgstr "zm�nit jazykov� p�edvolby"
 
-#: g10/card-util.c:1307
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr "zm�n� pohlav� dr�itele karty"
 
-#: g10/card-util.c:1308
+#: g10/card-util.c:1330
 msgid "change a CA fingerprint"
 msgstr "vypsat fingerprint certifika�n� autority"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr "zapnout/vypnout po�adov�n� PINu p�i ka�d� self-sign operaci"
 
-#: g10/card-util.c:1310
+#: g10/card-util.c:1332
 msgid "generate new keys"
 msgstr "vytvo�it nov� p�r kl���"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr "nab�dka pro zm�nu anebo odblokov�n� PINu"
 
-#: g10/card-util.c:1377 g10/keyedit.c:1526
+#: g10/card-util.c:1334
+msgid "verify the PIN and list all data"
+msgstr ""
+
+#: g10/card-util.c:1454 g10/keyedit.c:1609
 msgid "Command> "
 msgstr "P��kaz> "
 
-#: g10/card-util.c:1412
+#: g10/card-util.c:1492
 msgid "Admin-only command\n"
 msgstr "pouze administr�torsk� p��kazy\n"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1523
 msgid "Admin commands are allowed\n"
 msgstr "administr�torsk� p��kazy jsou povoleny\n"
 
-#: g10/card-util.c:1430
+#: g10/card-util.c:1525
 msgid "Admin commands are not allowed\n"
 msgstr "administr�torsk� p��kazy nejsou povoleny\n"
 
-#: g10/card-util.c:1499 g10/keyedit.c:2104
+#: g10/card-util.c:1599 g10/keyedit.c:2210
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� p��kaz (zkuste \"help\")\n"
 
-#: g10/cardglue.c:287
+#: g10/cardglue.c:396
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr "Pros�m vo�te kartu a stiskn�te enter. Operaci zru��te stisknut�m 'z': "
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:519
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -637,144 +664,144 @@ msgstr ""
 "Pros�m vyjm�te kartu a vlo�te jinou se seriov�m ��slem:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:380
+#: g10/cardglue.c:527
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 "Je-li nov� karta p�ipravena, stiskn�te enter.  Operaci zru��te stisknut�m "
 "'z': "
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:852
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Vlo�te PIN administr�tora: "
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:853
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "Vlo�te PIN: "
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:854
 msgid "Enter Admin PIN: "
 msgstr "Vlo�te PIN administr�tora: "
 
-#: g10/cardglue.c:691
+#: g10/cardglue.c:855
 msgid "Enter PIN: "
 msgstr "Vlo�te PIN: "
 
-#: g10/cardglue.c:705
+#: g10/cardglue.c:872
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Opakujte heslo: "
 
-#: g10/cardglue.c:719
+#: g10/cardglue.c:886
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "heslo nen� zopakov�no spr�vn�; zkuste to znovu"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
-#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nelze otev��t `%s'\n"
 
-#: g10/decrypt.c:104 g10/encode.c:859
+#: g10/decrypt.c:105 g10/encode.c:846
 msgid "--output doesn't work for this command\n"
 msgstr "--output pro tento p��kaz nen� platn�\n"
 
-#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3167 g10/keyserver.c:1511
-#: g10/revoke.c:226
+#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3346 g10/keyserver.c:1541
+#: g10/revoke.c:227
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "kl�� \"%s\" nenalezen: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2300 g10/keyserver.c:1525
-#: g10/revoke.c:232 g10/revoke.c:439
+#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "chyba p�i �ten� bloku kl��e: %s\n"
 
-#: g10/delkey.c:128 g10/delkey.c:135
+#: g10/delkey.c:129 g10/delkey.c:136
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(dokud neur��te kl�� jeho fingerprintem)\n"
 
-#: g10/delkey.c:134
+#: g10/delkey.c:135
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "bez parametru \"--yes\" to nemohu v d�vkov�m m�du prov�st\n"
 
-#: g10/delkey.c:146
+#: g10/delkey.c:147
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Smazat tento kl�� ze souboru kl���? (a/N) "
 
-#: g10/delkey.c:154
+#: g10/delkey.c:155
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Toto je tajn� kl��! - opravdu smazat? (a/N) "
 
-#: g10/delkey.c:164
+#: g10/delkey.c:165
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "smaz�n� bloku kl��e se nezda�ilo:  %s\n"
 
-#: g10/delkey.c:174
+#: g10/delkey.c:175
 msgid "ownertrust information cleared\n"
 msgstr "informace o d�v�ryhodnosti vlastn�ka kl��e vymaz�ny\n"
 
-#: g10/delkey.c:205
+#: g10/delkey.c:206
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "existuje tajn� kl�� pro tento ve�ejn� kl�� \"%s\"!\n"
 
-#: g10/delkey.c:207
+#: g10/delkey.c:208
 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:210 g10/sign.c:1186
+#: g10/encode.c:211 g10/sign.c:1218
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
 
-#: g10/encode.c:215
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "v m�du S2K nelze pou��t symetrick� ESK paket\n"
 
-#: g10/encode.c:228
+#: g10/encode.c:229
 #, c-format
 msgid "using cipher %s\n"
 msgstr "pou�it� �ifry: %s\n"
 
-#: g10/encode.c:238 g10/encode.c:558
+#: g10/encode.c:239 g10/encode.c:545
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' je ji� zkomprimov�n\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
+#: g10/encode.c:302 g10/encode.c:591 g10/sign.c:566
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VAROV�N�: soubor `%s' je pr�zdn�\n"
 
-#: g10/encode.c:472
+#: g10/encode.c:466
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "v m�du --pgp2 m��ete �ifrovat pouze RSA kl��em o d�lce 2048 bit� a m�n�\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:488
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "�tu z `%s'\n"
 
-#: g10/encode.c:530
+#: g10/encode.c:517
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "algoritmus IDEA nelze pou��t pro v�echny kl��e, pro kter� �ifrujete.\n"
 
-#: g10/encode.c:540
+#: g10/encode.c:527
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "VAROV�N�: vy��dan� symetrick� �ifra %s (%d) nevyhovuje p�edvolb�m p��jemce\n"
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:635 g10/sign.c:899
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -783,124 +810,124 @@ msgstr ""
 "VAROV�N�: vy��dan� komprima�n� algoritmus %s (%d) nevyhovuje p�edvolb�m "
 "p��jemce\n"
 
-#: g10/encode.c:735
+#: g10/encode.c:722
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "vy��dan� symetrick� �ifra %s (%d) nevyhovuje p�edvolb�m p��jemce\n"
 
-#: g10/encode.c:805 g10/pkclist.c:721 g10/pkclist.c:757
+#: g10/encode.c:792 g10/pkclist.c:722 g10/pkclist.c:758
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "pou�it� %s nen� v m�du %s dovoleno\n"
 
-#: g10/encode.c:832
+#: g10/encode.c:819
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s za�ifrovan� pro: %s\n"
 
-#: g10/encr-data.c:66 g10/mainproc.c:301
+#: g10/encr-data.c:67 g10/mainproc.c:302
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s za�ifrovan� data\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:305
+#: g10/encr-data.c:69 g10/mainproc.c:306
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "za�ifrov�no nezn�m�m algoritmem %d\n"
 
-#: g10/encr-data.c:92
+#: g10/encr-data.c:93
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "VAROV�N�: zpr�va byla za�ifrov�na slab�m kl��em v symetrick� �if�e.\n"
 
-#: g10/encr-data.c:103
+#: g10/encr-data.c:104
 msgid "problem handling encrypted packet\n"
 msgstr "probl�m se za�ifrovan�m paketem\n"
 
-#: g10/exec.c:48
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "spu�t�n� extern�ho programu nen� podporov�no\n"
 
-#: g10/exec.c:184 g10/openfile.c:406
+#: g10/exec.c:173 g10/openfile.c:410
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nemohu vytvo�it adres�� `%s': %s\n"
 
-#: g10/exec.c:325
+#: g10/exec.c:314
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "vol�n� extern�ch program� je zak�z�no, proto�e file permissions nejsou\n"
 "nastaveny nebezpe�n�\n"
 
-#: g10/exec.c:355
+#: g10/exec.c:344
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "na t�to platform� jsou p�i vol�n� extern�ch program� vy�adov�ny\n"
 "do�asn� soubory (temp files)\n"
 
-#: g10/exec.c:433
+#: g10/exec.c:422
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "nelze spustit program `%s': %s\n"
 
-#: g10/exec.c:436
+#: g10/exec.c:425
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "nelze spustit shell `%s': %s\n"
 
-#: g10/exec.c:521
+#: g10/exec.c:510
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "syst�mov� chyba p�i vol�n� extern�ho programu: %s\n"
 
-#: g10/exec.c:532 g10/exec.c:598
+#: g10/exec.c:521 g10/exec.c:587
 msgid "unnatural exit of external program\n"
 msgstr "neo�ek�van� konec extern�ho programu\n"
 
-#: g10/exec.c:547
+#: g10/exec.c:536
 msgid "unable to execute external program\n"
 msgstr "nelze spustit extern� program\n"
 
-#: g10/exec.c:563
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "nelze p�e��st odpov�� extern�ho programu: %s\n"
 
-#: g10/exec.c:609 g10/exec.c:616
+#: g10/exec.c:598 g10/exec.c:605
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "VAROV�N�: nelze smazat do�asn� soubor (%s) `%s': %s\n"
 
-#: g10/exec.c:621
+#: g10/exec.c:610
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "VAROV�N�: nelze smazat do�asn� adres�� `%s': %s\n"
 
-#: g10/export.c:183
+#: g10/export.c:184
 msgid "exporting secret keys not allowed\n"
 msgstr "exportov�n� tajn�ho kl��e nen� povoleno\n"
 
-#: g10/export.c:212
+#: g10/export.c:213
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "kl�� %s: nen� chr�n�n� - p�esko�eno\n"
 
-#: g10/export.c:220
+#: g10/export.c:221
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "kl�� %s: PGP 2.x kl�� - p�esko�eno\n"
 
-#: g10/export.c:395
+#: g10/export.c:398
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "VAROV�N�: tajn� kl�� %s nen� chr�n�n pomoc� simple SK checksum\n"
 
-#: g10/export.c:427
+#: g10/export.c:430
 msgid "WARNING: nothing exported\n"
 msgstr "VAROV�N�: nebylo nic vyexportov�no\n"
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid ""
 "@Commands:\n"
 " "
@@ -908,127 +935,127 @@ msgstr ""
 "@P��kazy:\n"
 " "
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "|[file]|make a signature"
 msgstr "|[soubor]|vytvo�it podpis"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "|[file]|make a clear text signature"
 msgstr "|[soubor]|vytvo�it podpis v �iteln�m dokumentu"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "make a detached signature"
 msgstr "vytvo�it podpis odd�len� od dokumentu"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encrypt data"
 msgstr "�ifrovat data"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "encryption only with symmetric cipher"
 msgstr "�ifrov�n� pouze se symetrickou �ifrou"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "decrypt data (default)"
 msgstr "de�ifrovat data (implicitn�)"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "verify a signature"
 msgstr "verifikovat podpis"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys"
 msgstr "vypsat seznam kl���"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and signatures"
 msgstr "vypsat seznam kl��� a podpis�"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 msgid "list and check key signatures"
 msgstr "vypsat a zkontrolovat podpisy kl���"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "list keys and fingerprints"
 msgstr "vypsat seznam kl��� a fingerprint�"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "list secret keys"
 msgstr "vypsat seznam tajn�ch kl���"
 
-#: g10/g10.c:379
+#: g10/g10.c:381
 msgid "generate a new key pair"
 msgstr "vytvo�it nov� p�r kl���"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the public keyring"
 msgstr "odstranit kl�� ze souboru ve�ejn�ch kl���"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "remove keys from the secret keyring"
 msgstr "odstranit kl�� ze souboru tajn�ch kl���"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign a key"
 msgstr "podepsat kl��"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "sign a key locally"
 msgstr "podepsat kl�� lok�ln�"
 
-#: g10/g10.c:385
+#: g10/g10.c:387
 msgid "sign or edit a key"
 msgstr "podepsat nebo modifikovat kl��"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "generate a revocation certificate"
 msgstr "vytvo�it revoka�n� certifik�t"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "export keys"
 msgstr "exportovat kl��e"
 
-#: g10/g10.c:389
+#: g10/g10.c:391
 msgid "export keys to a key server"
 msgstr "exportovat kl��e na server kl���"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "import keys from a key server"
 msgstr "importovat kl��e ze serveru kl���"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "search for keys on a key server"
 msgstr "vyhledat kl��e na serveru kl���"
 
-#: g10/g10.c:394
+#: g10/g10.c:396
 msgid "update all keys from a keyserver"
 msgstr "aktualizovat v�echny kl��e ze serveru kl���"
 
-#: g10/g10.c:397
+#: g10/g10.c:399
 msgid "import/merge keys"
 msgstr "importovat/slou�it kl��e"
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "print the card status"
 msgstr "vytisknout stav karty"
 
-#: g10/g10.c:401
+#: g10/g10.c:403
 msgid "change data on a card"
 msgstr "zm�nit data na kart�"
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "change a card's PIN"
 msgstr "zm�nit PIN karty"
 
-#: g10/g10.c:410
+#: g10/g10.c:412
 msgid "update the trust database"
 msgstr "aktualizovat datab�zi d�v�ry"
 
-#: g10/g10.c:417
+#: g10/g10.c:419
 msgid "|algo [files]|print message digests"
 msgstr "|algo [soubory]  vypi� hash"
 
-#: g10/g10.c:421 g10/gpgv.c:66
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1038,55 +1065,55 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "create ascii armored output"
 msgstr "vytvo� v�stup zak�dovan� pomoc� ASCII"
 
-#: g10/g10.c:425
+#: g10/g10.c:427
 msgid "|NAME|encrypt for NAME"
 msgstr "|JM�NO|�ifrovat pro JM�NO"
 
-#: g10/g10.c:436
+#: g10/g10.c:438
 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/g10.c:437
+#: g10/g10.c:439
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|nastavit �rov�� komprimace N (0 - ��dn�\n"
 " komprimace)"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "use canonical text mode"
 msgstr "pou��t kanonick� textov� m�d"
 
-#: g10/g10.c:452
+#: g10/g10.c:458
 msgid "use as output file"
 msgstr "pou��t jako v�stupn� soubor"
 
-#: g10/g10.c:454 g10/gpgv.c:68
+#: g10/g10.c:460 g10/gpgv.c:73
 msgid "verbose"
 msgstr "s dodate�n�mi informacemi"
 
-#: g10/g10.c:465
+#: g10/g10.c:471
 msgid "do not make any changes"
 msgstr "neprov�d�t ��dn� zm�ny"
 
-#: g10/g10.c:466
+#: g10/g10.c:472
 msgid "prompt before overwriting"
 msgstr "vy��dat potvrzen� p�ed p�eps�n�m"
 
-#: g10/g10.c:507
+#: g10/g10.c:513
 msgid "use strict OpenPGP behavior"
 msgstr "pou��t chov�n� striktn� podle OpenPGP"
 
-#: g10/g10.c:508
+#: g10/g10.c:514
 msgid "generate PGP 2.x compatible messages"
 msgstr "generovat zpr�vu komplatibiln� s PGP 2.x"
 
-#: g10/g10.c:536
+#: g10/g10.c:542
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1094,7 +1121,7 @@ msgstr ""
 "@\n"
 "(Pou�ijte manu�lov� str�nky pro kompletn� seznam v�ech p��kaz� a mo�nost�)\n"
 
-#: g10/g10.c:539
+#: g10/g10.c:545
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1112,17 +1139,17 @@ msgstr ""
 " --list-keys [jm�na]        vypsat kl��e\n"
 " --fingerprint [jm�na]      vypsat fingerprinty \n"
 
-#: g10/g10.c:720 g10/gpgv.c:93
+#: g10/g10.c:724 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Chyby oznamte, pros�m, na adresu <[email protected]>.\n"
 "P�ipom�nky k p�ekladu <[email protected]>.\n"
 
-#: g10/g10.c:737
+#: g10/g10.c:741
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: g10/g10.c:740
+#: g10/g10.c:744
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1132,7 +1159,7 @@ msgstr ""
 "podepsat, ov��it, �ifrovat nebo de�ifrovat\n"
 "implicitn� operace z�vis� na vstupn�ch datech\n"
 
-#: g10/g10.c:751
+#: g10/g10.c:755
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1140,79 +1167,79 @@ msgstr ""
 "\n"
 "Podporovan� algoritmy:\n"
 
-#: g10/g10.c:754
+#: g10/g10.c:758
 msgid "Pubkey: "
 msgstr "Ve�ejn� kl��: "
 
-#: g10/g10.c:760 g10/keyedit.c:2141
+#: g10/g10.c:764 g10/keyedit.c:2248
 msgid "Cipher: "
 msgstr "�ifra: "
 
-#: g10/g10.c:766
+#: g10/g10.c:770
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:772 g10/keyedit.c:2187
+#: g10/g10.c:776 g10/keyedit.c:2294
 msgid "Compression: "
 msgstr "Komprese: "
 
-#: g10/g10.c:855
+#: g10/g10.c:859
 msgid "usage: gpg [options] "
 msgstr "u�it�: gpg [mo�nosti]"
 
-#: g10/g10.c:1003
+#: g10/g10.c:1007
 msgid "conflicting commands\n"
 msgstr "konfliktn� p��kazy\n"
 
-#: g10/g10.c:1021
+#: g10/g10.c:1025
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = podpis nalezen v definici skupiny `%s'\n"
 
 # g10/g10.c:1179#, c-format
-#: g10/g10.c:1218
+#: g10/g10.c:1222
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� domovsk�ho adres��e nen� nastaveno bezpe�n� `%s'\n"
 
-#: g10/g10.c:1221
+#: g10/g10.c:1225
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� konfigura�n�ho souboru nen� nastaveno bezpe�n� `%s'\n"
 
-#: g10/g10.c:1224
+#: g10/g10.c:1228
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� roz�i�uj�c�ho modulu nen� nastaveno bezpe�n� `%s'\n"
 
-#: g10/g10.c:1230
+#: g10/g10.c:1234
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: p��stupov� pr�va pro domovsk� adres��e nejsou bezpe�n� `%s'\n"
 
-#: g10/g10.c:1233
+#: g10/g10.c:1237
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 "VAROV�N�: p��stupov� pr�va pro konfigura�n� soubor nejsou bezpe�n� `%s'\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1240
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VAROV�N�: p��stupov� pr�va roz�i�uj�c�mu modulu nejsou bezpe�n� `%s'\n"
 
-#: g10/g10.c:1242
+#: g10/g10.c:1246
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� adres��e s domovk�m adres��em nen� nastaveno "
 "nebezpe�n� `%s'\n"
 
-#: g10/g10.c:1245
+#: g10/g10.c:1249
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1220,21 +1247,21 @@ msgstr ""
 "VAROV�N�: vlastnictv� adres��e s konfigura�n�m souborem nen� nastaveno "
 "nebezpe�n� `%s'\n"
 
-#: g10/g10.c:1248
+#: g10/g10.c:1252
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� adres��e s roz�i�uj�c�m modulem nen� nastaveno "
 "nebezpe�n� `%s'\n"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1258
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: p��stupov� pr�va k adres��i s domovsk�m adres��em nejsou nastavena "
 "bezpe�n� `%s'\n"
 
-#: g10/g10.c:1257
+#: g10/g10.c:1261
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1242,7 +1269,7 @@ msgstr ""
 "VAROV�N�: p��stupov� pr�va k aders��i s konfigura�n�m souborem nejsou "
 "nastavena bezpe�n� `%s'\n"
 
-#: g10/g10.c:1260
+#: g10/g10.c:1264
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
@@ -1250,366 +1277,376 @@ msgstr ""
 "nastavena bezpe�n� `%s'\n"
 
 # c-format
-#: g10/g10.c:1401
+#: g10/g10.c:1405
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nezn�m� konfigura�n� polo�ka \"%s\"\n"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1802
 #, 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/g10.c:1838
+#: g10/g10.c:1844
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "POZN�MKA: neexistuje implicitn� soubor s mo�nostmi `%s'\n"
 
-#: g10/g10.c:1842
+#: g10/g10.c:1848
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "soubor s mo�nostmi `%s': %s\n"
 
-#: g10/g10.c:1849
+#: g10/g10.c:1855
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�tu mo�nosti z `%s'\n"
 
-#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "POZN�MKA: %s nen� pro norm�ln� pou�it�!\n"
 
-#: g10/g10.c:2076
+#: g10/g10.c:2082
 #, 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/g10.c:2293
+#: g10/g10.c:2236 g10/g10.c:2248
+#, fuzzy, c-format
+msgid "`%s' is not a valid signature expiration\n"
+msgstr "`%s' nen� platn� znakov� sada\n"
+
+#: g10/g10.c:2321
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' nen� platn� znakov� sada\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3683
+#: g10/g10.c:2340 g10/keyedit.c:3862
 msgid "could not parse keyserver URL\n"
 msgstr "nelze zpracovat URL serveru kl���\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2346
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatn� parametr pro server kl���\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2349
 msgid "invalid keyserver options\n"
 msgstr "neplatn� parametr pro server kl���\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2356
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parametr pro import\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2359
 msgid "invalid import options\n"
 msgstr "neplatn� parametr pro import\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2366
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parametr pro export\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2369
 msgid "invalid export options\n"
 msgstr "neplatn� parametr pro export\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2376
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatn� parametr pro v�pis\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2379
 msgid "invalid list options\n"
 msgstr "neplatn� parametr pro v�pis\n"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2401
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatn� parametr pro ov��en�\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2404
 msgid "invalid verify options\n"
 msgstr "neplatn� parametr pro ov��en�\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2411
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nelze nastavit exec-path na %s\n"
 
-#: g10/g10.c:2573
+#: g10/g10.c:2602
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROV�N�: program m��e vytvo�it soubor core!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2606
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROV�N�: %s p�ep��e %s\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2615
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nen� dovoleno pou��vat %s s %s!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2618
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�v� s %s smysl!\n"
 
-#: g10/g10.c:2603
+#: g10/g10.c:2625
+#, fuzzy, c-format
+msgid "NOTE: %s is not available in this version\n"
+msgstr "gpg-agent nen� v tomto sezen� dostupn�\n"
+
+#: g10/g10.c:2640
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: g10/g10.c:2617
+#: g10/g10.c:2654
 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/g10.c:2623
+#: g10/g10.c:2660
 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/g10.c:2629
+#: g10/g10.c:2666
 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/g10.c:2642
+#: g10/g10.c:2679
 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/g10.c:2712 g10/g10.c:2736
+#: g10/g10.c:2746 g10/g10.c:2770
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2718 g10/g10.c:2742
+#: g10/g10.c:2752 g10/g10.c:2776
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2724
+#: g10/g10.c:2758
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybran� komprimovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2764
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2745
+#: g10/g10.c:2779
 msgid "completes-needed must be greater than 0\n"
 msgstr "polo�ka completes-needed mus� b�t v�t�� ne� 0\n"
 
-#: g10/g10.c:2747
+#: g10/g10.c:2781
 msgid "marginals-needed must be greater than 1\n"
 msgstr "polo�ka marginals-needed mus� b�t v�t�� ne� 1\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2783
 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/g10.c:2751
+#: g10/g10.c:2785
 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/g10.c:2753
+#: g10/g10.c:2787
 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/g10.c:2756
+#: g10/g10.c:2790
 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/g10.c:2760
+#: g10/g10.c:2794
 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/g10.c:2767
+#: g10/g10.c:2801
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� p�edvolby\n"
 
-#: g10/g10.c:2776
+#: g10/g10.c:2810
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro �ifrov�n�\n"
 
-#: g10/g10.c:2780
+#: g10/g10.c:2814
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro hashov�n�\n"
 
-#: g10/g10.c:2784
+#: g10/g10.c:2818
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro komprimaci\n"
 
-#: g10/g10.c:2817
+#: g10/g10.c:2851
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s dosud nen� funk�n� s %s\n"
 
-#: g10/g10.c:2864
+#: g10/g10.c:2898
 #, 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/g10.c:2869
+#: g10/g10.c:2903
 #, 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/g10.c:2874
+#: g10/g10.c:2908
 #, 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/g10.c:2970
+#: g10/g10.c:3004
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemohu inicializovat datab�zi d�v�ry: %s\n"
 
-#: g10/g10.c:2981
+#: g10/g10.c:3015
 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/g10.c:2992
+#: g10/g10.c:3026
 msgid "--store [filename]"
 msgstr "--store [jm�no souboru]"
 
-#: g10/g10.c:2999
+#: g10/g10.c:3033
 msgid "--symmetric [filename]"
 msgstr "--symmetric [jm�no souboru]"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3035
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symetrick� �ifrov�n� `%s' se nepovedlo: %s\n"
 
-#: g10/g10.c:3011
+#: g10/g10.c:3045
 msgid "--encrypt [filename]"
 msgstr "--encrypt [jm�no souboru]"
 
-#: g10/g10.c:3024
+#: g10/g10.c:3058
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [jm�no souboru]"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3060
 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/g10.c:3029
+#: g10/g10.c:3063
 #, 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/g10.c:3047
+#: g10/g10.c:3081
 msgid "--sign [filename]"
 msgstr "--sign [jm�no souboru]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3094
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [jm�no souboru]"
 
-#: g10/g10.c:3075
+#: g10/g10.c:3109
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [jm�no souboru]"
 
-#: g10/g10.c:3077
+#: g10/g10.c:3111
 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/g10.c:3080
+#: g10/g10.c:3114
 #, 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/g10.c:3100
+#: g10/g10.c:3134
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [jm�no souboru]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3143
 msgid "--clearsign [filename]"
 msgstr "--clearsign [jm�no souboru]"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3168
 msgid "--decrypt [filename]"
 msgstr "--decrypt [jm�no souboru]"
 
-#: g10/g10.c:3142
+#: g10/g10.c:3176
 msgid "--sign-key user-id"
 msgstr "--sign-key id u�ivatele"
 
-#: g10/g10.c:3146
+#: g10/g10.c:3180
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u�ivatele"
 
-#: g10/g10.c:3167
+#: g10/g10.c:3201
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u�ivatele [p��kazy]"
 
-#: g10/g10.c:3238
+#: g10/g10.c:3272
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id u�ivatele] [soubor s kl��i (keyring)]"
 
-#: g10/g10.c:3275
+#: g10/g10.c:3309
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "odesl�n� na keyserver se nezda�ilo: %s\n"
 
-#: g10/g10.c:3277
+#: g10/g10.c:3311
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "z�sk�n� dat z keyserveru se nezda�ilo: %s\n"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3313
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export kl��e se nepoda�il: %s\n"
 
-#: g10/g10.c:3290
+#: g10/g10.c:3324
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "hled�n� na keyserveru se nezda�ilo: %s\n"
 
-#: g10/g10.c:3300
+#: g10/g10.c:3334
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "refresh dat na keyserveru se nezda�il: %s\n"
 
-#: g10/g10.c:3341
+#: g10/g10.c:3375
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dov�n� z ASCII form�tu selhalo: %s\n"
 
-#: g10/g10.c:3349
+#: g10/g10.c:3383
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dov�n� do ASCII form�tu selhalo: %s\n"
 
-#: g10/g10.c:3436
+#: g10/g10.c:3470
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/g10.c:3559
+#: g10/g10.c:3593
 msgid "[filename]"
 msgstr "[jm�no souboru]"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3597
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�n�te ps�t svou zpr�vu ...\n"
 
-#: g10/g10.c:3853
+#: g10/g10.c:3887
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1617,76 +1654,81 @@ msgstr ""
 "symbolick� jm�no sm� obsahovat pouze p�smena, ��slice, te�ky nebo podtr��tka "
 "a mus� kon�it znakem '='\n"
 
-#: g10/g10.c:3861
+#: g10/g10.c:3895
 msgid "a user notation name must contain the '@' character\n"
 msgstr "jm�no u�ivatele mus� obsahovat znakt '@' \n"
 
-#: g10/g10.c:3871
+#: g10/g10.c:3900
+#, fuzzy
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr "jm�no u�ivatele mus� obsahovat znakt '@' \n"
+
+#: g10/g10.c:3911
 msgid "a notation value must not use any control characters\n"
 msgstr "hodnota nem��e obsahovat ��dn� kontroln� znaky\n"
 
-#: g10/g10.c:3905
+#: g10/g10.c:3945
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pro certifika�n� politiku je neplatn�\n"
 
-#: g10/g10.c:3907
+#: g10/g10.c:3947
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pro podepisovac� politiku je neplatn�\n"
 
-#: g10/g10.c:3940
+#: g10/g10.c:3980
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "p��li� mnoho polo�ek v bufferu ve�ejn�ch kl��� - vypnuto\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2750
+#: g10/getkey.c:187 g10/getkey.c:2757
 msgid "[User ID not found]"
 msgstr "[ID u�ivatele nenalezeno]"
 
 # c-format
-#: g10/getkey.c:1677
+#: g10/getkey.c:1684
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Neplatn� kl�� %s zm�n�n na platn� pomoc� --always-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2228
+#: g10/getkey.c:2235
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "neexistuje tajn� podkl�� pro ve�ejn� kl�� %s - ignorov�no\n"
 
-#: g10/getkey.c:2459
+#: g10/getkey.c:2466
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "pou��v�m sekund�rn� kl�� %s m�sto prim�rn�ho kl��e %s\n"
 
-#: g10/getkey.c:2506
+#: g10/getkey.c:2513
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "kl�� %s: tajn� kl�� bez kl��e ve�ejn�ho - p�esko�eno\n"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:74
 msgid "be somewhat more quiet"
 msgstr "b�t o trochu v�c tich�"
 
-#: g10/gpgv.c:70
+#: g10/gpgv.c:75
 msgid "take the keys from this keyring"
 msgstr "ber kl��e z t�to kl��enky (keyringu)"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:77
 msgid "make timestamp conflicts only a warning"
 msgstr "pouze varov�n� p�i konfliktu �asov�ho raz�tka"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:78
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapsat informace o stavu do tohoto FD"
 
-#: g10/gpgv.c:97
+#: g10/gpgv.c:102
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:105
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1694,7 +1736,7 @@ msgstr ""
 "Syntaxe: gpg [volby] [souboru]\n"
 "Ov��� podpisy proti zn�m�m, d�v�ryhodn�m kl���m\n"
 
-#: g10/helptext.c:48
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1705,7 +1747,7 @@ msgstr ""
 "d�v�ry\"; nem� to nic spole�n�ho s (implicitn� vytvo�enou) \"pavu�inou\n"
 "certifik�t�\"."
 
-#: g10/helptext.c:54
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1717,17 +1759,17 @@ msgstr ""
 "k tajn�m kl���m. Odpov�zte \"ano\", abyste nastavili tyto kl��e\n"
 "jako absolutn� d�v�ryhodn�\n"
 
-#: g10/helptext.c:61
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Pokud p�esto chcete pou��t tento ned�v�ryhodn� kl��, odpov�zte \"ano\"."
 
-#: g10/helptext.c:65
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Vlo�te identifik�tor adres�ta, kter�mu chcete poslat zpr�vu."
 
-#: g10/helptext.c:69
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1751,7 +1793,7 @@ msgstr ""
 "\n"
 "Prvn� (prim�rn�) kl�� mus� b�t v�dy kl��, pomoc� kter�ho lze podepisovat."
 
-#: g10/helptext.c:83
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -1761,16 +1803,16 @@ msgstr ""
 "Tento algoritmus je vhodn� pou��t jen za jist�ch podm�nek.\n"
 "Kontaktujte pros�m nejprve bezpe�nostn�ho specialistu."
 
-#: g10/helptext.c:90
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "Vlo�te d�lku kl��e"
 
-#: g10/helptext.c:94 g10/helptext.c:99 g10/helptext.c:111 g10/helptext.c:143
-#: g10/helptext.c:171 g10/helptext.c:176 g10/helptext.c:181
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "Odpov�zte \"ano\" nebo \"ne\""
 
-#: g10/helptext.c:104
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1782,19 +1824,19 @@ msgstr ""
 "spr�vnou chybovou hl�ku - m�sto toho syst�m zkus� interpretovat\n"
 "zadanou hodnotu jako interval."
 
-#: g10/helptext.c:116
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "Vlo�te jm�no dr�itele kl��e"
 
-#: g10/helptext.c:121
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr "pros�m, vlo�te e-mailovou adresu (nepovinn�, ale velmi doporu�ovan�)"
 
-#: g10/helptext.c:125
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "Pros�m, vlo�te nepovinn� koment��"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1808,11 +1850,11 @@ msgstr ""
 "O  pro pokra�ov�n� generov�n� kl��e.\n"
 "Q  pro ukon�en� generov�n� kl��e."
 
-#: g10/helptext.c:139
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Jestli�e chcete generovat podkl��, odpov�zte \"ano\" (nebo jen \"a\")."
 
-#: g10/helptext.c:147
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -1885,12 +1927,12 @@ msgstr ""
 "\n"
 "Pokud nev�te, jak� je spr�vn� odpov��, odpov�zte \"0\"."
 
-#: g10/helptext.c:185
+#: g10/helptext.c:186
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr ""
 "Pokud chcete podepsat V�ECHNY identifik�tory u�ivatel�, odpov�zte \"ano\""
 
-#: g10/helptext.c:189
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -1899,11 +1941,11 @@ msgstr ""
 "\".\n"
 "V�echny certifik�ty budou tak� ztraceny!"
 
-#: g10/helptext.c:194
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Odpov�zte \"ano\", pokud chcete smazat podkl��"
 
-#: g10/helptext.c:199
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -1913,7 +1955,7 @@ msgstr ""
 "proto�e m��e b�t d�le�it� p�i vytv��en� d�v�ry kl��e nebo jin�ho kl��e\n"
 "ceritifikovan�ho t�mto kl��em."
 
-#: g10/helptext.c:204
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -1925,13 +1967,13 @@ msgstr ""
 "byl pou�it, proto�e tento podpisovac� kl�� m��e vytvo�it d�v�ru\n"
 "prost�ednictv�m jin�ho ji� certifikovan�ho kl��e."
 
-#: g10/helptext.c:210
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "Podpis je neplatn�. Je rozumn� ho odstranit z Va�eho souboru kl���."
 
-#: g10/helptext.c:214
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -1944,7 +1986,7 @@ msgstr ""
 "pou��vat. Ud�lejte to jenom v p��pad�, kdy je tento podpis kl��e\n"
 "j�m sam�m z n�jak�ho d�vodu neplatn� a kdy je k dipozici kl�� jin�."
 
-#: g10/helptext.c:222
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -1954,25 +1996,25 @@ msgstr ""
 "na aktu�ln� seznam p�edvoleb. �asov� raz�tka v�ech dot�en�ch podpis�\n"
 "kl��� jimi samotn�mi budou posunuty o jednu vte�inu dop�edu.\n"
 
-#: g10/helptext.c:229
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Pros�m, vlo�te heslo; toto je tajn� v�ta \n"
 
-#: g10/helptext.c:235
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "Pros�m, zopakujte posledn� heslo, abyste si byl(a) jist�(�), co jste \n"
 " napsal(a)."
 
-#: g10/helptext.c:239
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "Zadejte n�zev souboru, ke kter�mu se podpis vztahuje"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Pokud si p�ejete p�eps�n� souboru, odpov�zte \"ano\""
 
-#: g10/helptext.c:249
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -1980,7 +2022,7 @@ msgstr ""
 "Pros�m, vlo�te nov� n�zev souboru. Pokud pouze stisknete RETURN, bude\n"
 "pou�it implicitn� soubor (kter� je uk�z�n v z�vork�ch)."
 
-#: g10/helptext.c:255
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2008,7 +2050,7 @@ msgstr ""
 "      Toto pou�ijte, pokud by se identifik�tor u�ivatele u� nem�l pou��vat;\n"
 "      norm�ln� se pou��v� k ozna�en� neplatn� e-mailov� adresy.\n"
 
-#: g10/helptext.c:271
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2018,472 +2060,477 @@ msgstr ""
 "ceritifik�tu. Pros�m, stru�n�. \n"
 "Text kon�� pr�zdn�m ��dkem.\n"
 
-#: g10/helptext.c:286
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "Pomoc nen� k dispozici"
 
-#: g10/helptext.c:294
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Pomoc nen� dostupn� pro '%s'"
 
-#: g10/import.c:247
+#: g10/import.c:248
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d byl p�esko�en\n"
 
-#: g10/import.c:256
+#: g10/import.c:257
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu kl��e byly doposud zpracov�ny\n"
 
-#: g10/import.c:273
+#: g10/import.c:274
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Celkov� po�et zpracovan�ch kl���: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      p�esko�eny nov� kl��e: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:279
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          bez identifik�tor� (user ID): %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importov�no: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:287
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             beze zm�n: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          nov� id u�ivatel� (user ID): %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nov� podkl��e: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        nov� podpisy: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   nov� revokace kl���: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      p�e�ten� tajn� kl��e: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  importovan� tajn� kl��e: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "tajn� kl��e nezm�n�ny: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "           neimportov�no: %lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:544
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr "VAROV�N�: kl�� %s obsahuje preference pro algoritmy,\n"
 
-#: g10/import.c:545
+#: g10/import.c:546
 msgid "algorithms on these user IDs:\n"
 msgstr "kter� nesjou k dispozici. T�k� se to t�chto user ID:\n"
 
-#: g10/import.c:582
+#: g10/import.c:583
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": preference pro �ifrovac� algortimus %s\n"
 
-#: g10/import.c:594
+#: g10/import.c:595
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": preference pro podepisovac� algoritmus %s\n"
 
-#: g10/import.c:606
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": preference pro komprima�n� algoritmus %s\n"
 
-#: g10/import.c:619
+#: g10/import.c:620
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "velmi doporu�ujeme aktualiaci nastaven� va�ich preferenc� a\n"
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "distribuci tohoto kl��e aby jste p�ede�el probl�m�m s neshodou algoritm�\n"
 
-#: g10/import.c:645
+#: g10/import.c:646
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "nelze aktualizovat preference s: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:694 g10/import.c:1048
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "kl�� %s: chyb� identifik�tor u�ivatele\n"
 
-#: g10/import.c:713
+#: g10/import.c:714
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "kl�� %s: PKS po�kozen� podkl��e opraveno\n"
 
 # c-format
-#: g10/import.c:728
+#: g10/import.c:729
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "kl�� %s: p�ijat id u�ivatele \"%s\",kter� nen� podeps�n j�m sam�m\n"
 
-#: g10/import.c:734
+#: g10/import.c:735
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "kl�� %s: chyb� platn� identifik�tor u�ivatele\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 msgid "this may be caused by a missing self-signature\n"
 msgstr "m��e to b�t zp�sobeno chyb�j�c�m podpisem kl��e j�m sam�m\n"
 
-#: g10/import.c:746 g10/import.c:1168
+#: g10/import.c:747 g10/import.c:1169
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "kl�� %s: ve�ejn� kl�� nenalezen: %s\n"
 
-#: g10/import.c:752
+#: g10/import.c:753
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "kl�� %s: nov� kl�� - p�esko�en\n"
 
-#: g10/import.c:761
+#: g10/import.c:762
 #, c-format
 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:766 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapisuji do '%s'\n"
 
-#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
-#: g10/import.c:2314 g10/import.c:2336
+#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
+#: g10/import.c:2315 g10/import.c:2337
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "chyba p�i z�pisu souboru kl��� (keyring)  `%s': %s\n"
 
-#: g10/import.c:791
+#: g10/import.c:792
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "kl�� %s: ve�ejn� kl�� \"%s\" importov�n\n"
 
-#: g10/import.c:815
+#: g10/import.c:816
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "kl�� %s: neodpov�d� na�� kopii\n"
 
-#: g10/import.c:832 g10/import.c:1186
+#: g10/import.c:833 g10/import.c:1187
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "kl�� %s: nemohu naj�t origin�ln� blok kl��e: %s\n"
 
-#: g10/import.c:840 g10/import.c:1193
+#: g10/import.c:841 g10/import.c:1194
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "kl�� %s: nemohu ��st origin�ln� blok kl��e: %s\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "kl�� %s: \"%s\" 1 nov� identifik�tor u�ivatele\n"
 
-#: g10/import.c:875
+#: g10/import.c:876
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "kl�� %s: \"%s\" %d nov�ch identifik�tor� u�ivatele\n"
 
-#: g10/import.c:878
+#: g10/import.c:879
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "kl�� %s: \"%s\" 1 nov� podpis\n"
 
-#: g10/import.c:881
+#: g10/import.c:882
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "kl�� %s: \"%s\" %d nov�ch podpis�\n"
 
-#: g10/import.c:884
+#: g10/import.c:885
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "kl�� %s: \"%s\" 1 nov� podkl��\n"
 
-#: g10/import.c:887
+#: g10/import.c:888
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "kl�� %s: \"%s\" %d nov�ch podkl���\n"
 
-#: g10/import.c:908
+#: g10/import.c:909
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "kl�� %s: \"%s\" beze zm�n\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1054
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "kl�� %s: tajn� kl�� s neplatnou �ifrou %d - p�esko�eno\n"
 
-#: g10/import.c:1064
+#: g10/import.c:1065
 msgid "importing secret keys not allowed\n"
 msgstr "import tajn�ch kl��� nen� povolen\n"
 
-#: g10/import.c:1081 g10/import.c:2329
+#: g10/import.c:1082 g10/import.c:2330
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nen� nastaven implicitn� soubor tajn�ch kl��� %s\n"
 
-#: g10/import.c:1092
+#: g10/import.c:1093
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "kl�� %s: tajn� kl�� importov�n\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1122
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "kl�� %s: je ji� v souboru tajn�ch kl���\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1132
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "kl�� %s: nenalezen tajn� kl��: %s\n"
 
-#: g10/import.c:1161
+#: g10/import.c:1162
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "kl�� %s: chyb� ve�ejn� kl�� - nemohu aplikovat revoka�n� certifik�t\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1205
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "kl�� %s: neplatn� revoka�n� certifik�t: %s - zam�tnuto\n"
 
-#: g10/import.c:1236
+#: g10/import.c:1237
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "kl�� %s: \"%s\" revoka�n� certifik�t importov�n\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1302
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "kl�� %s: neexistuje id u�ivatele pro podpis\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1317
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "kl�� %s: nepodporovan� algoritmus ve�ejn�ho kl��e u u�ivatelsk�ho id  \"%s"
 "\"\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "kl�� %s neplatn� podpis kl��e j�m sam�m u u�ivatelsk�ho id \"%s\"\n"
 
-#: g10/import.c:1336
+#: g10/import.c:1337
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "kl�� %s: neexistuje podkl�� pro v�z�n� kl���\n"
 
-#: g10/import.c:1347 g10/import.c:1397
+#: g10/import.c:1348 g10/import.c:1398
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "kl�� %s: nepodporovan� algoritmus ve�ejn�ho kl��e\n"
 
-#: g10/import.c:1349
+#: g10/import.c:1350
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "kl�� %s: neplatn� vazba podkl��e\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1365
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "kl�� %s: smaz�na v�cen�sobn� vazba podkl��e\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "kl�� %s: neexistuje podkl�� pro revokaci kl��e\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "kl�� %s: neplatn� revoka�n� podkl��\n"
 
-#: g10/import.c:1414
+#: g10/import.c:1415
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "kl�� %s: smaz�na v�cen�sobn� revokace podkl��e\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1457
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "kl�� %s: p�esko�en identifik�tor u�ivatele \"%s\"\n"
 
-#: g10/import.c:1477
+#: g10/import.c:1478
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "kl�� %s: podkl�� p�esko�en\n"
 
-#: g10/import.c:1504
+#: g10/import.c:1505
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "kl�� %s: podpis nen� exportovateln� (t��da %02X) - p�esko�eno\n"
 
-#: g10/import.c:1514
+#: g10/import.c:1515
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "kl�� %s: revoka�n� certifik�t na �patn�m m�st� - p�esko�eno \n"
 
-#: g10/import.c:1531
+#: g10/import.c:1532
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "kl�� %s: neplatn� revoka�n� certifik�t: %s - p�esko�en\n"
 
-#: g10/import.c:1545
+#: g10/import.c:1546
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "kl�� %s: podpis podkl��e na �patn�m m�st� - p�esko�eno \n"
 
-#: g10/import.c:1553
+#: g10/import.c:1554
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "kl�� %s: neo�ek�van� podpisov� t��da (0x%02X) - p�esko�eno\n"
 
-#: g10/import.c:1574
+#: g10/import.c:1575
 #, fuzzy, c-format
 msgid "key %s: expired signature from key %s - skipped\n"
 msgstr "kl�� %s: neo�ek�van� podpisov� t��da (0x%02X) - p�esko�eno\n"
 
-#: g10/import.c:1677
+#: g10/import.c:1678
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "kl�� %s: objeven duplikovan� identifik�tor u�ivatele - slou�en\n"
 
-#: g10/import.c:1739
+#: g10/import.c:1740
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "VAROV�N�: kl�� %s m��e b�t revokov�n: zkou��m z�skat revoka�n� kl�� %s\n"
 
-#: g10/import.c:1753
+#: g10/import.c:1754
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "VAROV�N�: kl�� %s m��e b�t revokov�n: revoka�n� kl�� %s nenalezen.\n"
 
-#: g10/import.c:1812
+#: g10/import.c:1813
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "kl�� %s: \"%s\" p�id�n revoka�n� certifik�t\n"
 
-#: g10/import.c:1846
+#: g10/import.c:1847
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "kl�� %s: podpis kl��e j�m sam�m (direct key signature) p�id�n\n"
 
-#: g10/import.c:2235
+#: g10/import.c:2236
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "ve�ejn� kl�� neodpov�d� tajn�mu kl��i!\n"
 
-#: g10/import.c:2243
+#: g10/import.c:2244
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "tajn� kl�� je na kart� ulo�en\n"
 
-#: g10/import.c:2245
+#: g10/import.c:2246
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "tajn� kl�� je na kart� ulo�en\n"
 
-#: g10/keydb.c:167
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "chyba p�i vytv��en� souboru kl��� (keyring)`%s': %s\n"
 
-#: g10/keydb.c:174
+#: g10/keydb.c:175
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "soubor kl��� (keyring) `%s' vytvo�en\n"
 
-#: g10/keydb.c:685
+#: g10/keydb.c:316 g10/keydb.c:319
+#, fuzzy, c-format
+msgid "keyblock resource `%s': %s\n"
+msgstr "chyba p�i vytv��en� `%s': %s\n"
+
+#: g10/keydb.c:698
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "selhalo obnoven� vyrovn�vac� pam�ti kl���: %s\n"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[revokace]"
 
-#: g10/keyedit.c:255
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[podpis kl��e j�m sam�m]"
 
-#: g10/keyedit.c:333 g10/keylist.c:405
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 �patn� podpis\n"
 
-#: g10/keyedit.c:335 g10/keylist.c:407
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d �patn�ch podpis�\n"
 
-#: g10/keyedit.c:337 g10/keylist.c:409
+#: g10/keyedit.c:344 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 podpis neov��en, proto�e chyb� kl��\n"
 
-#: g10/keyedit.c:339 g10/keylist.c:411
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, 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:341 g10/keylist.c:413
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 podpis neov��en, proto�e vznikla chyba\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:415
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, 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:345
+#: g10/keyedit.c:352
 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:347
+#: g10/keyedit.c:354
 #, 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:403 g10/pkclist.c:262
+#: g10/keyedit.c:410 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2495,17 +2542,17 @@ msgstr ""
 "kontrolou fingerprint� z r�zn�ch zdroj�...)?\n"
 "\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:274
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = D�v��uji ��ste�n�\n"
 
-#: g10/keyedit.c:408 g10/pkclist.c:276
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = D�v��uji �pln�\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:434
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2515,38 +2562,48 @@ 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:443
+#: g10/keyedit.c:450
 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:585
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "U�ivatelsk� ID \"%s\" je revokov�no."
 
-#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
-#: g10/keyedit.c:858 g10/keyedit.c:1642
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1728
 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:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
-#: g10/keyedit.c:1648
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
+#: g10/keyedit.c:1734
 msgid "  Unable to sign.\n"
 msgstr "  Nelze podepsat.\n"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Vypr�ela platnost u�ivatelsk�ho ID \"%s\"."
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:650
 #, 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:676
+#: g10/keyedit.c:678
+#, fuzzy, c-format
+msgid "User ID \"%s\" is signable.  "
+msgstr "ID u�ivatele \"%s\" nen� podeps�no j�m sam�m."
+
+#: g10/keyedit.c:680
+#, fuzzy
+msgid "Sign it? (y/N) "
+msgstr "Skute�n� podepsat? (a/N) "
+
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2555,11 +2612,11 @@ msgstr ""
 "Podpis kl��e \"%s\" j�m sam�m je\n"
 "podpis form�tu PGP 2.x.\n"
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:711
 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:699
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2569,13 +2626,13 @@ msgstr ""
 "vypr�ela.\n"
 "\n"
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:729
 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:724
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2585,54 +2642,54 @@ msgstr ""
 "je pouze lok�ln�.\n"
 "\n"
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:754
 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:749
+#: g10/keyedit.c:775
 #, 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:752
+#: g10/keyedit.c:778
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" je ji� podeps�n kl��em %s\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:783
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Chcete kl�� p�esto znova podepsat? (a/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:805
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nic k podeps�n� kl��em %s\n"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "Platnost kl��e vypr�ela!"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Platnost kl��e vypr�� %s.\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:844
 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:851
+#: g10/keyedit.c:882
 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:853
+#: g10/keyedit.c:884
 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:878
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2642,32 +2699,32 @@ msgstr ""
 "pat�� v��e uveden� osob�.\n"
 "Pokud nezn�te odpov��, zadejte \"0\".\n"
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Neodpov�m.%s\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Nijak jsem to nekontroloval(a).%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:918
 #, 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:889
+#: g10/keyedit.c:920
 #, 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:895
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Va� v�b�r? (pro detailn�j�� informace stiskn�t� '?'):"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:950
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2676,75 +2733,75 @@ msgstr ""
 "Jste si jist�(�), �e chcete podepsat tento kl��\n"
 "sv�m kl��em \"%s\" (%s)\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:957
 msgid "This will be a self-signature.\n"
 msgstr "Jedn� se o podpis kl��e j�m sam�m.\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:963
 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:940
+#: g10/keyedit.c:971
 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:950
+#: g10/keyedit.c:981
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Podpis bude ozna�en jako neexportovateln�.\n"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:988
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Podpis bude ozna�en jako neodvolateln� (non-revocable).\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:995
 msgid "I have not checked this key at all.\n"
 msgstr "Nijak jsem tento kl�� neov��il.\n"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1000
 msgid "I have checked this key casually.\n"
 msgstr "��ste�n� jsem ov��il tento kl��.\n"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1005
 msgid "I have checked this key very carefully.\n"
 msgstr "Velmi pe�liv� jsem ov��il tento kl��.\n"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1015
 msgid "Really sign? (y/N) "
 msgstr "Skute�n� podepsat? (a/N) "
 
-#: g10/keyedit.c:1029 g10/keyedit.c:4132 g10/keyedit.c:4223 g10/keyedit.c:4287
-#: g10/keyedit.c:4348 g10/sign.c:369
+#: g10/keyedit.c:1060 g10/keyedit.c:4350 g10/keyedit.c:4441 g10/keyedit.c:4505
+#: g10/keyedit.c:4566 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podeps�n� selhalo: %s\n"
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1105 g10/keygen.c:3057
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "Tento kl�� nen� chr�n�n�.\n"
 
-#: g10/keyedit.c:1109 g10/keygen.c:3045
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Tajn� ��sti prim�rn�ho kl��e nejsou dostupn�.\n"
 
-#: g10/keyedit.c:1113 g10/keygen.c:3060
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Tajn� ��sti prim�rn�ho kl��e nejsou dostupn�.\n"
 
-#: g10/keyedit.c:1117 g10/keygen.c:3064
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "Kl�� je chr�n�n�.\n"
 
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Nen� mo�n� editovat tento kl��: %s\n"
 
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2752,11 +2809,11 @@ msgstr ""
 "Vlo�te nov� heslo (passphrase) pro tento tajn� kl��.\n"
 "\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:1825
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "heslo nen� zopakov�no spr�vn�; zkuste to znovu"
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2764,193 +2821,193 @@ msgstr ""
 "Nechcete heslo - to *nen�* dobr� n�pad!\n"
 "\n"
 
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1195
 msgid "Do you really want to do this? (y/N) "
 msgstr "Opravdu to chcete ud�lat? (a/N) "
 
-#: g10/keyedit.c:1235
+#: g10/keyedit.c:1266
 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:1319
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "ulo�it a ukon�it"
 
-#: g10/keyedit.c:1322
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "vypsat fingerprint"
 
-#: g10/keyedit.c:1323
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "vypsat seznam kl��� a id u�ivatel�"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "vyberte identifik�tor u�ivatele N"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "vyberte identifik�tor u�ivatele N"
 
-#: g10/keyedit.c:1327
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "revokovat podpisy"
 
-#: g10/keyedit.c:1330
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1335
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "podepsat kl�� lok�ln�"
 
-#: g10/keyedit.c:1337
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "N�pov�da: Vyberte id u�ivatele k podeps�n�\n"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1343
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "p�idat identifik�tor u�ivatele"
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "p�idat fotografick� ID"
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "smazat identifik�tor u�ivatele"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr "p�idat kl�� na kartu"
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr "p�esunout kl�� na kartu"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1392
 #, fuzzy
 msgid "move a backup key to a smartcard"
 msgstr "p�esunout kl�� na kartu"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "smazat sekund�rn� kl��"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr "p�idat revoka�n� kl��"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Opravdu aktualizovat p�edvolby pro vybran� id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Nem��ete zm�nit dobu platnosti kl��e verze 3\n"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "ozna�it u�ivatelsk� ID jako prim�rn�"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "p�epnout mezi vyps�n�m seznamu tajn�ch a ve�ejn�ch kl���"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "vypsat seznam p�edvoleb (pro experty)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "vypsat seznam p�edvoleb (podrobn�)"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Opravdu aktualizovat p�edvolby pro vybran� id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1418
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "nastavit URL pro preferovan� server kl���"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "zm�nit heslo"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "zm�nit d�v�ryhodnost vlastn�ka kl��e"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1426
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Opravdu revokovat v�echny vybran� id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "odvolat platnost id u�ivatele"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revokovat sekund�rn� kl��"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "enable key"
 msgstr "nastavit kl�� jako platn� (enable)"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "disable key"
 msgstr "nastavit kl�� jako neplatn� (disable)"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1436
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "uk�zat fotografick� ID"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1556
 #, 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:1494
+#: g10/keyedit.c:1574
 msgid "Secret key is available.\n"
 msgstr "Tajn� kl�� je dostupn�.\n"
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1655
 msgid "Need the secret key to do this.\n"
 msgstr "Pro proveden� t�to operace je pot�eba tajn� kl��.\n"
 
-#: g10/keyedit.c:1579
+#: g10/keyedit.c:1663
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Pros�m, nejd��ve pou�ijte p��kaz \"toggle\" (p�epnout).\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1682
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -2958,224 +3015,229 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1722
 msgid "Key is revoked."
 msgstr "Kl�� revokov�n."
 
-#: g10/keyedit.c:1657
+#: g10/keyedit.c:1741
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Opravdu podepsat v�echny id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:1660
-msgid "Hint: Select the user IDs to sign\n"
-msgstr "N�pov�da: Vyberte id u�ivatele k podeps�n�\n"
-
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1748
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "nezn�m� t��da podpisu"
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1771
 #, 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:1713 g10/keyedit.c:1733 g10/keyedit.c:1899
+#: g10/keyedit.c:1793 g10/keyedit.c:1813 g10/keyedit.c:1979
 msgid "You must select at least one user ID.\n"
 msgstr "Mus�te vybrat alespo� jeden id u�ivatele.\n"
 
-#: g10/keyedit.c:1715
+#: g10/keyedit.c:1795
 msgid "You can't delete the last user ID!\n"
 msgstr "Nem��ete smazat posledn� id u�ivatele!\n"
 
-#: g10/keyedit.c:1717
+#: g10/keyedit.c:1797
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Opravdu odstranit v�echny vybran� id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:1718
+#: g10/keyedit.c:1798
 msgid "Really remove this user ID? (y/N) "
 msgstr "Opravdu odstranit tento id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1848
 msgid "Really move the primary key? (y/N) "
 msgstr "Opravdu p�esunout prim�rn� kl��? (a/N) "
 
-#: g10/keyedit.c:1780
+#: g10/keyedit.c:1860
 msgid "You must select exactly one key.\n"
 msgstr "Mus�te vybrat pr�v� jeden kl��.\n"
 
-#: g10/keyedit.c:1808
+#: g10/keyedit.c:1888
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1822
+#: g10/keyedit.c:1902
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "nemohu otev��t `%s': %s\n"
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1919
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "chyba p�i vytv��en� souboru kl��� (keyring)`%s': %s\n"
 
-#: g10/keyedit.c:1863
+#: g10/keyedit.c:1943
 msgid "You must select at least one key.\n"
 msgstr "Mus�te vybrat alespo� jeden kl��.\n"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1946
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Opravdu chcete smazat vybran� kl��e? (a/N) "
 
-#: g10/keyedit.c:1867
+#: g10/keyedit.c:1947
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Opravdu chcete smazat tento kl��? (a/N) "
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1982
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Opravdu revokovat v�echny vybran� id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1983
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Opravdu revokovat tento id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:1921
+#: g10/keyedit.c:2001
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Opravdu chcete revokovat tento kl��? (a/N) "
 
-#: g10/keyedit.c:1932
+#: g10/keyedit.c:2012
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Opravdu chcete revokovat vybran� kl��e? (a/N) "
 
-#: g10/keyedit.c:1934
+#: g10/keyedit.c:2014
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Opravdu chcete revokovat tento kl��? (a/N) "
 
-#: g10/keyedit.c:1975
+#: g10/keyedit.c:2055
 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:2007
+#: g10/keyedit.c:2087
 msgid "Set preference list to:\n"
 msgstr "Nastavit seznam p�edvoleb:\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2093
 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:2015
+#: g10/keyedit.c:2095
 msgid "Really update the preferences? (y/N) "
 msgstr "Opravdu aktualizovat p�edvolby? (a/N) "
 
-#: g10/keyedit.c:2065
+#: g10/keyedit.c:2157
+#, fuzzy, c-format
+msgid "Unable to clean `%s'\n"
+msgstr "nelze spustit program `%s': %s\n"
+
+#: g10/keyedit.c:2160
+msgid "Please specify item to clean: `sigs', `uids', or `all'\n"
+msgstr ""
+
+#: g10/keyedit.c:2171
 msgid "Save changes? (y/N) "
 msgstr "Ulo�it zm�ny? (a/N) "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2174
 msgid "Quit without saving? (y/N) "
 msgstr "Ukon�it bez ulo�en�? (a/N) "
 
-#: g10/keyedit.c:2078
+#: g10/keyedit.c:2184
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2191
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualizace tajn�ho kl��e selhala: %s\n"
 
-#: g10/keyedit.c:2092
+#: g10/keyedit.c:2198
 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:2164
+#: g10/keyedit.c:2271
 msgid "Digest: "
 msgstr "Hash: "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2323
 msgid "Features: "
 msgstr "Vlastnosti: "
 
-#: g10/keyedit.c:2227
+#: g10/keyedit.c:2334
 msgid "Keyserver no-modify"
 msgstr "Keyserver bez modifikace"
 
-#: g10/keyedit.c:2242 g10/keylist.c:307
+#: g10/keyedit.c:2349 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "Preferovan� keyserver: "
 
-#: g10/keyedit.c:2473
+#: g10/keyedit.c:2580
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Tento kl�� m��e b�t revokov�n kl��em %s "
 
-#: g10/keyedit.c:2494
+#: g10/keyedit.c:2601
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Tento kl�� m��e b�t revokov�n kl��em %s "
 
-#: g10/keyedit.c:2500
+#: g10/keyedit.c:2607
 #, fuzzy
 msgid "(sensitive)"
 msgstr "(citliv� informace)"
 
-#: g10/keyedit.c:2516 g10/keyedit.c:2572 g10/keyedit.c:2684 g10/keyedit.c:2699
-#: g10/keylist.c:193 g10/keyserver.c:422
+#: g10/keyedit.c:2623 g10/keyedit.c:2679 g10/keyedit.c:2792 g10/keyedit.c:2807
+#: g10/keylist.c:194 g10/keyserver.c:421
 #, c-format
 msgid "created: %s"
 msgstr "vytvo�en: %s"
 
-#: g10/keyedit.c:2519 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:931
+#: g10/keyedit.c:2626 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:948
 #, c-format
 msgid "revoked: %s"
 msgstr "revokov�n: %s"
 
-#: g10/keyedit.c:2521 g10/keylist.c:757 g10/keylist.c:886
+#: g10/keyedit.c:2628 g10/keylist.c:758 g10/keylist.c:887
 #, c-format
 msgid "expired: %s"
 msgstr "platnost skon�ila: %s"
 
-#: g10/keyedit.c:2523 g10/keyedit.c:2574 g10/keyedit.c:2686 g10/keyedit.c:2701
-#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
-#: g10/keylist.c:913 g10/keyserver.c:428 g10/mainproc.c:937
+#: g10/keyedit.c:2630 g10/keyedit.c:2681 g10/keyedit.c:2794 g10/keyedit.c:2809
+#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
+#: g10/keylist.c:914 g10/keyserver.c:427 g10/mainproc.c:954
 #, c-format
 msgid "expires: %s"
 msgstr "platnost skon��: %s"
 
-#: g10/keyedit.c:2525
+#: g10/keyedit.c:2632
 #, c-format
 msgid "usage: %s"
 msgstr "pou�it�: %s"
 
-#: g10/keyedit.c:2540
+#: g10/keyedit.c:2647
 #, c-format
 msgid "trust: %s"
 msgstr "d�v�ra: %s"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2651
 #, c-format
 msgid "validity: %s"
 msgstr "platnost: %s"
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2658
 msgid "This key has been disabled"
 msgstr "Tento kl�� byl ozna�en za neplatn� (disabled)"
 
-#: g10/keyedit.c:2579 g10/keylist.c:199
+#: g10/keyedit.c:2686 g10/keylist.c:200
 msgid "card-no: "
 msgstr "��slo karty: "
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2754
 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:2654
+#: g10/keyedit.c:2762
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3183,17 +3245,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:2718 g10/keyserver.c:432 g10/mainproc.c:1577
-#: g10/trustdb.c:1178
+#: g10/keyedit.c:2826 g10/keyedit.c:3201 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1690
 msgid "revoked"
 msgstr "revokov�n"
 
-#: g10/keyedit.c:2720 g10/keyserver.c:436 g10/mainproc.c:1579
-#: g10/trustdb.c:531
+#: g10/keyedit.c:2828 g10/keyedit.c:3203 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1692
 msgid "expired"
 msgstr "platnost skon�ila"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2893
 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"
@@ -3201,7 +3263,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:2845
+#: g10/keyedit.c:2953
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3210,45 +3272,75 @@ 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:2850 g10/keyedit.c:3128
+#: g10/keyedit.c:2958 g10/keyedit.c:3307
 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:2856
+#: g10/keyedit.c:2964
 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:2996
+#: g10/keyedit.c:3104
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Smazat tento dobr� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3114
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Smazat tento neplatn� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3010
+#: g10/keyedit.c:3118
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Smazat tento nezn�m� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3016
+#: g10/keyedit.c:3124
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Opravdu smazat tento podpis podepsan� sebou sam�m? (a/N)"
 
-#: g10/keyedit.c:3030
+#: g10/keyedit.c:3138
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Smaz�n %d podpis.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3139
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Smaz�no %d podpis�.\n"
 
-#: g10/keyedit.c:3034
+#: g10/keyedit.c:3142
 msgid "Nothing deleted.\n"
 msgstr "Nic nebylo smaz�no.\n"
 
-#: g10/keyedit.c:3123
+#: g10/keyedit.c:3167
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed.\n"
+msgstr "U�ivatelsk� ID \"%s\" je revokov�no."
+
+#: g10/keyedit.c:3168
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed.\n"
+msgstr "U�ivatelsk� ID \"%s\" je revokov�no."
+
+#: g10/keyedit.c:3173
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean.\n"
+msgstr "U�ivatelsk� ID \"%s\" je ji� revokov�no.\n"
+
+#: g10/keyedit.c:3205 g10/trustdb.c:1694
+#, fuzzy
+msgid "invalid"
+msgstr "neplatn� zp�sob reprezentace v ASCII"
+
+#: g10/keyedit.c:3207
+#, fuzzy, c-format
+msgid "User ID \"%s\" removed: %s\n"
+msgstr "U�ivatelsk� ID \"%s\" je revokov�no."
+
+#: g10/keyedit.c:3214
+#, fuzzy
+msgid "No user IDs are removable.\n"
+msgstr "U�ivatelsk� ID \"%s\" je ji� revokov�no.\n"
+
+#: g10/keyedit.c:3302
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3257,330 +3349,335 @@ 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:3134
+#: g10/keyedit.c:3313
 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:3154
+#: g10/keyedit.c:3333
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vlo�te identifik�tor u�ivatele pov��en�ho revokac�: "
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3356
 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:3192
+#: g10/keyedit.c:3371
 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:3214
+#: g10/keyedit.c:3393
 msgid "this key has already been designated as a revoker\n"
 msgstr "tento kl�� ji� bykl pov��en revokac�\n"
 
-#: g10/keyedit.c:3233
+#: g10/keyedit.c:3412
 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:3239
+#: g10/keyedit.c:3418
 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:3300
+#: g10/keyedit.c:3479
 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:3306
+#: g10/keyedit.c:3485
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Pros�m, vyberte nejv��e jeden sekund�rn� kl��.\n"
 
-#: g10/keyedit.c:3310
+#: g10/keyedit.c:3489
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "M�n�m dobu platnosti sekund�rn�ho kl��e.\n"
 
-#: g10/keyedit.c:3313
+#: g10/keyedit.c:3492
 msgid "Changing expiration time for the primary key.\n"
 msgstr "M�n�m dobu platnosti prim�rn�ho kl��e.\n"
 
-#: g10/keyedit.c:3359
+#: g10/keyedit.c:3538
 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:3375
+#: g10/keyedit.c:3554
 msgid "No corresponding signature in secret ring\n"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/keyedit.c:3455
+#: g10/keyedit.c:3634
 msgid "Please select exactly one user ID.\n"
 msgstr "Pros�m, vyberte pr�v� jeden id u�ivatele .\n"
 
-#: g10/keyedit.c:3494 g10/keyedit.c:3604 g10/keyedit.c:3724
+#: g10/keyedit.c:3673 g10/keyedit.c:3783 g10/keyedit.c:3903
 #, 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:3665
+#: g10/keyedit.c:3844
 msgid "Enter your preferred keyserver URL: "
 msgstr "Vlo�te URL preferovan�ho keyserveru: "
 
-#: g10/keyedit.c:3745
+#: g10/keyedit.c:3924
 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:3746
+#: g10/keyedit.c:3925
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Jste si jist�(�), �e jej chcete smazat? (a/N) "
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3987
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifik�tor u�ivatele s indexem %d\n"
 
-#: g10/keyedit.c:3854
+#: g10/keyedit.c:4045
+#, fuzzy, c-format
+msgid "No user ID with hash %s\n"
+msgstr "Neexistuje identifik�tor u�ivatele s indexem %d\n"
+
+#: g10/keyedit.c:4072
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Neexistuje identifik�tor u�ivatele s indexem %d\n"
 
-#: g10/keyedit.c:3971
+#: g10/keyedit.c:4189
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "id u�ivatele:\"%s\"\n"
 
-#: g10/keyedit.c:3974 g10/keyedit.c:4038 g10/keyedit.c:4081
+#: g10/keyedit.c:4192 g10/keyedit.c:4256 g10/keyedit.c:4299
 #, 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:3976 g10/keyedit.c:4040 g10/keyedit.c:4083
+#: g10/keyedit.c:4194 g10/keyedit.c:4258 g10/keyedit.c:4301
 msgid " (non-exportable)"
 msgstr " (neexportovateln�)"
 
-#: g10/keyedit.c:3980
+#: g10/keyedit.c:4198
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnost podpisu vypr�� %s.\n"
 
-#: g10/keyedit.c:3984
+#: g10/keyedit.c:4202
 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:3988
+#: g10/keyedit.c:4206
 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:4015
+#: g10/keyedit.c:4233
 #, 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:4041
+#: g10/keyedit.c:4259
 msgid " (non-revocable)"
 msgstr " (nerevokovateln�)"
 
-#: g10/keyedit.c:4048
+#: g10/keyedit.c:4266
 #, 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:4070
+#: g10/keyedit.c:4288
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chyst�te se revokovat tyto podpisy:\n"
 
-#: g10/keyedit.c:4090
+#: g10/keyedit.c:4308
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Opravdu vytvo�it revoka�n� certifik�ty? (a/N) "
 
-#: g10/keyedit.c:4120
+#: g10/keyedit.c:4338
 msgid "no secret key\n"
 msgstr "neexistuje tajn� kl��\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4408
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "U�ivatelsk� ID \"%s\" je ji� revokov�no.\n"
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4425
 #, 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:4271
+#: g10/keyedit.c:4489
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "U�ivatelsk� ID \"%s\" je ji� revokov�no.\n"
 
-#: g10/keyedit.c:4333
+#: g10/keyedit.c:4551
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "U�ivatelsk� ID \"%s\" je ji� revokov�no.\n"
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4646
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Zobrazuji %s fotografick� ID o velikosti %ld pro kl�� %s (uid %d)\n"
 
-#: g10/keygen.c:293
+#: g10/keygen.c:258
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "duplicita p�edvolby `%s'\n"
 
-#: g10/keygen.c:300
+#: g10/keygen.c:265
 msgid "too many cipher preferences\n"
 msgstr "p��li� mnoho p�edvoleb pro �ifrov�n�\n"
 
-#: g10/keygen.c:302
+#: g10/keygen.c:267
 msgid "too many digest preferences\n"
 msgstr "p��li� mnoho p�edvoleb pro vzorkov�n�\n"
 
-#: g10/keygen.c:304
+#: g10/keygen.c:269
 msgid "too many compression preferences\n"
 msgstr "p��li� mnoho p�edvoleb pro komprimaci\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:394
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "neplatn� polo�ka `%s' v �et�zci s p�edvolbami\n"
 
-#: g10/keygen.c:829
+#: g10/keygen.c:822
 msgid "writing direct signature\n"
 msgstr "zapisuji podpis kl��e j�m sam�m (direct signature)\n"
 
-#: g10/keygen.c:868
+#: g10/keygen.c:861
 msgid "writing self signature\n"
 msgstr "zapisuji podpis kl��e sebou sam�m\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing key binding signature\n"
 msgstr "zapisuji \"key-binding\" podpis\n"
 
-#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2632
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "neplatn� d�lka kl��e; pou�iji %u bit�\n"
 
-#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2638
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "d�lka kl��e zaokrouhlena na %u bit�\n"
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1239
 msgid "Sign"
 msgstr "Podepisov�n�"
 
-#: g10/keygen.c:1252
+#: g10/keygen.c:1242
 msgid "Encrypt"
 msgstr "�ifrov�n�"
 
-#: g10/keygen.c:1255
+#: g10/keygen.c:1245
 msgid "Authenticate"
 msgstr "Autentizace"
 
-#: g10/keygen.c:1263
+#: g10/keygen.c:1253
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1268
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Pro kl�� %s lze prov�st: "
 
-#: g10/keygen.c:1282
+#: g10/keygen.c:1272
 msgid "Current allowed actions: "
 msgstr "Aktu�ln� povolen� akce: "
 
-#: g10/keygen.c:1287
+#: g10/keygen.c:1277
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Zapnout/vypnout schopnost podepisovat\n"
 
-#: g10/keygen.c:1290
+#: g10/keygen.c:1280
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Zapnout/vypnout schopnost �ifrovat\n"
 
-#: g10/keygen.c:1293
+#: g10/keygen.c:1283
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Zapnout/vypnout schopnost autentizovat\n"
 
-#: g10/keygen.c:1296
+#: g10/keygen.c:1286
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Konec\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1340
 msgid "Please select what kind of key you want:\n"
 msgstr "Pros�m, vyberte druh kl��e, kter� chcete:\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1342
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA a ElGamal (implicitn�)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1343
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (pouze pro podpis)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1345
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nastavit si vlastn� pou�it�)\n"
 
-#: g10/keygen.c:1357
+#: g10/keygen.c:1347
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (pouze pro �ifrov�n�)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1348
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (pouze pro podpis)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1350
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (pouze pro �ifrov�n�)\n"
 
-#: g10/keygen.c:1362
+#: g10/keygen.c:1352
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nastavit si vlastn� pou�it�)\n"
 
-#: g10/keygen.c:1431 g10/keygen.c:2509
+#: g10/keygen.c:1421 g10/keygen.c:2506
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "P�r kl��� DSA bude dlouh� 1024 bit�.\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1431
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1438
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Jakou velikost kl��e si p�ejete? (1024) "
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1452
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1468
+#: g10/keygen.c:1458
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Po�adovan� d�lka kl��e je %u bit�.\n"
 
-#: g10/keygen.c:1473 g10/keygen.c:1478
+#: g10/keygen.c:1463 g10/keygen.c:1468
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokrouhleno na %u bit�\n"
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1515
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3596,7 +3693,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:1539
+#: g10/keygen.c:1526
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3612,39 +3709,40 @@ 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:1561
+#: g10/keygen.c:1549
 msgid "Key is valid for? (0) "
 msgstr "Kl�� je platn� pro? (0) "
 
-#: g10/keygen.c:1563
-msgid "Signature is valid for? (0) "
+#: g10/keygen.c:1554
+#, fuzzy, c-format
+msgid "Signature is valid for? (%s) "
 msgstr "Podpis je platn� pro? (0) "
 
-#: g10/keygen.c:1568
+#: g10/keygen.c:1572
 msgid "invalid value\n"
 msgstr "neplatn� hodnota\n"
 
-#: g10/keygen.c:1575
+#: g10/keygen.c:1579
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "platnost %s neskon��\n"
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1580
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "platnost %s neskon��\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1585
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "platnost %s skon�� %s\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1586
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Platnost podpisu skon�� %s\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1592
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3652,11 +3750,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:1595
+#: g10/keygen.c:1597
 msgid "Is this correct? (y/N) "
 msgstr "Je to spr�vn� (a/N)? "
 
-#: g10/keygen.c:1638
+#: g10/keygen.c:1641
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3672,44 +3770,44 @@ msgstr ""
 "    \"Magda Prochazkova (student) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1651
+#: g10/keygen.c:1654
 msgid "Real name: "
 msgstr "Jm�no a p��jmen�: "
 
-#: g10/keygen.c:1659
+#: g10/keygen.c:1662
 msgid "Invalid character in name\n"
 msgstr "Neplatn� znak ve jm�n�\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1664
 msgid "Name may not start with a digit\n"
 msgstr "Jm�no nem��e za��nat ��slic�\n"
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1666
 msgid "Name must be at least 5 characters long\n"
 msgstr "Jm�no mus� b�t dlouh� alespo� 5 znak�\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1674
 msgid "Email address: "
 msgstr "E-mailov� adresa: "
 
-#: g10/keygen.c:1682
+#: g10/keygen.c:1685
 msgid "Not a valid email address\n"
 msgstr "Neplatn� e-mailov� adresa\n"
 
-#: g10/keygen.c:1690
+#: g10/keygen.c:1693
 msgid "Comment: "
 msgstr "Koment��: "
 
-#: g10/keygen.c:1696
+#: g10/keygen.c:1699
 msgid "Invalid character in comment\n"
 msgstr "Neplatn� znak v koment��i\n"
 
-#: g10/keygen.c:1719
+#: g10/keygen.c:1722
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Pou��v�te znakovou sadu `%s'.\n"
 
-#: g10/keygen.c:1725
+#: g10/keygen.c:1728
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3720,7 +3818,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1733
 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"
 
@@ -3735,25 +3833,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:1746
+#: g10/keygen.c:1749
 msgid "NnCcEeOoQq"
 msgstr "jJkKeEPpUu"
 
-#: g10/keygen.c:1756
+#: g10/keygen.c:1759
 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:1757
+#: g10/keygen.c:1760
 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:1776
+#: g10/keygen.c:1779
 msgid "Please correct the error first\n"
 msgstr "Nejd��v, pros�m, opravte chybu\n"
 
-#: g10/keygen.c:1816
+#: g10/keygen.c:1819
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3761,12 +3859,12 @@ msgstr ""
 "Pro ochranu Va�eho tajn�ho kl��e mus�te zadat heslo.\n"
 "\n"
 
-#: g10/keygen.c:1826 g10/passphrase.c:1105
+#: g10/keygen.c:1829 g10/passphrase.c:786
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1832
+#: g10/keygen.c:1835
 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"
@@ -3778,7 +3876,7 @@ msgstr ""
 "tohoto programu s parametrem \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1857
 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"
@@ -3791,50 +3889,50 @@ msgstr ""
 "pou��vat disky); d�ky tomu m� gener�tor lep�� �anci z�skat dostatek "
 "entropie.\n"
 
-#: g10/keygen.c:2578
+#: g10/keygen.c:2575
 msgid "Key generation canceled.\n"
 msgstr "Vytv��en� kl��e bylo zru�eno.\n"
 
-#: g10/keygen.c:2766 g10/keygen.c:2910
+#: g10/keygen.c:2774 g10/keygen.c:2918
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisuji ve�ejn� kl�� do `%s'\n"
 
-#: g10/keygen.c:2768 g10/keygen.c:2913
+#: g10/keygen.c:2776 g10/keygen.c:2921
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: g10/keygen.c:2771 g10/keygen.c:2916
+#: g10/keygen.c:2779 g10/keygen.c:2924
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2907
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor ve�ejn�ch kl��� (pubring): %s\n"
 
-#: g10/keygen.c:2905
+#: g10/keygen.c:2913
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor tajn�ch kl��� (secring): %s\n"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2931
 #, 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:2930
+#: g10/keygen.c:2938
 #, 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:2953
+#: g10/keygen.c:2961
 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:2964
+#: g10/keygen.c:2972
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -3843,12 +3941,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:2976 g10/keygen.c:3105 g10/keygen.c:3220
+#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Vytvo�en� kl��e se nepoda�ilo: %s\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3156 g10/sign.c:290
+#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -3856,7 +3954,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:3030 g10/keygen.c:3158 g10/sign.c:292
+#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -3864,364 +3962,345 @@ 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:3039 g10/keygen.c:3169
+#: g10/keygen.c:3047 g10/keygen.c:3177
 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:3078 g10/keygen.c:3202
+#: g10/keygen.c:3086 g10/keygen.c:3210
 msgid "Really create? (y/N) "
 msgstr "Opravdu vytvo�it? (a/N) "
 
-#: g10/keygen.c:3355
+#: g10/keygen.c:3363
 #, 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:3402
+#: g10/keygen.c:3410
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nemohu vytvo�it z�lohu souboru `%s': %s\n"
 
-#: g10/keygen.c:3428
+#: g10/keygen.c:3436
 #, 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"
 
-#: g10/keygen.c:3508
-#, c-format
-msgid "length of RSA modulus is not %d\n"
-msgstr "RSA modulus nen� dlouh� %d\n"
-
-#: g10/keygen.c:3514
-msgid "public exponent too large (more than 32 bits)\n"
-msgstr "ve�ejn� RSA exponent je p��li� dlouh� (v�ce ne� 32 bit�)\n"
-
-#: g10/keygen.c:3520 g10/keygen.c:3526
-#, c-format
-msgid "length of an RSA prime is not %d\n"
-msgstr "d�lka RSA prvo��sla nen� %d\n"
-
-#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
+#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
 msgid "never     "
 msgstr "nikdy     "
 
-#: g10/keylist.c:264
+#: g10/keylist.c:265
 msgid "Critical signature policy: "
 msgstr "Kritick� podepisovac� politika: "
 
-#: g10/keylist.c:266
+#: g10/keylist.c:267
 msgid "Signature policy: "
 msgstr "Podepisovac� politika: "
 
-#: g10/keylist.c:305
+#: g10/keylist.c:306
 msgid "Critical preferred keyserver: "
 msgstr "Kriticky preferovan� keyserver: "
 
-#: g10/keylist.c:354 g10/keylist.c:398
+#: 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:372
+#: g10/keylist.c:373
 msgid "Critical signature notation: "
 msgstr "Kritick� podepisovac� notace: "
 
-#: g10/keylist.c:374
+#: g10/keylist.c:375
 msgid "Signature notation: "
 msgstr "Podepisovac� notace: "
 
-#: g10/keylist.c:385
+#: g10/keylist.c:386
 msgid "not human readable"
 msgstr "nen� v p��mo �iteln�m form�tu"
 
-#: g10/keylist.c:486
+#: g10/keylist.c:487
 msgid "Keyring"
 msgstr "soubor kl��� (keyring)"
 
-#: g10/keylist.c:792
+#: g10/keylist.c:793
 #, c-format
 msgid "expired: %s)"
 msgstr "platnost skon�ila: %s)"
 
-#: g10/keylist.c:1488
+#: g10/keylist.c:1489
 msgid "Primary key fingerprint:"
 msgstr "Prim�rn� fingerprint kl��e:"
 
-#: g10/keylist.c:1490
+#: g10/keylist.c:1491
 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:1497
+#: g10/keylist.c:1498
 msgid " Primary key fingerprint:"
 msgstr " Prim�rn� fingerprint kl��e:"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1500
 msgid "      Subkey fingerprint:"
 msgstr "      Fingerprint podkl��e:"
 
-#: g10/keylist.c:1503 g10/keylist.c:1507
+#: g10/keylist.c:1504 g10/keylist.c:1508
 msgid "      Key fingerprint ="
 msgstr "      Fingerprint kl��e ="
 
-#: g10/keylist.c:1574
+#: g10/keylist.c:1575
 msgid "      Card serial no. ="
 msgstr "      Seriov� ��slo karty ="
 
-#: g10/keyring.c:1245
+#: g10/keyring.c:1246
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "p�ejmenov�n� `%s' na `%s' se nezda�ilo: %s\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1252
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "VAROV�N�: Existuj� dva soubory s tajn�mi informacemi.\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s je beze zm�ny\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1255
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s je nov�\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1256
 msgid "Please fix this possible security flaw\n"
 msgstr "Pros�m, opravte tento mo�n� bezpe�nostn� probl�m\n"
 
-#: g10/keyring.c:1375
+#: g10/keyring.c:1376
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "cache souboru kl��� `%s'\n"
 
-#: g10/keyring.c:1421
+#: g10/keyring.c:1422
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu kl��� ji� ulo�eno v cache (%lu podpis�)\n"
 
-#: g10/keyring.c:1433
+#: g10/keyring.c:1434
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu kl��� ulo�eno v cache (%lu podpis�)\n"
 
-#: g10/keyring.c:1504
+#: g10/keyring.c:1505
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: soubor kl��� (keyring) vytvo�en\n"
 
-#: g10/keyserver.c:107
+#: g10/keyserver.c:105
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "VAROV�N�: volba `%s' pro server kl��� nen� na t�to platform� ��inn�\n"
 
-#: g10/keyserver.c:434
+#: g10/keyserver.c:433
 msgid "disabled"
 msgstr "disabled"
 
-#: g10/keyserver.c:635
+#: g10/keyserver.c:634
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Vlo�te ��slo (��sla), 'N' pro dal�� nebo 'Q' pro konec> "
 
-#: g10/keyserver.c:718 g10/keyserver.c:1238
+#: g10/keyserver.c:717 g10/keyserver.c:1267
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "neplatn� protokol serveru kl��� (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:808
+#: g10/keyserver.c:815
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "kl�� \"%s\" nebyl na serveru kl��� nalezen\n"
 
-#: g10/keyserver.c:810
+#: g10/keyserver.c:817
 msgid "key not found on keyserver\n"
 msgstr "kl�� nebyl na serveru kl��� nalezen\n"
 
-#: g10/keyserver.c:985
+#: g10/keyserver.c:1014
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "po�aduji kl�� %s ze %s server %s\n"
 
-#: g10/keyserver.c:989
+#: g10/keyserver.c:1018
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "po�aduji kl�� %s z %s\n"
 
-#: g10/keyserver.c:1141
+#: g10/keyserver.c:1170
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "pos�l�m kl�� %s na %s server %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1174
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "pos�l�m kl�� %s na %s\n"
 
-#: g10/keyserver.c:1188
+#: g10/keyserver.c:1217
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "vyhled�v�m \"%s\" na %s serveru %s\n"
 
-#: g10/keyserver.c:1191
+#: g10/keyserver.c:1220
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "vyhled�v�m \"%s\" na serveru %s\n"
 
-#: g10/keyserver.c:1198 g10/keyserver.c:1293
+#: g10/keyserver.c:1227 g10/keyserver.c:1322
 msgid "no keyserver action!\n"
 msgstr "��dn� operace se serverem kl���!\n"
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1275
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "VAROV�N�: keyserver handler z jin� verze GnuPG (%s)\n"
 
-#: g10/keyserver.c:1255
+#: g10/keyserver.c:1284
 msgid "keyserver did not send VERSION\n"
 msgstr "server kl��� neposlal VERSION\n"
 
-#: g10/keyserver.c:1314
+#: g10/keyserver.c:1343
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "�adn� server kl��� nen� zn�m (pou��jte volbu --keyserver)\n"
 
-#: g10/keyserver.c:1320
+#: g10/keyserver.c:1349
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "vol�n� extern�ho keyserver nen� v t�to verzi podporov�no\n"
 
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1361
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "protokol serveru kl��� `%s' nen� podporov�n\n"
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1366
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "akce `%s' nen� podporov�na v protokolu `%s' serveru kl���\n"
 
-#: g10/keyserver.c:1345
-#, c-format
-msgid "gpgkeys_%s does not support handler version %d\n"
+#: g10/keyserver.c:1374
+#, fuzzy, c-format
+msgid "%s does not support handler version %d\n"
 msgstr "gpgkeys_%s nepodporuje protokol verze  %d\n"
 
-#: g10/keyserver.c:1351
+#: g10/keyserver.c:1381
 msgid "keyserver timed out\n"
 msgstr "�asov� limit pro server kl��� vypr�el\n"
 
-#: g10/keyserver.c:1356
+#: g10/keyserver.c:1386
 msgid "keyserver internal error\n"
 msgstr "intern� chyba serveru kl���\n"
 
-#: g10/keyserver.c:1365
+#: g10/keyserver.c:1395
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "chyba komunikace se serverem kl���: %s\n"
 
-#: g10/keyserver.c:1390 g10/keyserver.c:1424
+#: g10/keyserver.c:1420 g10/keyserver.c:1454
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" nen� ID kl��e: p�esko�eno\n"
 
-#: g10/keyserver.c:1681
+#: g10/keyserver.c:1711
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VAROV�N�: nelze aktualizovat kl�� %s prost�ednictv�m %s: %s\n"
 
-#: g10/keyserver.c:1703
+#: g10/keyserver.c:1733
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "aktualizuji 1 kl�� z %s\n"
 
-#: g10/keyserver.c:1705
+#: g10/keyserver.c:1735
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "aktualizuji %d kl��� z %s\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:249
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "podivn� velikost �ifrovac�ho kl��e pro sezen� (%d)\n"
 
-#: g10/mainproc.c:262
-#, c-format
-msgid "bad passphrase or unknown cipher algorithm (%d)\n"
-msgstr "neplatn� heslo nebo nezn�m� �ifrovac� algoritmus (%d)\n"
-
-#: g10/mainproc.c:299
+#: g10/mainproc.c:300
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s za�ifrovan� kl�� sezen�\n"
 
-#: g10/mainproc.c:309
+#: g10/mainproc.c:310
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "heslo (passphraze) generov�no s pou�it�m nezn�m�ho algoritmu %d\n"
 
-#: g10/mainproc.c:375
+#: g10/mainproc.c:376
 #, c-format
 msgid "public key is %s\n"
 msgstr "ve�ejn� kl�� je %s\n"
 
-#: g10/mainproc.c:430
+#: g10/mainproc.c:431
 msgid "public key encrypted data: good DEK\n"
 msgstr "data za�ifrov�na ve�ejn�m kl��em: spr�vn� DEK\n"
 
-#: g10/mainproc.c:463
+#: g10/mainproc.c:464
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "za�ifrov�na %u-bitov�m %s kl��em, ID %s, vytvo�en�m %s\n"
 
-#: g10/mainproc.c:467 g10/pkclist.c:218
+#: g10/mainproc.c:468 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
 # [kw]
-#: g10/mainproc.c:471
+#: g10/mainproc.c:472
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "za�ifrov�no %s kl��em, ID %s\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "de�ifrov�n� ve�ejn�m kl��em selhalo: %s\n"
 
-#: g10/mainproc.c:499
+#: g10/mainproc.c:500
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "za�ifrov�no s heslem %lu\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:502
 msgid "encrypted with 1 passphrase\n"
 msgstr "za�ifrov�no jedn�m heslem\n"
 
-#: g10/mainproc.c:529 g10/mainproc.c:551
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "p�edpokl�d�m %s �ifrovan�ch dat\n"
 
-#: g10/mainproc.c:537
+#: g10/mainproc.c:538
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "algoritmus IDEA nen� dostupn�; optimisticky se jej pokus�me nahradit "
 "algoritmem %s\n"
 
-#: g10/mainproc.c:569
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr "de�ifrov�n� o.k.\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:574
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VAROV�N�: zpr�va nebyla chr�n�na proti poru�en� jej� integrity\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROV�N�: se za�ifrovanou zpr�vou bylo manipulov�no!\n"
 
-#: g10/mainproc.c:592
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "de�ifrov�n� selhalo: %s\n"
@@ -4235,303 +4314,292 @@ 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:786
+#: g10/mainproc.c:803
 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:1290
+#: g10/mainproc.c:1307
 msgid "signature verification suppressed\n"
 msgstr "verifikace podpisu potla�ena\n"
 
-#: g10/mainproc.c:1332 g10/mainproc.c:1342
+#: g10/mainproc.c:1349 g10/mainproc.c:1359
 msgid "can't handle these multiple signatures\n"
 msgstr "neum�m pracovat s t�mito n�sobn�mi podpisy\n"
 
-#: g10/mainproc.c:1352
+#: g10/mainproc.c:1369
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Podpis vytvo�en %s\n"
 
-#: g10/mainproc.c:1353
+#: g10/mainproc.c:1370
 #, 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:1357
+#: g10/mainproc.c:1374
 #, 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:1377
+#: g10/mainproc.c:1394
 msgid "Key available at: "
 msgstr "Kl�� k dispozici na: "
 
-#: g10/mainproc.c:1482 g10/mainproc.c:1530
+#: g10/mainproc.c:1499 g10/mainproc.c:1547
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "�PATN� podpis od \"%s\""
 
-#: g10/mainproc.c:1484 g10/mainproc.c:1532
+#: g10/mainproc.c:1501 g10/mainproc.c:1549
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Podpis s vypr�enou platnost� od \"%s\""
 
-#: g10/mainproc.c:1486 g10/mainproc.c:1534
+#: g10/mainproc.c:1503 g10/mainproc.c:1551
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Dobr� podpis od \"%s\""
 
-#: g10/mainproc.c:1538
+#: g10/mainproc.c:1555
 msgid "[uncertain]"
 msgstr "[nejist�]"
 
-#: g10/mainproc.c:1570
+#: g10/mainproc.c:1587
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \"%s\""
 
-#: g10/mainproc.c:1664
+#: g10/mainproc.c:1681
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Platnost podpisu skon�ila %s\n"
 
-#: g10/mainproc.c:1669
+#: g10/mainproc.c:1686
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Platnost podpisu skon�� %s\n"
 
-#: g10/mainproc.c:1672
+#: g10/mainproc.c:1689
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "podpis %s, hashovac� algoritmus %s\n"
 
-#: g10/mainproc.c:1673
+#: g10/mainproc.c:1690
 msgid "binary"
 msgstr "bin�rn� form�t"
 
-#: g10/mainproc.c:1674
+#: g10/mainproc.c:1691
 msgid "textmode"
 msgstr "textov� form�t"
 
-#: g10/mainproc.c:1674 g10/trustdb.c:530
+#: g10/mainproc.c:1691 g10/trustdb.c:531
 msgid "unknown"
 msgstr "nezn�m� form�t"
 
-#: g10/mainproc.c:1694
+#: g10/mainproc.c:1711
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nemohu ov��it podpis: %s\n"
 
-#: g10/mainproc.c:1762 g10/mainproc.c:1778 g10/mainproc.c:1864
+#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
 msgid "not a detached signature\n"
 msgstr "toto nen� podpis odd�len� od dokumentu\n"
 
-#: g10/mainproc.c:1805
+#: g10/mainproc.c:1822
 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:1813
+#: g10/mainproc.c:1830
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "samostatn� podpis t��dy 0x%02x\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1887
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis star�ho typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:1880
+#: g10/mainproc.c:1897
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nalezen neplatn� ko�enov� paket v proc_tree()\n"
 
-#: g10/misc.c:121
+#: g10/misc.c:122
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "nemohu vypnout vytv��en� core soubor�: %s\n"
 
-#: g10/misc.c:141 g10/misc.c:169 g10/misc.c:241
+#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "fstat `%s' selhal na %s: %s\n"
 
-#: g10/misc.c:206
+#: g10/misc.c:207
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) selhal v %s: %s\n"
 
-#: g10/misc.c:315
+#: g10/misc.c:316
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "nemohu pracovat s algoritmem ve�ejn�ho kl��e %d\n"
 
-#: g10/misc.c:330
+#: g10/misc.c:331
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "�ifrovac� algoritmus nen� implementov�n"
 
-#: g10/misc.c:345
+#: g10/misc.c:346
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "podpis %s, hashovac� algoritmus %s\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:351
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "VAROV�N�: vy��dan� hashovac� algoritmus %s (%d) nevyhovuje p�edvolb�m "
 "p��jemce\n"
 
-#: g10/misc.c:446
+#: g10/misc.c:447
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA modul pro GnuPG nenalezen\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:448
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 "v�ce informac� naleznete v dokumentu http://www.gnupg.cz/why-not-idea.html\n"
 
-#: g10/misc.c:680
+#: g10/misc.c:681
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: pou�it� parametru \"%s\" se nedoporu�uje\n"
 
-#: g10/misc.c:684
+#: g10/misc.c:685
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VAROV�N�: pou��v�n� parametru \"%s\" se nedoporu�uje\n"
 
-#: g10/misc.c:686
+#: g10/misc.c:687
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "pou�ijte m�sto n�j \"%s%s\" \n"
 
-#: g10/misc.c:697
+#: g10/misc.c:694
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
+msgstr "VAROV�N�: pou��v�n� parametru \"%s\" se nedoporu�uje\n"
+
+#: g10/misc.c:707
 msgid "Uncompressed"
 msgstr "Nezakomprimov�no"
 
-#: g10/misc.c:722
+#: g10/misc.c:732
 msgid "uncompressed|none"
 msgstr "nezakomprimov�no|nic"
 
-#: g10/misc.c:832
+#: g10/misc.c:842
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "tato zpr�va nemus� b�t s %s pou�iteln�\n"
 
-#: g10/misc.c:989
+#: g10/misc.c:999
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "nejednozna�n� volby `%s'\n"
 
-#: g10/misc.c:1014
+#: g10/misc.c:1024
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "nezn�m� volba `%s'\n"
 
-#: g10/openfile.c:84
+#: g10/openfile.c:86
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Soubor `%s' existuje. "
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 msgid "Overwrite? (y/N) "
 msgstr "P�epsat (a/N)? "
 
-#: g10/openfile.c:119
+#: g10/openfile.c:121
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: nezn�m� p��pona\n"
 
-#: g10/openfile.c:141
+#: g10/openfile.c:143
 msgid "Enter new filename"
 msgstr "Vlo�te nov� n�zev souboru"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:188
 msgid "writing to stdout\n"
 msgstr "zapisuji do standardn�ho v�stupu\n"
 
-#: g10/openfile.c:296
+#: g10/openfile.c:300
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "p�edpokl�d�m podepsan� data v `%s'\n"
 
-#: g10/openfile.c:375
+#: g10/openfile.c:379
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "vytvo�en nov� konfigura�n� soubor `%s'\n"
 
-#: g10/openfile.c:377
+#: g10/openfile.c:381
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "VAROV�N�: nastaven� z `%s' nejsou p�i tomto spu�t�n� zat�m aktivn�\n"
 
-#: g10/openfile.c:409
+#: g10/openfile.c:413
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "adres�� `%s' vytvo�en\n"
 
-#: g10/parse-packet.c:137
+#: g10/parse-packet.c:138
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "nemohu pracovat s algoritmem ve�ejn�ho kl��e %d\n"
 
-#: g10/parse-packet.c:707
+#: g10/parse-packet.c:708
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "VAROV�N�: potencion�ln� nebezpe�n� symetricky za�ifrov�n kl�� sezen�\n"
 
-#: g10/parse-packet.c:1132
+#: g10/parse-packet.c:1145
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
 
-#: g10/passphrase.c:478 g10/passphrase.c:525
+#: g10/passphrase.c:305
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nen� v tomto sezen� dostupn�\n"
 
-#: g10/passphrase.c:486
-msgid "can't set client pid for the agent\n"
-msgstr "nemohu nastavit PID klienta pro gpg-agenta\n"
-
-#: g10/passphrase.c:494
-msgid "can't get server read FD for the agent\n"
-msgstr "nelze z�skat server read file descriptor pro agenta r\n"
-
-#: g10/passphrase.c:501
-msgid "can't get server write FD for the agent\n"
-msgstr "nezle z�skat server write file descriptor pro agenta\n"
-
-#: g10/passphrase.c:534
+#: g10/passphrase.c:317
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "�patn� form�t prom�nn� prost�ed� GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:547
+#: g10/passphrase.c:332
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent protokol verze %d nen� podporov�n\n"
 
-#: g10/passphrase.c:568
+#: g10/passphrase.c:345
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nemohu se p�ipojit k `%s': %s\n"
 
-#: g10/passphrase.c:590
-msgid "communication problem with gpg-agent\n"
-msgstr "probl�m v komunikaci s gpg-agentem\n"
-
-#: g10/passphrase.c:597 g10/passphrase.c:937 g10/passphrase.c:1049
+#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
 msgid "problem with the agent - disabling agent use\n"
 msgstr "probl�m s agentem - pou��v�n� agenta vypnuto\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1209
+#: g10/passphrase.c:511 g10/passphrase.c:890
 #, c-format
 msgid " (main key ID %s)"
 msgstr "(hlavn� ID kl��e %s)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:525
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4542,41 +4610,28 @@ msgstr ""
 "\"%.*s\"\n"
 "Kl�� o d�lce %u bit�, typ %s, ID %s, vytvo�en� %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:550
 msgid "Repeat passphrase\n"
 msgstr "Opakovat heslo\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:552
 msgid "Enter passphrase\n"
 msgstr "Vlo�it heslo\n"
 
-#: g10/passphrase.c:781
-msgid "passphrase too long\n"
-msgstr "heslo je p��li� dlouh�\n"
-
-#: g10/passphrase.c:794
-msgid "invalid response from agent\n"
-msgstr "neplatn� reakce od agenta\n"
-
-#: g10/passphrase.c:810 g10/passphrase.c:931
+#: g10/passphrase.c:628
 msgid "cancelled by user\n"
 msgstr "zru�eno u�ivatelem\n"
 
-#: g10/passphrase.c:815 g10/passphrase.c:1020
-#, c-format
-msgid "problem with the agent: agent returns 0x%lx\n"
-msgstr "probl�m s agentem: agent vrac� 0x%lx\n"
-
-#: g10/passphrase.c:1100 g10/passphrase.c:1263
+#: g10/passphrase.c:781 g10/passphrase.c:944
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "v d�vkov�m re�imu se nemohu pt�t na heslo\n"
 
-#: g10/passphrase.c:1107 g10/passphrase.c:1268
+#: g10/passphrase.c:788 g10/passphrase.c:949
 msgid "Enter passphrase: "
 msgstr "Vlo�te heslo: "
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:871
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4585,21 +4640,21 @@ msgstr ""
 "Mus�te zn�t heslo, abyste odemknul(a) tajn� kl�� pro\n"
 "u�ivatele: \"%s\"\n"
 
-#: g10/passphrase.c:1196
+#: g10/passphrase.c:877
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "d�lka %u bit�, typ %s, kl�� %s, vytvo�en� %s"
 
-#: g10/passphrase.c:1205
+#: g10/passphrase.c:886
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (podkl�� na hlavn�m kl��i ID %s)"
 
-#: g10/passphrase.c:1272
+#: g10/passphrase.c:953
 msgid "Repeat passphrase: "
 msgstr "Opakujte heslo: "
 
-#: g10/photoid.c:66
+#: g10/photoid.c:67
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4613,111 +4668,111 @@ msgstr ""
 "kl��i - velk� obr�zek bude m�t za n�sledek velmi velk� ve�ejn� kl�� !\n"
 "Vhodn� velikost obr�zku je asi 240x288.\n"
 
-#: g10/photoid.c:80
+#: g10/photoid.c:81
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Vlo�te jm�no JPEG souboru s fotografick�m ID: "
 
-#: g10/photoid.c:94
+#: g10/photoid.c:95
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "nelze otev��t JPEG soubor `%s': %s\n"
 
-#: g10/photoid.c:102
+#: g10/photoid.c:103
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Tento JPEG je opravdu velk� (%d bajt�)!\n"
 
-#: g10/photoid.c:104
+#: g10/photoid.c:105
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Jste si jist�(�), �e jej chcete pou��t? (a/N) "
 
-#: g10/photoid.c:119
+#: g10/photoid.c:120
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "`%s' nen� soubor ve form�tu JPEG\n"
 
-#: g10/photoid.c:136
+#: g10/photoid.c:137
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Je tato fotografie spr�vn� (a/N/u)? "
 
-#: g10/photoid.c:338
+#: g10/photoid.c:339
 msgid "unable to display photo ID!\n"
 msgstr "nelze zobrazit photo ID!\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:580
+#: g10/pkclist.c:62 g10/revoke.c:581
 msgid "No reason specified"
 msgstr "D�vod nebyl specifikov�n"
 
-#: g10/pkclist.c:63 g10/revoke.c:582
+#: g10/pkclist.c:64 g10/revoke.c:583
 msgid "Key is superseded"
 msgstr "Kl�� je nahrazen"
 
-#: g10/pkclist.c:65 g10/revoke.c:581
+#: g10/pkclist.c:66 g10/revoke.c:582
 msgid "Key has been compromised"
 msgstr "Kl�� byl zkompromitov�n"
 
-#: g10/pkclist.c:67 g10/revoke.c:583
+#: g10/pkclist.c:68 g10/revoke.c:584
 msgid "Key is no longer used"
 msgstr "Kl�� se ji� nepou��v�"
 
-#: g10/pkclist.c:69 g10/revoke.c:584
+#: g10/pkclist.c:70 g10/revoke.c:585
 msgid "User ID is no longer valid"
 msgstr "Identifik�tor u�ivatele ji� neplat�"
 
-#: g10/pkclist.c:73
+#: g10/pkclist.c:74
 msgid "reason for revocation: "
 msgstr "d�vod pro revokaci: "
 
-#: g10/pkclist.c:90
+#: g10/pkclist.c:91
 msgid "revocation comment: "
 msgstr "revoka�n� pozn�mka: "
 
-#: g10/pkclist.c:205
+#: g10/pkclist.c:206
 msgid "iImMqQsS"
 msgstr "iImMuUsS"
 
-#: g10/pkclist.c:213
+#: g10/pkclist.c:214
 msgid "No trust value assigned to:\n"
 msgstr "Nen� p�i�azena ��dn� hodnota d�v�ry:\n"
 
-#: g10/pkclist.c:245
+#: g10/pkclist.c:246
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "  alias \"%s\"\n"
 
-#: g10/pkclist.c:255
+#: g10/pkclist.c:256
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Nakolik d�v��ujete tvrzen�, �e tento kl�� pat�� uveden�mu u�ivateli?\n"
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:271
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = Nev�m nebo ne�eknu\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = Ned�v��uji\n"
 
-#: g10/pkclist.c:278
+#: g10/pkclist.c:279
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = D�v��uji absolutn�\n"
 
-#: g10/pkclist.c:284
+#: g10/pkclist.c:285
 msgid "  m = back to the main menu\n"
 msgstr " m = zp�t do hlavn�ho menu\n"
 
-#: g10/pkclist.c:287
+#: g10/pkclist.c:288
 msgid "  s = skip this key\n"
 msgstr " s = p�esko�it tento kl��\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 msgid "  q = quit\n"
 msgstr " u = ukon�it\n"
 
-#: g10/pkclist.c:292
+#: g10/pkclist.c:293
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
@@ -4726,37 +4781,37 @@ msgstr ""
 "Minim�ln� �rove� d�v�ry tohoto kl��e je: %s\n"
 "\n"
 
-#: g10/pkclist.c:298 g10/revoke.c:609
+#: g10/pkclist.c:299 g10/revoke.c:610
 msgid "Your decision? "
 msgstr "Va�e rozhodnut�? "
 
-#: g10/pkclist.c:319
+#: g10/pkclist.c:320
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Opravdu chcete nastavit pro tento kl�� absolutn� d�v�ru? (a/N) "
 
-#: g10/pkclist.c:333
+#: g10/pkclist.c:334
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certifik�ty vedouc� k fin�ln�mu d�v�ryhodn�mu kl��i:\n"
 
-#: g10/pkclist.c:418
+#: g10/pkclist.c:419
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr "%s: Nic nenazna�uje tomu, �e tento kl�� pat�� uveden�mu u�ivateli\n"
 
-#: g10/pkclist.c:423
+#: g10/pkclist.c:424
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr "%s: Je zde ��ste�n� d�v�ra, �e tento kl�� pat�� uveden�mu uv�ivateli\n"
 
-#: g10/pkclist.c:429
+#: g10/pkclist.c:430
 msgid "This key probably belongs to the named user\n"
 msgstr "Tento kl�� pravd�podobn� n�le�� uveden�mu u�ivateli\n"
 
-#: g10/pkclist.c:434
+#: g10/pkclist.c:435
 msgid "This key belongs to us\n"
 msgstr "Tento kl�� n�le�� n�m (m�me odpov�daj�c� tajn� kl��)\n"
 
-#: g10/pkclist.c:460
+#: g10/pkclist.c:461
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -4767,91 +4822,91 @@ msgstr ""
 "n�sleduj�c� ot�zku odpov�d�t ano\n"
 "\n"
 
-#: g10/pkclist.c:467
+#: g10/pkclist.c:468
 msgid "Use this key anyway? (y/N) "
 msgstr "Pou��t p�esto tento kl��? (a/N) "
 
-#: g10/pkclist.c:501
+#: g10/pkclist.c:502
 msgid "WARNING: Using untrusted key!\n"
 msgstr "VAROV�N�: Je pou�it ned�v�ryhodn� kl��!\n"
 
-#: g10/pkclist.c:508
+#: g10/pkclist.c:509
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "VAROV�N�: tento kl�� m��e b�t revokov�n (revoka�n� kl�� nenalezen)\n"
 
-#: g10/pkclist.c:517
+#: g10/pkclist.c:518
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "VAROV�N�: Tento kl�� byl revokov�n kl��em s pov��en�m k revokaci!\n"
 
-#: g10/pkclist.c:520
+#: g10/pkclist.c:521
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "VAROV�N�: Tento kl�� byl revokov�n sv�m vlastn�kem!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         To m��e znamenat, �e podpis je pad�lan�.\n"
 
-#: g10/pkclist.c:527
+#: g10/pkclist.c:528
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "VAROV�N�: Tento podkl�� byl revokov�n sv�m vlastn�kem!\n"
 
-#: g10/pkclist.c:532
+#: g10/pkclist.c:533
 msgid "Note: This key has been disabled.\n"
 msgstr "Pozn�mka: Tento kl�� byl ozna�en jako neplatn� (disabled).\n"
 
-#: g10/pkclist.c:537
+#: g10/pkclist.c:538
 msgid "Note: This key has expired!\n"
 msgstr "Pozn�mka: Skon�ila platnost tohoto kl��e!\n"
 
-#: g10/pkclist.c:548
+#: g10/pkclist.c:549
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "VAROV�N�: Tento kl�� nen� certifikov�n d�v�ryhodn�m podpisem!\n"
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:551
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Nic nenazna�uje tomu, �e tento podpis pat�� vlastn�kovi kl��e.\n"
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:559
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "VAROV�N�: NEd�v��ujeme tomuto kl��i!\n"
 
-#: g10/pkclist.c:559
+#: g10/pkclist.c:560
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Tento podpis je pravd�podobn� PAD�LAN�.\n"
 
-#: g10/pkclist.c:567
+#: g10/pkclist.c:568
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "VAROV�N�: Tento kl�� nen� certifikov�n dostate�n� d�v�ryhodn�mi podpisy!\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:570
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Nen� jist�, zda tento podpis pat�� vlastn�kovi.\n"
 
-#: g10/pkclist.c:734 g10/pkclist.c:767 g10/pkclist.c:936 g10/pkclist.c:996
+#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: p�esko�eno: %s\n"
 
-#: g10/pkclist.c:744 g10/pkclist.c:968
+#: g10/pkclist.c:745 g10/pkclist.c:969
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: p�esko�eno: ve�ejn� kl�� je ji� obsa�en v datab�zi\n"
 
-#: g10/pkclist.c:786
+#: g10/pkclist.c:787
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Nespecifikoval jste identifik�tor u�ivatele (user ID). M��ete pou��t \"-r\"\n"
 
-#: g10/pkclist.c:802
+#: g10/pkclist.c:803
 msgid "Current recipients:\n"
 msgstr "Aktu�ln� p��jemci:\n"
 
-#: g10/pkclist.c:828
+#: g10/pkclist.c:829
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -4859,168 +4914,168 @@ msgstr ""
 "\n"
 "Napi�te identifik�tor u�ivatele (user ID). Ukon�ete pr�zdn�m ��dkem: "
 
-#: g10/pkclist.c:844
+#: g10/pkclist.c:845
 msgid "No such user ID.\n"
 msgstr "Takov� identifik�tor u�ivatele neexistuje.\n"
 
-#: g10/pkclist.c:849 g10/pkclist.c:911
+#: g10/pkclist.c:850 g10/pkclist.c:912
 msgid "skipped: public key already set as default recipient\n"
 msgstr "p�esko�eno: ve�ejn� kl�� je u� nastaven podle implicitn�ho adres�ta\n"
 
-#: g10/pkclist.c:867
+#: g10/pkclist.c:868
 msgid "Public key is disabled.\n"
 msgstr "Ve�ejn� kl�� je neplatn� (disabled).\n"
 
-#: g10/pkclist.c:874
+#: g10/pkclist.c:875
 msgid "skipped: public key already set\n"
 msgstr "p�esko�eno: ve�ejn� kl�� je ji� nastaven\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:904
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "nezn�m� implicitn� adres�t \"%s\"\n"
 
-#: g10/pkclist.c:948
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: p�esko�eno: ve�ejn� kl�� je neplatn� (disabled)\n"
 
-#: g10/pkclist.c:1003
+#: g10/pkclist.c:1004
 msgid "no valid addressees\n"
 msgstr "��dn� platn� adresy\n"
 
-#: g10/plaintext.c:90
+#: g10/plaintext.c:91
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "data nebyla ulo�ena; k jejich ulo�en� pou�ijte parametr p��kazu \"--output"
 "\"\n"
 
-#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
+#: g10/plaintext.c:136 g10/plaintext.c:141 g10/plaintext.c:159
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "chyba p�i vytv��en� `%s': %s\n"
 
-#: g10/plaintext.c:446
+#: g10/plaintext.c:447
 msgid "Detached signature.\n"
 msgstr "Podpis odd�len� od dokumentu.\n"
 
-#: g10/plaintext.c:450
+#: g10/plaintext.c:452
 msgid "Please enter name of data file: "
 msgstr "Pros�m, vlo�te n�zev datov�ho souboru: "
 
-#: g10/plaintext.c:478
+#: g10/plaintext.c:481
 msgid "reading stdin ...\n"
 msgstr "�tu standardn� vstup ...\n"
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:515
 msgid "no signed data\n"
 msgstr "chyb� podepsan� data\n"
 
-#: g10/plaintext.c:526
+#: g10/plaintext.c:529
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nemohu otev��t podepsan� data '%s'\n"
 
-#: g10/pubkey-enc.c:103
+#: g10/pubkey-enc.c:104
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "anonymn� adres�t; zkou��m tajn� kl�� %s ...\n"
 
-#: g10/pubkey-enc.c:119
+#: g10/pubkey-enc.c:120
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "o.k., my jsme anonymn� adres�t.\n"
 
-#: g10/pubkey-enc.c:207
+#: g10/pubkey-enc.c:208
 msgid "old encoding of the DEK is not supported\n"
 msgstr "star� k�dov�n� DEK nen� podporov�no\n"
 
-#: g10/pubkey-enc.c:228
+#: g10/pubkey-enc.c:229
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "�ifrovac� algoritmus %d%s je nezn�m� nebo je zneplatn�n\n"
 
-#: g10/pubkey-enc.c:266
+#: g10/pubkey-enc.c:267
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "VAROV�N�: v p�edvolb�ch p��jemce nenalezen �ifrovac� algoritmus %s\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:287
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "POZN�MKA: platnost tajn�ho kl��e %s skon�ila %s\n"
 
-#: g10/pubkey-enc.c:292
+#: g10/pubkey-enc.c:293
 msgid "NOTE: key has been revoked"
 msgstr "POZN�MKA: kl�� byl revokov�n"
 
-#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:545
+#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
+#: g10/revoke.c:188 g10/revoke.c:546
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "selhalo vytvo�en� paketu (build_packet): %s\n"
 
-#: g10/revoke.c:146
+#: g10/revoke.c:147
 #, c-format
 msgid "key %s has no user IDs\n"
 msgstr "kl�� %s: chyb� identifik�tor u�ivatele\n"
 
-#: g10/revoke.c:272
+#: g10/revoke.c:273
 msgid "To be revoked by:\n"
 msgstr "Revokov�n:\n"
 
-#: g10/revoke.c:276
+#: g10/revoke.c:277
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Toto je citliv� revoka�n� kl��)\n"
 
-#: g10/revoke.c:280
+#: g10/revoke.c:281
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Vytvo�it pro tento kl�� pov��en� revoka�n� certifik�t? (a/N)"
 
-#: g10/revoke.c:293 g10/revoke.c:511
+#: g10/revoke.c:294 g10/revoke.c:512
 msgid "ASCII armored output forced.\n"
 msgstr "na��zen v�stup do form�tu ASCII.\n"
 
-#: g10/revoke.c:307 g10/revoke.c:525
+#: g10/revoke.c:308 g10/revoke.c:526
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "vytvo�en� podepisovac�ho paketu (make_keysig_packet) selhalo: %s\n"
 
-#: g10/revoke.c:370
+#: g10/revoke.c:371
 msgid "Revocation certificate created.\n"
 msgstr "Revoka�n� certifik�t vytvo�en.\n"
 
-#: g10/revoke.c:376
+#: g10/revoke.c:377
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "pro \"%s\" nebyl nalezen ��dn� revoka�n� kl��\n"
 
-#: g10/revoke.c:432
+#: g10/revoke.c:433
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "tajn� kl�� \"%s\" nenalezen: %s\n"
 
-#: g10/revoke.c:461
+#: g10/revoke.c:462
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "neexistuje odpov�daj�c� ve�ejn� kl��: %s\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:473
 msgid "public key does not match secret key!\n"
 msgstr "ve�ejn� kl�� neodpov�d� tajn�mu kl��i!\n"
 
-#: g10/revoke.c:479
+#: g10/revoke.c:480
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Vytvo�it pro tento kl�� revoka�n� certifik�t? (a/N) "
 
-#: g10/revoke.c:496
+#: g10/revoke.c:497
 msgid "unknown protection algorithm\n"
 msgstr "nezn�m� kompresn� algoritmus\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 msgid "NOTE: This key is not protected!\n"
 msgstr "POZN�MKA: Tento kl�� nen� chr�n�n�!\n"
 
-#: g10/revoke.c:551
+#: g10/revoke.c:552
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5039,109 +5094,109 @@ msgstr ""
 "na Va�em po��ta�i m��e ukl�dat data ur�en� k tisku a zp��stupnist je\n"
 "jin�m u�ivatel�m!\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid "Please select the reason for the revocation:\n"
 msgstr "Pros�m vyberte d�vod revokace:\n"
 
-#: g10/revoke.c:602
+#: g10/revoke.c:603
 msgid "Cancel"
 msgstr "Zru�it"
 
-#: g10/revoke.c:604
+#: g10/revoke.c:605
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Pravd�podobn� zda chcete vybrat %d)\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:646
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "M��ete vlo�it dal�� popis. Ukon�ete pr�zdn�m ��dkem:\n"
 
-#: g10/revoke.c:673
+#: g10/revoke.c:674
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "D�vod revokace: %s\n"
 
-#: g10/revoke.c:675
+#: g10/revoke.c:676
 msgid "(No description given)\n"
 msgstr "(Nebyl zad�n ��dn� popis)\n"
 
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 msgid "Is this okay? (y/N) "
 msgstr "Je d�vod revokace vybr�n spr�vn�? (a/N) "
 
-#: g10/seckey-cert.c:54
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "tajn� ��sti kl��e nejsou dostupn�\n"
 
-#: g10/seckey-cert.c:60
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "ochrann� algoritmus %d%s nen� podporov�n\n"
 
-#: g10/seckey-cert.c:71
+#: g10/seckey-cert.c:72
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "ochrann� algoritmus %d nen� podporov�n\n"
 
-#: g10/seckey-cert.c:265
+#: g10/seckey-cert.c:266
 msgid "Invalid passphrase; please try again"
 msgstr "Neplatn� heslo; pros�m, zkuste to znovu"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:267
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:326
+#: g10/seckey-cert.c:327
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "VAROV�N�: Objeven slab� kl�� - zm��te, pros�m, znovu heslo.\n"
 
-#: g10/seckey-cert.c:364
+#: g10/seckey-cert.c:365
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "generuji _nevhodn�_ 16-ti bitov� kontroln� sou�et pro ochranu soukrom�ho "
 "kl��e\n"
 
-#: g10/seskey.c:52
+#: g10/seskey.c:53
 msgid "weak key created - retrying\n"
 msgstr "vytvo�en slab� kl�� - zkou��m znovu\n"
 
-#: g10/seskey.c:57
+#: g10/seskey.c:58
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "nemohu se vyvarovat slab�ho kl��e pro symetrickou �ifru; operaci jsem zkusil "
 "%d kr�t!\n"
 
-#: g10/seskey.c:213
+#: g10/seskey.c:214
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA po�aduje pou�it� 160-ti bitov�ho hashovac�ho algoritmu\n"
 
-#: g10/sig-check.c:75
+#: g10/sig-check.c:76
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "VAROV�N�: konflikt hashe podpisu ve zpr�v�\n"
 
-#: g10/sig-check.c:99
+#: g10/sig-check.c:100
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "VAROV�N�: podepisovac� podkl�� %s nen� k���ov� certifikov�n\n"
 
-#: g10/sig-check.c:102
+#: g10/sig-check.c:103
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "VAROV�N�: podepisovac� podkl�� %s m� neplatnou k���ovou certifikaci\n"
 
-#: g10/sig-check.c:168
+#: g10/sig-check.c:169
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "ve�ejn� kl�� %s je o %lu sekund nov�j�� ne� podpis\n"
 
-#: g10/sig-check.c:169
+#: g10/sig-check.c:170
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "ve�ejn� kl�� %s je o %lu sekund nov�j�� ne� podpis\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:181
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5149,7 +5204,7 @@ msgstr ""
 "kl�� %s byl vytvo�en %lu sekund v budoucnosti (do�lo ke zm�n� �asu nebo\n"
 "je probl�m se syst�mov�m �asem)\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:183
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5157,53 +5212,53 @@ msgstr ""
 "kl�� %s byl vytvo�en %lu sekund v budoucnosti (do�lo ke zm�n� �asu nebo\n"
 "je probl�m se syst�mov�m �asem)\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:193
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "POZN�MKA: podpisov�mu kl��i %s skon�ila platnost %s\n"
 
-#: g10/sig-check.c:275
+#: g10/sig-check.c:276
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "p�edpokl�d�m �patn� podpis kl��em %s, proto�e je nastaven nezn�m� kritick� "
 "bit\n"
 
-#: g10/sig-check.c:532
+#: g10/sig-check.c:533
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "kl�� %s: neexistuje podkl�� pro revokaci podkl��e\n"
 
-#: g10/sig-check.c:558
+#: g10/sig-check.c:559
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "kl�� %s: podkl�� kter� je sv�z�n s podpisem neexistuje\n"
 
-#: g10/sign.c:85
+#: g10/sign.c:86
 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:93
+#: g10/sign.c:94
 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:112
+#: g10/sign.c:113
 #, 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:138
+#: g10/sign.c:139
 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:146
+#: g10/sign.c:147
 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:159
+#: g10/sign.c:160
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5211,7 +5266,7 @@ msgstr ""
 "VAROV�N�: nemohu %%-expandovat URL politiky (p��li� dlouh�). Pou�ity "
 "neexpandovan�.\n"
 
-#: g10/sign.c:187
+#: g10/sign.c:188
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5220,23 +5275,23 @@ msgstr ""
 "VAROV�N�: nemohu %%-expandovat URL preferovan�ho keyservery (p��li� dlouh�). "
 "Pou�ity neexpandovan�.\n"
 
-#: g10/sign.c:364
+#: g10/sign.c:365
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontrola vytvo�en�ho podpisu se nepoda�ila: %s\n"
 
-#: g10/sign.c:373
+#: g10/sign.c:374
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s podpis od: \"%s\"\n"
 
-#: g10/sign.c:741
+#: g10/sign.c:761
 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:808
+#: g10/sign.c:830
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5244,52 +5299,52 @@ msgstr ""
 "VAROV�N�: vy��dan� hashovac� algoritmus %s (%d) nevyhovuje p�edvolb�m "
 "p��jemce\n"
 
-#: g10/sign.c:900
+#: g10/sign.c:922
 msgid "signing:"
 msgstr "podepisuji:"
 
-#: g10/sign.c:1007
+#: g10/sign.c:1034
 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:1180
+#: g10/sign.c:1212
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "bude pou�ito �ifrov�n� %s\n"
 
-#: g10/skclist.c:126 g10/skclist.c:190
+#: g10/skclist.c:127 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "kl�� nen� ozna�en jako nedostate�n� bezpe�n� - nemohu jej pou��t s pad�lan�m "
 "RNG!\n"
 
-#: g10/skclist.c:157
+#: g10/skclist.c:158
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "p�esko�en \"%s\": duplikov�n\n"
 
-#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "p�esko�en \"%s\": %s\n"
 
-#: g10/skclist.c:170
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "p�esko�eno: tajn� kl�� je u� v datab�zi\n"
 
-#: g10/skclist.c:185
+#: g10/skclist.c:186
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "toto je PGP kl�� vygenerovan� podle algoritmu ElGamal,\n"
 "podpisy vytvo�en� t�mto kl��em nejsou bezpe�n�!"
 
-#: g10/tdbdump.c:59 g10/trustdb.c:365
+#: g10/tdbdump.c:60 g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "z�znam d�v�ry %lu, typ %d: z�pis selhal: %s\n"
 
-#: g10/tdbdump.c:104
+#: g10/tdbdump.c:105
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5298,337 +5353,337 @@ msgstr ""
 "# Seznam p�id�len�ch hodnot d�v�ry, vytvo�en %s\n"
 "# (Pou�ijte \"gpg --import-ownertrust\" k jeho obnov�)\n"
 
-#: g10/tdbdump.c:159 g10/tdbdump.c:167 g10/tdbdump.c:172 g10/tdbdump.c:177
+#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
 #, c-format
 msgid "error in `%s': %s\n"
 msgstr "chyba v `%s': %s\n"
 
-#: g10/tdbdump.c:159
+#: g10/tdbdump.c:160
 msgid "line too long"
 msgstr "��dek je p��li� dlouh�"
 
-#: g10/tdbdump.c:167
+#: g10/tdbdump.c:168
 msgid "colon missing"
 msgstr "sloupec sch�z�"
 
-#: g10/tdbdump.c:173
+#: g10/tdbdump.c:174
 msgid "invalid fingerprint"
 msgstr "neplatn� fingerprint"
 
-#: g10/tdbdump.c:178
+#: g10/tdbdump.c:179
 msgid "ownertrust value missing"
 msgstr ""
 "hodnota d�v�ryhodnosti vlastn�ka sch�z�importovat hodnoty d�v�ryhodnosti\n"
 " vlastn�ka kl��e"
 
-#: g10/tdbdump.c:214
+#: g10/tdbdump.c:215
 #, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "chyba p�i hled�n� z�znamu d�v�ryhodnosti v `%s': %s\n"
 
-#: g10/tdbdump.c:218
+#: g10/tdbdump.c:219
 #, c-format
 msgid "read error in `%s': %s\n"
 msgstr "chyba p�i �ten� v `%s': %s\n"
 
-#: g10/tdbdump.c:227 g10/trustdb.c:380
+#: g10/tdbdump.c:228 g10/trustdb.c:381
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "datab�ze d�v�ry: synchronizace selhala %s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1440
+#: g10/tdbio.c:129 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "z�znam v datab�zi d�v�ry %lu: lseek() se nepoda�il: %s\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1447
+#: g10/tdbio.c:135 g10/tdbio.c:1448
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "z�znam v datab�zi d�v�ry %lu: z�pis se nepoda�il (n=%d): %s\n"
 
-#: g10/tdbio.c:244
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "transakce s datab�z� d�v�ry je p��li� dlouh�\n"
 
-#: g10/tdbio.c:497
+#: g10/tdbio.c:498
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "nemohu otev��t `%s': %s\n"
 
-#: g10/tdbio.c:512
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: adres�� neexistuje!\n"
 
-#: g10/tdbio.c:522 g10/tdbio.c:545 g10/tdbio.c:588
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "nemohu vytvo�it z�mek pro  `%s'\n"
 
-#: g10/tdbio.c:524 g10/tdbio.c:591
+#: g10/tdbio.c:525 g10/tdbio.c:592
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "nelze zam��t `%s'\n"
 
-#: g10/tdbio.c:550
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: nepoda�ilo se vytvo�it z�znam verze: %s"
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: vytvo�ena neplatn� datab�ze d�v�ry\n"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: datab�ze d�v�ry vytvo�ena\n"
 
-#: g10/tdbio.c:597
+#: g10/tdbio.c:598
 msgid "NOTE: trustdb not writable\n"
 msgstr "POZN�MKA: do trustedb nezle zapisovat\n"
 
-#: g10/tdbio.c:614
+#: g10/tdbio.c:615
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: neplatn� datab�ze d�v�ry\n"
 
-#: g10/tdbio.c:646
+#: g10/tdbio.c:647
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: nepoda�ilo se vytvo�it hashovac� tabulku: %s\n"
 
-#: g10/tdbio.c:654
+#: g10/tdbio.c:655
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: chyba p�i aktualizaci z�znamu verze: %s\n"
 
-#: g10/tdbio.c:671 g10/tdbio.c:691 g10/tdbio.c:707 g10/tdbio.c:721
-#: g10/tdbio.c:751 g10/tdbio.c:1373 g10/tdbio.c:1400
+#: g10/tdbio.c:672 g10/tdbio.c:692 g10/tdbio.c:708 g10/tdbio.c:722
+#: g10/tdbio.c:752 g10/tdbio.c:1374 g10/tdbio.c:1401
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: chyba p�i �ten� z�znamu verze: %s\n"
 
-#: g10/tdbio.c:730
+#: g10/tdbio.c:731
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: chyba p�i z�pisu z�znamu verze: %s\n"
 
-#: g10/tdbio.c:1169
+#: g10/tdbio.c:1170
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "datab�ze d�v�ry: procedura lseek() selhala: %s\n"
 
-#: g10/tdbio.c:1177
+#: g10/tdbio.c:1178
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "datab�ze d�v�ry: procedura read() (n=%d) selhala: %s\n"
 
-#: g10/tdbio.c:1198
+#: g10/tdbio.c:1199
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: nen� soubor datab�ze d�v�ry\n"
 
-#: g10/tdbio.c:1216
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: z�znam verze s ��slem %lu\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1222
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: neplatn� verze souboru %d\n"
 
-#: g10/tdbio.c:1406
+#: g10/tdbio.c:1407
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: chyba p�i �ten� voln�ho z�znamu: %s\n"
 
-#: g10/tdbio.c:1414
+#: g10/tdbio.c:1415
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: chyba p�i z�pisu adres��ov�ho z�znamu: %s\n"
 
-#: g10/tdbio.c:1424
+#: g10/tdbio.c:1425
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: vynulov�n� z�znamu selhalo: %s\n"
 
-#: g10/tdbio.c:1454
+#: g10/tdbio.c:1455
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: p�id�n� z�znamu selhalo: %s\n"
 
-#: g10/tdbio.c:1499
+#: g10/tdbio.c:1500
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "datab�ze d�v�ry je po�kozena; pros�m spus�te \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:147
+#: g10/textfilter.c:148
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "nemohu pracovat s ��dky del��mi ne� %d znak�\n"
 
-#: g10/textfilter.c:244
+#: g10/textfilter.c:245
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "vstupn� ��dek je del�� ne� %d znak�\n"
 
-#: g10/trustdb.c:226
+#: g10/trustdb.c:227
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' nen� platn� dlouh� keyID\n"
 
-#: g10/trustdb.c:257
+#: g10/trustdb.c:258
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "kl�� %s: akceptov�n jako d�v�ryhodn� kl��\n"
 
-#: g10/trustdb.c:295
+#: g10/trustdb.c:296
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "kl�� %s se v datab�zi d�v�ry vyskytuje v�ce ne� jednou\n"
 
-#: g10/trustdb.c:310
+#: g10/trustdb.c:311
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "kl�� %s: nenalezen ve�ejn� kl�� k d�v�ryhodn�mu kl��i - p�esko�eno\n"
 
-#: g10/trustdb.c:320
+#: g10/trustdb.c:321
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "kl�� %s ozna�en jako absolutn� d�v�ryhodn�.\n"
 
-#: g10/trustdb.c:344
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "z�znam d�v�ry %lu, typ po�. %d: �ten� selhalo: %s\n"
 
-#: g10/trustdb.c:350
+#: g10/trustdb.c:351
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "z�znam d�v�ry %lu nen� po�adovan�ho typu %d\n"
 
-#: g10/trustdb.c:446
+#: g10/trustdb.c:447
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "nelze pou��t nezn�m� model d�v�ry (%d) - p�edpokl�d�me pou�it� modelu %s\n"
 
-#: g10/trustdb.c:452
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr "poui�it� modelu d�v�ry %s\n"
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:506
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ revoked]"
 msgstr "revokov�n"
 
-#: g10/trustdb.c:508 g10/trustdb.c:513
+#: g10/trustdb.c:509 g10/trustdb.c:514
 #, fuzzy
 msgid "[ expired]"
 msgstr "platnost skon�ila"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 #, fuzzy
 msgid "[ unknown]"
 msgstr "nezn�m� form�t"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 #, fuzzy
 msgid "[marginal]"
 msgstr "��ste�n�"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:518
 #, fuzzy
 msgid "[ultimate]"
 msgstr "absolutn�"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr "nedefinov�n"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 msgid "never"
 msgstr "��dn�"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr "��ste�n�"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:536
 msgid "full"
 msgstr "pln�"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr "absolutn�"
 
-#: g10/trustdb.c:576
+#: 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:582 g10/trustdb.c:2157
+#: g10/trustdb.c:583 g10/trustdb.c:2309
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "dal�� kontrola datab�ze d�v�ry v %s\n"
 
-#: g10/trustdb.c:591
+#: 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:606
+#: 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:838 g10/trustdb.c:1276
+#: 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:1033
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr "pros�m prove�te --check-trustdb\n"
 
-#: g10/trustdb.c:1037
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "kontroluji datab�zi d�v�ry\n"
 
-#: g10/trustdb.c:1901
+#: g10/trustdb.c:2053
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "zpracov�no %d kl��� (%d validit vymaz�no)\n"
 
-#: g10/trustdb.c:1965
+#: g10/trustdb.c:2117
 msgid "no ultimately trusted keys found\n"
 msgstr "��dn� absolutn� d�v�ryhodn� kl�� nebyl nalezen\n"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:2131
 #, 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:2002
+#: g10/trustdb.c:2154
 #, 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:2088
+#: g10/trustdb.c:2240
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -5636,12 +5691,12 @@ msgstr ""
 "hloubka: %d  platn�ch: %3d  podepsan�ch: %3d  d�v�ra: %d-, %dq, %dn, %dm, %"
 "df, %du\n"
 
-#: g10/trustdb.c:2163
+#: g10/trustdb.c:2315
 #, 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"
 
-#: g10/verify.c:116
+#: g10/verify.c:117
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -5651,301 +5706,337 @@ msgstr ""
 "Pros�m, nezapome�te, �e soubor s podpisem (.sig nebo .asc)\n"
 "by m�l b�t prvn�m souborem zadan�m na p��kazov� ��dce.\n"
 
-#: g10/verify.c:189
+#: g10/verify.c:190
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "vstupn� ��dek %u je p��li� dlouh� nebo na konci chyb� znak LF\n"
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "obecn� chyba"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "nezn�m� typ paketu"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "nezn�m� verze"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "nezn�m� algoritmus ve�ejn�ho kl��e"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "nezn�m� hashovac� algoritmus"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "�patn� ve�ejn� kl��"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "�patn� tajn� kl��"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "�patn� podpis"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "chyba kontroln�ho sou�tu"
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "�patn� heslo"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "ve�ejn� kl�� nenalezen"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "nezn�m� �ifrovac� algoritmus"
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "nemohu otev��t soubor kl���"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "neplatn� paket"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "neplatn� zp�sob reprezentace v ASCII"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "neexistuje u�ivatel s t�mto id"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "tajn� kl�� nen� dostupn�"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "je pou�it �patn� tajn� kl��"
 
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "nepodporov�no"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "�patn� kl��"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "chyba p�i �ten� souboru"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "chyba p�i z�pisu souboru"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "nezn�m� komprima�n� algoritmus"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "chyba p�i otv�r�n� souboru"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "chyba p�i vytv��en� souboru"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "nespr�vn� heslo"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "algoritmus ve�ejn�ho kl��e nen� implementov�n"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "�ifrovac� algoritmus nen� implementov�n"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "nezn�m� t��da podpisu"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "chyba v datab�zi d�v�ry"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "�patn� MPI"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "omezen� zdroj�"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "neplatn� soubor kl���"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "�patn� certifik�t"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "�patn� form�t id u�ivatele"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "chyba p�i zav�r�n� souboru"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "chyba p�i p�ejmenov�n� souboru"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "chyba p�i maz�n� souboru"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "neo�ek�van� data"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "konflikt �asov�ho raz�tka"
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "nepou�iteln� algoritmus s ve�ejn�m kl��em"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "soubor existuje"
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "slab� kl��"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "neplatn� argument"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "�patn� URI"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "toto URI nen� podporov�no"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "chyba s�t�"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "neza�ifrov�no"
 
-#: util/errors.c:103
+#: util/errors.c:104
 msgid "not processed"
 msgstr "nezpracov�no"
 
-#: util/errors.c:105
+#: util/errors.c:106
 msgid "unusable public key"
 msgstr "nepou�iteln� ve�ejn� kl��"
 
-#: util/errors.c:106
+#: util/errors.c:107
 msgid "unusable secret key"
 msgstr "nepou�iteln� tajn� kl��"
 
-#: util/errors.c:107
+#: util/errors.c:108
 msgid "keyserver error"
 msgstr "chyba serveru kl���"
 
-#: util/errors.c:108
+#: util/errors.c:109
 msgid "canceled"
 msgstr "zru�eno"
 
-#: util/errors.c:109
+#: util/errors.c:110
 msgid "no card"
 msgstr "��dn� karta"
 
-#: util/logger.c:157
+#: util/logger.c:158
 msgid "ERROR: "
 msgstr "CHYBA: "
 
-#: util/logger.c:160
+#: util/logger.c:161
 msgid "WARNING: "
 msgstr "VAROV�N�: "
 
-#: util/logger.c:223
+#: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... toto je chyba v programu (%s:%d:%s)\n"
 
-#: util/logger.c:229
+#: util/logger.c:230
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "nalezena chyba v programu ... (%s:%d)\n"
 
-#: util/miscutil.c:336 util/miscutil.c:373
+#: util/miscutil.c:330 util/miscutil.c:367
 msgid "yes"
 msgstr "ano"
 
-#: util/miscutil.c:337 util/miscutil.c:378
+#: util/miscutil.c:331 util/miscutil.c:372
 msgid "yY"
 msgstr "aAyY"
 
-#: util/miscutil.c:339 util/miscutil.c:375
+#: util/miscutil.c:333 util/miscutil.c:369
 msgid "no"
 msgstr "ne"
 
-#: util/miscutil.c:340 util/miscutil.c:379
+#: util/miscutil.c:334 util/miscutil.c:373
 msgid "nN"
 msgstr "nN"
 
-#: util/miscutil.c:377
+#: util/miscutil.c:371
 msgid "quit"
 msgstr "ukon�it"
 
-#: util/miscutil.c:380
+#: util/miscutil.c:374
 msgid "qQ"
 msgstr "uUqQ"
 
-#: util/miscutil.c:413
+#: util/miscutil.c:407
 msgid "okay|okay"
 msgstr "okey|okey"
 
-#: util/miscutil.c:415
+#: util/miscutil.c:409
 msgid "cancel|cancel"
 msgstr "zru�it|zru�it"
 
-#: util/miscutil.c:416
+#: util/miscutil.c:410
 msgid "oO"
 msgstr "oO"
 
-#: util/miscutil.c:417
+#: util/miscutil.c:411
 msgid "cC"
 msgstr "zZ"
 
-#: util/secmem.c:90
+#: util/secmem.c:91
 msgid "WARNING: using insecure memory!\n"
 msgstr "VAROV�N�: Pou��van� pam� nen� bezpe�n�!\n"
 
-#: util/secmem.c:91
+#: util/secmem.c:92
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "V�ce informac� naleznete na adrese http://www.gnupg.cz/faq.html\n"
 
-#: util/secmem.c:343
+#: util/secmem.c:344
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "prov�st operaci nen� mo�n� bez inicializovan� bezpe�n� pam�ti\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:345
 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 "error getting serial number: %s\n"
+#~ msgstr "chyba p�i z�sk�n� s�riov�ho ��sla: %s\n"
+
+#~ msgid "Hint: Select the user IDs to sign\n"
+#~ msgstr "N�pov�da: Vyberte id u�ivatele k podeps�n�\n"
+
+#~ msgid "length of RSA modulus is not %d\n"
+#~ msgstr "RSA modulus nen� dlouh� %d\n"
+
+#~ msgid "length of an RSA prime is not %d\n"
+#~ msgstr "d�lka RSA prvo��sla nen� %d\n"
+
+#~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+#~ msgstr "neplatn� heslo nebo nezn�m� �ifrovac� algoritmus (%d)\n"
+
+#~ msgid "can't set client pid for the agent\n"
+#~ msgstr "nemohu nastavit PID klienta pro gpg-agenta\n"
+
+#~ msgid "can't get server read FD for the agent\n"
+#~ msgstr "nelze z�skat server read file descriptor pro agenta r\n"
+
+#~ msgid "can't get server write FD for the agent\n"
+#~ msgstr "nezle z�skat server write file descriptor pro agenta\n"
+
+#~ msgid "communication problem with gpg-agent\n"
+#~ msgstr "probl�m v komunikaci s gpg-agentem\n"
+
+#~ msgid "passphrase too long\n"
+#~ msgstr "heslo je p��li� dlouh�\n"
+
+#~ msgid "invalid response from agent\n"
+#~ msgstr "neplatn� reakce od agenta\n"
+
+#~ msgid "problem with the agent: agent returns 0x%lx\n"
+#~ msgstr "probl�m s agentem: agent vrac� 0x%lx\n"
+
 #~ msgid "select secondary key N"
 #~ msgstr "vyberte sekund�rn� kl�� N"
 
diff --git a/po/da.po b/po/da.po
index 9daac3892..6e608fcd2 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: 2005-03-15 16:35+0100\n"
+"POT-Creation-Date: 2005-05-31 10:05+0200\n"
 "PO-Revision-Date: 2003-12-03 16:11+0100\n"
 "Last-Translator: Birger Langkjer <[email protected]>\n"
 "Language-Team: Danish <[email protected]>\n"
@@ -16,80 +16,80 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:120
+#: cipher/primegen.c:121
 #, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr ""
 
-#: cipher/primegen.c:311
+#: cipher/primegen.c:312
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr ""
 
-#: cipher/random.c:163
+#: cipher/random.c:164
 msgid "no entropy gathering module detected\n"
 msgstr ""
 
-#: cipher/random.c:387 g10/card-util.c:656 g10/card-util.c:725
-#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2255
-#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
-#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
-#: g10/tdbio.c:600
+#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
+#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
+#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
+#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
+#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/tdbio.c:601
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: cipher/random.c:391
+#: cipher/random.c:392
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: cipher/random.c:396
+#: cipher/random.c:397
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:401
+#: cipher/random.c:402
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:407
+#: cipher/random.c:408
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 
-#: cipher/random.c:415
+#: cipher/random.c:416
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: cipher/random.c:453
+#: cipher/random.c:454
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2723
-#: g10/keygen.c:2753 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
-#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:481
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: cipher/random.c:483
+#: cipher/random.c:484
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: cipher/random.c:728
+#: cipher/random.c:729
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "ADVARSEL: bruger usikker tilf�ldig-nummer-generator!!!\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:730
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -103,14 +103,14 @@ msgstr ""
 "BENYT IKKE DATA GENERERET AF DETTE PROGRAM!!!\n"
 "\n"
 
-#: cipher/rndegd.c:204
+#: cipher/rndegd.c:205
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
 "of the entropy.\n"
 msgstr ""
 
-#: cipher/rndlinux.c:134
+#: cipher/rndlinux.c:135
 #, c-format
 msgid ""
 "\n"
@@ -122,45 +122,62 @@ msgstr ""
 "the OS a chance to collect more entropy! (Kr�ver %d byte mere)\n"
 
 # er det klogt at overs�tte TrustDB?
-#: g10/app-openpgp.c:547
+#: g10/app-openpgp.c:596
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/app-openpgp.c:560
+#: g10/app-openpgp.c:609
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "ingen standard offentlig n�glering\n"
 
-#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
+#: g10/app-openpgp.c:977
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "fjernelse af beskyttelse fejlede: %s\n"
+
+#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+msgid "response does not contain the public key data\n"
+msgstr ""
+
+#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
-#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
+#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
+#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/app-openpgp.c:836
+#: g10/app-openpgp.c:1310
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:857
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:862
+#: g10/app-openpgp.c:1336
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -168,353 +185,358 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:869
+#: g10/app-openpgp.c:1343
 msgid "|A|Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1018
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:1492
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1018
+#: g10/app-openpgp.c:1492
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1022
+#: g10/app-openpgp.c:1496
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
+#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
+#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/app-openpgp.c:1104
+#: g10/app-openpgp.c:1562
 #, fuzzy
 msgid "key already exists\n"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: g10/app-openpgp.c:1108
+#: g10/app-openpgp.c:1566
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1110
+#: g10/app-openpgp.c:1568
 #, fuzzy
 msgid "generating new key\n"
 msgstr "gener�r et nyt n�glepar"
 
-#: g10/app-openpgp.c:1120
+#: g10/app-openpgp.c:1735
+msgid "creation timestamp missing\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1742
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1749
+#, c-format
+msgid "RSA public exponent missing or largerr than %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
+
+# er det klogt at overs�tte TrustDB?
+#: g10/app-openpgp.c:1827
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "kunne ikke initialisere TillidsDB: %s\n"
+
+#: g10/app-openpgp.c:1886
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1135
+#: g10/app-openpgp.c:1901
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1904
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "N�gleoprettelse annulleret.\n"
 
-#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
-msgid "response does not contain the public key data\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
-msgid "response does not contain the RSA modulus\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
-msgid "response does not contain the RSA public exponent\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1195
+#: g10/app-openpgp.c:1961
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1356
+#: g10/app-openpgp.c:2130
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1364
+#: g10/app-openpgp.c:2138
 #, c-format
-msgid "PIN [sigs done: %lu]"
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
+#: g10/app-openpgp.c:2399
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
 
-#: g10/app-openpgp.c:1731
-#, fuzzy, c-format
-msgid "error getting serial number: %s\n"
-msgstr "fejl ved oprettelse af kodes�tning: %s\n"
-
-# er det klogt at overs�tte TrustDB?
-#: g10/app-openpgp.c:1826
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "kunne ikke initialisere TillidsDB: %s\n"
-
-#: g10/app-openpgp.c:1868
-#, fuzzy
-msgid "reading the key failed\n"
-msgstr "fjernelse af beskyttelse fejlede: %s\n"
-
-#: g10/armor.c:317
+#: g10/armor.c:318
 #, c-format
 msgid "armor: %s\n"
 msgstr "panser: %s\n"
 
-#: g10/armor.c:346
+#: g10/armor.c:347
 msgid "invalid armor header: "
 msgstr "ugyldigt panserhoved: "
 
-#: g10/armor.c:353
+#: g10/armor.c:354
 msgid "armor header: "
 msgstr "panserhoved: "
 
-#: g10/armor.c:364
+#: g10/armor.c:365
 msgid "invalid clearsig header\n"
 msgstr ""
 
-#: g10/armor.c:416
+#: g10/armor.c:417
 msgid "nested clear text signatures\n"
 msgstr ""
 
-#: g10/armor.c:551
+#: g10/armor.c:552
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "uforventet beskyttelse:"
 
-#: g10/armor.c:563
+#: g10/armor.c:564
 msgid "invalid dash escaped line: "
 msgstr ""
 
-#: g10/armor.c:715 g10/armor.c:1322
+#: g10/armor.c:716 g10/armor.c:1323
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "ugyldigt radix64 tegn %02x udeladt\n"
 
-#: g10/armor.c:758
+#: g10/armor.c:759
 msgid "premature eof (no CRC)\n"
 msgstr "for tidlig eof (ingen CRC)\n"
 
-#: g10/armor.c:792
+#: g10/armor.c:793
 msgid "premature eof (in CRC)\n"
 msgstr "for tidlig eof (i CRC)\n"
 
-#: g10/armor.c:800
+#: g10/armor.c:801
 msgid "malformed CRC\n"
 msgstr "d�rlig CRC\n"
 
-#: g10/armor.c:804 g10/armor.c:1359
+#: g10/armor.c:805 g10/armor.c:1360
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC fejl; %06lx - %06lx\n"
 
-#: g10/armor.c:824
+#: g10/armor.c:825
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "for tidlig eof (i trailer)\n"
 
-#: g10/armor.c:828
+#: g10/armor.c:829
 msgid "error in trailer line\n"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/armor.c:1137
+#: g10/armor.c:1138
 msgid "no valid OpenPGP data found.\n"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
 
-#: g10/armor.c:1142
+#: g10/armor.c:1143
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ugyldigt panser: linie l�ngere end %d tegn\n"
 
-#: g10/armor.c:1146
+#: g10/armor.c:1147
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr "quoted printable-tegn i panser - m�ske pga. en fejlbeh�ftet MTA\n"
 
-#: g10/card-util.c:58 g10/card-util.c:295
+#: g10/card-util.c:63 g10/card-util.c:303
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/card-util.c:63
+#: g10/card-util.c:68
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1329 g10/delkey.c:127 g10/keyedit.c:1430
-#: g10/keygen.c:2439 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1510
+#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
 msgid "can't do this in batch mode\n"
 msgstr ""
 
-#: g10/card-util.c:97 g10/card-util.c:1108 g10/card-util.c:1191
-#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
-#: g10/keygen.c:1365
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
+#: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "Dit valg? "
 
-#: g10/card-util.c:206 g10/card-util.c:256
+#: g10/card-util.c:213 g10/card-util.c:263
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:391
+#: g10/card-util.c:410
 #, fuzzy
 msgid "male"
 msgstr "sl�til"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 #, fuzzy
 msgid "female"
 msgstr "sl�til"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 msgid "unspecified"
 msgstr ""
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 #, fuzzy
 msgid "not forced"
 msgstr "ikke bearbejdet"
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:497
+#: g10/card-util.c:516
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:499
+#: g10/card-util.c:518
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:501
+#: g10/card-util.c:520
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:518
+#: g10/card-util.c:537
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:539
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:538
+#: g10/card-util.c:557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:559
+#: g10/card-util.c:578
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/card-util.c:567
+#: g10/card-util.c:586
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:665 g10/card-util.c:734 g10/import.c:261
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:692
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:683
+#: g10/card-util.c:702
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:742
+#: g10/card-util.c:761
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:752
+#: g10/card-util.c:771
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:772
+#: g10/card-util.c:791
 #, fuzzy
 msgid "Language preferences: "
 msgstr "vis pr�ferencer"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:799
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:808
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:829
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:824
+#: g10/card-util.c:843
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/card-util.c:845
+#: g10/card-util.c:864
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Fingeraftryk:"
 
-#: g10/card-util.c:868
+#: g10/card-util.c:887
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/card-util.c:916
+#: g10/card-util.c:935
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/card-util.c:917
+#: g10/card-util.c:936
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
 
-#: g10/card-util.c:926
+#: g10/card-util.c:945
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1030
 #, fuzzy
 msgid "Replace existing key? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/card-util.c:1030 g10/card-util.c:1039
+#: g10/card-util.c:1051 g10/card-util.c:1060
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1051
+#: g10/card-util.c:1072
 #, fuzzy
 msgid "Replace existing keys? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/card-util.c:1060
+#: g10/card-util.c:1081
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -522,402 +544,406 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1099
+#: g10/card-util.c:1120
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/card-util.c:1101 g10/card-util.c:1182
+#: g10/card-util.c:1122 g10/card-util.c:1203
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/card-util.c:1102 g10/card-util.c:1184
+#: g10/card-util.c:1123 g10/card-util.c:1205
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/card-util.c:1103 g10/card-util.c:1186
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1119 g10/card-util.c:1202 g10/keyedit.c:908
-#: g10/keygen.c:1404 g10/revoke.c:642
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
+#: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "Ugyldigt valg.\n"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1200
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/card-util.c:1214
+#: g10/card-util.c:1235
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "ukendt kompressionsalgoritme"
 
-#: g10/card-util.c:1219
+#: g10/card-util.c:1240
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/card-util.c:1224
+#: g10/card-util.c:1245
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
 
-#: g10/card-util.c:1294 g10/keyedit.c:1317
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "afslut denne menu"
 
-#: g10/card-util.c:1296
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "show admin commands"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1297 g10/keyedit.c:1320
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "vis denne hj�lp"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "list all available data"
 msgstr "Ingen hj�lp tilg�ngelig"
 
-#: g10/card-util.c:1302
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1303
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1304
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1305
+#: g10/card-util.c:1327
 #, fuzzy
 msgid "change the login name"
 msgstr "�ndr udl�bsdatoen"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the language preferences"
 msgstr "vis pr�ferencer"
 
-#: g10/card-util.c:1307
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1308
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "vis fingeraftryk"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1310
+#: g10/card-util.c:1332
 #, fuzzy
 msgid "generate new keys"
 msgstr "gener�r et nyt n�glepar"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1377 g10/keyedit.c:1526
+#: g10/card-util.c:1334
+msgid "verify the PIN and list all data"
+msgstr ""
+
+#: g10/card-util.c:1454 g10/keyedit.c:1609
 msgid "Command> "
 msgstr ""
 
-#: g10/card-util.c:1412
+#: g10/card-util.c:1492
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1430
+#: g10/card-util.c:1525
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/card-util.c:1499 g10/keyedit.c:2104
+#: g10/card-util.c:1599 g10/keyedit.c:2210
 msgid "Invalid command  (try \"help\")\n"
 msgstr ""
 
-#: g10/cardglue.c:287
+#: g10/cardglue.c:396
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:519
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:380
+#: g10/cardglue.c:527
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:852
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Indtast bruger-id: "
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:853
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "Indtast bruger-id: "
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:854
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:691
+#: g10/cardglue.c:855
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Indtast bruger-id: "
 
-#: g10/cardglue.c:705
+#: g10/cardglue.c:872
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Gentag kodes�tning: "
 
-#: g10/cardglue.c:719
+#: g10/cardglue.c:886
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "kodes�tningen blev ikke ordentlig gentaget; pr�v igen.\n"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
-#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke �bne `%s'\n"
 
-#: g10/decrypt.c:104 g10/encode.c:859
+#: g10/decrypt.c:105 g10/encode.c:846
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3167 g10/keyserver.c:1511
-#: g10/revoke.c:226
+#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3346 g10/keyserver.c:1541
+#: g10/revoke.c:227
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2300 g10/keyserver.c:1525
-#: g10/revoke.c:232 g10/revoke.c:439
+#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/revoke.c:233 g10/revoke.c:440
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/delkey.c:128 g10/delkey.c:135
+#: g10/delkey.c:129 g10/delkey.c:136
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr ""
 
-#: g10/delkey.c:134
+#: g10/delkey.c:135
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr ""
 
-#: g10/delkey.c:146
+#: g10/delkey.c:147
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Slet denne n�gle fra n�gleringen? "
 
-#: g10/delkey.c:154
+#: g10/delkey.c:155
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr ""
 
-#: g10/delkey.c:164
+#: g10/delkey.c:165
 #, fuzzy, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/delkey.c:174
+#: g10/delkey.c:175
 msgid "ownertrust information cleared\n"
 msgstr ""
 
-#: g10/delkey.c:205
+#: g10/delkey.c:206
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr ""
 
-#: g10/delkey.c:207
+#: g10/delkey.c:208
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 
-#: g10/encode.c:210 g10/sign.c:1186
+#: g10/encode.c:211 g10/sign.c:1218
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: g10/encode.c:215
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 
-#: g10/encode.c:228
+#: g10/encode.c:229
 #, fuzzy, c-format
 msgid "using cipher %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/encode.c:238 g10/encode.c:558
+#: g10/encode.c:239 g10/encode.c:545
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr ""
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
+#: g10/encode.c:302 g10/encode.c:591 g10/sign.c:566
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/encode.c:472
+#: g10/encode.c:466
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 
-#: g10/encode.c:494
+#: g10/encode.c:488
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "l�ser fra '%s'\n"
 
-#: g10/encode.c:530
+#: g10/encode.c:517
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 
-#: g10/encode.c:540
+#: g10/encode.c:527
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:635 g10/sign.c:899
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr ""
 
-#: g10/encode.c:735
+#: g10/encode.c:722
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:805 g10/pkclist.c:721 g10/pkclist.c:757
+#: g10/encode.c:792 g10/pkclist.c:722 g10/pkclist.c:758
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr ""
 
-#: g10/encode.c:832
+#: g10/encode.c:819
 #, fuzzy, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s krypteret for: %s\n"
 
-#: g10/encr-data.c:66 g10/mainproc.c:301
+#: g10/encr-data.c:67 g10/mainproc.c:302
 #, c-format
 msgid "%s encrypted data\n"
 msgstr ""
 
-#: g10/encr-data.c:68 g10/mainproc.c:305
+#: g10/encr-data.c:69 g10/mainproc.c:306
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr ""
 
-#: g10/encr-data.c:92
+#: g10/encr-data.c:93
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 
-#: g10/encr-data.c:103
+#: g10/encr-data.c:104
 msgid "problem handling encrypted packet\n"
 msgstr ""
 
-#: g10/exec.c:48
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr ""
 
-#: g10/exec.c:184 g10/openfile.c:406
+#: g10/exec.c:173 g10/openfile.c:410
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: kan ikke oprette mappe: %s\n"
 
-#: g10/exec.c:325
+#: g10/exec.c:314
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 
-#: g10/exec.c:355
+#: g10/exec.c:344
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 
-#: g10/exec.c:433
+#: g10/exec.c:422
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/exec.c:436
+#: g10/exec.c:425
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/exec.c:521
+#: g10/exec.c:510
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr ""
 
-#: g10/exec.c:532 g10/exec.c:598
+#: g10/exec.c:521 g10/exec.c:587
 msgid "unnatural exit of external program\n"
 msgstr ""
 
-#: g10/exec.c:547
+#: g10/exec.c:536
 msgid "unable to execute external program\n"
 msgstr ""
 
-#: g10/exec.c:563
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr ""
 
-#: g10/exec.c:609 g10/exec.c:616
+#: g10/exec.c:598 g10/exec.c:605
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr ""
 
-#: g10/exec.c:621
+#: g10/exec.c:610
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr ""
 
-#: g10/export.c:183
+#: g10/export.c:184
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/export.c:212
+#: g10/export.c:213
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/export.c:220
+#: g10/export.c:221
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/export.c:395
+#: g10/export.c:398
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:427
+#: g10/export.c:430
 msgid "WARNING: nothing exported\n"
 msgstr "ADVARSEL: intet blev eksporteret\n"
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid ""
 "@Commands:\n"
 " "
@@ -925,132 +951,132 @@ msgstr ""
 "@Kommandoer:\n"
 " "
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "|[file]|make a signature"
 msgstr "|[filer]|opret en signatur"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "|[file]|make a clear text signature"
 msgstr "|[filer]|opret rentekst signatur"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "make a detached signature"
 msgstr "opret en separat signatur"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encrypt data"
 msgstr "krypt�r data"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "encryption only with symmetric cipher"
 msgstr "krypt�r kun med symmetriske cifre"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "decrypt data (default)"
 msgstr "afkrypt�r data (standard)"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "verify a signature"
 msgstr "godkend en signatur"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys"
 msgstr "vis n�gler"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and signatures"
 msgstr "vis n�gler og signaturer"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "tjek n�glesignaturer"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "list keys and fingerprints"
 msgstr "vis n�gle og fingeraftryk"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "list secret keys"
 msgstr "vis hemmelige n�gler"
 
-#: g10/g10.c:379
+#: g10/g10.c:381
 msgid "generate a new key pair"
 msgstr "gener�r et nyt n�glepar"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "fjern n�gle fra den offentlige n�glering"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign a key"
 msgstr "sign�r en n�gle"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "sign a key locally"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/g10.c:385
+#: g10/g10.c:387
 msgid "sign or edit a key"
 msgstr "sign�r eller redig�r en n�gle"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "generate a revocation certificate"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "export keys"
 msgstr "eksport�r n�gler"
 
-#: g10/g10.c:389
+#: g10/g10.c:391
 msgid "export keys to a key server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "import keys from a key server"
 msgstr "import�r n�gler fra en n�gleserver"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/g10.c:394
+#: g10/g10.c:396
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "import�r n�gler fra en n�gleserver"
 
-#: g10/g10.c:397
+#: g10/g10.c:399
 msgid "import/merge keys"
 msgstr "import�r/fusion�r n�gler"
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "print the card status"
 msgstr ""
 
-#: g10/g10.c:401
+#: g10/g10.c:403
 msgid "change data on a card"
 msgstr ""
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/g10.c:410
+#: g10/g10.c:412
 msgid "update the trust database"
 msgstr "opdat�r tillidsdatabasen"
 
-#: g10/g10.c:417
+#: g10/g10.c:419
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|print meddelelsesresum�"
 
-#: g10/g10.c:421 g10/gpgv.c:66
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1060,57 +1086,57 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "create ascii armored output"
 msgstr "opret ascii beskyttet uddata"
 
-#: g10/g10.c:425
+#: g10/g10.c:427
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|krypt�r for NAME"
 
-#: g10/g10.c:436
+#: g10/g10.c:438
 msgid "use this user-id to sign or decrypt"
 msgstr "brug denne bruger-id til at signere eller dekryptere"
 
-#: g10/g10.c:437
+#: g10/g10.c:439
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|s�t kompresningsniveau N (0 = sl�et fra)"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "use canonical text mode"
 msgstr "brug kanonisk tekstmodus"
 
-#: g10/g10.c:452
+#: g10/g10.c:458
 msgid "use as output file"
 msgstr "brug som uddatafil"
 
-#: g10/g10.c:454 g10/gpgv.c:68
+#: g10/g10.c:460 g10/gpgv.c:73
 msgid "verbose"
 msgstr "meddelsom"
 
-#: g10/g10.c:465
+#: g10/g10.c:471
 msgid "do not make any changes"
 msgstr "lav ingen �ndringer"
 
-#: g10/g10.c:466
+#: g10/g10.c:472
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/g10.c:507
+#: g10/g10.c:513
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:508
+#: g10/g10.c:514
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:536
+#: g10/g10.c:542
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:539
+#: g10/g10.c:545
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1130,16 +1156,16 @@ msgstr ""
 " --list-keys [navne]        vis n�gler\n"
 " --fingerprint [navne]      vis fingeraftryk\n"
 
-#: g10/g10.c:720 g10/gpgv.c:93
+#: g10/g10.c:724 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Rapport�r venligst fejl til <[email protected]>.\n"
 
-#: g10/g10.c:737
+#: g10/g10.c:741
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
 # Skal alt dette overs�ttes eller er det flagene?
-#: g10/g10.c:740
+#: g10/g10.c:744
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1149,7 +1175,7 @@ msgstr ""
 "sign, check, encrypt eller decrypt\n"
 "standard operation afh�nger af inddata\n"
 
-#: g10/g10.c:751
+#: g10/g10.c:755
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1157,562 +1183,577 @@ msgstr ""
 "\n"
 "Underst�ttede algoritmer:\n"
 
-#: g10/g10.c:754
+#: g10/g10.c:758
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/g10.c:760 g10/keyedit.c:2141
+#: g10/g10.c:764 g10/keyedit.c:2248
 msgid "Cipher: "
 msgstr ""
 
-#: g10/g10.c:766
+#: g10/g10.c:770
 msgid "Hash: "
 msgstr ""
 
-#: g10/g10.c:772 g10/keyedit.c:2187
+#: g10/g10.c:776 g10/keyedit.c:2294
 #, fuzzy
 msgid "Compression: "
 msgstr "Kommentar: "
 
-#: g10/g10.c:855
+#: g10/g10.c:859
 msgid "usage: gpg [options] "
 msgstr "brug: gpg [flag] "
 
-#: g10/g10.c:1003
+#: g10/g10.c:1007
 msgid "conflicting commands\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/g10.c:1021
+#: g10/g10.c:1025
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1218
+#: g10/g10.c:1222
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1221
+#: g10/g10.c:1225
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1224
+#: g10/g10.c:1228
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1230
+#: g10/g10.c:1234
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1233
+#: g10/g10.c:1237
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1236
+#: g10/g10.c:1240
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1242
+#: g10/g10.c:1246
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1245
+#: g10/g10.c:1249
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1248
+#: g10/g10.c:1252
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1254
+#: g10/g10.c:1258
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1257
+#: g10/g10.c:1261
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1260
+#: g10/g10.c:1264
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1401
+#: g10/g10.c:1405
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1802
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/g10.c:1838
+#: g10/g10.c:1844
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/g10.c:1842
+#: g10/g10.c:1848
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "alternativfil`%s': %s\n"
 
-#: g10/g10.c:1849
+#: g10/g10.c:1855
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTITS: %s er ikke til normal brug!\n"
 
-#: g10/g10.c:2076
+#: g10/g10.c:2082
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/g10.c:2293
+#: g10/g10.c:2236 g10/g10.c:2248
+#, fuzzy, c-format
+msgid "`%s' is not a valid signature expiration\n"
+msgstr "%s er ikke et gyldigt tegns�t\n"
+
+#: g10/g10.c:2321
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3683
+#: g10/g10.c:2340 g10/keyedit.c:3862
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2346
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2349
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2356
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2359
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "ugyldig rustning"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2366
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2369
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2376
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2379
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "ugyldig rustning"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2401
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2404
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2411
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:2573
+#: g10/g10.c:2602
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/g10.c:2577
+#: g10/g10.c:2606
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:2586
+#: g10/g10.c:2615
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2618
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/g10.c:2603
+#: g10/g10.c:2625
+#, 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/g10.c:2640
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/g10.c:2617
+#: g10/g10.c:2654
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:2623
+#: g10/g10.c:2660
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:2629
+#: g10/g10.c:2666
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:2642
+#: g10/g10.c:2679
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/g10.c:2712 g10/g10.c:2736
+#: g10/g10.c:2746 g10/g10.c:2770
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/g10.c:2718 g10/g10.c:2742
+#: g10/g10.c:2752 g10/g10.c:2776
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/g10.c:2724
+#: g10/g10.c:2758
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2764
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/g10.c:2745
+#: g10/g10.c:2779
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/g10.c:2747
+#: g10/g10.c:2781
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/g10.c:2749
+#: g10/g10.c:2783
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:2751
+#: g10/g10.c:2785
 #, 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/g10.c:2753
+#: g10/g10.c:2787
 #, 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/g10.c:2756
+#: g10/g10.c:2790
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: simpel S2K modus (0) frar�des p� det skarpeste\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2794
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
-#: g10/g10.c:2767
+#: g10/g10.c:2801
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/g10.c:2776
+#: g10/g10.c:2810
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/g10.c:2780
+#: g10/g10.c:2814
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/g10.c:2784
+#: g10/g10.c:2818
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/g10.c:2817
+#: g10/g10.c:2851
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/g10.c:2864
+#: g10/g10.c:2898
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2869
+#: g10/g10.c:2903
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2874
+#: g10/g10.c:2908
 #, 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/g10.c:2970
+#: g10/g10.c:3004
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/g10.c:2981
+#: g10/g10.c:3015
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/g10.c:2992
+#: g10/g10.c:3026
 msgid "--store [filename]"
 msgstr "--store [filnavn (som gemmes)]"
 
-#: g10/g10.c:2999
+#: g10/g10.c:3033
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3035
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:3011
+#: g10/g10.c:3045
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn (som krypteres)]"
 
-#: g10/g10.c:3024
+#: g10/g10.c:3058
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3060
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3029
+#: g10/g10.c:3063
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:3047
+#: g10/g10.c:3081
 msgid "--sign [filename]"
 msgstr "--sign [filnavn (som signeres)]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3094
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/g10.c:3075
+#: g10/g10.c:3109
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/g10.c:3077
+#: g10/g10.c:3111
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3080
+#: g10/g10.c:3114
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:3100
+#: g10/g10.c:3134
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3143
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3168
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn (som dekrypteres)]"
 
-#: g10/g10.c:3142
+#: g10/g10.c:3176
 msgid "--sign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/g10.c:3146
+#: g10/g10.c:3180
 msgid "--lsign-key user-id"
 msgstr "--lsign-key bruger-id"
 
-#: g10/g10.c:3167
+#: g10/g10.c:3201
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key bruger-id [kommandoer]"
 
-#: g10/g10.c:3238
+#: g10/g10.c:3272
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [bruger-id] [n�glering]"
 
-#: g10/g10.c:3275
+#: g10/g10.c:3309
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:3277
+#: g10/g10.c:3311
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3313
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:3290
+#: g10/g10.c:3324
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/g10.c:3300
+#: g10/g10.c:3334
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/g10.c:3341
+#: g10/g10.c:3375
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:3349
+#: g10/g10.c:3383
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:3436
+#: g10/g10.c:3470
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hash-algoritme `%s'\n"
 
-#: g10/g10.c:3559
+#: g10/g10.c:3593
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3597
 msgid "Go ahead and type your message ...\n"
 msgstr "G� til sagen og skriv meddelelsen ...\n"
 
-#: g10/g10.c:3853
+#: g10/g10.c:3887
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
 
-#: g10/g10.c:3861
+#: g10/g10.c:3895
 #, fuzzy
 msgid "a user notation name must contain the '@' character\n"
 msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
 
-#: g10/g10.c:3871
+#: g10/g10.c:3900
+#, fuzzy
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
+
+#: g10/g10.c:3911
 msgid "a notation value must not use any control characters\n"
 msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
 
-#: g10/g10.c:3905
+#: g10/g10.c:3945
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/g10.c:3907
+#: g10/g10.c:3947
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/g10.c:3940
+#: g10/g10.c:3980
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:186 g10/getkey.c:2750
+#: g10/getkey.c:187 g10/getkey.c:2757
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[bruger ikke fundet]"
 
-#: g10/getkey.c:1677
+#: g10/getkey.c:1684
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2228
+#: g10/getkey.c:2235
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 
-#: g10/getkey.c:2459
+#: g10/getkey.c:2466
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "bruger sekund�r n�gle %08lX istedetfor prim�r n�gle %08lX\n"
 
-#: g10/getkey.c:2506
+#: g10/getkey.c:2513
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:74
 msgid "be somewhat more quiet"
 msgstr "v�r mere stille"
 
-#: g10/gpgv.c:70
+#: g10/gpgv.c:75
 #, fuzzy
 msgid "take the keys from this keyring"
 msgstr "Slet denne n�gle fra n�gleringen? "
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:77
 #, fuzzy
 msgid "make timestamp conflicts only a warning"
 msgstr "tidsstempelkonflikt"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:78
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinfo til denne FD"
 
-#: g10/gpgv.c:97
+#: g10/gpgv.c:102
 #, fuzzy
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:105
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
 
-#: g10/helptext.c:48
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
 "to do with the (implicitly created) web-of-certificates."
 msgstr ""
 
-#: g10/helptext.c:54
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1720,16 +1761,16 @@ msgid ""
 "ultimately trusted\n"
 msgstr ""
 
-#: g10/helptext.c:61
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 
-#: g10/helptext.c:65
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr ""
 
-#: g10/helptext.c:69
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1743,23 +1784,23 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:83
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
 "Please consult your security expert first."
 msgstr ""
 
-#: g10/helptext.c:90
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "Indtast n�glens st�rrelse"
 
-#: g10/helptext.c:94 g10/helptext.c:99 g10/helptext.c:111 g10/helptext.c:143
-#: g10/helptext.c:171 g10/helptext.c:176 g10/helptext.c:181
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "Svar \"ja\" eller \"nej\""
 
-#: g10/helptext.c:104
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1767,19 +1808,19 @@ msgid ""
 "the given value as an interval."
 msgstr ""
 
-#: g10/helptext.c:116
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr ""
 
-#: g10/helptext.c:121
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr ""
 
-#: g10/helptext.c:125
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr ""
 
-#: g10/helptext.c:130
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1788,11 +1829,11 @@ msgid ""
 "Q  to to quit the key generation."
 msgstr ""
 
-#: g10/helptext.c:139
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr ""
 
-#: g10/helptext.c:147
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -1833,28 +1874,28 @@ msgid ""
 "If you don't know what the right answer is, answer \"0\"."
 msgstr ""
 
-#: g10/helptext.c:185
+#: g10/helptext.c:186
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr ""
 
-#: g10/helptext.c:189
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
 msgstr ""
 
-#: g10/helptext.c:194
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr ""
 
-#: g10/helptext.c:199
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
 "trust connection to the key or another key certified by this key."
 msgstr ""
 
-#: g10/helptext.c:204
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -1862,13 +1903,13 @@ msgid ""
 "a trust connection through another already certified key."
 msgstr ""
 
-#: g10/helptext.c:210
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr ""
 
-#: g10/helptext.c:214
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -1877,30 +1918,30 @@ msgid ""
 "a second one is available."
 msgstr ""
 
-#: g10/helptext.c:222
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
 "self-signatures will be advanced by one second.\n"
 msgstr ""
 
-#: g10/helptext.c:229
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr ""
 
-#: g10/helptext.c:235
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 
-#: g10/helptext.c:239
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr ""
 
-#: g10/helptext.c:244
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Svar \"ja\" hvis det er ok at overskrive filen"
 
-#: g10/helptext.c:249
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -1908,7 +1949,7 @@ msgstr ""
 "Indtast et nyt filnavn. Hvis du bare trykker RETUR vil det\n"
 "forvalgte navn (som er vist i klammer) blive brugt."
 
-#: g10/helptext.c:255
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -1924,473 +1965,478 @@ msgid ""
 "      this is normally used to mark an email address invalid.\n"
 msgstr ""
 
-#: g10/helptext.c:271
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
 "An empty line ends the text.\n"
 msgstr ""
 
-#: g10/helptext.c:286
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "Ingen hj�lp tilg�ngelig"
 
-#: g10/helptext.c:294
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Ingen hj�lp tilg�ngelig for `%s'"
 
-#: g10/import.c:247
+#: g10/import.c:248
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "sprang over blok af typen %d\n"
 
-#: g10/import.c:256
+#: g10/import.c:257
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu n�gler behandlet indtil nu\n"
 
-#: g10/import.c:273
+#: g10/import.c:274
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Totalt antal behandlede: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, fuzzy, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "       nye undern�gler: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:279
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "              imported: %lu"
 msgstr "           importerede: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:287
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "              u�ndrede: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      nye bruger-id'er: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "       nye undern�gler: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        nye signaturer: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  nye n�gletilbagekald: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " hemmelige n�gler l�st: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "hemmelige n�gler import: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "hemmelige n�gler u�ndre: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, fuzzy, c-format
 msgid "          not imported: %lu\n"
 msgstr "           importerede: %lu"
 
-#: g10/import.c:543
+#: g10/import.c:544
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:545
+#: g10/import.c:546
 msgid "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:582
+#: g10/import.c:583
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:594
+#: g10/import.c:595
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/import.c:606
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:620
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:646
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:694 g10/import.c:1048
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:713
+#: g10/import.c:714
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:728
+#: g10/import.c:729
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:734
+#: g10/import.c:735
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 msgid "this may be caused by a missing self-signature\n"
 msgstr ""
 
-#: g10/import.c:746 g10/import.c:1168
+#: g10/import.c:747 g10/import.c:1169
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/import.c:752
+#: g10/import.c:753
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:761
+#: g10/import.c:762
 #, fuzzy, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/import.c:766 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver til `%s'\n"
 
-#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
-#: g10/import.c:2314 g10/import.c:2336
+#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
+#: g10/import.c:2315 g10/import.c:2337
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/import.c:791
+#: g10/import.c:792
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:815
+#: g10/import.c:816
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "n�gle %08lX: stemmer ikke med vores kopi\n"
 
-#: g10/import.c:832 g10/import.c:1186
+#: g10/import.c:833 g10/import.c:1187
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "n�gle %08lX: kan ikke lokalisere original n�gleblok: %s\n"
 
-#: g10/import.c:840 g10/import.c:1193
+#: g10/import.c:841 g10/import.c:1194
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "n�gle %08lX: kan ikke l�se original n�gleblok: %s\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:875
+#: g10/import.c:876
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:878
+#: g10/import.c:879
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:881
+#: g10/import.c:882
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:884
+#: g10/import.c:885
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:887
+#: g10/import.c:888
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:908
+#: g10/import.c:909
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1054
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1064
+#: g10/import.c:1065
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/import.c:1081 g10/import.c:2329
+#: g10/import.c:1082 g10/import.c:2330
 #, fuzzy, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "ingen standard offentlig n�glering\n"
 
-#: g10/import.c:1092
+#: g10/import.c:1093
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "hemmelige n�gler import: %lu\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1122
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: g10/import.c:1131
+#: g10/import.c:1132
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/import.c:1161
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1204
+#: g10/import.c:1205
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1236
+#: g10/import.c:1237
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1301
+#: g10/import.c:1302
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1317
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1336
+#: g10/import.c:1337
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:1347 g10/import.c:1397
+#: g10/import.c:1348 g10/import.c:1398
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/import.c:1349
+#: g10/import.c:1350
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1365
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1414
+#: g10/import.c:1415
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1457
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/import.c:1477
+#: g10/import.c:1478
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/import.c:1504
+#: g10/import.c:1505
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1514
+#: g10/import.c:1515
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1531
+#: g10/import.c:1532
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1545
+#: g10/import.c:1546
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1553
+#: g10/import.c:1554
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1574
+#: g10/import.c:1575
 #, fuzzy, c-format
 msgid "key %s: expired signature from key %s - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1677
+#: g10/import.c:1678
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:1739
+#: g10/import.c:1740
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/import.c:1753
+#: g10/import.c:1754
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/import.c:1812
+#: g10/import.c:1813
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:1846
+#: g10/import.c:1847
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:2235
+#: g10/import.c:2236
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2243
+#: g10/import.c:2244
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
 
-#: g10/import.c:2245
+#: g10/import.c:2246
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
 
-#: g10/keydb.c:167
+#: g10/keydb.c:168
 #, fuzzy, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keydb.c:174
+#: g10/keydb.c:175
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr ""
 
-#: g10/keydb.c:685
+#: g10/keydb.c:316 g10/keydb.c:319
+#, fuzzy, c-format
+msgid "keyblock resource `%s': %s\n"
+msgstr "fejl ved l�sning af '%s': %s\n"
+
+#: g10/keydb.c:698
 #, fuzzy, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "ingen standard offentlig n�glering\n"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr ""
 
-#: g10/keyedit.c:255
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[selv-signatur]"
 
-#: g10/keyedit.c:333 g10/keylist.c:405
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 d�rlig signature\n"
 
-#: g10/keyedit.c:335 g10/keylist.c:407
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d d�rlige signaturer\n"
 
-#: g10/keyedit.c:337 g10/keylist.c:409
+#: g10/keyedit.c:344 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr ""
 
-#: g10/keyedit.c:339 g10/keylist.c:411
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr ""
 
-#: g10/keyedit.c:341 g10/keylist.c:413
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr ""
 
-#: g10/keyedit.c:343 g10/keylist.c:415
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr ""
 
-#: g10/keyedit.c:345
+#: g10/keyedit.c:352
 msgid "1 user ID without valid self-signature detected\n"
 msgstr ""
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:354
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 
-#: g10/keyedit.c:403 g10/pkclist.c:262
+#: g10/keyedit.c:410 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2398,443 +2444,453 @@ msgid ""
 "etc.)\n"
 msgstr ""
 
-#: g10/keyedit.c:407 g10/pkclist.c:274
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keyedit.c:408 g10/pkclist.c:276
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:434
 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:443
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:594
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
-#: g10/keyedit.c:858 g10/keyedit.c:1642
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1728
 #, 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:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
-#: g10/keyedit.c:1648
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
+#: g10/keyedit.c:1734
 msgid "  Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:622
 #, fuzzy, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:650
 #, fuzzy, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/keyedit.c:676
+#: g10/keyedit.c:678
+#, fuzzy, c-format
+msgid "User ID \"%s\" is signable.  "
+msgstr "ADVARSEL: '%s' er en tom fil\n"
+
+#: g10/keyedit.c:680
+#, fuzzy
+msgid "Sign it? (y/N) "
+msgstr "Vil du gerne signere? "
+
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:711
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:699
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr ""
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:729
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:724
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:754
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:749
+#: g10/keyedit.c:775
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:752
+#: g10/keyedit.c:778
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:783
 #, 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:779
+#: g10/keyedit.c:805
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:820
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Bem�rk: Denne n�gle er for�ldet!\n"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:840
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:844
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:882
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:884
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr ""
 
-#: g10/keyedit.c:878
+#: g10/keyedit.c:909
 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:883
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:895
+#: g10/keyedit.c:926
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:950
 #, 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:926
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:963
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:971
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:981
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:988
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:995
 msgid "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1000
 msgid "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1005
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1015
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:1029 g10/keyedit.c:4132 g10/keyedit.c:4223 g10/keyedit.c:4287
-#: g10/keyedit.c:4348 g10/sign.c:369
+#: g10/keyedit.c:1060 g10/keyedit.c:4350 g10/keyedit.c:4441 g10/keyedit.c:4505
+#: g10/keyedit.c:4566 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1105 g10/keygen.c:3057
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:1109 g10/keygen.c:3045
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/keyedit.c:1113 g10/keygen.c:3060
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/keyedit.c:1117 g10/keygen.c:3064
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan ikke redigere denne n�gle: %s\n"
 
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:1156 g10/keygen.c:1825
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "kodes�tningen blev ikke ordentlig gentaget; pr�v igen.\n"
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1195
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:1235
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr ""
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "gem og afslut"
 
-#: g10/keyedit.c:1322
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "vis fingeraftryk"
 
-#: g10/keyedit.c:1323
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "vis n�gler og bruger-id'er"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr ""
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "v�lg sekund�r n�gle N"
 
-#: g10/keyedit.c:1327
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/keyedit.c:1330
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1335
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/keyedit.c:1337
+#: g10/keyedit.c:1369
 msgid "sign selected user IDs with a trust signature"
 msgstr ""
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1343
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1377
 #, fuzzy
 msgid "add a photo ID"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "slet bruger id"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "add a subkey"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "slet sekund�r n�gle"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1398
 #, fuzzy
 msgid "add a revocation key"
 msgstr "tilf�j sekund�r n�gle"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1402
 msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1404
 msgid "flag the selected user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "skift imellem hemmelig og offentlig n�gle visning"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1409
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1411
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1418
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "�ndr kodes�tningen"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr ""
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1426
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1433
 msgid "revoke key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "enable key"
 msgstr "sl� n�gle til"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "disable key"
 msgstr "sl� n�gle fra"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1436
 msgid "show selected photo IDs"
 msgstr ""
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1556
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/keyedit.c:1494
+#: g10/keyedit.c:1574
 msgid "Secret key is available.\n"
 msgstr ""
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1655
 msgid "Need the secret key to do this.\n"
 msgstr ""
 
-#: g10/keyedit.c:1579
+#: g10/keyedit.c:1663
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1682
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -2842,649 +2898,689 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1722
 #, fuzzy
 msgid "Key is revoked."
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:1657
+#: g10/keyedit.c:1741
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:1660
-msgid "Hint: Select the user IDs to sign\n"
-msgstr ""
-
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1748
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "ukendt signaturklasse"
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1771
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1713 g10/keyedit.c:1733 g10/keyedit.c:1899
+#: g10/keyedit.c:1793 g10/keyedit.c:1813 g10/keyedit.c:1979
 msgid "You must select at least one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:1715
+#: g10/keyedit.c:1795
 msgid "You can't delete the last user ID!\n"
 msgstr ""
 
-#: g10/keyedit.c:1717
+#: g10/keyedit.c:1797
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1718
+#: g10/keyedit.c:1798
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1848
 msgid "Really move the primary key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1780
+#: g10/keyedit.c:1860
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:1808
+#: g10/keyedit.c:1888
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1822
+#: g10/keyedit.c:1902
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1919
 #, 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:1863
+#: g10/keyedit.c:1943
 msgid "You must select at least one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1946
 #, 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:1867
+#: g10/keyedit.c:1947
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1982
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1983
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1921
+#: g10/keyedit.c:2001
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:1932
+#: g10/keyedit.c:2012
 #, 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:1934
+#: g10/keyedit.c:2014
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:1975
+#: g10/keyedit.c:2055
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2007
+#: g10/keyedit.c:2087
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2093
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2095
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:2065
+#: g10/keyedit.c:2157
+#, fuzzy, c-format
+msgid "Unable to clean `%s'\n"
+msgstr "kan ikke �bne %s: %s\n"
+
+#: g10/keyedit.c:2160
+msgid "Please specify item to clean: `sigs', `uids', or `all'\n"
+msgstr ""
+
+#: g10/keyedit.c:2171
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Gem �ndringer? "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2174
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Afslut uden at gemme? "
 
-#: g10/keyedit.c:2078
+#: g10/keyedit.c:2184
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2191
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2092
+#: g10/keyedit.c:2198
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:2164
+#: g10/keyedit.c:2271
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2323
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2227
+#: g10/keyedit.c:2334
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2242 g10/keylist.c:307
+#: g10/keyedit.c:2349 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2473
+#: g10/keyedit.c:2580
 #, 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:2494
+#: g10/keyedit.c:2601
 #, 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:2500
+#: g10/keyedit.c:2607
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2516 g10/keyedit.c:2572 g10/keyedit.c:2684 g10/keyedit.c:2699
-#: g10/keylist.c:193 g10/keyserver.c:422
+#: g10/keyedit.c:2623 g10/keyedit.c:2679 g10/keyedit.c:2792 g10/keyedit.c:2807
+#: g10/keylist.c:194 g10/keyserver.c:421
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/keyedit.c:2519 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:931
+#: g10/keyedit.c:2626 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:948
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:2521 g10/keylist.c:757 g10/keylist.c:886
+#: g10/keyedit.c:2628 g10/keylist.c:758 g10/keylist.c:887
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keyedit.c:2523 g10/keyedit.c:2574 g10/keyedit.c:2686 g10/keyedit.c:2701
-#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
-#: g10/keylist.c:913 g10/keyserver.c:428 g10/mainproc.c:937
+#: g10/keyedit.c:2630 g10/keyedit.c:2681 g10/keyedit.c:2794 g10/keyedit.c:2809
+#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
+#: g10/keylist.c:914 g10/keyserver.c:427 g10/mainproc.c:954
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keyedit.c:2525
+#: g10/keyedit.c:2632
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "betro"
 
-#: g10/keyedit.c:2540
+#: g10/keyedit.c:2647
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr "betro"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2651
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2658
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:2579 g10/keylist.c:199
+#: g10/keyedit.c:2686 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2754
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2654
+#: g10/keyedit.c:2762
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2718 g10/keyserver.c:432 g10/mainproc.c:1577
-#: g10/trustdb.c:1178
+#: g10/keyedit.c:2826 g10/keyedit.c:3201 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1690
 #, fuzzy
 msgid "revoked"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:2720 g10/keyserver.c:436 g10/mainproc.c:1579
-#: g10/trustdb.c:531
+#: g10/keyedit.c:2828 g10/keyedit.c:3203 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1692
 #, fuzzy
 msgid "expired"
 msgstr "udl�b"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2893
 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:2845
+#: g10/keyedit.c:2953
 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:2850 g10/keyedit.c:3128
+#: g10/keyedit.c:2958 g10/keyedit.c:3307
 #, 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:2856
+#: g10/keyedit.c:2964
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2996
+#: g10/keyedit.c:3104
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3114
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3010
+#: g10/keyedit.c:3118
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3016
+#: g10/keyedit.c:3124
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:3030
+#: g10/keyedit.c:3138
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Slettede %d signatur.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3139
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:3034
+#: g10/keyedit.c:3142
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:3123
+#: g10/keyedit.c:3167
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed.\n"
+msgstr "N�glen er beskyttet.\n"
+
+#: g10/keyedit.c:3168
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed.\n"
+msgstr "N�glen er beskyttet.\n"
+
+#: g10/keyedit.c:3173
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean.\n"
+msgstr "N�glen er beskyttet.\n"
+
+#: g10/keyedit.c:3205 g10/trustdb.c:1694
+#, fuzzy
+msgid "invalid"
+msgstr "ugyldig rustning"
+
+#: g10/keyedit.c:3207
+#, fuzzy, c-format
+msgid "User ID \"%s\" removed: %s\n"
+msgstr "N�glen er beskyttet.\n"
+
+#: g10/keyedit.c:3214
+#, fuzzy
+msgid "No user IDs are removable.\n"
+msgstr "Ingen bruger-ID for n�gle\n"
+
+#: g10/keyedit.c:3302
 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:3134
+#: g10/keyedit.c:3313
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3154
+#: g10/keyedit.c:3333
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Indtast n�glens st�rrelse"
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3356
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3371
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3214
+#: g10/keyedit.c:3393
 #, 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:3233
+#: g10/keyedit.c:3412
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3239
+#: g10/keyedit.c:3418
 #, 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:3300
+#: g10/keyedit.c:3479
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3306
+#: g10/keyedit.c:3485
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:3310
+#: g10/keyedit.c:3489
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:3313
+#: g10/keyedit.c:3492
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3359
+#: g10/keyedit.c:3538
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3554
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3455
+#: g10/keyedit.c:3634
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:3494 g10/keyedit.c:3604 g10/keyedit.c:3724
+#: g10/keyedit.c:3673 g10/keyedit.c:3783 g10/keyedit.c:3903
 #, 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:3665
+#: g10/keyedit.c:3844
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3745
+#: g10/keyedit.c:3924
 #, 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:3746
+#: g10/keyedit.c:3925
 #, 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:3808
+#: g10/keyedit.c:3987
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:3854
+#: g10/keyedit.c:4045
+#, fuzzy, c-format
+msgid "No user ID with hash %s\n"
+msgstr "Ingen bruger-id med indeks %d\n"
+
+#: g10/keyedit.c:4072
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:3971
+#: g10/keyedit.c:4189
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "bruger-id: \""
 
-#: g10/keyedit.c:3974 g10/keyedit.c:4038 g10/keyedit.c:4081
+#: g10/keyedit.c:4192 g10/keyedit.c:4256 g10/keyedit.c:4299
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:3976 g10/keyedit.c:4040 g10/keyedit.c:4083
+#: g10/keyedit.c:4194 g10/keyedit.c:4258 g10/keyedit.c:4301
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:3980
+#: g10/keyedit.c:4198
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:3984
+#: g10/keyedit.c:4202
 #, 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:3988
+#: g10/keyedit.c:4206
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:4015
+#: g10/keyedit.c:4233
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:4041
+#: g10/keyedit.c:4259
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/keyedit.c:4048
+#: g10/keyedit.c:4266
 #, 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:4070
+#: g10/keyedit.c:4288
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:4090
+#: g10/keyedit.c:4308
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:4120
+#: g10/keyedit.c:4338
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4408
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4425
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4271
+#: g10/keyedit.c:4489
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:4333
+#: g10/keyedit.c:4551
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4646
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 
-#: g10/keygen.c:293
+#: g10/keygen.c:258
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "vis pr�ferencer"
 
-#: g10/keygen.c:300
+#: g10/keygen.c:265
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/keygen.c:302
+#: g10/keygen.c:267
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/keygen.c:304
+#: g10/keygen.c:269
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:394
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/keygen.c:829
+#: g10/keygen.c:822
 #, fuzzy
 msgid "writing direct signature\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keygen.c:868
+#: g10/keygen.c:861
 msgid "writing self signature\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing key binding signature\n"
 msgstr ""
 
-#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2632
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�nsket n�glest�rrelse er %u bit\n"
 
-#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2638
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1239
 #, fuzzy
 msgid "Sign"
 msgstr "sign�r"
 
-#: g10/keygen.c:1252
+#: g10/keygen.c:1242
 #, fuzzy
 msgid "Encrypt"
 msgstr "krypt�r data"
 
-#: g10/keygen.c:1255
+#: g10/keygen.c:1245
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1263
+#: g10/keygen.c:1253
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1268
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1282
+#: g10/keygen.c:1272
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1287
+#: g10/keygen.c:1277
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1290
+#: g10/keygen.c:1280
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1293
+#: g10/keygen.c:1283
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1296
+#: g10/keygen.c:1286
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1340
 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:1352
+#: g10/keygen.c:1342
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA og ElGamal (standard)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1343
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (sign�r kun)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1345
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1357
+#: g10/keygen.c:1347
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1348
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) DSA (sign�r kun)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1350
 #, fuzzy, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1362
+#: g10/keygen.c:1352
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1431 g10/keygen.c:2509
+#: g10/keygen.c:1421 g10/keygen.c:2506
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA n�glepar vil have 1024 bit.\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1431
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1438
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Hvilken n�glest�rrelse �nsker du? (1024) "
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1452
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1468
+#: g10/keygen.c:1458
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�nsket n�glest�rrelse er %u bit\n"
 
-#: g10/keygen.c:1473 g10/keygen.c:1478
+#: g10/keygen.c:1463 g10/keygen.c:1468
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1515
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3494,7 +3590,7 @@ msgid ""
 "      <n>y = key expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1526
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3504,52 +3600,52 @@ msgid ""
 "      <n>y = signature expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1549
 msgid "Key is valid for? (0) "
 msgstr "N�gle er gyldig for? (0) "
 
-#: g10/keygen.c:1563
-#, fuzzy
-msgid "Signature is valid for? (0) "
+#: g10/keygen.c:1554
+#, fuzzy, c-format
+msgid "Signature is valid for? (%s) "
 msgstr "N�gle er gyldig for? (0) "
 
-#: g10/keygen.c:1568
+#: g10/keygen.c:1572
 msgid "invalid value\n"
 msgstr "ugyldig v�rdi\n"
 
-#: g10/keygen.c:1575
+#: g10/keygen.c:1579
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "N�glen udl�ber aldrig\n"
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1580
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "N�glen udl�ber aldrig\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1585
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1586
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1592
 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:1595
+#: g10/keygen.c:1597
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Er dette korrekt (j/n)? "
 
-#: g10/keygen.c:1638
+#: g10/keygen.c:1641
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3559,44 +3655,44 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1651
+#: g10/keygen.c:1654
 msgid "Real name: "
 msgstr "Rigtige navn: "
 
-#: g10/keygen.c:1659
+#: g10/keygen.c:1662
 msgid "Invalid character in name\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1664
 msgid "Name may not start with a digit\n"
 msgstr "Navn m� ikke starte med et tal\n"
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1666
 msgid "Name must be at least 5 characters long\n"
 msgstr "Navn skal v�re mindst 5 bogstaver langt\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1674
 msgid "Email address: "
 msgstr "Epostadresse: "
 
-#: g10/keygen.c:1682
+#: g10/keygen.c:1685
 msgid "Not a valid email address\n"
 msgstr "Ikke en gyldig epostadresse\n"
 
-#: g10/keygen.c:1690
+#: g10/keygen.c:1693
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1696
+#: g10/keygen.c:1699
 msgid "Invalid character in comment\n"
 msgstr "Ugyldigt tegn i kommentar\n"
 
-#: g10/keygen.c:1719
+#: g10/keygen.c:1722
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du bruger '%s' tegns�ttet.\n"
 
-#: g10/keygen.c:1725
+#: g10/keygen.c:1728
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3607,7 +3703,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1733
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
@@ -3622,24 +3718,24 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1746
+#: g10/keygen.c:1749
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1756
+#: g10/keygen.c:1759
 #, 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:1757
+#: g10/keygen.c:1760
 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:1776
+#: g10/keygen.c:1779
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1816
+#: g10/keygen.c:1819
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3647,12 +3743,12 @@ msgstr ""
 "Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
 "\n"
 
-#: g10/keygen.c:1826 g10/passphrase.c:1105
+#: g10/keygen.c:1829 g10/passphrase.c:786
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1832
+#: g10/keygen.c:1835
 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"
@@ -3660,7 +3756,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1857
 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"
@@ -3668,441 +3764,422 @@ msgid ""
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:2578
+#: g10/keygen.c:2575
 msgid "Key generation canceled.\n"
 msgstr "N�gleoprettelse annulleret.\n"
 
-#: g10/keygen.c:2766 g10/keygen.c:2910
+#: g10/keygen.c:2774 g10/keygen.c:2918
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/keygen.c:2768 g10/keygen.c:2913
+#: g10/keygen.c:2776 g10/keygen.c:2921
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:2771 g10/keygen.c:2916
+#: g10/keygen.c:2779 g10/keygen.c:2924
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2907
 #, 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:2905
+#: g10/keygen.c:2913
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2931
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2938
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keygen.c:2953
+#: g10/keygen.c:2961
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig n�gle oprettet og signeret.\n"
 
-#: g10/keygen.c:2964
+#: g10/keygen.c:2972
 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:2976 g10/keygen.c:3105 g10/keygen.c:3220
+#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3028 g10/keygen.c:3156 g10/sign.c:290
+#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3030 g10/keygen.c:3158 g10/sign.c:292
+#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3039 g10/keygen.c:3169
+#: g10/keygen.c:3047 g10/keygen.c:3177
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:3078 g10/keygen.c:3202
+#: g10/keygen.c:3086 g10/keygen.c:3210
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keygen.c:3355
+#: g10/keygen.c:3363
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/keygen.c:3402
+#: g10/keygen.c:3410
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/keygen.c:3428
+#: g10/keygen.c:3436
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "hemmelige n�gler import: %lu\n"
 
-#: g10/keygen.c:3508
-#, c-format
-msgid "length of RSA modulus is not %d\n"
-msgstr ""
-
-#: g10/keygen.c:3514
-msgid "public exponent too large (more than 32 bits)\n"
-msgstr ""
-
-#: g10/keygen.c:3520 g10/keygen.c:3526
-#, c-format
-msgid "length of an RSA prime is not %d\n"
-msgstr ""
-
-#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
+#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
 msgid "never     "
 msgstr ""
 
-#: g10/keylist.c:264
+#: g10/keylist.c:265
 #, fuzzy
 msgid "Critical signature policy: "
 msgstr "%s signatur fra: %s\n"
 
-#: g10/keylist.c:266
+#: g10/keylist.c:267
 #, fuzzy
 msgid "Signature policy: "
 msgstr "%s signatur fra: %s\n"
 
-#: g10/keylist.c:305
+#: g10/keylist.c:306
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:354 g10/keylist.c:398
+#: g10/keylist.c:355 g10/keylist.c:399
 msgid "WARNING: invalid notation data found\n"
 msgstr ""
 
-#: g10/keylist.c:372
+#: g10/keylist.c:373
 msgid "Critical signature notation: "
 msgstr ""
 
-#: g10/keylist.c:374
+#: g10/keylist.c:375
 msgid "Signature notation: "
 msgstr ""
 
-#: g10/keylist.c:385
+#: g10/keylist.c:386
 msgid "not human readable"
 msgstr ""
 
-#: g10/keylist.c:486
+#: g10/keylist.c:487
 msgid "Keyring"
 msgstr ""
 
-#: g10/keylist.c:792
+#: g10/keylist.c:793
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keylist.c:1488
+#: g10/keylist.c:1489
 #, fuzzy
 msgid "Primary key fingerprint:"
 msgstr "vis n�gle og fingeraftryk"
 
-#: g10/keylist.c:1490
+#: g10/keylist.c:1491
 #, 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:1497
+#: g10/keylist.c:1498
 #, fuzzy
 msgid " Primary key fingerprint:"
 msgstr "             Fingeraftryk:"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1500
 #, fuzzy
 msgid "      Subkey fingerprint:"
 msgstr "             Fingeraftryk:"
 
-#: g10/keylist.c:1503 g10/keylist.c:1507
+#: g10/keylist.c:1504 g10/keylist.c:1508
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "             Fingeraftryk:"
 
-#: g10/keylist.c:1574
+#: g10/keylist.c:1575
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1245
+#: g10/keyring.c:1246
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1252
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr ""
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1255
 #, c-format
 msgid "%s is the new one\n"
 msgstr ""
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1256
 msgid "Please fix this possible security flaw\n"
 msgstr ""
 
-#: g10/keyring.c:1375
+#: g10/keyring.c:1376
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keyring.c:1421
+#: g10/keyring.c:1422
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "vis n�gler og signaturer"
 
-#: g10/keyring.c:1433
+#: g10/keyring.c:1434
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "vis n�gler og signaturer"
 
-#: g10/keyring.c:1504
+#: g10/keyring.c:1505
 #, c-format
 msgid "%s: keyring created\n"
 msgstr ""
 
-#: g10/keyserver.c:107
+#: g10/keyserver.c:105
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 
-#: g10/keyserver.c:434
+#: g10/keyserver.c:433
 #, fuzzy
 msgid "disabled"
 msgstr "sl�fra"
 
-#: g10/keyserver.c:635
+#: g10/keyserver.c:634
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:718 g10/keyserver.c:1238
+#: g10/keyserver.c:717 g10/keyserver.c:1267
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "ugyldig n�glering"
 
-#: g10/keyserver.c:808
+#: g10/keyserver.c:815
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/keyserver.c:810
+#: g10/keyserver.c:817
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/keyserver.c:985
+#: g10/keyserver.c:1014
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:989
+#: g10/keyserver.c:1018
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1141
+#: g10/keyserver.c:1170
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1188
+#: g10/keyserver.c:1217
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/keyserver.c:1191
+#: g10/keyserver.c:1220
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/keyserver.c:1198 g10/keyserver.c:1293
+#: g10/keyserver.c:1227 g10/keyserver.c:1322
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "ugyldig n�glering"
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1275
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1255
+#: g10/keyserver.c:1284
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1314
+#: g10/keyserver.c:1343
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1320
+#: g10/keyserver.c:1349
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1361
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1366
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1374
 #, c-format
-msgid "gpgkeys_%s does not support handler version %d\n"
+msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1351
+#: g10/keyserver.c:1381
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "generel fejl"
 
-#: g10/keyserver.c:1356
+#: g10/keyserver.c:1386
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "generel fejl"
 
-#: g10/keyserver.c:1365
+#: g10/keyserver.c:1395
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/keyserver.c:1390 g10/keyserver.c:1424
+#: g10/keyserver.c:1420 g10/keyserver.c:1454
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/keyserver.c:1681
+#: g10/keyserver.c:1711
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1703
+#: g10/keyserver.c:1733
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1705
+#: g10/keyserver.c:1735
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:249
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:262
-#, fuzzy, c-format
-msgid "bad passphrase or unknown cipher algorithm (%d)\n"
-msgstr "ukendt cifferalgoritme "
-
-#: g10/mainproc.c:299
+#: g10/mainproc.c:300
 #, fuzzy, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s/%s krypteret for: %s\n"
 
-#: g10/mainproc.c:309
+#: g10/mainproc.c:310
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "ukendt cifferalgoritme "
 
-#: g10/mainproc.c:375
+#: g10/mainproc.c:376
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "Offentlig n�gle er sl�et fra.\n"
 
-#: g10/mainproc.c:430
+#: g10/mainproc.c:431
 msgid "public key encrypted data: good DEK\n"
 msgstr ""
 
-#: g10/mainproc.c:463
+#: g10/mainproc.c:464
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/mainproc.c:467 g10/pkclist.c:218
+#: g10/mainproc.c:468 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:472
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:499
+#: g10/mainproc.c:500
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:502
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/mainproc.c:529 g10/mainproc.c:551
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, fuzzy, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "krypt�r data"
 
-#: g10/mainproc.c:537
+#: g10/mainproc.c:538
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:569
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:574
 #, fuzzy
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ADVARSEL: intet blev eksporteret\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:592
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr ""
@@ -4116,304 +4193,293 @@ msgstr ""
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:786
+#: g10/mainproc.c:803
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:1290
+#: g10/mainproc.c:1307
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1332 g10/mainproc.c:1342
+#: g10/mainproc.c:1349 g10/mainproc.c:1359
 #, fuzzy
 msgid "can't handle these multiple signatures\n"
 msgstr "opret en separat signatur"
 
-#: g10/mainproc.c:1352
+#: g10/mainproc.c:1369
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/mainproc.c:1353
+#: g10/mainproc.c:1370
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:1357
+#: g10/mainproc.c:1374
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1377
+#: g10/mainproc.c:1394
 #, fuzzy
 msgid "Key available at: "
 msgstr "Ingen hj�lp tilg�ngelig"
 
-#: g10/mainproc.c:1482 g10/mainproc.c:1530
+#: g10/mainproc.c:1499 g10/mainproc.c:1547
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "D�RLIG signatur fra \""
 
-#: g10/mainproc.c:1484 g10/mainproc.c:1532
+#: g10/mainproc.c:1501 g10/mainproc.c:1549
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1486 g10/mainproc.c:1534
+#: g10/mainproc.c:1503 g10/mainproc.c:1551
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1538
+#: g10/mainproc.c:1555
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1570
+#: g10/mainproc.c:1587
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1664
+#: g10/mainproc.c:1681
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/mainproc.c:1669
+#: g10/mainproc.c:1686
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/mainproc.c:1672
+#: g10/mainproc.c:1689
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/mainproc.c:1673
+#: g10/mainproc.c:1690
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:1674
+#: g10/mainproc.c:1691
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1674 g10/trustdb.c:530
+#: g10/mainproc.c:1691 g10/trustdb.c:531
 #, fuzzy
 msgid "unknown"
 msgstr "ukendt version"
 
-#: g10/mainproc.c:1694
+#: g10/mainproc.c:1711
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/mainproc.c:1762 g10/mainproc.c:1778 g10/mainproc.c:1864
+#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "opret en separat signatur"
 
-#: g10/mainproc.c:1805
+#: g10/mainproc.c:1822
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:1813
+#: g10/mainproc.c:1830
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1887
 msgid "old style (PGP 2.x) signature\n"
 msgstr "gammeldags (PGP 2.x) signatur\n"
 
-#: g10/mainproc.c:1880
+#: g10/mainproc.c:1897
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
-#: g10/misc.c:121
+#: g10/misc.c:122
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "kan ikke sl� core-dump fra: %s\n"
 
-#: g10/misc.c:141 g10/misc.c:169 g10/misc.c:241
+#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/misc.c:206
+#: g10/misc.c:207
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr ""
 
-#: g10/misc.c:315
+#: g10/misc.c:316
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/misc.c:330
+#: g10/misc.c:331
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "uimplementeret cifferalgoritme"
 
-#: g10/misc.c:345
+#: g10/misc.c:346
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:351
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:446
+#: g10/misc.c:447
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:447
+#: g10/misc.c:448
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 
-#: g10/misc.c:680
+#: g10/misc.c:681
 #, fuzzy, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:684
+#: g10/misc.c:685
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:686
+#: g10/misc.c:687
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:697
+#: g10/misc.c:694
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
+msgstr "ADVARSEL: '%s' er en tom fil\n"
+
+#: g10/misc.c:707
 #, fuzzy
 msgid "Uncompressed"
 msgstr "ikke bearbejdet"
 
-#: g10/misc.c:722
+#: g10/misc.c:732
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "ikke bearbejdet"
 
-#: g10/misc.c:832
+#: g10/misc.c:842
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:989
+#: g10/misc.c:999
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/misc.c:1014
+#: g10/misc.c:1024
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: g10/openfile.c:84
+#: g10/openfile.c:86
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Fil `%s' eksisterer. "
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Overskriv (j/N)? "
 
-#: g10/openfile.c:119
+#: g10/openfile.c:121
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: ukendt suffiks\n"
 
-#: g10/openfile.c:141
+#: g10/openfile.c:143
 msgid "Enter new filename"
 msgstr "Indtast nyt filnavn"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:188
 msgid "writing to stdout\n"
 msgstr "skriver til stdout\n"
 
-#: g10/openfile.c:296
+#: g10/openfile.c:300
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr ""
 
-#: g10/openfile.c:375
+#: g10/openfile.c:379
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr ""
 
-#: g10/openfile.c:377
+#: g10/openfile.c:381
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 
-#: g10/openfile.c:409
+#: g10/openfile.c:413
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: mappe oprettet\n"
 
-#: g10/parse-packet.c:137
+#: g10/parse-packet.c:138
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:707
+#: g10/parse-packet.c:708
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1132
+#: g10/parse-packet.c:1145
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:478 g10/passphrase.c:525
+#: g10/passphrase.c:305
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: g10/passphrase.c:486
-msgid "can't set client pid for the agent\n"
-msgstr ""
-
-#: g10/passphrase.c:494
-msgid "can't get server read FD for the agent\n"
-msgstr ""
-
-#: g10/passphrase.c:501
-msgid "can't get server write FD for the agent\n"
-msgstr ""
-
-#: g10/passphrase.c:534
+#: g10/passphrase.c:317
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/passphrase.c:547
+#: g10/passphrase.c:332
 #, fuzzy, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: g10/passphrase.c:568
+#: g10/passphrase.c:345
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: g10/passphrase.c:590
-msgid "communication problem with gpg-agent\n"
-msgstr ""
-
-#: g10/passphrase.c:597 g10/passphrase.c:937 g10/passphrase.c:1049
+#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
 
-#: g10/passphrase.c:700 g10/passphrase.c:1209
+#: g10/passphrase.c:511 g10/passphrase.c:890
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (hovedn�gle-ID %08lX)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:525
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4421,42 +4487,29 @@ msgid ""
 "%u-bit %s key, ID %s, created %s%s\n"
 msgstr ""
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:550
 #, fuzzy
 msgid "Repeat passphrase\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:552
 #, fuzzy
 msgid "Enter passphrase\n"
 msgstr "Indtast kodes�tning: "
 
-#: g10/passphrase.c:781
-msgid "passphrase too long\n"
-msgstr ""
-
-#: g10/passphrase.c:794
-msgid "invalid response from agent\n"
-msgstr ""
-
-#: g10/passphrase.c:810 g10/passphrase.c:931
+#: g10/passphrase.c:628
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:815 g10/passphrase.c:1020
-#, c-format
-msgid "problem with the agent: agent returns 0x%lx\n"
-msgstr ""
-
-#: g10/passphrase.c:1100 g10/passphrase.c:1263
+#: g10/passphrase.c:781 g10/passphrase.c:944
 msgid "can't query passphrase in batch mode\n"
 msgstr ""
 
-#: g10/passphrase.c:1107 g10/passphrase.c:1268
+#: g10/passphrase.c:788 g10/passphrase.c:949
 msgid "Enter passphrase: "
 msgstr "Indtast kodes�tning: "
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:871
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4465,21 +4518,21 @@ msgstr ""
 "Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
 "\n"
 
-#: g10/passphrase.c:1196
+#: g10/passphrase.c:877
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr ""
 
-#: g10/passphrase.c:1205
+#: g10/passphrase.c:886
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1272
+#: g10/passphrase.c:953
 msgid "Repeat passphrase: "
 msgstr "Gentag kodes�tning: "
 
-#: g10/photoid.c:66
+#: g10/photoid.c:67
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4488,430 +4541,430 @@ msgid ""
 "Keeping the image close to 240x288 is a good size to use.\n"
 msgstr ""
 
-#: g10/photoid.c:80
+#: g10/photoid.c:81
 msgid "Enter JPEG filename for photo ID: "
 msgstr ""
 
-#: g10/photoid.c:94
+#: g10/photoid.c:95
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/photoid.c:102
+#: g10/photoid.c:103
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:104
+#: g10/photoid.c:105
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/photoid.c:119
+#: g10/photoid.c:120
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
 # virker j automatisk istedetfor y?
-#: g10/photoid.c:136
+#: g10/photoid.c:137
 #, fuzzy
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Er dette korrekt (j/n)? "
 
-#: g10/photoid.c:338
+#: g10/photoid.c:339
 #, fuzzy
 msgid "unable to display photo ID!\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:580
+#: g10/pkclist.c:62 g10/revoke.c:581
 msgid "No reason specified"
 msgstr ""
 
-#: g10/pkclist.c:63 g10/revoke.c:582
+#: g10/pkclist.c:64 g10/revoke.c:583
 #, fuzzy
 msgid "Key is superseded"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/pkclist.c:65 g10/revoke.c:581
+#: g10/pkclist.c:66 g10/revoke.c:582
 msgid "Key has been compromised"
 msgstr ""
 
-#: g10/pkclist.c:67 g10/revoke.c:583
+#: g10/pkclist.c:68 g10/revoke.c:584
 msgid "Key is no longer used"
 msgstr ""
 
-#: g10/pkclist.c:69 g10/revoke.c:584
+#: g10/pkclist.c:70 g10/revoke.c:585
 msgid "User ID is no longer valid"
 msgstr ""
 
-#: g10/pkclist.c:73
+#: g10/pkclist.c:74
 #, fuzzy
 msgid "reason for revocation: "
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/pkclist.c:90
+#: g10/pkclist.c:91
 msgid "revocation comment: "
 msgstr ""
 
-#: g10/pkclist.c:205
+#: g10/pkclist.c:206
 msgid "iImMqQsS"
 msgstr ""
 
-#: g10/pkclist.c:213
+#: g10/pkclist.c:214
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "Ingen tillidsv�rdi tildelt til %lu:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:245
+#: g10/pkclist.c:246
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "              alias \""
 
-#: g10/pkclist.c:255
+#: g10/pkclist.c:256
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Denne n�gle tilh�rer sikkert ejeren\n"
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:271
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr ""
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr "%08lX: Vi stoler IKKE p� denne n�gle\n"
 
-#: g10/pkclist.c:278
+#: g10/pkclist.c:279
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/pkclist.c:284
+#: g10/pkclist.c:285
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = tilbage til hovedmenu\n"
 
-#: g10/pkclist.c:287
+#: g10/pkclist.c:288
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " q = afslut\n"
 
-#: g10/pkclist.c:292
+#: g10/pkclist.c:293
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:298 g10/revoke.c:609
+#: g10/pkclist.c:299 g10/revoke.c:610
 msgid "Your decision? "
 msgstr "Dit valg? "
 
-#: g10/pkclist.c:319
+#: g10/pkclist.c:320
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/pkclist.c:333
+#: g10/pkclist.c:334
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr ""
 
-#: g10/pkclist.c:418
+#: g10/pkclist.c:419
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr "         Intet tyder p� at denne signatur tilh�rer ejeren.\n"
 
-#: g10/pkclist.c:423
+#: g10/pkclist.c:424
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr "         Intet tyder p� at denne signatur tilh�rer ejeren.\n"
 
-#: g10/pkclist.c:429
+#: g10/pkclist.c:430
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Denne n�gle tilh�rer sikkert ejeren\n"
 
-#: g10/pkclist.c:434
+#: g10/pkclist.c:435
 msgid "This key belongs to us\n"
 msgstr "Denne n�gle tilh�rer os\n"
 
-#: g10/pkclist.c:460
+#: g10/pkclist.c:461
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
 "you may answer the next question with yes.\n"
 msgstr ""
 
-#: g10/pkclist.c:467
+#: g10/pkclist.c:468
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Brug denne n�gle alligevel? "
 
-#: g10/pkclist.c:501
+#: g10/pkclist.c:502
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ADVARSEL: Bruger n�gle uden tillid!\n"
 
-#: g10/pkclist.c:508
+#: g10/pkclist.c:509
 #, fuzzy
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/pkclist.c:517
+#: g10/pkclist.c:518
 #, fuzzy
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/pkclist.c:520
+#: g10/pkclist.c:521
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Dette kan betyde at signaturen er forfalsket.\n"
 
-#: g10/pkclist.c:527
+#: g10/pkclist.c:528
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ADVARSEL: Denne undern�gle er blevet tilbagekaldt af dens ejer!\n"
 
-#: g10/pkclist.c:532
+#: g10/pkclist.c:533
 #, fuzzy
 msgid "Note: This key has been disabled.\n"
 msgstr "Bem�rk: Denne n�gle er for�ldet!\n"
 
-#: g10/pkclist.c:537
+#: g10/pkclist.c:538
 msgid "Note: This key has expired!\n"
 msgstr "Bem�rk: Denne n�gle er for�ldet!\n"
 
-#: g10/pkclist.c:548
+#: g10/pkclist.c:549
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:551
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         Intet tyder p� at denne signatur tilh�rer ejeren.\n"
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:559
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ADVARSEL: Vi tror IKKE p� denne n�gle!\n"
 
-#: g10/pkclist.c:559
+#: g10/pkclist.c:560
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Signaturen er formentlig FORFALSKET.\n"
 
-#: g10/pkclist.c:567
+#: g10/pkclist.c:568
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:570
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Det er ikke sikkert at signaturen tilh�rer ejeren.\n"
 
-#: g10/pkclist.c:734 g10/pkclist.c:767 g10/pkclist.c:936 g10/pkclist.c:996
+#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/pkclist.c:744 g10/pkclist.c:968
+#: g10/pkclist.c:745 g10/pkclist.c:969
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: udelod: offentlig n�gle er allerede tilstede\n"
 
-#: g10/pkclist.c:786
+#: g10/pkclist.c:787
 #, fuzzy
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Du angav ikke en bruger-id. (du kan bruge \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:802
+#: g10/pkclist.c:803
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:828
+#: g10/pkclist.c:829
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
 msgstr ""
 
-#: g10/pkclist.c:844
+#: g10/pkclist.c:845
 msgid "No such user ID.\n"
 msgstr "Ingen s�dan bruger-id.\n"
 
-#: g10/pkclist.c:849 g10/pkclist.c:911
+#: g10/pkclist.c:850 g10/pkclist.c:912
 msgid "skipped: public key already set as default recipient\n"
 msgstr "udeladt: offentlig n�gle er allerede valgt som standard modtager\n"
 
-#: g10/pkclist.c:867
+#: g10/pkclist.c:868
 msgid "Public key is disabled.\n"
 msgstr "Offentlig n�gle er sl�et fra.\n"
 
-#: g10/pkclist.c:874
+#: g10/pkclist.c:875
 #, fuzzy
 msgid "skipped: public key already set\n"
 msgstr "%s: udelod: offentlig n�gle er allerede tilstede\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:904
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: g10/pkclist.c:948
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: udelod: offentlign�gle er sl�et fra\n"
 
-#: g10/pkclist.c:1003
+#: g10/pkclist.c:1004
 msgid "no valid addressees\n"
 msgstr "ingen gyldige adresser\n"
 
-#: g10/plaintext.c:90
+#: g10/plaintext.c:91
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 
-#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
+#: g10/plaintext.c:136 g10/plaintext.c:141 g10/plaintext.c:159
 #, fuzzy, c-format
 msgid "error creating `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/plaintext.c:446
+#: g10/plaintext.c:447
 msgid "Detached signature.\n"
 msgstr ""
 
-#: g10/plaintext.c:450
+#: g10/plaintext.c:452
 msgid "Please enter name of data file: "
 msgstr ""
 
-#: g10/plaintext.c:478
+#: g10/plaintext.c:481
 msgid "reading stdin ...\n"
 msgstr "l�ser stdin ...\n"
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:515
 msgid "no signed data\n"
 msgstr ""
 
-#: g10/plaintext.c:526
+#: g10/plaintext.c:529
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:103
+#: g10/pubkey-enc.c:104
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:119
+#: g10/pubkey-enc.c:120
 msgid "okay, we are the anonymous recipient.\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:207
+#: g10/pubkey-enc.c:208
 msgid "old encoding of the DEK is not supported\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:228
+#: g10/pubkey-enc.c:229
 #, fuzzy, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: g10/pubkey-enc.c:266
+#: g10/pubkey-enc.c:267
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:287
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "hemmelige n�gler import: %lu\n"
 
-#: g10/pubkey-enc.c:292
+#: g10/pubkey-enc.c:293
 #, fuzzy
 msgid "NOTE: key has been revoked"
 msgstr "n�gle %08lX: n�gle er blevet annulleret!\n"
 
-#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:545
+#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
+#: g10/revoke.c:188 g10/revoke.c:546
 #, fuzzy, c-format
 msgid "build_packet failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/revoke.c:146
+#: g10/revoke.c:147
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/revoke.c:272
+#: g10/revoke.c:273
 msgid "To be revoked by:\n"
 msgstr ""
 
-#: g10/revoke.c:276
+#: g10/revoke.c:277
 msgid "(This is a sensitive revocation key)\n"
 msgstr ""
 
-#: g10/revoke.c:280
+#: g10/revoke.c:281
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/revoke.c:293 g10/revoke.c:511
+#: g10/revoke.c:294 g10/revoke.c:512
 msgid "ASCII armored output forced.\n"
 msgstr ""
 
-#: g10/revoke.c:307 g10/revoke.c:525
+#: g10/revoke.c:308 g10/revoke.c:526
 #, fuzzy, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/revoke.c:370
+#: g10/revoke.c:371
 #, fuzzy
 msgid "Revocation certificate created.\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/revoke.c:376
+#: g10/revoke.c:377
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr ""
 
-#: g10/revoke.c:432
+#: g10/revoke.c:433
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/revoke.c:461
+#: g10/revoke.c:462
 #, fuzzy, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:473
 msgid "public key does not match secret key!\n"
 msgstr ""
 
-#: g10/revoke.c:479
+#: g10/revoke.c:480
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/revoke.c:496
+#: g10/revoke.c:497
 #, fuzzy
 msgid "unknown protection algorithm\n"
 msgstr "ukendt kompressionsalgoritme"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 #, fuzzy
 msgid "NOTE: This key is not protected!\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/revoke.c:551
+#: g10/revoke.c:552
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -4922,889 +4975,897 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/revoke.c:602
+#: g10/revoke.c:603
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:604
+#: g10/revoke.c:605
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:645
+#: g10/revoke.c:646
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 
-#: g10/revoke.c:673
+#: g10/revoke.c:674
 #, fuzzy, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/revoke.c:675
+#: g10/revoke.c:676
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Brug denne n�gle alligevel? "
 
-#: g10/seckey-cert.c:54
+#: g10/seckey-cert.c:55
 #, fuzzy
 msgid "secret key parts are not available\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/seckey-cert.c:60
+#: g10/seckey-cert.c:61
 #, fuzzy, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: g10/seckey-cert.c:71
+#: g10/seckey-cert.c:72
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: g10/seckey-cert.c:265
+#: g10/seckey-cert.c:266
 #, fuzzy
 msgid "Invalid passphrase; please try again"
 msgstr "ugyldig kodes�tning"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:267
 #, c-format
 msgid "%s ...\n"
 msgstr ""
 
-#: g10/seckey-cert.c:326
+#: g10/seckey-cert.c:327
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 
-#: g10/seckey-cert.c:364
+#: g10/seckey-cert.c:365
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 
-#: g10/seskey.c:52
+#: g10/seskey.c:53
 msgid "weak key created - retrying\n"
 msgstr ""
 
-#: g10/seskey.c:57
+#: g10/seskey.c:58
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 
-#: g10/seskey.c:213
+#: g10/seskey.c:214
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr ""
 
-#: g10/sig-check.c:75
+#: g10/sig-check.c:76
 msgid "WARNING: signature digest conflict in message\n"
 msgstr ""
 
-#: g10/sig-check.c:99
+#: g10/sig-check.c:100
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 
-#: g10/sig-check.c:102
+#: g10/sig-check.c:103
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 
-#: g10/sig-check.c:168
+#: g10/sig-check.c:169
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/sig-check.c:169
+#: g10/sig-check.c:170
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:181
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:183
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:193
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/sig-check.c:275
+#: g10/sig-check.c:276
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 
-#: g10/sig-check.c:532
+#: g10/sig-check.c:533
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/sig-check.c:558
+#: g10/sig-check.c:559
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/sign.c:85
+#: g10/sign.c:86
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:93
+#: g10/sign.c:94
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 
-#: g10/sign.c:112
+#: g10/sign.c:113
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:138
+#: g10/sign.c:139
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:146
+#: g10/sign.c:147
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:159
+#: g10/sign.c:160
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:187
+#: g10/sign.c:188
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:364
+#: g10/sign.c:365
 #, fuzzy, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/sign.c:373
+#: g10/sign.c:374
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/sign.c:741
+#: g10/sign.c:761
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:808
+#: g10/sign.c:830
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/sign.c:900
+#: g10/sign.c:922
 msgid "signing:"
 msgstr "signerer:"
 
-#: g10/sign.c:1007
+#: g10/sign.c:1034
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1180
+#: g10/sign.c:1212
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr ""
 
-#: g10/skclist.c:126 g10/skclist.c:190
+#: g10/skclist.c:127 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 
-#: g10/skclist.c:157
+#: g10/skclist.c:158
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "vis pr�ferencer"
 
-#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/skclist.c:170
+#: g10/skclist.c:171
 #, fuzzy
 msgid "skipped: secret key already present\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
 
-#: g10/skclist.c:185
+#: g10/skclist.c:186
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 
-#: g10/tdbdump.c:59 g10/trustdb.c:365
+#: g10/tdbdump.c:60 g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr ""
 
-#: g10/tdbdump.c:104
+#: g10/tdbdump.c:105
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
 "# (Use \"gpg --import-ownertrust\" to restore them)\n"
 msgstr ""
 
-#: g10/tdbdump.c:159 g10/tdbdump.c:167 g10/tdbdump.c:172 g10/tdbdump.c:177
+#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/tdbdump.c:159
+#: g10/tdbdump.c:160
 msgid "line too long"
 msgstr ""
 
-#: g10/tdbdump.c:167
+#: g10/tdbdump.c:168
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:173
+#: g10/tdbdump.c:174
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/tdbdump.c:178
+#: g10/tdbdump.c:179
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr "import�r ejertillidsv�rdierne"
 
-#: g10/tdbdump.c:214
+#: g10/tdbdump.c:215
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/tdbdump.c:218
+#: g10/tdbdump.c:219
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "panser: %s\n"
 
-#: g10/tdbdump.c:227 g10/trustdb.c:380
+#: g10/tdbdump.c:228 g10/trustdb.c:381
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:128 g10/tdbio.c:1440
+#: g10/tdbio.c:129 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:134 g10/tdbio.c:1447
+#: g10/tdbio.c:135 g10/tdbio.c:1448
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:244
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr ""
 
-#: g10/tdbio.c:497
+#: g10/tdbio.c:498
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: g10/tdbio.c:512
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr ""
 
-#: g10/tdbio.c:522 g10/tdbio.c:545 g10/tdbio.c:588
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/tdbio.c:524 g10/tdbio.c:591
+#: g10/tdbio.c:525 g10/tdbio.c:592
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "kan ikke �bne `%s'\n"
 
-#: g10/tdbio.c:550
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr ""
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr ""
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr ""
 
-#: g10/tdbio.c:597
+#: g10/tdbio.c:598
 msgid "NOTE: trustdb not writable\n"
 msgstr ""
 
-#: g10/tdbio.c:614
+#: g10/tdbio.c:615
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr ""
 
-#: g10/tdbio.c:646
+#: g10/tdbio.c:647
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:654
+#: g10/tdbio.c:655
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:671 g10/tdbio.c:691 g10/tdbio.c:707 g10/tdbio.c:721
-#: g10/tdbio.c:751 g10/tdbio.c:1373 g10/tdbio.c:1400
+#: g10/tdbio.c:672 g10/tdbio.c:692 g10/tdbio.c:708 g10/tdbio.c:722
+#: g10/tdbio.c:752 g10/tdbio.c:1374 g10/tdbio.c:1401
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:730
+#: g10/tdbio.c:731
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1169
+#: g10/tdbio.c:1170
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1177
+#: g10/tdbio.c:1178
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1198
+#: g10/tdbio.c:1199
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr ""
 
-#: g10/tdbio.c:1216
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr ""
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1222
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr ""
 
-#: g10/tdbio.c:1406
+#: g10/tdbio.c:1407
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1414
+#: g10/tdbio.c:1415
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1424
+#: g10/tdbio.c:1425
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1454
+#: g10/tdbio.c:1455
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1499
+#: g10/tdbio.c:1500
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 
-#: g10/textfilter.c:147
+#: g10/textfilter.c:148
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr ""
 
-#: g10/textfilter.c:244
+#: g10/textfilter.c:245
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr ""
 
-#: g10/trustdb.c:226
+#: g10/trustdb.c:227
 #, fuzzy, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/trustdb.c:257
+#: g10/trustdb.c:258
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/trustdb.c:295
+#: g10/trustdb.c:296
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:310
+#: g10/trustdb.c:311
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/trustdb.c:320
+#: g10/trustdb.c:321
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/trustdb.c:344
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:350
+#: g10/trustdb.c:351
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr ""
 
-#: g10/trustdb.c:446
+#: g10/trustdb.c:447
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:452
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:506
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ revoked]"
 msgstr "tilf�j n�gle"
 
-#: g10/trustdb.c:508 g10/trustdb.c:513
+#: g10/trustdb.c:509 g10/trustdb.c:514
 #, fuzzy
 msgid "[ expired]"
 msgstr "udl�b"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 #, fuzzy
 msgid "[ unknown]"
 msgstr "ukendt version"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:536
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:576
+#: g10/trustdb.c:577
 msgid "no need for a trustdb check\n"
 msgstr ""
 
-#: g10/trustdb.c:582 g10/trustdb.c:2157
+#: g10/trustdb.c:583 g10/trustdb.c:2309
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr ""
 
-#: g10/trustdb.c:591
+#: g10/trustdb.c:592
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:606
+#: g10/trustdb.c:607
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:838 g10/trustdb.c:1276
+#: 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:1033
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1037
+#: g10/trustdb.c:1038
 #, fuzzy
 msgid "checking the trustdb\n"
 msgstr "|[NAMES]|tjek tillidsdatabasen"
 
-#: g10/trustdb.c:1901
+#: g10/trustdb.c:2053
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:1965
+#: g10/trustdb.c:2117
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:2131
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 
-#: g10/trustdb.c:2002
+#: g10/trustdb.c:2154
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2240
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2163
+#: g10/trustdb.c:2315
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 
-#: g10/verify.c:116
+#: g10/verify.c:117
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
 "should be the first file given on the command line.\n"
 msgstr ""
 
-#: g10/verify.c:189
+#: g10/verify.c:190
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "generel fejl"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "ukendt pakketype"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "ukendt version"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "ukendt offentlig n�glealgoritme"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "ukendt sammenfatningsalgoritme"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "d�rlig offentlig n�gle"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "d�rlig hemmelig n�gle"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "d�rlig signatur"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "tjeksumsfejl"
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "d�rlig kodes�tning"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "offentlig n�gle ikke fundet"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "ukendt cifferalgoritme "
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "kan ikke �bne n�gleringen"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "ugyldig pakke"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "ugyldig rustning"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "ikke-eksisterende bruger id"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "forkert hemmelig n�gle brugt"
 
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "ikke underst�ttet"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "d�rlig n�gle"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "fill�sningsfejl"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "filskrivningsfejl"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "ukendt kompressionsalgoritme"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "fil�bningsfejl"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "filoprettelsesfejl"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "ugyldig kodes�tning"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "uimplementeret offentlig n�glealgoritme"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "uimplementeret cifferalgoritme"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "ukendt signaturklasse"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "tillidsdatabasefejl"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "d�rlig mpi"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "resursegr�nse"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "ugyldig n�glering"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "ugyldigt certifikat"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "d�rlig bruger-id"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "fillukningsfejl"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "filomd�bningsfejl"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "filsletningsfejl"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "uforventet data"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "tidsstempelkonflikt"
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "uanvendelig offentlig n�glealgoritme"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "fil eksisterer"
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "svag n�gle"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "ugyldigt argument"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "ugyldig URI"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "ikke-underst�ttet URI"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "netv�rksfejl"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "ikke krypteret"
 
-#: util/errors.c:103
+#: util/errors.c:104
 msgid "not processed"
 msgstr "ikke bearbejdet"
 
-#: util/errors.c:105
+#: util/errors.c:106
 #, fuzzy
 msgid "unusable public key"
 msgstr "d�rlig offentlig n�gle"
 
-#: util/errors.c:106
+#: util/errors.c:107
 #, fuzzy
 msgid "unusable secret key"
 msgstr "d�rlig hemmelig n�gle"
 
-#: util/errors.c:107
+#: util/errors.c:108
 #, fuzzy
 msgid "keyserver error"
 msgstr "generel fejl"
 
-#: util/errors.c:108
+#: util/errors.c:109
 msgid "canceled"
 msgstr ""
 
-#: util/errors.c:109
+#: util/errors.c:110
 #, fuzzy
 msgid "no card"
 msgstr "ikke krypteret"
 
-#: util/logger.c:157
+#: util/logger.c:158
 msgid "ERROR: "
 msgstr ""
 
-#: util/logger.c:160
+#: util/logger.c:161
 msgid "WARNING: "
 msgstr ""
 
-#: util/logger.c:223
+#: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... dette er en fejl (%s:%d:%s)\n"
 
-#: util/logger.c:229
+#: util/logger.c:230
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "du fandt en fejl ... (%s:%d)\n"
 
-#: util/miscutil.c:336 util/miscutil.c:373
+#: util/miscutil.c:330 util/miscutil.c:367
 msgid "yes"
 msgstr "ja"
 
-#: util/miscutil.c:337 util/miscutil.c:378
+#: util/miscutil.c:331 util/miscutil.c:372
 msgid "yY"
 msgstr "jJ"
 
-#: util/miscutil.c:339 util/miscutil.c:375
+#: util/miscutil.c:333 util/miscutil.c:369
 msgid "no"
 msgstr "n"
 
-#: util/miscutil.c:340 util/miscutil.c:379
+#: util/miscutil.c:334 util/miscutil.c:373
 msgid "nN"
 msgstr "nN"
 
-#: util/miscutil.c:377
+#: util/miscutil.c:371
 msgid "quit"
 msgstr "afslut"
 
-#: util/miscutil.c:380
+#: util/miscutil.c:374
 msgid "qQ"
 msgstr "aA"
 
-#: util/miscutil.c:413
+#: util/miscutil.c:407
 msgid "okay|okay"
 msgstr ""
 
-#: util/miscutil.c:415
+#: util/miscutil.c:409
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:416
+#: util/miscutil.c:410
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:417
+#: util/miscutil.c:411
 #, fuzzy
 msgid "cC"
 msgstr "c"
 
-#: util/secmem.c:90
+#: util/secmem.c:91
 #, fuzzy
 msgid "WARNING: using insecure memory!\n"
 msgstr "Advarsel: benytter ubeskyttet hukommelse!\n"
 
-#: util/secmem.c:91
+#: util/secmem.c:92
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr ""
 
-#: util/secmem.c:343
+#: util/secmem.c:344
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operation er ikke mulig uden beskyttet hukommelse indl�st\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:345
 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 "error getting serial number: %s\n"
+#~ msgstr "fejl ved oprettelse af kodes�tning: %s\n"
+
+#, fuzzy
+#~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+#~ msgstr "ukendt cifferalgoritme "
+
 #~ msgid "list signatures"
 #~ msgstr "vis signaturer"
 
@@ -6334,19 +6395,9 @@ msgstr "(du kan have brugt et forkert program til denne opgave)\n"
 #~ msgid "%s: user not found\n"
 #~ msgstr "%s: bruger ikke fundet\n"
 
-#, fuzzy
-#~ msgid "invalid"
-#~ msgstr "ugyldig rustning"
-
-#~ msgid "RSA key cannot be used in this version\n"
-#~ msgstr "RSA n�gle kan ikke bruges i denne version\n"
-
 #~ msgid "No key for user ID\n"
 #~ msgstr "Ingen n�gle for bruger-ID\n"
 
-#~ msgid "No user ID for key\n"
-#~ msgstr "Ingen bruger-ID for n�gle\n"
-
 #~ msgid "set debugging flags"
 #~ msgstr "s�t aflusningsflag"
 
diff --git a/po/de.po b/po/de.po
index 88466ed64..7e9e1132e 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: 2005-03-15 16:35+0100\n"
+"POT-Creation-Date: 2005-05-31 10:05+0200\n"
 "PO-Revision-Date: 2005-03-30 10:45+0200\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
@@ -15,81 +15,81 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:120
+#: cipher/primegen.c:121
 #, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr "Eine Primzahl mit pbits=%u und qbits=%u kann nicht erzeugt werden\n"
 
-#: cipher/primegen.c:311
+#: cipher/primegen.c:312
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "Eine Primzahl mit weniger als %d Bits kann nicht erzeugt werden\n"
 
-#: cipher/random.c:163
+#: cipher/random.c:164
 msgid "no entropy gathering module detected\n"
 msgstr "Kein Modul zum sammeln von Entropie vorhanden\n"
 
-#: cipher/random.c:387 g10/card-util.c:656 g10/card-util.c:725
-#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2255
-#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
-#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
-#: g10/tdbio.c:600
+#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
+#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
+#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
+#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
+#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/tdbio.c:601
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
 
-#: cipher/random.c:391
+#: cipher/random.c:392
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "Status von '%s' ist nicht feststellbar: %s\n"
 
-#: cipher/random.c:396
+#: cipher/random.c:397
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "'%s' ist keine normale Datei - sie bleibt unbeachtet\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:402
 msgid "note: random_seed file is empty\n"
 msgstr "Hinweis: 'random_seed'-Datei ist leer\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:408
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "WARNUNG: Falsche Gr���e der 'random_seed'-Datei - sie wird nicht verwendet\n"
 
-#: cipher/random.c:415
+#: cipher/random.c:416
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "'%s' ist unlesbar: %s\n"
 
-#: cipher/random.c:453
+#: cipher/random.c:454
 msgid "note: random_seed file not updated\n"
 msgstr "Hinweis: 'random_seed'-Datei bleibt unver�ndert\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2723
-#: g10/keygen.c:2753 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
-#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "'%s' kann nicht erzeugt werden: %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:481
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kann '%s' nicht schreiben: %s\n"
 
-#: cipher/random.c:483
+#: cipher/random.c:484
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kann '%s' nicht schliessen: %s\n"
 
-#: cipher/random.c:728
+#: cipher/random.c:729
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "WARNUNG: Der Zufallsgenerator erzeugt keine echten Zufallszahlen!\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:730
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -104,7 +104,7 @@ msgstr ""
 "\n"
 
 # translated by wk
-#: cipher/rndegd.c:204
+#: cipher/rndegd.c:205
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -113,7 +113,7 @@ msgstr ""
 "Zufalls wird gesammelt.  Bitte arebiten Sie an etwas anderem, da\n"
 "so die Qualit�t der Zufallszahlen erh�ht werden kann.\n"
 
-#: cipher/rndlinux.c:134
+#: cipher/rndlinux.c:135
 #, c-format
 msgid ""
 "\n"
@@ -125,45 +125,62 @@ msgstr ""
 "Arbeiten durch, damit das Betriebssystem weitere Entropie sammeln kann!\n"
 "(Es werden noch %d Byte ben�tigt.)\n"
 
-#: g10/app-openpgp.c:547
+#: g10/app-openpgp.c:596
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "Der Fingerabdruck kann nicht gespeichert werden: %s\n"
 
-#: g10/app-openpgp.c:560
+#: g10/app-openpgp.c:609
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "Das Erzeugungsdatum konnte nicht gespeichert werden: %s\n"
 
-#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
+#: g10/app-openpgp.c:977
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "Lesen des Schl�ssels fehlgeschlagen: %s\n"
+
+#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+msgid "response does not contain the public key data\n"
+msgstr "Die Antwort enth�lt keine �ffentliche Schl�ssel-Daten\n"
+
+#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+msgid "response does not contain the RSA modulus\n"
+msgstr "Die Antwort enth�lt das RSA-Modulus nicht\n"
+
+#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+msgid "response does not contain the RSA public exponent\n"
+msgstr "Antwort enth�lt den �ffentlichen RSA-Exponenten nicht\n"
+
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-Callback meldete Fehler: %s\n"
 
-#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN f�r CHV%d ist zu kurz; die Mindestl�nge betr�gt %d\n"
 
-#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
-#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
+#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
+#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Pr�fung des CHV%d fehlgeschlagen: %s\n"
 
-#: g10/app-openpgp.c:836
+#: g10/app-openpgp.c:1310
 msgid "access to admin commands is not configured\n"
 msgstr "Zugriff auf Admin-Befehle ist nicht eingerichtet\n"
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
 msgid "error retrieving CHV status from card\n"
 msgstr "Fehler beim Holen des CHV-Status' von der Karte\n"
 
-#: g10/app-openpgp.c:857
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
 msgid "card is permanently locked!\n"
 msgstr "Karte ist dauerhaft gesperrt!\n"
 
-#: g10/app-openpgp.c:862
+#: g10/app-openpgp.c:1336
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "Noch %d Admin-PIN-Versuche, bis die Karte dauerhaft geperrt ist\n"
@@ -171,336 +188,342 @@ msgstr "Noch %d Admin-PIN-Versuche, bis die Karte dauerhaft geperrt ist\n"
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:869
+#: g10/app-openpgp.c:1343
 msgid "|A|Admin PIN"
 msgstr "|A|Admin-PIN"
 
-#: g10/app-openpgp.c:1018
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:1492
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Neue Admin-PIN"
 
-#: g10/app-openpgp.c:1018
+#: g10/app-openpgp.c:1492
 msgid "|N|New PIN"
 msgstr "|N|Neue PIN"
 
-#: g10/app-openpgp.c:1022
+#: g10/app-openpgp.c:1496
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "Fehler beim Abfragen einer neuen PIN: %s\n"
 
-#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
+#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
 msgid "error reading application data\n"
 msgstr "Fehler beim Lesen der Anwendungsdaten\n"
 
-#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
+#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
 msgid "error reading fingerprint DO\n"
 msgstr "Fehler beim Lesen des Fingerabdrucks DO\n"
 
-#: g10/app-openpgp.c:1104
+#: g10/app-openpgp.c:1562
 msgid "key already exists\n"
 msgstr "Shl�ssel existiert bereits\n"
 
-#: g10/app-openpgp.c:1108
+#: g10/app-openpgp.c:1566
 msgid "existing key will be replaced\n"
 msgstr "Existierender Schl�ssel wird ersetzt werden\n"
 
-#: g10/app-openpgp.c:1110
+#: g10/app-openpgp.c:1568
 msgid "generating new key\n"
 msgstr "neue Schl�ssel werden erzeugt\n"
 
-#: g10/app-openpgp.c:1120
+#: g10/app-openpgp.c:1735
+msgid "creation timestamp missing\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1742
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1749
+#, fuzzy, c-format
+msgid "RSA public exponent missing or largerr than %d bits\n"
+msgstr "der �ffentliche Exponent ist zu gro� (mehr als 32 Bit)\n"
+
+#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1827
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "Speichern des Schl�ssels fehlgeschlagen: %s\n"
+
+#: g10/app-openpgp.c:1886
 msgid "please wait while key is being generated ...\n"
 msgstr "Bitte warten, der Schl�ssel wird erzeugt ...\n"
 
-#: g10/app-openpgp.c:1135
+#: g10/app-openpgp.c:1901
 msgid "generating key failed\n"
 msgstr "Schl�sselerzeugung fehlgeschlagen\n"
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1904
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Schl�sselerzeugung abgeschlossen (%d Sekunden)\n"
 
-#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
-msgid "response does not contain the public key data\n"
-msgstr "Die Antwort enth�lt keine �ffentliche Schl�ssel-Daten\n"
-
-#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
-msgid "response does not contain the RSA modulus\n"
-msgstr "Die Antwort enth�lt das RSA-Modulus nicht\n"
-
-#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
-msgid "response does not contain the RSA public exponent\n"
-msgstr "Antwort enth�lt den �ffentlichen RSA-Exponenten nicht\n"
-
-#: g10/app-openpgp.c:1195
+#: g10/app-openpgp.c:1961
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "Ung�ltige Struktur der OpenPGP-Karte (DO 0x93)}\n"
 
-#: g10/app-openpgp.c:1356
+#: g10/app-openpgp.c:2130
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1364
+#: g10/app-openpgp.c:2138
 #, c-format
-msgid "PIN [sigs done: %lu]"
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
+#: g10/app-openpgp.c:2399
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Kann auf %s nicht zugreifen - ung�ltige OpenPGP-Karte?\n"
 
-#: g10/app-openpgp.c:1731
-#, c-format
-msgid "error getting serial number: %s\n"
-msgstr "Fehler beim Holen der Seriennummer: %s\n"
-
-#: g10/app-openpgp.c:1826
-#, c-format
-msgid "failed to store the key: %s\n"
-msgstr "Speichern des Schl�ssels fehlgeschlagen: %s\n"
-
-#: g10/app-openpgp.c:1868
-msgid "reading the key failed\n"
-msgstr "Lesen des Schl�ssels fehlgeschlagen: %s\n"
-
-#: g10/armor.c:317
+#: g10/armor.c:318
 #, c-format
 msgid "armor: %s\n"
 msgstr "ASCII-H�lle: %s\n"
 
-#: g10/armor.c:346
+#: g10/armor.c:347
 msgid "invalid armor header: "
 msgstr "Ung�ltige ASCII-H�lle"
 
-#: g10/armor.c:353
+#: g10/armor.c:354
 msgid "armor header: "
 msgstr "ASCII-H�lle: "
 
-#: g10/armor.c:364
+#: g10/armor.c:365
 msgid "invalid clearsig header\n"
 msgstr "Ung�ltige Klartextsignatur-Einleitung\n"
 
-#: g10/armor.c:416
+#: g10/armor.c:417
 msgid "nested clear text signatures\n"
 msgstr "verschachtelte Klartextunterschriften\n"
 
-#: g10/armor.c:551
+#: g10/armor.c:552
 msgid "unexpected armor: "
 msgstr "Unerwartete ASCII-H�lle: "
 
-#: g10/armor.c:563
+#: g10/armor.c:564
 msgid "invalid dash escaped line: "
 msgstr "Ung�ltige mit Bindestrich \"escapte\" Zeile: "
 
-#: g10/armor.c:715 g10/armor.c:1322
+#: g10/armor.c:716 g10/armor.c:1323
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "Ung�ltiges \"radix64\" Zeichen %02x ignoriert\n"
 
-#: g10/armor.c:758
+#: g10/armor.c:759
 msgid "premature eof (no CRC)\n"
 msgstr "vorzeitiges Dateiende (keine Pr�fsumme)\n"
 
-#: g10/armor.c:792
+#: g10/armor.c:793
 msgid "premature eof (in CRC)\n"
 msgstr "vorzeitiges Dateiende (innerhalb der Pr�fsumme)\n"
 
-#: g10/armor.c:800
+#: g10/armor.c:801
 msgid "malformed CRC\n"
 msgstr "Falsch aufgebaute Pr�fsumme\n"
 
-#: g10/armor.c:804 g10/armor.c:1359
+#: g10/armor.c:805 g10/armor.c:1360
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Pr�fsummenfehler; %06lx - %06lx\n"
 
-#: g10/armor.c:824
+#: g10/armor.c:825
 msgid "premature eof (in trailer)\n"
 msgstr "vorzeitiges Dateiende (im Nachsatz)\n"
 
-#: g10/armor.c:828
+#: g10/armor.c:829
 msgid "error in trailer line\n"
 msgstr "Fehler in der Nachsatzzeile\n"
 
-#: g10/armor.c:1137
+#: g10/armor.c:1138
 msgid "no valid OpenPGP data found.\n"
 msgstr "Keine g�ltigen OpenPGP-Daten gefunden.\n"
 
-#: g10/armor.c:1142
+#: g10/armor.c:1143
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ung�ltige ASCII-H�lle: Zeile ist l�nger als %d Zeichen\n"
 
-#: g10/armor.c:1146
+#: g10/armor.c:1147
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "\"quoted printable\" Zeichen in der ASCII-H�lle gefunden - m�glicherweise\n"
 " war ein fehlerhafter E-Mail-Transporter(\"MTA\") die Ursache\n"
 
-#: g10/card-util.c:58 g10/card-util.c:295
+#: g10/card-util.c:63 g10/card-util.c:303
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP Karte ist nicht vorhanden: %s\n"
 
-#: g10/card-util.c:63
+#: g10/card-util.c:68
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP Karte Nr. %s erkannt\n"
 
-#: g10/card-util.c:70 g10/card-util.c:1329 g10/delkey.c:127 g10/keyedit.c:1430
-#: g10/keygen.c:2439 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1510
+#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
 msgid "can't do this in batch mode\n"
 msgstr "Dies kann im Batchmodus nicht durchgef�hrt werden.\n"
 
-#: g10/card-util.c:97 g10/card-util.c:1108 g10/card-util.c:1191
-#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
-#: g10/keygen.c:1365
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
+#: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "Ihre Auswahl? "
 
-#: g10/card-util.c:206 g10/card-util.c:256
+#: g10/card-util.c:213 g10/card-util.c:263
 msgid "[not set]"
 msgstr "[nicht gesetzt]"
 
-#: g10/card-util.c:391
+#: g10/card-util.c:410
 msgid "male"
 msgstr "m�nnlich"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 msgid "female"
 msgstr "weiblich"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 msgid "unspecified"
 msgstr "unbestimmt"
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 msgid "not forced"
 msgstr "nicht zwingend"
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 msgid "forced"
 msgstr "zwingend"
 
-#: g10/card-util.c:497
+#: g10/card-util.c:516
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Fehler: Nur reines ASCII ist derzeit erlaubt.\n"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:518
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Fehler: Das Zeichen \"<\" kann nicht benutzt werden.\n"
 
-#: g10/card-util.c:501
+#: g10/card-util.c:520
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Fehler: Doppelte Leerzeichen sind nicht erlaubt.\n"
 
-#: g10/card-util.c:518
+#: g10/card-util.c:537
 msgid "Cardholder's surname: "
 msgstr "Familienname des Kartenbesitzers:"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:539
 msgid "Cardholder's given name: "
 msgstr "Vorname des Kartenbesitzers:"
 
-#: g10/card-util.c:538
+#: g10/card-util.c:557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 "Fehler: Der zusammengesetzte Name ist zu lang (Grenze betr�gt %d Zeichen).\n"
 
-#: g10/card-util.c:559
+#: g10/card-util.c:578
 msgid "URL to retrieve public key: "
 msgstr "URL um den �ffentlichen Schl�ssel zu holen: "
 
-#: g10/card-util.c:567
+#: g10/card-util.c:586
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Fehler: URL ist zu lang (Grenze betr�gt %d Zeichen).\n"
 
-#: g10/card-util.c:665 g10/card-util.c:734 g10/import.c:261
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Fehler beim Lesen von `%s': %s\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:692
 msgid "Login data (account name): "
 msgstr "Logindaten (Kontenname): "
 
-#: g10/card-util.c:683
+#: g10/card-util.c:702
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Fehler: Logindaten sind zu lang (Grenze betr�gt %d Zeichen).\n"
 
-#: g10/card-util.c:742
+#: g10/card-util.c:761
 msgid "Private DO data: "
 msgstr "Geheime DO-Daten: "
 
-#: g10/card-util.c:752
+#: g10/card-util.c:771
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Fehler: Geheime DO-Daten sind zu lang (Grenze betr�gt %d Zeichen).\n"
 
-#: g10/card-util.c:772
+#: g10/card-util.c:791
 msgid "Language preferences: "
 msgstr "Spracheinstellungen"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:799
 msgid "Error: invalid length of preference string.\n"
 msgstr "Fehler: Ung�ltige L�nge der Einstellungs-Zeichenfolge.\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:808
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Fehler: Ung�ltige Zeichen in der Einstellungs-Zeichenfolge\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:829
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Geschlecht: (M�nnlich (M), Weiblich (F) oder Leerzeichen): "
 
-#: g10/card-util.c:824
+#: g10/card-util.c:843
 msgid "Error: invalid response.\n"
 msgstr "Fehler: ung�ltige Antwort.\n"
 
-#: g10/card-util.c:845
+#: g10/card-util.c:864
 msgid "CA fingerprint: "
 msgstr "CA-Fingerabdruck: "
 
-#: g10/card-util.c:868
+#: g10/card-util.c:887
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Fehler: ung�ltig geformter Fingerabdruck.\n"
 
-#: g10/card-util.c:916
+#: g10/card-util.c:935
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Schl�sseloperation nicht m�glich: %s\n"
 
-#: g10/card-util.c:917
+#: g10/card-util.c:936
 msgid "not an OpenPGP card"
 msgstr "Keine g�ltige OpenPGP-Karte"
 
-#: g10/card-util.c:926
+#: g10/card-util.c:945
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "Fehler beim Holen der aktuellen Schl�sselinfo: %s\n"
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1030
 msgid "Replace existing key? (y/N) "
 msgstr "Vorhandenen Schl�ssel ersetzen? (j/N) "
 
-#: g10/card-util.c:1030 g10/card-util.c:1039
+#: g10/card-util.c:1051 g10/card-util.c:1060
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 "Sicherung des Verschl�sselungsschl�ssel ausserhalb der Karte erstellen? (J/"
 "n) "
 
-#: g10/card-util.c:1051
+#: g10/card-util.c:1072
 msgid "Replace existing keys? (y/N) "
 msgstr "Vorhandene Schl�ssel ersetzen? (j/N) "
 
-#: g10/card-util.c:1060
+#: g10/card-util.c:1081
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -511,126 +534,130 @@ msgstr ""
 "   PIN = `%s'     Admin-PIN = `%s'\n"
 "Sie sollten sie mittels des Kommandos --change-pin �ndern\n"
 
-#: g10/card-util.c:1099
+#: g10/card-util.c:1120
 msgid "Please select the type of key to generate:\n"
 msgstr "Bitte w�hlen Sie die Art des Schl�ssel, der erzeugt werden soll:\n"
 
-#: g10/card-util.c:1101 g10/card-util.c:1182
+#: g10/card-util.c:1122 g10/card-util.c:1203
 msgid "   (1) Signature key\n"
 msgstr "   (1) Unterschriften-Schl�ssel\n"
 
-#: g10/card-util.c:1102 g10/card-util.c:1184
+#: g10/card-util.c:1123 g10/card-util.c:1205
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Verschl�sselungs-Schl�ssel\n"
 
-#: g10/card-util.c:1103 g10/card-util.c:1186
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Authentisierungs-Schl�ssel\n"
 
-#: g10/card-util.c:1119 g10/card-util.c:1202 g10/keyedit.c:908
-#: g10/keygen.c:1404 g10/revoke.c:642
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
+#: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "Ung�ltige Auswahl.\n"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1200
 msgid "Please select where to store the key:\n"
 msgstr "W�hlen Sie den Speicherort f�r den Schl�ssel:\n"
 
-#: g10/card-util.c:1214
+#: g10/card-util.c:1235
 msgid "unknown key protection algorithm\n"
 msgstr "Unbekanntes Schl�ssel-Schutzverfahren\n"
 
-#: g10/card-util.c:1219
+#: g10/card-util.c:1240
 msgid "secret parts of key are not available\n"
 msgstr "Geheime Teile des Schl�ssels sind nicht vorhanden\n"
 
-#: g10/card-util.c:1224
+#: g10/card-util.c:1245
 msgid "secret key already stored on a card\n"
 msgstr "geheimer Schl�ssel ist bereits auf einer Karte gepeichert\n"
 
-#: g10/card-util.c:1294 g10/keyedit.c:1317
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "Men� verlassen"
 
-#: g10/card-util.c:1296
+#: g10/card-util.c:1318
 msgid "show admin commands"
 msgstr "Zeige Admin-Kommandos"
 
-#: g10/card-util.c:1297 g10/keyedit.c:1320
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "Diese Hilfe zeigen"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1321
 msgid "list all available data"
 msgstr "Alle vorhandenen Daten auflisten"
 
-#: g10/card-util.c:1302
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr "Kartenbesitzernamen �ndern"
 
-#: g10/card-util.c:1303
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr "Schl�ssel-holen-URL �ndern"
 
-#: g10/card-util.c:1304
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr "Holen des Schl�ssels mittels der URL auf der Karte"
 
-#: g10/card-util.c:1305
+#: g10/card-util.c:1327
 msgid "change the login name"
 msgstr "�ndern der Logindaten"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1328
 msgid "change the language preferences"
 msgstr "�ndern der Spracheinstellungen"
 
-#: g10/card-util.c:1307
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr "�ndern des Geschlechts des Kartenbesitzers"
 
-#: g10/card-util.c:1308
+#: g10/card-util.c:1330
 msgid "change a CA fingerprint"
 msgstr "�ndern des CA-Fingerabdrucks"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr "Umschalte des \"Signature-force-PIN\"-Schalters"
 
-#: g10/card-util.c:1310
+#: g10/card-util.c:1332
 msgid "generate new keys"
 msgstr "neue Schl�ssel erzeugen"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr "Men� f�r �ndern oder Entsperren der PIN"
 
-#: g10/card-util.c:1377 g10/keyedit.c:1526
+#: g10/card-util.c:1334
+msgid "verify the PIN and list all data"
+msgstr ""
+
+#: g10/card-util.c:1454 g10/keyedit.c:1609
 msgid "Command> "
 msgstr "Befehl> "
 
-#: g10/card-util.c:1412
+#: g10/card-util.c:1492
 msgid "Admin-only command\n"
 msgstr "nur-Admin Befehl\n"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1523
 msgid "Admin commands are allowed\n"
 msgstr "Admin-Befehle sind erlaubt\n"
 
-#: g10/card-util.c:1430
+#: g10/card-util.c:1525
 msgid "Admin commands are not allowed\n"
 msgstr "Admin-Befehle sind nicht erlaubt\n"
 
-#: g10/card-util.c:1499 g10/keyedit.c:2104
+#: g10/card-util.c:1599 g10/keyedit.c:2210
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ung�ltiger Befehl (versuchen Sie's mal mit \"help\")\n"
 
-#: g10/cardglue.c:287
+#: g10/cardglue.c:396
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 "Legen Sie die Karte ein und dr�cken Sie 'Eingabe'; dr�cken Sie 'c' um "
 "abzubrechen: "
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:519
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -640,139 +667,139 @@ msgstr ""
 "Seriennummer ein:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:380
+#: g10/cardglue.c:527
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 "Dr�cken Sie 'Eingabe' wenn fertig; oder dr�cken Sie 'c' um abzubrechen: "
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:852
 msgid "Enter New Admin PIN: "
 msgstr "Geben Sie die neue Admin-PIN ein: "
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:853
 msgid "Enter New PIN: "
 msgstr "Geben Sie die neue PIN ein: "
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:854
 msgid "Enter Admin PIN: "
 msgstr "Geben Sie die Admin-PIN ein: "
 
-#: g10/cardglue.c:691
+#: g10/cardglue.c:855
 msgid "Enter PIN: "
 msgstr "Geben Sie die PIN ein: "
 
-#: g10/cardglue.c:705
+#: g10/cardglue.c:872
 msgid "Repeat this PIN: "
 msgstr "Geben Sie die PIN nochmal ein: "
 
-#: g10/cardglue.c:719
+#: g10/cardglue.c:886
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN wurde nicht richtig wiederholt; noch einmal versuchen"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
-#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "'%s' kann nicht ge�ffnet werden\n"
 
-#: g10/decrypt.c:104 g10/encode.c:859
+#: g10/decrypt.c:105 g10/encode.c:846
 msgid "--output doesn't work for this command\n"
 msgstr "--output funktioniert nicht bei diesem Kommando\n"
 
-#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3167 g10/keyserver.c:1511
-#: g10/revoke.c:226
+#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3346 g10/keyserver.c:1541
+#: g10/revoke.c:227
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "Schl�ssel \"%s\" nicht gefunden: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2300 g10/keyserver.c:1525
-#: g10/revoke.c:232 g10/revoke.c:439
+#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "Fehler beim Lesen des Schl�sselblocks: %s\n"
 
-#: g10/delkey.c:128 g10/delkey.c:135
+#: g10/delkey.c:129 g10/delkey.c:136
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(es sei denn, Sie geben den Schl�ssel mittels Fingerprint an)\n"
 
-#: g10/delkey.c:134
+#: g10/delkey.c:135
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "dies kann im Batchmodus ohne \"--yes\" nicht durchgef�hrt werden\n"
 
-#: g10/delkey.c:146
+#: g10/delkey.c:147
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Diesen Schl�ssel aus dem Schl�sselbund l�schen? (j/N) "
 
-#: g10/delkey.c:154
+#: g10/delkey.c:155
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Dies ist ein privater Schl�ssel! - Wirklich l�schen? (j/N) "
 
-#: g10/delkey.c:164
+#: g10/delkey.c:165
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "l�schen des Schl�sselblocks fehlgeschlagen: %s\n"
 
-#: g10/delkey.c:174
+#: g10/delkey.c:175
 msgid "ownertrust information cleared\n"
 msgstr "Der \"Ownertrust\" wurde gel�scht\n"
 
-#: g10/delkey.c:205
+#: g10/delkey.c:206
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr ""
 "Es gibt einen privaten Schl�ssel zu diesem �ffentlichen Schl�ssel \"%s\"!\n"
 
-#: g10/delkey.c:207
+#: g10/delkey.c:208
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 "Verwenden Sie zun�chst das Kommando \"--delete-secret-key\", um ihn zu "
 "entfernen.\n"
 
-#: g10/encode.c:210 g10/sign.c:1186
+#: g10/encode.c:211 g10/sign.c:1218
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "Fehler beim Erzeugen der Passphrase: %s\n"
 
-#: g10/encode.c:215
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 "Aufgrund des S2K-Modus kann ein symmetrisches ESK Packet nicht benutzt "
 "werden\n"
 
-#: g10/encode.c:228
+#: g10/encode.c:229
 #, c-format
 msgid "using cipher %s\n"
 msgstr "benutze Cipher %s\n"
 
-#: g10/encode.c:238 g10/encode.c:558
+#: g10/encode.c:239 g10/encode.c:545
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' ist bereits komprimiert\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
+#: g10/encode.c:302 g10/encode.c:591 g10/sign.c:566
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "WARNUNG: '%s' ist eine leere Datei.\n"
 
-#: g10/encode.c:472
+#: g10/encode.c:466
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus kann nur f�r RSA-Schl�ssel mit maximal 2048 Bit "
 "verschl�sselt werden\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:488
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "Lesen von '%s'\n"
 
-#: g10/encode.c:530
+#: g10/encode.c:517
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "Die IDEA-Verschl�sselung kann nicht mit allen Zielschl�sseln verwendet "
 "werden.\n"
 
-#: g10/encode.c:540
+#: g10/encode.c:527
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -780,7 +807,7 @@ msgstr ""
 "WARNUNG: Erzwungene Verwendung des symmetrischen Verschl�sselungsverfahren %"
 "s (%d) verletzt die Empf�ngervoreinstellungen\n"
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:635 g10/sign.c:899
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -789,129 +816,129 @@ msgstr ""
 "WARNUNG: Erzwungenes Kompressionsverfahren %s (%d) verletzt die "
 "Empf�ngervoreinstellungen.\n"
 
-#: g10/encode.c:735
+#: g10/encode.c:722
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "Erzwungene Verwendung des symmetrischen Verschl�sselungsverfahren %s (%d) "
 "verletzt die Empf�ngervoreinstellungen\n"
 
-#: g10/encode.c:805 g10/pkclist.c:721 g10/pkclist.c:757
+#: g10/encode.c:792 g10/pkclist.c:722 g10/pkclist.c:758
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/encode.c:832
+#: g10/encode.c:819
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s verschl�sselt f�r: %s\n"
 
-#: g10/encr-data.c:66 g10/mainproc.c:301
+#: g10/encr-data.c:67 g10/mainproc.c:302
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s verschl�sselte Daten\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:305
+#: g10/encr-data.c:69 g10/mainproc.c:306
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "Mit unbekanntem Verfahren verschl�sselt %d\n"
 
-#: g10/encr-data.c:92
+#: g10/encr-data.c:93
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "Warnung: Botschaft wurde mit einem unsicheren Schl�ssel verschl�sselt.\n"
 
-#: g10/encr-data.c:103
+#: g10/encr-data.c:104
 msgid "problem handling encrypted packet\n"
 msgstr "Problem beim Bearbeiten des verschl�sselten Pakets\n"
 
-#: g10/exec.c:48
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "Ausf�hren von externen Programmen wird nicht unterst�tzt\n"
 
-#: g10/exec.c:184 g10/openfile.c:406
+#: g10/exec.c:173 g10/openfile.c:410
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "Verzeichnis `%s' kann nicht erzeugt werden: %s\n"
 
-#: g10/exec.c:325
+#: g10/exec.c:314
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "Ausf�hren von externen Programmen ist ausgeschaltet, da die Dateirechte "
 "nicht sicher sind\n"
 
-#: g10/exec.c:355
+#: g10/exec.c:344
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "Diese Plattform ben�tigt tempor�re Dateien zur Ausf�hrung von externen\n"
 "Programmen\n"
 
-#: g10/exec.c:433
+#: g10/exec.c:422
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "Ausf�hren des Programms `%s' nicht m�glich: %s\n"
 
-#: g10/exec.c:436
+#: g10/exec.c:425
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "Ausf�hren der Shell `%s' nicht m�glich: %s\n"
 
-#: g10/exec.c:521
+#: g10/exec.c:510
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "Fehler beim Aufruf eines externen Programms: %s\n"
 
-#: g10/exec.c:532 g10/exec.c:598
+#: g10/exec.c:521 g10/exec.c:587
 msgid "unnatural exit of external program\n"
 msgstr "ungew�hnliches Ende eines externen Programms\n"
 
-#: g10/exec.c:547
+#: g10/exec.c:536
 msgid "unable to execute external program\n"
 msgstr "Externes Programm konnte nicht aufgerufen werden\n"
 
-#: g10/exec.c:563
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "Die Ausgabe des externen Programms konnte nicht gelesen werden: %s\n"
 
-#: g10/exec.c:609 g10/exec.c:616
+#: g10/exec.c:598 g10/exec.c:605
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr ""
 "WARNUNG: die tempor�re Datei (%s) `%s' konnte nicht entfernt werden: %s\n"
 
-#: g10/exec.c:621
+#: g10/exec.c:610
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "WARNUNG: Tempor�res Verzeichnis `%s' kann nicht entfernt werden: %s\n"
 
-#: g10/export.c:183
+#: g10/export.c:184
 msgid "exporting secret keys not allowed\n"
 msgstr "Exportieren geheimer Schl�ssel ist nicht erlaubt\n"
 
-#: g10/export.c:212
+#: g10/export.c:213
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "Schl�ssel %s: ungesch�tzt - �bersprungen\n"
 
-#: g10/export.c:220
+#: g10/export.c:221
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "Schl�ssel %s: PGP 2.x-artiger Schl�ssel - �bersprungen\n"
 
 # translated by wk
-#: g10/export.c:395
+#: g10/export.c:398
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "WARNUNG: Der geheime Schl�ssel %s hat keine einfache SK-Pr�fsumme\n"
 
-#: g10/export.c:427
+#: g10/export.c:430
 msgid "WARNING: nothing exported\n"
 msgstr "WARNUNG: Nichts exportiert\n"
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid ""
 "@Commands:\n"
 " "
@@ -919,127 +946,127 @@ msgstr ""
 "@Befehle:\n"
 " "
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "|[file]|make a signature"
 msgstr "|[Datei]|Eine Unterschrift erzeugen"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "|[file]|make a clear text signature"
 msgstr "|[Datei]|Eine Klartextunterschrift erzeugen"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "make a detached signature"
 msgstr "Eine abgetrennte Unterschrift erzeugen"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encrypt data"
 msgstr "Daten verschl�sseln"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "encryption only with symmetric cipher"
 msgstr "Daten symmetrisch verschl�sseln"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "decrypt data (default)"
 msgstr "Daten entschl�sseln (Voreinstellung)"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "verify a signature"
 msgstr "Signatur pr�fen"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys"
 msgstr "Liste der Schl�ssel"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and signatures"
 msgstr "Liste der Schl�ssel und ihrer Signaturen"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 msgid "list and check key signatures"
 msgstr "Signaturen der Schl�ssel auflisten und pr�fen"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "list keys and fingerprints"
 msgstr "Liste der Schl�ssel und ihrer \"Fingerabdr�cke\""
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "list secret keys"
 msgstr "Liste der geheimen Schl�ssel"
 
-#: g10/g10.c:379
+#: g10/g10.c:381
 msgid "generate a new key pair"
 msgstr "Ein neues Schl�sselpaar erzeugen"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the public keyring"
 msgstr "Schl�ssel aus dem �ff. Schl�sselbund entfernen"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "remove keys from the secret keyring"
 msgstr "Schl�ssel aus dem geh. Schl�sselbund entfernen"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign a key"
 msgstr "Schl�ssel signieren"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "sign a key locally"
 msgstr "Schl�ssel nur f�r diesen Rechner signieren"
 
-#: g10/g10.c:385
+#: g10/g10.c:387
 msgid "sign or edit a key"
 msgstr "Unterschreiben oder bearbeiten eines Schl."
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "generate a revocation certificate"
 msgstr "Ein Schl�sselwiderruf-Zertifikat erzeugen"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "export keys"
 msgstr "Schl�ssel exportieren"
 
-#: g10/g10.c:389
+#: g10/g10.c:391
 msgid "export keys to a key server"
 msgstr "Schl�ssel zu einem Schl�.server exportieren"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "import keys from a key server"
 msgstr "Schl�ssel von einem Schl�.server importieren"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "search for keys on a key server"
 msgstr "Schl�ssel auf einem Schl�.server suchen"
 
-#: g10/g10.c:394
+#: g10/g10.c:396
 msgid "update all keys from a keyserver"
 msgstr "alle Schl�ssel per Schl�.server aktualisieren"
 
-#: g10/g10.c:397
+#: g10/g10.c:399
 msgid "import/merge keys"
 msgstr "Schl�ssel importieren/kombinieren"
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "print the card status"
 msgstr "den Karten-Status ausgeben"
 
-#: g10/g10.c:401
+#: g10/g10.c:403
 msgid "change data on a card"
 msgstr "Daten auf einer Karte �ndern"
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "change a card's PIN"
 msgstr "PIN einer Karte �ndern"
 
-#: g10/g10.c:410
+#: g10/g10.c:412
 msgid "update the trust database"
 msgstr "�ndern der \"Trust\"-Datenbank"
 
-#: g10/g10.c:417
+#: g10/g10.c:419
 msgid "|algo [files]|print message digests"
 msgstr "|algo [Dateien]|Message-Digests f�r die Dateien ausgeben"
 
-#: g10/g10.c:421 g10/gpgv.c:66
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1049,51 +1076,51 @@ msgstr ""
 "Optionen:\n"
 " "
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "create ascii armored output"
 msgstr "Ausgabe mit ASCII-H�lle versehen"
 
-#: g10/g10.c:425
+#: g10/g10.c:427
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|Verschl�sseln f�r NAME"
 
-#: g10/g10.c:436
+#: g10/g10.c:438
 msgid "use this user-id to sign or decrypt"
 msgstr "Mit dieser User-ID signieren"
 
-#: g10/g10.c:437
+#: g10/g10.c:439
 msgid "|N|set compress level N (0 disables)"
 msgstr "Kompressionsstufe auf N setzen (0=keine)"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "use canonical text mode"
 msgstr "Textmodus benutzen"
 
-#: g10/g10.c:452
+#: g10/g10.c:458
 msgid "use as output file"
 msgstr "Als Ausgabedatei benutzen"
 
-#: g10/g10.c:454 g10/gpgv.c:68
+#: g10/g10.c:460 g10/gpgv.c:73
 msgid "verbose"
 msgstr "Detaillierte Informationen"
 
-#: g10/g10.c:465
+#: g10/g10.c:471
 msgid "do not make any changes"
 msgstr "Keine wirklichen �nderungen durchf�hren"
 
-#: g10/g10.c:466
+#: g10/g10.c:472
 msgid "prompt before overwriting"
 msgstr "vor �berschreiben nachfragen"
 
-#: g10/g10.c:507
+#: g10/g10.c:513
 msgid "use strict OpenPGP behavior"
 msgstr "OpenPGP-Verhalten strikt beachten"
 
-#: g10/g10.c:508
+#: g10/g10.c:514
 msgid "generate PGP 2.x compatible messages"
 msgstr "PGP 2.x-kompatibele Botschaften erzeugen"
 
-#: g10/g10.c:536
+#: g10/g10.c:542
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1102,7 +1129,7 @@ msgstr ""
 "(Auf der \"man\"-Seite ist eine vollst�ndige Liste aller Kommandos und "
 "Optionen)\n"
 
-#: g10/g10.c:539
+#: g10/g10.c:545
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1122,17 +1149,17 @@ msgstr ""
 " --list-keys [Namen]        Schl�ssel anzeigen\n"
 " --fingerprint [Namen]      \"Fingerabdr�cke\" anzeigen\n"
 
-#: g10/g10.c:720 g10/gpgv.c:93
+#: g10/g10.c:724 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Berichte �ber Programmfehler bitte in englisch an <[email protected]>.\n"
 "Sinn- oder Schreibfehler in den deutschen Texten bitte an <[email protected]>.\n"
 
-#: g10/g10.c:737
+#: g10/g10.c:741
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Aufruf: gpg [Optionen] [Dateien] (-h f�r Hilfe)"
 
-#: g10/g10.c:740
+#: g10/g10.c:744
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1142,7 +1169,7 @@ msgstr ""
 "Signieren, pr�fen, verschl�sseln, entschl�sseln.\n"
 "Die voreingestellte Operation ist abh�ngig von den Eingabedaten\n"
 
-#: g10/g10.c:751
+#: g10/g10.c:755
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1150,73 +1177,73 @@ msgstr ""
 "\n"
 "Unterst�tzte Verfahren:\n"
 
-#: g10/g10.c:754
+#: g10/g10.c:758
 msgid "Pubkey: "
 msgstr "�ff.Schl�ssel: "
 
-#: g10/g10.c:760 g10/keyedit.c:2141
+#: g10/g10.c:764 g10/keyedit.c:2248
 msgid "Cipher: "
 msgstr "Verschl�.: "
 
-#: g10/g10.c:766
+#: g10/g10.c:770
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:772 g10/keyedit.c:2187
+#: g10/g10.c:776 g10/keyedit.c:2294
 msgid "Compression: "
 msgstr "Komprimierung: "
 
-#: g10/g10.c:855
+#: g10/g10.c:859
 msgid "usage: gpg [options] "
 msgstr "Aufruf: gpg [Optionen] "
 
-#: g10/g10.c:1003
+#: g10/g10.c:1007
 msgid "conflicting commands\n"
 msgstr "Widerspr�chliche Befehle\n"
 
-#: g10/g10.c:1021
+#: g10/g10.c:1025
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "Kein '='-Zeichen in der Gruppendefinition gefunden `%s'\n"
 
-#: g10/g10.c:1218
+#: g10/g10.c:1222
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverh�ltnis des Home-Verzeichnis `%s'\n"
 
-#: g10/g10.c:1221
+#: g10/g10.c:1225
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverh�ltnis der Konfigurationsdatei `%s'\n"
 
-#: g10/g10.c:1224
+#: g10/g10.c:1228
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverh�ltnis auf die Erweiterung `%s'\n"
 
-#: g10/g10.c:1230
+#: g10/g10.c:1234
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte des Home-Verzeichnis `%s'\n"
 
-#: g10/g10.c:1233
+#: g10/g10.c:1237
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte der Konfigurationsdatei `%s'\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1240
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte auf die Erweiterung `%s'\n"
 
-#: g10/g10.c:1242
+#: g10/g10.c:1246
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "WARNUNG: Unsicheres Besitzverh�ltnis des umgebenden Verzeichnisses f�r Home-"
 "Verzeichnis `%s'\n"
 
-#: g10/g10.c:1245
+#: g10/g10.c:1249
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1224,20 +1251,20 @@ msgstr ""
 "WARNUNG: Unsicheres Besitzverh�ltnis des umgebenden Verzeichnisses der "
 "Konfigurationsdatei `%s'\n"
 
-#: g10/g10.c:1248
+#: g10/g10.c:1252
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "WARNUNG: Unsicheres Besitzverh�ltnis des umgebenden Verzeichnisses `%s'\n"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1258
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses des Home-"
 "Verzeichnisses `%s'\n"
 
-#: g10/g10.c:1257
+#: g10/g10.c:1261
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1245,382 +1272,392 @@ msgstr ""
 "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses der "
 "Konfigurationsdatei `%s'\n"
 
-#: g10/g10.c:1260
+#: g10/g10.c:1264
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses auf "
 "Erweiterung `%s'\n"
 
-#: g10/g10.c:1401
+#: g10/g10.c:1405
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "Unbekanntes Konfigurationselement `%s'\n"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1802
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n"
 
-#: g10/g10.c:1838
+#: g10/g10.c:1844
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: g10/g10.c:1842
+#: g10/g10.c:1848
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: g10/g10.c:1849
+#: g10/g10.c:1855
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "Hinweis: %s ist nicht f�r den �blichen Gebrauch gedacht!\n"
 
-#: g10/g10.c:2076
+#: g10/g10.c:2082
 #, 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/g10.c:2293
+#: g10/g10.c:2236 g10/g10.c:2248
+#, fuzzy, c-format
+msgid "`%s' is not a valid signature expiration\n"
+msgstr "`%s' ist kein g�ltiger Zeichensatz\n"
+
+#: g10/g10.c:2321
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' ist kein g�ltiger Zeichensatz\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3683
+#: g10/g10.c:2340 g10/keyedit.c:3862
 msgid "could not parse keyserver URL\n"
 msgstr "Schl�sselserver-URL konnte nicht analysiert werden\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2346
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ung�ltige Schl�sselserver-Option\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2349
 msgid "invalid keyserver options\n"
 msgstr "Ung�ltige Schl�sselserver-Option\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2356
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ung�ltige Import-Option\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2359
 msgid "invalid import options\n"
 msgstr "Ung�ltige Import-Option\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2366
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ung�ltige Export-Option.\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2369
 msgid "invalid export options\n"
 msgstr "Ung�ltige Export-Option\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2376
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ung�ltige Listen-Option.\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2379
 msgid "invalid list options\n"
 msgstr "Ung�ltige Listen-Option\n"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2401
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ung�ltige �berpr�funs-Option.\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2404
 msgid "invalid verify options\n"
 msgstr "Ung�ltige �berpr�fungs-Option\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2411
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "Der Ausf�hrungspfad konnte nicht auf %s gesetzt werden.\n"
 
-#: g10/g10.c:2573
+#: g10/g10.c:2602
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm k�nnte eine core-dump-Datei schreiben!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2606
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNUNG: %s ersetzt %s\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2615
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2618
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/g10.c:2603
+#: g10/g10.c:2625
+#, fuzzy, c-format
+msgid "NOTE: %s is not available in this version\n"
+msgstr "GPG-Agent ist in dieser Sitzung nicht vorhanden\n"
+
+#: g10/g10.c:2640
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
 
-#: g10/g10.c:2617
+#: g10/g10.c:2654
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus k�nnen Sie nur abgetrennte oder Klartextunterschriften "
 "machen\n"
 
-#: g10/g10.c:2623
+#: g10/g10.c:2660
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus k�nnen Sie nicht gleichzeitig unterschreiben und "
 "verschl�sseln\n"
 
-#: g10/g10.c:2629
+#: g10/g10.c:2666
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "Im --pgp2-Modus m�ssen Sie Dateien benutzen und k�nnen keine Pipes "
 "verwenden.\n"
 
-#: g10/g10.c:2642
+#: g10/g10.c:2679
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "Verschl�ssen einer Botschaft ben�tigt im --pgp2-Modus die IDEA-"
 "Verschl�sselung\n"
 
-#: g10/g10.c:2712 g10/g10.c:2736
+#: g10/g10.c:2746 g10/g10.c:2770
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgew�hlte Verschl�sselungsverfahren ist ung�ltig\n"
 
-#: g10/g10.c:2718 g10/g10.c:2742
+#: g10/g10.c:2752 g10/g10.c:2776
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
 
-#: g10/g10.c:2724
+#: g10/g10.c:2758
 msgid "selected compression algorithm is invalid\n"
 msgstr "Das ausgew�hlte Komprimierungsverfahren ist ung�ltig\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2764
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
 
-#: g10/g10.c:2745
+#: g10/g10.c:2779
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed m�ssen gr���er als 0 sein\n"
 
-#: g10/g10.c:2747
+#: g10/g10.c:2781
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed m�ssen gr���er als 1 sein\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2783
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth mu� im Bereich 1 bis 255 liegen\n"
 
-#: g10/g10.c:2751
+#: g10/g10.c:2785
 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/g10.c:2753
+#: g10/g10.c:2787
 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/g10.c:2756
+#: g10/g10.c:2790
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2794
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ung�ltiger \"simple S2K\"-Modus; Wert mu� 0, 1 oder 3 sein\n"
 
-#: g10/g10.c:2767
+#: g10/g10.c:2801
 msgid "invalid default preferences\n"
 msgstr "ung�ltige Standard Voreinstellungen\n"
 
-#: g10/g10.c:2776
+#: g10/g10.c:2810
 msgid "invalid personal cipher preferences\n"
 msgstr "ung�ltige private Verschl�sselungsvoreinstellungen\n"
 
-#: g10/g10.c:2780
+#: g10/g10.c:2814
 msgid "invalid personal digest preferences\n"
 msgstr "ung�ltige private Hashvoreinstellungen\n"
 
-#: g10/g10.c:2784
+#: g10/g10.c:2818
 msgid "invalid personal compress preferences\n"
 msgstr "ung�ltige private Komprimierungsvoreinstellungen\n"
 
-#: g10/g10.c:2817
+#: g10/g10.c:2851
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s arbeitet noch nicht mit %s zusammen\n"
 
-#: g10/g10.c:2864
+#: g10/g10.c:2898
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "Die Benutzung des Verschl�sselungsverfahren %s ist im %s-Modus nicht "
 "erlaubt.\n"
 
-#: g10/g10.c:2869
+#: g10/g10.c:2903
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "Die Benutzung der Hashmethode %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/g10.c:2874
+#: g10/g10.c:2908
 #, 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/g10.c:2970
+#: g10/g10.c:3004
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/g10.c:2981
+#: g10/g10.c:3015
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "WARNUNG: Empf�nger (-r) angegeben ohne Verwendung von Public-Key-Verfahren\n"
 
-#: g10/g10.c:2992
+#: g10/g10.c:3026
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/g10.c:2999
+#: g10/g10.c:3033
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3035
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Entschl�sselung fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3011
+#: g10/g10.c:3045
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/g10.c:3024
+#: g10/g10.c:3058
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [Dateiname]"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3060
 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/g10.c:3029
+#: g10/g10.c:3063
 #, 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/g10.c:3047
+#: g10/g10.c:3081
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3094
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/g10.c:3075
+#: g10/g10.c:3109
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [Dateiname]"
 
-#: g10/g10.c:3077
+#: g10/g10.c:3111
 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/g10.c:3080
+#: g10/g10.c:3114
 #, 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/g10.c:3100
+#: g10/g10.c:3134
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [Dateiname]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3143
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3168
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/g10.c:3142
+#: g10/g10.c:3176
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/g10.c:3146
+#: g10/g10.c:3180
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/g10.c:3167
+#: g10/g10.c:3201
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/g10.c:3238
+#: g10/g10.c:3272
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [User-ID] [Schl�sselbund]"
 
-#: g10/g10.c:3275
+#: g10/g10.c:3309
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Senden an Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3277
+#: g10/g10.c:3311
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Empfangen vom Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3313
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Schl�sselexport fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3290
+#: g10/g10.c:3324
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Suche auf dem Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3300
+#: g10/g10.c:3334
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh vom Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3341
+#: g10/g10.c:3375
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3349
+#: g10/g10.c:3383
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3436
+#: g10/g10.c:3470
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ung�ltiges Hashverfahren '%s'\n"
 
-#: g10/g10.c:3559
+#: g10/g10.c:3593
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3597
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/g10.c:3853
+#: g10/g10.c:3887
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1628,87 +1665,92 @@ msgstr ""
 "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
 "enthalten und mu� mit einem '=' enden\n"
 
-#: g10/g10.c:3861
+#: g10/g10.c:3895
 msgid "a user notation name must contain the '@' character\n"
 msgstr "Ein \"notation\"-Wert darf das '@'-Zeichen nicht verwenden\n"
 
-#: g10/g10.c:3871
+#: g10/g10.c:3900
+#, fuzzy
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr "Ein \"notation\"-Wert darf das '@'-Zeichen nicht verwenden\n"
+
+#: g10/g10.c:3911
 msgid "a notation value must not use any control characters\n"
 msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
 
-#: g10/g10.c:3905
+#: g10/g10.c:3945
 msgid "the given certification policy URL is invalid\n"
 msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ung�ltig\n"
 
-#: g10/g10.c:3907
+#: g10/g10.c:3947
 msgid "the given signature policy URL is invalid\n"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ung�ltig\n"
 
-#: g10/g10.c:3940
+#: g10/g10.c:3980
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ung�ltig\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "zu viele Eintr�ge im pk-Cache - abgeschaltet\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2750
+#: g10/getkey.c:187 g10/getkey.c:2757
 msgid "[User ID not found]"
 msgstr "[User-ID nicht gefunden]"
 
-#: g10/getkey.c:1677
+#: g10/getkey.c:1684
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Ung�ltiger Schl�ssel %s, g�ltig gemacht per --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2228
+#: g10/getkey.c:2235
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "Kein privater Unterschl�ssel zum �ffentlichen Unterschl�ssel %s - "
 "�bergangen\n"
 
-#: g10/getkey.c:2459
+#: g10/getkey.c:2466
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "der Zweitschl�ssel %s wird anstelle des Hauptschl�ssels %s verwendet\n"
 
-#: g10/getkey.c:2506
+#: g10/getkey.c:2513
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
 "Schl�ssel %08lX: geheimer Schl�ssel, aber ohne �ffentlichen Schl�ssel - "
 "�bersprungen\n"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:74
 msgid "be somewhat more quiet"
 msgstr "Etwas weniger Infos"
 
-#: g10/gpgv.c:70
+#: g10/gpgv.c:75
 msgid "take the keys from this keyring"
 msgstr "Schl�ssel aus diesem Schl�sselbund nehmen"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:77
 msgid "make timestamp conflicts only a warning"
 msgstr "differierende Zeitangaben sind kein Fehler"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:78
 msgid "|FD|write status info to this FD"
 msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
 
-#: g10/gpgv.c:97
+#: g10/gpgv.c:102
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Aufruf: gpg [Optionen] [Dateien] (-h f�r Hilfe)"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:105
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr "Aufruf: gpgv [Optionen] [Dateien] (-h Hilfe)\n"
 
-#: g10/helptext.c:48
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1719,7 +1761,7 @@ msgstr ""
 "um das \"Netz des Vertrauens\" aufzubauen.  Dieses hat nichts mit dem\n"
 "(implizit erzeugten) \"Netz der Zertifikate\" zu tun."
 
-#: g10/helptext.c:54
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1731,19 +1773,19 @@ msgstr ""
 "auf deren geheimen Schl�ssel Sie Zugruff haben.\n"
 "Antworten Sie mit \"yes\" um diesen Schl�ssel uneingeschr�nkt zu vertrauen\n"
 
-#: g10/helptext.c:61
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Wenn Sie diesen nicht vertrauensw�rdigen Schl�ssel trotzdem benutzen "
 "wollen,\n"
 "so antworten Sie mit \"ja\"."
 
-#: g10/helptext.c:65
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Geben Sie die User-ID dessen ein, dem Sie die Botschaft senden wollen."
 
-#: g10/helptext.c:69
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1757,7 +1799,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:83
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -1768,16 +1810,16 @@ msgstr ""
 "Anwendungsgebiten benutzt werden.  Bitte lassen Sie sich zuerst von \n"
 "einem Sicherheistexperten beraten."
 
-#: g10/helptext.c:90
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "W�hlen Sie die gew�nschte Schl�ssell�nge"
 
-#: g10/helptext.c:94 g10/helptext.c:99 g10/helptext.c:111 g10/helptext.c:143
-#: g10/helptext.c:171 g10/helptext.c:176 g10/helptext.c:181
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "Geben Sie \"ja\" oder \"nein\" ein"
 
-#: g10/helptext.c:104
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1789,21 +1831,21 @@ msgstr ""
 "erh�lt dann ggfs. keine brauchbaren Fehlermeldungen - stattdessen versucht\n"
 "der Rechner den Wert als Intervall (von-bis) zu deuten."
 
-#: g10/helptext.c:116
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "Geben Sie den Namen des Schl�sselinhabers ein"
 
-#: g10/helptext.c:121
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr ""
 "Geben Sie eine E-Mail-Adresse ein. Dies ist zwar nicht unbedingt notwendig,\n"
 "aber sehr empfehlenswert."
 
-#: g10/helptext.c:125
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "Geben Sie - bei Bedarf - einen Kommentar ein"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1817,12 +1859,12 @@ msgstr ""
 "F  um mit der Schl�sselerzeugung fortzusetzen.\n"
 "B  um die Schl�sselerzeugung abbrechen."
 
-#: g10/helptext.c:139
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr ""
 "Geben Sie \"ja\" (oder nur \"j\") ein, um den Unterschl�ssel zu erzeugen."
 
-#: g10/helptext.c:147
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -1897,11 +1939,11 @@ msgstr ""
 "\n"
 "Wenn Sie nicht wissen, wie Sie antworten sollen, w�hlen Sie \"0\"."
 
-#: g10/helptext.c:185
+#: g10/helptext.c:186
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Geben Sie \"ja\" (oder nur \"j\") ein, um alle User-IDs zu beglaubigen"
 
-#: g10/helptext.c:189
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -1909,12 +1951,12 @@ msgstr ""
 "Geben Sie \"ja\" (oder nur \"j\") ein, um diese User-ID zu L�SCHEN.\n"
 "Alle Zertifikate werden dann auch weg sein!"
 
-#: g10/helptext.c:194
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr ""
 "Geben Sie \"ja\" (oder nur \"j\") ein, um diesen Unterschl�ssel zu l�schen"
 
-#: g10/helptext.c:199
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -1926,7 +1968,7 @@ msgstr ""
 "Schl�ssel\n"
 "herzustellen."
 
-#: g10/helptext.c:204
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -1939,7 +1981,7 @@ msgstr ""
 "sie wissen, welcher Schl�ssel verwendet wurde. Denn vielleicht w�rde genau\n"
 "diese Beglaubigung den \"Trust\"-Weg kompletieren."
 
-#: g10/helptext.c:210
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -1947,7 +1989,7 @@ msgstr ""
 "Diese Beglaubigung ist ung�ltig. Es ist sinnvoll sie aus Ihrem\n"
 "Schl�sselbund zu entfernen."
 
-#: g10/helptext.c:214
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -1963,7 +2005,7 @@ msgstr ""
 "irgendeinem Grund nicht g�ltig ist und eine zweite Beglaubigung verf�gbar "
 "ist."
 
-#: g10/helptext.c:222
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -1974,27 +2016,27 @@ msgstr ""
 "betroffenen\n"
 "Eigenbeglaubigungen werden um eine Sekunde vorgestellt.\n"
 
-#: g10/helptext.c:229
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Bitte geben Sie die Passphrase ein. Dies ist ein geheimer Satz \n"
 
-#: g10/helptext.c:235
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "Um sicher zu gehen, da� Sie sich bei der Eingabe der Passphrase nicht\n"
 "vertippt haben, geben Sie diese bitte nochmal ein.  Nur wenn beide Eingaben\n"
 "�bereinstimmen, wird die Passphrase akzeptiert."
 
-#: g10/helptext.c:239
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr ""
 "Geben Sie den Namen der Datei an, zu dem die abgetrennte Unterschrift geh�rt"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Geben Sie \"ja\" ein, wenn Sie die Datei �berschreiben m�chten"
 
-#: g10/helptext.c:249
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2003,7 +2045,7 @@ msgstr ""
 "Eingabetaste bet�tigen, wird der (in Klammern angezeigte) Standarddateiname\n"
 "verwendet."
 
-#: g10/helptext.c:255
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2031,7 +2073,7 @@ msgstr ""
 "      Um bekanntzugeben, da� die User-ID nicht mehr benutzt werden soll.\n"
 "      So weist man normalerweise auf eine ung�ltige E-Mailadresse hin.\n"
 
-#: g10/helptext.c:271
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2041,488 +2083,493 @@ msgstr ""
 "Sie diesen Widerruf herausgeben.  Der Text sollte m�glichst knapp sein.\n"
 "Eine Leerzeile beendet die Eingabe.\n"
 
-#: g10/helptext.c:286
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "Keine Hilfe vorhanden."
 
-#: g10/helptext.c:294
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Keine Hilfe f�r '%s' vorhanden."
 
-#: g10/import.c:247
+#: g10/import.c:248
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "�berspringe den Block vom Typ %d\n"
 
-#: g10/import.c:256
+#: g10/import.c:257
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu Schl�ssel bislang bearbeitet\n"
 
-#: g10/import.c:273
+#: g10/import.c:274
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Anzahl insgesamt bearbeiteter Schl�ssel: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "              ignorierte neue Schl�ssel: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:279
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "                           ohne User-ID: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "              imported: %lu"
 msgstr "                             importiert: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:287
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                            unver�ndert: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "                          neue User-IDs: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "                    neue Unterschl�ssel: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                        neue Signaturen: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "                neue Schl�sselwiderrufe: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "             gelesene geheime Schl�ssel: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "           geheime Schl�ssel importiert: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "                 unver�nderte geh.Schl.: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "                       nicht importiert: %lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:544
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:545
+#: g10/import.c:546
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Sie haben folgende User-IDs beglaubigt:\n"
 
-#: g10/import.c:582
+#: g10/import.c:583
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:594
+#: g10/import.c:595
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s Unterschrift, Hashmethode \"%s\"\n"
 
-#: g10/import.c:606
+#: g10/import.c:607
 #, fuzzy, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "Das ausgew�hlte Komprimierungsverfahren ist ung�ltig\n"
 
-#: g10/import.c:619
+#: g10/import.c:620
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:646
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:694 g10/import.c:1048
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "Schl�ssel %s: Keine User-ID\n"
 
-#: g10/import.c:713
+#: g10/import.c:714
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "Schl�ssel %s: PKS Unterschl�sseldefekt repariert\n"
 
-#: g10/import.c:728
+#: g10/import.c:729
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "Schl�ssel %s: Nicht eigenbeglaubigte User-ID `%s' �bernommen\n"
 
-#: g10/import.c:734
+#: g10/import.c:735
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "Schl�ssel %08lX: Keine g�ltigen User-IDs\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 msgid "this may be caused by a missing self-signature\n"
 msgstr "dies k�nnte durch fehlende Eigenbeglaubigung verursacht worden sein\n"
 
-#: g10/import.c:746 g10/import.c:1168
+#: g10/import.c:747 g10/import.c:1169
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "Schl�ssel %08lX: �ffentlicher Schl�ssel nicht gefunden: %s\n"
 
-#: g10/import.c:752
+#: g10/import.c:753
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "Schl�ssel %08lX: neuer Schl�ssel - �bersprungen\n"
 
-#: g10/import.c:761
+#: g10/import.c:762
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "kein schreibbarer Schl�sselbund gefunden: %s\n"
 
-#: g10/import.c:766 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "Schreiben nach '%s'\n"
 
-#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
-#: g10/import.c:2314 g10/import.c:2336
+#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
+#: g10/import.c:2315 g10/import.c:2337
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des Schl�sselbundes `%s': %s\n"
 
-#: g10/import.c:791
+#: g10/import.c:792
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "Schl�ssel %08lX: �ffentlicher Schl�ssel \"%s\" importiert\n"
 
-#: g10/import.c:815
+#: g10/import.c:816
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "Schl�ssel %08lX: Stimmt nicht mit unserer Kopie �berein\n"
 
-#: g10/import.c:832 g10/import.c:1186
+#: g10/import.c:833 g10/import.c:1187
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr ""
 "Schl�ssel %08lX: der lokale originale Schl�sselblocks wurde nicht gefunden: %"
 "s\n"
 
-#: g10/import.c:840 g10/import.c:1193
+#: g10/import.c:841 g10/import.c:1194
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr ""
 "Schl�ssel %08lX: Lesefehler im lokalen originalen Schl�sselblocks: %s\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "Schl�ssel %08lX: \"%s\" 1 neue User-ID\n"
 
-#: g10/import.c:875
+#: g10/import.c:876
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "Schl�ssel %08lX: \"%s\" %d neue User-IDs\n"
 
-#: g10/import.c:878
+#: g10/import.c:879
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "Schl�ssel %08lX: \"%s\" 1 neue Signatur\n"
 
-#: g10/import.c:881
+#: g10/import.c:882
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "Schl�ssel %08lX: \"%s\" %d neue Signaturen\n"
 
-#: g10/import.c:884
+#: g10/import.c:885
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "Schl�ssel %08lX: \"%s\" 1 neuer Unterschl�ssel\n"
 
-#: g10/import.c:887
+#: g10/import.c:888
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "Schl�ssel %08lX: \"%s\" %d neue Unterschl�ssel\n"
 
-#: g10/import.c:908
+#: g10/import.c:909
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "Schl�ssel %08lX: \"%s\" Nicht ge�ndert\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1054
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "Schl�ssel %08lX: geheimer Schl�ssel mit ung�ltiger Verschl�sselung %d - "
 "�bersprungen\n"
 
-#: g10/import.c:1064
+#: g10/import.c:1065
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
 
-#: g10/import.c:1081 g10/import.c:2329
+#: g10/import.c:1082 g10/import.c:2330
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "Kein voreingestellter geheimer Schl�sselbund: %s\n"
 
-#: g10/import.c:1092
+#: g10/import.c:1093
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "Schl�ssel %08lX: Geheimer Schl�ssel importiert\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1122
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "Schl�ssel %08lX: Ist bereits im geheimen Schl�sselbund\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1132
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "Schl�ssel %08lX: geheimer Schl�ssel nicht gefunden: %s\n"
 
-#: g10/import.c:1161
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "Schl�ssel %08lX: Kein �ffentlicher Schl�ssel - der Schl�sselwiderruf kann "
 "nicht angebracht werden\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1205
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "Schl�ssel %08lX: Ung�ltiges Widerrufzertifikat: %s - zur�ckgewiesen\n"
 
-#: g10/import.c:1236
+#: g10/import.c:1237
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "Schl�ssel %08lX: \"%s\" Widerrufzertifikat importiert\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1302
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "Schl�ssel %08lX: Keine User-ID f�r Signatur\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1317
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "Schl�ssel %08lX: Nicht unterst�tztes Public-Key-Verfahren f�r User-ID \"%s"
 "\"\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "Schl�ssel %08lX: Ung�ltige Eigenbeglaubigung f�r User-ID \"%s\"\n"
 
-#: g10/import.c:1336
+#: g10/import.c:1337
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr ""
 "Schl�ssel %08lX: Kein Unterschl�ssel f�r die Unterschl�sselanbindungs-"
 "Beglaubigung\n"
 
-#: g10/import.c:1347 g10/import.c:1397
+#: g10/import.c:1348 g10/import.c:1398
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "Schl�ssel %08lX: Nicht unterst�tztes Public-Key-Verfahren\n"
 
-#: g10/import.c:1349
+#: g10/import.c:1350
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "Schl�ssel %08lX: Ung�ltige Unterschl�ssel-Anbindung\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1365
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "Schl�ssel %08lX: Ung�ltige Unterschl�ssel-Anbindung entfernt\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr ""
 "Schl�ssel %08lX: Kein Unterschl�ssel f�r die Unterschl�sselwiderruf-"
 "Beglaubigung\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "Schl�ssel %08lX: Ung�ltiger Unterschl�sselwiderruf\n"
 
-#: g10/import.c:1414
+#: g10/import.c:1415
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr ""
 "Schl�ssel %08lX: Mehrfacher Unterschl�ssel-Widerruf-Beglaubigung entfernt\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1457
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "Schl�ssel %08lX: User-ID �bergangen '"
 
-#: g10/import.c:1477
+#: g10/import.c:1478
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "Schl�ssel %08lX: Unterschl�ssel ignoriert\n"
 
-#: g10/import.c:1504
+#: g10/import.c:1505
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr ""
 "Schl�ssel %08lX: Nicht exportf�hige Unterschrift (Klasse %02x) - �bergangen\n"
 
-#: g10/import.c:1514
+#: g10/import.c:1515
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "Schl�ssel %08lX: Widerrufzertifikat an falschem Platz - �bergangen\n"
 
-#: g10/import.c:1531
+#: g10/import.c:1532
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "Schl�ssel %08lX: Ung�ltiges Widerrufzertifikat: %s - �bergangen\n"
 
-#: g10/import.c:1545
+#: g10/import.c:1546
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "Schl�ssel %08lX: Widerrufzertifikat an falschem Platz - �bergangen\n"
 
-#: g10/import.c:1553
+#: g10/import.c:1554
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 "Schl�ssel %08lX: unerwartete Unterschriftenklasse (0x%02x) - �bergangen\n"
 
-#: g10/import.c:1574
+#: g10/import.c:1575
 #, fuzzy, c-format
 msgid "key %s: expired signature from key %s - skipped\n"
 msgstr ""
 "Schl�ssel %08lX: unerwartete Unterschriftenklasse (0x%02x) - �bergangen\n"
 
-#: g10/import.c:1677
+#: g10/import.c:1678
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "Schl�ssel %08lX: Doppelte User-ID entdeckt - zusammengef�hrt\n"
 
-#: g10/import.c:1739
+#: g10/import.c:1740
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "WARNUNG: Schl�ssel %08lX ist u.U. widerrufen: hole Widerrufschl�ssel %08lX\n"
 
-#: g10/import.c:1753
+#: g10/import.c:1754
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "WARNUNG: Schl�ssel %08lX ist u.U. widerrufen: Widerrufschl�ssel %08lX ist "
 "nicht vorhanden\n"
 
-#: g10/import.c:1812
+#: g10/import.c:1813
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "Schl�ssel %08lX: \"%s\" Widerrufzertifikat hinzugef�gt\n"
 
-#: g10/import.c:1846
+#: g10/import.c:1847
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "Schl�ssel %08lX: \"direct-key\"-Signaturen hinzugef�gt\n"
 
-#: g10/import.c:2235
+#: g10/import.c:2236
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "�ffentliche Schl�ssel pa�t nicht zum geheimen Schl�ssel!\n"
 
-#: g10/import.c:2243
+#: g10/import.c:2244
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "�bersprungen: geheimer Schl�ssel bereits vorhanden\n"
 
-#: g10/import.c:2245
+#: g10/import.c:2246
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "�bersprungen: geheimer Schl�ssel bereits vorhanden\n"
 
-#: g10/keydb.c:167
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "Fehler beim Erzeugen des Schl�sselbundes `%s': %s\n"
 
-#: g10/keydb.c:174
+#: g10/keydb.c:175
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "Schl�sselbund `%s' erstellt\n"
 
-#: g10/keydb.c:685
+#: g10/keydb.c:316 g10/keydb.c:319
+#, fuzzy, c-format
+msgid "keyblock resource `%s': %s\n"
+msgstr "Fehler beim Erstellen von `%s': %s\n"
+
+#: g10/keydb.c:698
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "Schl�sselbund-Cache konnte nicht neu erzeugt werden: %s\n"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[Widerruf]"
 
-#: g10/keyedit.c:255
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[Eigenbeglaubigung]"
 
-#: g10/keyedit.c:333 g10/keylist.c:405
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 falsche Beglaubigung\n"
 
-#: g10/keyedit.c:335 g10/keylist.c:407
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d falsche Beglaubigungen\n"
 
-#: g10/keyedit.c:337 g10/keylist.c:409
+#: g10/keyedit.c:344 g10/keylist.c:410
 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:339 g10/keylist.c:411
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, 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:341 g10/keylist.c:413
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 Beglaubigung aufgrund von Fehler nicht gepr�ft\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:415
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d Beglaubigungen aufgrund von Fehlern nicht gepr�ft\n"
 
-#: g10/keyedit.c:345
+#: g10/keyedit.c:352
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Eine User-ID ohne g�ltige Eigenbeglaubigung entdeckt\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:354
 #, 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:403 g10/pkclist.c:262
+#: g10/keyedit.c:410 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2536,17 +2583,17 @@ msgstr ""
 "unterschiedlichen Quellen ...)?\n"
 "\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:274
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Ich vertraue ihm marginal\n"
 
-#: g10/keyedit.c:408 g10/pkclist.c:276
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Ich vertraue ihm vollst�ndig\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:434
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2556,38 +2603,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:443
+#: g10/keyedit.c:450
 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:585
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "User-ID \"%s\" ist widerrufen."
 
-#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
-#: g10/keyedit.c:858 g10/keyedit.c:1642
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1728
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Wollen Sie ihn immmer noch beglaubigen? (j/N) "
 
-#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
-#: g10/keyedit.c:1648
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
+#: g10/keyedit.c:1734
 msgid "  Unable to sign.\n"
 msgstr "  Beglaubigen ist nicht m�glich.\n"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "User-ID \"%s\" ist abgelaufen."
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:650
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "User-ID \"%s\" ist nicht eigenbeglaubigt."
 
-#: g10/keyedit.c:676
+#: g10/keyedit.c:678
+#, fuzzy, c-format
+msgid "User ID \"%s\" is signable.  "
+msgstr "User-ID \"%s\" ist nicht eigenbeglaubigt."
+
+#: g10/keyedit.c:680
+#, fuzzy
+msgid "Sign it? (y/N) "
+msgstr "Wirklich unterschreiben? (j/N) "
+
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2596,11 +2653,11 @@ msgstr ""
 "Die Eigenbeglaubigung von \"%s\"\n"
 "ist eine PGP 2.x artige Signatur.\n"
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:711
 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:699
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2609,13 +2666,13 @@ msgstr ""
 "Ihre derzeitige Beglaubigung von \"%s\"\n"
 "ist abgelaufen.\n"
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:729
 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:724
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2624,44 +2681,44 @@ msgstr ""
 "Die derzeitige Beglaubigung von \"%s\"\n"
 "ist nur f�r diesen Rechner g�ltig.\n"
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:754
 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:749
+#: g10/keyedit.c:775
 #, 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:752
+#: g10/keyedit.c:778
 #, 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:757
+#: g10/keyedit.c:783
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Wollen Sie ihn immmer noch wieder beglaubigen? (j/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:805
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nichts zu beglaubigen f�r Schl�ssel %08lX\n"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "Dieser Schl�ssel ist verfallen!"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Dieser Schl�ssel wird %s verfallen.\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:844
 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:851
+#: g10/keyedit.c:882
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2669,11 +2726,11 @@ msgstr ""
 "Im --pgp2-Modus kann nur mit PGP-2.x-artigen Schl�sseln unterschrieben "
 "werden\n"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:884
 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:878
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2683,33 +2740,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:883
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Ich antworte nicht.%s\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:916
 #, 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:887
+#: g10/keyedit.c:918
 #, 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:889
+#: g10/keyedit.c:920
 #, 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:895
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Ihre Auswahl? ('?' f�r weitere Informationen): "
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:950
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2718,14 +2775,14 @@ msgstr ""
 "Sind Sie wirklich sicher, da� Sie vorstehenden Schl�ssel mit Ihrem\n"
 "Schl�ssel beglaubigen wollen: \""
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Dies wird eine Eigenbeglaubigung sein.\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:963
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
@@ -2733,85 +2790,85 @@ msgstr ""
 "WARNUNG: Die Unterschrift wird nicht als nicht-exportierbar markiert "
 "werden.\n"
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:971
 #, 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:950
+#: g10/keyedit.c:981
 #, 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:957
+#: g10/keyedit.c:988
 #, 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:964
+#: g10/keyedit.c:995
 #, 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:969
+#: g10/keyedit.c:1000
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Ich habe diesen Schl�ssel fl�chtig �berpr�ft.\n"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1005
 #, 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:984
+#: g10/keyedit.c:1015
 msgid "Really sign? (y/N) "
 msgstr "Wirklich unterschreiben? (j/N) "
 
-#: g10/keyedit.c:1029 g10/keyedit.c:4132 g10/keyedit.c:4223 g10/keyedit.c:4287
-#: g10/keyedit.c:4348 g10/sign.c:369
+#: g10/keyedit.c:1060 g10/keyedit.c:4350 g10/keyedit.c:4441 g10/keyedit.c:4505
+#: g10/keyedit.c:4566 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Beglaubigung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1105 g10/keygen.c:3057
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "Dieser Schl�ssel ist nicht gesch�tzt.\n"
 
-#: g10/keyedit.c:1109 g10/keygen.c:3045
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Geheime Teile des Haupschl�ssels sind nicht vorhanden\n"
 
-#: g10/keyedit.c:1113 g10/keygen.c:3060
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 #, 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:1117 g10/keygen.c:3064
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "Schl�ssel ist gesch�tzt.\n"
 
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Dieser Schl�ssel kann nicht editiert werden: %s\n"
 
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2819,11 +2876,11 @@ msgstr ""
 "Geben Sie die neue Passphrase f�r diesen geheimen Schl�ssel ein.\n"
 "\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:1825
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "Passphrase wurde nicht richtig wiederholt; noch einmal versuchen"
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2831,195 +2888,195 @@ msgstr ""
 "Sie wollen keine Passphrase - dies ist *nicht* zu empfehlen!\n"
 "\n"
 
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1195
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "M�chten Sie dies wirklich tun? "
 
-#: g10/keyedit.c:1235
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "schiebe eine Beglaubigung an die richtige Stelle\n"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "speichern und Men� verlassen"
 
-#: g10/keyedit.c:1322
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "\"Fingerabdruck\" anzeigen"
 
-#: g10/keyedit.c:1323
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "Schl�ssel und User-IDs auflisten"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "User-ID N ausw�hlen"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "User-ID N ausw�hlen"
 
-#: g10/keyedit.c:1327
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "Signaturen widerrufen"
 
-#: g10/keyedit.c:1330
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1335
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "Den Schl�ssel nur f�r diesen Rechner beglaubigen"
 
-#: g10/keyedit.c:1337
+#: g10/keyedit.c:1369
 #, 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:1339
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1343
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "Eine User-ID hinzuf�gen"
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "Eine Foto-ID hinzuf�gen"
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "User-ID entfernen"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "Einen Zweitschl�ssel entfernen"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr "Einen Widerrufschl�ssel hinzuf�gen"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1400
 #, 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:1370
+#: g10/keyedit.c:1402
 #, 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:1372
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "User-ID als Haupt-User-ID kennzeichnen"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "Umschalten zwischen Anzeige geheimer und �ffentlicher Schl�ssel"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "Liste der Voreinstellungen (f�r Experten)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "Liste der Voreinstellungen (ausf�hrlich)"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1413
 #, 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:1386
+#: g10/keyedit.c:1418
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "Schl�sselserver-URI konnte nicht zerlegt werden\n"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "Die Passphrase �ndern"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "Den \"Owner trust\" �ndern"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1426
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "M�chten Sie wirklich alle ausgew�hlten User-IDs widerrufen? "
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "Eine User-ID widerrufen"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "Einen Zweitschl�ssel widerrufen"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "enable key"
 msgstr "Schl�ssel anschalten"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "disable key"
 msgstr "Schl�ssel abschalten"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1436
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "Foto-ID anzeigen"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1556
 #, 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:1494
+#: g10/keyedit.c:1574
 msgid "Secret key is available.\n"
 msgstr "Geheimer Schl�ssel ist vorhanden.\n"
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1655
 msgid "Need the secret key to do this.\n"
 msgstr "Hierzu wird der geheime Schl�ssel ben�tigt.\n"
 
-#: g10/keyedit.c:1579
+#: g10/keyedit.c:1663
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Bitte verwenden sie zun�chst den Befehl \"toggle\"\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1682
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3027,237 +3084,242 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1722
 msgid "Key is revoked."
 msgstr "Schl�ssel wurde widerrufen."
 
-#: g10/keyedit.c:1657
+#: g10/keyedit.c:1741
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Wirklich alle User-IDs beglaubigen? "
 
-#: g10/keyedit.c:1660
-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:1668
+#: g10/keyedit.c:1748
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Unbekannte Unterschriftenklasse"
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1771
 #, 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:1713 g10/keyedit.c:1733 g10/keyedit.c:1899
+#: g10/keyedit.c:1793 g10/keyedit.c:1813 g10/keyedit.c:1979
 msgid "You must select at least one user ID.\n"
 msgstr "Zumindestens eine User-ID mu� ausgew�hlt werden.\n"
 
-#: g10/keyedit.c:1715
+#: g10/keyedit.c:1795
 msgid "You can't delete the last user ID!\n"
 msgstr "Die letzte User-ID kann nicht gel�scht werden!\n"
 
-#: g10/keyedit.c:1717
+#: g10/keyedit.c:1797
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "M�chten Sie alle ausgew�hlten User-IDs wirklich entfernen? "
 
-#: g10/keyedit.c:1718
+#: g10/keyedit.c:1798
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Diese User-ID wirklich entfernen? "
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1848
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Diese User-ID wirklich entfernen? "
 
-#: g10/keyedit.c:1780
+#: g10/keyedit.c:1860
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Zumindestens ein Schl�ssel mu� ausgew�hlt werden.\n"
 
-#: g10/keyedit.c:1808
+#: g10/keyedit.c:1888
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1822
+#: g10/keyedit.c:1902
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1919
 #, 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:1863
+#: g10/keyedit.c:1943
 msgid "You must select at least one key.\n"
 msgstr "Zumindestens ein Schl�ssel mu� ausgew�hlt werden.\n"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1946
 #, 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:1867
+#: g10/keyedit.c:1947
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "M�chten Sie diesen Schl�ssel wirklich entfernen? "
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1982
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "M�chten Sie wirklich alle ausgew�hlten User-IDs widerrufen? "
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1983
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Diese User-ID wirklich widerrufen? "
 
-#: g10/keyedit.c:1921
+#: g10/keyedit.c:2001
 #, 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:1932
+#: g10/keyedit.c:2012
 #, 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:1934
+#: g10/keyedit.c:2014
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "M�chten Sie diesen Schl�ssel wirklich wiederrufen? "
 
-#: g10/keyedit.c:1975
+#: g10/keyedit.c:2055
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2007
+#: g10/keyedit.c:2087
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "Liste der Voreinstellungen einstellen"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2093
 #, 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:2015
+#: g10/keyedit.c:2095
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Die Voreinstellungen wirklich �ndern? "
 
-#: g10/keyedit.c:2065
+#: g10/keyedit.c:2157
+#, fuzzy, c-format
+msgid "Unable to clean `%s'\n"
+msgstr "Ausf�hren des Programms `%s' nicht m�glich: %s\n"
+
+#: g10/keyedit.c:2160
+msgid "Please specify item to clean: `sigs', `uids', or `all'\n"
+msgstr ""
+
+#: g10/keyedit.c:2171
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "�nderungen speichern? "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2174
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Beenden ohne zu speichern? "
 
-#: g10/keyedit.c:2078
+#: g10/keyedit.c:2184
 #, c-format
 msgid "update failed: %s\n"
 msgstr "�nderung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2191
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "�nderung des Geheimnisses fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:2092
+#: g10/keyedit.c:2198
 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:2164
+#: g10/keyedit.c:2271
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2323
 msgid "Features: "
 msgstr "Eigenschaften: "
 
-#: g10/keyedit.c:2227
+#: g10/keyedit.c:2334
 msgid "Keyserver no-modify"
 msgstr "Keyserver no-modify"
 
-#: g10/keyedit.c:2242 g10/keylist.c:307
+#: g10/keyedit.c:2349 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2473
+#: g10/keyedit.c:2580
 #, 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:2494
+#: g10/keyedit.c:2601
 #, 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:2500
+#: g10/keyedit.c:2607
 #, fuzzy
 msgid "(sensitive)"
 msgstr "(empfindlich)"
 
-#: g10/keyedit.c:2516 g10/keyedit.c:2572 g10/keyedit.c:2684 g10/keyedit.c:2699
-#: g10/keylist.c:193 g10/keyserver.c:422
+#: g10/keyedit.c:2623 g10/keyedit.c:2679 g10/keyedit.c:2792 g10/keyedit.c:2807
+#: g10/keylist.c:194 g10/keyserver.c:421
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s kann nicht erzeugt werden: %s\n"
 
-#: g10/keyedit.c:2519 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:931
+#: g10/keyedit.c:2626 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:948
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[widerrufen]"
 
-#: g10/keyedit.c:2521 g10/keylist.c:757 g10/keylist.c:886
+#: g10/keyedit.c:2628 g10/keylist.c:758 g10/keylist.c:887
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [verf�llt: %s]"
 
-#: g10/keyedit.c:2523 g10/keyedit.c:2574 g10/keyedit.c:2686 g10/keyedit.c:2701
-#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
-#: g10/keylist.c:913 g10/keyserver.c:428 g10/mainproc.c:937
+#: g10/keyedit.c:2630 g10/keyedit.c:2681 g10/keyedit.c:2794 g10/keyedit.c:2809
+#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
+#: g10/keylist.c:914 g10/keyserver.c:427 g10/mainproc.c:954
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [verf�llt: %s]"
 
-#: g10/keyedit.c:2525
+#: g10/keyedit.c:2632
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " Vertrauen: %c/%c"
 
-#: g10/keyedit.c:2540
+#: g10/keyedit.c:2647
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " Vertrauen: %c/%c"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2651
 #, c-format
 msgid "validity: %s"
 msgstr "G�ltigkeit: %s"
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2658
 msgid "This key has been disabled"
 msgstr "Hinweis: Dieser Schl�ssel ist abgeschaltet"
 
-#: g10/keyedit.c:2579 g10/keylist.c:199
+#: g10/keyedit.c:2686 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2754
 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:2654
+#: g10/keyedit.c:2762
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3265,20 +3327,20 @@ msgstr ""
 "Bitte beachten Sie, da� ohne einen Programmneustart die angezeigte\n"
 "Schl�sselg�ltigkeit nicht notwendigerweise korrekt ist.\n"
 
-#: g10/keyedit.c:2718 g10/keyserver.c:432 g10/mainproc.c:1577
-#: g10/trustdb.c:1178
+#: g10/keyedit.c:2826 g10/keyedit.c:3201 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1690
 #, fuzzy
 msgid "revoked"
 msgstr "[widerrufen]"
 
-#: g10/keyedit.c:2720 g10/keyserver.c:436 g10/mainproc.c:1579
-#: g10/trustdb.c:531
+#: g10/keyedit.c:2828 g10/keyedit.c:3203 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1692
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
 # translated by wk
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2893
 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"
@@ -3286,7 +3348,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:2845
+#: g10/keyedit.c:2953
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3296,45 +3358,74 @@ msgstr ""
 "k�nnte\n"
 "         bei einigen PGP-Versionen zur Zur�ckweisung des Schl�ssels f�hren.\n"
 
-#: g10/keyedit.c:2850 g10/keyedit.c:3128
+#: g10/keyedit.c:2958 g10/keyedit.c:3307
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Wollen Sie ihn immmer noch hinzuf�gen? (j/N) "
 
-#: g10/keyedit.c:2856
+#: g10/keyedit.c:2964
 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:2996
+#: g10/keyedit.c:3104
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3114
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Diese ung�ltige Beglaubigung entfernen= (j/N/q)"
 
-#: g10/keyedit.c:3010
+#: g10/keyedit.c:3118
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:3016
+#: g10/keyedit.c:3124
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
 
-#: g10/keyedit.c:3030
+#: g10/keyedit.c:3138
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3139
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:3034
+#: g10/keyedit.c:3142
 msgid "Nothing deleted.\n"
 msgstr "Nichts entfernt.\n"
 
-#: g10/keyedit.c:3123
+#: g10/keyedit.c:3167
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed.\n"
+msgstr "User-ID \"%s\" ist widerrufen."
+
+#: g10/keyedit.c:3168
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed.\n"
+msgstr "User-ID \"%s\" ist widerrufen."
+
+#: g10/keyedit.c:3173
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean.\n"
+msgstr "User-ID \"%s\" ist bereits widerrufen\n"
+
+#: g10/keyedit.c:3205 g10/trustdb.c:1694
+msgid "invalid"
+msgstr "ung�ltig"
+
+#: g10/keyedit.c:3207
+#, fuzzy, c-format
+msgid "User ID \"%s\" removed: %s\n"
+msgstr "User-ID \"%s\" ist widerrufen."
+
+#: g10/keyedit.c:3214
+#, fuzzy
+msgid "No user IDs are removable.\n"
+msgstr "Keine User-ID f�r Schl�ssel\n"
+
+#: g10/keyedit.c:3302
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3344,37 +3435,37 @@ msgstr ""
 "         Widerrufers k�nnte bei einigen PGP-Versionen zur Zur�ckweisung\n"
 "         des Schl�ssels f�hren.\n"
 
-#: g10/keyedit.c:3134
+#: g10/keyedit.c:3313
 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:3154
+#: g10/keyedit.c:3333
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Geben sie die User-ID des designierten Widerrufers ein: "
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3356
 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:3192
+#: g10/keyedit.c:3371
 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:3214
+#: g10/keyedit.c:3393
 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:3233
+#: g10/keyedit.c:3412
 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:3239
+#: g10/keyedit.c:3418
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -3382,310 +3473,315 @@ msgstr ""
 "M�chten Sie diesen Schl�ssel wirklich als vorgesehenen Widerrufer "
 "deklarieren? (j/N): "
 
-#: g10/keyedit.c:3300
+#: g10/keyedit.c:3479
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bitte entfernen Sie die Auswahl von den geheimen Schl�sseln.\n"
 
-#: g10/keyedit.c:3306
+#: g10/keyedit.c:3485
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Bitte w�hlen Sie h�chstens einen Zweitschl�ssel aus.\n"
 
-#: g10/keyedit.c:3310
+#: g10/keyedit.c:3489
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "�ndern des Verfallsdatums des Zweitschl�ssels.\n"
 
-#: g10/keyedit.c:3313
+#: g10/keyedit.c:3492
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�ndern des Verfallsdatums des Hauptschl�ssels.\n"
 
-#: g10/keyedit.c:3359
+#: g10/keyedit.c:3538
 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:3375
+#: g10/keyedit.c:3554
 msgid "No corresponding signature in secret ring\n"
 msgstr "Keine entsprechende Signatur im geheimen Schl�sselbund\n"
 
-#: g10/keyedit.c:3455
+#: g10/keyedit.c:3634
 msgid "Please select exactly one user ID.\n"
 msgstr "Bitte genau eine User-ID ausw�hlen.\n"
 
-#: g10/keyedit.c:3494 g10/keyedit.c:3604 g10/keyedit.c:3724
+#: g10/keyedit.c:3673 g10/keyedit.c:3783 g10/keyedit.c:3903
 #, 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:3665
+#: g10/keyedit.c:3844
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3745
+#: g10/keyedit.c:3924
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Wollen Sie es wirklich benutzen? (j/N) "
 
-#: g10/keyedit.c:3746
+#: g10/keyedit.c:3925
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Wollen Sie es wirklich benutzen? (j/N) "
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3987
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:3854
+#: g10/keyedit.c:4045
+#, fuzzy, c-format
+msgid "No user ID with hash %s\n"
+msgstr "Keine User-ID mit Index %d\n"
+
+#: g10/keyedit.c:4072
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:3971
+#: g10/keyedit.c:4189
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "User-ID: \""
 
-#: g10/keyedit.c:3974 g10/keyedit.c:4038 g10/keyedit.c:4081
+#: g10/keyedit.c:4192 g10/keyedit.c:4256 g10/keyedit.c:4299
 #, 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:3976 g10/keyedit.c:4040 g10/keyedit.c:4083
+#: g10/keyedit.c:4194 g10/keyedit.c:4258 g10/keyedit.c:4301
 msgid " (non-exportable)"
 msgstr " (nicht-exportierbar)"
 
-#: g10/keyedit.c:3980
+#: g10/keyedit.c:4198
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/keyedit.c:3984
+#: g10/keyedit.c:4202
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Wollen Sie ihn immmer noch widerrufen? (j/N) "
 
-#: g10/keyedit.c:3988
+#: g10/keyedit.c:4206
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Ein Widerrufszertifikat f�r diese Unterschrift erzeugen (j/N)"
 
-#: g10/keyedit.c:4015
+#: g10/keyedit.c:4233
 #, 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:4041
+#: g10/keyedit.c:4259
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nicht-exportierbar)"
 
-#: g10/keyedit.c:4048
+#: g10/keyedit.c:4266
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   widerrufen durch %08lX um %s\n"
 
-#: g10/keyedit.c:4070
+#: g10/keyedit.c:4288
 msgid "You are about to revoke these signatures:\n"
 msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
 
-#: g10/keyedit.c:4090
+#: g10/keyedit.c:4308
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) "
 
-#: g10/keyedit.c:4120
+#: g10/keyedit.c:4338
 msgid "no secret key\n"
 msgstr "Kein geheimer Schl�ssel\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4408
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User-ID \"%s\" ist bereits widerrufen\n"
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4425
 #, 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:4271
+#: g10/keyedit.c:4489
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "User-ID \"%s\" ist bereits widerrufen\n"
 
-#: g10/keyedit.c:4333
+#: g10/keyedit.c:4551
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "User-ID \"%s\" ist bereits widerrufen\n"
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4646
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Anzeigen einer %s Photo ID (%ld Byte) f�r Schl�ssel %08lX (User-ID %d)\n"
 
-#: g10/keygen.c:293
+#: g10/keygen.c:258
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "Voreinstellung %c%lu ist doppelt\n"
 
-#: g10/keygen.c:300
+#: g10/keygen.c:265
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "zu viele Hashvoreinstellungen\n"
 
-#: g10/keygen.c:302
+#: g10/keygen.c:267
 msgid "too many digest preferences\n"
 msgstr "zu viele Hashvoreinstellungen\n"
 
-#: g10/keygen.c:304
+#: g10/keygen.c:269
 msgid "too many compression preferences\n"
 msgstr "zu viele Komprimierungsvoreinstellungen\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:394
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "Ung�ltiges Feld in der Voreinstellungszeichenkette\n"
 
-#: g10/keygen.c:829
+#: g10/keygen.c:822
 msgid "writing direct signature\n"
 msgstr "Die \"Direct Key Signature\" wird geschrieben\n"
 
-#: g10/keygen.c:868
+#: g10/keygen.c:861
 msgid "writing self signature\n"
 msgstr "Die Eigenbeglaubigung wird geschrieben\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing key binding signature\n"
 msgstr "Schreiben der \"key-binding\" Signatur\n"
 
-#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2632
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Ung�ltig Schl�ssell�nge; %u Bit werden verwendet\n"
 
-#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2638
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Schl�ssell�nge auf %u Bit aufgerundet\n"
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1239
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1252
+#: g10/keygen.c:1242
 #, fuzzy
 msgid "Encrypt"
 msgstr "Daten verschl�sseln"
 
-#: g10/keygen.c:1255
+#: g10/keygen.c:1245
 #, fuzzy
 msgid "Authenticate"
 msgstr "uneingeschr�nkt"
 
-#: g10/keygen.c:1263
+#: g10/keygen.c:1253
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1268
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1282
+#: g10/keygen.c:1272
 #, fuzzy
 msgid "Current allowed actions: "
 msgstr "Derzeitige Voreinstellungenliste:\n"
 
-#: g10/keygen.c:1287
+#: g10/keygen.c:1277
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1290
+#: g10/keygen.c:1280
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (nur verschl�sseln)\n"
 
-#: g10/keygen.c:1293
+#: g10/keygen.c:1283
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1296
+#: g10/keygen.c:1286
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1340
 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:1352
+#: g10/keygen.c:1342
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA und ElGamal (voreingestellt)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1343
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nur signieren/beglaubigen)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1345
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nur verschl�sseln)\n"
 
-#: g10/keygen.c:1357
+#: g10/keygen.c:1347
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (nur verschl�sseln)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1348
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (nur signieren/beglaubigen)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1350
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (nur verschl�sseln)\n"
 
-#: g10/keygen.c:1362
+#: g10/keygen.c:1352
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nur verschl�sseln)\n"
 
-#: g10/keygen.c:1431 g10/keygen.c:2509
+#: g10/keygen.c:1421 g10/keygen.c:2506
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "Das DSA-Schl�sselpaar wird 1024 Bit haben.\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1431
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1438
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Welche Schl�ssell�nge w�nschen Sie? (1024) "
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1452
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1468
+#: g10/keygen.c:1458
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Die verlangte Schl�ssell�nge betr�gt %u Bit\n"
 
-#: g10/keygen.c:1473 g10/keygen.c:1478
+#: g10/keygen.c:1463 g10/keygen.c:1468
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "aufgerundet auf %u Bit\n"
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1515
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3701,7 +3797,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:1539
+#: g10/keygen.c:1526
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3717,37 +3813,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:1561
+#: g10/keygen.c:1549
 msgid "Key is valid for? (0) "
 msgstr "Wie lange bleibt der Schl�ssel g�ltig? (0) "
 
-#: g10/keygen.c:1563
-msgid "Signature is valid for? (0) "
+#: g10/keygen.c:1554
+#, fuzzy, c-format
+msgid "Signature is valid for? (%s) "
 msgstr "Wie lange bleibt die Beglaubigung g�ltig? (0) "
 
-#: g10/keygen.c:1568
+#: g10/keygen.c:1572
 msgid "invalid value\n"
 msgstr "Ung�ltiger Wert.\n"
 
-#: g10/keygen.c:1575
+#: g10/keygen.c:1579
 msgid "Key does not expire at all\n"
 msgstr "Schl�ssel verf�llt nie\n"
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1580
 msgid "Signature does not expire at all\n"
 msgstr "Signature verf�llt nie\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1585
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Key verf�llt am %s\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1586
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Unterschrift verf�llt am %s\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1592
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3755,11 +3852,11 @@ msgstr ""
 "Ihr Rechner kann Daten jenseits des Jahres 2038 nicht anzeigen.\n"
 "Trotzdem werden Daten bis 2106 korrekt verarbeitet.\n"
 
-#: g10/keygen.c:1595
+#: g10/keygen.c:1597
 msgid "Is this correct? (y/N) "
 msgstr "Ist dies richtig? (j/N) "
 
-#: g10/keygen.c:1638
+#: g10/keygen.c:1641
 #, fuzzy
 msgid ""
 "\n"
@@ -3776,44 +3873,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1651
+#: g10/keygen.c:1654
 msgid "Real name: "
 msgstr "Ihr Name (\"Vorname Nachname\"): "
 
-#: g10/keygen.c:1659
+#: g10/keygen.c:1662
 msgid "Invalid character in name\n"
 msgstr "Ung�ltiges Zeichen im Namen\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1664
 msgid "Name may not start with a digit\n"
 msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1666
 msgid "Name must be at least 5 characters long\n"
 msgstr "Der Name mu� min. 5 Zeichen lang sein.\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1674
 msgid "Email address: "
 msgstr "E-Mail-Adresse: "
 
-#: g10/keygen.c:1682
+#: g10/keygen.c:1685
 msgid "Not a valid email address\n"
 msgstr "Diese E-Mail-Adresse ist ung�ltig\n"
 
-#: g10/keygen.c:1690
+#: g10/keygen.c:1693
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1696
+#: g10/keygen.c:1699
 msgid "Invalid character in comment\n"
 msgstr "Ung�ltiges Zeichen im Kommentar.\n"
 
-#: g10/keygen.c:1719
+#: g10/keygen.c:1722
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Sie benutzen den Zeichensatz `%s'\n"
 
-#: g10/keygen.c:1725
+#: g10/keygen.c:1728
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3824,7 +3921,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1733
 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"
 
@@ -3839,23 +3936,23 @@ msgstr "Bitte keine E-Mailadressen als Namen oder Kommentar verwenden\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1746
+#: g10/keygen.c:1749
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeFfBb"
 
-#: g10/keygen.c:1756
+#: g10/keygen.c:1759
 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:1757
+#: g10/keygen.c:1760
 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:1776
+#: g10/keygen.c:1779
 msgid "Please correct the error first\n"
 msgstr "Bitte beseitigen Sie zuerst den Fehler\n"
 
-#: g10/keygen.c:1816
+#: g10/keygen.c:1819
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3863,12 +3960,12 @@ msgstr ""
 "Sie ben�tigen eine Passphrase, um den geheimen Schl�ssel zu sch�tzen.\n"
 "\n"
 
-#: g10/keygen.c:1826 g10/passphrase.c:1105
+#: g10/keygen.c:1829 g10/passphrase.c:786
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1832
+#: g10/keygen.c:1835
 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"
@@ -3881,7 +3978,7 @@ msgstr ""
 "aufrufen.\n"
 "\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1857
 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"
@@ -3892,50 +3989,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:2578
+#: g10/keygen.c:2575
 msgid "Key generation canceled.\n"
 msgstr "Schl�sselerzeugung abgebrochen.\n"
 
-#: g10/keygen.c:2766 g10/keygen.c:2910
+#: g10/keygen.c:2774 g10/keygen.c:2918
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "schreiben des �ffentlichen Schl�ssels nach '%s'\n"
 
-#: g10/keygen.c:2768 g10/keygen.c:2913
+#: g10/keygen.c:2776 g10/keygen.c:2921
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
 
-#: g10/keygen.c:2771 g10/keygen.c:2916
+#: g10/keygen.c:2779 g10/keygen.c:2924
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2907
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kein schreibbarer �ffentlicher Schl�sselbund gefunden: %s\n"
 
-#: g10/keygen.c:2905
+#: g10/keygen.c:2913
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kein schreibbarer geheimer Schl�sselbund gefunden: %s\n"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2931
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des �ff. Schl�sselbundes `%s': %s\n"
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2938
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des geheimen Schl�sselbundes `%s': %s\n"
 
-#: g10/keygen.c:2953
+#: g10/keygen.c:2961
 msgid "public and secret key created and signed.\n"
 msgstr "�ffentlichen und geheimen Schl�ssel erzeugt und signiert.\n"
 
-#: g10/keygen.c:2964
+#: g10/keygen.c:2972
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -3945,12 +4042,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:2976 g10/keygen.c:3105 g10/keygen.c:3220
+#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Schl�sselerzeugung fehlgeschlagen: %s\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3156 g10/sign.c:290
+#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -3958,7 +4055,7 @@ msgstr ""
 "Der Schl�ssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht �berein)\n"
 
-#: g10/keygen.c:3030 g10/keygen.c:3158 g10/sign.c:292
+#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -3966,373 +4063,354 @@ msgstr ""
 "Der Schl�ssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
 "Uhren stimmen nicht �berein)\n"
 
-#: g10/keygen.c:3039 g10/keygen.c:3169
+#: g10/keygen.c:3047 g10/keygen.c:3177
 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:3078 g10/keygen.c:3202
+#: g10/keygen.c:3086 g10/keygen.c:3210
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Wirklich erzeugen? "
 
-#: g10/keygen.c:3355
+#: g10/keygen.c:3363
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "l�schen des Schl�sselblocks fehlgeschlagen: %s\n"
 
-#: g10/keygen.c:3402
+#: g10/keygen.c:3410
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "'%s' kann nicht erzeugt werden: %s\n"
 
-#: g10/keygen.c:3428
+#: g10/keygen.c:3436
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "Hinweis: geheimer Schl�ssel %08lX verf�llt am %s\n"
 
-#: g10/keygen.c:3508
-#, c-format
-msgid "length of RSA modulus is not %d\n"
-msgstr "die L�nge des RSA-Modulus betr�gt nicht %d\n"
-
-#: g10/keygen.c:3514
-msgid "public exponent too large (more than 32 bits)\n"
-msgstr "der �ffentliche Exponent ist zu gro� (mehr als 32 Bit)\n"
-
-#: g10/keygen.c:3520 g10/keygen.c:3526
-#, c-format
-msgid "length of an RSA prime is not %d\n"
-msgstr "die L�nge einer RSA-Primzahl ist nicht %d\n"
-
-#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
+#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
 msgid "never     "
 msgstr "niemals   "
 
-#: g10/keylist.c:264
+#: g10/keylist.c:265
 msgid "Critical signature policy: "
 msgstr "Krititische Beglaubigungsrichtlinie: "
 
-#: g10/keylist.c:266
+#: g10/keylist.c:267
 msgid "Signature policy: "
 msgstr "Beglaubigungsrichtlinie: "
 
-#: g10/keylist.c:305
+#: g10/keylist.c:306
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:354 g10/keylist.c:398
+#: 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:372
+#: g10/keylist.c:373
 msgid "Critical signature notation: "
 msgstr "Krititische Beglaubigungs-\"Notation\": "
 
-#: g10/keylist.c:374
+#: g10/keylist.c:375
 msgid "Signature notation: "
 msgstr "Beglaubigungs-\"Notation\": "
 
-#: g10/keylist.c:385
+#: g10/keylist.c:386
 msgid "not human readable"
 msgstr "nicht als Klartext darstellbar"
 
-#: g10/keylist.c:486
+#: g10/keylist.c:487
 msgid "Keyring"
 msgstr "Schl�sselbund"
 
-#: g10/keylist.c:792
+#: g10/keylist.c:793
 #, c-format
 msgid "expired: %s)"
 msgstr "verf�llt: %s)"
 
-#: g10/keylist.c:1488
+#: g10/keylist.c:1489
 msgid "Primary key fingerprint:"
 msgstr "Haupt-Fingerabdruck  ="
 
-#: g10/keylist.c:1490
+#: g10/keylist.c:1491
 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:1497
+#: g10/keylist.c:1498
 msgid " Primary key fingerprint:"
 msgstr " Haupt-Fingerabdruck  ="
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1500
 msgid "      Subkey fingerprint:"
 msgstr " Unter-Fingerabdruck  ="
 
-#: g10/keylist.c:1503 g10/keylist.c:1507
+#: g10/keylist.c:1504 g10/keylist.c:1508
 msgid "      Key fingerprint ="
 msgstr "  Schl.-Fingerabdruck ="
 
-#: g10/keylist.c:1574
+#: g10/keylist.c:1575
 msgid "      Card serial no. ="
 msgstr "      Kartenseriennr. ="
 
-#: g10/keyring.c:1245
+#: g10/keyring.c:1246
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "Anbringen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1252
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "Warnung: Zwei Dateien mit vertraulichem Inhalt vorhanden.\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s ist der Unver�nderte\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1255
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s ist der Neue\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1256
 msgid "Please fix this possible security flaw\n"
 msgstr "Bitte diesen potentiellen Sicherheitsmangel beseitigen\n"
 
-#: g10/keyring.c:1375
+#: g10/keyring.c:1376
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "Pr�fen des Schl�sselbundes `%s'\n"
 
-#: g10/keyring.c:1421
+#: g10/keyring.c:1422
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu Schl�ssel bislang gepr�ft (%lu Beglaubigungen)\n"
 
-#: g10/keyring.c:1433
+#: g10/keyring.c:1434
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu Schl�ssel gepr�ft (%lu Beglaubigungen)\n"
 
-#: g10/keyring.c:1504
+#: g10/keyring.c:1505
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: Schl�sselbund erstellt\n"
 
-#: g10/keyserver.c:107
+#: g10/keyserver.c:105
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "WARNUNG: Optionen in `%s' sind w�hrend dieses Laufes noch nicht wirksam\n"
 
-#: g10/keyserver.c:434
+#: g10/keyserver.c:433
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:635
+#: g10/keyserver.c:634
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:718 g10/keyserver.c:1238
+#: g10/keyserver.c:717 g10/keyserver.c:1267
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "Ung�ltige export Option\n"
 
-#: g10/keyserver.c:808
+#: g10/keyserver.c:815
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "Schl�ssel `%s' nicht gefunden: %s\n"
 
-#: g10/keyserver.c:810
+#: g10/keyserver.c:817
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "Schl�ssel `%s' nicht gefunden: %s\n"
 
-#: g10/keyserver.c:985
+#: g10/keyserver.c:1014
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "Schl�ssel %08lX wird von %s angefordert\n"
 
-#: g10/keyserver.c:989
+#: g10/keyserver.c:1018
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "Schl�ssel %08lX wird von %s angefordert\n"
 
-#: g10/keyserver.c:1141
+#: g10/keyserver.c:1170
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "suche nach \"%s\" auf HKP-Server %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "unterschrieben mit Ihrem Schl�ssel %08lX um %s\n"
 
-#: g10/keyserver.c:1188
+#: g10/keyserver.c:1217
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "suche nach \"%s\" auf HKP-Server %s\n"
 
-#: g10/keyserver.c:1191
+#: g10/keyserver.c:1220
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "suche nach \"%s\" auf HKP-Server %s\n"
 
-#: g10/keyserver.c:1198 g10/keyserver.c:1293
+#: g10/keyserver.c:1227 g10/keyserver.c:1322
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "Ung�ltige export Option\n"
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1275
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1255
+#: g10/keyserver.c:1284
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1314
+#: g10/keyserver.c:1343
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "Kein Schl�sselserver bekannt (Option --keyserver verwenden)\n"
 
-#: g10/keyserver.c:1320
+#: g10/keyserver.c:1349
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1361
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1366
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1374
 #, c-format
-msgid "gpgkeys_%s does not support handler version %d\n"
+msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1351
+#: g10/keyserver.c:1381
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "Schl�sselserverfehler"
 
-#: g10/keyserver.c:1356
+#: g10/keyserver.c:1386
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "Schl�sselserverfehler"
 
-#: g10/keyserver.c:1365
+#: g10/keyserver.c:1395
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "Empfangen vom Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/keyserver.c:1390 g10/keyserver.c:1424
+#: g10/keyserver.c:1420 g10/keyserver.c:1454
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: Dies ist keine g�ltige Schl�ssel-ID\n"
 
-#: g10/keyserver.c:1681
+#: g10/keyserver.c:1711
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 "WARNUNG: die tempor�re Datei (%s) `%s' konnte nicht entfernt werden: %s\n"
 
-#: g10/keyserver.c:1703
+#: g10/keyserver.c:1733
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "Schl�ssel %08lX wird von %s angefordert\n"
 
-#: g10/keyserver.c:1705
+#: g10/keyserver.c:1735
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "Schl�ssel %08lX wird von %s angefordert\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:249
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "Seltsame L�nge f�r einen verschl�sselten Sitzungsschl�ssel (%d)\n"
 
-#: g10/mainproc.c:262
-#, c-format
-msgid "bad passphrase or unknown cipher algorithm (%d)\n"
-msgstr "Falsche Passphrase oder unbekanntes Verschl�sselungsverfahren (%d)\n"
-
-#: g10/mainproc.c:299
+#: g10/mainproc.c:300
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s verschl�sselter Sitzungsschl�ssel\n"
 
-#: g10/mainproc.c:309
+#: g10/mainproc.c:310
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "Passphrase wurde mit unbekanntem Hashverfahren %d erstellt\n"
 
-#: g10/mainproc.c:375
+#: g10/mainproc.c:376
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "�ffentlicher Schl�ssel ist %08lX\n"
 
-#: g10/mainproc.c:430
+#: g10/mainproc.c:431
 msgid "public key encrypted data: good DEK\n"
 msgstr "Mit �ffentlichem Sch�ssel verschl�sselte Daten: Korrekte DEK\n"
 
-#: g10/mainproc.c:463
+#: g10/mainproc.c:464
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "verschl�sselt mit %u-Bit %s Schl�ssel, ID %08lX, erzeugt %s\n"
 
-#: g10/mainproc.c:467 g10/pkclist.c:218
+#: g10/mainproc.c:468 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                    alias \""
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
 # [kw]
-#: g10/mainproc.c:471
+#: g10/mainproc.c:472
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "verschl�sselt mit %s Schl�ssel, ID %08lX\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Entschl�sselung mit �ffentlichem Schl�ssel fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:499
+#: g10/mainproc.c:500
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Verschl�sselt mit %lu Passphrases\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:502
 msgid "encrypted with 1 passphrase\n"
 msgstr "Verschl�sselt mit einer Passphrase\n"
 
-#: g10/mainproc.c:529 g10/mainproc.c:551
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "vermutlich %s-verschl�sselte Daten\n"
 
-#: g10/mainproc.c:537
+#: g10/mainproc.c:538
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA-Verschl�sselung nicht verf�gbar; versucht wird stattdessen %s\n"
 
-#: g10/mainproc.c:569
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr "Entschl�sselung erfolgreich\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:574
 msgid "WARNING: message was not integrity protected\n"
 msgstr ""
 "WARNUNG: Botschaft wurde nicht integrit�tsgesch�tzt (integrity protected)\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "Warnung: Verschl�sselte Botschaft ist manipuliert worden!\n"
 
-#: g10/mainproc.c:592
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Entschl�sselung fehlgeschlagen: %s\n"
@@ -4347,305 +4425,294 @@ msgstr ""
 msgid "original file name='%.*s'\n"
 msgstr "Urspr�nglicher Dateiname='%.*s'\n"
 
-#: g10/mainproc.c:786
+#: g10/mainproc.c:803
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "Einzelner Widerruf - verwenden Sie \"gpg --import\" um ihn anzuwenden\n"
 
-#: g10/mainproc.c:1290
+#: g10/mainproc.c:1307
 msgid "signature verification suppressed\n"
 msgstr "Unterschriften-�berpr�fung unterdr�ckt\n"
 
-#: g10/mainproc.c:1332 g10/mainproc.c:1342
+#: g10/mainproc.c:1349 g10/mainproc.c:1359
 msgid "can't handle these multiple signatures\n"
 msgstr "diese Mehrfachunterschriften k�nnen nicht behandelt werden\n"
 
-#: g10/mainproc.c:1352
+#: g10/mainproc.c:1369
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/mainproc.c:1353
+#: g10/mainproc.c:1370
 #, 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:1357
+#: g10/mainproc.c:1374
 #, 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:1377
+#: g10/mainproc.c:1394
 msgid "Key available at: "
 msgstr "Schl�ssel erh�ltlich bei: "
 
-#: g10/mainproc.c:1482 g10/mainproc.c:1530
+#: g10/mainproc.c:1499 g10/mainproc.c:1547
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "FALSCHE Unterschrift von \""
 
-#: g10/mainproc.c:1484 g10/mainproc.c:1532
+#: g10/mainproc.c:1501 g10/mainproc.c:1549
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Verfallene Unterschrift von \""
 
-#: g10/mainproc.c:1486 g10/mainproc.c:1534
+#: g10/mainproc.c:1503 g10/mainproc.c:1551
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrekte Unterschrift von \""
 
-#: g10/mainproc.c:1538
+#: g10/mainproc.c:1555
 msgid "[uncertain]"
 msgstr "[ungewi�]  "
 
-#: g10/mainproc.c:1570
+#: g10/mainproc.c:1587
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                    alias \""
 
-#: g10/mainproc.c:1664
+#: g10/mainproc.c:1681
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/mainproc.c:1669
+#: g10/mainproc.c:1686
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Diese Unterschrift verf�llt am %s.\n"
 
-#: g10/mainproc.c:1672
+#: g10/mainproc.c:1689
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s Unterschrift, Hashmethode \"%s\"\n"
 
-#: g10/mainproc.c:1673
+#: g10/mainproc.c:1690
 msgid "binary"
 msgstr "Bin�re"
 
-#: g10/mainproc.c:1674
+#: g10/mainproc.c:1691
 msgid "textmode"
 msgstr "Textmodus"
 
-#: g10/mainproc.c:1674 g10/trustdb.c:530
+#: g10/mainproc.c:1691 g10/trustdb.c:531
 msgid "unknown"
 msgstr "unbekannt"
 
-#: g10/mainproc.c:1694
+#: g10/mainproc.c:1711
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Unterschrift kann nicht gepr�ft werden: %s\n"
 
-#: g10/mainproc.c:1762 g10/mainproc.c:1778 g10/mainproc.c:1864
+#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
 msgid "not a detached signature\n"
 msgstr "keine abgetrennte Unterschrift\n"
 
-#: g10/mainproc.c:1805
+#: g10/mainproc.c:1822
 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:1813
+#: g10/mainproc.c:1830
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "Einzelne Unterschrift der Klasse 0x%02x\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1887
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
 
-#: g10/mainproc.c:1880
+#: g10/mainproc.c:1897
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ung�ltiges root-Paket in proc_tree() entdeckt\n"
 
-#: g10/misc.c:121
+#: g10/misc.c:122
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "core-dump-Dateierzeugung kann nicht abgeschaltet werden: %s\n"
 
-#: g10/misc.c:141 g10/misc.c:169 g10/misc.c:241
+#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "�nderung der \"Trust-DB\" fehlgeschlagen: %s\n"
 
-#: g10/misc.c:206
+#: g10/misc.c:207
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/misc.c:315
+#: g10/misc.c:316
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "dieses Public-Key Verfahren %d kann nicht benutzt werden\n"
 
-#: g10/misc.c:330
+#: g10/misc.c:331
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "Verschl�sselungsverfahren ist nicht implementiert"
 
-#: g10/misc.c:345
+#: g10/misc.c:346
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s Unterschrift, Hashmethode \"%s\"\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:351
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "Erzwingen des Hashverfahrens %s (%d) verletzt die Empf�ngervoreinstellungen\n"
 
-#: g10/misc.c:446
+#: g10/misc.c:447
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "das IDEA-Verschl�sselungs-Plugin ist nicht vorhanden\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:448
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr "F�r weitere Info siehe http://www.gnupg.org/why-not-idea.html\n"
 
-#: g10/misc.c:680
+#: g10/misc.c:681
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: mi�billigte Option \"%s\".\n"
 
-#: g10/misc.c:684
+#: g10/misc.c:685
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "WARNUNG: \"%s\" ist eine mi�billigte Option.\n"
 
-#: g10/misc.c:686
+#: g10/misc.c:687
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "Bitte benutzen Sie stattdessen \"%s%s\".\n"
 
-#: g10/misc.c:697
+#: g10/misc.c:694
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
+msgstr "WARNUNG: \"%s\" ist eine mi�billigte Option.\n"
+
+#: g10/misc.c:707
 msgid "Uncompressed"
 msgstr "nicht komprimiert"
 
-#: g10/misc.c:722
+#: g10/misc.c:732
 msgid "uncompressed|none"
 msgstr "unkomprimiert|kein|keine"
 
-#: g10/misc.c:832
+#: g10/misc.c:842
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "Diese Botschaft k�nnte f�r %s unbrauchbar sein\n"
 
-#: g10/misc.c:989
+#: g10/misc.c:999
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: g10/misc.c:1014
+#: g10/misc.c:1024
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "Unbekannter voreingestellter Empf�nger '%s'\n"
 
-#: g10/openfile.c:84
+#: g10/openfile.c:86
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Datei '%s' existiert bereits. "
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 msgid "Overwrite? (y/N) "
 msgstr "�berschreiben (j/N)? "
 
-#: g10/openfile.c:119
+#: g10/openfile.c:121
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: unbekannte Dateinamenerweiterung\n"
 
-#: g10/openfile.c:141
+#: g10/openfile.c:143
 msgid "Enter new filename"
 msgstr "Neuen Dateinamen eingeben"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:188
 msgid "writing to stdout\n"
 msgstr "Schreiben auf die Standardausgabe\n"
 
-#: g10/openfile.c:296
+#: g10/openfile.c:300
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "die unterzeichneten Daten sind wohl in '%s'\n"
 
-#: g10/openfile.c:375
+#: g10/openfile.c:379
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "Neue Konfigurationsdatei `%s' erstellt\n"
 
-#: g10/openfile.c:377
+#: g10/openfile.c:381
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 "WARNUNG: Optionen in `%s' sind w�hrend dieses Laufes noch nicht wirksam\n"
 
-#: g10/openfile.c:409
+#: g10/openfile.c:413
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "Verzeichnis `%s' erzeugt\n"
 
-#: g10/parse-packet.c:137
+#: g10/parse-packet.c:138
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "dieses Public-Key Verfahren %d kann nicht benutzt werden\n"
 
-#: g10/parse-packet.c:707
+#: g10/parse-packet.c:708
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "WARNUNG: M�glicherweise unsicherer symmetrisch verschl�sselter "
 "Sitzungsschl�ssel\n"
 
-#: g10/parse-packet.c:1132
+#: g10/parse-packet.c:1145
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
 
-#: g10/passphrase.c:478 g10/passphrase.c:525
+#: g10/passphrase.c:305
 msgid "gpg-agent is not available in this session\n"
 msgstr "GPG-Agent ist in dieser Sitzung nicht vorhanden\n"
 
-#: g10/passphrase.c:486
-msgid "can't set client pid for the agent\n"
-msgstr "Client-PID f�r den Agent kann nicht gesetzt werden\n"
-
-#: g10/passphrase.c:494
-msgid "can't get server read FD for the agent\n"
-msgstr "Server-Lese-Handle f�r den Agent nicht verf�gbar\n"
-
-#: g10/passphrase.c:501
-msgid "can't get server write FD for the agent\n"
-msgstr "Server-Schreib-Handle f�r den Agent nicht verf�gbar\n"
-
-#: g10/passphrase.c:534
+#: g10/passphrase.c:317
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "fehlerhaft aufgebaute GPG_AGENT_INFO - Umgebungsvariable\n"
 
-#: g10/passphrase.c:547
+#: g10/passphrase.c:332
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "GPG-Agent-Protokoll-Version %d wird nicht unterst�tzt\n"
 
-#: g10/passphrase.c:568
+#: g10/passphrase.c:345
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "Verbindung zu '%s' kann nicht aufgebaut werden: %s\n"
 
-#: g10/passphrase.c:590
-msgid "communication problem with gpg-agent\n"
-msgstr "Kommunikationsproblem mit GPG-Agent\n"
-
-#: g10/passphrase.c:597 g10/passphrase.c:937 g10/passphrase.c:1049
+#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
 "Schwierigkeiten mit dem Agenten - Agent-Ansteuerung wird abgeschaltet\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1209
+#: g10/passphrase.c:511 g10/passphrase.c:890
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (Hauptschl�ssel-ID %08lX)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:525
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4656,41 +4723,28 @@ msgstr ""
 "Benutzer: \"%.*s\"\n"
 "%u-bit %s Schl�ssel, ID %s, erzeugt %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:550
 msgid "Repeat passphrase\n"
 msgstr "Geben Sie die Passphrase nochmal ein\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:552
 msgid "Enter passphrase\n"
 msgstr "Geben Sie die Passphrase ein\n"
 
-#: g10/passphrase.c:781
-msgid "passphrase too long\n"
-msgstr "Passphrase ist zu lang\n"
-
-#: g10/passphrase.c:794
-msgid "invalid response from agent\n"
-msgstr "Falsche Antwort des Agenten\n"
-
-#: g10/passphrase.c:810 g10/passphrase.c:931
+#: g10/passphrase.c:628
 msgid "cancelled by user\n"
 msgstr "Abbruch durch Benutzer\n"
 
-#: g10/passphrase.c:815 g10/passphrase.c:1020
-#, c-format
-msgid "problem with the agent: agent returns 0x%lx\n"
-msgstr "Schwierigkeiten mit dem Agenten: Agent antwortet 0x%lx\n"
-
-#: g10/passphrase.c:1100 g10/passphrase.c:1263
+#: g10/passphrase.c:781 g10/passphrase.c:944
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "Passphrase kann im Batchmodus nicht abgefragt werden\n"
 
-#: g10/passphrase.c:1107 g10/passphrase.c:1268
+#: g10/passphrase.c:788 g10/passphrase.c:949
 msgid "Enter passphrase: "
 msgstr "Geben Sie die Passphrase ein: "
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:871
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4700,22 +4754,22 @@ msgstr ""
 "Sie ben�tigen eine Passphrase, um den geheimen Schl�ssel zu entsperren.\n"
 "Benutzer: \""
 
-#: g10/passphrase.c:1196
+#: g10/passphrase.c:877
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-Bit %s Schl�ssel, ID %08lX, erzeugt %s"
 
-#: g10/passphrase.c:1205
+#: g10/passphrase.c:886
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1272
+#: g10/passphrase.c:953
 msgid "Repeat passphrase: "
 msgstr "Geben Sie die Passphrase nochmal ein: "
 
 # translated by wk
-#: g10/photoid.c:66
+#: g10/photoid.c:67
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4730,164 +4784,164 @@ msgstr ""
 "wir Ihr Schl�ssel leider auch sehr gro� werden.  Ein Bild der Gr���e\n"
 "240x288 Pixel ist eine gute Wahl.\n"
 
-#: g10/photoid.c:80
+#: g10/photoid.c:81
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Dateiname mit JPEG f�r die Photo ID eingeben: "
 
-#: g10/photoid.c:94
+#: g10/photoid.c:95
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "Datei kann nicht ge�ffnet werden: %s\n"
 
-#: g10/photoid.c:102
+#: g10/photoid.c:103
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:104
+#: g10/photoid.c:105
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Wollen Sie es wirklich benutzen? (j/N) "
 
-#: g10/photoid.c:119
+#: g10/photoid.c:120
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "`%s' ist keine JPEG Datei\n"
 
-#: g10/photoid.c:136
+#: g10/photoid.c:137
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Ist dieses Bild richtig? (j/N) "
 
-#: g10/photoid.c:338
+#: g10/photoid.c:339
 msgid "unable to display photo ID!\n"
 msgstr "Die Photo ID kann nicht angezeigt werden!\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:580
+#: g10/pkclist.c:62 g10/revoke.c:581
 msgid "No reason specified"
 msgstr "Kein Grund angegeben"
 
-#: g10/pkclist.c:63 g10/revoke.c:582
+#: g10/pkclist.c:64 g10/revoke.c:583
 msgid "Key is superseded"
 msgstr "Schl�ssel ist �berholt"
 
-#: g10/pkclist.c:65 g10/revoke.c:581
+#: g10/pkclist.c:66 g10/revoke.c:582
 msgid "Key has been compromised"
 msgstr "Hinweis: Dieser Schl�ssel ist nicht mehr sicher"
 
-#: g10/pkclist.c:67 g10/revoke.c:583
+#: g10/pkclist.c:68 g10/revoke.c:584
 msgid "Key is no longer used"
 msgstr "Schl�ssel wird nicht mehr benutzt"
 
-#: g10/pkclist.c:69 g10/revoke.c:584
+#: g10/pkclist.c:70 g10/revoke.c:585
 msgid "User ID is no longer valid"
 msgstr "User-ID ist nicht mehr g�ltig"
 
-#: g10/pkclist.c:73
+#: g10/pkclist.c:74
 msgid "reason for revocation: "
 msgstr "Grund f�r Widerruf: "
 
-#: g10/pkclist.c:90
+#: g10/pkclist.c:91
 msgid "revocation comment: "
 msgstr "Widerruf-Bemerkung: "
 
-#: g10/pkclist.c:205
+#: g10/pkclist.c:206
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:213
+#: g10/pkclist.c:214
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "Es ist kein \"trust value\" zugewiesen f�r:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:245
+#: g10/pkclist.c:246
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "                    alias \""
 
-#: g10/pkclist.c:255
+#: g10/pkclist.c:256
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Dieser Schl�ssel geh�rt wahrscheinlich dem angegebenen Besitzer\n"
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:271
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = Wei� nicht so recht\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = Nein, ihm traue ich NICHT\n"
 
-#: g10/pkclist.c:278
+#: g10/pkclist.c:279
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Ich vertraue ihm absolut\n"
 
-#: g10/pkclist.c:284
+#: g10/pkclist.c:285
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = Zur�ck zum Men�\n"
 
-#: g10/pkclist.c:287
+#: g10/pkclist.c:288
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " s = diesen Schl�ssel �berSpringen\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " q = verlassen\n"
 
-#: g10/pkclist.c:292
+#: g10/pkclist.c:293
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr "Die minimale Trust-Ebene f�r diesen Schl�ssel betr�gt: %s\n"
 
-#: g10/pkclist.c:298 g10/revoke.c:609
+#: g10/pkclist.c:299 g10/revoke.c:610
 msgid "Your decision? "
 msgstr "Ihre Auswahl? "
 
-#: g10/pkclist.c:319
+#: g10/pkclist.c:320
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "M�chten Sie diesem Schl�ssel wirklich uneingeschr�nkt vertrauen? "
 
-#: g10/pkclist.c:333
+#: g10/pkclist.c:334
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Zertifikate f�hren zu einem letztlich vertrauensw�rdigen Schl�ssel:\n"
 
-#: g10/pkclist.c:418
+#: g10/pkclist.c:419
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Es gibt keine Garantie, da� dieser Schl�ssel wirklich dem angegebenen "
 "Besitzer geh�rt.\n"
 
-#: g10/pkclist.c:423
+#: g10/pkclist.c:424
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Es gibt nur eine beschr�nkte Garantie, da� dieser Schl�ssel wirklich "
 "dem angegebenen Besitzer geh�rt.\n"
 
-#: g10/pkclist.c:429
+#: g10/pkclist.c:430
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Dieser Schl�ssel geh�rt wahrscheinlich dem angegebenen Besitzer\n"
 
-#: g10/pkclist.c:434
+#: g10/pkclist.c:435
 msgid "This key belongs to us\n"
 msgstr ""
 "Dieser Schl�ssel geh�rt uns (da wir n�mlich den geheimen Schl�ssel dazu "
 "haben)\n"
 
-#: g10/pkclist.c:460
+#: g10/pkclist.c:461
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -4898,100 +4952,100 @@ msgstr ""
 "Wenn Sie *wirklich* wissen, was Sie tun, k�nnen Sie die n�chste\n"
 "Frage mit ja beantworten\n"
 
-#: g10/pkclist.c:467
+#: g10/pkclist.c:468
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Diesen Schl�ssel trotzdem benutzen? "
 
-#: g10/pkclist.c:501
+#: g10/pkclist.c:502
 msgid "WARNING: Using untrusted key!\n"
 msgstr "WARNUNG: Ein Schl�ssel ohne gesichertes Vertrauen wird benutzt!\n"
 
-#: g10/pkclist.c:508
+#: g10/pkclist.c:509
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "WARNUNG: Dieser schl�ssel ist u.U. widerrufen: Widerrufschl�ssel ist nicht "
 "vorhanden\n"
 
-#: g10/pkclist.c:517
+#: g10/pkclist.c:518
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr ""
 "WARNUNG: Dieser Schl�ssel wurde vom vorgesehen Widerrufer widerrufen!\n"
 
-#: g10/pkclist.c:520
+#: g10/pkclist.c:521
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "WARNUNG: Dieser Schl�ssel wurde von seinem Besitzer widerrufen!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Das k�nnte bedeuten, da� die Signatur gef�lscht ist.\n"
 
-#: g10/pkclist.c:527
+#: g10/pkclist.c:528
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "WARNUNG: Dieser Unterschl�ssel wurde von seinem Besitzer widerrufen!\n"
 
-#: g10/pkclist.c:532
+#: g10/pkclist.c:533
 msgid "Note: This key has been disabled.\n"
 msgstr "Hinweis: Dieser Schl�ssel wurde abgeschaltet.\n"
 
-#: g10/pkclist.c:537
+#: g10/pkclist.c:538
 msgid "Note: This key has expired!\n"
 msgstr "Hinweis: Dieser Schl�ssel ist verfallen!\n"
 
-#: g10/pkclist.c:548
+#: g10/pkclist.c:549
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "WARNUNG: Dieser Schl�ssel tr�gt keine vertrauensw�rdige Signatur!\n"
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:551
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Es gibt keinen Hinweis, da� die Signatur wirklich dem vorgeblichen "
 "Besitzer geh�rt.\n"
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:559
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "WARNUNG: Wir haben KEIN Vertrauen zu diesem Schl�ssel!\n"
 
-#: g10/pkclist.c:559
+#: g10/pkclist.c:560
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Die Signatur ist wahrscheinlich eine F�LSCHUNG.\n"
 
-#: g10/pkclist.c:567
+#: g10/pkclist.c:568
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "WARNUNG: Dieser Schl�ssel ist nicht durch hinreichend vertrauensw�rdige "
 "Signaturen zertifiziert!\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:570
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 "         Es ist nicht sicher, da� die Signatur wirklich dem vorgeblichen "
 "Besitzer geh�rt.\n"
 
-#: g10/pkclist.c:734 g10/pkclist.c:767 g10/pkclist.c:936 g10/pkclist.c:996
+#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: �bersprungen: %s\n"
 
-#: g10/pkclist.c:744 g10/pkclist.c:968
+#: g10/pkclist.c:745 g10/pkclist.c:969
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: �bersprungen: �ffentlicher Schl�ssel bereits vorhanden\n"
 
-#: g10/pkclist.c:786
+#: g10/pkclist.c:787
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Sie haben keine User-ID angegeben (Sie k�nnen die Option \"-r\" verwenden).\n"
 
-#: g10/pkclist.c:802
+#: g10/pkclist.c:803
 #, fuzzy
 msgid "Current recipients:\n"
 msgstr "Derzeitige Voreinstellungenliste:\n"
 
-#: g10/pkclist.c:828
+#: g10/pkclist.c:829
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -4999,171 +5053,171 @@ msgstr ""
 "\n"
 "Geben Sie die User-ID ein. Beenden mit einer leeren Zeile: "
 
-#: g10/pkclist.c:844
+#: g10/pkclist.c:845
 msgid "No such user ID.\n"
 msgstr "Keine solche User-ID vorhanden.\n"
 
-#: g10/pkclist.c:849 g10/pkclist.c:911
+#: g10/pkclist.c:850 g10/pkclist.c:912
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "�bersprungen: �ffentlicher Schl�ssel bereits als Standardempf�nger gesetzt\n"
 
-#: g10/pkclist.c:867
+#: g10/pkclist.c:868
 msgid "Public key is disabled.\n"
 msgstr "�ffentlicher Schl�ssel ist abgeschaltet.\n"
 
-#: g10/pkclist.c:874
+#: g10/pkclist.c:875
 msgid "skipped: public key already set\n"
 msgstr "�bersprungen: �ffentlicher Schl�ssel bereits gesetzt\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:904
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "Unbekannter voreingestellter Empf�nger '%s'\n"
 
-#: g10/pkclist.c:948
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: �bersprungen: �ffentlicher Schl�ssel ist abgeschaltet\n"
 
-#: g10/pkclist.c:1003
+#: g10/pkclist.c:1004
 msgid "no valid addressees\n"
 msgstr "Keine g�ltigen Adressaten\n"
 
-#: g10/plaintext.c:90
+#: g10/plaintext.c:91
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "Daten wurden nicht gespeichert; verwenden Sie daf�r die Option \"--output\"\n"
 
-#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
+#: g10/plaintext.c:136 g10/plaintext.c:141 g10/plaintext.c:159
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "Fehler beim Erstellen von `%s': %s\n"
 
-#: g10/plaintext.c:446
+#: g10/plaintext.c:447
 msgid "Detached signature.\n"
 msgstr "Abgetrennte Beglaubigungen.\n"
 
-#: g10/plaintext.c:450
+#: g10/plaintext.c:452
 msgid "Please enter name of data file: "
 msgstr "Bitte geben Sie den Namen der Datendatei ein: "
 
-#: g10/plaintext.c:478
+#: g10/plaintext.c:481
 msgid "reading stdin ...\n"
 msgstr "lese stdin ...\n"
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:515
 msgid "no signed data\n"
 msgstr "keine unterschriebene Daten\n"
 
-#: g10/plaintext.c:526
+#: g10/plaintext.c:529
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "kann signierte Datei '%s' nicht �ffnen.\n"
 
-#: g10/pubkey-enc.c:103
+#: g10/pubkey-enc.c:104
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "Ungenannter Empf�nger; Versuch mit geheimen Schl�ssel %08lX ...\n"
 
-#: g10/pubkey-enc.c:119
+#: g10/pubkey-enc.c:120
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "Alles klar, wir sind der ungenannte Empf�nger.\n"
 
-#: g10/pubkey-enc.c:207
+#: g10/pubkey-enc.c:208
 msgid "old encoding of the DEK is not supported\n"
 msgstr "alte Kodierung des DEK wird nicht unterst�tzt\n"
 
-#: g10/pubkey-enc.c:228
+#: g10/pubkey-enc.c:229
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "Versch�sselungsverfahren %d%s ist unbekannt oder abgeschaltet\n"
 
-#: g10/pubkey-enc.c:266
+#: g10/pubkey-enc.c:267
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "Hinweis: Verfahren %d ist kein bevorzugtes Verschl�sselungsverfahren\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:287
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "Hinweis: geheimer Schl�ssel %08lX verf�llt am %s\n"
 
-#: g10/pubkey-enc.c:292
+#: g10/pubkey-enc.c:293
 msgid "NOTE: key has been revoked"
 msgstr "Hinweis: Schl�ssel wurde widerrufen"
 
-#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:545
+#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
+#: g10/revoke.c:188 g10/revoke.c:546
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "\"build_packet\" fehlgeschlagen: %s\n"
 
-#: g10/revoke.c:146
+#: g10/revoke.c:147
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "Schl�ssel %08lX: Keine User-ID\n"
 
-#: g10/revoke.c:272
+#: g10/revoke.c:273
 msgid "To be revoked by:\n"
 msgstr "Schl�ssel soll widerrufen werden von:\n"
 
-#: g10/revoke.c:276
+#: g10/revoke.c:277
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Dies ist ein \"sensitiver\" Widerrufsschl�ssel)\n"
 
-#: g10/revoke.c:280
+#: g10/revoke.c:281
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Ein Widerrufszertifikat f�r diesen Schl�ssel erzeugen? (j/N) "
 
-#: g10/revoke.c:293 g10/revoke.c:511
+#: g10/revoke.c:294 g10/revoke.c:512
 msgid "ASCII armored output forced.\n"
 msgstr "Ausgabe mit ASCII H�lle erzwungen\n"
 
-#: g10/revoke.c:307 g10/revoke.c:525
+#: g10/revoke.c:308 g10/revoke.c:526
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "\"make_keysig_packet\" fehlgeschlagen: %s\n"
 
-#: g10/revoke.c:370
+#: g10/revoke.c:371
 msgid "Revocation certificate created.\n"
 msgstr "Widerrufzertifikat erzeugt.\n"
 
-#: g10/revoke.c:376
+#: g10/revoke.c:377
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "Widerrufsschl�ssel f�r `%s' nicht gefunden\n"
 
-#: g10/revoke.c:432
+#: g10/revoke.c:433
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "Geheimer Schl�ssel `%s' nicht gefunden: %s\n"
 
-#: g10/revoke.c:461
+#: g10/revoke.c:462
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "kein zugeh�riger �ffentlicher Schl�ssel: %s\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:473
 msgid "public key does not match secret key!\n"
 msgstr "�ffentliche Schl�ssel pa�t nicht zum geheimen Schl�ssel!\n"
 
-#: g10/revoke.c:479
+#: g10/revoke.c:480
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Ein Widerrufszertifikat f�r diesen Schl�ssel erzeugen? (j/N) "
 
-#: g10/revoke.c:496
+#: g10/revoke.c:497
 msgid "unknown protection algorithm\n"
 msgstr "Unbekanntes Schutzverfahren\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 msgid "NOTE: This key is not protected!\n"
 msgstr "Dieser Schl�ssel ist nicht gesch�tzt.\n"
 
 # translated by wk
-#: g10/revoke.c:551
+#: g10/revoke.c:552
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5183,117 +5237,117 @@ msgstr ""
 "Drucksystem kann unter Umst�nden eine Kopie anderen Nutzern zug�nglich\n"
 "machen.\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid "Please select the reason for the revocation:\n"
 msgstr "Grund f�r den Widerruf:\n"
 
-#: g10/revoke.c:602
+#: g10/revoke.c:603
 msgid "Cancel"
 msgstr "Abbruch"
 
-#: g10/revoke.c:604
+#: g10/revoke.c:605
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Wahrscheinlich m�chten Sie hier %d ausw�hlen)\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:646
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "Geben Sie eine optionale Beschreibung ein. Beenden mit einer leeren Zeile:\n"
 
-#: g10/revoke.c:673
+#: g10/revoke.c:674
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Grund f�r Widerruf: %s\n"
 
-#: g10/revoke.c:675
+#: g10/revoke.c:676
 msgid "(No description given)\n"
 msgstr "(Keine Beschreibung angegeben)\n"
 
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Ist das richtig? "
 
-#: g10/seckey-cert.c:54
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "Teile des geheimen Schl�ssels sind nicht vorhanden\n"
 
-#: g10/seckey-cert.c:60
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "Schutzverfahren %d%s wird nicht unterst�tzt\n"
 
-#: g10/seckey-cert.c:71
+#: g10/seckey-cert.c:72
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "Hashschutzverfahren %d wird nicht unterst�tzt\n"
 
-#: g10/seckey-cert.c:265
+#: g10/seckey-cert.c:266
 msgid "Invalid passphrase; please try again"
 msgstr "Ung�ltige Passphrase; versuchen Sie es bitte noch einmal"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:267
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:326
+#: g10/seckey-cert.c:327
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "WARNUNG: Unsicherer Schl�ssel entdeckt -\n"
 "         bitte Passphrase nochmals wechseln.\n"
 
-#: g10/seckey-cert.c:364
+#: g10/seckey-cert.c:365
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "Die mi�billigte 16-bit Pr�fsumme wird zum Schutz des geheimen Schl�ssels "
 "benutzt\n"
 
-#: g10/seskey.c:52
+#: g10/seskey.c:53
 msgid "weak key created - retrying\n"
 msgstr "Unsicherer Schl�ssel erzeugt - neuer Versuch\n"
 
-#: g10/seskey.c:57
+#: g10/seskey.c:58
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "Trotz %d-fachen Versuch konnte die Erzeugung eines unsicheren Schl�ssels f�r "
 "sym.Verschl�sselung nicht vermieden werden!\n"
 
-#: g10/seskey.c:213
+#: g10/seskey.c:214
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA ben�tigt einen 160-bit Hash Algorithmus\n"
 
-#: g10/sig-check.c:75
+#: g10/sig-check.c:76
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "WARNUNG: Widersprechende Hashverfahren in der signierten Nachricht\n"
 
-#: g10/sig-check.c:99
+#: g10/sig-check.c:100
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "WARNUNG: Signaturunterschl�ssel %08lX hat keine R�cksignatur\n"
 
-#: g10/sig-check.c:102
+#: g10/sig-check.c:103
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "WARNUNG: Signaturunterschl�ssel %08lX hat eine ung�ltige R�cksignatur\n"
 
-#: g10/sig-check.c:168
+#: g10/sig-check.c:169
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr ""
 "�ffentlicher Schl�ssel %08lX ist um %lu Sekunde j�nger als die Unterschrift\n"
 
-#: g10/sig-check.c:169
+#: g10/sig-check.c:170
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr ""
 "�ffentlicher Schl�ssel %08lX ist um %lu Sekunden j�nger als die "
 "Unterschrift\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:181
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5301,7 +5355,7 @@ msgstr ""
 "Der Schl�ssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht �berein)\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:183
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5309,65 +5363,65 @@ msgstr ""
 "Der Schl�ssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
 "Uhren stimmen nicht �berein)\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:193
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "Hinweis: Signaturschl�ssel %08lX ist am %s verfallen.\n"
 
-#: g10/sig-check.c:275
+#: g10/sig-check.c:276
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "Vermutlich eine FALSCHE Unterschrift von Schl�ssel %08lX, wegen unbekanntem "
 "\"critical bit\"\n"
 
-#: g10/sig-check.c:532
+#: g10/sig-check.c:533
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
 "Schl�ssel %08lX: Kein Unterschl�ssel f�r die Unterschl�sselwiderruf-"
 "Beglaubigung\n"
 
-#: g10/sig-check.c:558
+#: g10/sig-check.c:559
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
 "Schl�ssel %08lX: Kein Unterschl�ssel f�r die Unterschl�sselanbindungs-"
 "Beglaubigung\n"
 
-#: g10/sign.c:85
+#: g10/sign.c:86
 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:93
+#: g10/sign.c:94
 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:112
+#: g10/sign.c:113
 #, 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:138
+#: g10/sign.c:139
 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:146
+#: g10/sign.c:147
 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:159
+#: g10/sign.c:160
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5375,7 +5429,7 @@ msgstr ""
 "WARNUNG: Richtlinien-URL kann nicht %%-erweitert werden (zu gro0). Verwende "
 "\"unerweiterte\".\n"
 
-#: g10/sign.c:187
+#: g10/sign.c:188
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5384,77 +5438,77 @@ msgstr ""
 "WARNUNG: Richtlinien-URL kann nicht %%-erweitert werden (zu gro0). Verwende "
 "\"unerweiterte\".\n"
 
-#: g10/sign.c:364
+#: g10/sign.c:365
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Pr�fung der erstellten Unterschrift ist fehlgeschlagen: %s\n"
 
-#: g10/sign.c:373
+#: g10/sign.c:374
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s Unterschrift von: \"%s\"\n"
 
-#: g10/sign.c:741
+#: g10/sign.c:761
 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:808
+#: g10/sign.c:830
 #, 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:900
+#: g10/sign.c:922
 msgid "signing:"
 msgstr "unterschreibe:"
 
-#: g10/sign.c:1007
+#: g10/sign.c:1034
 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:1180
+#: g10/sign.c:1212
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s Verschl�sselung wird verwendet\n"
 
-#: g10/skclist.c:126 g10/skclist.c:190
+#: g10/skclist.c:127 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "Schl�ssel ist nicht als unsicher gekennzeichnet - er ist nur mit einem\n"
 "echten Zufallsgenerator verwendbar\n"
 
-#: g10/skclist.c:157
+#: g10/skclist.c:158
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "�bersprungen '%s': doppelt\n"
 
-#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "�bersprungen '%s': %s\n"
 
-#: g10/skclist.c:170
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "�bersprungen: geheimer Schl�ssel bereits vorhanden\n"
 
-#: g10/skclist.c:185
+#: g10/skclist.c:186
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "'%s �bersprungen: Dies ist ein durch PGP erzeugter ElGamal-Schl�ssel. Das "
 "ist f�r Signaturen NICHT sicher genug!\n"
 
-#: g10/tdbdump.c:59 g10/trustdb.c:365
+#: g10/tdbdump.c:60 g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "Vertrauenssatz %lu, Typ %d: Schreiben fehlgeschlagen: %s\n"
 
-#: g10/tdbdump.c:104
+#: g10/tdbdump.c:105
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5463,358 +5517,358 @@ msgstr ""
 "# Liste de zugewiesenden Trustwerte, erzeugt am %s\n"
 "# (\"gpg --import-ownertrust\" um sie zu restaurieren)\n"
 
-#: g10/tdbdump.c:159 g10/tdbdump.c:167 g10/tdbdump.c:172 g10/tdbdump.c:177
+#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "Fehler beim Lesen von `%s': %s\n"
 
-#: g10/tdbdump.c:159
+#: g10/tdbdump.c:160
 #, fuzzy
 msgid "line too long"
 msgstr "Zeile ist zu lang\n"
 
-#: g10/tdbdump.c:167
+#: g10/tdbdump.c:168
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:173
+#: g10/tdbdump.c:174
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "Fehler: ung�ltiger Fingerabdruck\n"
 
-#: g10/tdbdump.c:178
+#: g10/tdbdump.c:179
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr "Importieren der \"Owner trust\"-Werte"
 
-#: g10/tdbdump.c:214
+#: g10/tdbdump.c:215
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "Fehler beim Suchen des \"Trust records\": %s\n"
 
-#: g10/tdbdump.c:218
+#: g10/tdbdump.c:219
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "Lesefehler: %s\n"
 
-#: g10/tdbdump.c:227 g10/trustdb.c:380
+#: g10/tdbdump.c:228 g10/trustdb.c:381
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "\"Trust-DB\": sync fehlgeschlagen: %s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1440
+#: g10/tdbio.c:129 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb Satz %lu: lseek fehlgeschlagen: %s\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1447
+#: g10/tdbio.c:135 g10/tdbio.c:1448
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb Satz %lu: write fehlgeschlagen (n=%d): %s\n"
 
-#: g10/tdbio.c:244
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "trustdb Transaktion zu gro�\n"
 
-#: g10/tdbio.c:497
+#: g10/tdbio.c:498
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "kann '%s' nicht schliessen: %s\n"
 
-#: g10/tdbio.c:512
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: Verzeichnis existiert nicht!\n"
 
-#: g10/tdbio.c:522 g10/tdbio.c:545 g10/tdbio.c:588
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "'%s' kann nicht erzeugt werden: %s\n"
 
-#: g10/tdbio.c:524 g10/tdbio.c:591
+#: g10/tdbio.c:525 g10/tdbio.c:592
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "'%s' kann nicht ge�ffnet werden\n"
 
-#: g10/tdbio.c:550
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: Fehler beim Erzeugen des Versionsatzes: %s"
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: ung�ltige trust-db erzeugt\n"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: trust-db erzeugt\n"
 
-#: g10/tdbio.c:597
+#: g10/tdbio.c:598
 msgid "NOTE: trustdb not writable\n"
 msgstr "Notiz: Die \"trustdb\" ist nicht schreibbar\n"
 
-#: g10/tdbio.c:614
+#: g10/tdbio.c:615
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: ung�ltige 'Trust'-Datenbank\n"
 
-#: g10/tdbio.c:646
+#: g10/tdbio.c:647
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: hashtable kann nicht erzeugt werden: %s\n"
 
-#: g10/tdbio.c:654
+#: g10/tdbio.c:655
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: Fehler beim �ndern des Versionsatzes: %s\n"
 
-#: g10/tdbio.c:671 g10/tdbio.c:691 g10/tdbio.c:707 g10/tdbio.c:721
-#: g10/tdbio.c:751 g10/tdbio.c:1373 g10/tdbio.c:1400
+#: g10/tdbio.c:672 g10/tdbio.c:692 g10/tdbio.c:708 g10/tdbio.c:722
+#: g10/tdbio.c:752 g10/tdbio.c:1374 g10/tdbio.c:1401
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: Fehler beim Lesen des Versionsatzes: %s\n"
 
-#: g10/tdbio.c:730
+#: g10/tdbio.c:731
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: Fehler beim Schreiben des Versionsatzes: %s\n"
 
-#: g10/tdbio.c:1169
+#: g10/tdbio.c:1170
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek fehlgeschlagen: %s\n"
 
-#: g10/tdbio.c:1177
+#: g10/tdbio.c:1178
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/tdbio.c:1198
+#: g10/tdbio.c:1199
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: keine trustdb Datei\n"
 
-#: g10/tdbio.c:1216
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: version record with recnum %lu\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1222
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: invalid file version %d\n"
 
-#: g10/tdbio.c:1406
+#: g10/tdbio.c:1407
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: Fehler beim Lesen eines freien Satzes: %s\n"
 
-#: g10/tdbio.c:1414
+#: g10/tdbio.c:1415
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: Fehler beim Schreiben eines Verzeichnis-Satzes: %s\n"
 
-#: g10/tdbio.c:1424
+#: g10/tdbio.c:1425
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: konnte einen Satz nicht Nullen: %s\n"
 
-#: g10/tdbio.c:1454
+#: g10/tdbio.c:1455
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: konnte Satz nicht anh�ngen: %s\n"
 
-#: g10/tdbio.c:1499
+#: g10/tdbio.c:1500
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "Die \"Trust\"-Datenbank ist besch�digt; verwenden Sie \"gpg --fix-trustdb"
 "\".\n"
 
-#: g10/textfilter.c:147
+#: g10/textfilter.c:148
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "Textzeilen l�nger als %d Zeichen k�nnen nicht benutzt werden\n"
 
-#: g10/textfilter.c:244
+#: g10/textfilter.c:245
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "Eingabezeile ist l�nger als %d Zeichen\n"
 
-#: g10/trustdb.c:226
+#: g10/trustdb.c:227
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "'%s' ist keine g�ltige lange Schl�ssel-ID\n"
 
-#: g10/trustdb.c:257
+#: g10/trustdb.c:258
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "Schl�ssel %08lX: Akzeptiert als vertrauensw�rdiger Schl�ssel\n"
 
-#: g10/trustdb.c:295
+#: g10/trustdb.c:296
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "Schl�ssel %08lX tritt mehr als einmal in der \"trustdb\" auf\n"
 
-#: g10/trustdb.c:310
+#: g10/trustdb.c:311
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "Schl�ssel %08lX: kein �ffentlicher Schl�ssel f�r den vertrauensw�rdigen "
 "Schl�ssel - �bersprungen\n"
 
-#: g10/trustdb.c:320
+#: g10/trustdb.c:321
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "Schl�ssel ist als uneingeschr�nkt vertrauensw�rdig gekennzeichnet.\n"
 
-#: g10/trustdb.c:344
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "trust record %lu, req type %d: read failed: %s\n"
 
-#: g10/trustdb.c:350
+#: g10/trustdb.c:351
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "Vertrauenssatz %lu ist nicht von der angeforderten Art %d\n"
 
-#: g10/trustdb.c:446
+#: g10/trustdb.c:447
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:452
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:506
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[widerrufen]"
 
-#: g10/trustdb.c:508 g10/trustdb.c:513
+#: g10/trustdb.c:509 g10/trustdb.c:514
 #, fuzzy
 msgid "[ expired]"
 msgstr "[verfallen]"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 #, fuzzy
 msgid "[ unknown]"
 msgstr "unbekannt"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 #, fuzzy
 msgid "[marginal]"
 msgstr "marginal"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:518
 #, fuzzy
 msgid "[ultimate]"
 msgstr "uneingeschr�nkt"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr "unbestimmt"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 #, fuzzy
 msgid "never"
 msgstr "niemals   "
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr "marginal"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:536
 msgid "full"
 msgstr "vollst�ndig"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr "uneingeschr�nkt"
 
-#: g10/trustdb.c:576
+#: g10/trustdb.c:577
 msgid "no need for a trustdb check\n"
 msgstr "\"Trust-DB\"-�berpr�fung nicht n�tig\n"
 
-#: g10/trustdb.c:582 g10/trustdb.c:2157
+#: g10/trustdb.c:583 g10/trustdb.c:2309
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "n�chste \"Trust-DB\"-Pflicht�berpr�fung am %s\n"
 
-#: g10/trustdb.c:591
+#: 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:606
+#: 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:838 g10/trustdb.c:1276
+#: 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:1033
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr "Bitte ein --check-trustdb durchf�hren\n"
 
-#: g10/trustdb.c:1037
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "\"Trust-DB\" wird �berpr�ft\n"
 
 # translated by wk
-#: g10/trustdb.c:1901
+#: g10/trustdb.c:2053
 #, 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:1965
+#: g10/trustdb.c:2117
 msgid "no ultimately trusted keys found\n"
 msgstr "kein uneingeschr�nkt vertrauensw�rdiger Schl�ssel %08lX gefunden\n"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:2131
 #, 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:2002
+#: g10/trustdb.c:2154
 #, 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:2088
+#: g10/trustdb.c:2240
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2163
+#: g10/trustdb.c:2315
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 "\"Trust-DB\"-Versions-Satz kann nicht ge�ndert werden: Schreiben "
 "fehlgeschlagen: %s\n"
 
-#: g10/verify.c:116
+#: g10/verify.c:117
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -5824,305 +5878,342 @@ msgstr ""
 "Denken Sie daran, da� die Datei mit der Unterschrift (.sig oder .asc)\n"
 "als erster in der Kommandozeile stehen sollte.\n"
 
-#: g10/verify.c:189
+#: g10/verify.c:190
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "Eingabezeile %u ist zu lang oder es fehlt ein LF\n"
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "Allgemeiner Fehler"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "Unbekannter Pakettyp"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "Unbekannte Version"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "Unbekanntes Public-Key-Verfahren"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "Unbekanntes Hashverfahren"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "Falscher �ffentlicher Sch�ssel"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "Falscher geheimer Schl�ssel"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "Falsche Unterschrift"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "Pr�fsummen-Fehler"
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "Falsche Passphrase"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "�ffentlicher Schl�ssel nicht gefunden"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "Unbekanntes Verschl�sselungsverfahren"
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "Der Schl�sselbund kann nicht ge�ffnet werden"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "Ung�ltiges Paket"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "Ung�ltige ASCII-H�lle"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "Keine solche User-ID"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "Geheimer Schl�ssel ist nicht vorhanden"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "Falscher geheimer Schl�ssel benutzt"
 
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "Wird nicht unterst�tzt"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "Falscher Schl�ssel"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "Dateilesefehler"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "Dateischreibfehler"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "Unbekanntes Komprimierverfahren"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "Fehler beim �ffnen der Datei"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "Fehler beim Erzeugen der Datei"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "Ung�ltige Passphrase"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "nicht implementiertes �ffentliches Schl�sselverfahren"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "Verschl�sselungsverfahren ist nicht implementiert"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "Unbekannte Unterschriftenklasse"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "Fehler in der Trust-DB"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "Falsche MPI"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "festdefinierte Ressourcenobergrenze erreicht"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "Ung�ltiger Schl�sselbund"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "Falsches Zertifikat"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "Ung�nstig aufgebaute User-ID"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "Fehler beim Schlie�en der Datei"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "Fehler beim Umbenennen einer Datei"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "Fehler beim L�schen einer Datei"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "Unerwartete Daten"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "Zeitangaben differieren"
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "Unbenutzbares �ffentliches Schl�sselverfahren"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "Datei existiert bereits"
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "Unsicherer Schl�ssel"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "Ung�ltiges Argument"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "fehlerhafter URI"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "Nicht unterst�tzter URI"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "Netzwerkfehler"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "nicht verschl�sselt"
 
-#: util/errors.c:103
+#: util/errors.c:104
 msgid "not processed"
 msgstr "nicht bearbeitet"
 
-#: util/errors.c:105
+#: util/errors.c:106
 msgid "unusable public key"
 msgstr "unbrauchbarer �ffentlicher Sch�ssel"
 
-#: util/errors.c:106
+#: util/errors.c:107
 msgid "unusable secret key"
 msgstr "unbrauchbarer geheimer Schl�ssel"
 
-#: util/errors.c:107
+#: util/errors.c:108
 msgid "keyserver error"
 msgstr "Schl�sselserverfehler"
 
-#: util/errors.c:108
+#: util/errors.c:109
 #, fuzzy
 msgid "canceled"
 msgstr "Abbruch"
 
-#: util/errors.c:109
+#: util/errors.c:110
 msgid "no card"
 msgstr "keine Karte"
 
-#: util/logger.c:157
+#: util/logger.c:158
 msgid "ERROR: "
 msgstr "FEHLER: "
 
-#: util/logger.c:160
+#: util/logger.c:161
 msgid "WARNING: "
 msgstr "WARNUNG: "
 
-#: util/logger.c:223
+#: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... dies ist ein Bug (Programmfehler) (%s:%d:%s)\n"
 
-#: util/logger.c:229
+#: util/logger.c:230
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Sie haben eine Bug (Programmfehler) gefunden ... (%s:%d)\n"
 
-#: util/miscutil.c:336 util/miscutil.c:373
+#: util/miscutil.c:330 util/miscutil.c:367
 msgid "yes"
 msgstr "ja"
 
-#: util/miscutil.c:337 util/miscutil.c:378
+#: util/miscutil.c:331 util/miscutil.c:372
 msgid "yY"
 msgstr "jJyY"
 
-#: util/miscutil.c:339 util/miscutil.c:375
+#: util/miscutil.c:333 util/miscutil.c:369
 msgid "no"
 msgstr "nein"
 
-#: util/miscutil.c:340 util/miscutil.c:379
+#: util/miscutil.c:334 util/miscutil.c:373
 msgid "nN"
 msgstr "nN"
 
-#: util/miscutil.c:377
+#: util/miscutil.c:371
 msgid "quit"
 msgstr "quit"
 
-#: util/miscutil.c:380
+#: util/miscutil.c:374
 msgid "qQ"
 msgstr "qQ"
 
-#: util/miscutil.c:413
+#: util/miscutil.c:407
 msgid "okay|okay"
 msgstr ""
 
-#: util/miscutil.c:415
+#: util/miscutil.c:409
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:416
+#: util/miscutil.c:410
 msgid "oO"
 msgstr "oO"
 
-#: util/miscutil.c:417
+#: util/miscutil.c:411
 msgid "cC"
 msgstr "cC"
 
-#: util/secmem.c:90
+#: util/secmem.c:91
 msgid "WARNING: using insecure memory!\n"
 msgstr "WARNUNG: Sensible Daten k�nnten auf Platte ausgelagert werden.\n"
 
-#: util/secmem.c:91
+#: util/secmem.c:92
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "siehe http://www.gnupg.org/faq.html f�r weitere Informationen\n"
 
 # "  Um dies zu vermeiden, kann das Programm suid(root) installiert werden.\n"
 # "  Bitte wenden Sie sich hierzu an den Systemadministrator.\n"
-#: util/secmem.c:343
+#: util/secmem.c:344
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "Vorgang ist ohne sicheren Hauptspeicher nicht m�glich\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:345
 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 "error getting serial number: %s\n"
+#~ msgstr "Fehler beim Holen der Seriennummer: %s\n"
+
+#~ msgid "Hint: Select the user IDs to sign\n"
+#~ msgstr "Tip: W�hlen Sie die User-IDs, die beglaubigt werden sollen\n"
+
+#~ msgid "length of RSA modulus is not %d\n"
+#~ msgstr "die L�nge des RSA-Modulus betr�gt nicht %d\n"
+
+#~ msgid "length of an RSA prime is not %d\n"
+#~ msgstr "die L�nge einer RSA-Primzahl ist nicht %d\n"
+
+#~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+#~ msgstr ""
+#~ "Falsche Passphrase oder unbekanntes Verschl�sselungsverfahren (%d)\n"
+
+#~ msgid "can't set client pid for the agent\n"
+#~ msgstr "Client-PID f�r den Agent kann nicht gesetzt werden\n"
+
+#~ msgid "can't get server read FD for the agent\n"
+#~ msgstr "Server-Lese-Handle f�r den Agent nicht verf�gbar\n"
+
+#~ msgid "can't get server write FD for the agent\n"
+#~ msgstr "Server-Schreib-Handle f�r den Agent nicht verf�gbar\n"
+
+#~ msgid "communication problem with gpg-agent\n"
+#~ msgstr "Kommunikationsproblem mit GPG-Agent\n"
+
+#~ msgid "passphrase too long\n"
+#~ msgstr "Passphrase ist zu lang\n"
+
+#~ msgid "invalid response from agent\n"
+#~ msgstr "Falsche Antwort des Agenten\n"
+
+#~ msgid "problem with the agent: agent returns 0x%lx\n"
+#~ msgstr "Schwierigkeiten mit dem Agenten: Agent antwortet 0x%lx\n"
+
 #~ msgid "select secondary key N"
 #~ msgstr "Zweitschl�ssel N ausw�hlen"
 
@@ -7187,18 +7278,12 @@ msgstr ""
 #~ msgid "%s: can't create keyring: %s\n"
 #~ msgstr "%s: Schl�sselbund kann nicht erzeugt werden: %s\n"
 
-#~ msgid "invalid"
-#~ msgstr "ung�ltig"
-
 #~ msgid "RSA key cannot be used in this version\n"
 #~ msgstr "RSA-Schl�ssel k�nnen in dieser Version nicht verwendet werden\n"
 
 #~ msgid "No key for user ID\n"
 #~ msgstr "Kein Schl�ssel f�r User-ID\n"
 
-#~ msgid "No user ID for key\n"
-#~ msgstr "Keine User-ID f�r Schl�ssel\n"
-
 #~ msgid "no secret key for decryption available\n"
 #~ msgstr "kein geheimer Schl�ssel zur Entschl�sselung vorhanden\n"
 
diff --git a/po/el.po b/po/el.po
index 618346cd5..edf58a3b8 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: 2005-03-15 16:35+0100\n"
+"POT-Creation-Date: 2005-05-31 10:05+0200\n"
 "PO-Revision-Date: 2003-06-27 12:00+0200\n"
 "Last-Translator: Dokianakis Theofanis <[email protected]>\n"
 "Language-Team: Greek <[email protected]>\n"
@@ -14,82 +14,82 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:120
+#: cipher/primegen.c:121
 #, fuzzy, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr "�������� ��������� ������ ������� �� �������� ��� %d bits\n"
 
-#: cipher/primegen.c:311
+#: cipher/primegen.c:312
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "�������� ��������� ������ ������� �� �������� ��� %d bits\n"
 
-#: cipher/random.c:163
+#: cipher/random.c:164
 msgid "no entropy gathering module detected\n"
 msgstr "��� ����������� ������� �������� ���������\n"
 
-#: cipher/random.c:387 g10/card-util.c:656 g10/card-util.c:725
-#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2255
-#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
-#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
-#: g10/tdbio.c:600
+#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
+#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
+#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
+#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
+#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/tdbio.c:601
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
 
-#: cipher/random.c:391
+#: cipher/random.c:392
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "�������� ����� ����������� ��� �� `%s': %s\n"
 
-#: cipher/random.c:396
+#: cipher/random.c:397
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' ��� ����� �������� ������ - ���������\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:402
 msgid "note: random_seed file is empty\n"
 msgstr "��������: �� ������ random_seed ����� �����\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:408
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "�������������: �� ������ ������� ������� random_seed - ���\n"
 "��������������\n"
 
-#: cipher/random.c:415
+#: cipher/random.c:416
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
 
-#: cipher/random.c:453
+#: cipher/random.c:454
 msgid "note: random_seed file not updated\n"
 msgstr "��������: ��� ���� ��������� �� ������ random_seed\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2723
-#: g10/keygen.c:2753 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
-#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:481
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "�������� �������� ��� `%s': %s\n"
 
-#: cipher/random.c:483
+#: cipher/random.c:484
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: cipher/random.c:728
+#: cipher/random.c:729
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "�������������: ����� �� �������� ���������� ������� �������!!\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:730
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -102,7 +102,7 @@ msgstr ""
 "�� ��������������� �������� ��� ����� �������� ��� ���� �� ���������!!\n"
 "\n"
 
-#: cipher/rndegd.c:204
+#: cipher/rndegd.c:205
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -111,7 +111,7 @@ msgstr ""
 "������ ����������, � �������� ��������������. ����� ��� ���� �������\n"
 "��� �� ��� ���������, ����� ���� �� ��������� ��� �������� ��� ��������.\n"
 
-#: cipher/rndlinux.c:134
+#: cipher/rndlinux.c:135
 #, c-format
 msgid ""
 "\n"
@@ -123,45 +123,62 @@ msgstr ""
 "�� ����������� �� ����������� ������� ����� ���� �� ������������\n"
 "����������� ��������! (����������� %d ����������� bytes)\n"
 
-#: g10/app-openpgp.c:547
+#: g10/app-openpgp.c:596
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: g10/app-openpgp.c:560
+#: g10/app-openpgp.c:609
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "�������� ������������ ��� cache �����������: %s\n"
 
-#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
+#: g10/app-openpgp.c:977
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "�������� block �������� �������: %s\n"
+
+#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+msgid "response does not contain the public key data\n"
+msgstr ""
+
+#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
-#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
+#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
+#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/app-openpgp.c:836
+#: g10/app-openpgp.c:1310
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:857
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:862
+#: g10/app-openpgp.c:1336
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -169,354 +186,359 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:869
+#: g10/app-openpgp.c:1343
 msgid "|A|Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1018
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:1492
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1018
+#: g10/app-openpgp.c:1492
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1022
+#: g10/app-openpgp.c:1496
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
+#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "������ ���� ��� �������� ��� ����� ��������: %s\n"
 
-#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
+#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: ������ ���� �������� ��� �������� free : %s\n"
 
-#: g10/app-openpgp.c:1104
+#: g10/app-openpgp.c:1562
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' ��� �����������\n"
 
-#: g10/app-openpgp.c:1108
+#: g10/app-openpgp.c:1566
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1110
+#: g10/app-openpgp.c:1568
 #, fuzzy
 msgid "generating new key\n"
 msgstr "���������� ���� ���� ������� ��������"
 
-#: g10/app-openpgp.c:1120
+#: g10/app-openpgp.c:1735
+msgid "creation timestamp missing\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1742
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1749
+#, c-format
+msgid "RSA public exponent missing or largerr than %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1827
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "�������� ������������� ��� TrustDB: %s\n"
+
+#: g10/app-openpgp.c:1886
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1135
+#: g10/app-openpgp.c:1901
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1904
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "� ���������� �������� �������: %s\n"
 
-#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
-msgid "response does not contain the public key data\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
-msgid "response does not contain the RSA modulus\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
-msgid "response does not contain the RSA public exponent\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1195
+#: g10/app-openpgp.c:1961
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1356
+#: g10/app-openpgp.c:2130
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1364
+#: g10/app-openpgp.c:2138
 #, c-format
-msgid "PIN [sigs done: %lu]"
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
+#: g10/app-openpgp.c:2399
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "�� �������� ������ OpenPGP ��������.\n"
 
-#: g10/app-openpgp.c:1731
-#, fuzzy, c-format
-msgid "error getting serial number: %s\n"
-msgstr "������ ��� ���������� ��� ������ ������: %s\n"
-
-#: g10/app-openpgp.c:1826
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "�������� ������������� ��� TrustDB: %s\n"
-
-#: g10/app-openpgp.c:1868
-#, fuzzy
-msgid "reading the key failed\n"
-msgstr "�������� block �������� �������: %s\n"
-
-#: g10/armor.c:317
+#: g10/armor.c:318
 #, c-format
 msgid "armor: %s\n"
 msgstr "��������: %s\n"
 
-#: g10/armor.c:346
+#: g10/armor.c:347
 msgid "invalid armor header: "
 msgstr "�� ������ ����������� ���������: "
 
-#: g10/armor.c:353
+#: g10/armor.c:354
 msgid "armor header: "
 msgstr "����������� ���������: "
 
-#: g10/armor.c:364
+#: g10/armor.c:365
 msgid "invalid clearsig header\n"
 msgstr "�� ������ ����������� clearsig\n"
 
-#: g10/armor.c:416
+#: g10/armor.c:417
 msgid "nested clear text signatures\n"
 msgstr "����������� �� ���������������� ���������\n"
 
-#: g10/armor.c:551
+#: g10/armor.c:552
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "�� ����������� ��������:"
 
-#: g10/armor.c:563
+#: g10/armor.c:564
 msgid "invalid dash escaped line: "
 msgstr "�� ������ dash escaped ������: "
 
-#: g10/armor.c:715 g10/armor.c:1322
+#: g10/armor.c:716 g10/armor.c:1323
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "�� ������� radix64 ���������� %02x ���������\n"
 
-#: g10/armor.c:758
+#: g10/armor.c:759
 msgid "premature eof (no CRC)\n"
 msgstr "������ ����� ������� (������� CRC)\n"
 
-#: g10/armor.c:792
+#: g10/armor.c:793
 msgid "premature eof (in CRC)\n"
 msgstr "������ ����� ������� (����� CRC)\n"
 
-#: g10/armor.c:800
+#: g10/armor.c:801
 msgid "malformed CRC\n"
 msgstr "����� ����� CRC\n"
 
-#: g10/armor.c:804 g10/armor.c:1359
+#: g10/armor.c:805 g10/armor.c:1360
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "������ CRC: %06lx - %06lx\n"
 
-#: g10/armor.c:824
+#: g10/armor.c:825
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "������ ����� ������� (��� �railer)\n"
 
-#: g10/armor.c:828
+#: g10/armor.c:829
 msgid "error in trailer line\n"
 msgstr "������ ��� ������ trailer\n"
 
-#: g10/armor.c:1137
+#: g10/armor.c:1138
 msgid "no valid OpenPGP data found.\n"
 msgstr "�� �������� ������ OpenPGP ��������.\n"
 
-#: g10/armor.c:1142
+#: g10/armor.c:1143
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "�� ������ ��������: � ������ ����� ���� ��� %d ����������\n"
 
-#: g10/armor.c:1146
+#: g10/armor.c:1147
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "�����������, �� ����������, ���������� ��� �������� - ���� ����� ����� "
 "������������� MTA\n"
 
-#: g10/card-util.c:58 g10/card-util.c:295
+#: g10/card-util.c:63 g10/card-util.c:303
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "�� ������� ������ ��� ����� ���������"
 
-#: g10/card-util.c:63
+#: g10/card-util.c:68
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1329 g10/delkey.c:127 g10/keyedit.c:1430
-#: g10/keygen.c:2439 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1510
+#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "��� ������ �� ����� ���� �� ��������� ������ (batchmode)\n"
 
-#: g10/card-util.c:97 g10/card-util.c:1108 g10/card-util.c:1191
-#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
-#: g10/keygen.c:1365
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
+#: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "� ������� ���; "
 
-#: g10/card-util.c:206 g10/card-util.c:256
+#: g10/card-util.c:213 g10/card-util.c:263
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:391
+#: g10/card-util.c:410
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 #, fuzzy
 msgid "unspecified"
 msgstr "��� ���� ������� �����"
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 #, fuzzy
 msgid "not forced"
 msgstr "�� �������������"
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:497
+#: g10/card-util.c:516
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:499
+#: g10/card-util.c:518
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:501
+#: g10/card-util.c:520
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:518
+#: g10/card-util.c:537
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:539
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:538
+#: g10/card-util.c:557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:559
+#: g10/card-util.c:578
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "������ ��������� ������� ������: %s\n"
 
-#: g10/card-util.c:567
+#: g10/card-util.c:586
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:665 g10/card-util.c:734 g10/import.c:261
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:692
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:683
+#: g10/card-util.c:702
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:742
+#: g10/card-util.c:761
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:752
+#: g10/card-util.c:771
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:772
+#: g10/card-util.c:791
 #, fuzzy
 msgid "Language preferences: "
 msgstr "����������� ��������"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:799
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "�� ������� ���������� ��� \"�������\" ��� ��������\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:808
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "�� ������� ���������� ��� \"�������\" ��� ��������\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:829
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:824
+#: g10/card-util.c:843
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "������: �� ������ ���������\n"
 
-#: g10/card-util.c:845
+#: g10/card-util.c:864
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "���������� ��� fingerprint"
 
-#: g10/card-util.c:868
+#: g10/card-util.c:887
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "������: �� ������ ���������\n"
 
-#: g10/card-util.c:916
+#: g10/card-util.c:935
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "� ���������� �������� �������: %s\n"
 
-#: g10/card-util.c:917
+#: g10/card-util.c:936
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "�� �������� ������ OpenPGP ��������.\n"
 
-#: g10/card-util.c:926
+#: g10/card-util.c:945
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1030
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1030 g10/card-util.c:1039
+#: g10/card-util.c:1051 g10/card-util.c:1060
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1051
+#: g10/card-util.c:1072
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1060
+#: g10/card-util.c:1081
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -524,279 +546,283 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1099
+#: g10/card-util.c:1120
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "�������� �������� ��� ���� ��� �������� ��� ������:\n"
 
-#: g10/card-util.c:1101 g10/card-util.c:1182
+#: g10/card-util.c:1122 g10/card-util.c:1203
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/card-util.c:1102 g10/card-util.c:1184
+#: g10/card-util.c:1123 g10/card-util.c:1205
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (��� ������������� ����)\n"
 
-#: g10/card-util.c:1103 g10/card-util.c:1186
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1119 g10/card-util.c:1202 g10/keyedit.c:908
-#: g10/keygen.c:1404 g10/revoke.c:642
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
+#: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "�� ������ �������.\n"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1200
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "�������� �������� ��� ����� ��� ��� ��������:\n"
 
-#: g10/card-util.c:1214
+#: g10/card-util.c:1235
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "�������� ���������� ����������\n"
 
-#: g10/card-util.c:1219
+#: g10/card-util.c:1240
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/card-util.c:1224
+#: g10/card-util.c:1245
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "������������: ������� ������ ��� �����\n"
 
-#: g10/card-util.c:1294 g10/keyedit.c:1317
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "����������� ����� ��� �����"
 
-#: g10/card-util.c:1296
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "show admin commands"
 msgstr "������������� �������\n"
 
-#: g10/card-util.c:1297 g10/keyedit.c:1320
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "���������� ����� ��� ��������"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "list all available data"
 msgstr "������ ��������� ���: "
 
-#: g10/card-util.c:1302
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1303
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1304
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1305
+#: g10/card-util.c:1327
 #, fuzzy
 msgid "change the login name"
 msgstr "������ ��� ����������� �����"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the language preferences"
 msgstr "������ ��� ������������ ���������"
 
-#: g10/card-util.c:1307
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1308
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "���������� ��� fingerprint"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1310
+#: g10/card-util.c:1332
 #, fuzzy
 msgid "generate new keys"
 msgstr "���������� ���� ���� ������� ��������"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1377 g10/keyedit.c:1526
+#: g10/card-util.c:1334
+msgid "verify the PIN and list all data"
+msgstr ""
+
+#: g10/card-util.c:1454 g10/keyedit.c:1609
 msgid "Command> "
 msgstr "������> "
 
-#: g10/card-util.c:1412
+#: g10/card-util.c:1492
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "������������� �������\n"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "������������� �������\n"
 
-#: g10/card-util.c:1430
+#: g10/card-util.c:1525
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/card-util.c:1499 g10/keyedit.c:2104
+#: g10/card-util.c:1599 g10/keyedit.c:2210
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�� ������ ������  (��������� \"help\")\n"
 
-#: g10/cardglue.c:287
+#: g10/cardglue.c:396
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:519
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:380
+#: g10/cardglue.c:527
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:852
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:853
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:854
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:691
+#: g10/cardglue.c:855
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:705
+#: g10/cardglue.c:872
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "����������� �� ����� ������: "
 
-#: g10/cardglue.c:719
+#: g10/cardglue.c:886
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "� ����� ������ ��� ������������ �����. ��������� ����"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
-#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "�������� ��������� ��� `%s'\n"
 
-#: g10/decrypt.c:104 g10/encode.c:859
+#: g10/decrypt.c:105 g10/encode.c:846
 msgid "--output doesn't work for this command\n"
 msgstr "--output ��� ���������� ��� ���� ��� ������\n"
 
-#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3167 g10/keyserver.c:1511
-#: g10/revoke.c:226
+#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3346 g10/keyserver.c:1541
+#: g10/revoke.c:227
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "�� ������ '%s' �� �������: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2300 g10/keyserver.c:1525
-#: g10/revoke.c:232 g10/revoke.c:439
+#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "������ ���� ��� �������� ��� ����� ��������: %s\n"
 
-#: g10/delkey.c:128 g10/delkey.c:135
+#: g10/delkey.c:129 g10/delkey.c:136
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(����� ��� ������������� ��� ������ ��� ���������)\n"
 
-#: g10/delkey.c:134
+#: g10/delkey.c:135
 #, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "��� ������ �� ����� ���� �� ��������� ������ ����� �� \"--yes\"\n"
 
-#: g10/delkey.c:146
+#: g10/delkey.c:147
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "�������� ����� ��� �������� ��� �� ����������; "
 
-#: g10/delkey.c:154
+#: g10/delkey.c:155
 #, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "���� ����� ��� ������� ������! - ������� �� ���������; "
 
-#: g10/delkey.c:164
+#: g10/delkey.c:165
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: g10/delkey.c:174
+#: g10/delkey.c:175
 msgid "ownertrust information cleared\n"
 msgstr "���������� ����������� ������������-���������\n"
 
-#: g10/delkey.c:205
+#: g10/delkey.c:206
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "������� ��� ������� ������ ��� �� ������� ������ \"%s\"!\n"
 
-#: g10/delkey.c:207
+#: g10/delkey.c:208
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 "��������������� ����� ��� ������� \"--delete-secret-key\" ��� �������� ���.\n"
 
-#: g10/encode.c:210 g10/sign.c:1186
+#: g10/encode.c:211 g10/sign.c:1218
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: g10/encode.c:215
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "�������� ������ ���� ����������� ������� ESK ���� ��� ���������� S2K\n"
 
-#: g10/encode.c:228
+#: g10/encode.c:229
 #, c-format
 msgid "using cipher %s\n"
 msgstr "����� ��� ���������������: %s\n"
 
-#: g10/encode.c:238 g10/encode.c:558
+#: g10/encode.c:239 g10/encode.c:545
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' ��� �����������\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
+#: g10/encode.c:302 g10/encode.c:591 g10/sign.c:566
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "�������������: `%s' ����� ��� ����� ������\n"
 
-#: g10/encode.c:472
+#: g10/encode.c:466
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "������������� �� ������� RSA ��� 2048 bit � ��� ���� ���� �� ��������� --"
 "pgp2\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:488
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "�������� ��� `%s'\n"
 
-#: g10/encode.c:530
+#: g10/encode.c:517
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "�������� ������ ��� ��������������� IDEA ��� ��� �� ������� �� �� "
 "�������������������.\n"
 
-#: g10/encode.c:540
+#: g10/encode.c:527
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -804,7 +830,7 @@ msgstr ""
 "� ������������ ����������� ���������� %s (%d) ���������� ���\n"
 "�������� ��� ���������\n"
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:635 g10/sign.c:899
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -813,129 +839,129 @@ msgstr ""
 "� ������������ ������ ��� ���������� ��������� %s (%d) ���������� ���\n"
 "�������� ��� ���������\n"
 
-#: g10/encode.c:735
+#: g10/encode.c:722
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "� ������������ ����������� ���������� %s (%d) ���������� ���\n"
 "�������� ��� ���������\n"
 
-#: g10/encode.c:805 g10/pkclist.c:721 g10/pkclist.c:757
+#: g10/encode.c:792 g10/pkclist.c:722 g10/pkclist.c:758
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/encode.c:832
+#: g10/encode.c:819
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s ��������������� ���: \"%s\"\n"
 
-#: g10/encr-data.c:66 g10/mainproc.c:301
+#: g10/encr-data.c:67 g10/mainproc.c:302
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s ��������������� ��������\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:305
+#: g10/encr-data.c:69 g10/mainproc.c:306
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "��������������� �� ������� ��������� %d\n"
 
-#: g10/encr-data.c:92
+#: g10/encr-data.c:93
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "�������������: �� ������ ��������������� �� ������� ������ ���\n"
 "���������� ��������������.\n"
 
-#: g10/encr-data.c:103
+#: g10/encr-data.c:104
 msgid "problem handling encrypted packet\n"
 msgstr "�������� ��� �������� ���������������� �������\n"
 
-#: g10/exec.c:48
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "��� ������������ � ������������� �������� ������������\n"
 
-#: g10/exec.c:184 g10/openfile.c:406
+#: g10/exec.c:173 g10/openfile.c:410
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "�������� ����������� ��������� `%s': %s\n"
 
-#: g10/exec.c:325
+#: g10/exec.c:314
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "�� ������� ���������� ������������ ����������������� ���� ��������� ������\n"
 "�������\n"
 
-#: g10/exec.c:355
+#: g10/exec.c:344
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "���� � ��������� ������� ������. ������ ���� ����� ���������� ������������\n"
 
-#: g10/exec.c:433
+#: g10/exec.c:422
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "�������� ��������� ��� %s \"%s\": %s\n"
 
-#: g10/exec.c:436
+#: g10/exec.c:425
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "�������� ��������� ��� %s \"%s\": %s\n"
 
-#: g10/exec.c:521
+#: g10/exec.c:510
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "������ ���������� ���� ��� ����� ���������� ������������: %s\n"
 
-#: g10/exec.c:532 g10/exec.c:598
+#: g10/exec.c:521 g10/exec.c:587
 msgid "unnatural exit of external program\n"
 msgstr "������� ������ ��� ���������� ������������\n"
 
-#: g10/exec.c:547
+#: g10/exec.c:536
 msgid "unable to execute external program\n"
 msgstr "�������� ��������� ��� ���������� ������������\n"
 
-#: g10/exec.c:563
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "�������� ��������� ��� ��������� ��� ���������� ������������: %s\n"
 
-#: g10/exec.c:609 g10/exec.c:616
+#: g10/exec.c:598 g10/exec.c:605
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
 
-#: g10/exec.c:621
+#: g10/exec.c:610
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "�������������: �������� ��������� ���������� ������� `%s': %s\n"
 
-#: g10/export.c:183
+#: g10/export.c:184
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/export.c:212
+#: g10/export.c:213
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "������ %08lX: ��� ����� ������������� - ������������\n"
 
-#: g10/export.c:220
+#: g10/export.c:221
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "������ %08lX:  ������ ����� PGP 2.x - ������������\n"
 
-#: g10/export.c:395
+#: g10/export.c:398
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "�������������: �� ������� ������ %08lX ��� ���� ���� SK checksum\n"
 
-#: g10/export.c:427
+#: g10/export.c:430
 msgid "WARNING: nothing exported\n"
 msgstr "�������������: ��� ����� ������ �������\n"
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid ""
 "@Commands:\n"
 " "
@@ -943,128 +969,128 @@ msgstr ""
 "@�������:\n"
 " "
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "|[file]|make a signature"
 msgstr "|[������]|���������� ���� ���������"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "|[file]|make a clear text signature"
 msgstr "|[������]|���������� ���� �� ���������������� ���������"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "make a detached signature"
 msgstr "���������� ���� �� ������������� ���������"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encrypt data"
 msgstr "������������� ���������"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "encryption only with symmetric cipher"
 msgstr "������������� �� ����� ���� ����������� ����������"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "decrypt data (default)"
 msgstr "���������������� ��������� (��������������)"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "verify a signature"
 msgstr "���������� ���� ���������"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys"
 msgstr "���������� ��� ������ ��������"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and signatures"
 msgstr "���������� ��� ������ �������� ��� ���������"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "������� ��������� ��������"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "list keys and fingerprints"
 msgstr "���������� ��� ������ �������� ��� ������������ (fingerprints)"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "list secret keys"
 msgstr "���������� ��� ������ �������� ��������"
 
-#: g10/g10.c:379
+#: g10/g10.c:381
 msgid "generate a new key pair"
 msgstr "���������� ���� ���� ������� ��������"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the public keyring"
 msgstr "�������� ��� �������� ��� �� ������� ����������"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "remove keys from the secret keyring"
 msgstr "�������� ��� �������� ��� �� ������� ����������"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign a key"
 msgstr "�������� ���� ��������"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "sign a key locally"
 msgstr "�������� ���� �������� ������"
 
-#: g10/g10.c:385
+#: g10/g10.c:387
 msgid "sign or edit a key"
 msgstr "�������� � ����������� ���� ��������"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "generate a revocation certificate"
 msgstr "���������� ���� �������������� ���������"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "export keys"
 msgstr "������� ��������"
 
-#: g10/g10.c:389
+#: g10/g10.c:391
 msgid "export keys to a key server"
 msgstr "������� �������� �� ��� ���������� ��������"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "import keys from a key server"
 msgstr "�������� �������� ��� ��� ���������� ��������"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "search for keys on a key server"
 msgstr "��������� �������� �� ��� ���������� ��������"
 
-#: g10/g10.c:394
+#: g10/g10.c:396
 msgid "update all keys from a keyserver"
 msgstr "�������� ���� ��� �������� ��� ��� ���������� ��������"
 
-#: g10/g10.c:397
+#: g10/g10.c:399
 msgid "import/merge keys"
 msgstr "��������/���������� ��������"
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "print the card status"
 msgstr ""
 
-#: g10/g10.c:401
+#: g10/g10.c:403
 msgid "change data on a card"
 msgstr ""
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/g10.c:410
+#: g10/g10.c:412
 msgid "update the trust database"
 msgstr "�������� ��� ����� ��������� ������������"
 
-#: g10/g10.c:417
+#: g10/g10.c:419
 msgid "|algo [files]|print message digests"
 msgstr "|����� [������]| ���������� ���������� ��� ���������"
 
-#: g10/g10.c:421 g10/gpgv.c:66
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1074,51 +1100,51 @@ msgstr ""
 "��������:\n"
 " "
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "create ascii armored output"
 msgstr "���������� ascii ������������ ������"
 
-#: g10/g10.c:425
+#: g10/g10.c:427
 msgid "|NAME|encrypt for NAME"
 msgstr "|�����|������������� ��� �����"
 
-#: g10/g10.c:436
+#: g10/g10.c:438
 msgid "use this user-id to sign or decrypt"
 msgstr "����� ����� ��� ���������� (user id) ��� �������� � ����������������"
 
-#: g10/g10.c:437
+#: g10/g10.c:439
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|���������� �������� ��������� N (0 �������������)"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "use canonical text mode"
 msgstr "����� ��������� ���������� ��������"
 
-#: g10/g10.c:452
+#: g10/g10.c:458
 msgid "use as output file"
 msgstr "����� �� ������� ������"
 
-#: g10/g10.c:454 g10/gpgv.c:68
+#: g10/g10.c:460 g10/gpgv.c:73
 msgid "verbose"
 msgstr "���������"
 
-#: g10/g10.c:465
+#: g10/g10.c:471
 msgid "do not make any changes"
 msgstr "�� �� ����� ������ ������"
 
-#: g10/g10.c:466
+#: g10/g10.c:472
 msgid "prompt before overwriting"
 msgstr "������� ���� ��� ���������"
 
-#: g10/g10.c:507
+#: g10/g10.c:513
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:508
+#: g10/g10.c:514
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:536
+#: g10/g10.c:542
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1126,7 +1152,7 @@ msgstr ""
 "@\n"
 "(����� �� ������ man ��� ��� ����� ����� ������� ��� ��������)\n"
 
-#: g10/g10.c:539
+#: g10/g10.c:545
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1146,15 +1172,15 @@ msgstr ""
 " --list-keys [�������]        ���������� ��������\n"
 " --fingerprint [�������]      ���������� ������������ (fingerprints)\n"
 
-#: g10/g10.c:720 g10/gpgv.c:93
+#: g10/g10.c:724 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "��������� �� ���������� ��� <[email protected]>\n"
 
-#: g10/g10.c:737
+#: g10/g10.c:741
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: g10/g10.c:740
+#: g10/g10.c:744
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1164,7 +1190,7 @@ msgstr ""
 "��������, �������, ������������� � ����������������\n"
 "� �������������� ���������� ��������� ��� �� �������� �������\n"
 
-#: g10/g10.c:751
+#: g10/g10.c:755
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1172,471 +1198,481 @@ msgstr ""
 "\n"
 "��������������� ����������:\n"
 
-#: g10/g10.c:754
+#: g10/g10.c:758
 msgid "Pubkey: "
 msgstr "�����������:"
 
-#: g10/g10.c:760 g10/keyedit.c:2141
+#: g10/g10.c:764 g10/keyedit.c:2248
 msgid "Cipher: "
 msgstr "���������������: "
 
-#: g10/g10.c:766
+#: g10/g10.c:770
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:772 g10/keyedit.c:2187
+#: g10/g10.c:776 g10/keyedit.c:2294
 msgid "Compression: "
 msgstr "��������: "
 
-#: g10/g10.c:855
+#: g10/g10.c:859
 msgid "usage: gpg [options] "
 msgstr "�����: gpg [��������] "
 
-#: g10/g10.c:1003
+#: g10/g10.c:1007
 msgid "conflicting commands\n"
 msgstr "������������� �������\n"
 
-#: g10/g10.c:1021
+#: g10/g10.c:1025
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "��� ������� �� ������� = ���� ������ ��� ������ \"%s\"\n"
 
-#: g10/g10.c:1218
+#: g10/g10.c:1222
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:1221
+#: g10/g10.c:1225
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:1224
+#: g10/g10.c:1228
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:1230
+#: g10/g10.c:1234
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/g10.c:1233
+#: g10/g10.c:1237
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1240
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/g10.c:1242
+#: g10/g10.c:1246
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:1245
+#: g10/g10.c:1249
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:1248
+#: g10/g10.c:1252
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1258
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:1257
+#: g10/g10.c:1261
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:1260
+#: g10/g10.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:1401
+#: g10/g10.c:1405
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "������� ����������� ��������� \"%s\"\n"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1802
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "��������: ��������� �� ����� ������ ��������������� �������� `%s'\n"
 
-#: g10/g10.c:1838
+#: g10/g10.c:1844
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "��������: �� �������������� ������ �������� `%s'\n"
 
-#: g10/g10.c:1842
+#: g10/g10.c:1848
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "������ �������� `%s': %s\n"
 
-#: g10/g10.c:1849
+#: g10/g10.c:1855
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�������� �������� ��� `%s'\n"
 
-#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "��������: �� %s ��� ����� ��� �������� �����!\n"
 
-#: g10/g10.c:2076
+#: g10/g10.c:2082
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "� �������� ��� ��������������� \"%s\" ��� ��������� ������ ��������\n"
 "���������� ������\n"
 
-#: g10/g10.c:2293
+#: g10/g10.c:2236 g10/g10.c:2248
+#, fuzzy, c-format
+msgid "`%s' is not a valid signature expiration\n"
+msgstr "�� %s ��� ����� ������ ��� ����������\n"
+
+#: g10/g10.c:2321
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3683
+#: g10/g10.c:2340 g10/keyedit.c:3862
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2346
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2349
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2356
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2359
 msgid "invalid import options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2366
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2369
 msgid "invalid export options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2376
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2379
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2401
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2404
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2411
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "�������� ������� ��� exec-path �� %s\n"
 
-#: g10/g10.c:2573
+#: g10/g10.c:2602
 msgid "WARNING: program may create a core file!\n"
 msgstr "�������������: �� ��������� ���� ������������ ������ core!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2606
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�������������: �� %s ����������� �� %s\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2615
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�� %s ��� ����������� �� �� %s!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2618
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�� %s ��� ���� ������ ������ ���� �� �� %s!\n"
 
-#: g10/g10.c:2603
+#: g10/g10.c:2625
+#, fuzzy, c-format
+msgid "NOTE: %s is not available in this version\n"
+msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
+
+#: g10/g10.c:2640
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/g10.c:2617
+#: g10/g10.c:2654
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ������ ����������� � ������� ��������� ���� �� --pgp2 ���������\n"
 
-#: g10/g10.c:2623
+#: g10/g10.c:2660
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "��� �������� �� ���������� ��� �� �������������� ���������� �� --pgp2 "
 "���������\n"
 
-#: g10/g10.c:2629
+#: g10/g10.c:2666
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "���� ������ ������������ (��� ��� pipes) ���� ��� ��������� --pgp2.\n"
 
-#: g10/g10.c:2642
+#: g10/g10.c:2679
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "� ������������� ���� ��������� �� --pgp2 ��������� ������� ��� �����. IDEA\n"
 
-#: g10/g10.c:2712 g10/g10.c:2736
+#: g10/g10.c:2746 g10/g10.c:2770
 msgid "selected cipher algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/g10.c:2718 g10/g10.c:2742
+#: g10/g10.c:2752 g10/g10.c:2776
 msgid "selected digest algorithm is invalid\n"
 msgstr "� ����������� ���������� ��������� ��� ����� �������\n"
 
-#: g10/g10.c:2724
+#: g10/g10.c:2758
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2764
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 "� ����������� ���������� ��������� ��� �����������\n"
 "��� ����� �������\n"
 
-#: g10/g10.c:2745
+#: g10/g10.c:2779
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ������ �� ����� ���������� ��� 0\n"
 
-#: g10/g10.c:2747
+#: g10/g10.c:2781
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ������ �� ����� ���������� ��� 1\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2783
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth ������ �� ����� ������ 1 ��� 255\n"
 
-#: g10/g10.c:2751
+#: g10/g10.c:2785
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "�� ������ default-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
 
-#: g10/g10.c:2753
+#: g10/g10.c:2787
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "�� ������ min-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
 
-#: g10/g10.c:2756
+#: g10/g10.c:2790
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "��������: � ���� S2K ��������� (0) ������ �� �����������\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2794
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�� ������ ��������� S2K; ������ �� ����� 0, 1 � 3\n"
 
-#: g10/g10.c:2767
+#: g10/g10.c:2801
 msgid "invalid default preferences\n"
 msgstr "�� ������� �����������\n"
 
-#: g10/g10.c:2776
+#: g10/g10.c:2810
 msgid "invalid personal cipher preferences\n"
 msgstr "�� ������� ����������� ���������� ���������������\n"
 
-#: g10/g10.c:2780
+#: g10/g10.c:2814
 msgid "invalid personal digest preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/g10.c:2784
+#: g10/g10.c:2818
 msgid "invalid personal compress preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/g10.c:2817
+#: g10/g10.c:2851
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�� %s ����� �� ���������� ���� �� �� %s\n"
 
-#: g10/g10.c:2864
+#: g10/g10.c:2898
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "����������� � ����� ��� ��������������� \"%s\" ���� ��������� %s\n"
 
-#: g10/g10.c:2869
+#: g10/g10.c:2903
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/g10.c:2874
+#: g10/g10.c:2908
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/g10.c:2970
+#: g10/g10.c:3004
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: g10/g10.c:2981
+#: g10/g10.c:3015
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "�������������: ������� ���������� (-r) ����� ����� ��������������\n"
 "�������� ��������\n"
 
-#: g10/g10.c:2992
+#: g10/g10.c:3026
 msgid "--store [filename]"
 msgstr "--store [����� �������]"
 
-#: g10/g10.c:2999
+#: g10/g10.c:3033
 msgid "--symmetric [filename]"
 msgstr "--symmetric [����� �������]"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3035
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "���������������� �������: %s\n"
 
-#: g10/g10.c:3011
+#: g10/g10.c:3045
 msgid "--encrypt [filename]"
 msgstr "--encrypt [����� �������]"
 
-#: g10/g10.c:3024
+#: g10/g10.c:3058
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3060
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3029
+#: g10/g10.c:3063
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/g10.c:3047
+#: g10/g10.c:3081
 msgid "--sign [filename]"
 msgstr "--sign [����� �������]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3094
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/g10.c:3075
+#: g10/g10.c:3109
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/g10.c:3077
+#: g10/g10.c:3111
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3080
+#: g10/g10.c:3114
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/g10.c:3100
+#: g10/g10.c:3134
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [����� �������]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3143
 msgid "--clearsign [filename]"
 msgstr "--clearsign [����� �������]"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3168
 msgid "--decrypt [filename]"
 msgstr "--decrypt [����� �������]"
 
-#: g10/g10.c:3142
+#: g10/g10.c:3176
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:3146
+#: g10/g10.c:3180
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:3167
+#: g10/g10.c:3201
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [�������]"
 
-#: g10/g10.c:3238
+#: g10/g10.c:3272
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [����������]"
 
-#: g10/g10.c:3275
+#: g10/g10.c:3309
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/g10.c:3277
+#: g10/g10.c:3311
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver ���� �������: %s\n"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3313
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "������� �������� �������: %s\n"
 
-#: g10/g10.c:3290
+#: g10/g10.c:3324
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver ��������� �������: %s\n"
 
-#: g10/g10.c:3300
+#: g10/g10.c:3334
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/g10.c:3341
+#: g10/g10.c:3375
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "����������� �������: %s\n"
 
-#: g10/g10.c:3349
+#: g10/g10.c:3383
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�������� �������: %s\n"
 
-#: g10/g10.c:3436
+#: g10/g10.c:3470
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�� ������� ����������  hash `%s'\n"
 
-#: g10/g10.c:3559
+#: g10/g10.c:3593
 msgid "[filename]"
 msgstr "[����� �������]"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3597
 msgid "Go ahead and type your message ...\n"
 msgstr "�������� ���� �� ���������� �� ������ ��� ...\n"
 
-#: g10/g10.c:3853
+#: g10/g10.c:3887
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1644,78 +1680,83 @@ msgstr ""
 "��� ����� ��������� ������ �� �������� ���� ������������ ���������� ��� ���� "
 "��� �� ����� �� ��� '='\n"
 
-#: g10/g10.c:3861
+#: g10/g10.c:3895
 msgid "a user notation name must contain the '@' character\n"
 msgstr "�� ����� ��������� ������ ������ �� �������� �� '@' ���������\n"
 
-#: g10/g10.c:3871
+#: g10/g10.c:3900
+#, fuzzy
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr "�� ����� ��������� ������ ������ �� �������� �� '@' ���������\n"
+
+#: g10/g10.c:3911
 msgid "a notation value must not use any control characters\n"
 msgstr "� ���� ��������� ������ �� �� ������������ ���������� control\n"
 
-#: g10/g10.c:3905
+#: g10/g10.c:3945
 msgid "the given certification policy URL is invalid\n"
 msgstr "�� URL ��������� �������������� ��� ������ ��� ����� ������\n"
 
-#: g10/g10.c:3907
+#: g10/g10.c:3947
 msgid "the given signature policy URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/g10.c:3940
+#: g10/g10.c:3980
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "���� ������ ������������ ��� pk cache - ����������������\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2750
+#: g10/getkey.c:187 g10/getkey.c:2757
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[User id ��� �������]"
 
-#: g10/getkey.c:1677
+#: g10/getkey.c:1684
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "�� ������ ������ %08lX ����� ������ ��� �� --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2228
+#: g10/getkey.c:2235
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "������ ������� ��������� ��� �� ������� ��������� %08lX - �������\n"
 
-#: g10/getkey.c:2459
+#: g10/getkey.c:2466
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "����� ��� ������������� �������� %08lX ���� ��� ����������� %08lX\n"
 
-#: g10/getkey.c:2506
+#: g10/getkey.c:2513
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "������ %08lX: ������� ������ ����� ������� - ������������\n"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:74
 msgid "be somewhat more quiet"
 msgstr "����� ������"
 
-#: g10/gpgv.c:70
+#: g10/gpgv.c:75
 msgid "take the keys from this keyring"
 msgstr "������� ��� �������� ��� ���� �� ����������"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:77
 msgid "make timestamp conflicts only a warning"
 msgstr "������� ��� ����������� ���� (timestamp) ���� ��� �������������"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:78
 msgid "|FD|write status info to this FD"
 msgstr "|FD|������� ��� ����������� ���������� ��� FD"
 
-#: g10/gpgv.c:97
+#: g10/gpgv.c:102
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "�����: gpgv [��������] [������] (-h ��� �������)"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:105
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1723,7 +1764,7 @@ msgstr ""
 "�������: gpg [��������] [������]\n"
 "������� ��������� �� �������� �� ������ ������������ �������\n"
 
-#: g10/helptext.c:48
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1734,7 +1775,7 @@ msgstr ""
 "������������,\n"
 "��� ���� ������ �� ����� �� ��� (������� �������������) ����-��������������."
 
-#: g10/helptext.c:54
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1748,19 +1789,19 @@ msgstr ""
 "������\n"
 "���� ����� �����������\n"
 
-#: g10/helptext.c:61
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "��� ������ �� ��������������� ���� �� �� ������������ ������, ��������� \"yes"
 "\"."
 
-#: g10/helptext.c:65
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr ""
 "�������������� �� user ID ��� �������� ����� ��� ������ �� �������� ������."
 
-#: g10/helptext.c:69
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1774,7 +1815,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:83
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -1784,16 +1825,16 @@ msgstr ""
 "��� �������������. ����� � ���������� ������ �� ��������������� ���� ��\n"
 "���������� ������. � �������� ���� ������� �� ������ ��������� ����������."
 
-#: g10/helptext.c:90
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "�������������� �� ������� ��� ��������"
 
-#: g10/helptext.c:94 g10/helptext.c:99 g10/helptext.c:111 g10/helptext.c:143
-#: g10/helptext.c:171 g10/helptext.c:176 g10/helptext.c:181
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "��������� \"yes\"(���) � \"no\"(���)"
 
-#: g10/helptext.c:104
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1805,19 +1846,19 @@ msgstr ""
 "��� �� ������ ��� ���� �������� ��������� - �������� �� �������\n"
 "��������� �� ���������� ��� ���� ��� ��������."
 
-#: g10/helptext.c:116
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "�������������� �� ����� ��� �������������"
 
-#: g10/helptext.c:121
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr "�������������� ����������� ��� ��������� email (����������)"
 
-#: g10/helptext.c:125
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "�������� ����������� �������������� ��� ������"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1831,13 +1872,13 @@ msgstr ""
 "O  ��� �������� ��� ����������� ��������.\n"
 "Q  ��� �� ����������� �� ���������� ��������."
 
-#: g10/helptext.c:139
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr ""
 "��������� \"yes\" (� ���� \"y\") ��� ����� ������� �� ������������ �� "
 "���������."
 
-#: g10/helptext.c:147
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -1909,12 +1950,12 @@ msgstr ""
 "\n"
 "��� ��� ������ ���� ����� � ����� ��������, ����� \"0\"."
 
-#: g10/helptext.c:185
+#: g10/helptext.c:186
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "��������� \"yes\" ��� ������ �� ���������� ��� �� user ID"
 
-#: g10/helptext.c:189
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -1922,11 +1963,11 @@ msgstr ""
 "��������� \"yes\" ��� ���������� ������ �� ��������� ����\n"
 "�� user ID.  ��� �� ������������� �� ������ ����!"
 
-#: g10/helptext.c:194
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "��������� \"yes\" ��� ����� ������� �� ��������� �� ���������"
 
-#: g10/helptext.c:199
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -1937,7 +1978,7 @@ msgstr ""
 "��������� ��� �������� ������������ ��� ������ � �� ��� ���� ������\n"
 "������������� ��� ����."
 
-#: g10/helptext.c:204
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -1949,7 +1990,7 @@ msgstr ""
 "��������������� ����� ���� �� ������ ��������� ������ �� ����������\n"
 "��� ������� ������������ ���� ���� ����� ��� �������������� ��������."
 
-#: g10/helptext.c:210
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -1957,7 +1998,7 @@ msgstr ""
 "� �������� ��� ����� ������.  ����� ������ �� ��������� ��� ��\n"
 "���������� ���."
 
-#: g10/helptext.c:214
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -1971,7 +2012,7 @@ msgstr ""
 "�� ������ ���.  ����� �� ���������� ���� ��� ���� � ����-�������� ���\n"
 "������ ���� ��� ����� ������ � ������� ��� �������."
 
-#: g10/helptext.c:222
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -1981,23 +2022,23 @@ msgstr ""
 "���� ������������ ����� �����������.  � ���������� ���� ��� ������������\n"
 "����-��������� �� ������� ���� 1 ������������.\n"
 
-#: g10/helptext.c:229
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 
-#: g10/helptext.c:235
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "�������� ����������� �� ��������� ����� ������, ��� ��������."
 
-#: g10/helptext.c:239
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "����� �� ����� ��� ������� ��� ����� ����������� � ��������"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "��������� \"yes\" ��� ����� ������� �� ����������� �� ������"
 
-#: g10/helptext.c:249
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2005,7 +2046,7 @@ msgstr ""
 "�������� �������� ��� ��� ����� �������. ��� ���� �������� RETURN\n"
 "�� ��'������� ������ (������������� ���� �������) �� ��������������."
 
-#: g10/helptext.c:255
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2033,7 +2074,7 @@ msgstr ""
 "      ��������������� ���� ��� �� �������� ��� �� user ID ��� ������\n"
 "      �� ��������������� ���. ��� �� ������� ����� ��� ��������� email.\n"
 
-#: g10/helptext.c:271
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2044,478 +2085,483 @@ msgstr ""
 "�������� �������� ���� �� ������� ���������. ��� ����� ������\n"
 "����� �� �������.\n"
 
-#: g10/helptext.c:286
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "��� ������� ��������� �������"
 
-#: g10/helptext.c:294
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "��� ������� ��������� ������� ��� `%s'"
 
-#: g10/import.c:247
+#: g10/import.c:248
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "��������� �������� ��� ����� %d\n"
 
-#: g10/import.c:256
+#: g10/import.c:257
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu ������� ����� ����� ���� ������������\n"
 
-#: g10/import.c:273
+#: g10/import.c:274
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "��������� ������� ��� ��������������: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      ��� ������� ��� �������������: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:279
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          ����� user ID: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "              imported: %lu"
 msgstr "              ����������: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:287
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             ����������: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          ��� user ID: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           ��� ����������: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        ���� ���������: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   ���� ���������� ��������: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      ����������� ������� �������: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  ���������� ������� �������: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " ���������� ������� �������: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "          ��  ����������: %lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:544
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:545
+#: g10/import.c:546
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "����� ��������� ���� �� user ID:\n"
 
-#: g10/import.c:582
+#: g10/import.c:583
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:594
+#: g10/import.c:595
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s ��������, ���������� ��������� %s\n"
 
-#: g10/import.c:606
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:620
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:646
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:694 g10/import.c:1048
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
 
-#: g10/import.c:713
+#: g10/import.c:714
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "������ %08lX: ����������� ��������� ����������� HKP\n"
 
-#: g10/import.c:728
+#: g10/import.c:729
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "������ %08lX: ����� �� ����-������������� user ID '%s'\n"
 
-#: g10/import.c:734
+#: g10/import.c:735
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "������ %08lX: ��� ���� ������ user ID\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 msgid "this may be caused by a missing self-signature\n"
 msgstr "���� ������ �� ������� ��� ��� ������ ������������\n"
 
-#: g10/import.c:746 g10/import.c:1168
+#: g10/import.c:747 g10/import.c:1169
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "������ %08lX: ������� ������ ��� �� �������: %s\n"
 
-#: g10/import.c:752
+#: g10/import.c:753
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "������ %08lX:  ��� ������ - ������������\n"
 
-#: g10/import.c:761
+#: g10/import.c:762
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "��� ������� ��������� ����������: %s\n"
 
-#: g10/import.c:766 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "������� ���  `%s'\n"
 
-#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
-#: g10/import.c:2314 g10/import.c:2336
+#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
+#: g10/import.c:2315 g10/import.c:2337
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "�������� �������� ��� ����������� `%s': %s\n"
 
-#: g10/import.c:791
+#: g10/import.c:792
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "������ %08lX: �� ������� ������ \"%s\" ���� ��������\n"
 
-#: g10/import.c:815
+#: g10/import.c:816
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "������ %08lX: ��� ��������� �� �� ��������� ���\n"
 
-#: g10/import.c:832 g10/import.c:1186
+#: g10/import.c:833 g10/import.c:1187
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "������ %08lX: �������� ���������� ��� ������� �������� ��������: %s\n"
 
-#: g10/import.c:840 g10/import.c:1193
+#: g10/import.c:841 g10/import.c:1194
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "������ %08lX: �������� ��������� ��� ������� �������� ��������: %s\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "������ %08lX: \"%s\" 1 ��� user ID\n"
 
-#: g10/import.c:875
+#: g10/import.c:876
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
 
-#: g10/import.c:878
+#: g10/import.c:879
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "������ %08lX: \"%s\" 1 ��� ��������\n"
 
-#: g10/import.c:881
+#: g10/import.c:882
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
 
-#: g10/import.c:884
+#: g10/import.c:885
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "������ %08lX: \"%s\" 1 ��� ���������\n"
 
-#: g10/import.c:887
+#: g10/import.c:888
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "������ %08lX: \"%s\" %d ��� ����������\n"
 
-#: g10/import.c:908
+#: g10/import.c:909
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "������ %08lX: \"%s\" ����������\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1054
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "������ %08lX: ������� ������ �� ����� ��������. %d - ������������\n"
 
-#: g10/import.c:1064
+#: g10/import.c:1065
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/import.c:1081 g10/import.c:2329
+#: g10/import.c:1082 g10/import.c:2330
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "��� ������� �������������� ����������: %s\n"
 
-#: g10/import.c:1092
+#: g10/import.c:1093
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "������ %08lX: ������� ������ ���������\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1122
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "������ %08lX: ��� ��� ������� ����������\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1132
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "������ %08lX: �� ������� �� ������� ������: %s\n"
 
-#: g10/import.c:1161
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "������ %08lX: ��� ������� ������ - �������� ��������� �������������� "
 "���������\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1205
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "������ %08lX: �� ������ ������������� ���������: %s - ��������\n"
 
-#: g10/import.c:1236
+#: g10/import.c:1237
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "������ %08lX: \"%s\" ������������� ��������� ���������\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1302
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "������ %08lX: ��� ������� user ID ��� ��� ��������\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1317
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "������ %08lX: �� ��������������� ���������� �������� �������� ��� user id \"%"
 "s\"\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "������ %08lX: �� ������ ����-�������� ��� user id \"%s\"\n"
 
-#: g10/import.c:1336
+#: g10/import.c:1337
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "������ %08lX: ��� ������� ��������� ��� �� �������� ��������\n"
 
-#: g10/import.c:1347 g10/import.c:1397
+#: g10/import.c:1348 g10/import.c:1398
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "������ %08lX: �� ��������������� ���������� �������� ��������\n"
 
-#: g10/import.c:1349
+#: g10/import.c:1350
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "������ %08lX: �� ������ �������� �����������\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1365
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "������ %08lX: ���������� � �������� ��������� �����������\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "������ %08lX: ��� ������� ��������� ��� ��� �������� ��������\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "������ %08lX: �� ������ �������� �����������\n"
 
-#: g10/import.c:1414
+#: g10/import.c:1415
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "������ %08lX: ���������� � �������� ��������� �����������\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1457
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "������ %08lX: ������������ user ID '"
 
-#: g10/import.c:1477
+#: g10/import.c:1478
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "������ %08lX: ������������ ���������\n"
 
-#: g10/import.c:1504
+#: g10/import.c:1505
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "������ %08lX: �� ��������� �������� (����� %02x) - ������������\n"
 
-#: g10/import.c:1514
+#: g10/import.c:1515
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "������ %08lX: �� ������������� ��������� �� ����� ������ - ������������\n"
 
-#: g10/import.c:1531
+#: g10/import.c:1532
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "������ %08lX: �� ������ ������������� ���������: %s - ������������\n"
 
-#: g10/import.c:1545
+#: g10/import.c:1546
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 "������ %08lX: � �������� ��� ����������� �� ����� ������ - ������������\n"
 
-#: g10/import.c:1553
+#: g10/import.c:1554
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "������ %08lX: �� ����������� ����� ��������� (0x%02x) - ������������\n"
 
-#: g10/import.c:1574
+#: g10/import.c:1575
 #, fuzzy, c-format
 msgid "key %s: expired signature from key %s - skipped\n"
 msgstr "������ %08lX: �� ����������� ����� ��������� (0x%02x) - ������������\n"
 
-#: g10/import.c:1677
+#: g10/import.c:1678
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "������ %08lX: ����������� ����� user ID - ��������\n"
 
-#: g10/import.c:1739
+#: g10/import.c:1740
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "�������������: ������ %08lX ������ �� ���������: ���� �������� ��������� %"
 "08lX\n"
 
-#: g10/import.c:1753
+#: g10/import.c:1754
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "�������������: ������ %08lX ������ �� ���������: �� ������ ��������� %08lX\n"
 "��� ����� �����.\n"
 
-#: g10/import.c:1812
+#: g10/import.c:1813
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "������ %08lX: \"%s\" ������������� ��������� ����������\n"
 
-#: g10/import.c:1846
+#: g10/import.c:1847
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "������ %08lX: ����� �������� �������� ����������\n"
 
-#: g10/import.c:2235
+#: g10/import.c:2236
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "�� ������� ������ ��� ��������� �� �� �������!\n"
 
-#: g10/import.c:2243
+#: g10/import.c:2244
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "������������: ������� ������ ��� �����\n"
 
-#: g10/import.c:2245
+#: g10/import.c:2246
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "������������: ������� ������ ��� �����\n"
 
-#: g10/keydb.c:167
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "�������� ����������� ��� ����������� `%s': %s\n"
 
-#: g10/keydb.c:174
+#: g10/keydb.c:175
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "���������� `%s' �������������\n"
 
-#: g10/keydb.c:685
+#: g10/keydb.c:316 g10/keydb.c:319
+#, fuzzy, c-format
+msgid "keyblock resource `%s': %s\n"
+msgstr "������ ���� �� ���������� ��� `%s': %s\n"
+
+#: g10/keydb.c:698
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "�������� ������������ ��� cache �����������: %s\n"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[��������]"
 
-#: g10/keyedit.c:255
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[����-��������]"
 
-#: g10/keyedit.c:333 g10/keylist.c:405
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 ���� ��������\n"
 
-#: g10/keyedit.c:335 g10/keylist.c:407
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d ����� ���������\n"
 
-#: g10/keyedit.c:337 g10/keylist.c:409
+#: g10/keyedit.c:344 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 �������� ��� ��������� ���� ������� ��������\n"
 
-#: g10/keyedit.c:339 g10/keylist.c:411
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d ��������� ��� ���������� ���� ������� ��������\n"
 
-#: g10/keyedit.c:341 g10/keylist.c:413
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 �������� ��� ��������� ���� ���� ���������\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:415
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d ��������� ��� ���������� ���� ���������\n"
 
-#: g10/keyedit.c:345
+#: g10/keyedit.c:352
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 user ID ����������� ����� ������ ����-��������\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:354
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d user ID ������������ ����� ������� ����-���������\n"
 
-#: g10/keyedit.c:403 g10/pkclist.c:262
+#: g10/keyedit.c:410 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2528,53 +2574,63 @@ msgstr ""
 "�� �������� passports ��� fingerprints ��� �������� �����...);\n"
 "\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:274
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = ��� ������ �����������\n"
 
-#: g10/keyedit.c:408 g10/pkclist.c:276
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = ��� ����� �����������\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:434
 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:443
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "�� user ID \"%s\" ����������."
 
-#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
-#: g10/keyedit.c:858 g10/keyedit.c:1642
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1728
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "������� ������ ����� �� �� ����������; (y/N) "
 
-#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
-#: g10/keyedit.c:1648
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
+#: g10/keyedit.c:1734
 msgid "  Unable to sign.\n"
 msgstr "  �������� ���������.\n"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "�� user ID \"%s\" ���� �����."
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:650
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "�������������: �� user ID \"%s\" ��� ���� ����-���������."
 
-#: g10/keyedit.c:676
+#: g10/keyedit.c:678
+#, fuzzy, c-format
+msgid "User ID \"%s\" is signable.  "
+msgstr "�������������: �� user ID \"%s\" ��� ���� ����-���������."
+
+#: g10/keyedit.c:680
+#, fuzzy
+msgid "Sign it? (y/N) "
+msgstr "������� �� ���������; "
+
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2583,11 +2639,11 @@ msgstr ""
 "� ����-�������� ��� \"%s\"\n"
 "����� ��� �������� ����� PGP 2.x.\n"
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:711
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "������ �� �� �������� �� ��� OpenPGP ����-��������; (y/N) "
 
-#: g10/keyedit.c:699
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2596,12 +2652,12 @@ msgstr ""
 "� ������������ �������� ��� ��� \"%s\"\n"
 "���� �����.\n"
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:729
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "������ �� ������� ��� ��� �������� ���� ������������� ��� ��������; (y/N) "
 
-#: g10/keyedit.c:724
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2610,43 +2666,43 @@ msgstr ""
 "� ������������ �������� ��� ��� \"%s\"\n"
 "����� ��� ������ ��������.\n"
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:754
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "������ �� �� �������� �� ��� ����� ��������� ��������; (y/N) "
 
-#: g10/keyedit.c:749
+#: g10/keyedit.c:775
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" ��� ����������� ��� �� ������ %08lX\n"
 
-#: g10/keyedit.c:752
+#: g10/keyedit.c:778
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" ��� ����������� ��� �� ������ %08lX\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:783
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "������� ������ ����� �� �� ��������������; (y/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:805
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "������ ��� �� ��������� �� �� ������  %08lX\n"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "���� �� ������ ���� �����!"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "���� �� ������ �������� �� ����� ���� %s.\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:844
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "������ � ���������� �� ����� ����������;  (Y/n) "
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:882
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2654,11 +2710,11 @@ msgstr ""
 "�������� �� ��������������� ��� OpenPGP �������� �� ��� PGP 2.x ���� �� "
 "��������� --pgp2.\n"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:884
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "���� �� ����� �� ������ ������� �� �� PGP 2.x.\n"
 
-#: g10/keyedit.c:878
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2668,32 +2724,32 @@ msgstr ""
 "������ �������� ��� ����������� �����; ��� ��� ������ �� �� ���������� "
 "�������\"0\".\n"
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) ��� ������.%s\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) ��� ��� ������� �������.%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) ��� ����� ��� ������ ������.%s\n"
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) ��� ����� ���������� ������.%s\n"
 
-#: g10/keyedit.c:895
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "� ������� ���; (�������������� ? ��� �����������): "
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:950
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2702,21 +2758,21 @@ msgstr ""
 "������� ������ �� ���������� ���� �� ������\n"
 "�� �� ������ ���: \""
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "���� �� ����� ��� ����-��������.\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:963
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "�������������: � �������� �� �� ��������� ��� ��-���������.\n"
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:971
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
@@ -2724,14 +2780,14 @@ msgstr ""
 "�������������: � �������� �� �� ��������� ��� ��-�����������.\n"
 "\n"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:981
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "� �������� �� ��������� ��� ��-���������.\n"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:988
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
@@ -2739,65 +2795,65 @@ msgstr ""
 "� �������� �� ��������� ��� ��-�����������.\n"
 "\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:995
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "��� ��� ������� ������� ���� �� ������.\n"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1000
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "��� ����� ����������� ������ �� ���� �� ������.\n"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1005
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "��� ������� ���� ���������� ���� �� ������.\n"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1015
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "������� �� ���������; "
 
-#: g10/keyedit.c:1029 g10/keyedit.c:4132 g10/keyedit.c:4223 g10/keyedit.c:4287
-#: g10/keyedit.c:4348 g10/sign.c:369
+#: g10/keyedit.c:1060 g10/keyedit.c:4350 g10/keyedit.c:4441 g10/keyedit.c:4505
+#: g10/keyedit.c:4566 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "� �������� �������: %s\n"
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1105 g10/keygen.c:3057
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "���� �� ������ ��� �������������.\n"
 
-#: g10/keyedit.c:1109 g10/keygen.c:3045
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 msgid "Secret parts of primary key are not available.\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/keyedit.c:1113 g10/keygen.c:3060
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/keyedit.c:1117 g10/keygen.c:3064
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "�� ������ �������������.\n"
 
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "������� � ����������� ����� ��� ��������:%s\n"
 
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2805,205 +2861,205 @@ msgstr ""
 "�������������� ��� ��� ����� ������ ��� ���� �� ������� ������.\n"
 "\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:1825
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "� ����� ������ ��� ������������ �����. ��������� ����"
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr "��� ������ ����� ������ - ���� ����� ������ *����* ����!\n"
 
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1195
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "������� ������ �� ������ ����; "
 
-#: g10/keyedit.c:1235
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "���������� ��������� �������� ��� ����� ����\n"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "���������� ��� ������"
 
-#: g10/keyedit.c:1322
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "���������� ��� fingerprint"
 
-#: g10/keyedit.c:1323
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "���������� ��� �������� ��� ��� user ID"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "������� user ID N"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "������� user ID N"
 
-#: g10/keyedit.c:1327
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "�������� ���������"
 
-#: g10/keyedit.c:1330
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1335
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "�������� ��� �������� ������"
 
-#: g10/keyedit.c:1337
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "��������: �������� �� user ID ��� ��������\n"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1343
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "�������� ���� user ID"
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "�������� ���� photo ID"
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "�������� ���� user ID"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "�������� ���� ������������� ��������"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr "�������� ���� �������� ���������"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "�������� ��� user ID ��� ��������"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "������ ������ ��� ����������� �������� ��� �������� ��������"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "���������� ����������� (�������)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "���������� �������� (���������)"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1418
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "������ ��� ������ ������"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "������ ��� ������������ ���������"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1426
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "�������� ���� user ID"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "�������� ���� ������������� ��������"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "enable key"
 msgstr "����������� ��� ������"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "disable key"
 msgstr "������������� ��� ������"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1436
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "���������� photo ID"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1556
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "������ ���� ��� �������� �������� ����� �������� `%s': %s\n"
 
-#: g10/keyedit.c:1494
+#: g10/keyedit.c:1574
 msgid "Secret key is available.\n"
 msgstr "�� ������� ������ ����� ���������.\n"
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1655
 msgid "Need the secret key to do this.\n"
 msgstr "���������� �� ������� ������ ��� �� ����� ����.\n"
 
-#: g10/keyedit.c:1579
+#: g10/keyedit.c:1663
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "�������� ��������������� ��� ������ \"toggle\" �����.\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1682
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3011,237 +3067,242 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1722
 msgid "Key is revoked."
 msgstr "�� ������ ����������."
 
-#: g10/keyedit.c:1657
+#: g10/keyedit.c:1741
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "������� �� ���������� ��� �� user ID; "
 
-#: g10/keyedit.c:1660
-msgid "Hint: Select the user IDs to sign\n"
-msgstr "��������: �������� �� user ID ��� ��������\n"
-
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1748
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "������� ����� ���������"
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1771
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "���� � ������ ����������� �� ���� ��� ��������� %s.\n"
 
-#: g10/keyedit.c:1713 g10/keyedit.c:1733 g10/keyedit.c:1899
+#: g10/keyedit.c:1793 g10/keyedit.c:1813 g10/keyedit.c:1979
 msgid "You must select at least one user ID.\n"
 msgstr "������ �� ��������� �� �������� ��� user ID.\n"
 
-#: g10/keyedit.c:1715
+#: g10/keyedit.c:1795
 msgid "You can't delete the last user ID!\n"
 msgstr "��� �������� �� ���������� �� ��������� user ID!\n"
 
-#: g10/keyedit.c:1717
+#: g10/keyedit.c:1797
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1718
+#: g10/keyedit.c:1798
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� user ID; "
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1848
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� user ID; "
 
-#: g10/keyedit.c:1780
+#: g10/keyedit.c:1860
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "������ �� ��������� ����������� ��� ������.\n"
 
-#: g10/keyedit.c:1808
+#: g10/keyedit.c:1888
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1822
+#: g10/keyedit.c:1902
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1919
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "�������� ����������� ��� ����������� `%s': %s\n"
 
-#: g10/keyedit.c:1863
+#: g10/keyedit.c:1943
 msgid "You must select at least one key.\n"
 msgstr "������ �� ��������� ����������� ��� ������.\n"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1946
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "������� ������ �� ���������� �� ���������� �������; "
 
-#: g10/keyedit.c:1867
+#: g10/keyedit.c:1947
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1982
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1983
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� user ID; "
 
-#: g10/keyedit.c:1921
+#: g10/keyedit.c:2001
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:1932
+#: g10/keyedit.c:2012
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "������� ������ �� ���������� �� ���������� �������; "
 
-#: g10/keyedit.c:1934
+#: g10/keyedit.c:2014
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:1975
+#: g10/keyedit.c:2055
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2007
+#: g10/keyedit.c:2087
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "������� ����������� ��������"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2093
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2095
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "������� �� ���������� �� �����������;"
 
-#: g10/keyedit.c:2065
+#: g10/keyedit.c:2157
+#, fuzzy, c-format
+msgid "Unable to clean `%s'\n"
+msgstr "�������� ��������� ��� %s \"%s\": %s\n"
+
+#: g10/keyedit.c:2160
+msgid "Please specify item to clean: `sigs', `uids', or `all'\n"
+msgstr ""
+
+#: g10/keyedit.c:2171
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "���������� ��� �������; "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2174
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "����������� ����� ����������; "
 
-#: g10/keyedit.c:2078
+#: g10/keyedit.c:2184
 #, c-format
 msgid "update failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2191
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "� ��������� �������� �������: %s\n"
 
-#: g10/keyedit.c:2092
+#: g10/keyedit.c:2198
 msgid "Key not changed so no update needed.\n"
 msgstr "�� ������ ��� ������ ����� ��� ���������� ���������.\n"
 
-#: g10/keyedit.c:2164
+#: g10/keyedit.c:2271
 msgid "Digest: "
 msgstr "��������: "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2323
 msgid "Features: "
 msgstr "����������: "
 
-#: g10/keyedit.c:2227
+#: g10/keyedit.c:2334
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2242 g10/keylist.c:307
+#: g10/keyedit.c:2349 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2473
+#: g10/keyedit.c:2580
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "���� �� ������ ������ �� ��������� ��� %s ������ "
 
-#: g10/keyedit.c:2494
+#: g10/keyedit.c:2601
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "���� �� ������ ������ �� ��������� ��� %s ������ "
 
-#: g10/keyedit.c:2500
+#: g10/keyedit.c:2607
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (���������)"
 
-#: g10/keyedit.c:2516 g10/keyedit.c:2572 g10/keyedit.c:2684 g10/keyedit.c:2699
-#: g10/keylist.c:193 g10/keyserver.c:422
+#: g10/keyedit.c:2623 g10/keyedit.c:2679 g10/keyedit.c:2792 g10/keyedit.c:2807
+#: g10/keylist.c:194 g10/keyserver.c:421
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "�������� ����������� ��� %s: %s\n"
 
-#: g10/keyedit.c:2519 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:931
+#: g10/keyedit.c:2626 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:948
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[����������]"
 
-#: g10/keyedit.c:2521 g10/keylist.c:757 g10/keylist.c:886
+#: g10/keyedit.c:2628 g10/keylist.c:758 g10/keylist.c:887
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [�����: %s]"
 
-#: g10/keyedit.c:2523 g10/keyedit.c:2574 g10/keyedit.c:2686 g10/keyedit.c:2701
-#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
-#: g10/keylist.c:913 g10/keyserver.c:428 g10/mainproc.c:937
+#: g10/keyedit.c:2630 g10/keyedit.c:2681 g10/keyedit.c:2794 g10/keyedit.c:2809
+#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
+#: g10/keylist.c:914 g10/keyserver.c:427 g10/mainproc.c:954
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [�����: %s]"
 
-#: g10/keyedit.c:2525
+#: g10/keyedit.c:2632
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " �����������: %c/%c"
 
-#: g10/keyedit.c:2540
+#: g10/keyedit.c:2647
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " �����������: %c/%c"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2651
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2658
 msgid "This key has been disabled"
 msgstr "���� �� ������ ���� ���������������"
 
-#: g10/keyedit.c:2579 g10/keylist.c:199
+#: g10/keyedit.c:2686 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2754
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "��� �������� ����������� �� ��� user ID ����� PGP 2.x.\n"
 
-#: g10/keyedit.c:2654
+#: g10/keyedit.c:2762
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3249,19 +3310,19 @@ msgstr ""
 "� ���������� ��� ��������������� �������� ��� ����� ���������� �����\n"
 "����� ��� ��� �������������� �� ���������.\n"
 
-#: g10/keyedit.c:2718 g10/keyserver.c:432 g10/mainproc.c:1577
-#: g10/trustdb.c:1178
+#: g10/keyedit.c:2826 g10/keyedit.c:3201 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1690
 #, fuzzy
 msgid "revoked"
 msgstr "[����������]"
 
-#: g10/keyedit.c:2720 g10/keyserver.c:436 g10/mainproc.c:1579
-#: g10/trustdb.c:531
+#: g10/keyedit.c:2828 g10/keyedit.c:3203 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1692
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2893
 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"
@@ -3269,7 +3330,7 @@ msgstr ""
 "�������������: ��� ���� ��������� ID ������ ��� ��������.  ���� � ������\n"
 "              ������ �� ����� ��� ���� ID ������ �� ����� �� ��������.\n"
 
-#: g10/keyedit.c:2845
+#: g10/keyedit.c:2953
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3278,45 +3339,75 @@ msgstr ""
 "�������������: ���� ����� ��� ������ ����� PGP2. � �������� ���� photo ID\n"
 "               ������ �� ����� ������� �������� PGP �� �� ����������.\n"
 
-#: g10/keyedit.c:2850 g10/keyedit.c:3128
+#: g10/keyedit.c:2958 g10/keyedit.c:3307
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "������� ����� ������ �� �� ����������; (y/N) "
 
-#: g10/keyedit.c:2856
+#: g10/keyedit.c:2964
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "��� �������� �� ���������� ��� photo ID �� ��� ������ ����� PGP2.\n"
 
-#: g10/keyedit.c:2996
+#: g10/keyedit.c:3104
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�������� ����� ��� ����� ���������; (y/N/q)"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3114
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�������� ����� ��� �� ������� ���������; (y/N/q)"
 
-#: g10/keyedit.c:3010
+#: g10/keyedit.c:3118
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�������� ����� ��� �������� ���������; (y/N/q)"
 
-#: g10/keyedit.c:3016
+#: g10/keyedit.c:3124
 msgid "Really delete this self-signature? (y/N)"
 msgstr "������� �� ��������� ���� � ����-��������; (y/N)"
 
-#: g10/keyedit.c:3030
+#: g10/keyedit.c:3138
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "����������� %d ��������.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3139
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "����������� %d ���������.\n"
 
-#: g10/keyedit.c:3034
+#: g10/keyedit.c:3142
 msgid "Nothing deleted.\n"
 msgstr "������ ��� �����������.\n"
 
-#: g10/keyedit.c:3123
+#: g10/keyedit.c:3167
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed.\n"
+msgstr "�� user ID \"%s\" ����������."
+
+#: g10/keyedit.c:3168
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed.\n"
+msgstr "�� user ID \"%s\" ����������."
+
+#: g10/keyedit.c:3173
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean.\n"
+msgstr "�� user ID \"%s\" ���� ��� ���������\n"
+
+#: g10/keyedit.c:3205 g10/trustdb.c:1694
+#, fuzzy
+msgid "invalid"
+msgstr "�� ������ ��������"
+
+#: g10/keyedit.c:3207
+#, fuzzy, c-format
+msgid "User ID \"%s\" removed: %s\n"
+msgstr "�� user ID \"%s\" ����������."
+
+#: g10/keyedit.c:3214
+#, fuzzy
+msgid "No user IDs are removable.\n"
+msgstr "�� user ID \"%s\" ���� ��� ���������\n"
+
+#: g10/keyedit.c:3302
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3326,38 +3417,38 @@ msgstr ""
 "               ������������ �������� ������ �� ����� ������� �������� PGP\n"
 "               �� �� ����������.\n"
 
-#: g10/keyedit.c:3134
+#: g10/keyedit.c:3313
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "��� �������� �� ���������� ��� ����������� �������� �� ������ ����� PGP2.x.\n"
 
-#: g10/keyedit.c:3154
+#: g10/keyedit.c:3333
 msgid "Enter the user ID of the designated revoker: "
 msgstr "�������������� �� user ID ��� ����������� ��������: "
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3356
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "�������� ������� ���� �������� ����� PGP 2.x, ��� ����������� ��������\n"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3371
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "�� �������� �� ������� ��� ������ ��� �� ���������� �������� ��� ������ ���\n"
 
-#: g10/keyedit.c:3214
+#: g10/keyedit.c:3393
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 "�������������: ���� �� ������ ���� ��������� ��� ��� �������� ��������!\n"
 
-#: g10/keyedit.c:3233
+#: g10/keyedit.c:3412
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "�������������: ��� ������� ��� ������ ��� ���������� �������� ��� ������ �� "
 "���������!\n"
 
-#: g10/keyedit.c:3239
+#: g10/keyedit.c:3418
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -3365,309 +3456,314 @@ msgstr ""
 "����� �������� ��� ������ �� ������� ��� ������ ��� ���������� ��������; (y/"
 "N): "
 
-#: g10/keyedit.c:3300
+#: g10/keyedit.c:3479
 msgid "Please remove selections from the secret keys.\n"
 msgstr "�������� ��������� ��� �������� ��� �� ������� �������.\n"
 
-#: g10/keyedit.c:3306
+#: g10/keyedit.c:3485
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "�������� �������� �� ���� ��� ���������� ������.\n"
 
-#: g10/keyedit.c:3310
+#: g10/keyedit.c:3489
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "������ ����������� ����� ��� ��� ���������� ������.\n"
 
-#: g10/keyedit.c:3313
+#: g10/keyedit.c:3492
 msgid "Changing expiration time for the primary key.\n"
 msgstr "������ ����������� ����� ��� ��� �������� ������.\n"
 
-#: g10/keyedit.c:3359
+#: g10/keyedit.c:3538
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3554
 msgid "No corresponding signature in secret ring\n"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/keyedit.c:3455
+#: g10/keyedit.c:3634
 msgid "Please select exactly one user ID.\n"
 msgstr "������ �� ��������� ������� ��� user ID.\n"
 
-#: g10/keyedit.c:3494 g10/keyedit.c:3604 g10/keyedit.c:3724
+#: g10/keyedit.c:3673 g10/keyedit.c:3783 g10/keyedit.c:3903
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "������������ � v3 ����-�������� ��� user id \"%s\"\n"
 
-#: g10/keyedit.c:3665
+#: g10/keyedit.c:3844
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3745
+#: g10/keyedit.c:3924
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "������� ������ ����� �� �� ���������������; (y/N) "
 
-#: g10/keyedit.c:3746
+#: g10/keyedit.c:3925
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "������� ������ ����� �� �� ���������������; (y/N) "
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3987
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:3854
+#: g10/keyedit.c:4045
+#, fuzzy, c-format
+msgid "No user ID with hash %s\n"
+msgstr "��� ������� user ID �� ������ %d\n"
+
+#: g10/keyedit.c:4072
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:3971
+#: g10/keyedit.c:4189
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: \""
 
-#: g10/keyedit.c:3974 g10/keyedit.c:4038 g10/keyedit.c:4081
+#: g10/keyedit.c:4192 g10/keyedit.c:4256 g10/keyedit.c:4299
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   ����������� ��� %08lX ���� %s%s%s\n"
 
-#: g10/keyedit.c:3976 g10/keyedit.c:4040 g10/keyedit.c:4083
+#: g10/keyedit.c:4194 g10/keyedit.c:4258 g10/keyedit.c:4301
 msgid " (non-exportable)"
 msgstr " (��-���������)"
 
-#: g10/keyedit.c:3980
+#: g10/keyedit.c:4198
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "���� � �������� ����� ���� %s.\n"
 
-#: g10/keyedit.c:3984
+#: g10/keyedit.c:4202
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:3988
+#: g10/keyedit.c:4206
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "���������� ���� �������������� ��������� ��� ���� ��� ��������; (y/N)"
 
-#: g10/keyedit.c:4015
+#: g10/keyedit.c:4233
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "����� ��������� ���� �� user ID:\n"
 
-#: g10/keyedit.c:4041
+#: g10/keyedit.c:4259
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (��-���������)"
 
-#: g10/keyedit.c:4048
+#: g10/keyedit.c:4266
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   ���������� ��� %08lX ���� %s\n"
 
-#: g10/keyedit.c:4070
+#: g10/keyedit.c:4288
 msgid "You are about to revoke these signatures:\n"
 msgstr "��������� �� ����������� ����� ��� ���������:\n"
 
-#: g10/keyedit.c:4090
+#: g10/keyedit.c:4308
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "������� �� ������������� �� ������������� ���������; (y/N)"
 
-#: g10/keyedit.c:4120
+#: g10/keyedit.c:4338
 msgid "no secret key\n"
 msgstr "������ ������� ������\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4408
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4425
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "�������������: ��� �������� user ID ���� ���������� %d ������� ��� ������\n"
 
-#: g10/keyedit.c:4271
+#: g10/keyedit.c:4489
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:4333
+#: g10/keyedit.c:4551
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4646
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "���������� %s photo ID �������� %ld ��� �� ������ 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:293
+#: g10/keygen.c:258
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "� ���������� %c%lu ������������\n"
 
-#: g10/keygen.c:300
+#: g10/keygen.c:265
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "���� ������ `%c' �����������\n"
 
-#: g10/keygen.c:302
+#: g10/keygen.c:267
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "���� ������ `%c' �����������\n"
 
-#: g10/keygen.c:304
+#: g10/keygen.c:269
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "���� ������ `%c' �����������\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:394
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "�� ������� ���������� ��� \"�������\" ��� ��������\n"
 
-#: g10/keygen.c:829
+#: g10/keygen.c:822
 msgid "writing direct signature\n"
 msgstr "������� ������ ���������\n"
 
-#: g10/keygen.c:868
+#: g10/keygen.c:861
 msgid "writing self signature\n"
 msgstr "������� ����-���������\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing key binding signature\n"
 msgstr "������� ��������� \"�������\" ��������\n"
 
-#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2632
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�� ������ ������� ��������, ����� %u bits\n"
 
-#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2638
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "��������������� ��� ������� �������� ��� %u bits\n"
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1239
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1252
+#: g10/keygen.c:1242
 #, fuzzy
 msgid "Encrypt"
 msgstr "������������� ���������"
 
-#: g10/keygen.c:1255
+#: g10/keygen.c:1245
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1263
+#: g10/keygen.c:1253
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1268
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1282
+#: g10/keygen.c:1272
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1287
+#: g10/keygen.c:1277
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1290
+#: g10/keygen.c:1280
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (��� ������������� ����)\n"
 
-#: g10/keygen.c:1293
+#: g10/keygen.c:1283
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1296
+#: g10/keygen.c:1286
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1340
 msgid "Please select what kind of key you want:\n"
 msgstr "�������� �������� ��� ���� ��� �������� ��� ������:\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1342
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA ��� ElGamal (��������������)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1343
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (��� �������� ����)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1345
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (��� ������������� ����)\n"
 
-#: g10/keygen.c:1357
+#: g10/keygen.c:1347
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (��� ������������� ����)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1348
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (��� �������� ����)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1350
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (��� ������������� ����)\n"
 
-#: g10/keygen.c:1362
+#: g10/keygen.c:1352
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (��� ������������� ����)\n"
 
-#: g10/keygen.c:1431 g10/keygen.c:2509
+#: g10/keygen.c:1421 g10/keygen.c:2506
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "�� ������ �������� DSA �� ����� 1024 bits.\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1431
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1438
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "�� ������� �������� �� ������; (1024) "
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1452
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1468
+#: g10/keygen.c:1458
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�� ������� �������� ��� �������� ����� %u bits\n"
 
-#: g10/keygen.c:1473 g10/keygen.c:1478
+#: g10/keygen.c:1463 g10/keygen.c:1468
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "����������������� ��� �� %u bits\n"
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1515
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3683,7 +3779,7 @@ msgstr ""
 "      <n>m = �� ������ ����� �� n �����\n"
 "      <n>y = �� ������ ����� �� n ���\n"
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1526
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3699,39 +3795,40 @@ msgstr ""
 "      <n>m = �� ������ ����� �� n �����\n"
 "      <n>y = �� ������ ����� �� n ���\n"
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1549
 msgid "Key is valid for? (0) "
 msgstr "�� ������ ����� ������ ���; (0) "
 
-#: g10/keygen.c:1563
-msgid "Signature is valid for? (0) "
+#: g10/keygen.c:1554
+#, fuzzy, c-format
+msgid "Signature is valid for? (%s) "
 msgstr "� �������� ����� ������ ���; (0) "
 
-#: g10/keygen.c:1568
+#: g10/keygen.c:1572
 msgid "invalid value\n"
 msgstr "�� ������ ����\n"
 
-#: g10/keygen.c:1575
+#: g10/keygen.c:1579
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "�� %s ��� ����� ����\n"
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1580
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "�� %s ��� ����� ����\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1585
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "�� %s ����� ���� %s\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1586
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1592
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3739,12 +3836,12 @@ msgstr ""
 "�� ������� ��� ��� ������ �� ����������� ����������� ���� ��� 2038.\n"
 "����, �� ����������� ����� ��� �� 2106.\n"
 
-#: g10/keygen.c:1595
+#: g10/keygen.c:1597
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "����� ���� ����� (y/n); "
 
-#: g10/keygen.c:1638
+#: g10/keygen.c:1641
 #, fuzzy
 msgid ""
 "\n"
@@ -3761,44 +3858,44 @@ msgstr ""
 "    \"Nikolaoy Nikos (toy Ioanni) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1651
+#: g10/keygen.c:1654
 msgid "Real name: "
 msgstr "������� �����: "
 
-#: g10/keygen.c:1659
+#: g10/keygen.c:1662
 msgid "Invalid character in name\n"
 msgstr "�� ������� ���������� ��� �����\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1664
 msgid "Name may not start with a digit\n"
 msgstr "�� ����� ��� ����������� �� ������ �� ���������� �����\n"
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1666
 msgid "Name must be at least 5 characters long\n"
 msgstr "�� ����� ������ �� ���� ����������� 5 ����������\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1674
 msgid "Email address: "
 msgstr "��������� Email: "
 
-#: g10/keygen.c:1682
+#: g10/keygen.c:1685
 msgid "Not a valid email address\n"
 msgstr "�� ������ ��������� Email\n"
 
-#: g10/keygen.c:1690
+#: g10/keygen.c:1693
 msgid "Comment: "
 msgstr "������: "
 
-#: g10/keygen.c:1696
+#: g10/keygen.c:1699
 msgid "Invalid character in comment\n"
 msgstr "�� ������� ���������� ��� ������\n"
 
-#: g10/keygen.c:1719
+#: g10/keygen.c:1722
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "�������������� �� `%s' ��� ����������.\n"
 
-#: g10/keygen.c:1725
+#: g10/keygen.c:1728
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3809,7 +3906,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1733
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�������� ��� ����������� ��� ��������� email ��� ����� � ��� ������\n"
 
@@ -3824,23 +3921,23 @@ msgstr "�������� ��� ����������� ��� ��������� email ��� ����� � ��� ������\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1746
+#: g10/keygen.c:1749
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1756
+#: g10/keygen.c:1759
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "������ (N)�����, (C)������, (E)mail � (Q)�����������; "
 
-#: g10/keygen.c:1757
+#: g10/keygen.c:1760
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "������ (N)�����, (C)������, (E)mail � (O)�������/(Q)�����������; "
 
-#: g10/keygen.c:1776
+#: g10/keygen.c:1779
 msgid "Please correct the error first\n"
 msgstr "��������, ��������� ����� �� ������\n"
 
-#: g10/keygen.c:1816
+#: g10/keygen.c:1819
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3848,12 +3945,12 @@ msgstr ""
 "���������� ��� ����� ������ ��� �� ������������� �� ������� ������.\n"
 "\n"
 
-#: g10/keygen.c:1826 g10/passphrase.c:1105
+#: g10/keygen.c:1829 g10/passphrase.c:786
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1832
+#: g10/keygen.c:1835
 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"
@@ -3865,7 +3962,7 @@ msgstr ""
 "����� ������, �� ��� ������� \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1857
 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"
@@ -3877,50 +3974,50 @@ msgstr ""
 "���� �������) ���� �� �������� ����������� ������ �������. ���� �����\n"
 "��� ��������� ������� ������� ��� �������� �� ������� ������ ��������.\n"
 
-#: g10/keygen.c:2578
+#: g10/keygen.c:2575
 msgid "Key generation canceled.\n"
 msgstr "� ���������� �������� ����������.\n"
 
-#: g10/keygen.c:2766 g10/keygen.c:2910
+#: g10/keygen.c:2774 g10/keygen.c:2918
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:2768 g10/keygen.c:2913
+#: g10/keygen.c:2776 g10/keygen.c:2921
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:2771 g10/keygen.c:2916
+#: g10/keygen.c:2779 g10/keygen.c:2924
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2907
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "�� ������� ��������� ������� ����������: %s\n"
 
-#: g10/keygen.c:2905
+#: g10/keygen.c:2913
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "�� ������� ��������� ������� ����������: %s\n"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2931
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2938
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/keygen.c:2953
+#: g10/keygen.c:2961
 msgid "public and secret key created and signed.\n"
 msgstr "�� ������� ��� �� ������� ������ �������������� ��� �����������.\n"
 
-#: g10/keygen.c:2964
+#: g10/keygen.c:2972
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -3931,12 +4028,12 @@ msgstr ""
 "�������� �� ��������������� ��� ������ \"--edit-key\" ��� �� ������������\n"
 "��� ���������� ������ ��� ���� �� ����.\n"
 
-#: g10/keygen.c:2976 g10/keygen.c:3105 g10/keygen.c:3220
+#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "� ���������� �������� �������: %s\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3156 g10/sign.c:290
+#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -3944,7 +4041,7 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/keygen.c:3030 g10/keygen.c:3158 g10/sign.c:292
+#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -3952,374 +4049,355 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/keygen.c:3039 g10/keygen.c:3169
+#: g10/keygen.c:3047 g10/keygen.c:3177
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "��������: � ���������� ����������� ��� ������� v3 ��� ����� �������\n"
 "�� �� OpenPGP\n"
 
-#: g10/keygen.c:3078 g10/keygen.c:3202
+#: g10/keygen.c:3086 g10/keygen.c:3210
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "������� �� ������������; "
 
-#: g10/keygen.c:3355
+#: g10/keygen.c:3363
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: g10/keygen.c:3402
+#: g10/keygen.c:3410
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: g10/keygen.c:3428
+#: g10/keygen.c:3436
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "��������: �� ������� ������ %08lX ����� ���� %s\n"
 
-#: g10/keygen.c:3508
-#, c-format
-msgid "length of RSA modulus is not %d\n"
-msgstr ""
-
-#: g10/keygen.c:3514
-msgid "public exponent too large (more than 32 bits)\n"
-msgstr ""
-
-#: g10/keygen.c:3520 g10/keygen.c:3526
-#, c-format
-msgid "length of an RSA prime is not %d\n"
-msgstr ""
-
-#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
+#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
 msgid "never     "
 msgstr "����     "
 
-#: g10/keylist.c:264
+#: g10/keylist.c:265
 msgid "Critical signature policy: "
 msgstr "�������� �������� ���������: "
 
-#: g10/keylist.c:266
+#: g10/keylist.c:267
 msgid "Signature policy: "
 msgstr "�������� ���������: "
 
-#: g10/keylist.c:305
+#: g10/keylist.c:306
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:354 g10/keylist.c:398
+#: g10/keylist.c:355 g10/keylist.c:399
 msgid "WARNING: invalid notation data found\n"
 msgstr "�������������: �������� �� ������ �������� ���������\n"
 
-#: g10/keylist.c:372
+#: g10/keylist.c:373
 msgid "Critical signature notation: "
 msgstr "�������� �������� ���������: "
 
-#: g10/keylist.c:374
+#: g10/keylist.c:375
 msgid "Signature notation: "
 msgstr "�������� ���������: "
 
-#: g10/keylist.c:385
+#: g10/keylist.c:386
 msgid "not human readable"
 msgstr "�� ����������"
 
-#: g10/keylist.c:486
+#: g10/keylist.c:487
 msgid "Keyring"
 msgstr "����������"
 
-#: g10/keylist.c:792
+#: g10/keylist.c:793
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr " [�����: %s]"
 
-#: g10/keylist.c:1488
+#: g10/keylist.c:1489
 msgid "Primary key fingerprint:"
 msgstr "��������� �������� ��������:"
 
-#: g10/keylist.c:1490
+#: g10/keylist.c:1491
 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:1497
+#: g10/keylist.c:1498
 msgid " Primary key fingerprint:"
 msgstr " ��������� �������� ��������:"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1500
 msgid "      Subkey fingerprint:"
 msgstr "      ��������� �����������:"
 
-#: g10/keylist.c:1503 g10/keylist.c:1507
+#: g10/keylist.c:1504 g10/keylist.c:1508
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     ��������� �������� ="
 
-#: g10/keylist.c:1574
+#: g10/keylist.c:1575
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1245
+#: g10/keyring.c:1246
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "�������� �������: %s\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1252
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "�������������: 2 ������ �� ������������� ����������� ��������.\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s ����� �� ����������\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1255
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s ����� �� ���\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1256
 msgid "Please fix this possible security flaw\n"
 msgstr "�������� ��������� ���� ��� ������ \"�����\" ���������\n"
 
-#: g10/keyring.c:1375
+#: g10/keyring.c:1376
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "������� ����������� `%s'\n"
 
-#: g10/keyring.c:1421
+#: g10/keyring.c:1422
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu ������� ����� �������� (%lu ���������)\n"
 
-#: g10/keyring.c:1433
+#: g10/keyring.c:1434
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu ������� ����� �������� (%lu ���������)\n"
 
-#: g10/keyring.c:1504
+#: g10/keyring.c:1505
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: ���������� �������������\n"
 
-#: g10/keyserver.c:107
+#: g10/keyserver.c:105
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "�������������: �� �������� ��� `%s' ��� ����� ������� �� ���� ��� ��������\n"
 
-#: g10/keyserver.c:434
+#: g10/keyserver.c:433
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:635
+#: g10/keyserver.c:634
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:718 g10/keyserver.c:1238
+#: g10/keyserver.c:717 g10/keyserver.c:1267
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/keyserver.c:808
+#: g10/keyserver.c:815
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "�� ������ '%s' �� �������: %s\n"
 
-#: g10/keyserver.c:810
+#: g10/keyserver.c:817
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "�� ������ '%s' �� �������: %s\n"
 
-#: g10/keyserver.c:985
+#: g10/keyserver.c:1014
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "������ �������� %08lX ��� �� %s\n"
 
-#: g10/keyserver.c:989
+#: g10/keyserver.c:1018
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "������ �������� %08lX ��� �� %s\n"
 
-#: g10/keyserver.c:1141
+#: g10/keyserver.c:1170
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "����������� �� �� ������ ��� %08lX ���� %s\n"
 
-#: g10/keyserver.c:1188
+#: g10/keyserver.c:1217
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1191
+#: g10/keyserver.c:1220
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1198 g10/keyserver.c:1293
+#: g10/keyserver.c:1227 g10/keyserver.c:1322
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1275
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1255
+#: g10/keyserver.c:1284
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1314
+#: g10/keyserver.c:1343
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1320
+#: g10/keyserver.c:1349
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1361
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1366
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1374
 #, c-format
-msgid "gpgkeys_%s does not support handler version %d\n"
+msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1351
+#: g10/keyserver.c:1381
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "������ ���������� ��������"
 
-#: g10/keyserver.c:1356
+#: g10/keyserver.c:1386
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "������ ���������� ��������"
 
-#: g10/keyserver.c:1365
+#: g10/keyserver.c:1395
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "keyserver ���� �������: %s\n"
 
-#: g10/keyserver.c:1390 g10/keyserver.c:1424
+#: g10/keyserver.c:1420 g10/keyserver.c:1454
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1681
+#: g10/keyserver.c:1711
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1703
+#: g10/keyserver.c:1733
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "������ �������� %08lX ��� �� %s\n"
 
-#: g10/keyserver.c:1705
+#: g10/keyserver.c:1735
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "������ �������� %08lX ��� �� %s\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:249
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "�������� ������� ��� ��� ������ ���������������� ��������� (%d)\n"
 
-#: g10/mainproc.c:262
-#, c-format
-msgid "bad passphrase or unknown cipher algorithm (%d)\n"
-msgstr "���� ����� ������ �������� ���������� �������������� (%d)\n"
-
-#: g10/mainproc.c:299
+#: g10/mainproc.c:300
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s ������ ���������������� ��������\n"
 
-#: g10/mainproc.c:309
+#: g10/mainproc.c:310
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "��������������� �� ������� ��������� %d\n"
 
-#: g10/mainproc.c:375
+#: g10/mainproc.c:376
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "������� ������ ����� %08lX\n"
 
-#: g10/mainproc.c:430
+#: g10/mainproc.c:431
 msgid "public key encrypted data: good DEK\n"
 msgstr "��������������� �������� �� ������� ������: ���� DEK\n"
 
-#: g10/mainproc.c:463
+#: g10/mainproc.c:464
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "��������������� �� %u-bit %s ������, ID %08lX, ������������� %s\n"
 
-#: g10/mainproc.c:467 g10/pkclist.c:218
+#: g10/mainproc.c:468 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                ������ ��� \""
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:472
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "��������������� �� %s key, ID %08lX\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "������������� �� ������� ������ �������: %s\n"
 
-#: g10/mainproc.c:499
+#: g10/mainproc.c:500
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "��������������� �� %lu ������� �������\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:502
 msgid "encrypted with 1 passphrase\n"
 msgstr "��������������� �� 1 ����� ������\n"
 
-#: g10/mainproc.c:529 g10/mainproc.c:551
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "������� %s ���������������� ���������\n"
 
-#: g10/mainproc.c:537
+#: g10/mainproc.c:538
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "��������������� IDEA �� ����������, ��������� ���������� ������ ���\n"
 "%s ��������\n"
 
-#: g10/mainproc.c:569
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr "���������������� OK\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:574
 msgid "WARNING: message was not integrity protected\n"
 msgstr "�������������: ��� ������������� � ����������� ��� ��������\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "�������������: �� ��������������� ������ ���� ���������!\n"
 
-#: g10/mainproc.c:592
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "���������������� �������: %s\n"
@@ -4333,305 +4411,294 @@ msgstr "��������: � ���������� ������ \"���-��-�����-���-����\"\n"
 msgid "original file name='%.*s'\n"
 msgstr "������ ����� �������='%.*s'\n"
 
-#: g10/mainproc.c:786
+#: g10/mainproc.c:803
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "���������� �������� - ��������������� \"gpg --import\" ��� ��������\n"
 
-#: g10/mainproc.c:1290
+#: g10/mainproc.c:1307
 msgid "signature verification suppressed\n"
 msgstr "��������� ��������� ���������\n"
 
-#: g10/mainproc.c:1332 g10/mainproc.c:1342
+#: g10/mainproc.c:1349 g10/mainproc.c:1359
 msgid "can't handle these multiple signatures\n"
 msgstr "�������� ��������� ����� ��� ��������� ���������\n"
 
-#: g10/mainproc.c:1352
+#: g10/mainproc.c:1369
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/mainproc.c:1353
+#: g10/mainproc.c:1370
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                ������ ��� \""
 
-#: g10/mainproc.c:1357
+#: g10/mainproc.c:1374
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "�������� ����� ��� %.*s �� ����� ��� ��������%s ID %08lX\n"
 
-#: g10/mainproc.c:1377
+#: g10/mainproc.c:1394
 msgid "Key available at: "
 msgstr "������ ��������� ���: "
 
-#: g10/mainproc.c:1482 g10/mainproc.c:1530
+#: g10/mainproc.c:1499 g10/mainproc.c:1547
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "���� �������� ��� \""
 
-#: g10/mainproc.c:1484 g10/mainproc.c:1532
+#: g10/mainproc.c:1501 g10/mainproc.c:1549
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "������� �������� ��� \""
 
-#: g10/mainproc.c:1486 g10/mainproc.c:1534
+#: g10/mainproc.c:1503 g10/mainproc.c:1551
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "���� �������� ��� \""
 
-#: g10/mainproc.c:1538
+#: g10/mainproc.c:1555
 msgid "[uncertain]"
 msgstr "[�������]"
 
-#: g10/mainproc.c:1570
+#: g10/mainproc.c:1587
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                ������ ��� \""
 
-#: g10/mainproc.c:1664
+#: g10/mainproc.c:1681
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/mainproc.c:1669
+#: g10/mainproc.c:1686
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/mainproc.c:1672
+#: g10/mainproc.c:1689
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s ��������, ���������� ��������� %s\n"
 
-#: g10/mainproc.c:1673
+#: g10/mainproc.c:1690
 msgid "binary"
 msgstr "�������"
 
-#: g10/mainproc.c:1674
+#: g10/mainproc.c:1691
 msgid "textmode"
 msgstr "���������-��������"
 
-#: g10/mainproc.c:1674 g10/trustdb.c:530
+#: g10/mainproc.c:1691 g10/trustdb.c:531
 msgid "unknown"
 msgstr "�������"
 
-#: g10/mainproc.c:1694
+#: g10/mainproc.c:1711
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "�������� ������� ��� ���������: %s\n"
 
-#: g10/mainproc.c:1762 g10/mainproc.c:1778 g10/mainproc.c:1864
+#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
 msgid "not a detached signature\n"
 msgstr "��� ����� ���������� ��������\n"
 
-#: g10/mainproc.c:1805
+#: g10/mainproc.c:1822
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "�������������: ���������� ��������� ���������. ���� � ����� �� ��������.\n"
 
-#: g10/mainproc.c:1813
+#: g10/mainproc.c:1830
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "���������� �������� ������ 0x%02x\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1887
 msgid "old style (PGP 2.x) signature\n"
 msgstr "�������� ������ ���� (PGP 2.x)\n"
 
-#: g10/mainproc.c:1880
+#: g10/mainproc.c:1897
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "�� ������ ������(root) ������ ����������� ��� proc_tree()\n"
 
-#: g10/misc.c:121
+#: g10/misc.c:122
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "�������� ��������������� ��� core dump: %s\n"
 
-#: g10/misc.c:141 g10/misc.c:169 g10/misc.c:241
+#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "�������� ��������� ��� �������: %s\n"
 
-#: g10/misc.c:206
+#: g10/misc.c:207
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: read ������� (n=%d): %s\n"
 
-#: g10/misc.c:315
+#: g10/misc.c:316
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "�������� ��������� ��� ���������� �������� �������� %d\n"
 
-#: g10/misc.c:330
+#: g10/misc.c:331
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "�� ������������ ���������� ��������������"
 
-#: g10/misc.c:345
+#: g10/misc.c:346
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s ��������, ���������� ��������� %s\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:351
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "� ������������ ��� ���������� ��������� %s (%d) ���������� ���\n"
 "����������� ��� ���������\n"
 
-#: g10/misc.c:446
+#: g10/misc.c:447
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "�� ����� ��� ��������������� IDEA ��� �������\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:448
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 "����� �� http://www.gnupg.org/why-not-idea.html ��� ������������ "
 "�����������\n"
 
-#: g10/misc.c:680
+#: g10/misc.c:681
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: �� ������������ ������� \"%s\"\n"
 
-#: g10/misc.c:684
+#: g10/misc.c:685
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
 
-#: g10/misc.c:686
+#: g10/misc.c:687
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "�������� �������������� �� \"%s%s\" ��������\n"
 
-#: g10/misc.c:697
+#: g10/misc.c:694
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
+msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
+
+#: g10/misc.c:707
 msgid "Uncompressed"
 msgstr "����������"
 
-#: g10/misc.c:722
+#: g10/misc.c:732
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "����������"
 
-#: g10/misc.c:832
+#: g10/misc.c:842
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "���� �� ������ ���� ��� ������ �� �������������� ��� %s\n"
 
-#: g10/misc.c:989
+#: g10/misc.c:999
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "�������� �������� ��� `%s'\n"
 
-#: g10/misc.c:1014
+#: g10/misc.c:1024
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "�������� ��������������� ���������� `%s'\n"
 
-#: g10/openfile.c:84
+#: g10/openfile.c:86
 #, c-format
 msgid "File `%s' exists. "
 msgstr "�� ������ `%s' ������� ���. "
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "��������� (y/N); "
 
-#: g10/openfile.c:119
+#: g10/openfile.c:121
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: ������� ��������\n"
 
-#: g10/openfile.c:141
+#: g10/openfile.c:143
 msgid "Enter new filename"
 msgstr "�������������� ��� ��� ����� �������"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:188
 msgid "writing to stdout\n"
 msgstr "������� ���� stdout\n"
 
-#: g10/openfile.c:296
+#: g10/openfile.c:300
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "������� �������������� ��������� ��� `%s'\n"
 
-#: g10/openfile.c:375
+#: g10/openfile.c:379
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "������������� ��� ������ �������� `%s'\n"
 
-#: g10/openfile.c:377
+#: g10/openfile.c:381
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 "�������������: �� �������� ��� `%s' ��� ����� ������� �� ���� ��� ��������\n"
 
-#: g10/openfile.c:409
+#: g10/openfile.c:413
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: ��������� �������������\n"
 
-#: g10/parse-packet.c:137
+#: g10/parse-packet.c:138
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "�������� ��������� ��� ���������� �������� �������� %d\n"
 
-#: g10/parse-packet.c:707
+#: g10/parse-packet.c:708
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "�������������: ������� �� ������� ��������������� ���������� ������\n"
 
-#: g10/parse-packet.c:1132
+#: g10/parse-packet.c:1145
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "��������� ����� %d ���� �������� �� ������� bit\n"
 
-#: g10/passphrase.c:478 g10/passphrase.c:525
+#: g10/passphrase.c:305
 msgid "gpg-agent is not available in this session\n"
 msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
 
-#: g10/passphrase.c:486
-msgid "can't set client pid for the agent\n"
-msgstr "�������� ������� ��� pid ��� ������ ��� �� agent\n"
-
-#: g10/passphrase.c:494
-msgid "can't get server read FD for the agent\n"
-msgstr "�������� ��������� ��� FD ��� �� ���������� ��� ��� agent\n"
-
-#: g10/passphrase.c:501
-msgid "can't get server write FD for the agent\n"
-msgstr "�������� �������� ��� FD ��� �� ���������� ��� ��� agent\n"
-
-#: g10/passphrase.c:534
+#: g10/passphrase.c:317
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "��������������� ��������� ������������� GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:547
+#: g10/passphrase.c:332
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "��� ������������� � ������ ����������� %d ��� gpg-agent\n"
 
-#: g10/passphrase.c:568
+#: g10/passphrase.c:345
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "�������� �������� ��� `%s': %s\n"
 
-#: g10/passphrase.c:590
-msgid "communication problem with gpg-agent\n"
-msgstr "�������� ������������ �� �� gpg-agent\n"
-
-#: g10/passphrase.c:597 g10/passphrase.c:937 g10/passphrase.c:1049
+#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
 msgid "problem with the agent - disabling agent use\n"
 msgstr "�������� �� ��� agent - �������������� ��� ������ ��� agent\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1209
+#: g10/passphrase.c:511 g10/passphrase.c:890
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (����� ������, ID %08lX)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:525
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4643,41 +4710,28 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s ������, ID %08lX, ���������� %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:550
 msgid "Repeat passphrase\n"
 msgstr "����������� �� �����\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:552
 msgid "Enter passphrase\n"
 msgstr "�������������� �� ����� ������\n"
 
-#: g10/passphrase.c:781
-msgid "passphrase too long\n"
-msgstr "� ����� ������ ����� ���� ������\n"
-
-#: g10/passphrase.c:794
-msgid "invalid response from agent\n"
-msgstr "�� ������ �������� ��� ��� agent\n"
-
-#: g10/passphrase.c:810 g10/passphrase.c:931
+#: g10/passphrase.c:628
 msgid "cancelled by user\n"
 msgstr "��������� ��� �� ������\n"
 
-#: g10/passphrase.c:815 g10/passphrase.c:1020
-#, c-format
-msgid "problem with the agent: agent returns 0x%lx\n"
-msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
-
-#: g10/passphrase.c:1100 g10/passphrase.c:1263
+#: g10/passphrase.c:781 g10/passphrase.c:944
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "�������� �������� ��� ����� ������ �� ��������� ������\n"
 
-#: g10/passphrase.c:1107 g10/passphrase.c:1268
+#: g10/passphrase.c:788 g10/passphrase.c:949
 msgid "Enter passphrase: "
 msgstr "�������������� �� ����� ������: "
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:871
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4687,21 +4741,21 @@ msgstr ""
 "���������� ��� ����� ������ ��� �� ������������ �� ������� ������\n"
 "��� �� ������: \""
 
-#: g10/passphrase.c:1196
+#: g10/passphrase.c:877
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bit %s ������, ID %08lX, ���������� %s"
 
-#: g10/passphrase.c:1205
+#: g10/passphrase.c:886
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1272
+#: g10/passphrase.c:953
 msgid "Repeat passphrase: "
 msgstr "����������� �� ����� ������: "
 
-#: g10/photoid.c:66
+#: g10/photoid.c:67
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4715,160 +4769,160 @@ msgstr ""
 "�������������� ��� ������ ������ �� ������ ��� ���������� �� ����� ������!\n"
 "������� ������� ��� ��� ������ ����� ���� ����� ��� 240x288.\n"
 
-#: g10/photoid.c:80
+#: g10/photoid.c:81
 msgid "Enter JPEG filename for photo ID: "
 msgstr "�������������� ��� ����� ������� ��� �� photo ID: "
 
-#: g10/photoid.c:94
+#: g10/photoid.c:95
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "�������� ��������� ��� �������: %s\n"
 
-#: g10/photoid.c:102
+#: g10/photoid.c:103
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:104
+#: g10/photoid.c:105
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "������� ������ ����� �� �� ���������������; (y/N) "
 
-#: g10/photoid.c:119
+#: g10/photoid.c:120
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\" ��� ����� JPEG ������\n"
 
-#: g10/photoid.c:136
+#: g10/photoid.c:137
 msgid "Is this photo correct (y/N/q)? "
 msgstr "����� ���� � ���������� ����� (y/N/q); "
 
-#: g10/photoid.c:338
+#: g10/photoid.c:339
 msgid "unable to display photo ID!\n"
 msgstr "�������� ����������� ��� photo ID!\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:580
+#: g10/pkclist.c:62 g10/revoke.c:581
 msgid "No reason specified"
 msgstr "��� ���� ������� �����"
 
-#: g10/pkclist.c:63 g10/revoke.c:582
+#: g10/pkclist.c:64 g10/revoke.c:583
 msgid "Key is superseded"
 msgstr "�� ������ ���� ����������"
 
-#: g10/pkclist.c:65 g10/revoke.c:581
+#: g10/pkclist.c:66 g10/revoke.c:582
 msgid "Key has been compromised"
 msgstr "�� ������ ���� �������"
 
-#: g10/pkclist.c:67 g10/revoke.c:583
+#: g10/pkclist.c:68 g10/revoke.c:584
 msgid "Key is no longer used"
 msgstr "�� ������ �� ��������������� �����"
 
-#: g10/pkclist.c:69 g10/revoke.c:584
+#: g10/pkclist.c:70 g10/revoke.c:585
 msgid "User ID is no longer valid"
 msgstr "�� User ID ��� ����� ����� ������"
 
-#: g10/pkclist.c:73
+#: g10/pkclist.c:74
 msgid "reason for revocation: "
 msgstr "����� ��� ��������:"
 
-#: g10/pkclist.c:90
+#: g10/pkclist.c:91
 msgid "revocation comment: "
 msgstr "������ ���������:"
 
-#: g10/pkclist.c:205
+#: g10/pkclist.c:206
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:213
+#: g10/pkclist.c:214
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "��� ������ ���� ������������ ���:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:245
+#: g10/pkclist.c:246
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "                ������ ��� \""
 
-#: g10/pkclist.c:255
+#: g10/pkclist.c:256
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "���� �� ������ ������� ������ ���� ���������\n"
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:271
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = ��� ����\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d =  ��� ��� �����������\n"
 
-#: g10/pkclist.c:278
+#: g10/pkclist.c:279
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = ������������ �������\n"
 
-#: g10/pkclist.c:284
+#: g10/pkclist.c:285
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = ���� ��� ������ �����\n"
 
-#: g10/pkclist.c:287
+#: g10/pkclist.c:288
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " s = ��������� ����� ��� ��������\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " q = �����������\n"
 
-#: g10/pkclist.c:292
+#: g10/pkclist.c:293
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:298 g10/revoke.c:609
+#: g10/pkclist.c:299 g10/revoke.c:610
 msgid "Your decision? "
 msgstr "� ������� ���; "
 
-#: g10/pkclist.c:319
+#: g10/pkclist.c:320
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "������� ������ ���� �� ������ �� ������� ��� �������� ������������; "
 
-#: g10/pkclist.c:333
+#: g10/pkclist.c:334
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "������������� ��� ������� �� ��� ������ �������� ������������:\n"
 
-#: g10/pkclist.c:418
+#: g10/pkclist.c:419
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: ��� ������� ������� ��� � �������� ���� ������ ���� ���������.\n"
 
-#: g10/pkclist.c:423
+#: g10/pkclist.c:424
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: ��� ������� ������� ��� � �������� ���� ������ ���� ���������.\n"
 
-#: g10/pkclist.c:429
+#: g10/pkclist.c:430
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "���� �� ������ ������� ������ ���� ���������\n"
 
-#: g10/pkclist.c:434
+#: g10/pkclist.c:435
 msgid "This key belongs to us\n"
 msgstr "���� �� ������ ������ �� ����\n"
 
-#: g10/pkclist.c:460
+#: g10/pkclist.c:461
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -4880,97 +4934,97 @@ msgstr ""
 "�� ���������� ���� ������� ������� ����������\n"
 "\n"
 
-#: g10/pkclist.c:467
+#: g10/pkclist.c:468
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "����� ���������� ����� ��� ��������; "
 
-#: g10/pkclist.c:501
+#: g10/pkclist.c:502
 msgid "WARNING: Using untrusted key!\n"
 msgstr "�������������: ����� �������� ����� �����������!\n"
 
-#: g10/pkclist.c:508
+#: g10/pkclist.c:509
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "�������������: ���� �� ������ ������ �� ��������� (������ �� ������ "
 "���������)\n"
 
-#: g10/pkclist.c:517
+#: g10/pkclist.c:518
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr ""
 "�������������: ���� �� ������ ���� ��������� ��� ��� �������� ��������!\n"
 
-#: g10/pkclist.c:520
+#: g10/pkclist.c:521
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "�������������: ���� �� ������ ���� ��������� ��� ��� ��������� ���!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         ���� ������ �� �������� ��� � �������� ����� ������������.\n"
 
-#: g10/pkclist.c:527
+#: g10/pkclist.c:528
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr ""
 "�������������: ���� �� ��������� ���� ��������� ��� ��� ��������� ���!\n"
 
-#: g10/pkclist.c:532
+#: g10/pkclist.c:533
 msgid "Note: This key has been disabled.\n"
 msgstr "��������: ���� �� ������ ���� ���������������.\n"
 
-#: g10/pkclist.c:537
+#: g10/pkclist.c:538
 msgid "Note: This key has expired!\n"
 msgstr "��������: ���� �� ������ ���� �����!\n"
 
-#: g10/pkclist.c:548
+#: g10/pkclist.c:549
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "�������������: ���� �� ������ ��� ���� ������������ �� ������������ "
 "��������!\n"
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:551
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         ��� ������� ������� ��� � �������� ������ ���� ���������.\n"
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:559
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "�������������: ��� �������������� ���� �� ������!\n"
 
-#: g10/pkclist.c:559
+#: g10/pkclist.c:560
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         � �������� ������ ����� ������������.\n"
 
-#: g10/pkclist.c:567
+#: g10/pkclist.c:568
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "�������������: ���� �� ������ ��� ���� ������������ �� ���������\n"
 "������� ������������!\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:570
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         ��� ����� ������ ��� � �������� ������ ���� ���������.\n"
 
-#: g10/pkclist.c:734 g10/pkclist.c:767 g10/pkclist.c:936 g10/pkclist.c:996
+#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ������������: %s\n"
 
-#: g10/pkclist.c:744 g10/pkclist.c:968
+#: g10/pkclist.c:745 g10/pkclist.c:969
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ������������: ������� ������ ����� ��� �����\n"
 
-#: g10/pkclist.c:786
+#: g10/pkclist.c:787
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "��� �������� ��� user ID. (��������������� �� \"-r\")\n"
 
-#: g10/pkclist.c:802
+#: g10/pkclist.c:803
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:828
+#: g10/pkclist.c:829
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -4978,169 +5032,169 @@ msgstr ""
 "\n"
 "�������������� �� user ID. ����� �� ��� ����� ������: "
 
-#: g10/pkclist.c:844
+#: g10/pkclist.c:845
 msgid "No such user ID.\n"
 msgstr "��� ������� ���� �� user ID.\n"
 
-#: g10/pkclist.c:849 g10/pkclist.c:911
+#: g10/pkclist.c:850 g10/pkclist.c:912
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "������������: ������� ������ ���� ��� ������� ��� �� ������� ����������\n"
 
-#: g10/pkclist.c:867
+#: g10/pkclist.c:868
 msgid "Public key is disabled.\n"
 msgstr "�� ������� ������ ���� ���������������.\n"
 
-#: g10/pkclist.c:874
+#: g10/pkclist.c:875
 msgid "skipped: public key already set\n"
 msgstr "������������: ������� ������ ���� ��� �������\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:904
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "�������� ��������������� ���������� `%s'\n"
 
-#: g10/pkclist.c:948
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ������������: �� ������� ������ ���� ���������������.\n"
 
-#: g10/pkclist.c:1003
+#: g10/pkclist.c:1004
 msgid "no valid addressees\n"
 msgstr "������ ������ ���������\n"
 
-#: g10/plaintext.c:90
+#: g10/plaintext.c:91
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "�������� ��� �������������. ���������� �� ��� ������� \"--output\"\n"
 
-#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
+#: g10/plaintext.c:136 g10/plaintext.c:141 g10/plaintext.c:159
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "������ ���� �� ���������� ��� `%s': %s\n"
 
-#: g10/plaintext.c:446
+#: g10/plaintext.c:447
 msgid "Detached signature.\n"
 msgstr "���������� ��������.\n"
 
-#: g10/plaintext.c:450
+#: g10/plaintext.c:452
 msgid "Please enter name of data file: "
 msgstr "�������� �� ����� ������� ���������: "
 
-#: g10/plaintext.c:478
+#: g10/plaintext.c:481
 msgid "reading stdin ...\n"
 msgstr "�������� ��� stdin ...\n"
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:515
 msgid "no signed data\n"
 msgstr "��� �������� ������������� ��������\n"
 
-#: g10/plaintext.c:526
+#: g10/plaintext.c:529
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "�������� ��������� �������������� ��������� `%s'\n"
 
-#: g10/pubkey-enc.c:103
+#: g10/pubkey-enc.c:104
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "�������� ���������� ������ �������� �������� %08lX ...\n"
 
-#: g10/pubkey-enc.c:119
+#: g10/pubkey-enc.c:120
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "�������, ������� � �������� ����������.\n"
 
-#: g10/pubkey-enc.c:207
+#: g10/pubkey-enc.c:208
 msgid "old encoding of the DEK is not supported\n"
 msgstr "������ ������������ ��� DEK ��� �������������\n"
 
-#: g10/pubkey-enc.c:228
+#: g10/pubkey-enc.c:229
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "� ���������� �������������� %d%s ����� �������� � �����������������\n"
 
-#: g10/pubkey-enc.c:266
+#: g10/pubkey-enc.c:267
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "��������: � ���������� �������������� %d ��� ����� ���� ��������\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:287
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "��������: �� ������� ������ %08lX ����� ���� %s\n"
 
-#: g10/pubkey-enc.c:292
+#: g10/pubkey-enc.c:293
 msgid "NOTE: key has been revoked"
 msgstr "��������: �� ������ ���� ���������"
 
-#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:545
+#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
+#: g10/revoke.c:188 g10/revoke.c:546
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet �������: %s\n"
 
-#: g10/revoke.c:146
+#: g10/revoke.c:147
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
 
-#: g10/revoke.c:272
+#: g10/revoke.c:273
 msgid "To be revoked by:\n"
 msgstr "���� �������� ���:\n"
 
-#: g10/revoke.c:276
+#: g10/revoke.c:277
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(���� ����� ��� ��������� ������ ���������)\n"
 
-#: g10/revoke.c:280
+#: g10/revoke.c:281
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "���������� ���� �������������� ��������� ��� ���� �� ������; "
 
-#: g10/revoke.c:293 g10/revoke.c:511
+#: g10/revoke.c:294 g10/revoke.c:512
 msgid "ASCII armored output forced.\n"
 msgstr "������������ ������ �� ����������� ASCII.\n"
 
-#: g10/revoke.c:307 g10/revoke.c:525
+#: g10/revoke.c:308 g10/revoke.c:526
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet �������: %s\n"
 
-#: g10/revoke.c:370
+#: g10/revoke.c:371
 msgid "Revocation certificate created.\n"
 msgstr "������������� ��������� �������������.\n"
 
-#: g10/revoke.c:376
+#: g10/revoke.c:377
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "�� �������� ������� ��������� ��� �� `%s'\n"
 
-#: g10/revoke.c:432
+#: g10/revoke.c:433
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "�� ������� ������ `%s' �� �������: %s\n"
 
-#: g10/revoke.c:461
+#: g10/revoke.c:462
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "������ ��������� ������� ������: %s\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:473
 msgid "public key does not match secret key!\n"
 msgstr "�� ������� ������ ��� ��������� �� �� �������!\n"
 
-#: g10/revoke.c:479
+#: g10/revoke.c:480
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "���������� ���� �������������� ��������� ��� ���� �� ������; "
 
-#: g10/revoke.c:496
+#: g10/revoke.c:497
 msgid "unknown protection algorithm\n"
 msgstr "�������� ���������� ����������\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 msgid "NOTE: This key is not protected!\n"
 msgstr "��������: ���� �� ������ ��� �������������!\n"
 
-#: g10/revoke.c:551
+#: g10/revoke.c:552
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5159,116 +5213,116 @@ msgstr ""
 "������� �� ������� ��������� ��� �������� ��� ������ �� ����������� ���\n"
 "�������� ��� �� ��� ����� ��������� �� ������!\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid "Please select the reason for the revocation:\n"
 msgstr "�������� �������� ��� ����� ��� ��� ��������:\n"
 
-#: g10/revoke.c:602
+#: g10/revoke.c:603
 msgid "Cancel"
 msgstr "�������"
 
-#: g10/revoke.c:604
+#: g10/revoke.c:605
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(������� �� ������ �� ��������� �� %d ���)\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:646
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "�������������� ��� ����������� ��������޷ ����� �� ��� ����� ������:\n"
 
-#: g10/revoke.c:673
+#: g10/revoke.c:674
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "����� ��� ��������: %s\n"
 
-#: g10/revoke.c:675
+#: g10/revoke.c:676
 msgid "(No description given)\n"
 msgstr "(��� ������ ���������)\n"
 
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "����� ���� �������; "
 
-#: g10/seckey-cert.c:54
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "������� ��� �������� �������� ��� ����� ���������\n"
 
-#: g10/seckey-cert.c:60
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "��� ������������� � ���������� ���������� %d%s\n"
 
-#: g10/seckey-cert.c:71
+#: g10/seckey-cert.c:72
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "��� ������������� � ���������� ���������� %d%s\n"
 
-#: g10/seckey-cert.c:265
+#: g10/seckey-cert.c:266
 msgid "Invalid passphrase; please try again"
 msgstr "�� ������ ����� ������, ��������� ����"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:267
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:326
+#: g10/seckey-cert.c:327
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "�������������: ����������� ������� ������ - ������� �� ����� ������\n"
 
-#: g10/seckey-cert.c:364
+#: g10/seckey-cert.c:365
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "���������� ��� �� ������������� 16-bit checksum ��� �� ��������� ���\n"
 "�������� ��������\n"
 
-#: g10/seskey.c:52
+#: g10/seskey.c:53
 msgid "weak key created - retrying\n"
 msgstr "������������� ������� ������ - ��������� �����������\n"
 
-#: g10/seskey.c:57
+#: g10/seskey.c:58
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "�������� �������� �������� �������� ��� ���������� ��������������, ������ "
 "��� %d �����!\n"
 
-#: g10/seskey.c:213
+#: g10/seskey.c:214
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "� DSA ������� �� ����� ���� 160 bit ���������� hash\n"
 
-#: g10/sig-check.c:75
+#: g10/sig-check.c:76
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "�������������: ��������� ��������� ��������� ��� ������\n"
 
-#: g10/sig-check.c:99
+#: g10/sig-check.c:100
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 "�������������: �� ��������� ��������� %08lX ��� ���� ���' ������������� "
 "������������\n"
 
-#: g10/sig-check.c:102
+#: g10/sig-check.c:103
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "�������������: �� ��������� ��������� %08lX ���� ����� ���' ������������� "
 "�����������\n"
 
-#: g10/sig-check.c:168
+#: g10/sig-check.c:169
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr ""
 "�� ������� ������ %08lX ����� %lu ������������ ������� ��� ��� ��������\n"
 
-#: g10/sig-check.c:169
+#: g10/sig-check.c:170
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr ""
 "�� ������� ������ %08lX ����� %lu ������������ ������� ��� ��� ��������\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:181
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5276,7 +5330,7 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:183
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5284,54 +5338,54 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:193
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "��������: �� ������ ��������� %08lX ����� ���� %s\n"
 
-#: g10/sig-check.c:275
+#: g10/sig-check.c:276
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "������� ����� ��������� ��� ������ %08lX ���� �������� �������� bit\n"
 
-#: g10/sig-check.c:532
+#: g10/sig-check.c:533
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "������ %08lX: ������ ��������� ��� �� ������ ��������� �����������\n"
 
-#: g10/sig-check.c:558
+#: g10/sig-check.c:559
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "������ %08lX: ��� ������� ��������� ��� �� �������� �����������\n"
 
-#: g10/sign.c:85
+#: g10/sign.c:86
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "�������� ����������� ��������� �������� �� ��������� v3 (PGP 2.x ����)\n"
 
-#: g10/sign.c:93
+#: g10/sign.c:94
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 "�������� ����������� ��������� �������� �� ��������� �������� v3 (PGP 2.x "
 "����)\n"
 
-#: g10/sign.c:112
+#: g10/sign.c:113
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "�������������: �������� ���� %%-�������� ��������� (���� ������).\n"
 "               ����� �� ������������.\n"
 
-#: g10/sign.c:138
+#: g10/sign.c:139
 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:146
+#: g10/sign.c:147
 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:159
+#: g10/sign.c:160
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5339,7 +5393,7 @@ msgstr ""
 "�������������: �������� ��� %%-�������� ��� url ��������� (���� ������).\n"
 "               ����� �� ������������.\n"
 
-#: g10/sign.c:187
+#: g10/sign.c:188
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5348,23 +5402,23 @@ msgstr ""
 "�������������: �������� ��� %%-�������� ��� url ��������� (���� ������).\n"
 "               ����� �� ������������.\n"
 
-#: g10/sign.c:364
+#: g10/sign.c:365
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
 
-#: g10/sign.c:373
+#: g10/sign.c:374
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s �������� ���: \"%s\"\n"
 
-#: g10/sign.c:741
+#: g10/sign.c:761
 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:808
+#: g10/sign.c:830
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5372,53 +5426,53 @@ msgstr ""
 "� ������������ ��� ���������� ��������� %s (%d) ���������� ���\n"
 "����������� ��� ���������\n"
 
-#: g10/sign.c:900
+#: g10/sign.c:922
 msgid "signing:"
 msgstr "��������:"
 
-#: g10/sign.c:1007
+#: g10/sign.c:1034
 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:1180
+#: g10/sign.c:1212
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s ������������� �� ��������������\n"
 
-#: g10/skclist.c:126 g10/skclist.c:190
+#: g10/skclist.c:127 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "�� ������ ��� ���� ��������� ��� ��������� - ��� ������ �� �������������� �� "
 "������� RNG!\n"
 
-#: g10/skclist.c:157
+#: g10/skclist.c:158
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "������������ `%s': ������������\n"
 
-#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "������������ `%s': %s\n"
 
-#: g10/skclist.c:170
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "������������: ������� ������ ��� �����\n"
 
-#: g10/skclist.c:185
+#: g10/skclist.c:186
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "������������ `%s': ���� ����� ������������� ��� PGP ������ ElGamal ��� ��� "
 "����� ������� ��� ���������!\n"
 
-#: g10/tdbdump.c:59 g10/trustdb.c:365
+#: g10/tdbdump.c:60 g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "������� trust %lu, ����� %d: write �������: %s\n"
 
-#: g10/tdbdump.c:104
+#: g10/tdbdump.c:105
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5427,350 +5481,350 @@ msgstr ""
 "# ����� ��� ������������ ����� ������������, ������������� %s\n"
 "# (����� ��� \"gpg --import-ownertrust\" ��� ��������� ����)\n"
 
-#: g10/tdbdump.c:159 g10/tdbdump.c:167 g10/tdbdump.c:172 g10/tdbdump.c:177
+#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: g10/tdbdump.c:159
+#: g10/tdbdump.c:160
 #, fuzzy
 msgid "line too long"
 msgstr "� ������ ����� ���� ������\n"
 
-#: g10/tdbdump.c:167
+#: g10/tdbdump.c:168
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:173
+#: g10/tdbdump.c:174
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "������: �� ������ ���������\n"
 
-#: g10/tdbdump.c:178
+#: g10/tdbdump.c:179
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr "�������� ��� ����� ������������"
 
-#: g10/tdbdump.c:214
+#: g10/tdbdump.c:215
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "������ ���� ������ ��� �������� ������������: %s\n"
 
-#: g10/tdbdump.c:218
+#: g10/tdbdump.c:219
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "������ ���������: %s\n"
 
-#: g10/tdbdump.c:227 g10/trustdb.c:380
+#: g10/tdbdump.c:228 g10/trustdb.c:381
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync �������: %s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1440
+#: g10/tdbio.c:129 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: �������� lseek: %s\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1447
+#: g10/tdbio.c:135 g10/tdbio.c:1448
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: �������� write (n=%d): %s\n"
 
-#: g10/tdbio.c:244
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "���� ������ ��������� trustdb\n"
 
-#: g10/tdbio.c:497
+#: g10/tdbio.c:498
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: g10/tdbio.c:512
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: � ������� ��� �������!\n"
 
-#: g10/tdbio.c:522 g10/tdbio.c:545 g10/tdbio.c:588
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: g10/tdbio.c:524 g10/tdbio.c:591
+#: g10/tdbio.c:525 g10/tdbio.c:592
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "�������� ��������� ��� `%s'\n"
 
-#: g10/tdbio.c:550
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: �������� ����������� ���� �������� �������: %s"
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: ������������� �� ������ trustdb\n"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: ������������� � trustdb\n"
 
-#: g10/tdbio.c:597
+#: g10/tdbio.c:598
 msgid "NOTE: trustdb not writable\n"
 msgstr "��������: � trustdb ��� ����� ���������\n"
 
-#: g10/tdbio.c:614
+#: g10/tdbio.c:615
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: �� ������ trustdb\n"
 
-#: g10/tdbio.c:646
+#: g10/tdbio.c:647
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: �������� ����������� hashtable: %s\n"
 
-#: g10/tdbio.c:654
+#: g10/tdbio.c:655
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: ������ ���� ��������� ��� �������� �������: %s\n"
 
-#: g10/tdbio.c:671 g10/tdbio.c:691 g10/tdbio.c:707 g10/tdbio.c:721
-#: g10/tdbio.c:751 g10/tdbio.c:1373 g10/tdbio.c:1400
+#: g10/tdbio.c:672 g10/tdbio.c:692 g10/tdbio.c:708 g10/tdbio.c:722
+#: g10/tdbio.c:752 g10/tdbio.c:1374 g10/tdbio.c:1401
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: ������ ���� �������� ��� �������� �������: %s\n"
 
-#: g10/tdbio.c:730
+#: g10/tdbio.c:731
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: ������ ���� ������� ��� �������� �������: %s\n"
 
-#: g10/tdbio.c:1169
+#: g10/tdbio.c:1170
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: ������� lseek: %s\n"
 
-#: g10/tdbio.c:1177
+#: g10/tdbio.c:1178
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read ������� (n=%d): %s\n"
 
-#: g10/tdbio.c:1198
+#: g10/tdbio.c:1199
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ��� ����� trustdb ������\n"
 
-#: g10/tdbio.c:1216
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: ������� ������� �� recnum %lu\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1222
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: �� ������ ������ ������� %d\n"
 
-#: g10/tdbio.c:1406
+#: g10/tdbio.c:1407
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: ������ ���� �������� ��� �������� free : %s\n"
 
-#: g10/tdbio.c:1414
+#: g10/tdbio.c:1415
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: ������ ���� ������� ��� �������� dir : %s\n"
 
-#: g10/tdbio.c:1424
+#: g10/tdbio.c:1425
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: �������� ���� ��������� ���� ��������: %s\n"
 
-#: g10/tdbio.c:1454
+#: g10/tdbio.c:1455
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: �������� ���� �������� ���� ��������: %s\n"
 
-#: g10/tdbio.c:1499
+#: g10/tdbio.c:1500
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "� trustdb ����� �������� - ��������������� �� \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:147
+#: g10/textfilter.c:148
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "�������� ��������� ������� �������� ����������� ��� %d ����������\n"
 
-#: g10/textfilter.c:244
+#: g10/textfilter.c:245
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "������ ������� ���������� ��� %d ����������\n"
 
-#: g10/trustdb.c:226
+#: g10/trustdb.c:227
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' ��� ����� ������ ����� keyID\n"
 
-#: g10/trustdb.c:257
+#: g10/trustdb.c:258
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "������ %08lX: ������� ��� ������ �� �����������\n"
 
-#: g10/trustdb.c:295
+#: g10/trustdb.c:296
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "�� ������ %08lX ������� ���� ��� ��� ���� ���� trustdb\n"
 
-#: g10/trustdb.c:310
+#: g10/trustdb.c:311
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "������ %08lX: ������ ������� ������ ��� �� ������ �� ����������� - "
 "���������\n"
 
-#: g10/trustdb.c:320
+#: g10/trustdb.c:321
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "�������� �������� ��� �������� ������������.\n"
 
-#: g10/trustdb.c:344
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "������� trust %lu, req ����� %d: read �������: %s\n"
 
-#: g10/trustdb.c:350
+#: g10/trustdb.c:351
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "� ������� trust %lu ��� ����� ��� ���������� ����� %d\n"
 
-#: g10/trustdb.c:446
+#: g10/trustdb.c:447
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:452
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:506
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[����������]"
 
-#: g10/trustdb.c:508 g10/trustdb.c:513
+#: g10/trustdb.c:509 g10/trustdb.c:514
 #, fuzzy
 msgid "[ expired]"
 msgstr "[�������]"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 #, fuzzy
 msgid "[ unknown]"
 msgstr "�������"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 #, fuzzy
 msgid "never"
 msgstr "����     "
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:536
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:576
+#: g10/trustdb.c:577
 msgid "no need for a trustdb check\n"
 msgstr "��� ������� ������ ��� ������ ��� trustdb\n"
 
-#: g10/trustdb.c:582 g10/trustdb.c:2157
+#: g10/trustdb.c:583 g10/trustdb.c:2309
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "�������� ������� ��� trustdb �� ����� ���� %s\n"
 
-#: g10/trustdb.c:591
+#: 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:606
+#: 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:838 g10/trustdb.c:1276
+#: 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:1033
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr "�������� ����� ��� --check-trustdb\n"
 
-#: g10/trustdb.c:1037
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "������� ��� trustdb\n"
 
-#: g10/trustdb.c:1901
+#: g10/trustdb.c:2053
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d ������� �������������� (%d ��������� ����������� �������)\n"
 
-#: g10/trustdb.c:1965
+#: g10/trustdb.c:2117
 msgid "no ultimately trusted keys found\n"
 msgstr "�� �������� ������� ������������ �������\n"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:2131
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "�� ������� �� ������� ������ ��� ������� ������������� �������� %08lX\n"
 
-#: g10/trustdb.c:2002
+#: g10/trustdb.c:2154
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2240
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2163
+#: g10/trustdb.c:2315
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "������� trust %lu, ����� %d: write �������: %s\n"
 
-#: g10/verify.c:116
+#: g10/verify.c:117
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -5780,304 +5834,335 @@ msgstr ""
 "�������� ��� ������� ��� �� ������ ��������� (.sig or .asc)\n"
 "������ �� ����� �� ����� ������ ��� ������ �������.\n"
 
-#: g10/verify.c:189
+#: g10/verify.c:190
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "������ ������� %u ����� ���� ������ � ��� ������ �� LF\n"
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "������ ������"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "�������� ����� �������"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "������� ������"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "�������� ���������� �������� ��������"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "�������� ���������� ���������"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "���� ������� ������"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "���� ������� ������"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "���� ��������"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "������ checksum"
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "���� ����� ������"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "��� ������� �� ������� ������"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "�������� ���������� ��������������"
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "�������� ��������� ��� ����������"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "�� ������ ������"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "�� ������ ��������"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "������� ��������� ������ (user id)"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "�� ������� ������ ��� ����� ���������"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "����� ����� �������� ��������"
 
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "��� �������������"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "���� ������"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "������ ��������� �������"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "������ �������� �������"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "�������� ���������� ���������"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "������ ��������� �������"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "������ ����������� �������"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "�� ������ ����� ������"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "�� ������������ ���������� �������� ��������"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "�� ������������ ���������� ��������������"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "������� ����� ���������"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "������ ��� ����� ��������� ������������"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "���� MPI"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "���� �����"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "�� ������ ����������"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "���� �������������"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "��������������� ��������� ������ (user id)"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "������ ����������� �������"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "������ ������������ �������"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "������ ��������� �������"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "�� ����������� ��������"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "��������� ���� (timestamp)"
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "�� ���������������� ���������� �������� ��������"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "�� ������ �������"
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "������� ������"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "�� ������ ������"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "���� URI"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "�� �������������� URI"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "������ �������"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "�� ���������������"
 
-#: util/errors.c:103
+#: util/errors.c:104
 msgid "not processed"
 msgstr "�� �������������"
 
-#: util/errors.c:105
+#: util/errors.c:106
 msgid "unusable public key"
 msgstr "�� ��������������� ������� ������"
 
-#: util/errors.c:106
+#: util/errors.c:107
 msgid "unusable secret key"
 msgstr "�� ��������������� ������� ������"
 
-#: util/errors.c:107
+#: util/errors.c:108
 msgid "keyserver error"
 msgstr "������ ���������� ��������"
 
-#: util/errors.c:108
+#: util/errors.c:109
 #, fuzzy
 msgid "canceled"
 msgstr "�������"
 
-#: util/errors.c:109
+#: util/errors.c:110
 #, fuzzy
 msgid "no card"
 msgstr "�� ���������������"
 
-#: util/logger.c:157
+#: util/logger.c:158
 msgid "ERROR: "
 msgstr ""
 
-#: util/logger.c:160
+#: util/logger.c:161
 msgid "WARNING: "
 msgstr ""
 
-#: util/logger.c:223
+#: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... ���� ����� bug (%s:%d:%s)\n"
 
-#: util/logger.c:229
+#: util/logger.c:230
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "������� ��� bug ... (%s:%d)\n"
 
-#: util/miscutil.c:336 util/miscutil.c:373
+#: util/miscutil.c:330 util/miscutil.c:367
 msgid "yes"
 msgstr "���|���"
 
-#: util/miscutil.c:337 util/miscutil.c:378
+#: util/miscutil.c:331 util/miscutil.c:372
 msgid "yY"
 msgstr "yY"
 
-#: util/miscutil.c:339 util/miscutil.c:375
+#: util/miscutil.c:333 util/miscutil.c:369
 msgid "no"
 msgstr "���|���"
 
-#: util/miscutil.c:340 util/miscutil.c:379
+#: util/miscutil.c:334 util/miscutil.c:373
 msgid "nN"
 msgstr "nN"
 
-#: util/miscutil.c:377
+#: util/miscutil.c:371
 msgid "quit"
 msgstr "�����������"
 
-#: util/miscutil.c:380
+#: util/miscutil.c:374
 msgid "qQ"
 msgstr "qQ"
 
-#: util/miscutil.c:413
+#: util/miscutil.c:407
 msgid "okay|okay"
 msgstr ""
 
-#: util/miscutil.c:415
+#: util/miscutil.c:409
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:416
+#: util/miscutil.c:410
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:417
+#: util/miscutil.c:411
 #, fuzzy
 msgid "cC"
 msgstr "c"
 
-#: util/secmem.c:90
+#: util/secmem.c:91
 msgid "WARNING: using insecure memory!\n"
 msgstr "�������������: ����� �� �������� ������!\n"
 
-#: util/secmem.c:91
+#: util/secmem.c:92
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "����� �� http://www.gnupg.org/faq.html ��� ������������ �����������\n"
 
-#: util/secmem.c:343
+#: util/secmem.c:344
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "� ���������� ��� ����� ������ ����� �������������� ������ �����\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:345
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(���� ��������������� ����� ��������� ��� ���� ��� �������)\n"
 
+#, fuzzy
+#~ msgid "error getting serial number: %s\n"
+#~ msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+
+#~ msgid "Hint: Select the user IDs to sign\n"
+#~ msgstr "��������: �������� �� user ID ��� ��������\n"
+
+#~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+#~ msgstr "���� ����� ������ �������� ���������� �������������� (%d)\n"
+
+#~ msgid "can't set client pid for the agent\n"
+#~ msgstr "�������� ������� ��� pid ��� ������ ��� �� agent\n"
+
+#~ msgid "can't get server read FD for the agent\n"
+#~ msgstr "�������� ��������� ��� FD ��� �� ���������� ��� ��� agent\n"
+
+#~ msgid "can't get server write FD for the agent\n"
+#~ msgstr "�������� �������� ��� FD ��� �� ���������� ��� ��� agent\n"
+
+#~ msgid "communication problem with gpg-agent\n"
+#~ msgstr "�������� ������������ �� �� gpg-agent\n"
+
+#~ msgid "passphrase too long\n"
+#~ msgstr "� ����� ������ ����� ���� ������\n"
+
+#~ msgid "invalid response from agent\n"
+#~ msgstr "�� ������ �������� ��� ��� agent\n"
+
+#~ msgid "problem with the agent: agent returns 0x%lx\n"
+#~ msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
+
 #~ msgid "select secondary key N"
 #~ msgstr "������� ������������� �������� N"
 
diff --git a/po/eo.po b/po/eo.po
index 254c7f9f0..162d1d393 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: 2005-03-15 16:35+0100\n"
+"POT-Creation-Date: 2005-05-31 10:05+0200\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"
@@ -14,81 +14,81 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-3\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:120
+#: cipher/primegen.c:121
 #, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr ""
 
-#: cipher/primegen.c:311
+#: cipher/primegen.c:312
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr ""
 
-#: cipher/random.c:163
+#: cipher/random.c:164
 msgid "no entropy gathering module detected\n"
 msgstr ""
 
-#: cipher/random.c:387 g10/card-util.c:656 g10/card-util.c:725
-#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2255
-#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
-#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
-#: g10/tdbio.c:600
+#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
+#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
+#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
+#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
+#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/tdbio.c:601
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
 
-#: cipher/random.c:391
+#: cipher/random.c:392
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "ne povas stat-i '%s': %s\n"
 
-#: cipher/random.c:396
+#: cipher/random.c:397
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "'%s' ne estas normala dosiero - ignorita\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:402
 msgid "note: random_seed file is empty\n"
 msgstr "noto: dosiero random_seed estas malplena\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:408
 #, fuzzy
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "averto: nevalida grando de la dosiero random_seen - ne uzita\n"
 
-#: cipher/random.c:415
+#: cipher/random.c:416
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "ne povas legi '%s': %s\n"
 
-#: cipher/random.c:453
+#: cipher/random.c:454
 msgid "note: random_seed file not updated\n"
 msgstr "noto: dosiero random_seed ne aktualigita\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2723
-#: g10/keygen.c:2753 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
-#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:481
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "ne povas skribi '%s': %s\n"
 
-#: cipher/random.c:483
+#: cipher/random.c:484
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "ne povas fermi '%s': %s\n"
 
-#: cipher/random.c:728
+#: cipher/random.c:729
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVERTO: uzas malsekuran stokastilon!!\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:730
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -102,14 +102,14 @@ msgstr ""
 "NE UZU DATENOJN KREITAJN DE �I TIU PROGRAMO!!\n"
 "\n"
 
-#: cipher/rndegd.c:204
+#: cipher/rndegd.c:205
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
 "of the entropy.\n"
 msgstr ""
 
-#: cipher/rndlinux.c:134
+#: cipher/rndlinux.c:135
 #, c-format
 msgid ""
 "\n"
@@ -120,45 +120,62 @@ msgstr ""
 "Nesufi�e da stokastaj datenoj. Bonvolu fari ion por ebligi al la\n"
 "mastruma sistemo kolekti pli da entropio! (Mankas %d bitokoj)\n"
 
-#: g10/app-openpgp.c:547
+#: g10/app-openpgp.c:596
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/app-openpgp.c:560
+#: g10/app-openpgp.c:609
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
 
-#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
+#: g10/app-openpgp.c:977
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
+
+#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+msgid "response does not contain the public key data\n"
+msgstr ""
+
+#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
-#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
+#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
+#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/app-openpgp.c:836
+#: g10/app-openpgp.c:1310
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:857
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:862
+#: g10/app-openpgp.c:1336
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -166,354 +183,359 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:869
+#: g10/app-openpgp.c:1343
 msgid "|A|Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1018
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:1492
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1018
+#: g10/app-openpgp.c:1492
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1022
+#: g10/app-openpgp.c:1496
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
+#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "eraro dum legado de �losilbloko: %s\n"
 
-#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
+#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: eraro dum legado de libera registro: %s\n"
 
-#: g10/app-openpgp.c:1104
+#: g10/app-openpgp.c:1562
 #, fuzzy
 msgid "key already exists\n"
 msgstr "'%s' jam densigita\n"
 
-#: g10/app-openpgp.c:1108
+#: g10/app-openpgp.c:1566
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1110
+#: g10/app-openpgp.c:1568
 #, fuzzy
 msgid "generating new key\n"
 msgstr "krei novan �losilparon"
 
-#: g10/app-openpgp.c:1120
+#: g10/app-openpgp.c:1735
+msgid "creation timestamp missing\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1742
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1749
+#, c-format
+msgid "RSA public exponent missing or largerr than %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1827
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
+
+#: g10/app-openpgp.c:1886
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1135
+#: g10/app-openpgp.c:1901
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1904
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
-msgid "response does not contain the public key data\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
-msgid "response does not contain the RSA modulus\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
-msgid "response does not contain the RSA public exponent\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1195
+#: g10/app-openpgp.c:1961
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1356
+#: g10/app-openpgp.c:2130
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1364
+#: g10/app-openpgp.c:2138
 #, c-format
-msgid "PIN [sigs done: %lu]"
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
+#: g10/app-openpgp.c:2399
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 
-#: g10/app-openpgp.c:1731
-#, fuzzy, c-format
-msgid "error getting serial number: %s\n"
-msgstr "eraro dum kreado de pasfrazo: %s\n"
-
-#: g10/app-openpgp.c:1826
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
-
-#: g10/app-openpgp.c:1868
-#, fuzzy
-msgid "reading the key failed\n"
-msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
-
-#: g10/armor.c:317
+#: g10/armor.c:318
 #, c-format
 msgid "armor: %s\n"
 msgstr "kiraso: %s\n"
 
-#: g10/armor.c:346
+#: g10/armor.c:347
 msgid "invalid armor header: "
 msgstr "nevalida kiraso�apo: "
 
-#: g10/armor.c:353
+#: g10/armor.c:354
 msgid "armor header: "
 msgstr "kiraso�apo: "
 
-#: g10/armor.c:364
+#: g10/armor.c:365
 msgid "invalid clearsig header\n"
 msgstr "nevalida �apo de klarteksta subskribo\n"
 
-#: g10/armor.c:416
+#: g10/armor.c:417
 msgid "nested clear text signatures\n"
 msgstr "ingitaj klartekstaj subskriboj\n"
 
-#: g10/armor.c:551
+#: g10/armor.c:552
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "neatendita kiraso:"
 
-#: g10/armor.c:563
+#: g10/armor.c:564
 msgid "invalid dash escaped line: "
 msgstr "nevalida strek-eskapita linio: "
 
-#: g10/armor.c:715 g10/armor.c:1322
+#: g10/armor.c:716 g10/armor.c:1323
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "nevalida signo %02x en bazo 64 ignorita\n"
 
-#: g10/armor.c:758
+#: g10/armor.c:759
 msgid "premature eof (no CRC)\n"
 msgstr "tro frua dosierfino (nenia CRC)\n"
 
-#: g10/armor.c:792
+#: g10/armor.c:793
 msgid "premature eof (in CRC)\n"
 msgstr "tro frua dosierfino (en CRC)\n"
 
-#: g10/armor.c:800
+#: g10/armor.c:801
 msgid "malformed CRC\n"
 msgstr "misformita CRC\n"
 
-#: g10/armor.c:804 g10/armor.c:1359
+#: g10/armor.c:805 g10/armor.c:1360
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC-eraro; %06lx - %06lx\n"
 
-#: g10/armor.c:824
+#: g10/armor.c:825
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "tro frua dosierfino (en vosto)\n"
 
-#: g10/armor.c:828
+#: g10/armor.c:829
 msgid "error in trailer line\n"
 msgstr "eraro en vostolinio\n"
 
-#: g10/armor.c:1137
+#: g10/armor.c:1138
 msgid "no valid OpenPGP data found.\n"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 
-#: g10/armor.c:1142
+#: g10/armor.c:1143
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "nevalida kiraso: linio pli longa ol %d signojn\n"
 
-#: g10/armor.c:1146
+#: g10/armor.c:1147
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "quoted-printable-signo en kiraso - ver�ajne cima po�totransendilo estis "
 "uzata\n"
 
-#: g10/card-util.c:58 g10/card-util.c:295
+#: g10/card-util.c:63 g10/card-util.c:303
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "sekreta �losilo ne havebla"
 
-#: g10/card-util.c:63
+#: g10/card-util.c:68
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1329 g10/delkey.c:127 g10/keyedit.c:1430
-#: g10/keygen.c:2439 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1510
+#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "ne povas fari tion en neinteraga re�imo\n"
 
-#: g10/card-util.c:97 g10/card-util.c:1108 g10/card-util.c:1191
-#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
-#: g10/keygen.c:1365
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
+#: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "Via elekto? "
 
-#: g10/card-util.c:206 g10/card-util.c:256
+#: g10/card-util.c:213 g10/card-util.c:263
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:391
+#: g10/card-util.c:410
 #, fuzzy
 msgid "male"
 msgstr "en"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 #, fuzzy
 msgid "female"
 msgstr "en"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 #, fuzzy
 msgid "unspecified"
 msgstr "Nenia kialo specifita"
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 #, fuzzy
 msgid "not forced"
 msgstr "ne traktita"
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:497
+#: g10/card-util.c:516
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:499
+#: g10/card-util.c:518
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:501
+#: g10/card-util.c:520
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:518
+#: g10/card-util.c:537
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:539
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:538
+#: g10/card-util.c:557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:559
+#: g10/card-util.c:578
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "skribas publikan �losilon al '%s'\n"
 
-#: g10/card-util.c:567
+#: g10/card-util.c:586
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:665 g10/card-util.c:734 g10/import.c:261
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:692
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:683
+#: g10/card-util.c:702
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:742
+#: g10/card-util.c:761
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:752
+#: g10/card-util.c:771
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:772
+#: g10/card-util.c:791
 #, fuzzy
 msgid "Language preferences: "
 msgstr "aktualigitaj preferoj"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:799
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "nevalida signo en signo�eno\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:808
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "nevalida signo en signo�eno\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:829
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:824
+#: g10/card-util.c:843
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/card-util.c:845
+#: g10/card-util.c:864
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Fingrospuro:"
 
-#: g10/card-util.c:868
+#: g10/card-util.c:887
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/card-util.c:916
+#: g10/card-util.c:935
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/card-util.c:917
+#: g10/card-util.c:936
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 
-#: g10/card-util.c:926
+#: g10/card-util.c:945
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1030
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1030 g10/card-util.c:1039
+#: g10/card-util.c:1051 g10/card-util.c:1060
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1051
+#: g10/card-util.c:1072
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1060
+#: g10/card-util.c:1081
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -521,406 +543,410 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1099
+#: g10/card-util.c:1120
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
 
-#: g10/card-util.c:1101 g10/card-util.c:1182
+#: g10/card-util.c:1122 g10/card-util.c:1203
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/card-util.c:1102 g10/card-util.c:1184
+#: g10/card-util.c:1123 g10/card-util.c:1205
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/card-util.c:1103 g10/card-util.c:1186
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1119 g10/card-util.c:1202 g10/keyedit.c:908
-#: g10/keygen.c:1404 g10/revoke.c:642
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
+#: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "Nevalida elekto.\n"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1200
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Kialo por revoko: "
 
-#: g10/card-util.c:1214
+#: g10/card-util.c:1235
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "nekonata densig-metodo"
 
-#: g10/card-util.c:1219
+#: g10/card-util.c:1240
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 
-#: g10/card-util.c:1224
+#: g10/card-util.c:1245
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
 
-#: g10/card-util.c:1294 g10/keyedit.c:1317
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "forlasi �i tiun menuon"
 
-#: g10/card-util.c:1296
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "show admin commands"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1297 g10/keyedit.c:1320
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "montri �i tiun helpon"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenia helpo disponata"
 
-#: g10/card-util.c:1302
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1303
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1304
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1305
+#: g10/card-util.c:1327
 #, fuzzy
 msgid "change the login name"
 msgstr "�an�i la daton de eksvalidi�o"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the language preferences"
 msgstr "�an�i la posedantofidon"
 
-#: g10/card-util.c:1307
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1308
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "montri fingrospuron"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1310
+#: g10/card-util.c:1332
 #, fuzzy
 msgid "generate new keys"
 msgstr "krei novan �losilparon"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1377 g10/keyedit.c:1526
+#: g10/card-util.c:1334
+msgid "verify the PIN and list all data"
+msgstr ""
+
+#: g10/card-util.c:1454 g10/keyedit.c:1609
 msgid "Command> "
 msgstr "Komando> "
 
-#: g10/card-util.c:1412
+#: g10/card-util.c:1492
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1430
+#: g10/card-util.c:1525
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/card-util.c:1499 g10/keyedit.c:2104
+#: g10/card-util.c:1599 g10/keyedit.c:2210
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Nevalida komando (provu per \"helpo\")\n"
 
-#: g10/cardglue.c:287
+#: g10/cardglue.c:396
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:519
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:380
+#: g10/cardglue.c:527
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:852
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Donu la uzantidentigilon: "
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:853
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "Donu la uzantidentigilon: "
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:854
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:691
+#: g10/cardglue.c:855
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Donu la uzantidentigilon: "
 
-#: g10/cardglue.c:705
+#: g10/cardglue.c:872
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Ripetu pasfrazon: "
 
-#: g10/cardglue.c:719
+#: g10/cardglue.c:886
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
-#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "ne povas malfermi '%s'\n"
 
-#: g10/decrypt.c:104 g10/encode.c:859
+#: g10/decrypt.c:105 g10/encode.c:846
 msgid "--output doesn't work for this command\n"
 msgstr "--output ne funkcias por �i tiu komando\n"
 
-#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3167 g10/keyserver.c:1511
-#: g10/revoke.c:226
+#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3346 g10/keyserver.c:1541
+#: g10/revoke.c:227
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2300 g10/keyserver.c:1525
-#: g10/revoke.c:232 g10/revoke.c:439
+#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "eraro dum legado de �losilbloko: %s\n"
 
-#: g10/delkey.c:128 g10/delkey.c:135
+#: g10/delkey.c:129 g10/delkey.c:136
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr ""
 
-#: g10/delkey.c:134
+#: g10/delkey.c:135
 #, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "ne povas fari tion en neinteraga re�imo sen \"--yes\"\n"
 
-#: g10/delkey.c:146
+#: g10/delkey.c:147
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "�u forvi�i �i tiun �losilon de la �losilaro? "
 
-#: g10/delkey.c:154
+#: g10/delkey.c:155
 #, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Tio estas sekreta �losilo! �u vere forvi�i �in? "
 
-#: g10/delkey.c:164
+#: g10/delkey.c:165
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: g10/delkey.c:174
+#: g10/delkey.c:175
 msgid "ownertrust information cleared\n"
 msgstr ""
 
-#: g10/delkey.c:205
+#: g10/delkey.c:206
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "estas sekreta �losilo por la publika �losilo \"%s\"!\n"
 
-#: g10/delkey.c:207
+#: g10/delkey.c:208
 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:210 g10/sign.c:1186
+#: g10/encode.c:211 g10/sign.c:1218
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: g10/encode.c:215
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 
-#: g10/encode.c:228
+#: g10/encode.c:229
 #, fuzzy, c-format
 msgid "using cipher %s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: g10/encode.c:238 g10/encode.c:558
+#: g10/encode.c:239 g10/encode.c:545
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "'%s' jam densigita\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
+#: g10/encode.c:302 g10/encode.c:591 g10/sign.c:566
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/encode.c:472
+#: g10/encode.c:466
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "eblas �ifri nur per RSA-�losiloj de maksimume 2048 bitoj kun --pgp2\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:488
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "legas el '%s'\n"
 
-#: g10/encode.c:530
+#: g10/encode.c:517
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "ne povas uzi la �ifron IDEA por �iuj �losiloj, al kiuj vi �ifras.\n"
 
-#: g10/encode.c:540
+#: g10/encode.c:527
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:635 g10/sign.c:899
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/encode.c:735
+#: g10/encode.c:722
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:805 g10/pkclist.c:721 g10/pkclist.c:757
+#: g10/encode.c:792 g10/pkclist.c:722 g10/pkclist.c:758
 #, fuzzy, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/encode.c:832
+#: g10/encode.c:819
 #, fuzzy, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s-�ifrita por: %s\n"
 
-#: g10/encr-data.c:66 g10/mainproc.c:301
+#: g10/encr-data.c:67 g10/mainproc.c:302
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s-�ifritaj datenoj\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:305
+#: g10/encr-data.c:69 g10/mainproc.c:306
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "�ifrita per nekonata metodo %d\n"
 
-#: g10/encr-data.c:92
+#: g10/encr-data.c:93
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "AVERTO: mesa�o estis �ifrita per malforta �losilo en la simetria �ifro.\n"
 
-#: g10/encr-data.c:103
+#: g10/encr-data.c:104
 msgid "problem handling encrypted packet\n"
 msgstr "problemo �e traktado de �ifrita paketo\n"
 
-#: g10/exec.c:48
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr ""
 
-#: g10/exec.c:184 g10/openfile.c:406
+#: g10/exec.c:173 g10/openfile.c:410
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: g10/exec.c:325
+#: g10/exec.c:314
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 
-#: g10/exec.c:355
+#: g10/exec.c:344
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr "%s: eraro dum legado de versiregistro: %s\n"
 
-#: g10/exec.c:433
+#: g10/exec.c:422
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/exec.c:436
+#: g10/exec.c:425
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: g10/exec.c:521
+#: g10/exec.c:510
 #, fuzzy, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "%s: eraro dum legado de versiregistro: %s\n"
 
-#: g10/exec.c:532 g10/exec.c:598
+#: g10/exec.c:521 g10/exec.c:587
 msgid "unnatural exit of external program\n"
 msgstr ""
 
-#: g10/exec.c:547
+#: g10/exec.c:536
 msgid "unable to execute external program\n"
 msgstr ""
 
-#: g10/exec.c:563
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr ""
 
-#: g10/exec.c:609 g10/exec.c:616
+#: g10/exec.c:598 g10/exec.c:605
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr ""
 
-#: g10/exec.c:621
+#: g10/exec.c:610
 #, fuzzy, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/export.c:183
+#: g10/export.c:184
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/export.c:212
+#: g10/export.c:213
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "�losilo %08lX: ne protektita - ignorita\n"
 
-#: g10/export.c:220
+#: g10/export.c:221
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "�losilo %08lX: PGP-2.x-stila �losilo - ignorita\n"
 
-#: g10/export.c:395
+#: g10/export.c:398
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:427
+#: g10/export.c:430
 msgid "WARNING: nothing exported\n"
 msgstr "AVERTO: nenio estis eksportita\n"
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid ""
 "@Commands:\n"
 " "
@@ -928,128 +954,128 @@ msgstr ""
 "@Komandoj:\n"
 " "
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "|[file]|make a signature"
 msgstr "|[dosiero]|fari subskribon"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosiero]|fari klartekstan subskribon"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "make a detached signature"
 msgstr "fari apartan subskribon"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encrypt data"
 msgstr "�ifri datenojn"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "encryption only with symmetric cipher"
 msgstr "�ifri nur kun simetria �ifro"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "decrypt data (default)"
 msgstr "mal�ifri datenojn (implicita elekto)"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "verify a signature"
 msgstr "kontroli subskribon"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys"
 msgstr "listigi �losilojn"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and signatures"
 msgstr "listigi �losilojn kaj subskribojn"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kontroli �losilsubskribojn"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "list keys and fingerprints"
 msgstr "listigi �losilojn kaj fingro�purojn"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "list secret keys"
 msgstr "listigi sekretajn �losilojn"
 
-#: g10/g10.c:379
+#: g10/g10.c:381
 msgid "generate a new key pair"
 msgstr "krei novan �losilparon"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the public keyring"
 msgstr "forigi �losilojn de la publika �losilaro"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "remove keys from the secret keyring"
 msgstr "forigi �losilojn de la sekreta �losilaro"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign a key"
 msgstr "subskribi �losilon"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "sign a key locally"
 msgstr "subskribi �losilon loke"
 
-#: g10/g10.c:385
+#: g10/g10.c:387
 msgid "sign or edit a key"
 msgstr "subskribi a� redakti �losilon"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "generate a revocation certificate"
 msgstr "krei revokatestilon"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "export keys"
 msgstr "eksporti �losilojn"
 
-#: g10/g10.c:389
+#: g10/g10.c:391
 msgid "export keys to a key server"
 msgstr "eksporti �losilojn al �losilservilo"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "import keys from a key server"
 msgstr "importi �losilojn de �losilservilo"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "search for keys on a key server"
 msgstr "ser�i �losilojn �e �losilservilo"
 
-#: g10/g10.c:394
+#: g10/g10.c:396
 msgid "update all keys from a keyserver"
 msgstr "aktualigi �iujn �losilojn de �losilservilo"
 
-#: g10/g10.c:397
+#: g10/g10.c:399
 msgid "import/merge keys"
 msgstr "importi/kunfandi �losilojn"
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "print the card status"
 msgstr ""
 
-#: g10/g10.c:401
+#: g10/g10.c:403
 msgid "change data on a card"
 msgstr ""
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/g10.c:410
+#: g10/g10.c:412
 msgid "update the trust database"
 msgstr "aktualigi la fido-datenaron"
 
-#: g10/g10.c:417
+#: g10/g10.c:419
 msgid "|algo [files]|print message digests"
 msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
 
-#: g10/g10.c:421 g10/gpgv.c:66
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1059,51 +1085,51 @@ msgstr ""
 "Opcioj:\n"
 " "
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "create ascii armored output"
 msgstr "krei eligon en askia kiraso"
 
-#: g10/g10.c:425
+#: g10/g10.c:427
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMO|�ifri por NOMO"
 
-#: g10/g10.c:436
+#: g10/g10.c:438
 msgid "use this user-id to sign or decrypt"
 msgstr "uzi �i tiun uzantidentigilon por subskribi a� mal�ifri"
 
-#: g10/g10.c:437
+#: g10/g10.c:439
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|difini densig-nivelon N (0=nenia)"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "use canonical text mode"
 msgstr "uzi tekstan re�imon"
 
-#: g10/g10.c:452
+#: g10/g10.c:458
 msgid "use as output file"
 msgstr "uzi dosieron por eligo"
 
-#: g10/g10.c:454 g10/gpgv.c:68
+#: g10/g10.c:460 g10/gpgv.c:73
 msgid "verbose"
 msgstr "detala eligo"
 
-#: g10/g10.c:465
+#: g10/g10.c:471
 msgid "do not make any changes"
 msgstr "fari neniajn �an�ojn"
 
-#: g10/g10.c:466
+#: g10/g10.c:472
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/g10.c:507
+#: g10/g10.c:513
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:508
+#: g10/g10.c:514
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:536
+#: g10/g10.c:542
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1111,7 +1137,7 @@ msgstr ""
 "@\n"
 "(Vidu la manpa�on por kompleta listo de �iuj komandoj kaj opcioj)\n"
 
-#: g10/g10.c:539
+#: g10/g10.c:545
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1131,15 +1157,15 @@ msgstr ""
 " --list-keys [nomoj]        montri �losilojn\n"
 " --fingerprint [nomoj]      montri fingro�purojn\n"
 
-#: g10/g10.c:720 g10/gpgv.c:93
+#: g10/g10.c:724 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Bonvolu raporti cimojn al <[email protected]>.\n"
 
-#: g10/g10.c:737
+#: g10/g10.c:741
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: g10/g10.c:740
+#: g10/g10.c:744
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1149,7 +1175,7 @@ msgstr ""
 "subskribi, kontroli, �ifri a� mal�ifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: g10/g10.c:751
+#: g10/g10.c:755
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1157,466 +1183,476 @@ msgstr ""
 "\n"
 "Realigitaj metodoj:\n"
 
-#: g10/g10.c:754
+#: g10/g10.c:758
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/g10.c:760 g10/keyedit.c:2141
+#: g10/g10.c:764 g10/keyedit.c:2248
 msgid "Cipher: "
 msgstr ""
 
-#: g10/g10.c:766
+#: g10/g10.c:770
 msgid "Hash: "
 msgstr ""
 
-#: g10/g10.c:772 g10/keyedit.c:2187
+#: g10/g10.c:776 g10/keyedit.c:2294
 #, fuzzy
 msgid "Compression: "
 msgstr "Komento: "
 
-#: g10/g10.c:855
+#: g10/g10.c:859
 msgid "usage: gpg [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: g10/g10.c:1003
+#: g10/g10.c:1007
 msgid "conflicting commands\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/g10.c:1021
+#: g10/g10.c:1025
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1218
+#: g10/g10.c:1222
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/g10.c:1221
+#: g10/g10.c:1225
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/g10.c:1224
+#: g10/g10.c:1228
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/g10.c:1230
+#: g10/g10.c:1234
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/g10.c:1233
+#: g10/g10.c:1237
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1240
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/g10.c:1242
+#: g10/g10.c:1246
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/g10.c:1245
+#: g10/g10.c:1249
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/g10.c:1248
+#: g10/g10.c:1252
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1258
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/g10.c:1257
+#: g10/g10.c:1261
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/g10.c:1260
+#: g10/g10.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/g10.c:1401
+#: g10/g10.c:1405
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1802
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/g10.c:1838
+#: g10/g10.c:1844
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/g10.c:1842
+#: g10/g10.c:1848
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "opcio-dosiero '%s': %s\n"
 
-#: g10/g10.c:1849
+#: g10/g10.c:1855
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTO: %s ne estas por normala uzado!\n"
 
-#: g10/g10.c:2076
+#: g10/g10.c:2082
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/g10.c:2293
+#: g10/g10.c:2236 g10/g10.c:2248
+#, fuzzy, c-format
+msgid "`%s' is not a valid signature expiration\n"
+msgstr "%s ne estas valida signaro\n"
+
+#: g10/g10.c:2321
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3683
+#: g10/g10.c:2340 g10/keyedit.c:3862
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2346
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2349
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2356
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2359
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "nevalida kiraso"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2366
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2369
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2376
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2379
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "nevalida kiraso"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2401
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2404
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2411
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:2573
+#: g10/g10.c:2602
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2606
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTO: %s nuligas %s\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2615
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2618
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/g10.c:2603
+#: g10/g10.c:2625
+#, 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/g10.c:2640
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/g10.c:2617
+#: g10/g10.c:2654
 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/g10.c:2623
+#: g10/g10.c:2660
 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/g10.c:2629
+#: g10/g10.c:2666
 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/g10.c:2642
+#: g10/g10.c:2679
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�ifri mesa�on kun --pgp2 postulas la �ifron IDEA\n"
 
-#: g10/g10.c:2712 g10/g10.c:2736
+#: g10/g10.c:2746 g10/g10.c:2770
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/g10.c:2718 g10/g10.c:2742
+#: g10/g10.c:2752 g10/g10.c:2776
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/g10.c:2724
+#: g10/g10.c:2758
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2764
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/g10.c:2745
+#: g10/g10.c:2779
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/g10.c:2747
+#: g10/g10.c:2781
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2783
 #, 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/g10.c:2751
+#: g10/g10.c:2785
 #, 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/g10.c:2753
+#: g10/g10.c:2787
 #, 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/g10.c:2756
+#: g10/g10.c:2790
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2794
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "nevalida S2K-re�imo; devas esti 0, 1 a� 3\n"
 
-#: g10/g10.c:2767
+#: g10/g10.c:2801
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/g10.c:2776
+#: g10/g10.c:2810
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/g10.c:2780
+#: g10/g10.c:2814
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/g10.c:2784
+#: g10/g10.c:2818
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/g10.c:2817
+#: g10/g10.c:2851
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/g10.c:2864
+#: g10/g10.c:2898
 #, 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/g10.c:2869
+#: g10/g10.c:2903
 #, 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/g10.c:2874
+#: g10/g10.c:2908
 #, 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/g10.c:2970
+#: g10/g10.c:3004
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/g10.c:2981
+#: g10/g10.c:3015
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/g10.c:2992
+#: g10/g10.c:3026
 msgid "--store [filename]"
 msgstr "--store [dosiero]"
 
-#: g10/g10.c:2999
+#: g10/g10.c:3033
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosiero]"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3035
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "mal�ifrado malsukcesis: %s\n"
 
-#: g10/g10.c:3011
+#: g10/g10.c:3045
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosiero]"
 
-#: g10/g10.c:3024
+#: g10/g10.c:3058
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3060
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3029
+#: g10/g10.c:3063
 #, 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/g10.c:3047
+#: g10/g10.c:3081
 msgid "--sign [filename]"
 msgstr "--sign [dosiero]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3094
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/g10.c:3075
+#: g10/g10.c:3109
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/g10.c:3077
+#: g10/g10.c:3111
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3080
+#: g10/g10.c:3114
 #, 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/g10.c:3100
+#: g10/g10.c:3134
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [dosiero]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3143
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosiero]"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3168
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosiero]"
 
-#: g10/g10.c:3142
+#: g10/g10.c:3176
 msgid "--sign-key user-id"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/g10.c:3146
+#: g10/g10.c:3180
 msgid "--lsign-key user-id"
 msgstr "--lsign-key uzantidentigilo"
 
-#: g10/g10.c:3167
+#: g10/g10.c:3201
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key uzantidentigilo [komandoj]"
 
-#: g10/g10.c:3238
+#: g10/g10.c:3272
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [uzantidentigilo] [�losilaro]"
 
-#: g10/g10.c:3275
+#: g10/g10.c:3309
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/g10.c:3277
+#: g10/g10.c:3311
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3313
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/g10.c:3290
+#: g10/g10.c:3324
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record malsukcesis: %s\n"
 
-#: g10/g10.c:3300
+#: g10/g10.c:3334
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/g10.c:3341
+#: g10/g10.c:3375
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/g10.c:3349
+#: g10/g10.c:3383
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/g10.c:3436
+#: g10/g10.c:3470
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/g10.c:3559
+#: g10/g10.c:3593
 msgid "[filename]"
 msgstr "[dosiero]"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3597
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesa�on ...\n"
 
-#: g10/g10.c:3853
+#: g10/g10.c:3887
 #, fuzzy
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1625,87 +1661,92 @@ msgstr ""
 "notacia nomo devas enhavi nur literojn, ciferojn, punktojn a� substrekojn "
 "kaj fini per '='\n"
 
-#: g10/g10.c:3861
+#: g10/g10.c:3895
 #, fuzzy
 msgid "a user notation name must contain the '@' character\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
-#: g10/g10.c:3871
+#: g10/g10.c:3900
+#, fuzzy
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr "notacia valoro ne povas enhavi stirsignojn\n"
+
+#: g10/g10.c:3911
 msgid "a notation value must not use any control characters\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
-#: g10/g10.c:3905
+#: g10/g10.c:3945
 msgid "the given certification policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por atestado ne validas\n"
 
-#: g10/g10.c:3907
+#: g10/g10.c:3947
 msgid "the given signature policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/g10.c:3940
+#: g10/g10.c:3980
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "tro da registroj en pk-staplo - mal�altas\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2750
+#: g10/getkey.c:187 g10/getkey.c:2757
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Uzantidentigilo ne trovita]"
 
-#: g10/getkey.c:1677
+#: g10/getkey.c:1684
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Nevalida �losilo %08lX validigita per --always-trust\n"
 
-#: g10/getkey.c:2228
+#: g10/getkey.c:2235
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "estas sekreta �losilo por la publika �losilo \"%s\"!\n"
 
-#: g10/getkey.c:2459
+#: g10/getkey.c:2466
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "uzas flankan �losilon %08lX anstata� la �efa �losilo %08lX\n"
 
-#: g10/getkey.c:2506
+#: g10/getkey.c:2513
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:74
 msgid "be somewhat more quiet"
 msgstr "iom malpli da informoj"
 
-#: g10/gpgv.c:70
+#: g10/gpgv.c:75
 #, fuzzy
 msgid "take the keys from this keyring"
 msgstr "�u forvi�i �i tiun �losilon de la �losilaro? "
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:77
 #, fuzzy
 msgid "make timestamp conflicts only a warning"
 msgstr "malkongruo de tempostampoj"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:78
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
 
-#: g10/gpgv.c:97
+#: g10/gpgv.c:102
 #, fuzzy
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:105
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
 
-#: g10/helptext.c:48
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1715,7 +1756,7 @@ msgstr ""
 "al alia persono. Ni bezonas �in por realigi la fido-reton; �i neniel\n"
 "rilatas al la (implicite kreita) atestilo-reto."
 
-#: g10/helptext.c:54
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1727,18 +1768,18 @@ msgstr ""
 "aliron al la sekreta �losilo. Respondu \"jes\" por igi �i tiun �losilon\n"
 "absolute fidata\n"
 
-#: g10/helptext.c:61
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Se vi tamen volas uzi �i tiun nefidatan �losilon, respondu per \"jes\"."
 
-#: g10/helptext.c:65
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr ""
 "Donu la uzantidentigilon de la adresito, al kiu vi volas sendi la mesa�on."
 
-#: g10/helptext.c:69
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1752,23 +1793,23 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:83
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
 "Please consult your security expert first."
 msgstr ""
 
-#: g10/helptext.c:90
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "Donu la �losilgrandon"
 
-#: g10/helptext.c:94 g10/helptext.c:99 g10/helptext.c:111 g10/helptext.c:143
-#: g10/helptext.c:171 g10/helptext.c:176 g10/helptext.c:181
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "Respondu per \"jes\" a� \"ne\""
 
-#: g10/helptext.c:104
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1780,19 +1821,19 @@ msgstr ""
 "bonan eraromesa�on; anstata�e la sistemo provas interpreti\n"
 "la donitan valoron kiel gamon."
 
-#: g10/helptext.c:116
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "Donu la nomon de la �losilposedanto"
 
-#: g10/helptext.c:121
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr "bonvolu doni retadreson (ne devige, sed tre rekomendate)"
 
-#: g10/helptext.c:125
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "Bonvolu doni nedevigan komenton"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1806,11 +1847,11 @@ msgstr ""
 "B  por da�rigi kun la �losilkreado.\n"
 "F  por interrompi la �losilkreadon kaj fini."
 
-#: g10/helptext.c:139
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Respondu per \"jes\" (a� nur \"j\"), se la sub�losilo estu kreita."
 
-#: g10/helptext.c:147
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -1880,12 +1921,12 @@ msgstr ""
 "\n"
 "Se vi ne scias la �ustan respondon, respondu per \"0\"."
 
-#: g10/helptext.c:185
+#: g10/helptext.c:186
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Respondu per \"jes\", se vi volas subskribi �iujn uzantidentigilojn"
 
-#: g10/helptext.c:189
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -1893,11 +1934,11 @@ msgstr ""
 "Respondu per \"jes\", se vi vere volas forvi�i la uzantidentigilon.\n"
 "Tiam anka� �iuj atestiloj perdi�os!"
 
-#: g10/helptext.c:194
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Respondu per \"jes\", se la sub�losilo estu forvi�ita"
 
-#: g10/helptext.c:199
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -1907,7 +1948,7 @@ msgstr ""
 "�i tiun subskribon, �ar eble �i estos grava por establi fido-ligon\n"
 "al la �losilo a� al alia �losilo atestita per �i tiu �losilo."
 
-#: g10/helptext.c:204
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -1919,7 +1960,7 @@ msgstr ""
 "�losilo estis uzita, �ar la subskribanta �losilo eble establos\n"
 "fido-ligon tra alia jam atestita �losilo."
 
-#: g10/helptext.c:210
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -1927,7 +1968,7 @@ msgstr ""
 "La subskribo ne estas valida. Estas prudente forigi �in de\n"
 "via �losilaro."
 
-#: g10/helptext.c:214
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -1941,7 +1982,7 @@ msgstr ""
 "mem-subskribo estas ial nevalida, kaj dua mem-subskribo estas\n"
 "havebla."
 
-#: g10/helptext.c:222
+#: g10/helptext.c:223
 #, fuzzy
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
@@ -1952,24 +1993,24 @@ msgstr ""
 "al la aktuala listo de preferoj. La dato de �iuj trafitaj\n"
 "mem-subskriboj estos anta�enigitaj je unu sekundo.\n"
 
-#: g10/helptext.c:229
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: g10/helptext.c:235
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "Bonvolu ripeti la pasfrazon, por kontroli, ke vi bone scias, kion vi tajpis."
 
-#: g10/helptext.c:239
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "Donu la nomon de la dosiero, al kiu la subskribo apliki�as"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Respondu per \"jes\", se la dosiero estu surskribita"
 
-#: g10/helptext.c:249
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -1977,7 +2018,7 @@ msgstr ""
 "Bonvolu doni novan dosiernomon. Se vi premas nur ENEN, la implicita\n"
 "dosiero (montrita en parentezo) estos uzata."
 
-#: g10/helptext.c:255
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2005,7 +2046,7 @@ msgstr ""
 "      Uzu �i tion por aserti, ke la uzantidentigilo ne plu estu uzata;\n"
 "      normale oni uzas �i tion por marki retadreson kiel nevalidan.\n"
 
-#: g10/helptext.c:271
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2015,468 +2056,473 @@ msgstr ""
 "�i tiun revokatestilon. Bonvolu fari �i tiun tekston konciza.\n"
 "Malplena linio finas la tekston.\n"
 
-#: g10/helptext.c:286
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "Nenia helpo disponata"
 
-#: g10/helptext.c:294
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Nenia helpo disponata por '%s'"
 
-#: g10/import.c:247
+#: g10/import.c:248
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignoras blokon de speco %d\n"
 
-#: g10/import.c:256
+#: g10/import.c:257
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu �losiloj jam traktitaj\n"
 
-#: g10/import.c:273
+#: g10/import.c:274
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "      Nombro traktita entute: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "    ignoritaj novaj �losiloj: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:279
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         sen uzantidentigilo: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "              imported: %lu"
 msgstr "                  importitaj: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:287
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                  ne�an�itaj: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      novaj uzantidentigiloj: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novaj sub�losiloj: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "            novaj subskriboj: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "         novaj �losilrevokoj: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   sekretaj �losiloj legitaj: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "sekretaj �losiloj importitaj: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "sekretaj �losiloj ne�an�itaj: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, fuzzy, c-format
 msgid "          not imported: %lu\n"
 msgstr "                  importitaj: %lu"
 
-#: g10/import.c:543
+#: g10/import.c:544
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:545
+#: g10/import.c:546
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
 
-#: g10/import.c:582
+#: g10/import.c:583
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:594
+#: g10/import.c:595
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/import.c:606
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:620
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:646
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:694 g10/import.c:1048
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo\n"
 
-#: g10/import.c:713
+#: g10/import.c:714
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:728
+#: g10/import.c:729
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "�losilo %08lX: akceptis ne-mem-subskribitan uzantidentigilon '"
 
-#: g10/import.c:734
+#: g10/import.c:735
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "�losilo %08lX: mankas valida uzantidentigilo\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 msgid "this may be caused by a missing self-signature\n"
 msgstr "tio povas esti ka�zata de mankanta mem-subskribo\n"
 
-#: g10/import.c:746 g10/import.c:1168
+#: g10/import.c:747 g10/import.c:1169
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "�losilo %08lX: publika �losilo ne trovita: %s\n"
 
-#: g10/import.c:752
+#: g10/import.c:753
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "�losilo %08lX: nova �losilo - ignorita\n"
 
-#: g10/import.c:761
+#: g10/import.c:762
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "neniu skribebla �losilaro trovita: %s\n"
 
-#: g10/import.c:766 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skribas al '%s'\n"
 
-#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
-#: g10/import.c:2314 g10/import.c:2336
+#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
+#: g10/import.c:2315 g10/import.c:2337
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "eraro dum skribado de �losilaro '%s': %s\n"
 
-#: g10/import.c:791
+#: g10/import.c:792
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "�losilo %08lX: publika �losilo importita\n"
 
-#: g10/import.c:815
+#: g10/import.c:816
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "�losilo %08lX: diferencas de nia kopio\n"
 
-#: g10/import.c:832 g10/import.c:1186
+#: g10/import.c:833 g10/import.c:1187
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "�losilo %08lX: ne povas trovi originalan �losilblokon: %s\n"
 
-#: g10/import.c:840 g10/import.c:1193
+#: g10/import.c:841 g10/import.c:1194
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "�losilo %08lX: ne povas legi originalan �losilblokon: %s\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "�losilo %08lX: 1 nova uzantidentigilo\n"
 
-#: g10/import.c:875
+#: g10/import.c:876
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
 
-#: g10/import.c:878
+#: g10/import.c:879
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "�losilo %08lX: 1 nova subskribo\n"
 
-#: g10/import.c:881
+#: g10/import.c:882
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "�losilo %08lX: %d novaj subskriboj\n"
 
-#: g10/import.c:884
+#: g10/import.c:885
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "�losilo %08lX: 1 nova sub�losilo\n"
 
-#: g10/import.c:887
+#: g10/import.c:888
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "�losilo %08lX: %d novaj sub�losiloj\n"
 
-#: g10/import.c:908
+#: g10/import.c:909
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "�losilo %08lX: ne �an�ita\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1054
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
 
-#: g10/import.c:1064
+#: g10/import.c:1065
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/import.c:1081 g10/import.c:2329
+#: g10/import.c:1082 g10/import.c:2330
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "mankas implicita sekreta �losilaro: %s\n"
 
-#: g10/import.c:1092
+#: g10/import.c:1093
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "�losilo %08lX: sekreta �losilo importita\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1122
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "�losilo %08lX: jam en sekreta �losilaro\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1132
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "�losilo %08lX: sekreta �losilo ne trovita: %s\n"
 
-#: g10/import.c:1161
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "�losilo %08lX: publika �losilo mankas - ne povas apliki revokatestilon\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1205
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "�losilo %08lX: nevalida revokatestilo: %s - malakceptita\n"
 
-#: g10/import.c:1236
+#: g10/import.c:1237
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "�losilo %08lX: revokatestilo importita\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1302
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo por subskribo\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1317
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/import.c:1336
+#: g10/import.c:1337
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:1347 g10/import.c:1397
+#: g10/import.c:1348 g10/import.c:1398
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
 
-#: g10/import.c:1349
+#: g10/import.c:1350
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1365
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "�losilo %08lX.%lu: Valida sub�losilrevoko\n"
 
-#: g10/import.c:1414
+#: g10/import.c:1415
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1457
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "�losilo %08lX: ignoris uzantidentigilon '"
 
-#: g10/import.c:1477
+#: g10/import.c:1478
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "�losilo %08lX: ignoris sub�losilon\n"
 
-#: g10/import.c:1504
+#: g10/import.c:1505
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "�losilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
 
-#: g10/import.c:1514
+#: g10/import.c:1515
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "�losilo %08lX: revokatestilo en mal�usta loko - ignorita\n"
 
-#: g10/import.c:1531
+#: g10/import.c:1532
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "�losilo %08lX: nevalida revokatestilo: %s - ignorita\n"
 
-#: g10/import.c:1545
+#: g10/import.c:1546
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "�losilo %08lX: revokatestilo en mal�usta loko - ignorita\n"
 
-#: g10/import.c:1553
+#: g10/import.c:1554
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "�losilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
 
-#: g10/import.c:1574
+#: g10/import.c:1575
 #, fuzzy, c-format
 msgid "key %s: expired signature from key %s - skipped\n"
 msgstr "�losilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
 
-#: g10/import.c:1677
+#: g10/import.c:1678
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "�losilo %08lX: trovis ripetitan uzantidentigilon - kunfandita\n"
 
-#: g10/import.c:1739
+#: g10/import.c:1740
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/import.c:1753
+#: g10/import.c:1754
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/import.c:1812
+#: g10/import.c:1813
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "�losilo %08lX: revokatestilo aldonita\n"
 
-#: g10/import.c:1846
+#: g10/import.c:1847
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "�losilo %08lX: rekta �losilsubskribo aldonita\n"
 
-#: g10/import.c:2235
+#: g10/import.c:2236
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2243
+#: g10/import.c:2244
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
 
-#: g10/import.c:2245
+#: g10/import.c:2246
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
 
-#: g10/keydb.c:167
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "eraro dum kreado de �losilaro '%s': %s\n"
 
-#: g10/keydb.c:174
+#: g10/keydb.c:175
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "�losilaro '%s' kreita\n"
 
-#: g10/keydb.c:685
+#: g10/keydb.c:316 g10/keydb.c:319
+#, fuzzy, c-format
+msgid "keyblock resource `%s': %s\n"
+msgstr "eraro dum kreado de '%s': %s\n"
+
+#: g10/keydb.c:698
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[revoko]"
 
-#: g10/keyedit.c:255
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[mem-subskribo]"
 
-#: g10/keyedit.c:333 g10/keylist.c:405
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 malbona subskribo\n"
 
-#: g10/keyedit.c:335 g10/keylist.c:407
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d malbonaj subskriboj\n"
 
-#: g10/keyedit.c:337 g10/keylist.c:409
+#: g10/keyedit.c:344 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 subskribo ne kontrolita pro manko de �losilo\n"
 
-#: g10/keyedit.c:339 g10/keylist.c:411
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, 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:341 g10/keylist.c:413
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 subskribo ne kontrolita pro eraro\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:415
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d subskriboj ne kontrolitaj pro eraroj\n"
 
-#: g10/keyedit.c:345
+#: g10/keyedit.c:352
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 uzantidentigilo sen valida mem-subskribo estis trovita\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:354
 #, 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:403 g10/pkclist.c:262
+#: g10/keyedit.c:410 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2489,54 +2535,64 @@ msgstr ""
 "kontrolante fingrospurojn el diversaj fontoj ...)?\n"
 "\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:274
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Mi fidas iomete\n"
 
-#: g10/keyedit.c:408 g10/pkclist.c:276
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Mi plene fidas\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:434
 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:443
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:594
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
-#: g10/keyedit.c:858 g10/keyedit.c:1642
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1728
 #, 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:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
-#: g10/keyedit.c:1648
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
+#: g10/keyedit.c:1734
 msgid "  Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:622
 #, fuzzy, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:650
 #, fuzzy, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/keyedit.c:676
+#: g10/keyedit.c:678
+#, fuzzy, c-format
+msgid "User ID \"%s\" is signable.  "
+msgstr "AVERTO: '%s' estas malplena dosiero\n"
+
+#: g10/keyedit.c:680
+#, fuzzy
+msgid "Sign it? (y/N) "
+msgstr "�u vere subskribi? "
+
+#: g10/keyedit.c:702
 #, fuzzy, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2547,7 +2603,7 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:711
 #, fuzzy
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
@@ -2556,7 +2612,7 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:699
+#: g10/keyedit.c:725
 #, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2567,12 +2623,12 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:729
 #, 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:724
+#: g10/keyedit.c:750
 #, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2583,7 +2639,7 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:754
 #, fuzzy
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
@@ -2592,53 +2648,53 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:749
+#: g10/keyedit.c:775
 #, 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:752
+#: g10/keyedit.c:778
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" jam estis %ssubskribita per �losilo %08lX\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:783
 #, 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:779
+#: g10/keyedit.c:805
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nenio por subskribi per �losilo %08lX\n"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "�i tiu �losilo eksvalidi�is!"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:844
 #, 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:851
+#: g10/keyedit.c:882
 #, 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:853
+#: g10/keyedit.c:884
 #, 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:878
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2647,31 +2703,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:883
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Mi ne respondas.%s\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Mi tute ne kontrolis.%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Mi malzorge kontrolis.%s\n"
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Mi tre zorge kontrolis.%s\n"
 
-#: g10/keyedit.c:895
+#: g10/keyedit.c:926
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:950
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2680,98 +2736,98 @@ msgstr ""
 "�u vi estas tute certa, ke vi volas subskribi �i tiun �losilon\n"
 "per via �losilo: \""
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr "tio povas esti ka�zata de mankanta mem-subskribo\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:963
 #, 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:940
+#: g10/keyedit.c:971
 #, 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:950
+#: g10/keyedit.c:981
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "La subskribo estos markita kiel neeksportebla.\n"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:988
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "La subskribo estos markita kiel nerevokebla.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:995
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Mi tute ne kontrolis �i tiun �losilon.\n"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1000
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Mi malzorge kontrolis �i tiun �losilon.\n"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1005
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Mi tre zorge kontrolis �i tiun �losilon.\n"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1015
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "�u vere subskribi? "
 
-#: g10/keyedit.c:1029 g10/keyedit.c:4132 g10/keyedit.c:4223 g10/keyedit.c:4287
-#: g10/keyedit.c:4348 g10/sign.c:369
+#: g10/keyedit.c:1060 g10/keyedit.c:4350 g10/keyedit.c:4441 g10/keyedit.c:4505
+#: g10/keyedit.c:4566 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1105 g10/keygen.c:3057
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "�i tiu �losilo ne estas protektita.\n"
 
-#: g10/keyedit.c:1109 g10/keygen.c:3045
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 
-#: g10/keyedit.c:1113 g10/keygen.c:3060
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 #, 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:1117 g10/keygen.c:3064
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "�losilo estas protektita.\n"
 
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Ne povas redakti �i tiun �losilon: %s\n"
 
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2779,11 +2835,11 @@ msgstr ""
 "Donu la novan pasfrazon por �i tiu sekreta �losilo.\n"
 "\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:1825
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2791,194 +2847,194 @@ msgstr ""
 "Vi ne deziras pasfrazon - tio ver�ajne estas *malbona* ideo!\n"
 "\n"
 
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1195
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "�u vi vere volas fari tion? "
 
-#: g10/keyedit.c:1235
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "movas �losilsubskribon al la �usta loko\n"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "skribi kaj fini"
 
-#: g10/keyedit.c:1322
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "montri fingrospuron"
 
-#: g10/keyedit.c:1323
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "listigi �losilojn kaj uzantidentigilojn"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "elekti uzantidentigilon N"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "elekti uzantidentigilon N"
 
-#: g10/keyedit.c:1327
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "revoki subskribojn"
 
-#: g10/keyedit.c:1330
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1335
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "subskribi la �losilon loke"
 
-#: g10/keyedit.c:1337
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1343
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "aldoni uzantidentigilon"
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "aldoni foto-identigilon"
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "forvi�i uzantidentigilon"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "add a subkey"
 msgstr "al"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "forvi�i flankan �losilon"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1398
 #, fuzzy
 msgid "add a revocation key"
 msgstr "aldoni flankan �losilon"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1402
 #, 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:1372
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "marku uzantidentigilon kiel �efan"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "de sekreta a� publika listo iri al la alia"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "listigi preferojn (spertula)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "listigi preferojn (detale)"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1418
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "�an�i la posedantofidon"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1426
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "aldoni uzantidentigilon"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoki flankan �losilon"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "enable key"
 msgstr "�alti �losilon"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "disable key"
 msgstr "mal�alti �losilon"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1436
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "montri foto-identigilon"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1556
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "eraro dum legado de sekreta �losilbloko '%s': %s\n"
 
-#: g10/keyedit.c:1494
+#: g10/keyedit.c:1574
 msgid "Secret key is available.\n"
 msgstr "Sekreta �losilo estas havebla.\n"
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1655
 msgid "Need the secret key to do this.\n"
 msgstr "Bezonas la sekretan �losilon por fari tion.\n"
 
-#: g10/keyedit.c:1579
+#: g10/keyedit.c:1663
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Bonvolu uzi la komandon \"toggle\" unue.\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1682
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -2986,261 +3042,266 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1722
 #, fuzzy
 msgid "Key is revoked."
 msgstr "�losilo estas revokita.\n"
 
-#: g10/keyedit.c:1657
+#: g10/keyedit.c:1741
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "�u vere subskribi �iujn uzantidentigilojn? "
 
-#: g10/keyedit.c:1660
-msgid "Hint: Select the user IDs to sign\n"
-msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
-
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1748
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "nekonata klaso de subskribo"
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1771
 #, 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:1713 g10/keyedit.c:1733 g10/keyedit.c:1899
+#: g10/keyedit.c:1793 g10/keyedit.c:1813 g10/keyedit.c:1979
 msgid "You must select at least one user ID.\n"
 msgstr "Vi devas elekti almena� unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:1715
+#: g10/keyedit.c:1795
 msgid "You can't delete the last user ID!\n"
 msgstr "Vi ne povas forvi�i la lastan uzantidentigilon!\n"
 
-#: g10/keyedit.c:1717
+#: g10/keyedit.c:1797
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:1718
+#: g10/keyedit.c:1798
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "�u vere forigi �i tiun uzantidentigilon? "
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1848
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "�u vere forigi �i tiun uzantidentigilon? "
 
-#: g10/keyedit.c:1780
+#: g10/keyedit.c:1860
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Vi devas elekti almena� unu �losilon.\n"
 
-#: g10/keyedit.c:1808
+#: g10/keyedit.c:1888
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1822
+#: g10/keyedit.c:1902
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1919
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "eraro dum kreado de �losilaro '%s': %s\n"
 
-#: g10/keyedit.c:1863
+#: g10/keyedit.c:1943
 msgid "You must select at least one key.\n"
 msgstr "Vi devas elekti almena� unu �losilon.\n"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1946
 #, 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:1867
+#: g10/keyedit.c:1947
 #, 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:1902
+#: g10/keyedit.c:1982
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1983
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "�u vere forigi �i tiun uzantidentigilon? "
 
-#: g10/keyedit.c:1921
+#: g10/keyedit.c:2001
 #, 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:1932
+#: g10/keyedit.c:2012
 #, 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:1934
+#: g10/keyedit.c:2014
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "�u vi vere volas revoki �i tiun �losilon? "
 
-#: g10/keyedit.c:1975
+#: g10/keyedit.c:2055
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2007
+#: g10/keyedit.c:2087
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "agordi liston de preferoj"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2093
 #, 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:2015
+#: g10/keyedit.c:2095
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "�u vere aktualigi la preferojn? "
 
-#: g10/keyedit.c:2065
+#: g10/keyedit.c:2157
+#, fuzzy, c-format
+msgid "Unable to clean `%s'\n"
+msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
+
+#: g10/keyedit.c:2160
+msgid "Please specify item to clean: `sigs', `uids', or `all'\n"
+msgstr ""
+
+#: g10/keyedit.c:2171
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "�u skribi �an�ojn? "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2174
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "�u fini sen skribi �an�ojn? "
 
-#: g10/keyedit.c:2078
+#: g10/keyedit.c:2184
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2191
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualigo de sekreto malsukcesis: %s\n"
 
-#: g10/keyedit.c:2092
+#: g10/keyedit.c:2198
 msgid "Key not changed so no update needed.\n"
 msgstr "�losilo ne �an�ita, do aktualigo ne necesas.\n"
 
-#: g10/keyedit.c:2164
+#: g10/keyedit.c:2271
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2323
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2227
+#: g10/keyedit.c:2334
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2242 g10/keylist.c:307
+#: g10/keyedit.c:2349 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2473
+#: g10/keyedit.c:2580
 #, 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:2494
+#: g10/keyedit.c:2601
 #, 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:2500
+#: g10/keyedit.c:2607
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sentema)"
 
-#: g10/keyedit.c:2516 g10/keyedit.c:2572 g10/keyedit.c:2684 g10/keyedit.c:2699
-#: g10/keylist.c:193 g10/keyserver.c:422
+#: g10/keyedit.c:2623 g10/keyedit.c:2679 g10/keyedit.c:2792 g10/keyedit.c:2807
+#: g10/keylist.c:194 g10/keyserver.c:421
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ne povas krei %s: %s\n"
 
-#: g10/keyedit.c:2519 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:931
+#: g10/keyedit.c:2626 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:948
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "rev"
 
-#: g10/keyedit.c:2521 g10/keylist.c:757 g10/keylist.c:886
+#: g10/keyedit.c:2628 g10/keylist.c:758 g10/keylist.c:887
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keyedit.c:2523 g10/keyedit.c:2574 g10/keyedit.c:2686 g10/keyedit.c:2701
-#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
-#: g10/keylist.c:913 g10/keyserver.c:428 g10/mainproc.c:937
+#: g10/keyedit.c:2630 g10/keyedit.c:2681 g10/keyedit.c:2794 g10/keyedit.c:2809
+#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
+#: g10/keylist.c:914 g10/keyserver.c:427 g10/mainproc.c:954
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keyedit.c:2525
+#: g10/keyedit.c:2632
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:2540
+#: g10/keyedit.c:2647
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2651
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2658
 msgid "This key has been disabled"
 msgstr "�i tiu �losilo estas mal�altita"
 
-#: g10/keyedit.c:2579 g10/keylist.c:199
+#: g10/keyedit.c:2686 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2754
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2654
+#: g10/keyedit.c:2762
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2718 g10/keyserver.c:432 g10/mainproc.c:1577
-#: g10/trustdb.c:1178
+#: g10/keyedit.c:2826 g10/keyedit.c:3201 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1690
 #, fuzzy
 msgid "revoked"
 msgstr "rev"
 
-#: g10/keyedit.c:2720 g10/keyserver.c:436 g10/mainproc.c:1579
-#: g10/trustdb.c:531
+#: g10/keyedit.c:2828 g10/keyedit.c:3203 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1692
 #, fuzzy
 msgid "expired"
 msgstr "eksval"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2893
 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:2845
+#: g10/keyedit.c:2953
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3249,46 +3310,75 @@ msgstr ""
 "AVERTO: �i tiu estas PGP2-stila �losilo. Aldono de foto-identigilo eble\n"
 "        ka�zos, ke iuj versioj de PGP malakceptos la �losilon.\n"
 
-#: g10/keyedit.c:2850 g10/keyedit.c:3128
+#: g10/keyedit.c:2958 g10/keyedit.c:3307
 #, 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:2856
+#: g10/keyedit.c:2964
 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:2996
+#: g10/keyedit.c:3104
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun bonan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3114
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nevalidan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:3010
+#: g10/keyedit.c:3118
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nekonatan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:3016
+#: g10/keyedit.c:3124
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�u vere forvi�i �i tiun mem-subskribon? (j/N)"
 
-#: g10/keyedit.c:3030
+#: g10/keyedit.c:3138
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Forvi�is %d subskribon.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3139
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Forvi�is %d subskribojn.\n"
 
-#: g10/keyedit.c:3034
+#: g10/keyedit.c:3142
 msgid "Nothing deleted.\n"
 msgstr "Nenio estis forvi�ita.\n"
 
-#: g10/keyedit.c:3123
+#: g10/keyedit.c:3167
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed.\n"
+msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
+
+#: g10/keyedit.c:3168
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed.\n"
+msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
+
+#: g10/keyedit.c:3173
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean.\n"
+msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
+
+#: g10/keyedit.c:3205 g10/trustdb.c:1694
+msgid "invalid"
+msgstr "nevalida"
+
+#: g10/keyedit.c:3207
+#, fuzzy, c-format
+msgid "User ID \"%s\" removed: %s\n"
+msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
+
+#: g10/keyedit.c:3214
+#, fuzzy
+msgid "No user IDs are removable.\n"
+msgstr "Mankas uzantidentigilo por �losilo\n"
+
+#: g10/keyedit.c:3302
 #, fuzzy
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
@@ -3298,345 +3388,350 @@ 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:3134
+#: g10/keyedit.c:3313
 #, 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:3154
+#: g10/keyedit.c:3333
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Donu la �losilgrandon"
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3356
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3371
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3214
+#: g10/keyedit.c:3393
 #, 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:3233
+#: g10/keyedit.c:3412
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3239
+#: g10/keyedit.c:3418
 #, 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:3300
+#: g10/keyedit.c:3479
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bonvolu malelekti la sekretajn �losilojn.\n"
 
-#: g10/keyedit.c:3306
+#: g10/keyedit.c:3485
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Bonvolu elekti maksimume unu flankan �losilon.\n"
 
-#: g10/keyedit.c:3310
+#: g10/keyedit.c:3489
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "�an�as la daton de eksvalidi�o de flanka �losilo.\n"
 
-#: g10/keyedit.c:3313
+#: g10/keyedit.c:3492
 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:3359
+#: g10/keyedit.c:3538
 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:3375
+#: g10/keyedit.c:3554
 msgid "No corresponding signature in secret ring\n"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/keyedit.c:3455
+#: g10/keyedit.c:3634
 msgid "Please select exactly one user ID.\n"
 msgstr "Bonvolu elekti precize unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:3494 g10/keyedit.c:3604 g10/keyedit.c:3724
+#: g10/keyedit.c:3673 g10/keyedit.c:3783 g10/keyedit.c:3903
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/keyedit.c:3665
+#: g10/keyedit.c:3844
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3745
+#: g10/keyedit.c:3924
 #, 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:3746
+#: g10/keyedit.c:3925
 #, 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:3808
+#: g10/keyedit.c:3987
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:3854
+#: g10/keyedit.c:4045
+#, fuzzy, c-format
+msgid "No user ID with hash %s\n"
+msgstr "Mankas uzantidentigilo kun indekso %d\n"
+
+#: g10/keyedit.c:4072
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:3971
+#: g10/keyedit.c:4189
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "uzantidentigilo: \""
 
-#: g10/keyedit.c:3974 g10/keyedit.c:4038 g10/keyedit.c:4081
+#: g10/keyedit.c:4192 g10/keyedit.c:4256 g10/keyedit.c:4299
 #, 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:3976 g10/keyedit.c:4040 g10/keyedit.c:4083
+#: g10/keyedit.c:4194 g10/keyedit.c:4258 g10/keyedit.c:4301
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:3980
+#: g10/keyedit.c:4198
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keyedit.c:3984
+#: g10/keyedit.c:4202
 #, 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:3988
+#: g10/keyedit.c:4206
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
 
-#: g10/keyedit.c:4015
+#: g10/keyedit.c:4233
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
 
-#: g10/keyedit.c:4041
+#: g10/keyedit.c:4259
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "subskribi �losilon nerevokeble"
 
-#: g10/keyedit.c:4048
+#: g10/keyedit.c:4266
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokita de %08lX je %s\n"
 
-#: g10/keyedit.c:4070
+#: g10/keyedit.c:4288
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vi revokos la sekvajn subskribojn:\n"
 
-#: g10/keyedit.c:4090
+#: g10/keyedit.c:4308
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�u vere krei la revokatestilojn? (j/N)"
 
-#: g10/keyedit.c:4120
+#: g10/keyedit.c:4338
 msgid "no secret key\n"
 msgstr "mankas sekreta �losilo\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4408
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4425
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4271
+#: g10/keyedit.c:4489
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4333
+#: g10/keyedit.c:4551
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4646
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 
-#: g10/keygen.c:293
+#: g10/keygen.c:258
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "prefero %c%lu ripetita\n"
 
-#: g10/keygen.c:300
+#: g10/keygen.c:265
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "tro da '%c'-preferoj\n"
 
-#: g10/keygen.c:302
+#: g10/keygen.c:267
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "tro da '%c'-preferoj\n"
 
-#: g10/keygen.c:304
+#: g10/keygen.c:269
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "tro da '%c'-preferoj\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:394
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "nevalida signo en signo�eno\n"
 
-#: g10/keygen.c:829
+#: g10/keygen.c:822
 #, fuzzy
 msgid "writing direct signature\n"
 msgstr "skribas mem-subskribon\n"
 
-#: g10/keygen.c:868
+#: g10/keygen.c:861
 msgid "writing self signature\n"
 msgstr "skribas mem-subskribon\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing key binding signature\n"
 msgstr "skribas �losilbindan subskribon\n"
 
-#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2632
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�losilgrando nevalida; uzas %u bitojn\n"
 
-#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2638
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "�losilgrando rondigita �is %u bitoj\n"
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1239
 #, fuzzy
 msgid "Sign"
 msgstr "subskribi"
 
-#: g10/keygen.c:1252
+#: g10/keygen.c:1242
 #, fuzzy
 msgid "Encrypt"
 msgstr "�ifri datenojn"
 
-#: g10/keygen.c:1255
+#: g10/keygen.c:1245
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1263
+#: g10/keygen.c:1253
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1268
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1282
+#: g10/keygen.c:1272
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1287
+#: g10/keygen.c:1277
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1290
+#: g10/keygen.c:1280
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (nur �ifri)\n"
 
-#: g10/keygen.c:1293
+#: g10/keygen.c:1283
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1296
+#: g10/keygen.c:1286
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1340
 msgid "Please select what kind of key you want:\n"
 msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1342
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA kaj ElGamal (implicita elekto)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1343
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nur subskribi)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1345
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/keygen.c:1357
+#: g10/keygen.c:1347
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (nur �ifri)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1348
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (nur subskribi)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1350
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/keygen.c:1362
+#: g10/keygen.c:1352
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/keygen.c:1431 g10/keygen.c:2509
+#: g10/keygen.c:1421 g10/keygen.c:2506
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA-�losilparo havos 1024 bitojn.\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1431
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1438
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Kiun �losilgrandon vi deziras? (1024) "
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1452
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1468
+#: g10/keygen.c:1458
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Petita �losilgrando estas %u bitoj\n"
 
-#: g10/keygen.c:1473 g10/keygen.c:1478
+#: g10/keygen.c:1463 g10/keygen.c:1468
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rondigita �is %u bitoj\n"
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1515
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3652,7 +3747,7 @@ msgstr ""
 "      <n>m = �losilo eksvalidi�os post n monatoj\n"
 "      <n>y = �losilo eksvalidi�os post n jaroj\n"
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1526
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3668,39 +3763,40 @@ msgstr ""
 "      <n>m = �losilo eksvalidi�os post n monatoj\n"
 "      <n>y = �losilo eksvalidi�os post n jaroj\n"
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1549
 msgid "Key is valid for? (0) "
 msgstr "�losilo validu ...? (0) "
 
-#: g10/keygen.c:1563
-msgid "Signature is valid for? (0) "
+#: g10/keygen.c:1554
+#, fuzzy, c-format
+msgid "Signature is valid for? (%s) "
 msgstr "�losilo validu por ...? (0) "
 
-#: g10/keygen.c:1568
+#: g10/keygen.c:1572
 msgid "invalid value\n"
 msgstr "nevalida valoro\n"
 
-#: g10/keygen.c:1575
+#: g10/keygen.c:1579
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s neniam eksvalidi�os\n"
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1580
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s neniam eksvalidi�os\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1585
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s eksvalidi�os je %s\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1586
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1592
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3708,12 +3804,12 @@ msgstr ""
 "Via sistemo ne povas montri datojn post 2038.\n"
 "Tamen, �i estos �uste traktata �is 2106.\n"
 
-#: g10/keygen.c:1595
+#: g10/keygen.c:1597
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "�u tio estas �usta (j/n)? "
 
-#: g10/keygen.c:1638
+#: g10/keygen.c:1641
 #, fuzzy
 msgid ""
 "\n"
@@ -3729,44 +3825,44 @@ msgstr ""
 "    \"Heinrich Heine (la poeto) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1651
+#: g10/keygen.c:1654
 msgid "Real name: "
 msgstr "Vera nomo: "
 
-#: g10/keygen.c:1659
+#: g10/keygen.c:1662
 msgid "Invalid character in name\n"
 msgstr "Nevalida signo en nomo\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1664
 msgid "Name may not start with a digit\n"
 msgstr "Nomo ne povas komenci�i per cifero\n"
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1666
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nomo devas havi almena� 5 signojn\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1674
 msgid "Email address: "
 msgstr "Retadreso: "
 
-#: g10/keygen.c:1682
+#: g10/keygen.c:1685
 msgid "Not a valid email address\n"
 msgstr "Nevalida retadreso\n"
 
-#: g10/keygen.c:1690
+#: g10/keygen.c:1693
 msgid "Comment: "
 msgstr "Komento: "
 
-#: g10/keygen.c:1696
+#: g10/keygen.c:1699
 msgid "Invalid character in comment\n"
 msgstr "Nevalida signo en komento\n"
 
-#: g10/keygen.c:1719
+#: g10/keygen.c:1722
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vi uzas la signaron '%s'.\n"
 
-#: g10/keygen.c:1725
+#: g10/keygen.c:1728
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3777,7 +3873,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1733
 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"
 
@@ -3792,23 +3888,23 @@ msgstr "Bonvolu ne meti la retadreson en la veran nomon a� la komenton\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1746
+#: g10/keygen.c:1749
 msgid "NnCcEeOoQq"
 msgstr "NnKkAaBbFf"
 
-#: g10/keygen.c:1756
+#: g10/keygen.c:1759
 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:1757
+#: g10/keygen.c:1760
 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:1776
+#: g10/keygen.c:1779
 msgid "Please correct the error first\n"
 msgstr "Bonvolu korekti la eraron unue\n"
 
-#: g10/keygen.c:1816
+#: g10/keygen.c:1819
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3816,12 +3912,12 @@ msgstr ""
 "Vi bezonas pasfrazon por protekti vian sekretan �losilon.\n"
 "\n"
 
-#: g10/keygen.c:1826 g10/passphrase.c:1105
+#: g10/keygen.c:1829 g10/passphrase.c:786
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1832
+#: g10/keygen.c:1835
 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"
@@ -3833,7 +3929,7 @@ msgstr ""
 "uzante �i tiun programon kun la opcio \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1857
 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,50 +3941,50 @@ msgstr ""
 "kreado de la primoj; tio donas al la stokastilo pli bonan �ancon\n"
 "akiri sufi�e da entropio.\n"
 
-#: g10/keygen.c:2578
+#: g10/keygen.c:2575
 msgid "Key generation canceled.\n"
 msgstr "Kreado de �losiloj nuligita.\n"
 
-#: g10/keygen.c:2766 g10/keygen.c:2910
+#: g10/keygen.c:2774 g10/keygen.c:2918
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skribas publikan �losilon al '%s'\n"
 
-#: g10/keygen.c:2768 g10/keygen.c:2913
+#: g10/keygen.c:2776 g10/keygen.c:2921
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/keygen.c:2771 g10/keygen.c:2916
+#: g10/keygen.c:2779 g10/keygen.c:2924
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2907
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "neniu skribebla publika �losilaro trovita: %s\n"
 
-#: g10/keygen.c:2905
+#: g10/keygen.c:2913
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "neniu skribebla sekreta �losilaro trovita: %s\n"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2931
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "eraro dum skribado de publika �losilaro '%s': %s\n"
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2938
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
 
-#: g10/keygen.c:2953
+#: g10/keygen.c:2961
 msgid "public and secret key created and signed.\n"
 msgstr "publika kaj sekreta �losiloj kreitaj kaj subskribitaj.\n"
 
-#: g10/keygen.c:2964
+#: g10/keygen.c:2972
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -3897,12 +3993,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:2976 g10/keygen.c:3105 g10/keygen.c:3220
+#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3156 g10/sign.c:290
+#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -3910,7 +4006,7 @@ msgstr ""
 "�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:3030 g10/keygen.c:3158 g10/sign.c:292
+#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -3918,377 +4014,358 @@ msgstr ""
 "�losilo estis kreita %lu sekundojn en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:3039 g10/keygen.c:3169
+#: g10/keygen.c:3047 g10/keygen.c:3177
 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:3078 g10/keygen.c:3202
+#: g10/keygen.c:3086 g10/keygen.c:3210
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "�u vere krei? "
 
-#: g10/keygen.c:3355
+#: g10/keygen.c:3363
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: g10/keygen.c:3402
+#: g10/keygen.c:3410
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: g10/keygen.c:3428
+#: g10/keygen.c:3436
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTO: sekreta �losilo %08lX eksvalidi�is je %s\n"
 
-#: g10/keygen.c:3508
-#, c-format
-msgid "length of RSA modulus is not %d\n"
-msgstr ""
-
-#: g10/keygen.c:3514
-msgid "public exponent too large (more than 32 bits)\n"
-msgstr ""
-
-#: g10/keygen.c:3520 g10/keygen.c:3526
-#, c-format
-msgid "length of an RSA prime is not %d\n"
-msgstr ""
-
-#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
+#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
 msgid "never     "
 msgstr ""
 
-#: g10/keylist.c:264
+#: g10/keylist.c:265
 #, fuzzy
 msgid "Critical signature policy: "
 msgstr "Subskribo-gvidlinioj: "
 
-#: g10/keylist.c:266
+#: g10/keylist.c:267
 msgid "Signature policy: "
 msgstr "Subskribo-gvidlinioj: "
 
-#: g10/keylist.c:305
+#: g10/keylist.c:306
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:354 g10/keylist.c:398
+#: 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:372
+#: g10/keylist.c:373
 #, fuzzy
 msgid "Critical signature notation: "
 msgstr "Subskribo-notacio: "
 
-#: g10/keylist.c:374
+#: g10/keylist.c:375
 msgid "Signature notation: "
 msgstr "Subskribo-notacio: "
 
-#: g10/keylist.c:385
+#: g10/keylist.c:386
 msgid "not human readable"
 msgstr "ne homlegebla"
 
-#: g10/keylist.c:486
+#: g10/keylist.c:487
 msgid "Keyring"
 msgstr "�losilaro"
 
-#: g10/keylist.c:792
+#: g10/keylist.c:793
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keylist.c:1488
+#: g10/keylist.c:1489
 #, fuzzy
 msgid "Primary key fingerprint:"
 msgstr "listigi �losilojn kaj fingro�purojn"
 
-#: g10/keylist.c:1490
+#: g10/keylist.c:1491
 #, 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:1497
+#: g10/keylist.c:1498
 #, fuzzy
 msgid " Primary key fingerprint:"
 msgstr "     �losilo-fingrospuro ="
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1500
 #, fuzzy
 msgid "      Subkey fingerprint:"
 msgstr "     �losilo-fingrospuro ="
 
-#: g10/keylist.c:1503 g10/keylist.c:1507
+#: g10/keylist.c:1504 g10/keylist.c:1508
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     �losilo-fingrospuro ="
 
-#: g10/keylist.c:1574
+#: g10/keylist.c:1575
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1245
+#: g10/keyring.c:1246
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1252
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVERTO: ekzistas 2 dosieroj kun sekretaj informoj.\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s estas la ne�an�ita\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1255
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s estas la nova\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1256
 msgid "Please fix this possible security flaw\n"
 msgstr "Bonvolu ripari �i tiun eblan sekurecproblemon\n"
 
-#: g10/keyring.c:1375
+#: g10/keyring.c:1376
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "kontrolas �losilaron '%s'\n"
 
-#: g10/keyring.c:1421
+#: g10/keyring.c:1422
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu �losiloj kontrolitaj (%lu subskriboj)\n"
 
-#: g10/keyring.c:1433
+#: g10/keyring.c:1434
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu �losiloj kontrolitaj (%lu subskriboj)\n"
 
-#: g10/keyring.c:1504
+#: g10/keyring.c:1505
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: �losilaro kreita\n"
 
-#: g10/keyserver.c:107
+#: g10/keyserver.c:105
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 
-#: g10/keyserver.c:434
+#: g10/keyserver.c:433
 #, fuzzy
 msgid "disabled"
 msgstr "el"
 
-#: g10/keyserver.c:635
+#: g10/keyserver.c:634
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:718 g10/keyserver.c:1238
+#: g10/keyserver.c:717 g10/keyserver.c:1267
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "nevalida �losilaro"
 
-#: g10/keyserver.c:808
+#: g10/keyserver.c:815
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/keyserver.c:810
+#: g10/keyserver.c:817
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/keyserver.c:985
+#: g10/keyserver.c:1014
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:989
+#: g10/keyserver.c:1018
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:1141
+#: g10/keyserver.c:1170
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "subskribita per via �losilo %08lX je %s\n"
 
-#: g10/keyserver.c:1188
+#: g10/keyserver.c:1217
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1191
+#: g10/keyserver.c:1220
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1198 g10/keyserver.c:1293
+#: g10/keyserver.c:1227 g10/keyserver.c:1322
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "nevalida �losilaro"
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1275
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1255
+#: g10/keyserver.c:1284
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1314
+#: g10/keyserver.c:1343
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "neniu �losilservilo konata (uzu la opcion --keyserver)\n"
 
-#: g10/keyserver.c:1320
+#: g10/keyserver.c:1349
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1361
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1366
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1374
 #, c-format
-msgid "gpgkeys_%s does not support handler version %d\n"
+msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1351
+#: g10/keyserver.c:1381
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "�losilservila eraro"
 
-#: g10/keyserver.c:1356
+#: g10/keyserver.c:1386
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "�losilservila eraro"
 
-#: g10/keyserver.c:1365
+#: g10/keyserver.c:1395
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/keyserver.c:1390 g10/keyserver.c:1424
+#: g10/keyserver.c:1420 g10/keyserver.c:1454
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: ne valida �losilidentigilo\n"
 
-#: g10/keyserver.c:1681
+#: g10/keyserver.c:1711
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/keyserver.c:1703
+#: g10/keyserver.c:1733
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:1705
+#: g10/keyserver.c:1735
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:249
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:262
-#, fuzzy, c-format
-msgid "bad passphrase or unknown cipher algorithm (%d)\n"
-msgstr "nekonata �ifrad-metodo"
-
-#: g10/mainproc.c:299
+#: g10/mainproc.c:300
 #, fuzzy, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s-�ifritaj datenoj\n"
 
-#: g10/mainproc.c:309
+#: g10/mainproc.c:310
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "�ifrita per nekonata metodo %d\n"
 
-#: g10/mainproc.c:375
+#: g10/mainproc.c:376
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "publika �losilo estas %08lX\n"
 
-#: g10/mainproc.c:430
+#: g10/mainproc.c:431
 msgid "public key encrypted data: good DEK\n"
 msgstr "publik�losile �ifritaj datenoj: bona DEK\n"
 
-#: g10/mainproc.c:463
+#: g10/mainproc.c:464
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "�ifrita per %u-bita %s-�losilo, %08lX, kreita je %s\n"
 
-#: g10/mainproc.c:467 g10/pkclist.c:218
+#: g10/mainproc.c:468 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "            alinome \""
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:472
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "�ifrita per %s-�losilo, %08lX\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "publik�losila mal�ifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:499
+#: g10/mainproc.c:500
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Ripetu pasfrazon\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:502
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Ripetu pasfrazon\n"
 
-#: g10/mainproc.c:529 g10/mainproc.c:551
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "supozas %s �ifritajn datenojn\n"
 
-#: g10/mainproc.c:537
+#: g10/mainproc.c:538
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "�ifro IDEA ne disponata, optimisme provas uzi %s anstata�e\n"
 
-#: g10/mainproc.c:569
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr "mal�ifrado sukcesis\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:574
 #, fuzzy
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVERTO: nenio estis eksportita\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTO: �ifrita mesa�o estis manipulita!\n"
 
-#: g10/mainproc.c:592
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "mal�ifrado malsukcesis: %s\n"
@@ -4302,304 +4379,293 @@ msgstr "NOTO: sendinto petis konfidencon (\"for-your-eyes-only\")\n"
 msgid "original file name='%.*s'\n"
 msgstr "originala dosiernomo='%.*s'\n"
 
-#: g10/mainproc.c:786
+#: g10/mainproc.c:803
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "memstara revoko - uzu \"gpg --import\" por apliki �in\n"
 
-#: g10/mainproc.c:1290
+#: g10/mainproc.c:1307
 msgid "signature verification suppressed\n"
 msgstr "kontrolo de subskribo estas mal�altita\n"
 
-#: g10/mainproc.c:1332 g10/mainproc.c:1342
+#: g10/mainproc.c:1349 g10/mainproc.c:1359
 msgid "can't handle these multiple signatures\n"
 msgstr "ne povas trakti �i tiujn pluroblajn subskribojn\n"
 
-#: g10/mainproc.c:1352
+#: g10/mainproc.c:1369
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:1353
+#: g10/mainproc.c:1370
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "            alinome \""
 
-#: g10/mainproc.c:1357
+#: g10/mainproc.c:1374
 #, 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:1377
+#: g10/mainproc.c:1394
 #, fuzzy
 msgid "Key available at: "
 msgstr "Nenia helpo disponata"
 
-#: g10/mainproc.c:1482 g10/mainproc.c:1530
+#: g10/mainproc.c:1499 g10/mainproc.c:1547
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "MALBONA subskribo de \""
 
-#: g10/mainproc.c:1484 g10/mainproc.c:1532
+#: g10/mainproc.c:1501 g10/mainproc.c:1549
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Eksvalidi�inta subskribo de \""
 
-#: g10/mainproc.c:1486 g10/mainproc.c:1534
+#: g10/mainproc.c:1503 g10/mainproc.c:1551
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Bona subskribo de \""
 
-#: g10/mainproc.c:1538
+#: g10/mainproc.c:1555
 msgid "[uncertain]"
 msgstr "[malcerta]"
 
-#: g10/mainproc.c:1570
+#: g10/mainproc.c:1587
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "            alinome \""
 
-#: g10/mainproc.c:1664
+#: g10/mainproc.c:1681
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:1669
+#: g10/mainproc.c:1686
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:1672
+#: g10/mainproc.c:1689
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/mainproc.c:1673
+#: g10/mainproc.c:1690
 #, fuzzy
 msgid "binary"
 msgstr "�efa"
 
-#: g10/mainproc.c:1674
+#: g10/mainproc.c:1691
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1674 g10/trustdb.c:530
+#: g10/mainproc.c:1691 g10/trustdb.c:531
 #, fuzzy
 msgid "unknown"
 msgstr "nekonata versio"
 
-#: g10/mainproc.c:1694
+#: g10/mainproc.c:1711
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Ne povas kontroli subskribon: %s\n"
 
-#: g10/mainproc.c:1762 g10/mainproc.c:1778 g10/mainproc.c:1864
+#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
 msgid "not a detached signature\n"
 msgstr "ne aparta subskribo\n"
 
-#: g10/mainproc.c:1805
+#: g10/mainproc.c:1822
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:1813
+#: g10/mainproc.c:1830
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "memstara subskribo de klaso 0x%02x\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1887
 msgid "old style (PGP 2.x) signature\n"
 msgstr "malnovstila subskribo (PGP 2.x)\n"
 
-#: g10/mainproc.c:1880
+#: g10/mainproc.c:1897
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nevalida radikpaketo trovita en proc_tree()\n"
 
-#: g10/misc.c:121
+#: g10/misc.c:122
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "ne povas mal�alti kreadon de core-dosieroj: %s\n"
 
-#: g10/misc.c:141 g10/misc.c:169 g10/misc.c:241
+#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "aktualigo de fido-datenaro malsukcesis: %s\n"
 
-#: g10/misc.c:206
+#: g10/misc.c:207
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
 
-#: g10/misc.c:315
+#: g10/misc.c:316
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "ne povas trakti publik�losilan metodon %d\n"
 
-#: g10/misc.c:330
+#: g10/misc.c:331
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "nerealigita �ifrad-metodo"
 
-#: g10/misc.c:345
+#: g10/misc.c:346
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:351
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/misc.c:446
+#: g10/misc.c:447
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "la aldona�o por la �ifro IDEA en �eestas\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:448
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 "bonvolu vidi http://www.gnupg.org/why-not-idea.html por pliaj informoj\n"
 
-#: g10/misc.c:680
+#: g10/misc.c:681
 #, fuzzy, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:684
+#: g10/misc.c:685
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:686
+#: g10/misc.c:687
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:697
+#: g10/misc.c:694
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
+msgstr "AVERTO: '%s' estas malplena dosiero\n"
+
+#: g10/misc.c:707
 #, fuzzy
 msgid "Uncompressed"
 msgstr "ne traktita"
 
-#: g10/misc.c:722
+#: g10/misc.c:732
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "ne traktita"
 
-#: g10/misc.c:832
+#: g10/misc.c:842
 #, fuzzy, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "�i tiu mesa�o povas ne esti uzebla de PGP 2.x\n"
 
-#: g10/misc.c:989
+#: g10/misc.c:999
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/misc.c:1014
+#: g10/misc.c:1024
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: g10/openfile.c:84
+#: g10/openfile.c:86
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Dosiero '%s' ekzistas. "
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "�u surskribi (j/N)? "
 
-#: g10/openfile.c:119
+#: g10/openfile.c:121
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: nekonata sufikso\n"
 
-#: g10/openfile.c:141
+#: g10/openfile.c:143
 msgid "Enter new filename"
 msgstr "Donu novan dosiernomon"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:188
 msgid "writing to stdout\n"
 msgstr "skribas al la normala eligo\n"
 
-#: g10/openfile.c:296
+#: g10/openfile.c:300
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "supozas subskribitajn datenojn en '%s'\n"
 
-#: g10/openfile.c:375
+#: g10/openfile.c:379
 #, fuzzy, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: g10/openfile.c:377
+#: g10/openfile.c:381
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 
-#: g10/openfile.c:409
+#: g10/openfile.c:413
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: dosierujo kreita\n"
 
-#: g10/parse-packet.c:137
+#: g10/parse-packet.c:138
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "ne povas trakti publik�losilan metodon %d\n"
 
-#: g10/parse-packet.c:707
+#: g10/parse-packet.c:708
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1132
+#: g10/parse-packet.c:1145
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaketo de speco %d havas �altitan \"critical bit\"\n"
 
-#: g10/passphrase.c:478 g10/passphrase.c:525
+#: g10/passphrase.c:305
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
 
-#: g10/passphrase.c:486
-msgid "can't set client pid for the agent\n"
-msgstr "ne povas agordi kliento-PID por la agento\n"
-
-#: g10/passphrase.c:494
-msgid "can't get server read FD for the agent\n"
-msgstr "ne povas akiri lego-FD de servilo por la agento\n"
-
-#: g10/passphrase.c:501
-msgid "can't get server write FD for the agent\n"
-msgstr "ne povas akiri skribo-FD de servilo por la agento\n"
-
-#: g10/passphrase.c:534
+#: g10/passphrase.c:317
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "malbona valoro de la media variablo GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:547
+#: g10/passphrase.c:332
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "protokolversio %d de gpg-agent ne estas uzebla\n"
 
-#: g10/passphrase.c:568
+#: g10/passphrase.c:345
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "ne povas konekti�i al '%s': %s\n"
 
-#: g10/passphrase.c:590
-msgid "communication problem with gpg-agent\n"
-msgstr "komunikproblemo kun gpg-agent\n"
-
-#: g10/passphrase.c:597 g10/passphrase.c:937 g10/passphrase.c:1049
+#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problemo kun agento - mal�altas uzadon de agento\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1209
+#: g10/passphrase.c:511 g10/passphrase.c:890
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (�ef�losilo %08lX)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:525
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4610,41 +4676,28 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bita %s �losilo, ID %08lX, kreita je %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:550
 msgid "Repeat passphrase\n"
 msgstr "Ripetu pasfrazon\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:552
 msgid "Enter passphrase\n"
 msgstr "Donu pasfrazon\n"
 
-#: g10/passphrase.c:781
-msgid "passphrase too long\n"
-msgstr "pasfrazo estas tro longa\n"
-
-#: g10/passphrase.c:794
-msgid "invalid response from agent\n"
-msgstr "nevalida respondo de agento\n"
-
-#: g10/passphrase.c:810 g10/passphrase.c:931
+#: g10/passphrase.c:628
 msgid "cancelled by user\n"
 msgstr "nuligita de uzanto\n"
 
-#: g10/passphrase.c:815 g10/passphrase.c:1020
-#, c-format
-msgid "problem with the agent: agent returns 0x%lx\n"
-msgstr "problemo kun agento: agento redonas 0x%lx\n"
-
-#: g10/passphrase.c:1100 g10/passphrase.c:1263
+#: g10/passphrase.c:781 g10/passphrase.c:944
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "ne povas kontroli pasvorton en neinteraga re�imo\n"
 
-#: g10/passphrase.c:1107 g10/passphrase.c:1268
+#: g10/passphrase.c:788 g10/passphrase.c:949
 msgid "Enter passphrase: "
 msgstr "Donu pasfrazon: "
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:871
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4654,21 +4707,21 @@ msgstr ""
 "Vi bezonas pasfrazon por mal�losi la sekretan �losilon\n"
 "por la uzanto: \""
 
-#: g10/passphrase.c:1196
+#: g10/passphrase.c:877
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bita %s-�losilo, %08lX, kreita je %s"
 
-#: g10/passphrase.c:1205
+#: g10/passphrase.c:886
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1272
+#: g10/passphrase.c:953
 msgid "Repeat passphrase: "
 msgstr "Ripetu pasfrazon: "
 
-#: g10/photoid.c:66
+#: g10/photoid.c:67
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4677,164 +4730,164 @@ msgid ""
 "Keeping the image close to 240x288 is a good size to use.\n"
 msgstr ""
 
-#: g10/photoid.c:80
+#: g10/photoid.c:81
 msgid "Enter JPEG filename for photo ID: "
 msgstr ""
 
-#: g10/photoid.c:94
+#: g10/photoid.c:95
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: g10/photoid.c:102
+#: g10/photoid.c:103
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:104
+#: g10/photoid.c:105
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
-#: g10/photoid.c:119
+#: g10/photoid.c:120
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "%s: ne estas fido-datenaro\n"
 
-#: g10/photoid.c:136
+#: g10/photoid.c:137
 #, fuzzy
 msgid "Is this photo correct (y/N/q)? "
 msgstr "�u tio estas �usta (j/n)? "
 
-#: g10/photoid.c:338
+#: g10/photoid.c:339
 #, fuzzy
 msgid "unable to display photo ID!\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:580
+#: g10/pkclist.c:62 g10/revoke.c:581
 msgid "No reason specified"
 msgstr "Nenia kialo specifita"
 
-#: g10/pkclist.c:63 g10/revoke.c:582
+#: g10/pkclist.c:64 g10/revoke.c:583
 msgid "Key is superseded"
 msgstr "�losilo estas anstata�igita."
 
-#: g10/pkclist.c:65 g10/revoke.c:581
+#: g10/pkclist.c:66 g10/revoke.c:582
 msgid "Key has been compromised"
 msgstr "�losilo estas kompromitita"
 
-#: g10/pkclist.c:67 g10/revoke.c:583
+#: g10/pkclist.c:68 g10/revoke.c:584
 msgid "Key is no longer used"
 msgstr "�losilo estas ne plu uzata"
 
-#: g10/pkclist.c:69 g10/revoke.c:584
+#: g10/pkclist.c:70 g10/revoke.c:585
 msgid "User ID is no longer valid"
 msgstr "Uzantidentigilo ne plu validas"
 
-#: g10/pkclist.c:73
+#: g10/pkclist.c:74
 #, fuzzy
 msgid "reason for revocation: "
 msgstr "Kialo por revoko: "
 
-#: g10/pkclist.c:90
+#: g10/pkclist.c:91
 #, fuzzy
 msgid "revocation comment: "
 msgstr "Komento pri revoko: "
 
-#: g10/pkclist.c:205
+#: g10/pkclist.c:206
 msgid "iImMqQsS"
 msgstr "iImMfFsS"
 
-#: g10/pkclist.c:213
+#: g10/pkclist.c:214
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "Nenia fidovaloro atribuita al:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:245
+#: g10/pkclist.c:246
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "            alinome \""
 
-#: g10/pkclist.c:255
+#: g10/pkclist.c:256
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "�i tiu �losilo ver�ajne apartenas al la posedanto\n"
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:271
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = Ne scias\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = Ni NE fidas �i tiun �losilon\n"
 
-#: g10/pkclist.c:278
+#: g10/pkclist.c:279
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Mi fidas absolute\n"
 
-#: g10/pkclist.c:284
+#: g10/pkclist.c:285
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = reen al la �efmenuo\n"
 
-#: g10/pkclist.c:287
+#: g10/pkclist.c:288
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " s = supersalti �i tiun �losilon\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " f = fini\n"
 
-#: g10/pkclist.c:292
+#: g10/pkclist.c:293
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:298 g10/revoke.c:609
+#: g10/pkclist.c:299 g10/revoke.c:610
 msgid "Your decision? "
 msgstr "Via decido? "
 
-#: g10/pkclist.c:319
+#: g10/pkclist.c:320
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "�u vi vere volas �an�i �i tiun �losilon al absoluta fido? "
 
-#: g10/pkclist.c:333
+#: g10/pkclist.c:334
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Atestiloj, kiuj kondukas al absolute fidata �losilo:\n"
 
-#: g10/pkclist.c:418
+#: g10/pkclist.c:419
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Estas nenia indiko, ke �i tiu �losilo vere apartenas al la posedanto\n"
 
-#: g10/pkclist.c:423
+#: g10/pkclist.c:424
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Estas nenia indiko, ke �i tiu �losilo vere apartenas al la posedanto\n"
 
-#: g10/pkclist.c:429
+#: g10/pkclist.c:430
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "�i tiu �losilo ver�ajne apartenas al la posedanto\n"
 
-#: g10/pkclist.c:434
+#: g10/pkclist.c:435
 msgid "This key belongs to us\n"
 msgstr "�i tiu �losilo apartenas al ni\n"
 
-#: g10/pkclist.c:460
+#: g10/pkclist.c:461
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -4846,93 +4899,93 @@ msgstr ""
 "la sekva demando per \"jes\"\n"
 "\n"
 
-#: g10/pkclist.c:467
+#: g10/pkclist.c:468
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "�u tamen uzi �i tiun �losilon? "
 
-#: g10/pkclist.c:501
+#: g10/pkclist.c:502
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVERTO: Uzas nefidatan �losilon!\n"
 
-#: g10/pkclist.c:508
+#: g10/pkclist.c:509
 #, fuzzy
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/pkclist.c:517
+#: g10/pkclist.c:518
 #, fuzzy
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/pkclist.c:520
+#: g10/pkclist.c:521
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Tio povas signifi, ke la subskribo estas falsa.\n"
 
-#: g10/pkclist.c:527
+#: g10/pkclist.c:528
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVERTO: �i tiu sub�losilo estas revokita de sia posedanto!\n"
 
-#: g10/pkclist.c:532
+#: g10/pkclist.c:533
 msgid "Note: This key has been disabled.\n"
 msgstr "Noto: �i tiu �losilo estas mal�altita.\n"
 
-#: g10/pkclist.c:537
+#: g10/pkclist.c:538
 msgid "Note: This key has expired!\n"
 msgstr "Noto: �i tiu �losilo eksvalidi�is!\n"
 
-#: g10/pkclist.c:548
+#: g10/pkclist.c:549
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVERTO: �i tiu �losilo ne estas atestita kun fidata subskribo!\n"
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:551
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Estas nenia indiko, ke la subskribo apartenas al la posedanto.\n"
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:559
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVERTO: Ni NE fidas �i tiun �losilon!\n"
 
-#: g10/pkclist.c:559
+#: g10/pkclist.c:560
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         La subskribo ver�ajne estas FALSA.\n"
 
-#: g10/pkclist.c:567
+#: g10/pkclist.c:568
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVERTO: �i tiu �losilo ne estas atestita kun sufi�e fidataj subskriboj!\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:570
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Ne estas certe, ke la subskribo apartenas al la posedanto.\n"
 
-#: g10/pkclist.c:734 g10/pkclist.c:767 g10/pkclist.c:936 g10/pkclist.c:996
+#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorita: %s\n"
 
-#: g10/pkclist.c:744 g10/pkclist.c:968
+#: g10/pkclist.c:745 g10/pkclist.c:969
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorita: publika �losilo jam �eestas\n"
 
-#: g10/pkclist.c:786
+#: g10/pkclist.c:787
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Vi ne specifis uzantidentigilon. (Vi povas uzi \"-r\")\n"
 
-#: g10/pkclist.c:802
+#: g10/pkclist.c:803
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:828
+#: g10/pkclist.c:829
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -4940,172 +4993,172 @@ msgstr ""
 "\n"
 "Donu la uzantidentigilon. Finu per malplena linio: "
 
-#: g10/pkclist.c:844
+#: g10/pkclist.c:845
 msgid "No such user ID.\n"
 msgstr "Uzantidentigilo ne ekzistas.\n"
 
-#: g10/pkclist.c:849 g10/pkclist.c:911
+#: g10/pkclist.c:850 g10/pkclist.c:912
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorita: publika �losilo jam difinita kiel implicita ricevonto\n"
 
-#: g10/pkclist.c:867
+#: g10/pkclist.c:868
 msgid "Public key is disabled.\n"
 msgstr "Publika �losilo estas mal�altita.\n"
 
-#: g10/pkclist.c:874
+#: g10/pkclist.c:875
 msgid "skipped: public key already set\n"
 msgstr "ignorita: publika �losilo jam agordita\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:904
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: g10/pkclist.c:948
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorita: publika �losilo estas mal�altita\n"
 
-#: g10/pkclist.c:1003
+#: g10/pkclist.c:1004
 msgid "no valid addressees\n"
 msgstr "mankas validaj adresitoj\n"
 
-#: g10/plaintext.c:90
+#: g10/plaintext.c:91
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "datenoj ne savitaj; uzu la opcion \"--output\" por savi ilin\n"
 
-#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
+#: g10/plaintext.c:136 g10/plaintext.c:141 g10/plaintext.c:159
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "eraro dum kreado de '%s': %s\n"
 
-#: g10/plaintext.c:446
+#: g10/plaintext.c:447
 msgid "Detached signature.\n"
 msgstr "Aparta subskribo.\n"
 
-#: g10/plaintext.c:450
+#: g10/plaintext.c:452
 msgid "Please enter name of data file: "
 msgstr "Bonvolu doni la nomon de la dosiero: "
 
-#: g10/plaintext.c:478
+#: g10/plaintext.c:481
 msgid "reading stdin ...\n"
 msgstr "legas la normalan enigon ...\n"
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:515
 msgid "no signed data\n"
 msgstr "mankas subskribitaj datenoj\n"
 
-#: g10/plaintext.c:526
+#: g10/plaintext.c:529
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "ne povas malfermi subskribitan dosieron '%s'\n"
 
-#: g10/pubkey-enc.c:103
+#: g10/pubkey-enc.c:104
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "nenomita ricevonto; provas per sekreta �losilo %08lX ...\n"
 
-#: g10/pubkey-enc.c:119
+#: g10/pubkey-enc.c:120
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "bone; ni estas la nenomita ricevonto.\n"
 
-#: g10/pubkey-enc.c:207
+#: g10/pubkey-enc.c:208
 msgid "old encoding of the DEK is not supported\n"
 msgstr "malnova kodado de DEK ne estas realigita\n"
 
-#: g10/pubkey-enc.c:228
+#: g10/pubkey-enc.c:229
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "�ifrad-metodo %d%s estas nekonata a� mal�altita\n"
 
-#: g10/pubkey-enc.c:266
+#: g10/pubkey-enc.c:267
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:287
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTO: sekreta �losilo %08lX eksvalidi�is je %s\n"
 
-#: g10/pubkey-enc.c:292
+#: g10/pubkey-enc.c:293
 #, fuzzy
 msgid "NOTE: key has been revoked"
 msgstr "�losilo %08lX: �losilo estas revokita!\n"
 
-#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:545
+#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
+#: g10/revoke.c:188 g10/revoke.c:546
 #, fuzzy, c-format
 msgid "build_packet failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: g10/revoke.c:146
+#: g10/revoke.c:147
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo\n"
 
-#: g10/revoke.c:272
+#: g10/revoke.c:273
 msgid "To be revoked by:\n"
 msgstr ""
 
-#: g10/revoke.c:276
+#: g10/revoke.c:277
 msgid "(This is a sensitive revocation key)\n"
 msgstr ""
 
-#: g10/revoke.c:280
+#: g10/revoke.c:281
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
 
-#: g10/revoke.c:293 g10/revoke.c:511
+#: g10/revoke.c:294 g10/revoke.c:512
 msgid "ASCII armored output forced.\n"
 msgstr ""
 
-#: g10/revoke.c:307 g10/revoke.c:525
+#: g10/revoke.c:308 g10/revoke.c:526
 #, fuzzy, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "listigo de �losilblokoj malsukcesis: %s\n"
 
-#: g10/revoke.c:370
+#: g10/revoke.c:371
 #, fuzzy
 msgid "Revocation certificate created.\n"
 msgstr "�losilo %08lX: revokatestilo aldonita\n"
 
-#: g10/revoke.c:376
+#: g10/revoke.c:377
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr ""
 
-#: g10/revoke.c:432
+#: g10/revoke.c:433
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/revoke.c:461
+#: g10/revoke.c:462
 #, fuzzy, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "skribas publikan �losilon al '%s'\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:473
 msgid "public key does not match secret key!\n"
 msgstr ""
 
-#: g10/revoke.c:479
+#: g10/revoke.c:480
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
 
-#: g10/revoke.c:496
+#: g10/revoke.c:497
 #, fuzzy
 msgid "unknown protection algorithm\n"
 msgstr "nekonata densig-metodo"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 #, fuzzy
 msgid "NOTE: This key is not protected!\n"
 msgstr "�i tiu �losilo ne estas protektita.\n"
 
-#: g10/revoke.c:551
+#: g10/revoke.c:552
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5116,112 +5169,112 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "Kialo por revoko: "
 
-#: g10/revoke.c:602
+#: g10/revoke.c:603
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:604
+#: g10/revoke.c:605
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:645
+#: g10/revoke.c:646
 #, fuzzy
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "\n"
 "Donu la uzantidentigilon. Finu per malplena linio: "
 
-#: g10/revoke.c:673
+#: g10/revoke.c:674
 #, fuzzy, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Kialo por revoko: "
 
-#: g10/revoke.c:675
+#: g10/revoke.c:676
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "�u tamen uzi �i tiun �losilon? "
 
-#: g10/seckey-cert.c:54
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "sekretaj �losilpartoj ne estas disponataj\n"
 
-#: g10/seckey-cert.c:60
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "protekto-metodo %d%s ne estas realigita\n"
 
-#: g10/seckey-cert.c:71
+#: g10/seckey-cert.c:72
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "protekto-metodo %d%s ne estas realigita\n"
 
-#: g10/seckey-cert.c:265
+#: g10/seckey-cert.c:266
 msgid "Invalid passphrase; please try again"
 msgstr "Nevalida pasfrazo; bonvolu provi denove"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:267
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:326
+#: g10/seckey-cert.c:327
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVERTO: Malforta �losilo trovita - bonvolu �an�i la pasfrazon denove.\n"
 
-#: g10/seckey-cert.c:364
+#: g10/seckey-cert.c:365
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 
-#: g10/seskey.c:52
+#: g10/seskey.c:53
 msgid "weak key created - retrying\n"
 msgstr "malforta �losilo kreita - provas denove\n"
 
-#: g10/seskey.c:57
+#: g10/seskey.c:58
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "ne povas eviti malfortajn �losilojn por simetria �ifro; provis %d fojojn!\n"
 
-#: g10/seskey.c:213
+#: g10/seskey.c:214
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr ""
 
-#: g10/sig-check.c:75
+#: g10/sig-check.c:76
 msgid "WARNING: signature digest conflict in message\n"
 msgstr ""
 
-#: g10/sig-check.c:99
+#: g10/sig-check.c:100
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 
-#: g10/sig-check.c:102
+#: g10/sig-check.c:103
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 
-#: g10/sig-check.c:168
+#: g10/sig-check.c:169
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "la publika �losilo estas %lu sekundon pli nova ol la subskribo\n"
 
-#: g10/sig-check.c:169
+#: g10/sig-check.c:170
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "la publika �losilo estas %lu sekundojn pli nova ol la subskribo\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:181
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5229,7 +5282,7 @@ msgstr ""
 "�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:183
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5237,50 +5290,50 @@ msgstr ""
 "�losilo estis kreita %lu sekundojn en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:193
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTO: subskribo-�losilo %08lX eksvalidi�is je %s\n"
 
-#: g10/sig-check.c:275
+#: g10/sig-check.c:276
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "supozas malbonan subskribon pro nekonata \"critical bit\"\n"
 
-#: g10/sig-check.c:532
+#: g10/sig-check.c:533
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/sig-check.c:558
+#: g10/sig-check.c:559
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/sign.c:85
+#: g10/sign.c:86
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:93
+#: g10/sign.c:94
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 
-#: g10/sign.c:112
+#: g10/sign.c:113
 #, 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:138
+#: g10/sign.c:139
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:146
+#: g10/sign.c:147
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:159
+#: g10/sign.c:160
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5288,7 +5341,7 @@ msgstr ""
 "AVERTO: ne povas %%-kompletigi gvidlinian URL (tro granda); uzas sen "
 "kompletigo.\n"
 
-#: g10/sign.c:187
+#: g10/sign.c:188
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5297,421 +5350,421 @@ msgstr ""
 "AVERTO: ne povas %%-kompletigi gvidlinian URL (tro granda); uzas sen "
 "kompletigo.\n"
 
-#: g10/sign.c:364
+#: g10/sign.c:365
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: g10/sign.c:373
+#: g10/sign.c:374
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/sign.c:741
+#: g10/sign.c:761
 #, 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:808
+#: g10/sign.c:830
 #, 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:900
+#: g10/sign.c:922
 msgid "signing:"
 msgstr "subskribas:"
 
-#: g10/sign.c:1007
+#: g10/sign.c:1034
 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:1180
+#: g10/sign.c:1212
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s �ifrado estos aplikata\n"
 
-#: g10/skclist.c:126 g10/skclist.c:190
+#: g10/skclist.c:127 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "�losilo ne estas markita kiel malsekura - ne povas uzi �in kun falsa "
 "stokastilo!\n"
 
-#: g10/skclist.c:157
+#: g10/skclist.c:158
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "ignoris '%s': ripetita\n"
 
-#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "ignoris '%s': %s\n"
 
-#: g10/skclist.c:170
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
 
-#: g10/skclist.c:185
+#: g10/skclist.c:186
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "ignoris '%s': �i tio estas PGP-kreita ElGamal-�losilo, kiu ne estas sekura "
 "por subskribado!\n"
 
-#: g10/tdbdump.c:59 g10/trustdb.c:365
+#: g10/tdbdump.c:60 g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n"
 
-#: g10/tdbdump.c:104
+#: g10/tdbdump.c:105
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
 "# (Use \"gpg --import-ownertrust\" to restore them)\n"
 msgstr ""
 
-#: g10/tdbdump.c:159 g10/tdbdump.c:167 g10/tdbdump.c:172 g10/tdbdump.c:177
+#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: g10/tdbdump.c:159
+#: g10/tdbdump.c:160
 #, fuzzy
 msgid "line too long"
 msgstr "pasfrazo estas tro longa\n"
 
-#: g10/tdbdump.c:167
+#: g10/tdbdump.c:168
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:173
+#: g10/tdbdump.c:174
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/tdbdump.c:178
+#: g10/tdbdump.c:179
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr "importi posedantofido-valorojn"
 
-#: g10/tdbdump.c:214
+#: g10/tdbdump.c:215
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "eraro dum legado de dosieruja registro: %s\n"
 
-#: g10/tdbdump.c:218
+#: g10/tdbdump.c:219
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "kiraso: %s\n"
 
-#: g10/tdbdump.c:227 g10/trustdb.c:380
+#: g10/tdbdump.c:228 g10/trustdb.c:381
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "fido-datenaro: sync malsukcesis: %s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1440
+#: g10/tdbio.c:129 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "fido-datenaro loko %lu: lseek malsukcesis: %s\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1447
+#: g10/tdbio.c:135 g10/tdbio.c:1448
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "fido-datenaro loko %lu: skribo malsukcesis (n=%d): %s\n"
 
-#: g10/tdbio.c:244
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "fido-datenaro-transakcio tro granda\n"
 
-#: g10/tdbio.c:497
+#: g10/tdbio.c:498
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "ne povas fermi '%s': %s\n"
 
-#: g10/tdbio.c:512
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: dosierujo ne ekzistas!\n"
 
-#: g10/tdbio.c:522 g10/tdbio.c:545 g10/tdbio.c:588
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: g10/tdbio.c:524 g10/tdbio.c:591
+#: g10/tdbio.c:525 g10/tdbio.c:592
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "ne povas malfermi '%s'\n"
 
-#: g10/tdbio.c:550
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: malsukcesis krei versiregistron: %s"
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: nevalida fido-datenaro kreita\n"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: fido-datenaro kreita\n"
 
-#: g10/tdbio.c:597
+#: g10/tdbio.c:598
 msgid "NOTE: trustdb not writable\n"
 msgstr ""
 
-#: g10/tdbio.c:614
+#: g10/tdbio.c:615
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: nevalida fido-datenaro\n"
 
-#: g10/tdbio.c:646
+#: g10/tdbio.c:647
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: malsukcesis krei haktabelon: %s\n"
 
-#: g10/tdbio.c:654
+#: g10/tdbio.c:655
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: eraro dum aktualigo de versiregistro: %s\n"
 
-#: g10/tdbio.c:671 g10/tdbio.c:691 g10/tdbio.c:707 g10/tdbio.c:721
-#: g10/tdbio.c:751 g10/tdbio.c:1373 g10/tdbio.c:1400
+#: g10/tdbio.c:672 g10/tdbio.c:692 g10/tdbio.c:708 g10/tdbio.c:722
+#: g10/tdbio.c:752 g10/tdbio.c:1374 g10/tdbio.c:1401
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: eraro dum legado de versiregistro: %s\n"
 
-#: g10/tdbio.c:730
+#: g10/tdbio.c:731
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: eraro dum skribado de versiregistro: %s\n"
 
-#: g10/tdbio.c:1169
+#: g10/tdbio.c:1170
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "fido-datenaro: lseek malsukcesis: %s\n"
 
-#: g10/tdbio.c:1177
+#: g10/tdbio.c:1178
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
 
-#: g10/tdbio.c:1198
+#: g10/tdbio.c:1199
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ne estas fido-datenaro\n"
 
-#: g10/tdbio.c:1216
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versiregistro kun registronumero %lu\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1222
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/tdbio.c:1406
+#: g10/tdbio.c:1407
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: eraro dum legado de libera registro: %s\n"
 
-#: g10/tdbio.c:1414
+#: g10/tdbio.c:1415
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: eraro dum skribo de dosieruja registro: %s\n"
 
-#: g10/tdbio.c:1424
+#: g10/tdbio.c:1425
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: malsukcesis nuligi registron: %s\n"
 
-#: g10/tdbio.c:1454
+#: g10/tdbio.c:1455
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: malsukcesis aldoni registron: %s\n"
 
-#: g10/tdbio.c:1499
+#: g10/tdbio.c:1500
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "la fido-datenaro estas fu�ita; bonvolu ruli \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:147
+#: g10/textfilter.c:148
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "ne povas trakti tekstliniojn pli longajn ol %d signojn\n"
 
-#: g10/textfilter.c:244
+#: g10/textfilter.c:245
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "enigata linio pli longa ol %d signojn\n"
 
-#: g10/trustdb.c:226
+#: g10/trustdb.c:227
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "'%s' ne estas valida longa �losilidentigilo\n"
 
-#: g10/trustdb.c:257
+#: g10/trustdb.c:258
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "�losilo %08lX: akceptita kiel fidata �losilo\n"
 
-#: g10/trustdb.c:295
+#: g10/trustdb.c:296
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "�losilo %08lX aperas pli ol unufoje en la fido-datenaro\n"
 
-#: g10/trustdb.c:310
+#: g10/trustdb.c:311
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "�losilo %08lX: mankas publika �losilo por fidata �losilo - ignorita\n"
 
-#: g10/trustdb.c:320
+#: g10/trustdb.c:321
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "�losilo markita kiel absolute fidata.\n"
 
-#: g10/trustdb.c:344
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "fido-datenaro loko %lu, petospeco %d: lego malsukcesis: %s\n"
 
-#: g10/trustdb.c:350
+#: g10/trustdb.c:351
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "fido-registro %lu ne havas petitan specon %d\n"
 
-#: g10/trustdb.c:446
+#: g10/trustdb.c:447
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:452
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:506
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ revoked]"
 msgstr "rev"
 
-#: g10/trustdb.c:508 g10/trustdb.c:513
+#: g10/trustdb.c:509 g10/trustdb.c:514
 #, fuzzy
 msgid "[ expired]"
 msgstr "eksval"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 #, fuzzy
 msgid "[ unknown]"
 msgstr "nekonata versio"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:536
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:576
+#: g10/trustdb.c:577
 msgid "no need for a trustdb check\n"
 msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
 
-#: g10/trustdb.c:582 g10/trustdb.c:2157
+#: g10/trustdb.c:583 g10/trustdb.c:2309
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "sekva kontrolo de fido-datenaro je %s\n"
 
-#: g10/trustdb.c:591
+#: 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:606
+#: 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:838 g10/trustdb.c:1276
+#: 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:1033
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1037
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "kontrolas la fido-datenaron\n"
 
-#: g10/trustdb.c:1901
+#: g10/trustdb.c:2053
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:1965
+#: g10/trustdb.c:2117
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr "publika �losilo de absolute fidata �losilo %08lX ne trovita\n"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:2131
 #, 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:2002
+#: g10/trustdb.c:2154
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2240
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2163
+#: g10/trustdb.c:2315
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n"
 
-#: g10/verify.c:116
+#: g10/verify.c:117
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -5721,306 +5774,338 @@ msgstr ""
 "Bonvolu memori, ke la subskribodosiero (.sig a� .asc)\n"
 "devas esti la unua dosiero donita en la komandlinio.\n"
 
-#: g10/verify.c:189
+#: g10/verify.c:190
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "enigata linio %u tro longa, a� mankas linifino\n"
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "�enerala eraro"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "nekonata paketo-speco"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "nekonata versio"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "nekonata publik�losila metodo"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "nekonata kompendi-metodo"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "malbona publika �losilo"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "malbona sekreta �losilo"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "malbona subskribo"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "eraro en kontrolsumo"
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "malbona pasfrazo"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "publika �losilo ne trovita"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "nekonata �ifrad-metodo"
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "ne povas malfermi la �losilaron"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "nevalida paketo"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "nevalida kiraso"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "uzantidentigilo ne ekzistas"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "sekreta �losilo ne havebla"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "mal�usta sekreta �losilo uzata"
 
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "ne realigita"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "malbona �losilo"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "legeraro �e dosiero"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "skriberaro �e dosiero"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "nekonata densig-metodo"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "eraro �e malfermo de dosiero"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "eraro �e kreo de dosiero"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "nevalida pasfrazo"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "nerealigita publik�losila metodo"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "nerealigita �ifrad-metodo"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "nekonata klaso de subskribo"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "eraro en fido-datenaro"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "malbona MPI"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "trafis rimedolimon"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "nevalida �losilaro"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "malbona atestilo"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "misformita uzantidentigilo"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "eraro �e fermo de dosiero"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "eraro �e renomado de dosiero"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "eraro �e forvi�o de dosiero"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "neatendita dateno"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "malkongruo de tempostampoj"
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "neuzebla publik�losila metodo"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "dosiero ekzistas"
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "malforta �losilo"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "nevalida argumento"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "malbona URI"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "nerealigita URI"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "reteraro"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "ne �ifrita"
 
-#: util/errors.c:103
+#: util/errors.c:104
 msgid "not processed"
 msgstr "ne traktita"
 
-#: util/errors.c:105
+#: util/errors.c:106
 msgid "unusable public key"
 msgstr "neuzebla publika �losilo"
 
-#: util/errors.c:106
+#: util/errors.c:107
 msgid "unusable secret key"
 msgstr "neuzebla sekreta �losilo"
 
-#: util/errors.c:107
+#: util/errors.c:108
 msgid "keyserver error"
 msgstr "�losilservila eraro"
 
-#: util/errors.c:108
+#: util/errors.c:109
 #, fuzzy
 msgid "canceled"
 msgstr "nuligita de uzanto\n"
 
-#: util/errors.c:109
+#: util/errors.c:110
 #, fuzzy
 msgid "no card"
 msgstr "ne �ifrita"
 
-#: util/logger.c:157
+#: util/logger.c:158
 msgid "ERROR: "
 msgstr ""
 
-#: util/logger.c:160
+#: util/logger.c:161
 msgid "WARNING: "
 msgstr ""
 
-#: util/logger.c:223
+#: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... �i tio estas cimo (%s:%d:%s)\n"
 
-#: util/logger.c:229
+#: util/logger.c:230
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "vi trovis cimon ... (%s:%d)\n"
 
-#: util/miscutil.c:336 util/miscutil.c:373
+#: util/miscutil.c:330 util/miscutil.c:367
 #, fuzzy
 msgid "yes"
 msgstr "jes"
 
-#: util/miscutil.c:337 util/miscutil.c:378
+#: util/miscutil.c:331 util/miscutil.c:372
 msgid "yY"
 msgstr "jJ"
 
-#: util/miscutil.c:339 util/miscutil.c:375
+#: util/miscutil.c:333 util/miscutil.c:369
 msgid "no"
 msgstr "ne"
 
-#: util/miscutil.c:340 util/miscutil.c:379
+#: util/miscutil.c:334 util/miscutil.c:373
 msgid "nN"
 msgstr "nN"
 
-#: util/miscutil.c:377
+#: util/miscutil.c:371
 msgid "quit"
 msgstr "fini"
 
-#: util/miscutil.c:380
+#: util/miscutil.c:374
 msgid "qQ"
 msgstr "fF"
 
-#: util/miscutil.c:413
+#: util/miscutil.c:407
 msgid "okay|okay"
 msgstr ""
 
-#: util/miscutil.c:415
+#: util/miscutil.c:409
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:416
+#: util/miscutil.c:410
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:417
+#: util/miscutil.c:411
 #, fuzzy
 msgid "cC"
 msgstr "k"
 
-#: util/secmem.c:90
+#: util/secmem.c:91
 #, fuzzy
 msgid "WARNING: using insecure memory!\n"
 msgstr "Averto: uzas malsekuran memoron!\n"
 
-#: util/secmem.c:91
+#: util/secmem.c:92
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "bonvolu vidi http://www.gnupg.org/faq.html por pliaj informoj\n"
 
-#: util/secmem.c:343
+#: util/secmem.c:344
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operacio ne eblas sen sekura memoro kun komenca valoro\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:345
 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 "error getting serial number: %s\n"
+#~ msgstr "eraro dum kreado de pasfrazo: %s\n"
+
+#~ msgid "Hint: Select the user IDs to sign\n"
+#~ msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
+
+#, fuzzy
+#~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+#~ msgstr "nekonata �ifrad-metodo"
+
+#~ msgid "can't set client pid for the agent\n"
+#~ msgstr "ne povas agordi kliento-PID por la agento\n"
+
+#~ msgid "can't get server read FD for the agent\n"
+#~ msgstr "ne povas akiri lego-FD de servilo por la agento\n"
+
+#~ msgid "can't get server write FD for the agent\n"
+#~ msgstr "ne povas akiri skribo-FD de servilo por la agento\n"
+
+#~ msgid "communication problem with gpg-agent\n"
+#~ msgstr "komunikproblemo kun gpg-agent\n"
+
+#~ msgid "passphrase too long\n"
+#~ msgstr "pasfrazo estas tro longa\n"
+
+#~ msgid "invalid response from agent\n"
+#~ msgstr "nevalida respondo de agento\n"
+
+#~ msgid "problem with the agent: agent returns 0x%lx\n"
+#~ msgstr "problemo kun agento: agento redonas 0x%lx\n"
+
 #~ msgid "select secondary key N"
 #~ msgstr "elekti flankan �losilon N"
 
@@ -6971,11 +7056,5 @@ msgstr "(eble vi uzis la mal�ustan programon por �i tiu tasko)\n"
 #~ msgid "No key for user ID\n"
 #~ msgstr "Mankas �losilo por uzantidentigilo\n"
 
-#~ msgid "No user ID for key\n"
-#~ msgstr "Mankas uzantidentigilo por �losilo\n"
-
-#~ msgid "invalid"
-#~ msgstr "nevalida"
-
 #~ msgid "no secret key for decryption available\n"
 #~ msgstr "mankas sekreta �losilo por mal�ifrado\n"
diff --git a/po/es.po b/po/es.po
index 66a896967..3c05dd2b6 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,42 +8,42 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gnupg 1.2.2\n"
+"Project-Id-Version: GNU gnupg 1.4.1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-03-15 16:35+0100\n"
-"PO-Revision-Date: 2004-10-12 19:27+0200\n"
+"POT-Creation-Date: 2005-05-31 10:05+0200\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:120
-#, fuzzy, c-format
+#: cipher/primegen.c:121
+#, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
-msgstr "no se puede generar un primo con menos de %d bits\n"
+msgstr "no se puede generar un primo con pbits=%u qbits=%u\n"
 
-#: cipher/primegen.c:311
+#: cipher/primegen.c:312
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "no se puede generar un primo con menos de %d bits\n"
 
-#: cipher/random.c:163
+#: cipher/random.c:164
 msgid "no entropy gathering module detected\n"
 msgstr "no se ha detectado m�dulo acumulador de entrop�a\n"
 
-#: cipher/random.c:387 g10/card-util.c:656 g10/card-util.c:725
-#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2255
-#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
-#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
-#: g10/tdbio.c:600
+#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
+#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
+#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
+#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
+#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/tdbio.c:601
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no se puede abrir `%s': %s\n"
 
-#: cipher/random.c:391
+#: cipher/random.c:392
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "no se puede obtener informaci�n de `%s': %s\n"
@@ -53,51 +53,51 @@ msgstr "no se puede obtener informaci�n de `%s': %s\n"
 # Sugerencia a la sugerencia: �qu� tal omitido? (pasar en silencio una
 # cosa; excluirla de lo que se habla o escribe) dice el diccionario.
 # Bien. Tambi�n se puede poner "descartado".
-#: cipher/random.c:396
+#: cipher/random.c:397
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s` no es un fichero regular - descartado\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:402
 msgid "note: random_seed file is empty\n"
 msgstr "nota: el fichero de semillas aleatorias est� vac�o\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:408
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "ATENCI�N: tama�o incorrecto del fichero de semillas aleatorias - no se usa\n"
 
-#: cipher/random.c:415
+#: cipher/random.c:416
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "no se puede leer `%s': %s\n"
 
-#: cipher/random.c:453
+#: cipher/random.c:454
 msgid "note: random_seed file not updated\n"
 msgstr "nota: el fichero de semillas aleatorias no se ha actualizado\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2723
-#: g10/keygen.c:2753 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
-#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "no se puede crear %s: %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:481
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "no se puede escribir `%s': %s\n"
 
-#: cipher/random.c:483
+#: cipher/random.c:484
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "no se puede cerrar `%s': %s\n"
 
-#: cipher/random.c:728
+#: cipher/random.c:729
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "ATENCI�N: �usando un generador de n�meros aleatorios inseguro!\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:730
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -111,7 +111,7 @@ msgstr ""
 "�NO USE DATOS GENERADOS POR ESTE PROGRAMA!\n"
 "\n"
 
-#: cipher/rndegd.c:204
+#: cipher/rndegd.c:205
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -121,7 +121,7 @@ msgstr ""
 "el ordenador mientras tanto si eso hace que no se aburra, porque eso\n"
 "mejorar� la calidad de la entrop�a.\n"
 
-#: cipher/rndlinux.c:134
+#: cipher/rndlinux.c:135
 #, c-format
 msgid ""
 "\n"
@@ -133,817 +133,803 @@ msgstr ""
 "otro trabajo para que el sistema pueda recolectar m�s entrop�a\n"
 "(se necesitan %d bytes m�s).\n"
 
-#: g10/app-openpgp.c:547
-#, fuzzy, c-format
+#: g10/app-openpgp.c:596
+#, c-format
 msgid "failed to store the fingerprint: %s\n"
-msgstr "inicializaci�n de la base de datos de confianza fallida: %s\n"
+msgstr "fallo al almacenar la huella digital: %s\n"
 
-#: g10/app-openpgp.c:560
-#, fuzzy, c-format
+#: g10/app-openpgp.c:609
+#, c-format
 msgid "failed to store the creation date: %s\n"
-msgstr "fallo reconstruyendo cach� del anillo de claves: %s\n"
+msgstr "fallo guardando la fecha de creaci�n: %s\n"
+
+#: g10/app-openpgp.c:977
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "fallo leyendo la clave\n"
+
+#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+msgid "response does not contain the public key data\n"
+msgstr "la respuesta no incluye la clave p�blica\n"
+
+#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+msgid "response does not contain the RSA modulus\n"
+msgstr "la respuesta no incluye el m�dulo RSA\n"
 
-#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
+#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+msgid "response does not contain the RSA public exponent\n"
+msgstr "la respuesta no incluye el exponente p�blico RSA\n"
+
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
 #, c-format
 msgid "PIN callback returned error: %s\n"
-msgstr ""
+msgstr "la funci�n de manejo del PIN devolvi� un error: %s\n"
 
-#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
-msgstr ""
+msgstr "El PIN para CHV%d es demasiado corto; longitud m�nima %d\n"
 
-#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
-#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
-#, fuzzy, c-format
+#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
+#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
+#, c-format
 msgid "verify CHV%d failed: %s\n"
-msgstr "env�o al servidor de claves fallido: %s\n"
+msgstr "la verificaci�n CHV%d fall�: %s\n"
 
-#: g10/app-openpgp.c:836
+#: g10/app-openpgp.c:1310
 msgid "access to admin commands is not configured\n"
-msgstr ""
+msgstr "el acceso a �rdenes de administrador no est� configurado\n"
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
 msgid "error retrieving CHV status from card\n"
-msgstr ""
+msgstr "error recuperando el estatus CHV de la tarjeta\n"
 
-#: g10/app-openpgp.c:857
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
 msgid "card is permanently locked!\n"
-msgstr ""
+msgstr "�la tarjeta est� bloqueada permanentemente!\n"
 
-#: g10/app-openpgp.c:862
+#: g10/app-openpgp.c:1336
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
+"%d intentos quedan para PIN de administrador antes de "
+"bloquearpermanentemente la clave\n"
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:869
+#: g10/app-openpgp.c:1343
 msgid "|A|Admin PIN"
-msgstr ""
+msgstr "|A|PIN Administrador"
 
-#: g10/app-openpgp.c:1018
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:1492
 msgid "|AN|New Admin PIN"
-msgstr ""
+msgstr "|AN|Nuevo PIN Administrador"
 
-#: g10/app-openpgp.c:1018
+#: g10/app-openpgp.c:1492
 msgid "|N|New PIN"
-msgstr ""
+msgstr "|N|Nuevo PIN"
 
-#: g10/app-openpgp.c:1022
-#, fuzzy, c-format
+#: g10/app-openpgp.c:1496
+#, c-format
 msgid "error getting new PIN: %s\n"
-msgstr "error creando frase contrase�a: %s\n"
+msgstr "error obteniendo nuevo PIN: %s\n"
 
-#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
-#, fuzzy
+#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
 msgid "error reading application data\n"
-msgstr "error leyendo bloque de claves: %s\n"
+msgstr "error leyendo datos de la aplicaci�n\n"
 
-#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
-#, fuzzy
+#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
 msgid "error reading fingerprint DO\n"
-msgstr "%s: error leyendo registro libre: %s\n"
+msgstr "error leyendo huella digital DO\n"
 
-#: g10/app-openpgp.c:1104
-#, fuzzy
+#: g10/app-openpgp.c:1562
 msgid "key already exists\n"
-msgstr "`%s' ya est� comprimido\n"
+msgstr "la clave ya existe\n"
 
-#: g10/app-openpgp.c:1108
+#: g10/app-openpgp.c:1566
 msgid "existing key will be replaced\n"
-msgstr ""
+msgstr "la clave existente ser� reemplazada\n"
 
-#: g10/app-openpgp.c:1110
-#, fuzzy
+#: g10/app-openpgp.c:1568
 msgid "generating new key\n"
-msgstr "genera un nuevo par de claves"
+msgstr "generando nueva clave\n"
 
-#: g10/app-openpgp.c:1120
-msgid "please wait while key is being generated ...\n"
+#: g10/app-openpgp.c:1735
+msgid "creation timestamp missing\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1135
-#, fuzzy
-msgid "generating key failed\n"
-msgstr "borrado de bloque de anillo de claves fallido: %s\n"
+#: g10/app-openpgp.c:1742
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1749
 #, fuzzy, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "Creaci�n de la clave fallida: %s\n"
+msgid "RSA public exponent missing or largerr than %d bits\n"
+msgstr "exponente p�blico demasiado grande (m�s de 32 bits)\n"
 
-#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
-msgid "response does not contain the public key data\n"
+#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
-msgid "response does not contain the RSA modulus\n"
-msgstr ""
+#: g10/app-openpgp.c:1827
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "fallo al almacenar la clave: %s\n"
 
-#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
-msgid "response does not contain the RSA public exponent\n"
-msgstr ""
+#: g10/app-openpgp.c:1886
+msgid "please wait while key is being generated ...\n"
+msgstr "por favor, espere mientras se genera la clave ...\n"
 
-#: g10/app-openpgp.c:1195
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
-msgstr ""
+#: g10/app-openpgp.c:1901
+msgid "generating key failed\n"
+msgstr "la generaci�n de la clave fall�\n"
 
-#: g10/app-openpgp.c:1356
+#: g10/app-openpgp.c:1904
 #, c-format
-msgid "signatures created so far: %lu\n"
-msgstr ""
+msgid "key generation completed (%d seconds)\n"
+msgstr "generaci�n de clave completada (%d segundos)\n"
 
-#: g10/app-openpgp.c:1364
-#, c-format
-msgid "PIN [sigs done: %lu]"
-msgstr ""
+#: g10/app-openpgp.c:1961
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr "estructura de la tarjeta OpenPGP inv�lida (DO 0x93)\n"
 
-#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
-#, fuzzy, c-format
-msgid "can't access %s - invalid OpenPGP card?\n"
-msgstr "no se han encontrados datos OpenPGP v�lidos\n"
+#: g10/app-openpgp.c:2130
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr "firmas creadas hasta ahora: %lu\n"
 
-#: g10/app-openpgp.c:1731
+#: g10/app-openpgp.c:2138
 #, fuzzy, c-format
-msgid "error getting serial number: %s\n"
-msgstr "error creando frase contrase�a: %s\n"
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr "PIN [firmas hechas: %lu]"
 
-#: g10/app-openpgp.c:1826
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "inicializaci�n de la base de datos de confianza fallida: %s\n"
+#: g10/app-openpgp.c:2399
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1868
-#, fuzzy
-msgid "reading the key failed\n"
-msgstr "borrado de bloque de anillo de claves fallido: %s\n"
+#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
+#, c-format
+msgid "can't access %s - invalid OpenPGP card?\n"
+msgstr "no se puede acceder a %s - �tarjeta OpenPGP inv�lida?\n"
 
-#: g10/armor.c:317
+#: g10/armor.c:318
 #, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:346
+#: g10/armor.c:347
 msgid "invalid armor header: "
 msgstr "cabecera de armadura inv�lida: "
 
-#: g10/armor.c:353
+#: g10/armor.c:354
 msgid "armor header: "
 msgstr "cabecera de armadura: "
 
-#: g10/armor.c:364
+#: g10/armor.c:365
 msgid "invalid clearsig header\n"
 msgstr "cabecera de firma clara inv�lida\n"
 
-#: g10/armor.c:416
+#: g10/armor.c:417
 msgid "nested clear text signatures\n"
 msgstr "firmas en texto claro anidadas\n"
 
-#: g10/armor.c:551
-#, fuzzy
+#: g10/armor.c:552
 msgid "unexpected armor: "
-msgstr "armadura inesperada"
+msgstr "armadura inesperada: "
 
-#: g10/armor.c:563
+#: g10/armor.c:564
 msgid "invalid dash escaped line: "
 msgstr "L�nea con guiones inv�lida: "
 
-#: g10/armor.c:715 g10/armor.c:1322
-#, fuzzy, c-format
+#: g10/armor.c:716 g10/armor.c:1323
+#, c-format
 msgid "invalid radix64 character %02X skipped\n"
-msgstr "caracteres inv�lidos radix64 %02x omitidos\n"
+msgstr "caracter inv�lido radix64 %02X omitido\n"
 
-#: g10/armor.c:758
+#: g10/armor.c:759
 msgid "premature eof (no CRC)\n"
 msgstr "Fin de fichero prematuro (falta suma de comprobaci�n)\n"
 
-#: g10/armor.c:792
+#: g10/armor.c:793
 msgid "premature eof (in CRC)\n"
 msgstr "Fin de suma de comprobaci�n prematuro\n"
 
-#: g10/armor.c:800
+#: g10/armor.c:801
 msgid "malformed CRC\n"
 msgstr "Suma de comprobaci�n mal creada\n"
 
-#: g10/armor.c:804 g10/armor.c:1359
-#, fuzzy, c-format
+#: g10/armor.c:805 g10/armor.c:1360
+#, c-format
 msgid "CRC error; %06lX - %06lX\n"
-msgstr "Error en suma de comprobaci�n: %06lx - %06lx\n"
+msgstr "Error en suma de comprobaci�n: %06lX - %06lX\n"
 
-#: g10/armor.c:824
-#, fuzzy
+#: g10/armor.c:825
 msgid "premature eof (in trailer)\n"
 msgstr "fin de fichero prematuro (en el cierre)\n"
 
-#: g10/armor.c:828
+#: g10/armor.c:829
 msgid "error in trailer line\n"
 msgstr "error en la l�nea de cierre\n"
 
-#: g10/armor.c:1137
+#: g10/armor.c:1138
 msgid "no valid OpenPGP data found.\n"
 msgstr "no se han encontrados datos OpenPGP v�lidos\n"
 
-#: g10/armor.c:1142
+#: g10/armor.c:1143
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura incorrecta: l�nea m�s larga de %d caracteres\n"
 
-#: g10/armor.c:1146
+#: g10/armor.c:1147
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "caracter \"quoted printable\" en la armadura - probablemente se us�\n"
 "un MTA defectuoso\n"
 
-#: g10/card-util.c:58 g10/card-util.c:295
-#, fuzzy, c-format
+#: g10/card-util.c:63 g10/card-util.c:303
+#, c-format
 msgid "OpenPGP card not available: %s\n"
-msgstr "clave secreta no disponible"
+msgstr "tarjeta OpenPGP no disponible: %s\n"
 
-#: g10/card-util.c:63
+#: g10/card-util.c:68
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
-msgstr ""
+msgstr "tarjeta OpenPGP num. %s detectada\n"
 
-#: g10/card-util.c:70 g10/card-util.c:1329 g10/delkey.c:127 g10/keyedit.c:1430
-#: g10/keygen.c:2439 g10/revoke.c:216 g10/revoke.c:417
-#, fuzzy
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1510
+#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
 msgid "can't do this in batch mode\n"
 msgstr "imposible hacer esto en modo de proceso por lotes\n"
 
-#: g10/card-util.c:97 g10/card-util.c:1108 g10/card-util.c:1191
-#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
-#: g10/keygen.c:1365
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
+#: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "Su elecci�n: "
 
-#: g10/card-util.c:206 g10/card-util.c:256
+#: g10/card-util.c:213 g10/card-util.c:263
 msgid "[not set]"
-msgstr ""
+msgstr "[no establecido]"
 
-#: g10/card-util.c:391
-#, fuzzy
+#: g10/card-util.c:410
 msgid "male"
-msgstr "habcla"
+msgstr "hombre"
 
-#: g10/card-util.c:392
-#, fuzzy
+#: g10/card-util.c:411
 msgid "female"
-msgstr "habcla"
+msgstr "mujer"
 
-#: g10/card-util.c:392
-#, fuzzy
+#: g10/card-util.c:411
 msgid "unspecified"
-msgstr "No se dio ninguna raz�n"
+msgstr "no especificado"
 
-#: g10/card-util.c:419
-#, fuzzy
+#: g10/card-util.c:438
 msgid "not forced"
-msgstr "no procesado"
+msgstr "no forzado"
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 msgid "forced"
-msgstr ""
+msgstr "forzado"
 
-#: g10/card-util.c:497
+#: g10/card-util.c:516
 msgid "Error: Only plain ASCII is currently allowed.\n"
-msgstr ""
+msgstr "Error: s�lo se permite ASCII sin formato actualmente.\n"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:518
 msgid "Error: The \"<\" character may not be used.\n"
-msgstr ""
+msgstr "Error: El caracter \"<\" no puede usarse.\n"
 
-#: g10/card-util.c:501
+#: g10/card-util.c:520
 msgid "Error: Double spaces are not allowed.\n"
-msgstr ""
+msgstr "Error: no se permiten dobles espacios.\n"
 
-#: g10/card-util.c:518
+#: g10/card-util.c:537
 msgid "Cardholder's surname: "
-msgstr ""
+msgstr "Apellido del titular de la tarjeta: "
 
-#: g10/card-util.c:520
+#: g10/card-util.c:539
 msgid "Cardholder's given name: "
-msgstr ""
+msgstr "Nombre del titular de la tarjeta: "
 
-#: g10/card-util.c:538
+#: g10/card-util.c:557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
-msgstr ""
+msgstr "Error: nombre combinado demasiado largo (m�ximo %d caracteres).\n"
 
-#: g10/card-util.c:559
-#, fuzzy
+#: g10/card-util.c:578
 msgid "URL to retrieve public key: "
-msgstr "no existe la clave p�blica correspondiente: %s\n"
+msgstr "URL de donde recuperar la clave p�blica: "
 
-#: g10/card-util.c:567
+#: g10/card-util.c:586
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
-msgstr ""
+msgstr "Error: URL demasiado larga (el m�ximo son %d caracteres).\n"
 
-#: g10/card-util.c:665 g10/card-util.c:734 g10/import.c:261
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:692
 msgid "Login data (account name): "
-msgstr ""
+msgstr "Datos de login (nombre de la cuenta): "
 
-#: g10/card-util.c:683
+#: g10/card-util.c:702
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
-msgstr ""
+msgstr "Error: el login es demasiado largo (l�mite de %d caracteres).\n"
 
-#: g10/card-util.c:742
+#: g10/card-util.c:761
 msgid "Private DO data: "
-msgstr ""
+msgstr "Datos privados: "
 
-#: g10/card-util.c:752
+#: g10/card-util.c:771
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
+"Error: los datos privados son demasiado largos (l�mite de %d caracteres).\n"
 
-#: g10/card-util.c:772
-#, fuzzy
+#: g10/card-util.c:791
 msgid "Language preferences: "
-msgstr "preferencias actualizadas"
+msgstr "Preferencias de idioma: "
 
-#: g10/card-util.c:780
-#, fuzzy
+#: g10/card-util.c:799
 msgid "Error: invalid length of preference string.\n"
-msgstr "caracter inv�lido en cadena de preferencias\n"
+msgstr "Error: longitud de la cadena de preferencias inv�lida.\n"
 
-#: g10/card-util.c:789
-#, fuzzy
+#: g10/card-util.c:808
 msgid "Error: invalid characters in preference string.\n"
-msgstr "caracter inv�lido en cadena de preferencias\n"
+msgstr "Error: caracteres inv�lidos en cadena de preferencias.\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:829
 msgid "Sex ((M)ale, (F)emale or space): "
-msgstr ""
+msgstr "Sexo ((H)ombre, (M)mujer o espacio): "
 
-#: g10/card-util.c:824
-#, fuzzy
+#: g10/card-util.c:843
 msgid "Error: invalid response.\n"
-msgstr "error: huella dactilar no v�lida\n"
+msgstr "Error: respuesta no v�lida.\n"
 
-#: g10/card-util.c:845
-#, fuzzy
+#: g10/card-util.c:864
 msgid "CA fingerprint: "
-msgstr "Huella dactilar:"
+msgstr "Huella dactilar CA:"
 
-#: g10/card-util.c:868
-#, fuzzy
+#: g10/card-util.c:887
 msgid "Error: invalid formatted fingerprint.\n"
-msgstr "error: huella dactilar no v�lida\n"
+msgstr "Error: formato inv�lido de huella dactilar.\n"
 
-#: g10/card-util.c:916
-#, fuzzy, c-format
+#: g10/card-util.c:935
+#, c-format
 msgid "key operation not possible: %s\n"
-msgstr "Creaci�n de la clave fallida: %s\n"
+msgstr "la operaci�n con la clave no es posible: %s\n"
 
-#: g10/card-util.c:917
-#, fuzzy
+#: g10/card-util.c:936
 msgid "not an OpenPGP card"
-msgstr "no se han encontrados datos OpenPGP v�lidos\n"
+msgstr "no es una tarjeta OpenPGP"
 
-#: g10/card-util.c:926
-#, fuzzy, c-format
+#: g10/card-util.c:945
+#, c-format
 msgid "error getting current key info: %s\n"
-msgstr "error escribiendo anillo privado `%s': %s\n"
+msgstr "error obteniendo la informaci�n actual de la clave: %s\n"
 
-#: g10/card-util.c:1009
-#, fuzzy
+#: g10/card-util.c:1030
 msgid "Replace existing key? (y/N) "
-msgstr "�Firmar de verdad? "
+msgstr "�Reemplazar la clave existente? (s/N) "
 
-#: g10/card-util.c:1030 g10/card-util.c:1039
+#: g10/card-util.c:1051 g10/card-util.c:1060
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
+"�Hacer copia de seguridad externa a la tarjeta de clave de cifrado? (S/n)"
 
-#: g10/card-util.c:1051
-#, fuzzy
+#: g10/card-util.c:1072
 msgid "Replace existing keys? (y/N) "
-msgstr "�Firmar de verdad? "
+msgstr "�Reemplazar las claves existentes? (s/N) "
 
-#: g10/card-util.c:1060
+#: g10/card-util.c:1081
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
 "   PIN = `%s'     Admin PIN = `%s'\n"
 "You should change them using the command --change-pin\n"
 msgstr ""
+"Por favor observe que los valores de f�brica del PIN son\n"
+"   PIN = `%s'     PIN Administrador = `%s'\n"
+"Deber�a cambiarlos usando la orden --change-pin\n"
 
-#: g10/card-util.c:1099
-#, fuzzy
+#: g10/card-util.c:1120
 msgid "Please select the type of key to generate:\n"
-msgstr "Por favor seleccione tipo de clave deseado:\n"
+msgstr "Por favor seleccione tipo de clave que generar:\n"
 
-#: g10/card-util.c:1101 g10/card-util.c:1182
-#, fuzzy
+#: g10/card-util.c:1122 g10/card-util.c:1203
 msgid "   (1) Signature key\n"
-msgstr "Firma caducada en %s\n"
+msgstr "    (1) Clave de firmado\n"
 
-#: g10/card-util.c:1102 g10/card-util.c:1184
-#, fuzzy
+#: g10/card-util.c:1123 g10/card-util.c:1205
 msgid "   (2) Encryption key\n"
-msgstr "   (%d) RSA (s�lo cifrar)\n"
+msgstr "   (2) Clave de cifrado\n"
 
-#: g10/card-util.c:1103 g10/card-util.c:1186
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
-msgstr ""
+msgstr "   (3) Clave de autentificaci�n\n"
 
-#: g10/card-util.c:1119 g10/card-util.c:1202 g10/keyedit.c:908
-#: g10/keygen.c:1404 g10/revoke.c:642
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
+#: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "Elecci�n inv�lida.\n"
 
-#: g10/card-util.c:1179
-#, fuzzy
+#: g10/card-util.c:1200
 msgid "Please select where to store the key:\n"
-msgstr "Por favor elija una raz�n para la revocaci�n:\n"
+msgstr "Por favor elija donde guardar la clave:\n"
 
-#: g10/card-util.c:1214
-#, fuzzy
+#: g10/card-util.c:1235
 msgid "unknown key protection algorithm\n"
-msgstr "algoritmo de protecci�n desconocido\n"
+msgstr "algoritmo de protecci�n de clave desconocido\n"
 
-#: g10/card-util.c:1219
-#, fuzzy
+#: g10/card-util.c:1240
 msgid "secret parts of key are not available\n"
-msgstr "Las partes secretas de la clave primaria no est�n disponibles.\n"
+msgstr "las partes secretas de la clave no est�n disponibles\n"
 
-#: g10/card-util.c:1224
-#, fuzzy
+#: g10/card-util.c:1245
 msgid "secret key already stored on a card\n"
-msgstr "omitido: clave secreta ya presente\n"
+msgstr "clave secreta ya almacenada en una tarjeta\n"
 
-#: g10/card-util.c:1294 g10/keyedit.c:1317
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "sale de este men�"
 
-#: g10/card-util.c:1296
-#, fuzzy
+#: g10/card-util.c:1318
 msgid "show admin commands"
-msgstr "�rdenes incompatibles\n"
+msgstr "ver �rdenes de administrador"
 
-#: g10/card-util.c:1297 g10/keyedit.c:1320
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "muestra esta ayuda"
 
-#: g10/card-util.c:1299
-#, fuzzy
+#: g10/card-util.c:1321
 msgid "list all available data"
-msgstr "Clave disponible en: "
+msgstr "listar todos los datos disponibles"
 
-#: g10/card-util.c:1302
+#: g10/card-util.c:1324
 msgid "change card holder's name"
-msgstr ""
+msgstr "cambiar el nombre del titular de la tarjeta"
 
-#: g10/card-util.c:1303
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
-msgstr ""
+msgstr "cambiar URL de donde obtener la clave"
 
-#: g10/card-util.c:1304
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
-msgstr ""
+msgstr "recuperar la clave especificada en la URL de la tarjeta"
 
-#: g10/card-util.c:1305
-#, fuzzy
+#: g10/card-util.c:1327
 msgid "change the login name"
-msgstr "cambia fecha de caducidad"
+msgstr "cambiar nombre de usuario"
 
-#: g10/card-util.c:1306
-#, fuzzy
+#: g10/card-util.c:1328
 msgid "change the language preferences"
-msgstr "cambia valores de confianza"
+msgstr "cambiar preferencias de idioma"
 
-#: g10/card-util.c:1307
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
-msgstr ""
+msgstr "cambiar sexo del titular de la tarjeta"
 
-#: g10/card-util.c:1308
-#, fuzzy
+#: g10/card-util.c:1330
 msgid "change a CA fingerprint"
-msgstr "muestra huella dactilar"
+msgstr "cambiar huella dactilar de una CA"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
-msgstr ""
+msgstr "cambiar estado de la opci�n forzar firma del PIN"
 
-#: g10/card-util.c:1310
-#, fuzzy
+#: g10/card-util.c:1332
 msgid "generate new keys"
-msgstr "genera un nuevo par de claves"
+msgstr "generar nuevas claves"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
+msgstr "men� para cambiar o desbloquear el PIN"
+
+#: g10/card-util.c:1334
+msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1377 g10/keyedit.c:1526
+#: g10/card-util.c:1454 g10/keyedit.c:1609
 msgid "Command> "
 msgstr "Orden> "
 
-#: g10/card-util.c:1412
-#, fuzzy
+#: g10/card-util.c:1492
 msgid "Admin-only command\n"
-msgstr "�rdenes incompatibles\n"
+msgstr "�rdenes s�lo de administrador\n"
 
-#: g10/card-util.c:1428
-#, fuzzy
+#: g10/card-util.c:1523
 msgid "Admin commands are allowed\n"
-msgstr "�rdenes incompatibles\n"
+msgstr "Se permiten �rdenes de administrador\n"
 
-#: g10/card-util.c:1430
-#, fuzzy
+#: g10/card-util.c:1525
 msgid "Admin commands are not allowed\n"
-msgstr "escribiendo clave privada en `%s'\n"
+msgstr "No se permiten �rdenes de administrador\n"
 
-#: g10/card-util.c:1499 g10/keyedit.c:2104
+#: g10/card-util.c:1599 g10/keyedit.c:2210
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Orden inv�lida (pruebe \"help\")\n"
 
-#: g10/cardglue.c:287
+#: g10/cardglue.c:396
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
-msgstr ""
+msgstr "Inserte la tarjeta y pulse Intro o escriba 'c' para cancelar: "
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:519
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
+"Por favor retire la tarjeta actual e inserte la de n�mero de serie:\n"
+"   %.*s\n"
 
-#: g10/cardglue.c:380
+#: g10/cardglue.c:527
 msgid "Hit return when ready or enter 'c' to cancel: "
-msgstr ""
+msgstr "Pulse Intro cuando est� listo"
 
-#: g10/cardglue.c:688
-#, fuzzy
+#: g10/cardglue.c:852
 msgid "Enter New Admin PIN: "
-msgstr "Introduzca el ID de usuario: "
+msgstr "Introduzca nuevo PIN de administrador: "
 
-#: g10/cardglue.c:689
-#, fuzzy
+#: g10/cardglue.c:853
 msgid "Enter New PIN: "
-msgstr "Introduzca el ID de usuario: "
+msgstr "Introduzca el nuevo PIN: "
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:854
 msgid "Enter Admin PIN: "
-msgstr ""
+msgstr "Introduzca PIN de administrador: "
 
-#: g10/cardglue.c:691
-#, fuzzy
+#: g10/cardglue.c:855
 msgid "Enter PIN: "
-msgstr "Introduzca el ID de usuario: "
+msgstr "Introduzca PIN: "
 
-#: g10/cardglue.c:705
-#, fuzzy
+#: g10/cardglue.c:872
 msgid "Repeat this PIN: "
-msgstr "Repita frase contrase�a: "
+msgstr "Repita este PIN: "
 
-#: g10/cardglue.c:719
-#, fuzzy
+#: g10/cardglue.c:886
 msgid "PIN not correctly repeated; try again"
-msgstr "frase contrase�a repetida incorrectamente; int�ntelo de nuevo"
+msgstr "PIN repetido incorrectamente; int�ntelo de nuevo"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
-#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no se puede abrir `%s'\n"
 
-#: g10/decrypt.c:104 g10/encode.c:859
+#: g10/decrypt.c:105 g10/encode.c:846
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona con esta orden\n"
 
-#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3167 g10/keyserver.c:1511
-#: g10/revoke.c:226
-#, fuzzy, c-format
+#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3346 g10/keyserver.c:1541
+#: g10/revoke.c:227
+#, c-format
 msgid "key \"%s\" not found: %s\n"
-msgstr "clave '%s' no encontrada: %s\n"
+msgstr "clave \"%s\" no encontrada: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2300 g10/keyserver.c:1525
-#: g10/revoke.c:232 g10/revoke.c:439
+#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "error leyendo bloque de claves: %s\n"
 
-#: g10/delkey.c:128 g10/delkey.c:135
+#: g10/delkey.c:129 g10/delkey.c:136
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(excepto si especifica la clave dando su huella digital)\n"
 
-#: g10/delkey.c:134
-#, fuzzy
+#: g10/delkey.c:135
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "imposible hacer esto en modo de proceso por lotes sin \"--yes\"\n"
 
-#: g10/delkey.c:146
-#, fuzzy
+#: g10/delkey.c:147
 msgid "Delete this key from the keyring? (y/N) "
-msgstr "�Eliminar esta clave del anillo? "
+msgstr "�Eliminar esta clave del anillo? (s/N) "
 
-#: g10/delkey.c:154
-#, fuzzy
+#: g10/delkey.c:155
 msgid "This is a secret key! - really delete? (y/N) "
-msgstr "�Esta es una clave secreta! �Eliminar realmente? "
+msgstr "�Es una clave secreta! �Eliminar realmente? (s/N) "
 
-#: g10/delkey.c:164
+#: g10/delkey.c:165
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "borrado de bloque de anillo de claves fallido: %s\n"
 
-#: g10/delkey.c:174
+#: g10/delkey.c:175
 msgid "ownertrust information cleared\n"
 msgstr "borrada informaci�n de propietarios\n"
 
-#: g10/delkey.c:205
+#: g10/delkey.c:206
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "�hay una clave secreta para esta clave p�blica! \"%s\"!\n"
 
-#: g10/delkey.c:207
+#: g10/delkey.c:208
 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:210 g10/sign.c:1186
+#: g10/encode.c:211 g10/sign.c:1218
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error creando frase contrase�a: %s\n"
 
-#: g10/encode.c:215
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "no puede usar un paquete sim�trico ESK debido al modo S2K\n"
 
-#: g10/encode.c:228
+#: g10/encode.c:229
 #, c-format
 msgid "using cipher %s\n"
 msgstr "usando cifrado %s\n"
 
-#: g10/encode.c:238 g10/encode.c:558
+#: g10/encode.c:239 g10/encode.c:545
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' ya est� comprimido\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
+#: g10/encode.c:302 g10/encode.c:591 g10/sign.c:566
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATENCI�N `%s' es un fichero vac�o\n"
 
-#: g10/encode.c:472
+#: g10/encode.c:466
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "solo puede cifrar a claves RSA de 2048 bits o menos en modo --pgp2\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:488
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "leyendo desde `%s'\n"
 
-#: g10/encode.c:530
+#: g10/encode.c:517
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "no se puede usar el algoritmo IDEA para todas las claves a las que cifra.\n"
 
-#: g10/encode.c:540
-#, fuzzy, c-format
+#: g10/encode.c:527
+#, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
-"forzar el cifrado sim�trico %s (%d) viola las preferencias\n"
+"AVISO: forzar el cifrado sim�trico %s (%d) viola las preferencias\n"
 "del destinatario\n"
 
-#: g10/encode.c:648 g10/sign.c:877
-#, fuzzy, c-format
+#: g10/encode.c:635 g10/sign.c:899
+#, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr ""
-"forzar el algoritmo de compresi�n %s (%d) va en contra de las preferencias "
-"del receptor\n"
+"AVISO: forzar el algoritmo de compresi�n %s (%d) va en contra\n"
+"de las preferencias del receptor\n"
 
-#: g10/encode.c:735
+#: g10/encode.c:722
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forzar el cifrado sim�trico %s (%d) viola las preferencias\n"
 "del destinatario\n"
 
-#: g10/encode.c:805 g10/pkclist.c:721 g10/pkclist.c:757
+#: g10/encode.c:792 g10/pkclist.c:722 g10/pkclist.c:758
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "no puede usar %s en modo %s\n"
 
-#: g10/encode.c:832
+#: g10/encode.c:819
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
 
-#: g10/encr-data.c:66 g10/mainproc.c:301
+#: g10/encr-data.c:67 g10/mainproc.c:302
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "datos cifrados %s\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:305
+#: g10/encr-data.c:69 g10/mainproc.c:306
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado con algoritmo desconocido %d\n"
 
-#: g10/encr-data.c:92
+#: g10/encr-data.c:93
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ATENCI�N: mensaje cifrado con una clave d�bil en el cifrado sim�trico.\n"
 
-#: g10/encr-data.c:103
+#: g10/encr-data.c:104
 msgid "problem handling encrypted packet\n"
 msgstr "problema trabajando con un paquete cifrado\n"
 
-#: g10/exec.c:48
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "no es posible ejecutar programas remotos\n"
 
-#: g10/exec.c:184 g10/openfile.c:406
+#: g10/exec.c:173 g10/openfile.c:410
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "no se puede crear el directorio `%s': %s\n"
 
-#: g10/exec.c:325
+#: g10/exec.c:314
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "llamadas a programas externos inhabilitadas por permisos inseguros de "
 "ficheros.\n"
 
-#: g10/exec.c:355
-#, fuzzy
+#: g10/exec.c:344
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "esta plataforma necesita ficheros temporales para llamar a programas "
-"externos.\n"
+"externos\n"
 
-#: g10/exec.c:433
-#, fuzzy, c-format
+#: g10/exec.c:422
+#, c-format
 msgid "unable to execute program `%s': %s\n"
-msgstr "no se puede ejecutar %s \"%s\": %s\n"
+msgstr "no se puede ejecutar el programa `%s': %s\n"
 
-#: g10/exec.c:436
-#, fuzzy, c-format
+#: g10/exec.c:425
+#, c-format
 msgid "unable to execute shell `%s': %s\n"
-msgstr "no se puede ejecutar %s \"%s\": %s\n"
+msgstr "no se puede ejecutar el int�rprete de �rdenes `%s': %s\n"
 
-#: g10/exec.c:521
+#: g10/exec.c:510
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "error del sistema llamando al programa externo: %s\n"
 
-#: g10/exec.c:532 g10/exec.c:598
+#: g10/exec.c:521 g10/exec.c:587
 msgid "unnatural exit of external program\n"
 msgstr "el programa externo finaliz� anormalmente\n"
 
-#: g10/exec.c:547
+#: g10/exec.c:536
 msgid "unable to execute external program\n"
 msgstr "no se puede ejecutar el programa externo\n"
 
-#: g10/exec.c:563
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "no se puede leer la respuesta del programa externo: %s\n"
 
-#: g10/exec.c:609 g10/exec.c:616
+#: g10/exec.c:598 g10/exec.c:605
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "AVISO: no se puede borrar fichero temporal (%s) `%s': %s\n"
 
-#: g10/exec.c:621
+#: g10/exec.c:610
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "AVISO: no se puede borrar el fichero temporal `%s': %s\n"
 
-#: g10/export.c:183
-#, fuzzy
+#: g10/export.c:184
 msgid "exporting secret keys not allowed\n"
-msgstr "escribiendo clave privada en `%s'\n"
+msgstr "no se permite exportar claves secretas\n"
 
-#: g10/export.c:212
-#, fuzzy, c-format
+#: g10/export.c:213
+#, c-format
 msgid "key %s: not protected - skipped\n"
-msgstr "clave %08lX: no protegida - omitida\n"
+msgstr "clave %s: no protegida - omitida\n"
 
-#: g10/export.c:220
-#, fuzzy, c-format
+#: g10/export.c:221
+#, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
-msgstr "clave %08lX: clave estilo PGP 2.x - omitida\n"
+msgstr "clave %s: clave estilo PGP 2.x - omitida\n"
 
-#: g10/export.c:395
-#, fuzzy, c-format
+#: g10/export.c:398
+#, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
-msgstr ""
-"AVISO: la clave secreta %08lX no tiene suma de comprobaci�n simple SK\n"
+msgstr "AVISO: la clave secreta %s no tiene suma de comprobaci�n simple SK\n"
 
-#: g10/export.c:427
+#: g10/export.c:430
 msgid "WARNING: nothing exported\n"
 msgstr "ATENCI�N: no se ha exportado nada\n"
 
@@ -951,7 +937,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/g10.c:360
+#: g10/g10.c:362
 msgid ""
 "@Commands:\n"
 " "
@@ -959,128 +945,127 @@ msgstr ""
 "@�rdenes:\n"
 " "
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "|[file]|make a signature"
 msgstr "|[file]|crea una firma"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|crea una firma en texto claro"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "make a detached signature"
 msgstr "crea una firma separada"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encrypt data"
 msgstr "cifra datos"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "encryption only with symmetric cipher"
 msgstr "cifra s�lo con un cifrado sim�trico"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "decrypt data (default)"
 msgstr "descifra datos (predefinido)"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys"
 msgstr "lista claves"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and signatures"
 msgstr "lista claves y firmas"
 
-#: g10/g10.c:376
-#, fuzzy
+#: g10/g10.c:378
 msgid "list and check key signatures"
-msgstr "comprueba las firmas de las claves"
+msgstr "lista y comprueba firmas de las claves"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "list keys and fingerprints"
 msgstr "lista claves y huellas dactilares"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "list secret keys"
 msgstr "lista claves secretas"
 
-#: g10/g10.c:379
+#: g10/g10.c:381
 msgid "generate a new key pair"
 msgstr "genera un nuevo par de claves"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the public keyring"
 msgstr "elimina claves del anillo p�blico"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "remove keys from the secret keyring"
 msgstr "elimina claves del anillo privado"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign a key"
 msgstr "firma la clave"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "sign a key locally"
 msgstr "firma la clave localmente"
 
-#: g10/g10.c:385
+#: g10/g10.c:387
 msgid "sign or edit a key"
 msgstr "firma o modifica una clave"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "generate a revocation certificate"
 msgstr "genera un certificado de revocaci�n"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "export keys"
 msgstr "exporta claves"
 
-#: g10/g10.c:389
+#: g10/g10.c:391
 msgid "export keys to a key server"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "import keys from a key server"
 msgstr "importa claves desde un servidor de claves"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "search for keys on a key server"
 msgstr "busca claves en un servidor de claves"
 
-#: g10/g10.c:394
+#: g10/g10.c:396
 msgid "update all keys from a keyserver"
 msgstr "actualiza todas las claves desde un servidor de claves"
 
-#: g10/g10.c:397
+#: g10/g10.c:399
 msgid "import/merge keys"
 msgstr "importa/fusiona claves"
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "print the card status"
-msgstr ""
+msgstr "escribir estado de la tarjeta"
 
-#: g10/g10.c:401
+#: g10/g10.c:403
 msgid "change data on a card"
-msgstr ""
+msgstr "cambiar datos en la tarjeta"
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "change a card's PIN"
-msgstr ""
+msgstr "cambiar el PIN de la tarjeta"
 
-#: g10/g10.c:410
+#: g10/g10.c:412
 msgid "update the trust database"
 msgstr "actualiza la base de datos de confianza"
 
-#: g10/g10.c:417
+#: g10/g10.c:419
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheros]|imprime res�menes de mensaje"
 
-#: g10/g10.c:421 g10/gpgv.c:66
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1090,55 +1075,55 @@ msgstr ""
 "Opciones:\n"
 " "
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
-#: g10/g10.c:425
+#: g10/g10.c:427
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMBRE|cifra para NOMBRE"
 
-#: g10/g10.c:436
+#: g10/g10.c:438
 msgid "use this user-id to sign or decrypt"
 msgstr "usa este usuario para firmar o descifrar"
 
-#: g10/g10.c:437
+#: g10/g10.c:439
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivel de compresi�n N (0 no comprime)"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "use canonical text mode"
 msgstr "usa modo de texto can�nico"
 
-#: g10/g10.c:452
+#: g10/g10.c:458
 msgid "use as output file"
 msgstr "usa como fichero de salida"
 
-#: g10/g10.c:454 g10/gpgv.c:68
+#: g10/g10.c:460 g10/gpgv.c:73
 msgid "verbose"
 msgstr "prolijo"
 
-#: g10/g10.c:465
+#: g10/g10.c:471
 msgid "do not make any changes"
 msgstr "no hace ning�n cambio"
 
-#: g10/g10.c:466
+#: g10/g10.c:472
 msgid "prompt before overwriting"
 msgstr "preguntar antes de sobreescribir"
 
-#: g10/g10.c:507
+#: g10/g10.c:513
 msgid "use strict OpenPGP behavior"
-msgstr ""
+msgstr "usar estilo OpenPGP estricto"
 
-#: g10/g10.c:508
+#: g10/g10.c:514
 msgid "generate PGP 2.x compatible messages"
-msgstr ""
+msgstr "generar mensajes compatibles con PGP 2.x"
 
 # ordenes -> �rdenes
 # 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/g10.c:536
+#: g10/g10.c:542
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1146,7 +1131,7 @@ msgstr ""
 "@\n"
 "(V�ase en la p�gina del manual la lista completo de �rdenes y opciones)\n"
 
-#: g10/g10.c:539
+#: g10/g10.c:545
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1166,15 +1151,15 @@ msgstr ""
 " --list-keys [nombres]      muestra las claves\n"
 " --fingerprint [nombres]    muestra las huellas dactilares\n"
 
-#: g10/g10.c:720 g10/gpgv.c:93
+#: g10/g10.c:724 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor, informe de posibles \"bugs\" a <[email protected]>.\n"
 
-#: g10/g10.c:737
+#: g10/g10.c:741
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/g10.c:740
+#: g10/g10.c:744
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1184,7 +1169,7 @@ msgstr ""
 "firma, comprueba, cifra o descifra\n"
 "la operaci�n por defecto depende de los datos de entrada\n"
 
-#: g10/g10.c:751
+#: g10/g10.c:755
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1192,448 +1177,456 @@ msgstr ""
 "\n"
 "Algoritmos disponibles:\n"
 
-#: g10/g10.c:754
+#: g10/g10.c:758
 msgid "Pubkey: "
 msgstr "Clave p�blica: "
 
-#: g10/g10.c:760 g10/keyedit.c:2141
+#: g10/g10.c:764 g10/keyedit.c:2248
 msgid "Cipher: "
 msgstr "Cifrado: "
 
-#: g10/g10.c:766
+#: g10/g10.c:770
 msgid "Hash: "
 msgstr "Resumen: "
 
-#: g10/g10.c:772 g10/keyedit.c:2187
+#: g10/g10.c:776 g10/keyedit.c:2294
 msgid "Compression: "
 msgstr "Compresi�n: "
 
-#: g10/g10.c:855
+#: g10/g10.c:859
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/g10.c:1003
+#: g10/g10.c:1007
 msgid "conflicting commands\n"
 msgstr "�rdenes incompatibles\n"
 
-#: g10/g10.c:1021
-#, fuzzy, c-format
+#: g10/g10.c:1025
+#, c-format
 msgid "no = sign found in group definition `%s'\n"
-msgstr "no se encontr� el signo = en la definici�n de grupo \"%s\"\n"
+msgstr "no se encontr� el signo = en la definici�n de grupo `%s'\n"
 
-#: g10/g10.c:1218
-#, fuzzy, c-format
+#: g10/g10.c:1222
+#, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
-msgstr "AVISO: propiedad insegura de %s \"%s\"\n"
+msgstr "AVISO: propiedad insegura del directorio personal `%s'\n"
 
-#: g10/g10.c:1221
-#, fuzzy, c-format
+#: g10/g10.c:1225
+#, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
-msgstr "AVISO: propiedad insegura de %s \"%s\"\n"
+msgstr "AVISO: propiedad insegura del fichero de configuraci�n `%s'\n"
 
-#: g10/g10.c:1224
-#, fuzzy, c-format
+#: g10/g10.c:1228
+#, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
-msgstr "AVISO: propiedad insegura de %s \"%s\"\n"
+msgstr "AVISO: propiedad insegura de la extensi�n `%s'\n"
 
-#: g10/g10.c:1230
-#, fuzzy, c-format
+#: g10/g10.c:1234
+#, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
-msgstr "AVISO: permisos inseguros de %s \"%s\"\n"
+msgstr "AVISO: permisos inseguros del directorio personal `%s'\n"
 
-#: g10/g10.c:1233
-#, fuzzy, c-format
+#: g10/g10.c:1237
+#, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
-msgstr "AVISO: permisos inseguros de %s \"%s\"\n"
+msgstr "AVISO: permisos inseguros del fichero de configuraci�n `%s'\n"
 
-#: g10/g10.c:1236
-#, fuzzy, c-format
+#: g10/g10.c:1240
+#, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
-msgstr "AVISO: permisos inseguros de %s \"%s\"\n"
+msgstr "AVISO: permisos inseguros de la extensi�n `%s'\n"
 
-#: g10/g10.c:1242
-#, fuzzy, c-format
+#: g10/g10.c:1246
+#, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
-msgstr "AVISO: propiedad insegura del directorio contenedor %s \"%s\"\n"
+msgstr "AVISO: propiedad insegura del directorio contenedor de `%s'\n"
 
-#: g10/g10.c:1245
-#, fuzzy, c-format
+#: g10/g10.c:1249
+#, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
-msgstr "AVISO: propiedad insegura del directorio contenedor %s \"%s\"\n"
+msgstr ""
+"AVISO: propiedad insegura del directorio contenedor del fichero de\n"
+"configuraci�n `%s'\n"
 
-#: g10/g10.c:1248
-#, fuzzy, c-format
+#: g10/g10.c:1252
+#, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
-msgstr "AVISO: propiedad insegura del directorio contenedor %s \"%s\"\n"
+msgstr ""
+"AVISO: propiedad insegura del directorio contenedor de la extensi�n `%s'\n"
 
-#: g10/g10.c:1254
-#, fuzzy, c-format
+#: g10/g10.c:1258
+#, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
-msgstr "AVISO: permisos inseguros del directorio contenedor %s \"%s\"\n"
+msgstr "AVISO: permisos inseguros del directorio contenedor de `%s'\n"
 
-#: g10/g10.c:1257
-#, fuzzy, c-format
+#: g10/g10.c:1261
+#, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
-msgstr "AVISO: permisos inseguros del directorio contenedor %s \"%s\"\n"
+msgstr ""
+"AVISO: permisos inseguros del directorio contenedor del fichero de\n"
+"configuraci�n `%s'\n"
 
-#: g10/g10.c:1260
-#, fuzzy, c-format
+#: g10/g10.c:1264
+#, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
-msgstr "AVISO: permisos inseguros del directorio contenedor %s \"%s\"\n"
+msgstr ""
+"AVISO: permisos inseguros del directorio contenedor de la extensi�n `%s'\n"
 
-#: g10/g10.c:1401
-#, fuzzy, c-format
+#: g10/g10.c:1405
+#, c-format
 msgid "unknown configuration item `%s'\n"
-msgstr "art�culo de configuraci�n desconocido \"%s\"\n"
+msgstr "art�culo de configuraci�n desconocido `%s'\n"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1802
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: se ignora el antiguo fichero de opciones predefinidas `%s'\n"
 
-#: g10/g10.c:1838
+#: g10/g10.c:1844
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
 
-#: g10/g10.c:1842
+#: g10/g10.c:1848
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: g10/g10.c:1849
+#: g10/g10.c:1855
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s no es para uso normal!\n"
 
-#: g10/g10.c:2076
-#, fuzzy, c-format
+#: g10/g10.c:2082
+#, 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"
+msgstr "no se carga el cifrado de ampliaci�n `%s' por permisos inseguros\n"
 
-#: g10/g10.c:2293
+#: g10/g10.c:2236 g10/g10.c:2248
 #, fuzzy, c-format
+msgid "`%s' is not a valid signature expiration\n"
+msgstr "`%s' no es un juego de caracteres v�lido\n"
+
+#: g10/g10.c:2321
+#, c-format
 msgid "`%s' is not a valid character set\n"
-msgstr "%s no es un juego de caracteres v�lido\n"
+msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3683
-#, fuzzy
+#: g10/g10.c:2340 g10/keyedit.c:3862
 msgid "could not parse keyserver URL\n"
-msgstr "no se puede interpretar la URI del servidor de claves\n"
+msgstr "no se puede interpretar la URL del servidor de claves\n"
 
-#: g10/g10.c:2318
-#, fuzzy, c-format
+#: g10/g10.c:2346
+#, c-format
 msgid "%s:%d: invalid keyserver options\n"
-msgstr "%s:%d: opciones de exportaci�n inv�lidas\n"
+msgstr "%s:%d: opciones del servidor de claves inv�lidas\n"
 
-#: g10/g10.c:2321
-#, fuzzy
+#: g10/g10.c:2349
 msgid "invalid keyserver options\n"
-msgstr "opciones de exportaci�n inv�lidas\n"
+msgstr "opciones del servidor de claves inv�lidas\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2356
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opciones de importaci�n inv�lidas\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2359
 msgid "invalid import options\n"
 msgstr "opciones de importaci�n inv�lidas\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2366
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opciones de exportaci�n inv�lidas\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2369
 msgid "invalid export options\n"
 msgstr "opciones de exportaci�n inv�lidas\n"
 
-#: g10/g10.c:2348
-#, fuzzy, c-format
+#: g10/g10.c:2376
+#, c-format
 msgid "%s:%d: invalid list options\n"
-msgstr "%s:%d: opciones de importaci�n inv�lidas\n"
+msgstr "%s:%d: lista de opciones inv�lida\n"
 
-#: g10/g10.c:2351
-#, fuzzy
+#: g10/g10.c:2379
 msgid "invalid list options\n"
-msgstr "opciones de importaci�n inv�lidas\n"
+msgstr "lista de opciones inv�lida\n"
 
-#: g10/g10.c:2373
-#, fuzzy, c-format
+#: g10/g10.c:2401
+#, c-format
 msgid "%s:%d: invalid verify options\n"
-msgstr "%s:%d: opciones de exportaci�n inv�lidas\n"
+msgstr "%s:%d: opciones de verificaci�n inv�lidas\n"
 
-#: g10/g10.c:2376
-#, fuzzy
+#: g10/g10.c:2404
 msgid "invalid verify options\n"
-msgstr "opciones de exportaci�n inv�lidas\n"
+msgstr "opciones de verificaci�n inv�lidas\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2411
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "imposible establecer camino de ejecutables %s\n"
 
-#: g10/g10.c:2573
+#: g10/g10.c:2602
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATENCI�N: �el programa podr�a volcar un fichero core!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2606
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sustituye a %s\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2615
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s no permitido con %s!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2618
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s no tiene sentido con %s!\n"
 
-#: g10/g10.c:2603
+#: g10/g10.c:2625
 #, 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/g10.c:2640
+#, c-format
 msgid "will not run with insecure memory due to %s\n"
-msgstr "escribiendo clave privada en `%s'\n"
+msgstr "no se ejecutar� en memoria insegura por %s\n"
 
-#: g10/g10.c:2617
+#: g10/g10.c:2654
 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/g10.c:2623
+#: g10/g10.c:2660
 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/g10.c:2629
+#: g10/g10.c:2666
 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/g10.c:2642
+#: g10/g10.c:2679
 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/g10.c:2712 g10/g10.c:2736
+#: g10/g10.c:2746 g10/g10.c:2770
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
 
-#: g10/g10.c:2718 g10/g10.c:2742
+#: g10/g10.c:2752 g10/g10.c:2776
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no inv�lido\n"
 
-#: g10/g10.c:2724
-#, fuzzy
+#: g10/g10.c:2758
 msgid "selected compression algorithm is invalid\n"
-msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
+msgstr "el algoritmo de compresi�n seleccionado es inv�lido\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2764
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "el algoritmo de certificaci�n por resumen elegido es inv�lido\n"
 
-#: g10/g10.c:2745
+#: g10/g10.c:2779
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/g10.c:2747
+#: g10/g10.c:2781
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/g10.c:2749
-#, fuzzy
+#: g10/g10.c:2783
 msgid "max-cert-depth must be in the range from 1 to 255\n"
-msgstr "max-cert-depth debe estar en el rango 1-255\n"
+msgstr "max-cert-depth debe estar en el rango de 1 a 255\n"
 
-#: g10/g10.c:2751
+#: g10/g10.c:2785
 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/g10.c:2753
+#: g10/g10.c:2787
 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/g10.c:2756
+#: g10/g10.c:2790
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2794
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n"
 
-#: g10/g10.c:2767
+#: g10/g10.c:2801
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto inv�lidas\n"
 
-#: g10/g10.c:2776
+#: g10/g10.c:2810
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias personales de cifrado inv�lidas\n"
 
-#: g10/g10.c:2780
+#: g10/g10.c:2814
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias personales de algoritmo de resumen inv�lidas\n"
 
-#: g10/g10.c:2784
+#: g10/g10.c:2818
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias personales de compresi�n inv�lidas\n"
 
-#: g10/g10.c:2817
+#: g10/g10.c:2851
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s a�n no funciona con %s\n"
 
-#: g10/g10.c:2864
-#, fuzzy, c-format
+#: g10/g10.c:2898
+#, 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"
+msgstr "no puede usar el cifrado `%s' en modo %s\n"
 
-#: g10/g10.c:2869
-#, fuzzy, c-format
+#: g10/g10.c:2903
+#, 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"
+msgstr "no puede usar el resumen `%s' en modo %s\n"
 
-#: g10/g10.c:2874
-#, fuzzy, c-format
+#: g10/g10.c:2908
+#, 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"
+msgstr "no puede usar la compresi�n `%s' en modo %s\n"
 
-#: g10/g10.c:2970
+#: g10/g10.c:3004
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicializaci�n de la base de datos de confianza fallida: %s\n"
 
-#: g10/g10.c:2981
+#: g10/g10.c:3015
 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/g10.c:2992
+#: g10/g10.c:3026
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/g10.c:2999
+#: g10/g10.c:3033
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/g10.c:3001
-#, fuzzy, c-format
+#: g10/g10.c:3035
+#, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
-msgstr "descifrado fallido: %s\n"
+msgstr "el cifrado sim�trico de `%s' fall�: %s\n"
 
-#: g10/g10.c:3011
+#: g10/g10.c:3045
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/g10.c:3024
-#, fuzzy
+#: g10/g10.c:3058
 msgid "--symmetric --encrypt [filename]"
-msgstr "--sign --encrypt [nombre_fichero]"
+msgstr "--symmetric --encrypt [nombre_fichero]"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3060
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
-msgstr ""
+msgstr "no puede usar --symetric --encrypt con --s2k-mode 0\n"
 
-#: g10/g10.c:3029
-#, fuzzy, c-format
+#: g10/g10.c:3063
+#, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
-msgstr "no puede usar %s en modo %s\n"
+msgstr "no puede usar --symetric --encrypt en modo %s\n"
 
-#: g10/g10.c:3047
+#: g10/g10.c:3081
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3094
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/g10.c:3075
-#, fuzzy
+#: g10/g10.c:3109
 msgid "--symmetric --sign --encrypt [filename]"
-msgstr "--sign --encrypt [nombre_fichero]"
+msgstr "--symmetric --sign --encrypt [nombre_fichero]"
 
-#: g10/g10.c:3077
+#: g10/g10.c:3111
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
-msgstr ""
+msgstr "no puede usar --symetric --sign --encrypt con --s2k-mode 0\n"
 
-#: g10/g10.c:3080
-#, fuzzy, c-format
+#: g10/g10.c:3114
+#, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
-msgstr "no puede usar %s en modo %s\n"
+msgstr "no puede usar --symmetric --sign --encrypt en modo %s\n"
 
-#: g10/g10.c:3100
+#: g10/g10.c:3134
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nombre_fichero]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3143
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3168
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/g10.c:3142
+#: g10/g10.c:3176
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/g10.c:3146
+#: g10/g10.c:3180
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/g10.c:3167
+#: g10/g10.c:3201
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuario [�rdenes]"
 
-#: g10/g10.c:3238
+#: g10/g10.c:3272
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usuario] [anillo]"
 
-#: g10/g10.c:3275
+#: g10/g10.c:3309
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "env�o al servidor de claves fallido: %s\n"
 
-#: g10/g10.c:3277
+#: g10/g10.c:3311
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recepci�n del servidor de claves fallida: %s\n"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3313
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "exportaci�n de clave fallida: %s\n"
 
-#: g10/g10.c:3290
+#: g10/g10.c:3324
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "b�squeda del servidor de claves fallida: %s\n"
 
-#: g10/g10.c:3300
+#: g10/g10.c:3334
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "renovaci�n al servidor de claves fallida: %s\n"
 
-#: g10/g10.c:3341
+#: g10/g10.c:3375
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
 
-#: g10/g10.c:3349
+#: g10/g10.c:3383
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creaci�n de armadura fallida: %s\n"
 
-#: g10/g10.c:3436
+#: g10/g10.c:3470
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribuci�n inv�lido `%s'\n"
 
-#: g10/g10.c:3559
+#: g10/g10.c:3593
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
@@ -1641,11 +1634,11 @@ 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/g10.c:3563
+#: g10/g10.c:3597
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/g10.c:3853
+#: g10/g10.c:3887
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1653,61 +1646,64 @@ msgstr ""
 "un nombre de notaci�n debe tener s�lo caracteres imprimibles o espacios, y "
 "acabar con un '='\n"
 
-#: g10/g10.c:3861
+#: g10/g10.c:3895
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nombre de notaci�n de usuario debe contener el caracter '@'\n"
 
-#: g10/g10.c:3871
+#: g10/g10.c:3900
+#, 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/g10.c:3911
 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/g10.c:3905
+#: g10/g10.c:3945
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL de pol�tica de certificado inv�lida\n"
 
-#: g10/g10.c:3907
+#: g10/g10.c:3947
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL de pol�tica inv�lida\n"
 
-#: g10/g10.c:3940
-#, fuzzy
+#: g10/g10.c:3980
 msgid "the given preferred keyserver URL is invalid\n"
-msgstr "URL de pol�tica inv�lida\n"
+msgstr "la URL del servidor de claves preferido no es v�lida\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "demasiados registros en la cache pk - anulada\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2750
-#, fuzzy
+#: g10/getkey.c:187 g10/getkey.c:2757
 msgid "[User ID not found]"
-msgstr "[Identificador de usuario no encontrado]"
+msgstr "[ID de usuario no encontrado]"
 
-#: g10/getkey.c:1677
-#, fuzzy, c-format
+#: g10/getkey.c:1684
+#, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
-msgstr "Clave %08lX inv�lida hecha mediante --allow-non-selfsigned-uid\n"
+msgstr "Clave %s inv�lida hecha v�lida mediante --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2228
-#, fuzzy, c-format
+#: g10/getkey.c:2235
+#, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
-msgstr "no hay subclave secreta para la clave p�blica %08lX -ignorada\n"
+msgstr "no hay subclave secreta para la subclave p�blica %s - ignorada\n"
 
-#: g10/getkey.c:2459
-#, fuzzy, c-format
+#: g10/getkey.c:2466
+#, c-format
 msgid "using subkey %s instead of primary key %s\n"
-msgstr "usando clave secundaria %08lX en vez de clave primaria %08lX\n"
+msgstr "usando subclave %s en vez de clave primaria %s\n"
 
-#: g10/getkey.c:2506
-#, fuzzy, c-format
+#: g10/getkey.c:2513
+#, c-format
 msgid "key %s: secret key without public key - skipped\n"
-msgstr "clave %08lX: clave secreta sin clave p�blica - omitida\n"
+msgstr "clave %s: clave secreta sin clave p�blica - omitida\n"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:74
 msgid "be somewhat more quiet"
 msgstr "algo m�s discreto"
 
-#: g10/gpgv.c:70
+#: g10/gpgv.c:75
 msgid "take the keys from this keyring"
 msgstr "tomar las claves de este anillo"
 
@@ -1715,19 +1711,19 @@ msgstr "tomar las claves de este anillo"
 # Creo que es mejor "con el sello de fecha", no es un conflicto
 # del sello en si mismo sino en relaci�n con el mensaje.
 # Ok.
-#: g10/gpgv.c:72
+#: g10/gpgv.c:77
 msgid "make timestamp conflicts only a warning"
 msgstr "hacer que los conflictos de fecha-hora sean s�lo un aviso"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:78
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribe informaci�n de estado en este descriptor de fichero"
 
-#: g10/gpgv.c:97
+#: g10/gpgv.c:102
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpgv [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:105
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1735,7 +1731,7 @@ msgstr ""
 "Sintaxis: gpg [opciones] [ficheros]\n"
 "Confrontar las firmas contra claves conocidas\n"
 
-#: g10/helptext.c:48
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1745,7 +1741,7 @@ msgstr ""
 "terceros. Es necesario para implementar la red de confianza, no tiene nada\n"
 "que ver con la red de certificados (impl�citamente creada)."
 
-#: g10/helptext.c:54
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1753,20 +1749,20 @@ msgid ""
 "ultimately trusted\n"
 msgstr ""
 "Para construir la Red-de-Confianza, GnuPG necesita saber qu� claves\n"
-"tienen confianza total - normalmente son las claves para las que usted\n"
+"tienen confianza absoluta - normalmente son las claves para las que usted\n"
 "puede acceder a la clave secreta. Conteste \"s�\" para hacer que esta\n"
 "clave se considere como de total confianza\n"
 
-#: g10/helptext.c:61
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "Si quiere usar esta clave no fiable de todos modos, conteste \"s�\"."
 
-#: g10/helptext.c:65
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Introduzca el ID de usuario al que quiere enviar el mensaje."
 
-#: g10/helptext.c:69
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1779,8 +1775,17 @@ msgid ""
 "\n"
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
+"Seleccione el algoritmo que usar.\n"
+"\n"
+"DSA (alias DSS) es el Algoritmo de Firma Digital y s�lo se usa para firmas.\n"
+"\n"
+"Elgamal es un algoritmo s�lo para cifrar.\n"
+"\n"
+"RSA sirve tanto para firmar como para cifrar.\n"
+"\n"
+"La primera clave (clave primaria) debe ser siempre de tipo capaz de firmar."
 
-#: g10/helptext.c:83
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -1790,16 +1795,16 @@ msgstr ""
 "cifrar. Este algoritmo deb�ria usarse solo en ciertos contextos.\n"
 "Por favor consulte primero a un experto en seguridad."
 
-#: g10/helptext.c:90
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "Introduzca la longitud de la clave"
 
-#: g10/helptext.c:94 g10/helptext.c:99 g10/helptext.c:111 g10/helptext.c:143
-#: g10/helptext.c:171 g10/helptext.c:176 g10/helptext.c:181
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "Responda \"s�\" o \"no\""
 
-#: g10/helptext.c:104
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1811,21 +1816,21 @@ msgstr ""
 "buena respuesta a los errores; el sistema intentar� interpretar el valor\n"
 "introducido como un intervalo."
 
-#: g10/helptext.c:116
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "Introduzca el nombre del due�o de la clave"
 
-#: g10/helptext.c:121
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr ""
 "Introduzca una direcci�n de correo electr�nico (opcional pero muy\n"
 "recomendable)"
 
-#: g10/helptext.c:125
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "Introduzca un comentario opcional"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1839,11 +1844,11 @@ msgstr ""
 "O  para continuar con la generaci�n de clave.\n"
 "S  para interrumpir la generaci�n de clave."
 
-#: g10/helptext.c:139
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Responda \"s�\" (o s�lo \"s\") para generar la subclave."
 
-#: g10/helptext.c:147
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -1918,12 +1923,11 @@ msgstr ""
 "\n"
 "Si no sabe qu� contestar, conteste \"0\"."
 
-#: g10/helptext.c:185
-#, fuzzy
+#: g10/helptext.c:186
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Responda \"s�\" si quiere firmar TODOS los IDs de usuario"
 
-#: g10/helptext.c:189
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -1931,11 +1935,11 @@ msgstr ""
 "Responda \"s�\" si realmente quiere borrar este ID de usuario.\n"
 "�Tambi�n se perder�n todos los certificados!"
 
-#: g10/helptext.c:194
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Responda \"s�\" si quiere borrar esta subclave"
 
-#: g10/helptext.c:199
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -1945,7 +1949,7 @@ msgstr ""
 "borrar esta firma ya que puede ser importante para establecer una conexi�n\n"
 "de confianza con la clave o con otra clave certificada por �sta."
 
-#: g10/helptext.c:204
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -1957,13 +1961,13 @@ msgstr ""
 "se us�, ya que dicha clave podr�a establecer una conexi�n de confianza\n"
 "a trav�s de otra clave certificada."
 
-#: g10/helptext.c:210
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "Esta firma no es v�lida. Tiene sentido borrarla de su anillo."
 
-#: g10/helptext.c:214
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -1976,7 +1980,7 @@ msgstr ""
 "volver a usar esta clave. As� que b�rrela tan s�lo si esta autofirma no\n"
 "es v�lida por alguna raz�n y hay otra disponible."
 
-#: g10/helptext.c:222
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -1986,25 +1990,25 @@ msgstr ""
 "seleccionados) a la lista actual de preferencias. El sello de tiempo\n"
 "de todas las autofirmas afectadas se avanzar� en un segundo.\n"
 
-#: g10/helptext.c:229
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Por favor introduzca la contrase�a: una frase secreta \n"
 
-#: g10/helptext.c:235
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Repita la �ltima frase contrase�a para asegurarse de lo que tecle�."
 
-#: g10/helptext.c:239
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "Introduzca el nombre del fichero al que corresponde la firma"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Responda \"s�\" para sobreescribir el fichero"
 
 # Sugerencia: ENTER -> INTRO.
 # Aceptada.
-#: g10/helptext.c:249
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2012,7 +2016,7 @@ msgstr ""
 "Introduzca un nuevo nombre de fichero. Si pulsa INTRO se usar� el fichero\n"
 "por omisi�n (mostrado entre corchetes)."
 
-#: g10/helptext.c:255
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2041,7 +2045,7 @@ msgstr ""
 "      seguir siendo usada; esto se utiliza normalmente para marcar una\n"
 "      direcci�n de correo-e como inv�lida.\n"
 
-#: g10/helptext.c:271
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2051,534 +2055,546 @@ msgstr ""
 "este certificado de revocaci�n. Por favor, que el texto sea breve.\n"
 "Una l�nea vac�a pone fin al texto.\n"
 
-#: g10/helptext.c:286
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "Ayuda no disponible"
 
-#: g10/helptext.c:294
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "No hay ayuda disponible para `%s'"
 
-#: g10/import.c:247
+#: g10/import.c:248
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "omitiendo bloque de tipo %d\n"
 
-#: g10/import.c:256
-#, fuzzy, c-format
+#: g10/import.c:257
+#, c-format
 msgid "%lu keys processed so far\n"
-msgstr "hasta ahora se han procesado %lu claves\n"
+msgstr "%lu claves procesadas hasta ahora\n"
 
-#: g10/import.c:273
+#: g10/import.c:274
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Cantidad total procesada: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      omitidas nuevas claves: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:279
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sin identificador: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importadas: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:287
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             sin cambios: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "     nuevos identificativos: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nuevas subclaves: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "              nuevas firmas: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "        nuevas revocaciones de claves: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     claves secretas le�das: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr " claves secretas importadas: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "claves secretas sin cambios: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "          no importadas: %lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:544
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
-msgstr ""
+msgstr "AVISO: la clave %s contiene preferencias para no disponible\n"
 
-#: g10/import.c:545
-#, fuzzy
+#: g10/import.c:546
 msgid "algorithms on these user IDs:\n"
-msgstr "Ha firmado los siguientes IDs de usuario:\n"
+msgstr "algoritmos en estos IDs de usuarios:\n"
 
-#: g10/import.c:582
+#: g10/import.c:583
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
-msgstr ""
+msgstr "         \"%s\": algoritmo de cifrado preferido %s\n"
 
-#: g10/import.c:594
-#, fuzzy, c-format
+#: g10/import.c:595
+#, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
-msgstr "firma %s de: \"%s\"\n"
+msgstr "         \"%s\": algoritmo de resumen preferido %s\n"
 
-#: g10/import.c:606
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
-msgstr ""
+msgstr "         \"%s\": algoritmo de compresi�n preferido %s\n"
 
-#: g10/import.c:619
+#: g10/import.c:620
 msgid "it is strongly suggested that you update your preferences and\n"
-msgstr ""
+msgstr "se recomienda encarecidamente que actualice sus preferencias y\n"
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
+"re-dustribuya esta clave para evitar potenciales problemas de\n"
+"diferencias en los algoritmos.\n"
 
-#: g10/import.c:645
+#: g10/import.c:646
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
+"puede actualizar sus preferencias con: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:693 g10/import.c:1047
-#, fuzzy, c-format
+#: g10/import.c:694 g10/import.c:1048
+#, c-format
 msgid "key %s: no user ID\n"
-msgstr "clave %08lX: sin identificador de usuario\n"
+msgstr "clave %s: sin identificador de usuario\n"
 
-#: g10/import.c:713
-#, fuzzy, c-format
+#: g10/import.c:714
+#, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
-msgstr "clave %08lX: reparada la subclave HKP corrompida\n"
+msgstr "clave %s: reparada la subclave PKS corrompida\n"
 
-#: g10/import.c:728
-#, fuzzy, c-format
+#: g10/import.c:729
+#, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
-msgstr "clave %08lX: aceptado ID de usuario sin autofirma '%s'\n"
+msgstr "clave %s: aceptado ID de usuario sin autofirma \"%s\"\n"
 
-#: g10/import.c:734
-#, fuzzy, c-format
+#: g10/import.c:735
+#, c-format
 msgid "key %s: no valid user IDs\n"
-msgstr "clave %08lX: sin identificadores de usuario v�lidos\n"
+msgstr "clave %s: sin identificadores de usuario v�lidos\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 msgid "this may be caused by a missing self-signature\n"
 msgstr "esto puede ser debido a la ausencia de autofirma\n"
 
-#: g10/import.c:746 g10/import.c:1168
-#, fuzzy, c-format
+#: g10/import.c:747 g10/import.c:1169
+#, c-format
 msgid "key %s: public key not found: %s\n"
-msgstr "clave %08lX: clave p�blica no encontrada: %s\n"
+msgstr "clave %s: clave p�blica no encontrada: %s\n"
 
-#: g10/import.c:752
-#, fuzzy, c-format
+#: g10/import.c:753
+#, c-format
 msgid "key %s: new key - skipped\n"
-msgstr "clave %08lX: clave nueva - omitida\n"
+msgstr "clave %s: clave nueva - omitida\n"
 
-#: g10/import.c:761
+#: g10/import.c:762
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "anillo de claves no escribible encontrado: %s\n"
 
-#: g10/import.c:766 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribiendo en `%s'\n"
 
-#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
-#: g10/import.c:2314 g10/import.c:2336
+#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
+#: g10/import.c:2315 g10/import.c:2337
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: g10/import.c:791
-#, fuzzy, c-format
+#: g10/import.c:792
+#, c-format
 msgid "key %s: public key \"%s\" imported\n"
-msgstr "clave %08lX: clave p�blica \"%s\" importada\n"
+msgstr "clave %s: clave p�blica \"%s\" importada\n"
 
-#: g10/import.c:815
-#, fuzzy, c-format
+#: g10/import.c:816
+#, c-format
 msgid "key %s: doesn't match our copy\n"
-msgstr "clave %08lX: no coincide con nuestra copia\n"
+msgstr "clave %s: no coincide con nuestra copia\n"
 
-#: g10/import.c:832 g10/import.c:1186
-#, fuzzy, c-format
+#: g10/import.c:833 g10/import.c:1187
+#, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
-msgstr "clave %08lX: no puede localizarse el bloque de claves original: %s\n"
+msgstr "clave %s: no puede localizarse el bloque de claves original: %s\n"
 
-#: g10/import.c:840 g10/import.c:1193
-#, fuzzy, c-format
+#: g10/import.c:841 g10/import.c:1194
+#, c-format
 msgid "key %s: can't read original keyblock: %s\n"
-msgstr "clave %08lX: no puede leerse el bloque de claves original: %s\n"
+msgstr "clave %s: no puede leerse el bloque de claves original: %s\n"
 
-#: g10/import.c:872
-#, fuzzy, c-format
+#: g10/import.c:873
+#, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
-msgstr "clave %08lX: \"%s\" 1 ID de usuario nuevo\n"
+msgstr "clave %s: \"%s\" 1 ID de usuario nuevo\n"
 
-#: g10/import.c:875
-#, fuzzy, c-format
+#: g10/import.c:876
+#, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
-msgstr "clave %08lX: \"%s\" %d nuevos identificadores de usuario\n"
+msgstr "clave %s: \"%s\" %d nuevos identificadores de usuario\n"
 
-#: g10/import.c:878
-#, fuzzy, c-format
+#: g10/import.c:879
+#, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
-msgstr "clave %08lX: \"%s\" 1 firma nueva\n"
+msgstr "clave %s: \"%s\" 1 firma nueva\n"
 
-#: g10/import.c:881
-#, fuzzy, c-format
+#: g10/import.c:882
+#, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
-msgstr "clave %08lX: \"%s\" %d firmas nuevas\n"
+msgstr "clave %s: \"%s\" %d firmas nuevas\n"
 
-#: g10/import.c:884
-#, fuzzy, c-format
+#: g10/import.c:885
+#, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
-msgstr "clave %08lX: \"%s\" 1 subclave nueva\n"
+msgstr "clave %s: \"%s\" 1 subclave nueva\n"
 
-#: g10/import.c:887
-#, fuzzy, c-format
+#: g10/import.c:888
+#, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
-msgstr "clave %08lX: \"%s\" %d subclaves nuevas\n"
+msgstr "clave %s: \"%s\" %d subclaves nuevas\n"
 
-#: g10/import.c:908
-#, fuzzy, c-format
+#: g10/import.c:909
+#, c-format
 msgid "key %s: \"%s\" not changed\n"
-msgstr "clave %08lX: \"%s\" sin cambios\n"
+msgstr "clave %s: \"%s\" sin cambios\n"
 
-#: g10/import.c:1053
-#, fuzzy, c-format
+#: g10/import.c:1054
+#, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
-msgstr "clave %08lX: clave secreta con cifrado inv�lido %d - omitida\n"
+msgstr "clave %s: clave secreta con cifrado inv�lido %d - omitida\n"
 
-#: g10/import.c:1064
-#, fuzzy
+#: g10/import.c:1065
 msgid "importing secret keys not allowed\n"
-msgstr "escribiendo clave privada en `%s'\n"
+msgstr "no se permite importar claves secretas\n"
 
-#: g10/import.c:1081 g10/import.c:2329
+#: g10/import.c:1082 g10/import.c:2330
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "no hay anillo secreto de claves por defecto: %s\n"
 
-#: g10/import.c:1092
-#, fuzzy, c-format
+#: g10/import.c:1093
+#, c-format
 msgid "key %s: secret key imported\n"
-msgstr "clave %08lX: clave secreta importada\n"
+msgstr "clave %s: clave secreta importada\n"
 
-#: g10/import.c:1121
-#, fuzzy, c-format
+#: g10/import.c:1122
+#, c-format
 msgid "key %s: already in secret keyring\n"
-msgstr "clave %08lX: ya estaba en el anillo secreto\n"
+msgstr "clave %s: ya estaba en el anillo secreto\n"
 
-#: g10/import.c:1131
-#, fuzzy, c-format
+#: g10/import.c:1132
+#, c-format
 msgid "key %s: secret key not found: %s\n"
-msgstr "clave %08lX: clave secreta no encontrada: %s\n"
+msgstr "clave %s: clave secreta no encontrada: %s\n"
 
-#: g10/import.c:1161
-#, fuzzy, c-format
+#: g10/import.c:1162
+#, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
-"clave %08lX: falta la clave p�blica - imposible emplear el\n"
+"clave %s: falta la clave p�blica - imposible emplear el\n"
 "certificado de revocaci�n\n"
 
-#: g10/import.c:1204
-#, fuzzy, c-format
+#: g10/import.c:1205
+#, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
-msgstr "clave %08lX: certificado de revocaci�n inv�lido: %s - rechazado\n"
+msgstr "clave %s: certificado de revocaci�n inv�lido: %s - rechazado\n"
 
-#: g10/import.c:1236
-#, fuzzy, c-format
+#: g10/import.c:1237
+#, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
-msgstr "clave %08lX: \"%s\" certificado de revocaci�n importado\n"
+msgstr "clave %s: \"%s\" certificado de revocaci�n importado\n"
 
-#: g10/import.c:1301
-#, fuzzy, c-format
+#: g10/import.c:1302
+#, c-format
 msgid "key %s: no user ID for signature\n"
-msgstr "clave %08lX: no hay identificador de usuario para la firma\n"
+msgstr "clave %s: no hay identificador de usuario para la firma\n"
 
-#: g10/import.c:1316
-#, fuzzy, c-format
+#: g10/import.c:1317
+#, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
-msgstr ""
-"clave %08lX: algoritmo de clave p�blica no disponible para el id \"%s\"\n"
+msgstr "clave %s: algoritmo de clave p�blica no disponible para ID \"%s\"\n"
 
-#: g10/import.c:1318
-#, fuzzy, c-format
+#: g10/import.c:1319
+#, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
-msgstr "clave %08lX: autofirma inv�lida para el id \"%s\"\n"
+msgstr "clave %s: autofirma inv�lida para el id \"%s\"\n"
 
-#: g10/import.c:1336
-#, fuzzy, c-format
+#: g10/import.c:1337
+#, c-format
 msgid "key %s: no subkey for key binding\n"
-msgstr "clave %08lX: no hay subclave que unir\n"
+msgstr "clave %s: no hay subclave que unir a la clave\n"
 
-#: g10/import.c:1347 g10/import.c:1397
-#, fuzzy, c-format
+#: g10/import.c:1348 g10/import.c:1398
+#, c-format
 msgid "key %s: unsupported public key algorithm\n"
-msgstr "clave %08lX: algoritmo de clave p�blica no disponible\n"
+msgstr "clave %s: algoritmo de clave p�blica no disponible\n"
 
-#: g10/import.c:1349
-#, fuzzy, c-format
+#: g10/import.c:1350
+#, c-format
 msgid "key %s: invalid subkey binding\n"
-msgstr "clave %08lX: uni�n de subclave inv�lida\n"
+msgstr "clave %s: uni�n de subclave inv�lida\n"
 
-#: g10/import.c:1364
-#, fuzzy, c-format
+#: g10/import.c:1365
+#, c-format
 msgid "key %s: removed multiple subkey binding\n"
-msgstr "clave %08lX: borrado enlace de subclaves m�ltiples\n"
+msgstr "clave %s: borrado enlace de subclaves m�ltiples\n"
 
-#: g10/import.c:1386
-#, fuzzy, c-format
+#: g10/import.c:1387
+#, c-format
 msgid "key %s: no subkey for key revocation\n"
-msgstr "clave %08lX: no hay subclave para la revocaci�n de clave\n"
+msgstr "clave %s: no hay subclave para la revocaci�n de clave\n"
 
-#: g10/import.c:1399
-#, fuzzy, c-format
+#: g10/import.c:1400
+#, c-format
 msgid "key %s: invalid subkey revocation\n"
-msgstr "clave %08lX: revocaci�n de subclave inv�lida\n"
+msgstr "clave %s: revocaci�n de subclave inv�lida\n"
 
-#: g10/import.c:1414
-#, fuzzy, c-format
+#: g10/import.c:1415
+#, c-format
 msgid "key %s: removed multiple subkey revocation\n"
-msgstr "clave %08lX: borrada revocaci�n de subclave m�ltiple\n"
+msgstr "clave %s: borrada revocaci�n de subclave m�ltiple\n"
 
-#: g10/import.c:1456
-#, fuzzy, c-format
+#: g10/import.c:1457
+#, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
-msgstr "clave %08lX: omitido ID de usuario '"
+msgstr "clave %s: omitido ID de usuario \"%s\"\n"
 
-#: g10/import.c:1477
-#, fuzzy, c-format
+#: g10/import.c:1478
+#, c-format
 msgid "key %s: skipped subkey\n"
-msgstr "clave %08lX: subclave omitida\n"
+msgstr "clave %s: subclave omitida\n"
 
-#: g10/import.c:1504
-#, fuzzy, c-format
+#: g10/import.c:1505
+#, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
-msgstr "clave %08lX: firma no exportable (clase %02x) - omitida\n"
+msgstr "clave %s: firma no exportable (clase 0x%02x) - omitida\n"
 
-#: g10/import.c:1514
-#, fuzzy, c-format
+#: g10/import.c:1515
+#, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
-msgstr "clave %08lX: certificado de revocaci�n en lugar equivocado - omitido\n"
+msgstr "clave %s: certificado de revocaci�n en lugar equivocado - omitido\n"
 
-#: g10/import.c:1531
-#, fuzzy, c-format
+#: g10/import.c:1532
+#, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
-msgstr "clave %08lX: certificado de revocaci�n no valido: %s - omitido\n"
+msgstr "clave %s: certificado de revocaci�n no valido: %s - omitido\n"
 
-#: g10/import.c:1545
-#, fuzzy, c-format
+#: g10/import.c:1546
+#, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
-msgstr "clave %08lX: firma de subclave en lugar equivocado - omitida\n"
+msgstr "clave %s: firma de subclave en lugar equivocado - omitida\n"
 
-#: g10/import.c:1553
-#, fuzzy, c-format
+#: g10/import.c:1554
+#, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
-msgstr "clave %08lX: firma de clase (0x%02x) inesperada - omitida\n"
+msgstr "clave %s: firma de clase (0x%02x) inesperada - omitida\n"
 
-#: g10/import.c:1574
-#, fuzzy, c-format
+#: g10/import.c:1575
+#, c-format
 msgid "key %s: expired signature from key %s - skipped\n"
-msgstr "clave %08lX: firma de clase (0x%02x) inesperada - omitida\n"
+msgstr "clave %s: firma caducada con la clave %s - omitida\n"
 
-#: g10/import.c:1677
-#, fuzzy, c-format
+#: g10/import.c:1678
+#, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
-msgstr "clave %08lX: detectado usuario duplicado - fusionada\n"
+msgstr "clave %s: detectado usuario duplicado - fusionada\n"
 
-#: g10/import.c:1739
-#, fuzzy, c-format
+#: g10/import.c:1740
+#, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
-"AVISO: la clave %08lX puede estar revocada: recuperando clave de revocaci�n %"
-"08lX\n"
+"AVISO: la clave %s puede estar revocada: recuperando clave de revocaci�n %s\n"
 
-#: g10/import.c:1753
-#, fuzzy, c-format
+#: g10/import.c:1754
+#, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
-"AVISO: la clave %08lX puede estar revocada: falta clave de revocaci�n %"
-"08lX.\n"
+"AVISO: la clave %s puede estar revocada: falta clave de revocaci�n %s.\n"
 
-#: g10/import.c:1812
-#, fuzzy, c-format
+#: g10/import.c:1813
+#, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
-msgstr "clave %08lX: \"%s\" certificado de revocaci�n a�adido\n"
+msgstr "clave %s: \"%s\" certificado de revocaci�n a�adido\n"
 
-#: g10/import.c:1846
-#, fuzzy, c-format
+#: g10/import.c:1847
+#, c-format
 msgid "key %s: direct key signature added\n"
-msgstr "clave %08lX: firma directa de clave a�adida\n"
+msgstr "clave %s: firma directa de clave a�adida\n"
 
-#: g10/import.c:2235
-#, fuzzy
+#: g10/import.c:2236
 msgid "NOTE: a key's S/N does not match the card's one\n"
-msgstr "�la clave p�blica y la privada no se corresponden!\n"
+msgstr "NOTA: un S/N de la clave no coincide con la de la tarjeta\n"
 
-#: g10/import.c:2243
-#, fuzzy
+#: g10/import.c:2244
 msgid "NOTE: primary key is online and stored on card\n"
-msgstr "omitido: clave secreta ya presente\n"
+msgstr "NOTA: clave primaria en l�nea y almacenada en la tarjeta\n"
 
-#: g10/import.c:2245
-#, fuzzy
+#: g10/import.c:2246
 msgid "NOTE: secondary key is online and stored on card\n"
-msgstr "omitido: clave secreta ya presente\n"
+msgstr "NOTA: clave secundaria en l�nea y almacenada en la tarjeta\n"
 
-#: g10/keydb.c:167
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: g10/keydb.c:174
+#: g10/keydb.c:175
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "anillo `%s' creado\n"
 
-#: g10/keydb.c:685
+#: g10/keydb.c:316 g10/keydb.c:319
+#, fuzzy, c-format
+msgid "keyblock resource `%s': %s\n"
+msgstr "%s: problema lectura del bloque de clave: %s\n"
+
+#: g10/keydb.c:698
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "fallo reconstruyendo cach� del anillo de claves: %s\n"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[revocaci�n]"
 
-#: g10/keyedit.c:255
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[autofirma]"
 
-#: g10/keyedit.c:333 g10/keylist.c:405
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 firma incorrecta\n"
 
-#: g10/keyedit.c:335 g10/keylist.c:407
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d firmas incorrectas\n"
 
-#: g10/keyedit.c:337 g10/keylist.c:409
+#: g10/keyedit.c:344 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 firma no comprobada por falta de clave\n"
 
-#: g10/keyedit.c:339 g10/keylist.c:411
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, 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:341 g10/keylist.c:413
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 firma no comprobada por causa de un error\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:415
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d firmas no comprobadas por errores\n"
 
-#: g10/keyedit.c:345
+#: g10/keyedit.c:352
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Detectado 1 identificador de usuario sin autofirma v�lida\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:354
 #, 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:403 g10/pkclist.c:262
-#, fuzzy
+#: g10/keyedit.c:410 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
 "(by looking at passports, checking fingerprints from different sources, "
 "etc.)\n"
 msgstr ""
-"Por favor, decida su nivel de confianza para que este usuario\n"
-"verifique las claves de otros usuarios (mirando pasaportes,\n"
-"comprobando huellas dactilares en diferentes fuentes...)\n"
+"Por favor, decida su nivel de confianza en que este usuario\n"
+"verifique correctamente las claves de otros usuarios (mirando\n"
+"pasaportes, comprobando huellas dactilares en diferentes fuentes...)\n"
 "\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:274
-#, fuzzy, c-format
+#: g10/keyedit.c:414 g10/pkclist.c:275
+#, c-format
 msgid "  %d = I trust marginally\n"
-msgstr " %d = Conf�o poco\n"
+msgstr " %d = Conf�o un poco\n"
 
-#: g10/keyedit.c:408 g10/pkclist.c:276
-#, fuzzy, c-format
+#: g10/keyedit.c:415 g10/pkclist.c:277
+#, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Conf�o totalmente\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:434
 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 ""
+"Por favor, introduzca el nivel de esta firma de confianza.\n"
+"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:443
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
-msgstr ""
+msgstr "Introduzca un dominio para restringir esta firma, o intro para nada.\n"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "ID de usuario \"%s\" revocado."
 
-#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
-#: g10/keyedit.c:858 g10/keyedit.c:1642
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1728
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�Seguro que todav�a quiere firmarlo? (s/N) "
 
-#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
-#: g10/keyedit.c:1648
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
+#: g10/keyedit.c:1734
 msgid "  Unable to sign.\n"
 msgstr "  Imposible firmar.\n"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "ID de usuario \"%s\" expirado."
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:650
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ID de usuario \"%s\" no tiene autofirma."
 
-#: g10/keyedit.c:676
+#: g10/keyedit.c:678
+#, fuzzy, c-format
+msgid "User ID \"%s\" is signable.  "
+msgstr "ID de usuario \"%s\" no tiene autofirma."
+
+#: g10/keyedit.c:680
+#, fuzzy
+msgid "Sign it? (y/N) "
+msgstr "�Firmar de verdad? (s/N) "
+
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2587,11 +2603,11 @@ msgstr ""
 "La autofirma en \"%s\"\n"
 "es una firma de tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:711
 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:699
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2600,11 +2616,11 @@ msgstr ""
 "Su firma actual en \"%s\"\n"
 "ha expirado.\n"
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:729
 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:724
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2613,43 +2629,43 @@ msgstr ""
 "Su firma actual en \"%s\"\n"
 "es una firma local.\n"
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:754
 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:749
-#, fuzzy, c-format
+#: g10/keyedit.c:775
+#, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
-msgstr "\"%s\" ya estaba firmada localmente por la clave %08lX\n"
+msgstr "\"%s\" ya estaba firmada localmente por la clave %s\n"
 
-#: g10/keyedit.c:752
-#, fuzzy, c-format
+#: g10/keyedit.c:778
+#, c-format
 msgid "\"%s\" was already signed by key %s\n"
-msgstr "\"%s\" ya estaba firmada por la clave %08lX\n"
+msgstr "\"%s\" ya estaba firmada por la clave %s\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:783
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "�Quiere firmarlo a�n as�? (s/N) "
 
-#: g10/keyedit.c:779
-#, fuzzy, c-format
+#: g10/keyedit.c:805
+#, c-format
 msgid "Nothing to sign with key %s\n"
-msgstr "Nada que firmar con la clave %08lX\n"
+msgstr "Nada que firmar con la clave %s\n"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "�Esta clave ha caducado!"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta clave expirar� el %s.\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:844
 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:851
+#: g10/keyedit.c:882
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2657,11 +2673,11 @@ msgstr ""
 "No puede hacer una firma OpenPGP de una clave PGP 2.x estando en modo --"
 "pgp2.\n"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:884
 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:878
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2671,134 +2687,109 @@ msgstr ""
 "firmar pertenece realmente a la persona arriba nombrada? Si no sabe que\n"
 "contestar, introduzca \"0\".\n"
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) No contesto.%s\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:916
 #, 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:887
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) He hecho una comprobaci�n informal.%s\n"
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Lo he comprobado meticulosamente.%s\n"
 
-#: g10/keyedit.c:895
-#, fuzzy
+#: g10/keyedit.c:926
 msgid "Your selection? (enter `?' for more information): "
 msgstr "�Su elecci�n? (escriba '?' si desea m�s informaci�n): "
 
-#: g10/keyedit.c:919
-#, fuzzy, c-format
+#: g10/keyedit.c:950
+#, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
 "key \"%s\" (%s)\n"
 msgstr ""
 "�Est� realmente seguro de querer firmar esta clave\n"
-"con su clave: \""
+"con su clave: \"%s\" (%s)?\n"
 
-#: g10/keyedit.c:926
-#, fuzzy
+#: g10/keyedit.c:957
 msgid "This will be a self-signature.\n"
-msgstr ""
-"\n"
-"Esto ser� una autofirma.\n"
+msgstr "Esto ser� una autofirma.\n"
 
-#: g10/keyedit.c:932
-#, fuzzy
+#: g10/keyedit.c:963
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
-msgstr ""
-"\n"
-"ATENCION: la firma no se marcar� como no exportable.\n"
+msgstr "ATENCION: la firma no se marcar� como no exportable.\n"
 
-#: g10/keyedit.c:940
-#, fuzzy
+#: g10/keyedit.c:971
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
-msgstr ""
-"\n"
-"AVISO: la firma no se marcar� como no revocable.\n"
+msgstr "AVISO: la firma no se marcar� como no revocable.\n"
 
-#: g10/keyedit.c:950
-#, fuzzy
+#: g10/keyedit.c:981
 msgid "The signature will be marked as non-exportable.\n"
-msgstr ""
-"\n"
-"La firma se marcar� como no exportable.\n"
+msgstr "La firma se marcar� como no exportable.\n"
 
-#: g10/keyedit.c:957
-#, fuzzy
+#: g10/keyedit.c:988
 msgid "The signature will be marked as non-revocable.\n"
-msgstr ""
-"\n"
-"La firma se marcar� como no revocable.\n"
+msgstr "La firma se marcar� como no revocable.\n"
 
-#: g10/keyedit.c:964
-#, fuzzy
+#: g10/keyedit.c:995
 msgid "I have not checked this key at all.\n"
-msgstr ""
-"\n"
-"No he comprobado esta clave en absoluto.\n"
+msgstr "No he comprobado esta clave en absoluto.\n"
 
-#: g10/keyedit.c:969
-#, fuzzy
+#: g10/keyedit.c:1000
 msgid "I have checked this key casually.\n"
-msgstr ""
-"\n"
-"He comprobado esta clave informalmente.\n"
+msgstr "He comprobado esta clave informalmente.\n"
 
-#: g10/keyedit.c:974
-#, fuzzy
+#: g10/keyedit.c:1005
 msgid "I have checked this key very carefully.\n"
-msgstr ""
-"\n"
-"He comprobado esta clave meticulosamente.\n"
+msgstr "He comprobado esta clave meticulosamente.\n"
 
-#: g10/keyedit.c:984
-#, fuzzy
+#: g10/keyedit.c:1015
 msgid "Really sign? (y/N) "
-msgstr "�Firmar de verdad? "
+msgstr "�Firmar de verdad? (s/N) "
 
-#: g10/keyedit.c:1029 g10/keyedit.c:4132 g10/keyedit.c:4223 g10/keyedit.c:4287
-#: g10/keyedit.c:4348 g10/sign.c:369
+#: g10/keyedit.c:1060 g10/keyedit.c:4350 g10/keyedit.c:4441 g10/keyedit.c:4505
+#: g10/keyedit.c:4566 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallida: %s\n"
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1125
 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:1105 g10/keygen.c:3057
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "Esta clave no est� protegida.\n"
 
-#: g10/keyedit.c:1109 g10/keygen.c:3045
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 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:1113 g10/keygen.c:3060
-#, fuzzy
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 msgid "Secret parts of primary key are stored on-card.\n"
-msgstr "Las partes secretas de la clave primaria no est�n disponibles.\n"
+msgstr "Las partes secretas de la clave primaria se guardan en la tarjeta.\n"
 
-#: g10/keyedit.c:1117 g10/keygen.c:3064
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "La clave est� protegida.\n"
 
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "No puede editarse esta clave: %s\n"
 
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2806,11 +2797,11 @@ msgstr ""
 "Introduzca la nueva frase contrase�a para esta clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:1825
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "frase contrase�a repetida incorrectamente; int�ntelo de nuevo"
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2818,433 +2809,403 @@ msgstr ""
 "No ha especificado frase contrase�a. Esto es probablemente una *mala* idea.\n"
 "\n"
 
-#: g10/keyedit.c:1164
-#, fuzzy
+#: g10/keyedit.c:1195
 msgid "Do you really want to do this? (y/N) "
-msgstr "�Realmente quiere hacer esto? "
+msgstr "�Realmente quiere hacer esto? (s/N) "
 
-#: g10/keyedit.c:1235
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "moviendo la firma de la clave al lugar correcto\n"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "graba y sale"
 
-#: g10/keyedit.c:1322
-#, fuzzy
+#: g10/keyedit.c:1354
 msgid "show key fingerprint"
-msgstr "muestra huella dactilar"
+msgstr "muestra huella dactilar de la clave"
 
-#: g10/keyedit.c:1323
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "lista clave e identificadores de usuario"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "selecciona identificador de usuario N"
 
-#: g10/keyedit.c:1326
-#, fuzzy
+#: g10/keyedit.c:1358
 msgid "select subkey N"
-msgstr "selecciona identificador de usuario N"
+msgstr "selecciona subclave N"
 
-#: g10/keyedit.c:1327
-#, fuzzy
+#: g10/keyedit.c:1359
 msgid "check signatures"
-msgstr "revoca firmas"
+msgstr "comprueba firmas"
 
-#: g10/keyedit.c:1330
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
-msgstr ""
+msgstr "firmar IDs seleccionadas [* ver debajo �rdenes relacionadas]"
 
-#: g10/keyedit.c:1335
-#, fuzzy
+#: g10/keyedit.c:1367
 msgid "sign selected user IDs locally"
-msgstr "firma la clave localmente"
+msgstr "firma localmente los IDs de usuarios elegidos"
 
-#: g10/keyedit.c:1337
-#, fuzzy
+#: g10/keyedit.c:1369
 msgid "sign selected user IDs with a trust signature"
-msgstr "lid %lu: identificativo de usuario sin firma\n"
+msgstr "firmar IDs seleccionados con firma de confianza"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
-msgstr ""
+msgstr "firmar IDs seleccionados con firma no revocable"
 
-#: g10/keyedit.c:1343
+#: g10/keyedit.c:1375
 msgid "add a user ID"
-msgstr "a�ade un identificador de usuario"
+msgstr "a�adir un identificador de usuario"
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
-msgstr "a�ade un ID fotogr�fico"
+msgstr "a�adir un ID fotogr�fico"
 
-#: g10/keyedit.c:1347
-#, fuzzy
+#: g10/keyedit.c:1379
 msgid "delete selected user IDs"
-msgstr "borra un identificador de usuario"
+msgstr "borrar identificadores de usuario seleccionados"
 
-#: g10/keyedit.c:1352
-#, fuzzy
+#: g10/keyedit.c:1384
 msgid "add a subkey"
-msgstr "a�acla"
+msgstr "a�adir una subclave"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
-msgstr ""
+msgstr "a�adir clave a tarjeta"
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
-msgstr ""
+msgstr "mover una clave a la tarjeta"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
-msgstr ""
+msgstr "mover una clave de respaldo a la tarjeta"
 
-#: g10/keyedit.c:1364
-#, fuzzy
+#: g10/keyedit.c:1396
 msgid "delete selected subkeys"
-msgstr "borra una clave secundaria"
+msgstr "borrar clave secundaria"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
-msgstr "a�ade una clave de revocaci�n"
+msgstr "a�adir una clave de revocaci�n"
 
-#: g10/keyedit.c:1368
-#, fuzzy
+#: g10/keyedit.c:1400
 msgid "delete signatures from the selected user IDs"
-msgstr ""
-"�Actualizar realmente las preferencias para todos los ID seleccionados? "
+msgstr "borrar firmas de los ID seleccionados"
 
-#: g10/keyedit.c:1370
-#, fuzzy
+#: g10/keyedit.c:1402
 msgid "change the expiration date for the key or selected subkeys"
-msgstr "No puede cambiar la fecha de caducidad de una clave v3\n"
+msgstr "cambiar la fecha de caducidad para la clave o subclaves seleccionadas"
 
-#: g10/keyedit.c:1372
-#, fuzzy
+#: g10/keyedit.c:1404
 msgid "flag the selected user ID as primary"
-msgstr "marca ID de usuario como primario"
+msgstr "marcar ID de usuario seleccionado como primario"
 
-#: g10/keyedit.c:1374
-#, fuzzy
+#: g10/keyedit.c:1406
 msgid "toggle between the secret and public key listings"
-msgstr "cambia entre lista de claves secretas y p�blicas"
+msgstr "cambiar entre lista de claves secretas y p�blicas"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
-msgstr "muestra preferencias (experto)"
+msgstr "mostrar preferencias (experto)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
-msgstr "muestra preferencias (prolijo)"
+msgstr "mostrar preferencias (prolijo)"
 
-#: g10/keyedit.c:1381
-#, fuzzy
+#: g10/keyedit.c:1413
 msgid "set preference list for the selected user IDs"
-msgstr ""
-"�Actualizar realmente las preferencias para todos los ID seleccionados? "
+msgstr "establecer preferencias para todos los ID seleccionados"
 
-#: g10/keyedit.c:1386
-#, fuzzy
+#: g10/keyedit.c:1418
 msgid "set preferred keyserver URL for the selected user IDs"
-msgstr "no se puede interpretar la URI del servidor de claves\n"
+msgstr ""
+"establecer URL del servidor de claves preferido por los IDs seleccionados"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "cambia la frase contrase�a"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "cambia valores de confianza"
 
-#: g10/keyedit.c:1394
-#, fuzzy
+#: g10/keyedit.c:1426
 msgid "revoke signatures on the selected user IDs"
-msgstr "�Revocar realmente todos los identificadores seleccionados? "
+msgstr "revocar firmas de los identificadores seleccionados"
 
-#: g10/keyedit.c:1396
-#, fuzzy
+#: g10/keyedit.c:1428
 msgid "revoke selected user IDs"
-msgstr "revocar un identificador de usuario"
+msgstr "revocar los identificadores seleccionados"
 
-#: g10/keyedit.c:1401
-#, fuzzy
+#: g10/keyedit.c:1433
 msgid "revoke key or selected subkeys"
-msgstr "revoca una clave secundaria"
+msgstr "revoca clave o subclaves seleccionadas"
 
-#: g10/keyedit.c:1402
-#, fuzzy
+#: g10/keyedit.c:1434
 msgid "enable key"
-msgstr "habilita una clave"
+msgstr "habilita clave"
 
-#: g10/keyedit.c:1403
-#, fuzzy
+#: g10/keyedit.c:1435
 msgid "disable key"
-msgstr "deshabilita una clave"
+msgstr "deshabilita clave"
 
-#: g10/keyedit.c:1404
-#, fuzzy
+#: g10/keyedit.c:1436
 msgid "show selected photo IDs"
-msgstr "mostrar ID fotogr�fico"
+msgstr "mostrar fotos de los ID seleccionados"
 
-#: g10/keyedit.c:1476
-#, fuzzy, c-format
+#: g10/keyedit.c:1556
+#, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
-msgstr "error leyendo bloque de clave secreta `%s': %s\n"
+msgstr "error leyendo bloque de clave secreta \"%s\": %s\n"
 
-#: g10/keyedit.c:1494
+#: g10/keyedit.c:1574
 msgid "Secret key is available.\n"
 msgstr "Clave secreta disponible.\n"
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1655
 msgid "Need the secret key to do this.\n"
 msgstr "Se necesita la clave secreta para hacer esto.\n"
 
-#: g10/keyedit.c:1579
+#: g10/keyedit.c:1663
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor use la orden \"cambia\" primero.\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1682
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
 "  a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
+"* La orden `sign' (firmar) puede estar precedida por una 'l' para firmas\n"
+"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:1636
+#: g10/keyedit.c:1722
 msgid "Key is revoked."
 msgstr "La clave est� revocada."
 
-#: g10/keyedit.c:1657
-#, fuzzy
+#: g10/keyedit.c:1741
 msgid "Really sign all user IDs? (y/N) "
-msgstr "�Firmar realmente todos los identificadores de usuario? "
-
-#: g10/keyedit.c:1660
-msgid "Hint: Select the user IDs to sign\n"
-msgstr "Sugerencia: seleccione los identificadores de usuario que firmar\n"
+msgstr "�Firmar realmente todos los IDs de usuario? (s/N) "
 
-#: g10/keyedit.c:1668
-#, fuzzy, c-format
+#: g10/keyedit.c:1748
+#, c-format
 msgid "Unknown signature type `%s'\n"
-msgstr "clase de firma desconocida"
+msgstr "Clase de firma desconocida `%s'\n"
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1771
 #, 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:1713 g10/keyedit.c:1733 g10/keyedit.c:1899
+#: g10/keyedit.c:1793 g10/keyedit.c:1813 g10/keyedit.c:1979
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar por lo menos un identificador de usuario.\n"
 
-#: g10/keyedit.c:1715
+#: g10/keyedit.c:1795
 msgid "You can't delete the last user ID!\n"
 msgstr "�No puede borrar el �ltimo identificador de usuario!\n"
 
-#: g10/keyedit.c:1717
-#, fuzzy
+#: g10/keyedit.c:1797
 msgid "Really remove all selected user IDs? (y/N) "
-msgstr "�Borrar realmente todos los identificadores seleccionados? "
+msgstr "�Borrar realmente todos los identificadores seleccionados? (s/N) "
 
-#: g10/keyedit.c:1718
-#, fuzzy
+#: g10/keyedit.c:1798
 msgid "Really remove this user ID? (y/N) "
-msgstr "�Borrar realmente este identificador de usuario? "
+msgstr "�Borrar realmente este identificador de usuario? (s/N) "
 
-#: g10/keyedit.c:1768
-#, fuzzy
+#: g10/keyedit.c:1848
 msgid "Really move the primary key? (y/N) "
-msgstr "�Borrar realmente este identificador de usuario? "
+msgstr "�Borrar realmente la clave primaria? (s/N)"
 
-#: g10/keyedit.c:1780
-#, fuzzy
+#: g10/keyedit.c:1860
 msgid "You must select exactly one key.\n"
-msgstr "Debe seleccionar por lo menos una clave.\n"
+msgstr "Debe seleccionar exactamente una clave.\n"
 
-#: g10/keyedit.c:1808
+#: g10/keyedit.c:1888
 msgid "Command expects a filename argument\n"
-msgstr ""
+msgstr "La orden espera un nombre de fichero como argumento\n"
 
-#: g10/keyedit.c:1822
-#, fuzzy, c-format
+#: g10/keyedit.c:1902
+#, c-format
 msgid "Can't open `%s': %s\n"
-msgstr "no se puede abrir `%s': %s\n"
+msgstr "No se puede abrir `%s': %s\n"
 
-#: g10/keyedit.c:1839
-#, fuzzy, c-format
+#: g10/keyedit.c:1919
+#, c-format
 msgid "Error reading backup key from `%s': %s\n"
-msgstr "error escribiendo anillo `%s': %s\n"
+msgstr "Error leyendo clave de respaldo desde `%s': %s\n"
 
-#: g10/keyedit.c:1863
+#: g10/keyedit.c:1943
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar por lo menos una clave.\n"
 
-#: g10/keyedit.c:1866
-#, fuzzy
+#: g10/keyedit.c:1946
 msgid "Do you really want to delete the selected keys? (y/N) "
-msgstr "�De verdad quiere borrar las claves seleccionadas? "
+msgstr "�De verdad quiere borrar las claves seleccionadas? (s/N) "
 
-#: g10/keyedit.c:1867
-#, fuzzy
+#: g10/keyedit.c:1947
 msgid "Do you really want to delete this key? (y/N) "
-msgstr "�De verdad quiere borrar esta clave? "
+msgstr "�De verdad quiere borrar esta clave? (s/N) "
 
-#: g10/keyedit.c:1902
-#, fuzzy
+#: g10/keyedit.c:1982
 msgid "Really revoke all selected user IDs? (y/N) "
-msgstr "�Revocar realmente todos los identificadores seleccionados? "
+msgstr "�Revocar realmente todos los identificadores seleccionados? (s/N) "
 
-#: g10/keyedit.c:1903
-#, fuzzy
+#: g10/keyedit.c:1983
 msgid "Really revoke this user ID? (y/N) "
-msgstr "�Revocar realmente este identificador de usuario? "
+msgstr "�Revocar realmente este identificador de usuario? (s/N) "
 
-#: g10/keyedit.c:1921
-#, fuzzy
+#: g10/keyedit.c:2001
 msgid "Do you really want to revoke the entire key? (y/N) "
-msgstr "�De verdad quiere revocar esta clave? "
+msgstr "�De verdad quiere revocar la clave completa? (s/N) "
 
-#: g10/keyedit.c:1932
-#, fuzzy
+#: g10/keyedit.c:2012
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
-msgstr "�De verdad quiere revocar las claves seleccionadas? "
+msgstr "�De verdad quiere revocar las subclaves seleccionadas? (s/N)"
 
-#: g10/keyedit.c:1934
-#, fuzzy
+#: g10/keyedit.c:2014
 msgid "Do you really want to revoke this subkey? (y/N) "
-msgstr "�De verdad quiere revocar esta clave? "
+msgstr "�De verdad quiere revocar esta subclave? (s/N) "
 
-#: g10/keyedit.c:1975
+#: g10/keyedit.c:2055
 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:2007
-#, fuzzy
+#: g10/keyedit.c:2087
 msgid "Set preference list to:\n"
-msgstr "establece preferencias"
+msgstr "Establecer lista de preferencias a:\n"
 
-#: g10/keyedit.c:2013
-#, fuzzy
+#: g10/keyedit.c:2093
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
-"�Actualizar realmente las preferencias para todos los ID seleccionados? "
+"�Actualizar realmente las preferencias para los ID seleccionados? (s/N) "
 
-#: g10/keyedit.c:2015
-#, fuzzy
+#: g10/keyedit.c:2095
 msgid "Really update the preferences? (y/N) "
-msgstr "�Actualizar realmente las preferencias? "
+msgstr "�Actualizar realmente las preferencias? (s/N) "
 
-#: g10/keyedit.c:2065
-#, fuzzy
+#: g10/keyedit.c:2157
+#, fuzzy, c-format
+msgid "Unable to clean `%s'\n"
+msgstr "no se puede ejecutar el programa `%s': %s\n"
+
+#: g10/keyedit.c:2160
+msgid "Please specify item to clean: `sigs', `uids', or `all'\n"
+msgstr ""
+
+#: g10/keyedit.c:2171
 msgid "Save changes? (y/N) "
-msgstr "�Grabar cambios? "
+msgstr "�Grabar cambios? (s/N) "
 
-#: g10/keyedit.c:2068
-#, fuzzy
+#: g10/keyedit.c:2174
 msgid "Quit without saving? (y/N) "
-msgstr "�Salir sin grabar? "
+msgstr "�Salir sin grabar? (s/N) "
 
-#: g10/keyedit.c:2078
+#: g10/keyedit.c:2184
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualizaci�n fallida: %s\n"
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2191
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualizaci�n de la clave secreta fallida: %s\n"
 
-#: g10/keyedit.c:2092
+#: g10/keyedit.c:2198
 msgid "Key not changed so no update needed.\n"
 msgstr "Clave sin cambios, no se necesita actualizaci�n.\n"
 
-#: g10/keyedit.c:2164
+#: g10/keyedit.c:2271
 msgid "Digest: "
 msgstr "Resumen: "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2323
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:2227
+#: g10/keyedit.c:2334
 msgid "Keyserver no-modify"
-msgstr ""
+msgstr "Sevidor de claves no-modificar"
 
-#: g10/keyedit.c:2242 g10/keylist.c:307
+#: g10/keyedit.c:2349 g10/keylist.c:308
 msgid "Preferred keyserver: "
-msgstr ""
+msgstr "Servidor de claves preferido: "
 
-#: g10/keyedit.c:2473
-#, fuzzy, c-format
+#: g10/keyedit.c:2580
+#, c-format
 msgid "This key was revoked on %s by %s key %s\n"
-msgstr "Esta clave puede ser revocada por la clave %s"
+msgstr "Esta clave fue revocada en %s por %s clave %s\n"
 
-#: g10/keyedit.c:2494
-#, fuzzy, c-format
+#: g10/keyedit.c:2601
+#, c-format
 msgid "This key may be revoked by %s key %s"
-msgstr "Esta clave puede ser revocada por la clave %s"
+msgstr "Esta clave puede ser revocada por %s clave %s"
 
-#: g10/keyedit.c:2500
-#, fuzzy
+#: g10/keyedit.c:2607
 msgid "(sensitive)"
-msgstr " (confidencial)"
+msgstr "(confidencial)"
 
-#: g10/keyedit.c:2516 g10/keyedit.c:2572 g10/keyedit.c:2684 g10/keyedit.c:2699
-#: g10/keylist.c:193 g10/keyserver.c:422
-#, fuzzy, c-format
+#: g10/keyedit.c:2623 g10/keyedit.c:2679 g10/keyedit.c:2792 g10/keyedit.c:2807
+#: g10/keylist.c:194 g10/keyserver.c:421
+#, c-format
 msgid "created: %s"
-msgstr "no se puede crear %s: %s\n"
+msgstr "creado: %s"
 
-#: g10/keyedit.c:2519 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:931
-#, fuzzy, c-format
+#: g10/keyedit.c:2626 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:948
+#, c-format
 msgid "revoked: %s"
-msgstr "[revocada]"
+msgstr "revocada: %s"
 
-#: g10/keyedit.c:2521 g10/keylist.c:757 g10/keylist.c:886
-#, fuzzy, c-format
+#: g10/keyedit.c:2628 g10/keylist.c:758 g10/keylist.c:887
+#, c-format
 msgid "expired: %s"
-msgstr " [caduca: %s]"
+msgstr "caduc�: %s"
 
-#: g10/keyedit.c:2523 g10/keyedit.c:2574 g10/keyedit.c:2686 g10/keyedit.c:2701
-#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
-#: g10/keylist.c:913 g10/keyserver.c:428 g10/mainproc.c:937
-#, fuzzy, c-format
+#: g10/keyedit.c:2630 g10/keyedit.c:2681 g10/keyedit.c:2794 g10/keyedit.c:2809
+#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
+#: g10/keylist.c:914 g10/keyserver.c:427 g10/mainproc.c:954
+#, c-format
 msgid "expires: %s"
-msgstr " [caduca: %s]"
+msgstr "caduca: %s"
 
-#: g10/keyedit.c:2525
-#, fuzzy, c-format
+#: g10/keyedit.c:2632
+#, c-format
 msgid "usage: %s"
-msgstr " confianza: %c/%c"
+msgstr "uso: %s"
 
-#: g10/keyedit.c:2540
-#, fuzzy, c-format
+#: g10/keyedit.c:2647
+#, c-format
 msgid "trust: %s"
-msgstr " confianza: %c/%c"
+msgstr "confianza: %s"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2651
 #, c-format
 msgid "validity: %s"
-msgstr ""
+msgstr "validez: %s"
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2658
 msgid "This key has been disabled"
 msgstr "Esta clave est� deshabilitada"
 
-#: g10/keyedit.c:2579 g10/keylist.c:199
+#: g10/keyedit.c:2686 g10/keylist.c:200
 msgid "card-no: "
-msgstr ""
+msgstr "num. tarjeta: "
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2754
 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:2654
+#: g10/keyedit.c:2762
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3252,19 +3213,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:2718 g10/keyserver.c:432 g10/mainproc.c:1577
-#: g10/trustdb.c:1178
-#, fuzzy
+#: g10/keyedit.c:2826 g10/keyedit.c:3201 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1690
 msgid "revoked"
-msgstr "[revocada]"
+msgstr "revocada"
 
-#: g10/keyedit.c:2720 g10/keyserver.c:436 g10/mainproc.c:1579
-#: g10/trustdb.c:531
-#, fuzzy
+#: g10/keyedit.c:2828 g10/keyedit.c:3203 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1692
 msgid "expired"
-msgstr "expira"
+msgstr "caducada"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2893
 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"
@@ -3272,7 +3231,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:2845
+#: g10/keyedit.c:2953
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3281,45 +3240,75 @@ msgstr ""
 "AVISO: esta es una clave de tipo PGP2. A�adir un ID fotogr�fico puede\n"
 "hacer que algunas versiones de PGP rechacen esta clave.\n"
 
-#: g10/keyedit.c:2850 g10/keyedit.c:3128
+#: g10/keyedit.c:2958 g10/keyedit.c:3307
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�Est� seguro de querer a�adirla? (s/N) "
 
-#: g10/keyedit.c:2856
+#: g10/keyedit.c:2964
 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:2996
+#: g10/keyedit.c:3104
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�Borrar esta firma correcta? (s/N/q)"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3114
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�Borrar esta firma inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:3010
+#: g10/keyedit.c:3118
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�Borrar esta firma desconocida? (s/N/q)"
 
-#: g10/keyedit.c:3016
+#: g10/keyedit.c:3124
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�Borrar realmente esta autofirma? (s/N)"
 
-#: g10/keyedit.c:3030
+#: g10/keyedit.c:3138
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d firmas borradas.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3139
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d firmas borradas\n"
 
-#: g10/keyedit.c:3034
+#: g10/keyedit.c:3142
 msgid "Nothing deleted.\n"
 msgstr "No se borr� nada\n"
 
-#: g10/keyedit.c:3123
+#: g10/keyedit.c:3167
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed.\n"
+msgstr "ID de usuario \"%s\" revocado."
+
+#: g10/keyedit.c:3168
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed.\n"
+msgstr "ID de usuario \"%s\" revocado."
+
+#: g10/keyedit.c:3173
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean.\n"
+msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
+
+#: g10/keyedit.c:3205 g10/trustdb.c:1694
+#, fuzzy
+msgid "invalid"
+msgstr "Armadura no v�lida"
+
+#: g10/keyedit.c:3207
+#, fuzzy, c-format
+msgid "User ID \"%s\" removed: %s\n"
+msgstr "ID de usuario \"%s\" revocado."
+
+#: g10/keyedit.c:3214
+#, fuzzy
+msgid "No user IDs are removable.\n"
+msgstr "No hay clave secreta para tal usuario\n"
+
+#: g10/keyedit.c:3302
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3328,344 +3317,334 @@ 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:3134
+#: g10/keyedit.c:3313
 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:3154
+#: g10/keyedit.c:3333
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduzca el ID de usuario del revocador designado: "
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3356
 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:3192
+#: g10/keyedit.c:3371
 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:3214
-#, fuzzy
+#: g10/keyedit.c:3393
 msgid "this key has already been designated as a revoker\n"
-msgstr ""
-"ATENCI�N: �Esta clave ha sido revocada por la persona designada\n"
-"como revocador!\n"
+msgstr "esta clave ya ha sido designada como revocadora\n"
 
-#: g10/keyedit.c:3233
+#: g10/keyedit.c:3412
 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:3239
-#, fuzzy
+#: g10/keyedit.c:3418
 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): "
+"�Est� seguro de querer elegir esta clave como revocador designado? (s/N) "
 
-#: g10/keyedit.c:3300
+#: g10/keyedit.c:3479
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite las selecciones de las claves secretas.\n"
 
-#: g10/keyedit.c:3306
-#, fuzzy
+#: g10/keyedit.c:3485
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor, seleccione como m�ximo una clave secundaria.\n"
 
-#: g10/keyedit.c:3310
-#, fuzzy
+#: g10/keyedit.c:3489
 msgid "Changing expiration time for a subkey.\n"
-msgstr "Cambiando caducidad de clave secundaria.\n"
+msgstr "Cambiando fecha de caducidad de subclave.\n"
 
-#: g10/keyedit.c:3313
+#: g10/keyedit.c:3492
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando caducidad de clave primaria.\n"
 
-#: g10/keyedit.c:3359
+#: g10/keyedit.c:3538
 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:3375
+#: g10/keyedit.c:3554
 msgid "No corresponding signature in secret ring\n"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/keyedit.c:3455
+#: g10/keyedit.c:3634
 msgid "Please select exactly one user ID.\n"
 msgstr "Por favor seleccione exactamente un identificador de usuario.\n"
 
-#: g10/keyedit.c:3494 g10/keyedit.c:3604 g10/keyedit.c:3724
-#, fuzzy, c-format
+#: g10/keyedit.c:3673 g10/keyedit.c:3783 g10/keyedit.c:3903
+#, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "omitiendo autofirma V3 para el id \"%s\"\n"
 
-#: g10/keyedit.c:3665
+#: g10/keyedit.c:3844
 msgid "Enter your preferred keyserver URL: "
-msgstr ""
+msgstr "Introduzca la URL de su servidor de claves preferido: "
 
-#: g10/keyedit.c:3745
-#, fuzzy
+#: g10/keyedit.c:3924
 msgid "Are you sure you want to replace it? (y/N) "
-msgstr "�Seguro que quiere usarlo? (s/N) "
+msgstr "�Seguro que quiere reemplazarlo? (s/N) "
 
-#: g10/keyedit.c:3746
-#, fuzzy
+#: g10/keyedit.c:3925
 msgid "Are you sure you want to delete it? (y/N) "
-msgstr "�Seguro que quiere usarlo? (s/N) "
+msgstr "�Seguro que quiere borrarlo? (s/N) "
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3987
 #, 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:3854
+#: g10/keyedit.c:4045
 #, fuzzy, c-format
-msgid "No subkey with index %d\n"
+msgid "No user ID with hash %s\n"
 msgstr "No hay ning�n identificador de usuario con el �ndice %d\n"
 
-#: g10/keyedit.c:3971
-#, fuzzy, c-format
+#: g10/keyedit.c:4072
+#, c-format
+msgid "No subkey with index %d\n"
+msgstr "No existe una subclave con �ndice %d\n"
+
+#: g10/keyedit.c:4189
+#, c-format
 msgid "user ID: \"%s\"\n"
-msgstr "ID de usuario: \""
+msgstr "ID de usuario: \"%s\"\n"
 
-#: g10/keyedit.c:3974 g10/keyedit.c:4038 g10/keyedit.c:4081
-#, fuzzy, c-format
+#: g10/keyedit.c:4192 g10/keyedit.c:4256 g10/keyedit.c:4299
+#, c-format
 msgid "signed by your key %s on %s%s%s\n"
-msgstr "   firmada por %08lX el %s%s%s\n"
+msgstr "firmada con su clave %s el %s%s%s\n"
 
-#: g10/keyedit.c:3976 g10/keyedit.c:4040 g10/keyedit.c:4083
+#: g10/keyedit.c:4194 g10/keyedit.c:4258 g10/keyedit.c:4301
 msgid " (non-exportable)"
 msgstr " (no exportable)"
 
-#: g10/keyedit.c:3980
+#: g10/keyedit.c:4198
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta firma caduc� el %s.\n"
 
-#: g10/keyedit.c:3984
+#: g10/keyedit.c:4202
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�De verdad quiere revocarla? (s/N) "
 
-#: g10/keyedit.c:3988
+#: g10/keyedit.c:4206
 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:4015
-#, fuzzy, c-format
+#: g10/keyedit.c:4233
+#, c-format
 msgid "You have signed these user IDs on key %s:\n"
-msgstr "Ha firmado los siguientes IDs de usuario:\n"
+msgstr "Ha firmado estos IDs de usuario con la clave %s:\n"
 
-#: g10/keyedit.c:4041
-#, fuzzy
+#: g10/keyedit.c:4259
 msgid " (non-revocable)"
-msgstr " (no exportable)"
+msgstr " (no revocable)"
 
-#: g10/keyedit.c:4048
-#, fuzzy, c-format
+#: g10/keyedit.c:4266
+#, c-format
 msgid "revoked by your key %s on %s\n"
-msgstr "   revocada por %08lX el %s\n"
+msgstr "revocada por la clave %s el %s\n"
 
-#: g10/keyedit.c:4070
+#: g10/keyedit.c:4288
 msgid "You are about to revoke these signatures:\n"
 msgstr "Va a revocar las siguientes firmas:\n"
 
-#: g10/keyedit.c:4090
+#: g10/keyedit.c:4308
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�Crear los certificados de revocaci�n realmente? (s/N) "
 
-#: g10/keyedit.c:4120
+#: g10/keyedit.c:4338
 msgid "no secret key\n"
 msgstr "no hay clave secreta\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4408
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4425
 #, 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:4271
-#, fuzzy, c-format
+#: g10/keyedit.c:4489
+#, c-format
 msgid "Key %s is already revoked.\n"
-msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
+msgstr "La clave %s ya ha sido revocada.\n"
 
-#: g10/keyedit.c:4333
-#, fuzzy, c-format
+#: g10/keyedit.c:4551
+#, c-format
 msgid "Subkey %s is already revoked.\n"
-msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
+msgstr "La subclave %s ya ha sido revocada.\n"
 
-#: g10/keyedit.c:4428
-#, fuzzy, c-format
+#: g10/keyedit.c:4646
+#, 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 0x%08lX (uid %d)\n"
+msgstr "Mostrando ID fotogr�fico %s de tama�o %ld para la clave %s (uid %d)\n"
 
-#: g10/keygen.c:293
-#, fuzzy, c-format
+#: g10/keygen.c:258
+#, c-format
 msgid "preference `%s' duplicated\n"
-msgstr "preferencia %c%lu duplicada\n"
+msgstr "preferencia `%s' duplicada\n"
 
-#: g10/keygen.c:300
-#, fuzzy
+#: g10/keygen.c:265
 msgid "too many cipher preferences\n"
-msgstr "demasiadas `%c' preferencias\n"
+msgstr "demasiadas preferencias de cifrado\n"
 
-#: g10/keygen.c:302
-#, fuzzy
+#: g10/keygen.c:267
 msgid "too many digest preferences\n"
-msgstr "demasiadas `%c' preferencias\n"
+msgstr "demasiadas preferencias de resumen\n"
 
-#: g10/keygen.c:304
-#, fuzzy
+#: g10/keygen.c:269
 msgid "too many compression preferences\n"
-msgstr "demasiadas `%c' preferencias\n"
+msgstr "demasiadas preferencias de compresi�n\n"
 
-#: g10/keygen.c:401
-#, fuzzy, c-format
+#: g10/keygen.c:394
+#, c-format
 msgid "invalid item `%s' in preference string\n"
-msgstr "caracter inv�lido en cadena de preferencias\n"
+msgstr "caracter inv�lido `%s' en cadena de preferencias\n"
 
-#: g10/keygen.c:829
+#: g10/keygen.c:822
 msgid "writing direct signature\n"
 msgstr "escribiendo firma directa\n"
 
-#: g10/keygen.c:868
+#: g10/keygen.c:861
 msgid "writing self signature\n"
 msgstr "escribiendo autofirma\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing key binding signature\n"
 msgstr "escribiendo la firma de comprobaci�n de clave\n"
 
-#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2632
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tama�o de clave incorrecto; se usar�n %u bits\n"
 
-#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2638
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tama�o de clave redondeado a %u bits\n"
 
-#: g10/keygen.c:1249
-#, fuzzy
+#: g10/keygen.c:1239
 msgid "Sign"
-msgstr "firma"
+msgstr "Firma"
 
-#: g10/keygen.c:1252
-#, fuzzy
+#: g10/keygen.c:1242
 msgid "Encrypt"
-msgstr "cifra datos"
+msgstr "Cifrado"
 
-#: g10/keygen.c:1255
+#: g10/keygen.c:1245
 msgid "Authenticate"
-msgstr ""
+msgstr "Autentificaci�n"
 
-#: g10/keygen.c:1263
+#: g10/keygen.c:1253
 msgid "SsEeAaQq"
-msgstr ""
+msgstr "FfCcAaSs"
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1268
 #, c-format
 msgid "Possible actions for a %s key: "
-msgstr ""
+msgstr "Posibles accriones para una %s clave: "
 
-#: g10/keygen.c:1282
+#: g10/keygen.c:1272
 msgid "Current allowed actions: "
-msgstr ""
+msgstr "Acciones permitidas actualmente: "
 
-#: g10/keygen.c:1287
+#: g10/keygen.c:1277
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
-msgstr ""
+msgstr "   (%c) Conmutar la capacidad de firmar\n"
 
-#: g10/keygen.c:1290
-#, fuzzy, c-format
+#: g10/keygen.c:1280
+#, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
-msgstr "   (%d) ElGamal (s�lo cifrar)\n"
+msgstr "   (%c) Conmutar la capacidad de cifrado\n"
 
-#: g10/keygen.c:1293
+#: g10/keygen.c:1283
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
-msgstr ""
+msgstr "   (%c) Conmutar la capacidad de autentificaci�n\n"
 
-#: g10/keygen.c:1296
+#: g10/keygen.c:1286
 #, c-format
 msgid "   (%c) Finished\n"
-msgstr ""
+msgstr "   (%c) Acabado\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1340
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor seleccione tipo de clave deseado:\n"
 
-#: g10/keygen.c:1352
-#, fuzzy, c-format
+#: g10/keygen.c:1342
+#, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA y ElGamal (por defecto)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1343
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (s�lo firmar)\n"
 
-#: g10/keygen.c:1355
-#, fuzzy, c-format
+#: g10/keygen.c:1345
+#, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) RSA (s�lo cifrar)\n"
+msgstr "   (%d) DSA (permite elegir capacidades)\n"
 
-#: g10/keygen.c:1357
-#, fuzzy, c-format
+#: g10/keygen.c:1347
+#, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (s�lo cifrar)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1348
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (s�lo firmar)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1350
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (s�lo cifrar)\n"
 
-#: g10/keygen.c:1362
-#, fuzzy, c-format
+#: g10/keygen.c:1352
+#, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
-msgstr "   (%d) RSA (s�lo cifrar)\n"
+msgstr "   (%d) RSA (permite elegir capacidades)\n"
 
-#: g10/keygen.c:1431 g10/keygen.c:2509
-#, fuzzy, c-format
+#: g10/keygen.c:1421 g10/keygen.c:2506
+#, c-format
 msgid "DSA keypair will have %u bits.\n"
-msgstr "El par de claves DSA tendr� 1024 bits.\n"
+msgstr "El par de claves DSA tendr� %u bits.\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1431
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
-msgstr ""
+msgstr "las claves %s pueden tener entre %u y %u bits de longitud.\n"
 
-#: g10/keygen.c:1448
-#, fuzzy, c-format
+#: g10/keygen.c:1438
+#, c-format
 msgid "What keysize do you want? (%u) "
-msgstr "�De qu� tama�o quiere la clave (1024)? "
+msgstr "�De qu� tama�o quiere la clave? (%u) "
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1452
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
-msgstr ""
+msgstr "los tama�os de claves %s deben estar en el rango %u-%u\n"
 
-#: g10/keygen.c:1468
+#: g10/keygen.c:1458
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "El tama�o requerido es de %u bits\n"
 
-#: g10/keygen.c:1473 g10/keygen.c:1478
+#: g10/keygen.c:1463 g10/keygen.c:1468
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeados a %u bits\n"
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1515
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3681,7 +3660,7 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n a�os\n"
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1526
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3697,39 +3676,38 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n a�os\n"
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1549
 msgid "Key is valid for? (0) "
 msgstr "�Validez de la clave (0)? "
 
-#: g10/keygen.c:1563
-msgid "Signature is valid for? (0) "
+#: g10/keygen.c:1554
+#, fuzzy, c-format
+msgid "Signature is valid for? (%s) "
 msgstr "Clave v�lida �durante (0)? "
 
-#: g10/keygen.c:1568
+#: g10/keygen.c:1572
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:1575
-#, fuzzy
+#: g10/keygen.c:1579
 msgid "Key does not expire at all\n"
-msgstr "%s nunca caduca\n"
+msgstr "La clave nunca caduca\n"
 
-#: g10/keygen.c:1576
-#, fuzzy
+#: g10/keygen.c:1580
 msgid "Signature does not expire at all\n"
-msgstr "%s nunca caduca\n"
+msgstr "La firma nunca caduca\n"
 
-#: g10/keygen.c:1583
-#, fuzzy, c-format
+#: g10/keygen.c:1585
+#, c-format
 msgid "Key expires at %s\n"
-msgstr "%s caduca el %s\n"
+msgstr "La clave caduca %s\n"
 
-#: g10/keygen.c:1584
-#, fuzzy, c-format
+#: g10/keygen.c:1586
+#, c-format
 msgid "Signature expires at %s\n"
 msgstr "La firma caduca el %s\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1592
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3737,13 +3715,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:1595
-#, fuzzy
+#: g10/keygen.c:1597
 msgid "Is this correct? (y/N) "
-msgstr "�Es correcto (s/n)? "
+msgstr "�Es correcto? (s/n) "
 
-#: g10/keygen.c:1638
-#, fuzzy
+#: g10/keygen.c:1641
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3759,44 +3735,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1651
+#: g10/keygen.c:1654
 msgid "Real name: "
 msgstr "Nombre y apellidos: "
 
-#: g10/keygen.c:1659
+#: g10/keygen.c:1662
 msgid "Invalid character in name\n"
 msgstr "Caracter inv�lido en el nombre\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1664
 msgid "Name may not start with a digit\n"
 msgstr "El nombre no puede empezar con un n�mero\n"
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1666
 msgid "Name must be at least 5 characters long\n"
 msgstr "El nombre debe tener al menos 5 caracteres\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1674
 msgid "Email address: "
 msgstr "Direcci�n de correo electr�nico: "
 
-#: g10/keygen.c:1682
+#: g10/keygen.c:1685
 msgid "Not a valid email address\n"
 msgstr "Direcci�n inv�lida\n"
 
-#: g10/keygen.c:1690
+#: g10/keygen.c:1693
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:1696
+#: g10/keygen.c:1699
 msgid "Invalid character in comment\n"
 msgstr "Caracter inv�lido en el comentario\n"
 
-#: g10/keygen.c:1719
+#: g10/keygen.c:1722
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Est� usando el juego de caracteres `%s'.\n"
 
-#: g10/keygen.c:1725
+#: g10/keygen.c:1728
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3807,7 +3783,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1733
 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 "
@@ -3824,23 +3800,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1746
+#: g10/keygen.c:1749
 msgid "NnCcEeOoQq"
 msgstr "NnCcDdVvSs"
 
-#: g10/keygen.c:1756
+#: g10/keygen.c:1759
 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:1757
+#: g10/keygen.c:1760
 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:1776
+#: g10/keygen.c:1779
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primero el error.\n"
 
-#: g10/keygen.c:1816
+#: g10/keygen.c:1819
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3848,12 +3824,12 @@ msgstr ""
 "Necesita una frase contrase�a para proteger su clave secreta.\n"
 "\n"
 
-#: g10/keygen.c:1826 g10/passphrase.c:1105
+#: g10/keygen.c:1829 g10/passphrase.c:786
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1832
+#: g10/keygen.c:1835
 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"
@@ -3865,7 +3841,7 @@ msgstr ""
 "la opci�n \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1857
 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"
@@ -3878,64 +3854,63 @@ msgstr ""
 "generador de n�meros aleatorios mayor oportunidad de recoger suficiente\n"
 "entrop�a.\n"
 
-#: g10/keygen.c:2578
+#: g10/keygen.c:2575
 msgid "Key generation canceled.\n"
 msgstr "Creaci�n de claves cancelada.\n"
 
-#: g10/keygen.c:2766 g10/keygen.c:2910
+#: g10/keygen.c:2774 g10/keygen.c:2918
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escribiendo clave p�blica en `%s'\n"
 
-#: g10/keygen.c:2768 g10/keygen.c:2913
-#, fuzzy, c-format
+#: g10/keygen.c:2776 g10/keygen.c:2921
+#, c-format
 msgid "writing secret key stub to `%s'\n"
-msgstr "escribiendo clave privada en `%s'\n"
+msgstr "escribiendo apuntador de la clave privada en `%s'\n"
 
-#: g10/keygen.c:2771 g10/keygen.c:2916
+#: g10/keygen.c:2779 g10/keygen.c:2924
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escribiendo clave privada en `%s'\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2907
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "anillo p�blico de claves no escribible encontrado: %s\n"
 
-#: g10/keygen.c:2905
+#: g10/keygen.c:2913
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "anillo privado de claves no escribible encontrado: %s\n"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2931
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "error escribiendo anillo p�blico `%s': %s\n"
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2938
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "error escribiendo anillo privado `%s': %s\n"
 
-#: g10/keygen.c:2953
+#: g10/keygen.c:2961
 msgid "public and secret key created and signed.\n"
 msgstr "claves p�blica y secreta creadas y firmadas.\n"
 
-#: g10/keygen.c:2964
-#, fuzzy
+#: g10/keygen.c:2972
 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 ""
-"Tenga en cuenta que esta clave no puede ser usada para cifrado. Puede usar\n"
-"la orden \"--edit-key\" para crear una clave secundaria con este prop�sito.\n"
+"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:2976 g10/keygen.c:3105 g10/keygen.c:3220
+#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Creaci�n de la clave fallida: %s\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3156 g10/sign.c:290
+#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -3943,7 +3918,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:3030 g10/keygen.c:3158 g10/sign.c:292
+#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -3951,370 +3926,348 @@ msgstr ""
 "clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:3039 g10/keygen.c:3169
+#: g10/keygen.c:3047 g10/keygen.c:3177
 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:3078 g10/keygen.c:3202
-#, fuzzy
+#: g10/keygen.c:3086 g10/keygen.c:3210
 msgid "Really create? (y/N) "
-msgstr "�Crear de verdad? "
+msgstr "�Crear de verdad? (s/N) "
 
-#: g10/keygen.c:3355
-#, fuzzy, c-format
+#: g10/keygen.c:3363
+#, c-format
 msgid "storing key onto card failed: %s\n"
-msgstr "borrado de bloque de anillo de claves fallido: %s\n"
-
-#: g10/keygen.c:3402
-#, fuzzy, c-format
-msgid "can't create backup file `%s': %s\n"
-msgstr "no se puede crear %s: %s\n"
+msgstr "almacenado de clave en la tarjeta fallido: %s\n"
 
-#: g10/keygen.c:3428
-#, fuzzy, c-format
-msgid "NOTE: backup of card key saved to `%s'\n"
-msgstr "NOTA: clave secreta %08lX caducada el %s\n"
-
-#: g10/keygen.c:3508
+#: g10/keygen.c:3410
 #, c-format
-msgid "length of RSA modulus is not %d\n"
-msgstr ""
-
-#: g10/keygen.c:3514
-msgid "public exponent too large (more than 32 bits)\n"
-msgstr ""
+msgid "can't create backup file `%s': %s\n"
+msgstr "no se puede crear fichero de respaldo `%s': %s\n"
 
-#: g10/keygen.c:3520 g10/keygen.c:3526
+#: g10/keygen.c:3436
 #, c-format
-msgid "length of an RSA prime is not %d\n"
-msgstr ""
+msgid "NOTE: backup of card key saved to `%s'\n"
+msgstr "NOTA: copia de seguridad de la clave guardada en `%s'\n"
 
-#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
+#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
 msgid "never     "
 msgstr "nunca     "
 
-#: g10/keylist.c:264
+#: g10/keylist.c:265
 msgid "Critical signature policy: "
 msgstr "Pol�tica de firmas cr�ticas: "
 
-#: g10/keylist.c:266
+#: g10/keylist.c:267
 msgid "Signature policy: "
 msgstr "Pol�tica de firmas: "
 
-#: g10/keylist.c:305
+#: g10/keylist.c:306
 msgid "Critical preferred keyserver: "
-msgstr ""
+msgstr "Servidor de claves cr�tico preferido: "
 
-#: g10/keylist.c:354 g10/keylist.c:398
+#: 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:372
+#: g10/keylist.c:373
 msgid "Critical signature notation: "
 msgstr "Notaci�n de firmas cr�ticas: "
 
-#: g10/keylist.c:374
+#: g10/keylist.c:375
 msgid "Signature notation: "
 msgstr "Notaci�n de firma: "
 
-#: g10/keylist.c:385
+#: g10/keylist.c:386
 msgid "not human readable"
 msgstr "ilegible"
 
-#: g10/keylist.c:486
+#: g10/keylist.c:487
 msgid "Keyring"
 msgstr "Anillo de claves"
 
-#: g10/keylist.c:792
-#, fuzzy, c-format
+#: g10/keylist.c:793
+#, c-format
 msgid "expired: %s)"
-msgstr " [caduca: %s]"
+msgstr "caduc�: %s)"
 
-#: g10/keylist.c:1488
+#: g10/keylist.c:1489
 msgid "Primary key fingerprint:"
 msgstr "Huellas dactilares de la clave primaria:"
 
-#: g10/keylist.c:1490
+#: g10/keylist.c:1491
 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:1497
+#: g10/keylist.c:1498
 msgid " Primary key fingerprint:"
 msgstr " Huella de clave primaria:"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1500
 msgid "      Subkey fingerprint:"
 msgstr "      Huella de subclave:"
 
-#: g10/keylist.c:1503 g10/keylist.c:1507
-#, fuzzy
+#: g10/keylist.c:1504 g10/keylist.c:1508
 msgid "      Key fingerprint ="
-msgstr "    Huella de clave ="
+msgstr "      Huella de clave ="
 
-#: g10/keylist.c:1574
+#: g10/keylist.c:1575
 msgid "      Card serial no. ="
-msgstr ""
+msgstr "      N�mero de serie de la tarjeta ="
 
-#: g10/keyring.c:1245
-#, fuzzy, c-format
+#: g10/keyring.c:1246
+#, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
-msgstr "creaci�n de armadura fallida: %s\n"
+msgstr "renombrando `%s' en `%s' fallo: %s\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1252
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ATENCI�N: existen 2 ficheros con informaci�n confidencial.\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s es el que no se ha modificado\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1255
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s es el nuevo\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1256
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor arregle este posible fallo de seguridad\n"
 
-#: g10/keyring.c:1375
-#, fuzzy, c-format
+#: g10/keyring.c:1376
+#, c-format
 msgid "caching keyring `%s'\n"
-msgstr "comprobando anillo `%s'\n"
+msgstr "memorizando anillo `%s'\n"
 
-#: g10/keyring.c:1421
-#, fuzzy, c-format
+#: g10/keyring.c:1422
+#, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
-msgstr "%lu claves comprobadas (%lu firmas)\n"
+msgstr "%lu claves memorizadas hasta ahora (%lu firmas)\n"
 
-#: g10/keyring.c:1433
-#, fuzzy, c-format
+#: g10/keyring.c:1434
+#, c-format
 msgid "%lu keys cached (%lu signatures)\n"
-msgstr "%lu claves comprobadas (%lu firmas)\n"
+msgstr "%lu claves memorizadas (%lu firmas)\n"
 
-#: g10/keyring.c:1504
+#: g10/keyring.c:1505
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: anillo creado\n"
 
-#: g10/keyserver.c:107
-#, fuzzy, c-format
+#: g10/keyserver.c:105
+#, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
-msgstr "AVISO: las opciones en `%s' no est�n a�n activas en esta ejecuci�n\n"
+msgstr ""
+"AVISO: las opciones de servidor de claves `%s' no se usan en esta "
+"plataforma\n"
 
-#: g10/keyserver.c:434
-#, fuzzy
+#: g10/keyserver.c:433
 msgid "disabled"
-msgstr "descla"
+msgstr "deshabilitado"
 
-#: g10/keyserver.c:635
+#: g10/keyserver.c:634
 msgid "Enter number(s), N)ext, or Q)uit > "
-msgstr ""
+msgstr "Introduzca n�mero(s), O)tro, o F)in >"
 
-#: g10/keyserver.c:718 g10/keyserver.c:1238
-#, fuzzy, c-format
+#: g10/keyserver.c:717 g10/keyserver.c:1267
+#, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
-msgstr "opciones de exportaci�n inv�lidas\n"
+msgstr "protocolo del servidor de claves inv�lido (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:808
-#, fuzzy, c-format
+#: g10/keyserver.c:815
+#, c-format
 msgid "key \"%s\" not found on keyserver\n"
-msgstr "clave '%s' no encontrada: %s\n"
+msgstr "clave \"%s\" no encontrada en el servidor\n"
 
-#: g10/keyserver.c:810
-#, fuzzy
+#: g10/keyserver.c:817
 msgid "key not found on keyserver\n"
-msgstr "clave '%s' no encontrada: %s\n"
+msgstr "clave no encontrada en el servidor\n"
 
-#: g10/keyserver.c:985
-#, fuzzy, c-format
+#: g10/keyserver.c:1014
+#, c-format
 msgid "requesting key %s from %s server %s\n"
-msgstr "solicitando clave %08lX a %s\n"
+msgstr "solicitando clave %s de %s servidor %s\n"
 
-#: g10/keyserver.c:989
-#, fuzzy, c-format
+#: g10/keyserver.c:1018
+#, c-format
 msgid "requesting key %s from %s\n"
-msgstr "solicitando clave %08lX a %s\n"
+msgstr "solicitando clave %s de %s\n"
 
-#: g10/keyserver.c:1141
-#, fuzzy, c-format
+#: g10/keyserver.c:1170
+#, c-format
 msgid "sending key %s to %s server %s\n"
-msgstr "buscando \"%s\" en el servidor HKP %s\n"
+msgstr "enviando clave %s a %s servidor %s\n"
 
-#: g10/keyserver.c:1145
-#, fuzzy, c-format
+#: g10/keyserver.c:1174
+#, c-format
 msgid "sending key %s to %s\n"
-msgstr ""
-"\"\n"
-"firmada con su clave %08lX el %s\n"
+msgstr "enviando clave %s a %s\n"
 
-#: g10/keyserver.c:1188
-#, fuzzy, c-format
+#: g10/keyserver.c:1217
+#, c-format
 msgid "searching for \"%s\" from %s server %s\n"
-msgstr "buscando \"%s\" en el servidor HKP %s\n"
+msgstr "buscando \"%s\" de %s servidor %s\n"
 
-#: g10/keyserver.c:1191
-#, fuzzy, c-format
+#: g10/keyserver.c:1220
+#, c-format
 msgid "searching for \"%s\" from %s\n"
-msgstr "buscando \"%s\" en el servidor HKP %s\n"
+msgstr "buscando \"%s\" de %s\n"
 
-#: g10/keyserver.c:1198 g10/keyserver.c:1293
-#, fuzzy
+#: g10/keyserver.c:1227 g10/keyserver.c:1322
 msgid "no keyserver action!\n"
-msgstr "opciones de exportaci�n inv�lidas\n"
+msgstr "�no se solicita ninguna acci�n al servidor de claves!\n"
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1275
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
+"AVISO: el manejo de claves procede de una versi�n diferente de GnuPG (%s)\n"
 
-#: g10/keyserver.c:1255
+#: g10/keyserver.c:1284
 msgid "keyserver did not send VERSION\n"
-msgstr ""
+msgstr "el servidor de claves no envi� VERSION\n"
 
-#: g10/keyserver.c:1314
+#: g10/keyserver.c:1343
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "no hay servidores de claves conocidos (use opci�n --keyserver)\n"
 
-#: g10/keyserver.c:1320
+#: g10/keyserver.c:1349
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
+"no se pueden realizar llamadas a un servidor externo de claves tal y\n"
+"como est� compilado el programa\n"
 
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1361
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
-msgstr ""
+msgstr "no hay un manejador para ese esquema de servidor de claves `%s'\n"
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1366
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
+"la acci�n `%s' no es posible con este esquema de servidor de claves `%s'\n"
 
-#: g10/keyserver.c:1345
-#, c-format
-msgid "gpgkeys_%s does not support handler version %d\n"
-msgstr ""
+#: g10/keyserver.c:1374
+#, fuzzy, c-format
+msgid "%s does not support handler version %d\n"
+msgstr "gpgkeys_%s no permite usar la versi�n %d del manejador\n"
 
-#: g10/keyserver.c:1351
-#, fuzzy
+#: g10/keyserver.c:1381
 msgid "keyserver timed out\n"
-msgstr "error del servidor de claves"
+msgstr "agotado el tiempo de espera para el servidor de claves\n"
 
-#: g10/keyserver.c:1356
-#, fuzzy
+#: g10/keyserver.c:1386
 msgid "keyserver internal error\n"
-msgstr "error del servidor de claves"
+msgstr "error interno del servidor de claves\n"
 
-#: g10/keyserver.c:1365
-#, fuzzy, c-format
+#: g10/keyserver.c:1395
+#, c-format
 msgid "keyserver communications error: %s\n"
-msgstr "recepci�n del servidor de claves fallida: %s\n"
+msgstr "error de comunicaci�n con el servidor de claves: %s\n"
 
-#: g10/keyserver.c:1390 g10/keyserver.c:1424
-#, fuzzy, c-format
+#: g10/keyserver.c:1420 g10/keyserver.c:1454
+#, c-format
 msgid "\"%s\" not a key ID: skipping\n"
-msgstr "'%s' no es un identificador de clave v�lido\n"
+msgstr "\"%s\" no es un identificador de clave v�lido: omitido\n"
 
-#: g10/keyserver.c:1681
-#, fuzzy, c-format
+#: g10/keyserver.c:1711
+#, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
-msgstr "AVISO: no se puede borrar fichero temporal (%s) `%s': %s\n"
+msgstr "AVISO: no se puede renovar la clave %s a traves de %s: %s\n"
 
-#: g10/keyserver.c:1703
-#, fuzzy, c-format
+#: g10/keyserver.c:1733
+#, c-format
 msgid "refreshing 1 key from %s\n"
-msgstr "solicitando clave %08lX a %s\n"
+msgstr "renovando 1 clave de %s\n"
 
-#: g10/keyserver.c:1705
-#, fuzzy, c-format
+#: g10/keyserver.c:1735
+#, c-format
 msgid "refreshing %d keys from %s\n"
-msgstr "solicitando clave %08lX a %s\n"
+msgstr "renovando %d claves desde %s\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:249
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "tama�o anormal para una clave de sesi�n cifrada (%d)\n"
 
-#: g10/mainproc.c:262
-#, c-format
-msgid "bad passphrase or unknown cipher algorithm (%d)\n"
-msgstr "frase de paso mala o algoritmo de cifrado desconocido (%d)\n"
-
-#: g10/mainproc.c:299
+#: g10/mainproc.c:300
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s clave de sesi�n cifrada\n"
 
-#: g10/mainproc.c:309
-#, fuzzy, c-format
+#: g10/mainproc.c:310
+#, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
-msgstr "cifrado con algoritmo desconocido %d\n"
+msgstr "frase contrase�a generada con algoritmo de resumen desconocido %d\n"
 
-#: g10/mainproc.c:375
-#, fuzzy, c-format
+#: g10/mainproc.c:376
+#, c-format
 msgid "public key is %s\n"
-msgstr "la clave p�blica es %08lX\n"
+msgstr "la clave p�blica es %s\n"
 
-#: g10/mainproc.c:430
+#: g10/mainproc.c:431
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados con la clave p�blica: DEK correcta\n"
 
-#: g10/mainproc.c:463
-#, fuzzy, c-format
+#: g10/mainproc.c:464
+#, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
-msgstr "cifrado con clave %2$s de %1$u bits, ID %3$08lX, creada el %4$s\n"
+msgstr "cifrado con clave %2$s de %1$u bits, ID %3$s, creada el %4$s\n"
 
-#: g10/mainproc.c:467 g10/pkclist.c:218
-#, fuzzy, c-format
+#: g10/mainproc.c:468 g10/pkclist.c:219
+#, c-format
 msgid "      \"%s\"\n"
-msgstr "                alias \""
+msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:471
-#, fuzzy, c-format
+#: g10/mainproc.c:472
+#, c-format
 msgid "encrypted with %s key, ID %s\n"
-msgstr "cifrado con clave %s, ID %08lX\n"
+msgstr "cifrado con clave %s, ID %s\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descifrado de la clave p�blica fallido: %s\n"
 
-#: g10/mainproc.c:499
+#: g10/mainproc.c:500
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrado con %lu frases contrase�a\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:502
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrado con 1 frase contrase�a\n"
 
-#: g10/mainproc.c:529 g10/mainproc.c:551
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "suponiendo %s datos cifrados\n"
 
-#: g10/mainproc.c:537
+#: g10/mainproc.c:538
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "cifrado IDEA no disponible, confiadamente intentamos usar %s en su lugar\n"
 
-#: g10/mainproc.c:569
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:574
 msgid "WARNING: message was not integrity protected\n"
-msgstr "ATENCI�N: la integridad del mensaje no est� protegida\n"
+msgstr "ATENCI�N: la intgridad del mensaje no est� protegida\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATENCI�N: �el mensaje cifrado ha sido manipulado!\n"
 
-#: g10/mainproc.c:592
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descifrado fallido: %s\n"
@@ -4328,304 +4281,289 @@ 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:786
+#: g10/mainproc.c:803
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocaci�n independiente - use \"gpg --import\" para aplicarla\n"
 
-#: g10/mainproc.c:1290
+#: g10/mainproc.c:1307
 msgid "signature verification suppressed\n"
 msgstr "suprimida la verificaci�n de la firma\n"
 
-#: g10/mainproc.c:1332 g10/mainproc.c:1342
+#: g10/mainproc.c:1349 g10/mainproc.c:1359
 msgid "can't handle these multiple signatures\n"
 msgstr "no se puede trabajar con firmas m�ltiples\n"
 
-#: g10/mainproc.c:1352
-#, fuzzy, c-format
+#: g10/mainproc.c:1369
+#, c-format
 msgid "Signature made %s\n"
-msgstr "Firma caducada en %s\n"
+msgstr "Firmado el %s\n"
 
-#: g10/mainproc.c:1353
-#, fuzzy, c-format
+#: g10/mainproc.c:1370
+#, c-format
 msgid "               using %s key %s\n"
-msgstr "                alias \""
+msgstr "               usando %s clave %s\n"
 
-#: g10/mainproc.c:1357
-#, fuzzy, c-format
+#: g10/mainproc.c:1374
+#, c-format
 msgid "Signature made %s using %s key ID %s\n"
-msgstr "Firmado el %.*s usando clave %s ID %08lX\n"
+msgstr "Firmado el %s usando clave %s ID %s\n"
 
-#: g10/mainproc.c:1377
+#: g10/mainproc.c:1394
 msgid "Key available at: "
 msgstr "Clave disponible en: "
 
-#: g10/mainproc.c:1482 g10/mainproc.c:1530
-#, fuzzy, c-format
+#: g10/mainproc.c:1499 g10/mainproc.c:1547
+#, c-format
 msgid "BAD signature from \"%s\""
-msgstr "Firma INCORRECTA de \""
+msgstr "Firma INCORRECTA de \"%s\""
 
-#: g10/mainproc.c:1484 g10/mainproc.c:1532
-#, fuzzy, c-format
+#: g10/mainproc.c:1501 g10/mainproc.c:1549
+#, c-format
 msgid "Expired signature from \"%s\""
-msgstr "Firma caducada de \""
+msgstr "Firma caducada de \"%s\""
 
-#: g10/mainproc.c:1486 g10/mainproc.c:1534
-#, fuzzy, c-format
+#: g10/mainproc.c:1503 g10/mainproc.c:1551
+#, c-format
 msgid "Good signature from \"%s\""
-msgstr "Firma correcta de \""
+msgstr "Firma correcta de \"%s\""
 
-#: g10/mainproc.c:1538
+#: g10/mainproc.c:1555
 msgid "[uncertain]"
 msgstr "[incierto]"
 
-#: g10/mainproc.c:1570
-#, fuzzy, c-format
+#: g10/mainproc.c:1587
+#, c-format
 msgid "                aka \"%s\""
-msgstr "                alias \""
+msgstr "                alias \"%s\""
 
-#: g10/mainproc.c:1664
+#: g10/mainproc.c:1681
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Firma caducada en %s\n"
 
-#: g10/mainproc.c:1669
+#: g10/mainproc.c:1686
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "La firma caduca el %s\n"
 
-#: g10/mainproc.c:1672
+#: g10/mainproc.c:1689
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
-msgstr "firma %s de: \"%s\"\n"
+msgstr "firma %s, algoritmo de resumen %s\n"
 
-#: g10/mainproc.c:1673
+#: g10/mainproc.c:1690
 msgid "binary"
 msgstr "binaria"
 
-#: g10/mainproc.c:1674
+#: g10/mainproc.c:1691
 msgid "textmode"
 msgstr "modotexto"
 
-#: g10/mainproc.c:1674 g10/trustdb.c:530
+#: g10/mainproc.c:1691 g10/trustdb.c:531
 msgid "unknown"
 msgstr "desconocido"
 
-#: g10/mainproc.c:1694
+#: g10/mainproc.c:1711
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposible comprobar la firma: %s\n"
 
-#: g10/mainproc.c:1762 g10/mainproc.c:1778 g10/mainproc.c:1864
+#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
 msgid "not a detached signature\n"
 msgstr "no es una firma separada\n"
 
-#: g10/mainproc.c:1805
+#: g10/mainproc.c:1822
 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:1813
+#: g10/mainproc.c:1830
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1887
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma al viejo estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:1880
+#: g10/mainproc.c:1897
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z inv�lido detectado en proc_tree()\n"
 
-#: g10/misc.c:121
+#: g10/misc.c:122
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "no se pueden desactivar los volcados de core: %s\n"
 
-#: g10/misc.c:141 g10/misc.c:169 g10/misc.c:241
-#, fuzzy, c-format
+#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
-msgstr "actualizaci�n de base de datos de confianza fallida: %s\n"
+msgstr "fstat de `%s' fall� en %s: %s\n"
 
-#: g10/misc.c:206
-#, fuzzy, c-format
+#: g10/misc.c:207
+#, c-format
 msgid "fstat(%d) failed in %s: %s\n"
-msgstr "base de datos de confianza: error lectura (n=%d): %s\n"
+msgstr "fstat(%d) fall� en %s: %s\n"
 
-#: g10/misc.c:315
-#, fuzzy, c-format
+#: g10/misc.c:316
+#, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
-msgstr "no puedo manejar el algoritmo de clave p�blica %d\n"
+msgstr "AVISO: usando un algoritmo de clave p�blica experimental %s\n"
 
-#: g10/misc.c:330
-#, fuzzy, c-format
+#: g10/misc.c:331
+#, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
-msgstr "algoritmo de cifrado no implementado"
+msgstr "AVISO: usando algoritmo de cifrado experimental %s\n"
 
-#: g10/misc.c:345
-#, fuzzy, c-format
+#: g10/misc.c:346
+#, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
-msgstr "firma %s de: \"%s\"\n"
+msgstr "AVISO: usando algoritmo de resumen experimental %s\n"
 
-#: g10/misc.c:350
-#, fuzzy, c-format
+#: g10/misc.c:351
+#, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
-msgstr ""
-"forzar el algoritmo de resumen %s (%d) va en contra de las\n"
-"preferencias del destinatario\n"
+msgstr "AVISO: el algoritmo de resumen %s es una opci�n desaconsejada\n"
 
-#: g10/misc.c:446
+#: g10/misc.c:447
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "el plugin para el cifrado IDEA no est� presente\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:448
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 "por favor vea http://www.gnupg.org/why-not-idea.html para m�s informaci�n\n"
 
-#: g10/misc.c:680
+#: g10/misc.c:681
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opci�n desaconsejada \"%s\"\n"
 
-#: g10/misc.c:684
+#: g10/misc.c:685
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "ATENCI�N: \"%s\" es una opci�n desaconsejada.\n"
+msgstr "ATENCI�N: \"%s\" es una opci�n desaconsejada\n"
 
-#: g10/misc.c:686
+#: g10/misc.c:687
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "por favor use \"%s%s\" en su lugar\n"
 
-#: g10/misc.c:697
+#: g10/misc.c:694
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
+msgstr "ATENCI�N: \"%s\" es una opci�n desaconsejada\n"
+
+#: g10/misc.c:707
 msgid "Uncompressed"
 msgstr "Sin comprimir"
 
-#: g10/misc.c:722
-#, fuzzy
+#: g10/misc.c:732
 msgid "uncompressed|none"
-msgstr "Sin comprimir"
+msgstr "sin_comprimir|ninguno"
 
-#: g10/misc.c:832
+#: g10/misc.c:842
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "este mensaje podr�a no ser utilizable por %s\n"
 
-#: g10/misc.c:989
-#, fuzzy, c-format
+#: g10/misc.c:999
+#, c-format
 msgid "ambiguous option `%s'\n"
-msgstr "leyendo opciones desde `%s'\n"
+msgstr "opci�n ambigua `%s'\n"
 
-#: g10/misc.c:1014
-#, fuzzy, c-format
+#: g10/misc.c:1024
+#, c-format
 msgid "unknown option `%s'\n"
-msgstr "desconocido el destinatario predefinido `%s'\n"
+msgstr "opci�n desconocida `%s'\n"
 
-#: g10/openfile.c:84
+#: g10/openfile.c:86
 #, c-format
 msgid "File `%s' exists. "
 msgstr "El fichero `%s' ya existe. "
 
-#: g10/openfile.c:86
-#, fuzzy
+#: g10/openfile.c:88
 msgid "Overwrite? (y/N) "
-msgstr "�Sobreescribir (s/N)? "
+msgstr "�Sobreescribir? (s/N) "
 
-#: g10/openfile.c:119
+#: g10/openfile.c:121
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: sufijo desconocido\n"
 
-#: g10/openfile.c:141
+#: g10/openfile.c:143
 msgid "Enter new filename"
 msgstr "Introduzca nuevo nombre de fichero"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:188
 msgid "writing to stdout\n"
 msgstr "escribiendo en stdout\n"
 
-#: g10/openfile.c:296
+#: g10/openfile.c:300
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "asumiendo que hay datos firmados en `%s'\n"
 
-#: g10/openfile.c:375
+#: g10/openfile.c:379
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "creado un nuevo fichero de configuraci�n `%s'\n"
 
-#: g10/openfile.c:377
+#: g10/openfile.c:381
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "AVISO: las opciones en `%s' no est�n a�n activas en esta ejecuci�n\n"
 
-#: g10/openfile.c:409
-#, fuzzy, c-format
+#: g10/openfile.c:413
+#, c-format
 msgid "directory `%s' created\n"
-msgstr "%s: directorio creado\n"
+msgstr "directorio `%s' creado\n"
 
-#: g10/parse-packet.c:137
+#: g10/parse-packet.c:138
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "no puedo manejar el algoritmo de clave p�blica %d\n"
 
-#: g10/parse-packet.c:707
+#: g10/parse-packet.c:708
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVISO: clave de sesi�n cifrada sim�tricamente potencialmente insegura\n"
 
-#: g10/parse-packet.c:1132
+#: g10/parse-packet.c:1145
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquete de tipo %d tiene el bit cr�tico activado\n"
 
-#: g10/passphrase.c:478 g10/passphrase.c:525
+#: g10/passphrase.c:305
 msgid "gpg-agent is not available in this session\n"
 msgstr "el agente gpg no esta disponible en esta sesi�n\n"
 
-#: g10/passphrase.c:486
-msgid "can't set client pid for the agent\n"
-msgstr "no puedo establecer pid para el agente\n"
-
-#: g10/passphrase.c:494
-msgid "can't get server read FD for the agent\n"
-msgstr "no puedo conseguir el FD de lectura para el agente\n"
-
-#: g10/passphrase.c:501
-msgid "can't get server write FD for the agent\n"
-msgstr "no puedo conseguir el FD de escritura para el agente\n"
-
-#: g10/passphrase.c:534
+#: g10/passphrase.c:317
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variable de entorno GPG_AGENT_INFO malformada\n"
 
-#: g10/passphrase.c:547
+#: g10/passphrase.c:332
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "el programa no permite usar el protocolo agente gpg versi�n %d\n"
 
-#: g10/passphrase.c:568
+#: g10/passphrase.c:345
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "no se puede conectar con `%s': %s\n"
 
-#: g10/passphrase.c:590
-msgid "communication problem with gpg-agent\n"
-msgstr "problema de comunicaci�n con el agente gpg\n"
-
-#: g10/passphrase.c:597 g10/passphrase.c:937 g10/passphrase.c:1049
+#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema con el agente - inhabilitando el uso del agente\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1209
-#, fuzzy, c-format
+#: g10/passphrase.c:511 g10/passphrase.c:890
+#, c-format
 msgid " (main key ID %s)"
-msgstr "(ID clave primaria %08lX)"
+msgstr "(ID de clave primaria %s)"
 
-#: g10/passphrase.c:714
-#, fuzzy, c-format
+#: g10/passphrase.c:525
+#, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
 "\"%.*s\"\n"
@@ -4633,67 +4571,52 @@ msgid ""
 msgstr ""
 "Necesita una frase contrase�a para desbloquear la clave secreta\n"
 "del usuario: \"%.*s\"\n"
-"%u bits, clave %s, ID %08lX, creada el %s%s\n"
+"%u bits, clave %s, ID %s, creada el %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:550
 msgid "Repeat passphrase\n"
 msgstr "Repita frase contrase�a\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:552
 msgid "Enter passphrase\n"
 msgstr "Introduzca frase contrase�a\n"
 
-#: g10/passphrase.c:781
-msgid "passphrase too long\n"
-msgstr "frase contrase�a demasiado larga\n"
-
-#: g10/passphrase.c:794
-msgid "invalid response from agent\n"
-msgstr "respuesta del agente inv�lida\n"
-
-#: g10/passphrase.c:810 g10/passphrase.c:931
+#: g10/passphrase.c:628
 msgid "cancelled by user\n"
 msgstr "cancelado por el usuario\n"
 
-#: g10/passphrase.c:815 g10/passphrase.c:1020
-#, c-format
-msgid "problem with the agent: agent returns 0x%lx\n"
-msgstr "problema con el agente: el agente devuelve 0x%lx\n"
-
-#: g10/passphrase.c:1100 g10/passphrase.c:1263
-#, fuzzy
+#: g10/passphrase.c:781 g10/passphrase.c:944
 msgid "can't query passphrase in batch mode\n"
-msgstr "imposible pedir contrase�a en modo de proceso por lotes\n"
+msgstr "imposible pedir frase contrase�a en modo de proceso por lotes\n"
 
-#: g10/passphrase.c:1107 g10/passphrase.c:1268
+#: g10/passphrase.c:788 g10/passphrase.c:949
 msgid "Enter passphrase: "
 msgstr "Introduzca frase contrase�a: "
 
-#: g10/passphrase.c:1190
-#, fuzzy, c-format
+#: g10/passphrase.c:871
+#, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
 "user: \"%s\"\n"
 msgstr ""
-"\n"
 "Necesita una frase contrase�a para desbloquear la clave secreta\n"
-"del usuario: \""
+"del usuario: \"%s\"\n"
 
-#: g10/passphrase.c:1196
-#, fuzzy, c-format
+#: g10/passphrase.c:877
+#, c-format
 msgid "%u-bit %s key, ID %s, created %s"
-msgstr "clave %2$s de %1$u bits, ID %3$08lX, creada el %4$s"
+msgstr "clave %2$s de %1$u bits, ID %3$s, creada el %4$s"
 
-#: g10/passphrase.c:1205
+#: g10/passphrase.c:886
 #, c-format
 msgid "         (subkey on main key ID %s)"
-msgstr ""
+msgstr "         (subclave en clave principal ID %s)"
 
-#: g10/passphrase.c:1272
+#: g10/passphrase.c:953
 msgid "Repeat passphrase: "
 msgstr "Repita frase contrase�a: "
 
-#: g10/photoid.c:66
+#: g10/photoid.c:67
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4707,259 +4630,251 @@ msgstr ""
 "Si usa una foto muy grande, �su clave ser� tambi�n muy grande!\n"
 "Una imagen cercana a 240x288 tiene un tama�o adecuado.\n"
 
-#: g10/photoid.c:80
+#: g10/photoid.c:81
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Introduzca nombre del fichero JPEG para ID fotogr�fico: "
 
-#: g10/photoid.c:94
-#, fuzzy, c-format
+#: g10/photoid.c:95
+#, c-format
 msgid "unable to open JPEG file `%s': %s\n"
-msgstr "no puede abrirse el fichero: %s\n"
+msgstr "Imposible abrir fichero JPEG `%s': %s\n"
 
-#: g10/photoid.c:102
+#: g10/photoid.c:103
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
-msgstr ""
+msgstr "�Este JPEG es realmente grande (%d bytes)!\n"
 
-#: g10/photoid.c:104
-#, fuzzy
+#: g10/photoid.c:105
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "�Seguro que quiere usarlo? (s/N) "
 
-#: g10/photoid.c:119
-#, fuzzy, c-format
+#: g10/photoid.c:120
+#, c-format
 msgid "`%s' is not a JPEG file\n"
-msgstr "\"%s\" no es un fichero JPEG\n"
+msgstr "`%s' no es un fichero JPEG\n"
 
-#: g10/photoid.c:136
+#: g10/photoid.c:137
 msgid "Is this photo correct (y/N/q)? "
 msgstr "�Es correcta la foto? (s/n) "
 
-#: g10/photoid.c:338
+#: g10/photoid.c:339
 msgid "unable to display photo ID!\n"
 msgstr "�no puedo mostrar ID fotogr�fico!\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:580
+#: g10/pkclist.c:62 g10/revoke.c:581
 msgid "No reason specified"
 msgstr "No se dio ninguna raz�n"
 
-#: g10/pkclist.c:63 g10/revoke.c:582
+#: g10/pkclist.c:64 g10/revoke.c:583
 msgid "Key is superseded"
 msgstr "La clave ha sido reemplazada."
 
-#: g10/pkclist.c:65 g10/revoke.c:581
+#: g10/pkclist.c:66 g10/revoke.c:582
 msgid "Key has been compromised"
 msgstr "La clave ha sido comprometida"
 
-#: g10/pkclist.c:67 g10/revoke.c:583
+#: g10/pkclist.c:68 g10/revoke.c:584
 msgid "Key is no longer used"
 msgstr "La clave ya no est� en uso"
 
-#: g10/pkclist.c:69 g10/revoke.c:584
+#: g10/pkclist.c:70 g10/revoke.c:585
 msgid "User ID is no longer valid"
 msgstr "El identificador de usuario ya no es v�lido"
 
-#: g10/pkclist.c:73
+#: g10/pkclist.c:74
 msgid "reason for revocation: "
 msgstr "raz�n para la revocaci�n: "
 
-#: g10/pkclist.c:90
+#: g10/pkclist.c:91
 msgid "revocation comment: "
 msgstr "comentario a la revocaci�n: "
 
-#: g10/pkclist.c:205
+#: g10/pkclist.c:206
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:213
-#, fuzzy
+#: g10/pkclist.c:214
 msgid "No trust value assigned to:\n"
-msgstr ""
-"No hay confianza definida para:\n"
-"%4u%c/%08lX %s \""
+msgstr "No hay confianza definida para:\n"
 
-#: g10/pkclist.c:245
-#, fuzzy, c-format
+#: g10/pkclist.c:246
+#, c-format
 msgid "  aka \"%s\"\n"
-msgstr "                alias \""
+msgstr "  alias \"%s\"\n"
 
-#: g10/pkclist.c:255
-#, fuzzy
+#: g10/pkclist.c:256
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
-msgstr "Esta clave probablemente pertenece a su proprietario\n"
+msgstr ""
+"�Qu� seguridad tiene de que esta clave pertenece realmente al usuario\n"
+"que se nombra?\n"
 
-#: g10/pkclist.c:270
-#, fuzzy, c-format
+#: g10/pkclist.c:271
+#, c-format
 msgid "  %d = I don't know or won't say\n"
-msgstr " %d = No lo s�\n"
+msgstr " %d = No lo s� o prefiero no decirlo\n"
 
-#: g10/pkclist.c:272
-#, fuzzy, c-format
+#: g10/pkclist.c:273
+#, c-format
 msgid "  %d = I do NOT trust\n"
-msgstr " %d = No conf�o\n"
+msgstr " %d = NO tengo confianza\n"
 
-#: g10/pkclist.c:278
-#, fuzzy, c-format
+#: g10/pkclist.c:279
+#, c-format
 msgid "  %d = I trust ultimately\n"
-msgstr " %d = conf�o por completo\n"
+msgstr " %d = conf�o absolutamente\n"
 
-#: g10/pkclist.c:284
-#, fuzzy
+#: g10/pkclist.c:285
 msgid "  m = back to the main menu\n"
-msgstr " m = volver al men� principal\n"
+msgstr "  m = volver al men� principal\n"
 
-#: g10/pkclist.c:287
-#, fuzzy
+#: g10/pkclist.c:288
 msgid "  s = skip this key\n"
-msgstr " s = saltar esta clave\n"
+msgstr "  s = saltar esta clave\n"
 
-#: g10/pkclist.c:288
-#, fuzzy
+#: g10/pkclist.c:289
 msgid "  q = quit\n"
-msgstr " q = salir\n"
+msgstr "  q = salir\n"
 
-#: g10/pkclist.c:292
+#: g10/pkclist.c:293
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
+"El m�nimo nivel de confianza para esta clave es: %s\n"
+"\n"
 
-#: g10/pkclist.c:298 g10/revoke.c:609
+#: g10/pkclist.c:299 g10/revoke.c:610
 msgid "Your decision? "
-msgstr "Su decisi�n: "
+msgstr "�Su decisi�n? "
 
-#: g10/pkclist.c:319
-#, fuzzy
+#: g10/pkclist.c:320
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
-msgstr "�De verdad quiere asignar total confianza a esta clave? "
+msgstr "�De verdad quiere asignar absoluta confianza a esta clave? (s/N) "
 
-#: g10/pkclist.c:333
+#: g10/pkclist.c:334
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificados que llevan a una clave de confianza absoluta:\n"
 
-#: g10/pkclist.c:418
-#, fuzzy, c-format
+#: g10/pkclist.c:419
+#, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
-"%08lX: No hay indicios de que la firma pertenezca realmente al propietario.\n"
+"%s: No hay seguridad de que esta clave pertenezca realmente\n"
+"al usuario que se nombra\n"
 
-#: g10/pkclist.c:423
-#, fuzzy, c-format
+#: g10/pkclist.c:424
+#, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
-"%08lX: No hay indicios de que la firma pertenezca realmente al propietario.\n"
+"%s: Hay poca seguridad de que esta clave pertenezca realmente\n"
+"al usuario que se nombra\n"
 
-#: g10/pkclist.c:429
-#, fuzzy
+#: g10/pkclist.c:430
 msgid "This key probably belongs to the named user\n"
-msgstr "Esta clave probablemente pertenece a su proprietario\n"
+msgstr "Esta clave probablemente pertenece al usuario que se nombra\n"
 
-#: g10/pkclist.c:434
+#: g10/pkclist.c:435
 msgid "This key belongs to us\n"
 msgstr "Esta clave nos pertenece\n"
 
-#: g10/pkclist.c:460
-#, fuzzy
+#: g10/pkclist.c:461
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
 "you may answer the next question with yes.\n"
 msgstr ""
-"No es seguro que la clave pertenezca a la persona que se nombra en el.\n"
-"identificador de usuario. Si *realmente* sabe lo que est� haciendo, \n"
+"No es seguro que la clave pertenezca a la persona que se nombra en el\n"
+"identificador de usuario. Si *realmente* sabe lo que est� haciendo,\n"
 "puede contestar s� a la siguiente pregunta.\n"
-"\n"
 
-#: g10/pkclist.c:467
-#, fuzzy
+#: g10/pkclist.c:468
 msgid "Use this key anyway? (y/N) "
-msgstr "�Usar esta clave de todas formas? "
+msgstr "�Usar esta clave de todas formas? (s/N) "
 
-#: g10/pkclist.c:501
+#: g10/pkclist.c:502
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ATENCI�N: �Usando una clave no fiable!\n"
 
-#: g10/pkclist.c:508
+#: g10/pkclist.c:509
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "AVISO: la clave puede estar revocada (falta clave de revocaci�n)\n"
 
-#: g10/pkclist.c:517
+#: g10/pkclist.c:518
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr ""
 "ATENCI�N: �Esta clave ha sido revocada por la persona designada\n"
 "como revocador!\n"
 
-#: g10/pkclist.c:520
+#: g10/pkclist.c:521
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ATENCI�N: �Esta clave ha sido revocada por su propietario!\n"
 
-#: g10/pkclist.c:521
-#, fuzzy
+#: g10/pkclist.c:522
 msgid "         This could mean that the signature is forged.\n"
-msgstr "          Esto puede significar que la firma est� falsificada.\n"
+msgstr "         Esto puede significar que la firma est� falsificada.\n"
 
-#: g10/pkclist.c:527
+#: g10/pkclist.c:528
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ATENCI�N: �Esta clave ha sido revocada por su propietario!\n"
 
-#: g10/pkclist.c:532
+#: g10/pkclist.c:533
 msgid "Note: This key has been disabled.\n"
 msgstr "Nota: Esta clave est� deshabilitada.\n"
 
-#: g10/pkclist.c:537
+#: g10/pkclist.c:538
 msgid "Note: This key has expired!\n"
 msgstr "Nota: �Esta clave ha caducado!\n"
 
-#: g10/pkclist.c:548
+#: g10/pkclist.c:549
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "ATENCI�N: �Esta clave no est� certificada por una firma de confianza!\n"
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:551
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "          No hay indicios de que la firma pertenezca al propietario.\n"
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:559
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATENCI�N: �Esta clave NO es de confianza!\n"
 
-#: g10/pkclist.c:559
+#: g10/pkclist.c:560
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "          La firma es probablemente una FALSIFICACI�N.\n"
 
-#: g10/pkclist.c:567
+#: g10/pkclist.c:568
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ATENCI�N: �Esta clave no est� certificada con firmas de suficiente "
 "confianza!\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:570
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "          No es seguro que la firma pertenezca al propietario.\n"
 
-#: g10/pkclist.c:734 g10/pkclist.c:767 g10/pkclist.c:936 g10/pkclist.c:996
+#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: omitido: %s\n"
 
-#: g10/pkclist.c:744 g10/pkclist.c:968
+#: g10/pkclist.c:745 g10/pkclist.c:969
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: omitida: clave p�blica ya presente\n"
 
-#: g10/pkclist.c:786
+#: g10/pkclist.c:787
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "No ha especificado un ID de usuario (puede usar \"-r\")\n"
 
-#: g10/pkclist.c:802
+#: g10/pkclist.c:803
 msgid "Current recipients:\n"
-msgstr ""
+msgstr "Destinatarios actuales:\n"
 
-#: g10/pkclist.c:828
+#: g10/pkclist.c:829
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -4967,168 +4882,166 @@ msgstr ""
 "\n"
 "Introduzca ID de usuario. Acabe con una l�nea vac�a: "
 
-#: g10/pkclist.c:844
+#: g10/pkclist.c:845
 msgid "No such user ID.\n"
 msgstr "ID de usuario inexistente.\n"
 
-#: g10/pkclist.c:849 g10/pkclist.c:911
+#: g10/pkclist.c:850 g10/pkclist.c:912
 msgid "skipped: public key already set as default recipient\n"
 msgstr "omitida: clave p�blica ya designada como destinataria por defecto\n"
 
-#: g10/pkclist.c:867
+#: g10/pkclist.c:868
 msgid "Public key is disabled.\n"
 msgstr "Clave p�blica deshabilitada.\n"
 
-#: g10/pkclist.c:874
+#: g10/pkclist.c:875
 msgid "skipped: public key already set\n"
 msgstr "omitida: clave p�blica ya establecida\n"
 
-#: g10/pkclist.c:903
-#, fuzzy, c-format
+#: g10/pkclist.c:904
+#, c-format
 msgid "unknown default recipient \"%s\"\n"
-msgstr "desconocido el destinatario predefinido `%s'\n"
+msgstr "desconocido el destinatario predefinido \"%s\"\n"
 
-#: g10/pkclist.c:948
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: omitida: clave p�blica deshabilitada\n"
 
-#: g10/pkclist.c:1003
+#: g10/pkclist.c:1004
 msgid "no valid addressees\n"
 msgstr "no hay direcciones v�lidas\n"
 
-#: g10/plaintext.c:90
+#: g10/plaintext.c:91
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "datos no grabados; use la opci�n \"--output\" para grabarlos\n"
 
-#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
+#: g10/plaintext.c:136 g10/plaintext.c:141 g10/plaintext.c:159
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "error creando `%s': %s\n"
 
-#: g10/plaintext.c:446
+#: g10/plaintext.c:447
 msgid "Detached signature.\n"
 msgstr "Firma separada.\n"
 
-#: g10/plaintext.c:450
+#: g10/plaintext.c:452
 msgid "Please enter name of data file: "
 msgstr "Introduzca el nombre del fichero de datos: "
 
-#: g10/plaintext.c:478
+#: g10/plaintext.c:481
 msgid "reading stdin ...\n"
 msgstr "leyendo stdin...\n"
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:515
 msgid "no signed data\n"
 msgstr "no hay datos firmados\n"
 
-#: g10/plaintext.c:526
+#: g10/plaintext.c:529
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposible abrir datos firmados `%s'\n"
 
-#: g10/pubkey-enc.c:103
-#, fuzzy, c-format
+#: g10/pubkey-enc.c:104
+#, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
-msgstr "destinatario an�nimo; probando clave secreta %08lX ...\n"
+msgstr "destinatario an�nimo; probando clave secreta %s ...\n"
 
-#: g10/pubkey-enc.c:119
+#: g10/pubkey-enc.c:120
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "de acuerdo, somos el destinatario an�nimo.\n"
 
-#: g10/pubkey-enc.c:207
+#: g10/pubkey-enc.c:208
 msgid "old encoding of the DEK is not supported\n"
 msgstr "la antigua codificaci�n de la DEK no puede usarse\n"
 
-#: g10/pubkey-enc.c:228
+#: g10/pubkey-enc.c:229
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "algoritmo de cifrado %d%s desconocido o desactivado\n"
 
-#: g10/pubkey-enc.c:266
-#, fuzzy, c-format
+#: g10/pubkey-enc.c:267
+#, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
-msgstr "NOTA: algoritmo de cifrado %d no encontrado en las preferencias\n"
+msgstr "NOTA: el cifrado %s no aparece en las preferencias del receptor\n"
 
-#: g10/pubkey-enc.c:286
-#, fuzzy, c-format
+#: g10/pubkey-enc.c:287
+#, c-format
 msgid "NOTE: secret key %s expired at %s\n"
-msgstr "NOTA: clave secreta %08lX caducada el %s\n"
+msgstr "NOTA: clave secreta %s caduc� el %s\n"
 
-#: g10/pubkey-enc.c:292
+#: g10/pubkey-enc.c:293
 msgid "NOTE: key has been revoked"
 msgstr "NOTA: la clave ha sido revocada"
 
-#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:545
+#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
+#: g10/revoke.c:188 g10/revoke.c:546
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "construcci�n del paquete fallida: %s\n"
 
-#: g10/revoke.c:146
-#, fuzzy, c-format
+#: g10/revoke.c:147
+#, c-format
 msgid "key %s has no user IDs\n"
-msgstr "clave %08lX: sin identificador de usuario\n"
+msgstr "clave %s: sin identificador de usuario\n"
 
-#: g10/revoke.c:272
+#: g10/revoke.c:273
 msgid "To be revoked by:\n"
 msgstr "Ser� revocado por:\n"
 
-#: g10/revoke.c:276
+#: g10/revoke.c:277
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Este es una clave de revocaci�n confidencial)\n"
 
-#: g10/revoke.c:280
-#, fuzzy
+#: g10/revoke.c:281
 msgid "Create a designated revocation certificate for this key? (y/N) "
-msgstr "�Crear un certificado de revocaci�n para esta clave? "
+msgstr "�Crear un certificado de revocaci�n para esta clave? (s/N)"
 
-#: g10/revoke.c:293 g10/revoke.c:511
+#: g10/revoke.c:294 g10/revoke.c:512
 msgid "ASCII armored output forced.\n"
 msgstr "se fuerza salida con armadura ASCII.\n"
 
-#: g10/revoke.c:307 g10/revoke.c:525
+#: g10/revoke.c:308 g10/revoke.c:526
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet fall�: %s\n"
 
-#: g10/revoke.c:370
+#: g10/revoke.c:371
 msgid "Revocation certificate created.\n"
 msgstr "Certificado de revocaci�n creado.\n"
 
-#: g10/revoke.c:376
-#, fuzzy, c-format
+#: g10/revoke.c:377
+#, c-format
 msgid "no revocation keys found for \"%s\"\n"
-msgstr "no se encuetran claves de revocaci�n para `%s'\n"
+msgstr "no se encuetran claves de revocaci�n para \"%s\"\n"
 
-#: g10/revoke.c:432
-#, fuzzy, c-format
+#: g10/revoke.c:433
+#, c-format
 msgid "secret key \"%s\" not found: %s\n"
-msgstr "clave secreta `%s' no encontrada: %s\n"
+msgstr "clave secreta \"%s\" no encontrada: %s\n"
 
-#: g10/revoke.c:461
+#: g10/revoke.c:462
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "no existe la clave p�blica correspondiente: %s\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:473
 msgid "public key does not match secret key!\n"
 msgstr "�la clave p�blica y la privada no se corresponden!\n"
 
-#: g10/revoke.c:479
-#, fuzzy
+#: g10/revoke.c:480
 msgid "Create a revocation certificate for this key? (y/N) "
-msgstr "�Crear un certificado de revocaci�n para esta clave? "
+msgstr "�Crear un certificado de revocaci�n para esta clave? (s/N) "
 
-#: g10/revoke.c:496
+#: g10/revoke.c:497
 msgid "unknown protection algorithm\n"
 msgstr "algoritmo de protecci�n desconocido\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOTA: �Esta clave no est� protegida!\n"
 
-#: g10/revoke.c:551
+#: g10/revoke.c:552
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5147,255 +5060,253 @@ msgstr ""
 "de impresi�n de su m�quina podr�a almacenar los datos y hacerlos accesibles\n"
 "a otras personas!\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid "Please select the reason for the revocation:\n"
 msgstr "Por favor elija una raz�n para la revocaci�n:\n"
 
-#: g10/revoke.c:602
+#: g10/revoke.c:603
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: g10/revoke.c:604
+#: g10/revoke.c:605
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Probablemente quer�a seleccionar %d aqu�)\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:646
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Introduzca una descripci�n opcional; ac�bela con una l�nea vac�a:\n"
 
-#: g10/revoke.c:673
+#: g10/revoke.c:674
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Raz�n para la revocaci�n: %s\n"
 
-#: g10/revoke.c:675
+#: g10/revoke.c:676
 msgid "(No description given)\n"
 msgstr "(No se di� descripci�n)\n"
 
-#: g10/revoke.c:680
-#, fuzzy
+#: g10/revoke.c:681
 msgid "Is this okay? (y/N) "
-msgstr "�Es correcto? "
+msgstr "�Es correcto? (s/N) "
 
-#: g10/seckey-cert.c:54
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "las partes de la clave privada no est�n disponibles\n"
 
-#: g10/seckey-cert.c:60
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "el algoritmo de protecci�n %d%s no puede ser utilizado\n"
 
-#: g10/seckey-cert.c:71
-#, fuzzy, c-format
+#: g10/seckey-cert.c:72
+#, c-format
 msgid "protection digest %d is not supported\n"
-msgstr "el algoritmo de protecci�n %d%s no puede ser utilizado\n"
+msgstr "el resumen protector %d no puede ser utilizado\n"
 
-#: g10/seckey-cert.c:265
+#: g10/seckey-cert.c:266
 msgid "Invalid passphrase; please try again"
 msgstr "Frase contrase�a incorrecta; int�ntelo de nuevo."
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:267
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ... \n"
 
-#: g10/seckey-cert.c:326
+#: g10/seckey-cert.c:327
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "ATENCI�N: detectada clave d�bil - por favor cambie la frase contrase�a.\n"
 
-#: g10/seckey-cert.c:364
+#: g10/seckey-cert.c:365
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "generando la suma de comprobaci�n de 16 bits (desaconsejada) para \n"
 "proteger la clave secreta.\n"
 
-#: g10/seskey.c:52
+#: g10/seskey.c:53
 msgid "weak key created - retrying\n"
 msgstr "creada clave d�bil - reintentando\n"
 
-#: g10/seskey.c:57
+#: g10/seskey.c:58
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "�imposible evitar clave d�bil para cifrado sim�trico despu�s de %d "
 "intentos!\n"
 
-#: g10/seskey.c:213
+#: g10/seskey.c:214
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA necesita un algoritmo de hash de 160 bits.\n"
 
-#: g10/sig-check.c:75
+#: g10/sig-check.c:76
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "AVISO: conflicto con el resumen de la firma del mensaje\n"
 
-#: g10/sig-check.c:99
-#, fuzzy, c-format
+#: g10/sig-check.c:100
+#, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
-msgstr "AVISO: la subclave de firmado %08lX no tiene certificado cruzado\n"
+msgstr "AVISO: la subclave de firmado %s no tiene certificado cruzado\n"
 
-#: g10/sig-check.c:102
-#, fuzzy, c-format
+#: g10/sig-check.c:103
+#, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
-"AVISO: la subclave de cifrado %08lX tiene un certificado cruzado inv�lido\n"
+"AVISO: la subclave de cifrado %s tiene un certificado cruzado inv�lido\n"
 
-#: g10/sig-check.c:168
-#, fuzzy, c-format
+#: g10/sig-check.c:169
+#, c-format
 msgid "public key %s is %lu second newer than the signature\n"
-msgstr "la clave p�blica %08lX es %lu segundos m�s nueva que la firma\n"
+msgstr "la clave p�blica %s es %lu segundos m�s nueva que la firma\n"
 
-#: g10/sig-check.c:169
-#, fuzzy, c-format
+#: g10/sig-check.c:170
+#, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
-msgstr "la clave p�blica %08lX es %lu segundos m�s nueva que la firma\n"
+msgstr "la clave p�blica %s es %lu segundos m�s nueva que la firma\n"
 
-#: g10/sig-check.c:180
-#, fuzzy, c-format
+#: g10/sig-check.c:181
+#, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
-"clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
-"problemas con el reloj)\n"
+"la clave %s fue creada %lu segundo en el futuro (viaje en el tiempo\n"
+"o problemas con el reloj)\n"
 
-#: g10/sig-check.c:182
-#, fuzzy, c-format
+#: g10/sig-check.c:183
+#, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr ""
-"clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
-"problemas con el reloj)\n"
+"la clave %s fue creada %lu segundos en el futuro (salto en el tiempo\n"
+"o problemas con el reloj)\n"
 
-#: g10/sig-check.c:192
-#, fuzzy, c-format
+#: g10/sig-check.c:193
+#, c-format
 msgid "NOTE: signature key %s expired %s\n"
-msgstr "NOTA: clave de la firma %08lX caducada el %s\n"
+msgstr "NOTA: clave de la firma %s caducada el %s\n"
 
-#: g10/sig-check.c:275
-#, fuzzy, c-format
+#: g10/sig-check.c:276
+#, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
-"asumiendo firma incorrecta de la clave %08lX por un bit cr�tico desconocido\n"
+"asumiendo firma incorrecta de la clave %s por un bit cr�tico desconocido\n"
 
-#: g10/sig-check.c:532
-#, fuzzy, c-format
+#: g10/sig-check.c:533
+#, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
-msgstr ""
-"clave %08lX: no hay subclave para el paquete de revocaci�n de subclave\n"
+msgstr "clave %s: no hay subclave para la firma de revocaci�n de subclave\n"
 
-#: g10/sig-check.c:558
-#, fuzzy, c-format
+#: g10/sig-check.c:559
+#, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
-msgstr "clave %08lX: no hay subclave para firma de subclave de enlace\n"
+msgstr "clave %s: no hay subclave para firma de subclave de enlace\n"
 
-#: g10/sign.c:85
+#: g10/sign.c:86
 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:93
+#: g10/sign.c:94
 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:112
+#: g10/sign.c:113
 #, 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:138
+#: g10/sign.c:139
 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:146
+#: g10/sign.c:147
 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:159
-#, fuzzy, c-format
+#: g10/sign.c:160
+#, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr ""
-"AVISO: no puedo expandir el %% de la url de pol�tica . Se usa sin expandir.\n"
+"AVISO: no puedo expandir el %% de la url de pol�tica (demasiado larga).\n"
+"Se usa sin expandir.\n"
 
-#: g10/sign.c:187
-#, fuzzy, c-format
+#: g10/sign.c:188
+#, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr ""
-"AVISO: no puedo expandir el %% de la url de pol�tica . Se usa sin expandir.\n"
+"AVISO: no puedo expandir el %% de la URL del servidor de claves\n"
+"preferido. Se usa sin expandir.\n"
 
-#: g10/sign.c:364
+#: g10/sign.c:365
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "la comprobaci�n de la firma creada fall�: %s\n"
 
-#: g10/sign.c:373
-#, fuzzy, c-format
+#: g10/sign.c:374
+#, c-format
 msgid "%s/%s signature from: \"%s\"\n"
-msgstr "firma %s de: \"%s\"\n"
+msgstr "%s/%s firma de: \"%s\"\n"
 
-#: g10/sign.c:741
+#: g10/sign.c:761
 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:808
-#, fuzzy, c-format
+#: g10/sign.c:830
+#, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
-"forzar el algoritmo de resumen %s (%d) va en contra de las\n"
+"AVISO: forzar el algoritmo de resumen %s (%d) va en contra de las\n"
 "preferencias del destinatario\n"
 
-#: g10/sign.c:900
+#: g10/sign.c:922
 msgid "signing:"
 msgstr "firmando:"
 
-#: g10/sign.c:1007
+#: g10/sign.c:1034
 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:1180
+#: g10/sign.c:1212
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "se usar� un cifrado %s\n"
 
-#: g10/skclist.c:126 g10/skclist.c:190
+#: g10/skclist.c:127 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "clave no marcada como insegura - no puede usarse con el pseudo RNG\n"
 
-#: g10/skclist.c:157
-#, fuzzy, c-format
+#: g10/skclist.c:158
+#, c-format
 msgid "skipped \"%s\": duplicated\n"
-msgstr "`%s' omitido: duplicado\n"
+msgstr "\"%s\" omitido: duplicado\n"
 
-#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
-#, fuzzy, c-format
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#, c-format
 msgid "skipped \"%s\": %s\n"
-msgstr "`%s' omitido: %s\n"
+msgstr "omitido \"%s\": %s\n"
 
-#: g10/skclist.c:170
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "omitido: clave secreta ya presente\n"
 
-#: g10/skclist.c:185
-#, fuzzy
+#: g10/skclist.c:186
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
-"`%s' omitida: esta es una clave ElGamal generada por PGP que NO es segura "
-"para las firmas\n"
+"�esta es una clave ElGamal generada por PGP que NO es segura para firmar!"
 
-#: g10/tdbdump.c:59 g10/trustdb.c:365
+#: g10/tdbdump.c:60 g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "registro de confianza %lu, tipo %d: fallo escritura: %s\n"
 
-#: g10/tdbdump.c:104
+#: g10/tdbdump.c:105
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5404,350 +5315,353 @@ msgstr ""
 "# Lista de valores de confianza asignados, creada %s\n"
 "# (Use \"gpg --import-ownertrust\" para restablecerlos)\n"
 
-#: g10/tdbdump.c:159 g10/tdbdump.c:167 g10/tdbdump.c:172 g10/tdbdump.c:177
-#, fuzzy, c-format
+#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#, c-format
 msgid "error in `%s': %s\n"
-msgstr "error leyendo `%s': %s\n"
+msgstr "error en `%s': %s\n"
 
-#: g10/tdbdump.c:159
-#, fuzzy
+#: g10/tdbdump.c:160
 msgid "line too long"
-msgstr "l�nea demasiado larga\n"
+msgstr "l�nea demasiado larga"
 
-#: g10/tdbdump.c:167
+#: g10/tdbdump.c:168
 msgid "colon missing"
-msgstr ""
+msgstr "falta una coma"
 
-#: g10/tdbdump.c:173
-#, fuzzy
+#: g10/tdbdump.c:174
 msgid "invalid fingerprint"
-msgstr "error: huella dactilar no v�lida\n"
+msgstr "huella dactilar no v�lida"
 
-#: g10/tdbdump.c:178
-#, fuzzy
+#: g10/tdbdump.c:179
 msgid "ownertrust value missing"
-msgstr "importa los valores de confianza"
+msgstr "falta el valor de confianza"
 
-#: g10/tdbdump.c:214
-#, fuzzy, c-format
+#: g10/tdbdump.c:215
+#, c-format
 msgid "error finding trust record in `%s': %s\n"
-msgstr "error econtrando registro de confianza: %s\n"
+msgstr "error econtrando registro de confianza en `%s': %s\n"
 
-#: g10/tdbdump.c:218
-#, fuzzy, c-format
+#: g10/tdbdump.c:219
+#, c-format
 msgid "read error in `%s': %s\n"
-msgstr "error de lectura: %s\n"
+msgstr "error de lectura `%s': %s\n"
 
-#: g10/tdbdump.c:227 g10/trustdb.c:380
+#: g10/tdbdump.c:228 g10/trustdb.c:381
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de datos de confianza: fallo sincronizaci�n: %s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1440
+#: g10/tdbio.c:129 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "registro base de datos de confianza %lu: lseek fallido: %s\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1447
+#: g10/tdbio.c:135 g10/tdbio.c:1448
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 "registro base de datos de confianza %lu: escritura fallida (n=%d): %s\n"
 
-#: g10/tdbio.c:244
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "transacci�n en la base de datos de confianza demasiado grande\n"
 
-#: g10/tdbio.c:497
-#, fuzzy, c-format
+#: g10/tdbio.c:498
+#, c-format
 msgid "can't access `%s': %s\n"
-msgstr "no se puede cerrar `%s': %s\n"
+msgstr "no se puede acceder a `%s': %s\n"
 
-#: g10/tdbio.c:512
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: �el directorio no existe!\n"
 
-#: g10/tdbio.c:522 g10/tdbio.c:545 g10/tdbio.c:588
-#, fuzzy, c-format
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#, c-format
 msgid "can't create lock for `%s'\n"
-msgstr "no se puede crear %s: %s\n"
+msgstr "no se puede crear el bloqueo para `%s'\n"
 
-#: g10/tdbio.c:524 g10/tdbio.c:591
-#, fuzzy, c-format
+#: g10/tdbio.c:525 g10/tdbio.c:592
+#, c-format
 msgid "can't lock `%s'\n"
-msgstr "no se puede abrir `%s'\n"
+msgstr "no se puede bloquear `%s'\n"
 
-#: g10/tdbio.c:550
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: fallo en la creaci�n del registro de versi�n: %s"
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: se ha creado base de datos de confianza inv�lida\n"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: se ha creado base de datos de confianza\n"
 
-#: g10/tdbio.c:597
+#: g10/tdbio.c:598
 msgid "NOTE: trustdb not writable\n"
 msgstr "NOTA: no se puede escribir base de datos de confianza\n"
 
-#: g10/tdbio.c:614
+#: g10/tdbio.c:615
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de datos de confianza inv�lida\n"
 
-#: g10/tdbio.c:646
+#: g10/tdbio.c:647
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: fallo en la creaci�n de la tabla hash: %s\n"
 
-#: g10/tdbio.c:654
+#: g10/tdbio.c:655
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: error actualizando el registro de versi�n: %s\n"
 
-#: g10/tdbio.c:671 g10/tdbio.c:691 g10/tdbio.c:707 g10/tdbio.c:721
-#: g10/tdbio.c:751 g10/tdbio.c:1373 g10/tdbio.c:1400
+#: g10/tdbio.c:672 g10/tdbio.c:692 g10/tdbio.c:708 g10/tdbio.c:722
+#: g10/tdbio.c:752 g10/tdbio.c:1374 g10/tdbio.c:1401
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: error leyendo registro de versi�n: %s\n"
 
-#: g10/tdbio.c:730
+#: g10/tdbio.c:731
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: error escribiendo registro de versi�n: %s\n"
 
-#: g10/tdbio.c:1169
+#: g10/tdbio.c:1170
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de datos de confianza: fallo lseek: %s\n"
 
-#: g10/tdbio.c:1177
+#: g10/tdbio.c:1178
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de datos de confianza: error lectura (n=%d): %s\n"
 
-#: g10/tdbio.c:1198
+#: g10/tdbio.c:1199
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: no es una base de datos de confianza\n"
 
-#: g10/tdbio.c:1216
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registro de versi�n con n�mero de registro %lu\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1222
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versi�n del fichero %d inv�lida\n"
 
-#: g10/tdbio.c:1406
+#: g10/tdbio.c:1407
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: error leyendo registro libre: %s\n"
 
-#: g10/tdbio.c:1414
+#: g10/tdbio.c:1415
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: error escribiendo registro de directorio: %s\n"
 
-#: g10/tdbio.c:1424
+#: g10/tdbio.c:1425
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: fallo en poner a cero un registro: %s\n"
 
-#: g10/tdbio.c:1454
+#: g10/tdbio.c:1455
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: fallo al a�adir un registro: %s\n"
 
-#: g10/tdbio.c:1499
+#: g10/tdbio.c:1500
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "La base de datos de confianza est� da�ada. Por favor, ejecute\n"
 "\"gpg --fix-trust-db\".\n"
 
-#: g10/textfilter.c:147
+#: g10/textfilter.c:148
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "no se pueden manejar l�neas de texto de m�s de %d caracteres\n"
 
-#: g10/textfilter.c:244
+#: g10/textfilter.c:245
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "l�nea de longitud superior a %d caracteres\n"
 
-#: g10/trustdb.c:226
+#: g10/trustdb.c:227
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "'%s' no es un identificador largo de clave v�lido\n"
 
-#: g10/trustdb.c:257
-#, fuzzy, c-format
+#: g10/trustdb.c:258
+#, c-format
 msgid "key %s: accepted as trusted key\n"
-msgstr "clave %08lX: aceptada como clave de confianza\n"
+msgstr "clave %s: aceptada como clave fiable\n"
 
-#: g10/trustdb.c:295
-#, fuzzy, c-format
+#: g10/trustdb.c:296
+#, c-format
 msgid "key %s occurs more than once in the trustdb\n"
-msgstr "clave %08lX aparece m�s de una vez en la base de datos de confianza\n"
+msgstr "la clave %s aparece m�s de una vez en la base de datos de confianza\n"
 
-#: g10/trustdb.c:310
-#, fuzzy, c-format
+#: g10/trustdb.c:311
+#, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
-msgstr "clave %08lX: clave fiable sin clave p�blica - omitida\n"
+msgstr "clave %s: clave fiable sin clave p�blica - omitida\n"
 
-#: g10/trustdb.c:320
-#, fuzzy, c-format
+#: g10/trustdb.c:321
+#, c-format
 msgid "key %s marked as ultimately trusted\n"
-msgstr "clave marcada como de confianza absoluta.\n"
+msgstr "clave %s marcada como de confianza absoluta\n"
 
-#: g10/trustdb.c:344
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "registro de confianza %lu, petici�n tipo %d: fallo lectura: %s\n"
 
-#: g10/trustdb.c:350
+#: g10/trustdb.c:351
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "registro de confianza %lu no es del tipo requerido %d\n"
 
-#: g10/trustdb.c:446
+#: g10/trustdb.c:447
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
-msgstr ""
+msgstr "imposible usar modelo de confianza (%d) - asumiendo el modelo %s\n"
 
-#: g10/trustdb.c:452
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
-msgstr ""
+msgstr "usando %s como modelo de confianza\n"
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
-msgstr ""
+msgstr "13 no apto para supersticiosos"
 
-#: g10/trustdb.c:506
-#, fuzzy
+#: g10/trustdb.c:507
 msgid "[ revoked]"
-msgstr "[revocada]"
+msgstr "[  revocada ]"
 
-#: g10/trustdb.c:508 g10/trustdb.c:513
-#, fuzzy
+#: g10/trustdb.c:509 g10/trustdb.c:514
 msgid "[ expired]"
-msgstr "[caducada]"
+msgstr "[  caducada ]"
 
-#: g10/trustdb.c:512
-#, fuzzy
+#: g10/trustdb.c:513
 msgid "[ unknown]"
-msgstr "desconocido"
+msgstr "[desconocida]"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  undef ]"
-msgstr ""
+msgstr "[no definida]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 msgid "[marginal]"
-msgstr ""
+msgstr "[   dudosa  ]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:517
 msgid "[  full  ]"
-msgstr ""
+msgstr "[   total   ]"
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:518
 msgid "[ultimate]"
-msgstr ""
+msgstr "[  absoluta ]"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "undefined"
-msgstr ""
+msgstr "no definido"
 
-#: g10/trustdb.c:533
-#, fuzzy
+#: g10/trustdb.c:534
 msgid "never"
-msgstr "nunca     "
+msgstr "nunca"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "marginal"
-msgstr ""
+msgstr "dudosa"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:536
 msgid "full"
-msgstr ""
+msgstr "total"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:537
 msgid "ultimate"
-msgstr ""
+msgstr "absoluta"
 
-#: g10/trustdb.c:576
+#: 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:582 g10/trustdb.c:2157
+#: g10/trustdb.c:583 g10/trustdb.c:2309
 #, 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:591
-#, fuzzy, c-format
+#: 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"
+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:606
-#, fuzzy, c-format
+#: g10/trustdb.c:607
+#, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
-msgstr "no es necesaria una comprobaci�n de la base de datos de confianza\n"
+msgstr ""
+"no es necesario comprobar la base de datos de confianza\n"
+"con el modelo `%s'\n"
 
-#: g10/trustdb.c:838 g10/trustdb.c:1276
-#, fuzzy, c-format
+#: g10/trustdb.c:839 g10/trustdb.c:1277
+#, c-format
 msgid "public key %s not found: %s\n"
-msgstr "clave p�blica %08lX no encontrada: %s\n"
+msgstr "clave p�blica %s no encontrada: %s\n"
 
-#: g10/trustdb.c:1033
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr "por favor haga un --check-trustdb\n"
 
-#: g10/trustdb.c:1037
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "comprobando base de datos de confianza\n"
 
-#: g10/trustdb.c:1901
+#: g10/trustdb.c:2053
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d claves procesadas (%d validaciones superadas)\n"
 
-#: g10/trustdb.c:1965
+#: g10/trustdb.c:2117
 msgid "no ultimately trusted keys found\n"
-msgstr "no se encuentran claves totalmente fiables\n"
+msgstr "no se encuentran claves absolutamente fiables\n"
 
-#: g10/trustdb.c:1979
-#, fuzzy, c-format
+#: g10/trustdb.c:2131
+#, c-format
 msgid "public key of ultimately trusted key %s not found\n"
-msgstr "clave p�blica de la clave totalmente fiable %08lX no encontrada\n"
+msgstr "clave p�blica de la clave absolutamente fiable %s no encontrada\n"
 
-#: g10/trustdb.c:2002
+#: g10/trustdb.c:2154
 #, 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:2088
+#: g10/trustdb.c:2240
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
+"nivel: %d  validez: %3d  firmada: %3d  confianza: %d-, %dq, %dn, %dm, %df, %"
+"du\n"
 
-#: g10/trustdb.c:2163
-#, fuzzy, c-format
+#: g10/trustdb.c:2315
+#, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
-msgstr "registro de confianza %lu, tipo %d: fallo escritura: %s\n"
+msgstr ""
+"no se puede actualizar el registro de la versi�n de la base de datos\n"
+"de confianza: fallo de escritura: %s\n"
 
-#: g10/verify.c:116
+#: g10/verify.c:117
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -5757,44 +5671,44 @@ msgstr ""
 "Por favor recuerde que el fichero de firma (.sig o .asc)\n"
 "deber�a ser el primero que se da en la l�nea de �rdenes.\n"
 
-#: g10/verify.c:189
+#: g10/verify.c:190
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "la l�nea %u es demasiado larga o no tiene avance de l�nea (LF)\n"
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "Error general"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "Formato desconocido"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "Versi�n desconocida"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "Algoritmo de clave p�blica desconocido"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "Algoritmo desconocido de resumen de mensaje"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "Clave p�blica incorrecta"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "Clave secreta incorrecta"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "Firma incorrecta"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "Error en la suma de comprobaci�n"
 
@@ -5807,15 +5721,15 @@ msgstr "Error en la suma de comprobaci�n"
 # �Por qu� los ingleses entonces s� que saben lo que es un "passphrase"?
 # �Es que son m�s listos? :-)
 #
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "Frase contrase�a incorrecta"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "Clave p�blica no encontrada"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "Algoritmo de cifrado desconocido"
 
@@ -5829,111 +5743,111 @@ msgstr "Algoritmo de cifrado desconocido"
 # c�mo se dice llavero en ingl�s...
 # Si los ingleses dicen llavero en su idioma �por qu� no vamos a poder
 # nosotros decir lo mismo en el nuestro?
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "No se puede abrir el anillo de claves"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "paquete inv�lido"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "armadura inv�lida"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "no existe el ID de usuario"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "clave secreta no disponible"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "clave secreta incorrecta"
 
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "no disponible"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "clave incorrecta"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "error de lectura"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "error de escritura"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "algoritmo de compresi�n desconocido"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "error al abrir fichero"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "error al crear fichero"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "frase contrase�a incorrecta"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "algoritmo de clave p�blica no implementado"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "algoritmo de cifrado no implementado"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "clase de firma desconocida"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "error en la base de datos de confianza"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "MPI incorrecto"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "l�mite de recurso"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "anillo inv�lido"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "certificado incorrecto"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "ID de usuario mal formado"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "error al cerrar fichero"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "error al renombrar fichero"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "error al borrar fichero"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "datos inesperados"
 
@@ -5941,541 +5855,183 @@ msgstr "datos inesperados"
 # Creo que es mejor "con el sello de fecha", no es un conflicto
 # del sello en si mismo sino en relaci�n con el mensaje.
 # Ok.
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "conflicto con el sello de fecha"
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "algoritmo de clave p�blica no utilizable"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "el fichero existe"
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "clave d�bil"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "argumento inv�lido"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "URI incorrecto"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "URI no disponible"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "error de red"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "no cifrado"
 
-#: util/errors.c:103
+#: util/errors.c:104
 msgid "not processed"
 msgstr "no procesado"
 
-#: util/errors.c:105
+#: util/errors.c:106
 msgid "unusable public key"
 msgstr "clave p�blica inutilizable"
 
-#: util/errors.c:106
+#: util/errors.c:107
 msgid "unusable secret key"
 msgstr "clave secreta inutilizable"
 
-#: util/errors.c:107
+#: util/errors.c:108
 msgid "keyserver error"
 msgstr "error del servidor de claves"
 
-#: util/errors.c:108
-#, fuzzy
+#: util/errors.c:109
 msgid "canceled"
-msgstr "Cancelar"
+msgstr "cancelado"
 
-#: util/errors.c:109
-#, fuzzy
+#: util/errors.c:110
 msgid "no card"
-msgstr "no cifrado"
+msgstr "no hay tarjeta"
 
-#: util/logger.c:157
+#: util/logger.c:158
 msgid "ERROR: "
-msgstr ""
+msgstr "ERROR: "
 
-#: util/logger.c:160
+#: util/logger.c:161
 msgid "WARNING: "
-msgstr ""
+msgstr "ATENCION: "
 
 # bicho :-)
 # �Error simplemente?
 # Uf, preferir�a bug, si leo "error" voy a pensar en otra cosa distinta...
-#: util/logger.c:223
+#: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... esto es un bug (%s:%d:%s)\n"
 
-#: util/logger.c:229
+#: util/logger.c:230
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "ha encontrado un error... (%s:%d)\n"
 
-#: util/miscutil.c:336 util/miscutil.c:373
+#: util/miscutil.c:330 util/miscutil.c:367
 msgid "yes"
-msgstr "s�|si"
+msgstr "s�"
 
-#: util/miscutil.c:337 util/miscutil.c:378
+#: util/miscutil.c:331 util/miscutil.c:372
 msgid "yY"
 msgstr "sS"
 
-#: util/miscutil.c:339 util/miscutil.c:375
+#: util/miscutil.c:333 util/miscutil.c:369
 msgid "no"
 msgstr "no"
 
-#: util/miscutil.c:340 util/miscutil.c:379
+#: util/miscutil.c:334 util/miscutil.c:373
 msgid "nN"
 msgstr "nN"
 
-#: util/miscutil.c:377
+#: util/miscutil.c:371
 msgid "quit"
-msgstr "salir|fin|acabar"
+msgstr "fin"
 
-#: util/miscutil.c:380
+#: util/miscutil.c:374
 msgid "qQ"
-msgstr "sS"
+msgstr "fF"
 
-#: util/miscutil.c:413
+#: util/miscutil.c:407
 msgid "okay|okay"
-msgstr ""
+msgstr "vale|Vale"
 
-#: util/miscutil.c:415
+#: util/miscutil.c:409
 msgid "cancel|cancel"
-msgstr ""
+msgstr "cancelar|Cancelar"
 
-#: util/miscutil.c:416
+#: util/miscutil.c:410
 msgid "oO"
-msgstr ""
+msgstr "vV"
 
-#: util/miscutil.c:417
-#, fuzzy
+#: util/miscutil.c:411
 msgid "cC"
-msgstr "c"
+msgstr "cC"
 
-#: util/secmem.c:90
+#: util/secmem.c:91
 msgid "WARNING: using insecure memory!\n"
 msgstr "ATENCI�N: �se est� usando memoria insegura!\n"
 
-#: util/secmem.c:91
+#: util/secmem.c:92
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "por favor, vea http://www.gnupg.org/faq.html para m�s informaci�n\n"
 
-#: util/secmem.c:343
+#: util/secmem.c:344
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operaci�n imposible sin memoria segura inicializada\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:345
 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 "select secondary key N"
-#~ msgstr "selecciona clave secundaria N"
-
-#~ msgid "list signatures"
-#~ msgstr "lista firmas"
-
-#~ msgid "sign the key"
-#~ msgstr "firma la clave"
-
-#~ msgid "add a secondary key"
-#~ msgstr "a�ade una clave secundaria"
-
-#~ msgid "delete signatures"
-#~ msgstr "borra firmas"
-
-#~ msgid "change the expire date"
-#~ msgstr "cambia fecha de caducidad"
-
-#~ msgid "set preference list"
-#~ msgstr "establece preferencias"
-
-#~ msgid "updated preferences"
-#~ msgstr "preferencias actualizadas"
-
-#~ msgid "No secondary key with index %d\n"
-#~ msgstr "No hay ninguna clave secundaria con el �ndice %d\n"
-
-#~ msgid "--nrsign-key user-id"
-#~ msgstr "--nrsign-key id-usuario"
-
-#~ msgid "--nrlsign-key user-id"
-#~ msgstr "--nrlsign-key id-usuario"
-
-#, fuzzy
-#~ msgid "make a trust signature"
-#~ msgstr "crea una firma separada"
-
-#~ msgid "sign the key non-revocably"
-#~ msgstr "firma la clave irrevocablemente"
-
-#~ msgid "sign the key locally and non-revocably"
-#~ msgstr "firma la clave local e irrevocablemente"
-
-#~ msgid "q"
-#~ msgstr "s"
-
-#~ msgid "help"
-#~ msgstr "ayuda"
-
-#~ msgid "list"
-#~ msgstr "lista"
-
-#~ msgid "l"
-#~ msgstr "l"
-
-#~ msgid "debug"
-#~ msgstr "depura"
-
-#, fuzzy
-#~ msgid "name"
-#~ msgstr "habcla"
-
-#, fuzzy
-#~ msgid "login"
-#~ msgstr "firmal"
-
-#, fuzzy
-#~ msgid "cafpr"
-#~ msgstr "hdac"
-
-#, fuzzy
-#~ msgid "forcesig"
-#~ msgstr "revfir"
-
-#, fuzzy
-#~ msgid "generate"
-#~ msgstr "Error general"
-
-#~ msgid "passwd"
-#~ msgstr "contr"
-
-#~ msgid "save"
-#~ msgstr "graba"
-
-#~ msgid "fpr"
-#~ msgstr "hdac"
-
-#~ msgid "uid"
-#~ msgstr "idu"
-
-#~ msgid "key"
-#~ msgstr "clave"
-
-#~ msgid "check"
-#~ msgstr "comprueba"
-
-#~ msgid "c"
-#~ msgstr "c"
-
-#~ msgid "sign"
-#~ msgstr "firma"
-
-#~ msgid "s"
-#~ msgstr "s"
-
-#, fuzzy
-#~ msgid "tsign"
-#~ msgstr "firma"
-
-#~ msgid "lsign"
-#~ msgstr "firmal"
-
-#~ msgid "nrsign"
-#~ msgstr "firmanr"
-
-#~ msgid "nrlsign"
-#~ msgstr "firmanrl"
-
-#~ msgid "adduid"
-#~ msgstr "a�aidu"
-
-#~ msgid "addphoto"
-#~ msgstr "a�adirfoto"
-
-#~ msgid "deluid"
-#~ msgstr "borridu"
-
-#~ msgid "delphoto"
-#~ msgstr "borfoto"
+#~ msgid "error getting serial number: %s\n"
+#~ msgstr "error obteniendo el n�mero de serie: %s\n"
 
-#, fuzzy
-#~ msgid "addcardkey"
-#~ msgstr "a�acla"
+#~ msgid "Hint: Select the user IDs to sign\n"
+#~ msgstr "Sugerencia: seleccione los identificadores de usuario que firmar\n"
 
-#~ msgid "delkey"
-#~ msgstr "borrcla"
+#~ msgid "length of RSA modulus is not %d\n"
+#~ msgstr "la longitud del m�dulo RSA no es %d\n"
 
-#~ msgid "addrevoker"
-#~ msgstr "a�arevoc"
+#~ msgid "length of an RSA prime is not %d\n"
+#~ msgstr "la longitud del primo RSA no es %d\n"
 
-#~ msgid "delsig"
-#~ msgstr "borrfir"
+#~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+#~ msgstr "frase de paso mala o algoritmo de cifrado desconocido (%d)\n"
 
-#~ msgid "expire"
-#~ msgstr "expira"
+#~ msgid "can't set client pid for the agent\n"
+#~ msgstr "no puedo establecer pid para el agente\n"
 
-#~ msgid "primary"
-#~ msgstr "primaria"
+#~ msgid "can't get server read FD for the agent\n"
+#~ msgstr "no puedo conseguir el FD de lectura para el agente\n"
 
-#~ msgid "toggle"
-#~ msgstr "cambia"
+#~ msgid "can't get server write FD for the agent\n"
+#~ msgstr "no puedo conseguir el FD de escritura para el agente\n"
 
-#~ msgid "t"
-#~ msgstr "t"
+#~ msgid "communication problem with gpg-agent\n"
+#~ msgstr "problema de comunicaci�n con el agente gpg\n"
 
-#~ msgid "pref"
-#~ msgstr "pref"
+#~ msgid "passphrase too long\n"
+#~ msgstr "frase contrase�a demasiado larga\n"
 
-#~ msgid "showpref"
-#~ msgstr "verpref"
+#~ msgid "invalid response from agent\n"
+#~ msgstr "respuesta del agente inv�lida\n"
 
-#~ msgid "setpref"
-#~ msgstr "estpref"
-
-#~ msgid "updpref"
-#~ msgstr "actpref"
-
-#, fuzzy
-#~ msgid "keyserver"
-#~ msgstr "error del servidor de claves"
-
-#~ msgid "trust"
-#~ msgstr "conf"
-
-#~ msgid "revsig"
-#~ msgstr "revfir"
-
-#~ msgid "revuid"
-#~ msgstr "revidu"
-
-#~ msgid "revkey"
-#~ msgstr "revcla"
-
-#~ msgid "disable"
-#~ msgstr "descla"
-
-#~ msgid "enable"
-#~ msgstr "habcla"
-
-#~ msgid "showphoto"
-#~ msgstr "verfoto"
+#~ msgid "problem with the agent: agent returns 0x%lx\n"
+#~ msgstr "problema con el agente: el agente devuelve 0x%lx\n"
 
 #~ msgid "digest algorithm `%s' is read-only in this release\n"
 #~ msgstr "el algoritmo de resumen `%s' es de s�lo lectura en esta versi�n\n"
 
 #~ msgid ""
-#~ "About to generate a new %s keypair.\n"
-#~ "              minimum keysize is  768 bits\n"
-#~ "              default keysize is 1024 bits\n"
-#~ "    highest suggested keysize is 2048 bits\n"
-#~ msgstr ""
-#~ "Listo para generar un nuevo par de claves %s.\n"
-#~ "              el tama�o m�nimo es 768 bits\n"
-#~ "        el tama�o por defecto es 1024 bits\n"
-#~ " el tama�o m�ximo recomendado es 2048 bits\n"
-
-#~ msgid "DSA only allows keysizes from 512 to 1024\n"
-#~ msgstr "DSA s�lo permite tama�os desde 512 a 1024\n"
-
-#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-#~ msgstr ""
-#~ "tama�o de clave insuficiente; 1024 es el m�nimo permitido para RSA.\n"
-
-#~ msgid "keysize too small; 768 is smallest value allowed.\n"
-#~ msgstr "tama�o insuficiente; 768 es el valor m�nimo permitido\n"
-
-#~ msgid "keysize too large; %d is largest value allowed.\n"
-#~ msgstr "tama�o excesivo; %d es el m�ximo valor permitido.\n"
-
-#~ msgid ""
-#~ "Keysizes larger than 2048 are not suggested because\n"
-#~ "computations take REALLY long!\n"
-#~ msgstr ""
-#~ "No se recomiendan claves de m�s de 2048 bits porque\n"
-#~ "�el tiempo de c�lculo es REALMENTE largo!\n"
-
-#, fuzzy
-#~ msgid "Are you sure that you want this keysize? (y/N) "
-#~ msgstr "�Seguro que quiere una clave de este tama�o? "
-
-#~ msgid ""
-#~ "Okay, but keep in mind that your monitor and keyboard radiation is also "
-#~ "very vulnerable to attacks!\n"
-#~ msgstr ""
-#~ "De acuerdo, �pero tenga en cuenta que las radiaciones de su monitor y\n"
-#~ "teclado tambi�n son vulnerables a un ataque!\n"
-
-#~ msgid "Experimental algorithms should not be used!\n"
-#~ msgstr "�No se deber�an usar algoritmos experimentales!\n"
-
-#~ msgid ""
-#~ "this cipher algorithm is deprecated; please use a more standard one!\n"
-#~ msgstr ""
-#~ "ese algoritmo de cifrado est� desacreditado;�por favor use uno m�s "
-#~ "est�ndar!\n"
-
-#, fuzzy
-#~ msgid "writing to file `%s'\n"
-#~ msgstr "escribiendo en `%s'\n"
-
-#~ msgid "sorry, can't do this in batch mode\n"
-#~ msgstr "lo siento, no puede hacerse en modo de proceso por lotes\n"
-
-#~ msgid "key `%s' not found: %s\n"
-#~ msgstr "clave '%s' no encontrada: %s\n"
-
-#, fuzzy
-#~ msgid "can't create file `%s': %s\n"
-#~ msgstr "no se puede crear %s: %s\n"
-
-#, fuzzy
-#~ msgid "can't open file `%s': %s\n"
-#~ msgstr "no puede abrirse el fichero: %s\n"
-
-#, fuzzy
-#~ msgid "          \""
-#~ msgstr "                alias \""
-
-#~ msgid " i = please show me more information\n"
-#~ msgstr " i = por favor mu�streme m�s informaci�n\n"
-
-#~ msgid "key %08lX: key has been revoked!\n"
-#~ msgstr "clave %08lX: �esta clave ha sido revocada!\n"
-
-#~ msgid "key %08lX: subkey has been revoked!\n"
-#~ msgstr "clave %08lX: �esta subclave ha sido revocada!\n"
-
-#~ msgid "%08lX: key has expired\n"
-#~ msgstr "%08lX: clave caducada\n"
-
-#~ msgid "%08lX: We do NOT trust this key\n"
-#~ msgstr "%08lX: �Esta clave NO es de confianza!\n"
-
-#~ msgid "   (%d) RSA (sign and encrypt)\n"
-#~ msgstr "   (%d) RSA (firmar y cifrar)\n"
-
-#, fuzzy
-#~ msgid "   (%d) RSA (auth only)\n"
-#~ msgstr "   (%d) RSA (s�lo firmar)\n"
-
-#, fuzzy
-#~ msgid "   (%d) RSA (sign and auth)\n"
-#~ msgstr "   (%d) RSA (firmar y cifrar)\n"
-
-#, fuzzy
-#~ msgid "   (%d) RSA (encrypt and auth)\n"
-#~ msgstr "   (%d) RSA (s�lo cifrar)\n"
-
-#, fuzzy
-#~ msgid "  (%d) RSA (sign, encrypt and auth)\n"
-#~ msgstr "   (%d) RSA (firmar y cifrar)\n"
-
-#~ msgid "%s: can't open: %s\n"
-#~ msgstr "%s: no se puede abrir: %s\n"
-
-#~ msgid "%s: WARNING: empty file\n"
-#~ msgstr "%s: ATENCI�N: fichero vac�o\n"
-
-#~ msgid "can't open %s: %s\n"
-#~ msgstr "no se puede abrir `%s': %s\n"
-
-#, fuzzy
-#~ msgid "   (%d) I trust marginally\n"
-#~ msgstr " %d = Conf�o poco\n"
-
-#, fuzzy
-#~ msgid "   (%d) I trust fully\n"
-#~ msgstr " %d = Conf�o totalmente\n"
-
-#~ msgid "Really sign? "
-#~ msgstr "�Firmar de verdad? "
-
-#, fuzzy
-#~ msgid "expires"
-#~ msgstr "expira"
-
-#, fuzzy
-#~ msgid ""
-#~ "\"\n"
-#~ "locally signed with your key %s at %s\n"
-#~ msgstr ""
-#~ "\"\n"
-#~ "firmada localmente con su clave %08lX el %s\n"
-
-#, fuzzy
-#~ msgid "   signed by %s on %s%s\n"
-#~ msgstr "   firmada por %08lX el %s%s\n"
-
-#~ msgid "%s: can't access: %s\n"
-#~ msgstr "%s: no se puede abrir: %s\n"
-
-#~ msgid "%s: can't create lock\n"
-#~ msgstr "%s: no se puede crear bloqueo\n"
-
-#~ msgid "%s: can't make lock\n"
-#~ msgstr "%s: no se puede crear bloqueo\n"
-
-#~ msgid "%s: can't create: %s\n"
-#~ msgstr "%s: no se puede crear: %s\n"
-
-#~ msgid "%s: can't create directory: %s\n"
-#~ msgstr "%s: no se puede crear el directorio: %s\n"
-
-#~ msgid "If you want to use this revoked key anyway, answer \"yes\"."
-#~ msgstr "Si quiere usar esta clave revocada de todos modos, conteste \"s�\"."
-
-#~ msgid "Unable to open photo \"%s\": %s\n"
-#~ msgstr "Imposible abrir fotograf�a \"%s\": %s\n"
-
-#~ msgid "can't open file: %s\n"
-#~ msgstr "no puede abrirse el fichero: %s\n"
-
-#~ msgid "error: missing colon\n"
-#~ msgstr "error: falta ':'\n"
-
-#~ msgid "error: no ownertrust value\n"
-#~ msgstr "error: no hay valor de confianza del propietario\n"
-
-#~ msgid " (main key ID %08lX)"
-#~ msgstr "(ID clave primaria %08lX)"
-
-#~ msgid "rev! subkey has been revoked: %s\n"
-#~ msgstr "rev! �esta subclave ha sido revocada! %s\n"
-
-#~ msgid "rev- faked revocation found\n"
-#~ msgstr "rev-  se encontr� una revocaci�n falsificada\n"
-
-#~ msgid "rev? problem checking revocation: %s\n"
-#~ msgstr "rev? problema comprobando la revocaci�n: %s\n"
-
-#, fuzzy
-#~ msgid " [expired: %s]"
-#~ msgstr " [caduca: %s]"
-
-#~ msgid " [expires: %s]"
-#~ msgstr " [caduca: %s]"
-
-#, fuzzy
-#~ msgid " [revoked: %s]"
-#~ msgstr "[revocada]"
-
-#~ msgid "can't create %s: %s\n"
-#~ msgstr "no se puede crear %s: %s\n"
-
-#~ msgid ""
 #~ "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
 #~ msgstr ""
 #~ "AVISO: el resumen `%s' no es parte de OpenPGP. ��selo bajo su "
@@ -6638,6 +6194,30 @@ msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 #~ msgid "compress algorithm must be in range %d..%d\n"
 #~ msgstr "el algoritmo de compresi�n debe estar en el rango %d-%d\n"
 
+#~ msgid "--nrsign-key user-id"
+#~ msgstr "--nrsign-key id-usuario"
+
+#~ msgid "--nrlsign-key user-id"
+#~ msgstr "--nrlsign-key id-usuario"
+
+#~ msgid "can't open %s: %s\n"
+#~ msgstr "no se puede abrir `%s': %s\n"
+
+#~ msgid " i = please show me more information\n"
+#~ msgstr " i = por favor mu�streme m�s informaci�n\n"
+
+#~ msgid "key %08lX: key has been revoked!\n"
+#~ msgstr "clave %08lX: �esta clave ha sido revocada!\n"
+
+#~ msgid "key %08lX: subkey has been revoked!\n"
+#~ msgstr "clave %08lX: �esta subclave ha sido revocada!\n"
+
+#~ msgid "%08lX: key has expired\n"
+#~ msgstr "%08lX: clave caducada\n"
+
+#~ msgid "%08lX: We do NOT trust this key\n"
+#~ msgstr "%08lX: �Esta clave NO es de confianza!\n"
+
 #~ msgid ""
 #~ "%08lX: It is not sure that this key really belongs to the owner\n"
 #~ "but it is accepted anyway\n"
@@ -6648,6 +6228,56 @@ msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 #~ msgid "preference %c%lu is not valid\n"
 #~ msgstr "la preferencia %c%lu no es v�lida\n"
 
+#~ msgid "   (%d) RSA (sign and encrypt)\n"
+#~ msgstr "   (%d) RSA (firmar y cifrar)\n"
+
+#~ msgid ""
+#~ "About to generate a new %s keypair.\n"
+#~ "              minimum keysize is  768 bits\n"
+#~ "              default keysize is 1024 bits\n"
+#~ "    highest suggested keysize is 2048 bits\n"
+#~ msgstr ""
+#~ "Listo para generar un nuevo par de claves %s.\n"
+#~ "              el tama�o m�nimo es 768 bits\n"
+#~ "        el tama�o por defecto es 1024 bits\n"
+#~ " el tama�o m�ximo recomendado es 2048 bits\n"
+
+#~ msgid "DSA only allows keysizes from 512 to 1024\n"
+#~ msgstr "DSA s�lo permite tama�os desde 512 a 1024\n"
+
+#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+#~ msgstr ""
+#~ "tama�o de clave insuficiente; 1024 es el m�nimo permitido para RSA.\n"
+
+#~ msgid "keysize too small; 768 is smallest value allowed.\n"
+#~ msgstr "tama�o insuficiente; 768 es el valor m�nimo permitido\n"
+
+#~ msgid "keysize too large; %d is largest value allowed.\n"
+#~ msgstr "tama�o excesivo; %d es el m�ximo valor permitido.\n"
+
+#~ msgid ""
+#~ "Keysizes larger than 2048 are not suggested because\n"
+#~ "computations take REALLY long!\n"
+#~ msgstr ""
+#~ "No se recomiendan claves de m�s de 2048 bits porque\n"
+#~ "�el tiempo de c�lculo es REALMENTE largo!\n"
+
+#~ msgid "Are you sure that you want this keysize? "
+#~ msgstr "�Seguro que quiere una clave de este tama�o? "
+
+#~ msgid ""
+#~ "Okay, but keep in mind that your monitor and keyboard radiation is also "
+#~ "very vulnerable to attacks!\n"
+#~ msgstr ""
+#~ "De acuerdo, �pero tenga en cuenta que las radiaciones de su monitor y\n"
+#~ "teclado tambi�n son vulnerables a un ataque!\n"
+
+#~ msgid "%s: can't open: %s\n"
+#~ msgstr "%s: no se puede abrir: %s\n"
+
+#~ msgid "%s: WARNING: empty file\n"
+#~ msgstr "%s: ATENCI�N: fichero vac�o\n"
+
 #~ msgid "key %08lX: not a rfc2440 key - skipped\n"
 #~ msgstr "clave %08lX: no es conforme a rfc2440 - omitida\n"
 
@@ -6660,15 +6290,178 @@ msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 #~ msgid " (default)"
 #~ msgstr "(por defecto)"
 
+#~ msgid "Really sign? "
+#~ msgstr "�Firmar de verdad? "
+
+#~ msgid "q"
+#~ msgstr "s"
+
+#~ msgid "save"
+#~ msgstr "graba"
+
+#~ msgid "help"
+#~ msgstr "ayuda"
+
+#~ msgid "fpr"
+#~ msgstr "hdac"
+
+#~ msgid "list"
+#~ msgstr "lista"
+
+#~ msgid "l"
+#~ msgstr "l"
+
+#~ msgid "uid"
+#~ msgstr "idu"
+
+#~ msgid "key"
+#~ msgstr "clave"
+
+#~ msgid "select secondary key N"
+#~ msgstr "selecciona clave secundaria N"
+
+#~ msgid "check"
+#~ msgstr "comprueba"
+
+#~ msgid "list signatures"
+#~ msgstr "lista firmas"
+
+#~ msgid "sign the key"
+#~ msgstr "firma la clave"
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#~ msgid "lsign"
+#~ msgstr "firmal"
+
+#~ msgid "nrsign"
+#~ msgstr "firmanr"
+
+#~ msgid "sign the key non-revocably"
+#~ msgstr "firma la clave irrevocablemente"
+
+#~ msgid "nrlsign"
+#~ msgstr "firmanrl"
+
+#~ msgid "sign the key locally and non-revocably"
+#~ msgstr "firma la clave local e irrevocablemente"
+
+#~ msgid "debug"
+#~ msgstr "depura"
+
+#~ msgid "adduid"
+#~ msgstr "a�aidu"
+
+#~ msgid "addphoto"
+#~ msgstr "a�adirfoto"
+
+#~ msgid "deluid"
+#~ msgstr "borridu"
+
+#~ msgid "delphoto"
+#~ msgstr "borfoto"
+
+#~ msgid "add a secondary key"
+#~ msgstr "a�ade una clave secundaria"
+
+#~ msgid "delkey"
+#~ msgstr "borrcla"
+
+#~ msgid "addrevoker"
+#~ msgstr "a�arevoc"
+
+#~ msgid "delsig"
+#~ msgstr "borrfir"
+
+#~ msgid "delete signatures"
+#~ msgstr "borra firmas"
+
+#~ msgid "primary"
+#~ msgstr "primaria"
+
+#~ msgid "toggle"
+#~ msgstr "cambia"
+
+#~ msgid "t"
+#~ msgstr "t"
+
+#~ msgid "pref"
+#~ msgstr "pref"
+
+#~ msgid "showpref"
+#~ msgstr "verpref"
+
+#~ msgid "setpref"
+#~ msgstr "estpref"
+
+#~ msgid "updpref"
+#~ msgstr "actpref"
+
+#~ msgid "passwd"
+#~ msgstr "contr"
+
+#~ msgid "trust"
+#~ msgstr "conf"
+
+#~ msgid "revsig"
+#~ msgstr "revfir"
+
+#~ msgid "revoke signatures"
+#~ msgstr "revoca firmas"
+
+#~ msgid "revuid"
+#~ msgstr "revidu"
+
+#~ msgid "revoke a user ID"
+#~ msgstr "revocar un identificador de usuario"
+
+#~ msgid "revkey"
+#~ msgstr "revcla"
+
+#~ msgid "showphoto"
+#~ msgstr "verfoto"
+
 #~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 #~ msgstr "%s%c %4u%c/%08lX  creada: %s expira: %s"
 
+#~ msgid "rev! subkey has been revoked: %s\n"
+#~ msgstr "rev! �esta subclave ha sido revocada! %s\n"
+
+#~ msgid "rev- faked revocation found\n"
+#~ msgstr "rev-  se encontr� una revocaci�n falsificada\n"
+
+#~ msgid "rev? problem checking revocation: %s\n"
+#~ msgstr "rev? problema comprobando la revocaci�n: %s\n"
+
+#~ msgid ""
+#~ "\"\n"
+#~ "locally signed with your key %08lX at %s\n"
+#~ msgstr ""
+#~ "\"\n"
+#~ "firmada localmente con su clave %08lX el %s\n"
+
+#~ msgid "   signed by %08lX at %s%s%s\n"
+#~ msgstr "   firmada por %08lX el %s%s%s\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: "
 
+#~ msgid "Experimental algorithms should not be used!\n"
+#~ msgstr "�No se deber�an usar algoritmos experimentales!\n"
+
+#~ msgid ""
+#~ "this cipher algorithm is deprecated; please use a more standard one!\n"
+#~ msgstr ""
+#~ "ese algoritmo de cifrado est� desacreditado;�por favor use uno m�s "
+#~ "est�ndar!\n"
+
 #~ msgid "can't get key from keyserver: %s\n"
 #~ msgstr "no puede obtenerse la clave en el servidor: %s\n"
 
@@ -6708,6 +6501,18 @@ msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 #~ "clave %08lX creada %lu segundos en el futuro (salto en el tiempo o\n"
 #~ "problemas con el reloj)\n"
 
+#~ msgid "%s: can't access: %s\n"
+#~ msgstr "%s: no se puede abrir: %s\n"
+
+#~ msgid "%s: can't create lock\n"
+#~ msgstr "%s: no se puede crear bloqueo\n"
+
+#~ msgid "%s: can't make lock\n"
+#~ msgstr "%s: no se puede crear bloqueo\n"
+
+#~ msgid "%s: can't create: %s\n"
+#~ msgstr "%s: no se puede crear: %s\n"
+
 #~ msgid "key %08lX marked as ultimately trusted\n"
 #~ msgstr "clave %08lX marcada como de confianza absoluta\n"
 
@@ -6722,6 +6527,12 @@ msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 #~ "comprobando en profundidad %d firmado=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%"
 #~ "d\n"
 
+#~ msgid "%s: can't create directory: %s\n"
+#~ msgstr "%s: no se puede crear el directorio: %s\n"
+
+#~ msgid "If you want to use this revoked key anyway, answer \"yes\"."
+#~ msgstr "Si quiere usar esta clave revocada de todos modos, conteste \"s�\"."
+
 #~ msgid ""
 #~ "Select the algorithm to use.\n"
 #~ "\n"
@@ -6785,6 +6596,18 @@ msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 #~ msgid "key %08lX incomplete\n"
 #~ msgstr "clave %08lX incompleta\n"
 
+#~ msgid "sorry, can't do this in batch mode\n"
+#~ msgstr "lo siento, no puede hacerse en modo de proceso por lotes\n"
+
+#~ msgid "can't open file: %s\n"
+#~ msgstr "no puede abrirse el fichero: %s\n"
+
+#~ msgid "error: missing colon\n"
+#~ msgstr "error: falta ':'\n"
+
+#~ msgid "error: no ownertrust value\n"
+#~ msgstr "error: no hay valor de confianza del propietario\n"
+
 #, fuzzy
 #~ msgid "quit|quit"
 #~ msgstr "salir"
@@ -7089,19 +6912,12 @@ msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 #~ msgid "%s: can't create keyring: %s\n"
 #~ msgstr "%s: no se puede crear el anillo: %s\n"
 
-#, fuzzy
-#~ msgid "invalid"
-#~ msgstr "Armadura no v�lida"
-
 #~ msgid "RSA key cannot be used in this version\n"
 #~ msgstr "No puede usarse clave RSA en esta versi�n\n"
 
 #~ msgid "No key for user ID\n"
 #~ msgstr "No hay clave para tal usuario\n"
 
-#~ msgid "No user ID for key\n"
-#~ msgstr "No hay clave secreta para tal usuario\n"
-
 #~ msgid "no secret key for decryption available\n"
 #~ msgstr "clave secreta para descifrado no disponible\n"
 
@@ -7192,9 +7008,6 @@ msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 #~ msgid "lid %lu: okay\n"
 #~ msgstr "lid %lu: bien\n"
 
-#~ msgid "%s: keyblock read problem: %s\n"
-#~ msgstr "%s: problema lectura del bloque de clave: %s\n"
-
 #~ msgid "%s: update failed: %s\n"
 #~ msgstr "%s: actualizaci�n fallida: %s\n"
 
diff --git a/po/et.po b/po/et.po
index 0db8fcdfd..12390b813 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: 2005-03-15 16:35+0100\n"
+"POT-Creation-Date: 2005-05-31 10:05+0200\n"
 "PO-Revision-Date: 2004-06-17 11:04+0300\n"
 "Last-Translator: Toomas Soome <[email protected]>\n"
 "Language-Team: Estonian <[email protected]>\n"
@@ -14,80 +14,80 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: cipher/primegen.c:120
+#: cipher/primegen.c:121
 #, fuzzy, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr "v�hem kui %d bitiga ei saa algarvu genereerida\n"
 
-#: cipher/primegen.c:311
+#: cipher/primegen.c:312
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "v�hem kui %d bitiga ei saa algarvu genereerida\n"
 
-#: cipher/random.c:163
+#: cipher/random.c:164
 msgid "no entropy gathering module detected\n"
 msgstr "entroopia kogumise moodul puudub\n"
 
-#: cipher/random.c:387 g10/card-util.c:656 g10/card-util.c:725
-#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2255
-#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
-#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
-#: g10/tdbio.c:600
+#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
+#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
+#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
+#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
+#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/tdbio.c:601
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' ei �nnestu avada: %s\n"
 
-#: cipher/random.c:391
+#: cipher/random.c:392
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "ei �nnestu lugeda `%s' atribuute: %s\n"
 
-#: cipher/random.c:396
+#: cipher/random.c:397
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' ei ole tavaline fail - ignoreerin\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:402
 msgid "note: random_seed file is empty\n"
 msgstr "m�rkus: random_seed fail on t�hi\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:408
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "HOIATUS: vigane random_seed faili suurus - ei kasuta\n"
 
-#: cipher/random.c:415
+#: cipher/random.c:416
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "`%s' ei �nnestu lugeda: %s\n"
 
-#: cipher/random.c:453
+#: cipher/random.c:454
 msgid "note: random_seed file not updated\n"
 msgstr "m�rkus: random_seed faili ei uuendatud\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2723
-#: g10/keygen.c:2753 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
-#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:481
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "`%s' ei �nnestu kirjutada: %s\n"
 
-#: cipher/random.c:483
+#: cipher/random.c:484
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "`%s' ei �nnestu sulgeda: %s\n"
 
-#: cipher/random.c:728
+#: cipher/random.c:729
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "HOIATUS: kasutan ebaturvalist juhuarvude generaatorit!!\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:730
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -101,7 +101,7 @@ msgstr ""
 "�RGE KASUTAGE SELLE PROGRAMMI POOLT GENEREERITUD ANDMEID!!\n"
 "\n"
 
-#: cipher/rndegd.c:204
+#: cipher/rndegd.c:205
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -110,7 +110,7 @@ msgstr ""
 "Palun oodake, kogutakse entroopiat. Igavuse v�ltimiseks v�ite teha arvutiga\n"
 "mingit t��d, see t�stab ka entroopia kvaliteeti.\n"
 
-#: cipher/rndlinux.c:134
+#: cipher/rndlinux.c:135
 #, c-format
 msgid ""
 "\n"
@@ -121,45 +121,62 @@ msgstr ""
 "Juhuslikke baite ei ole piisavalt. Palun tehke arvutiga muid t�id,\n"
 "et anda masinal v�imalust koguda enam entroopiat! (Vajatakse %d baiti)\n"
 
-#: g10/app-openpgp.c:547
+#: g10/app-openpgp.c:596
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/app-openpgp.c:560
+#: g10/app-openpgp.c:609
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "v�tmehoidla vahem�lu uuesti loomine eba�nnestus: %s\n"
 
-#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
+#: g10/app-openpgp.c:977
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
+
+#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+msgid "response does not contain the public key data\n"
+msgstr ""
+
+#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
-#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
+#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
+#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
 
-#: g10/app-openpgp.c:836
+#: g10/app-openpgp.c:1310
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:857
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:862
+#: g10/app-openpgp.c:1336
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -167,353 +184,358 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:869
+#: g10/app-openpgp.c:1343
 msgid "|A|Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1018
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:1492
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1018
+#: g10/app-openpgp.c:1492
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1022
+#: g10/app-openpgp.c:1496
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
+#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "viga v�tmebloki lugemisel: %s\n"
 
-#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
+#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: viga vaba kirje lugemisel: %s\n"
 
-#: g10/app-openpgp.c:1104
+#: g10/app-openpgp.c:1562
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' on juba pakitud\n"
 
-#: g10/app-openpgp.c:1108
+#: g10/app-openpgp.c:1566
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1110
+#: g10/app-openpgp.c:1568
 #, fuzzy
 msgid "generating new key\n"
 msgstr "genereeri uus v�tmepaar"
 
-#: g10/app-openpgp.c:1120
+#: g10/app-openpgp.c:1735
+msgid "creation timestamp missing\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1742
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1749
+#, c-format
+msgid "RSA public exponent missing or largerr than %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1827
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
+
+#: g10/app-openpgp.c:1886
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1135
+#: g10/app-openpgp.c:1901
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1904
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
-msgid "response does not contain the public key data\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
-msgid "response does not contain the RSA modulus\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
-msgid "response does not contain the RSA public exponent\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1195
+#: g10/app-openpgp.c:1961
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1356
+#: g10/app-openpgp.c:2130
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1364
+#: g10/app-openpgp.c:2138
 #, c-format
-msgid "PIN [sigs done: %lu]"
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
+#: g10/app-openpgp.c:2399
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "ei leia OpenPGP andmeid.\n"
 
-#: g10/app-openpgp.c:1731
-#, fuzzy, c-format
-msgid "error getting serial number: %s\n"
-msgstr "viga parooli loomisel: %s\n"
-
-#: g10/app-openpgp.c:1826
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
-
-#: g10/app-openpgp.c:1868
-#, fuzzy
-msgid "reading the key failed\n"
-msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
-
-#: g10/armor.c:317
+#: g10/armor.c:318
 #, c-format
 msgid "armor: %s\n"
 msgstr "pakend: %s\n"
 
-#: g10/armor.c:346
+#: g10/armor.c:347
 msgid "invalid armor header: "
 msgstr "vigane pakendi p�is: "
 
-#: g10/armor.c:353
+#: g10/armor.c:354
 msgid "armor header: "
 msgstr "pakendi p�is: "
 
-#: g10/armor.c:364
+#: g10/armor.c:365
 msgid "invalid clearsig header\n"
 msgstr "vigane avateksti allkirja p�is\n"
 
-#: g10/armor.c:416
+#: g10/armor.c:417
 msgid "nested clear text signatures\n"
 msgstr "avateksti allkirjad �ksteise sees\n"
 
-#: g10/armor.c:551
+#: g10/armor.c:552
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "ootamatu pakend:"
 
-#: g10/armor.c:563
+#: g10/armor.c:564
 msgid "invalid dash escaped line: "
 msgstr "vigane kriipsudega m�rgitud rida: "
 
-#: g10/armor.c:715 g10/armor.c:1322
+#: g10/armor.c:716 g10/armor.c:1323
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "vigane radix64 s�mbol %02x vahele j�etud\n"
 
-#: g10/armor.c:758
+#: g10/armor.c:759
 msgid "premature eof (no CRC)\n"
 msgstr "enneaegne failil�pp (puudub CRC)\n"
 
-#: g10/armor.c:792
+#: g10/armor.c:793
 msgid "premature eof (in CRC)\n"
 msgstr "enneaegne failil�pp (poolik CRC)\n"
 
-#: g10/armor.c:800
+#: g10/armor.c:801
 msgid "malformed CRC\n"
 msgstr "vigane CRC\n"
 
-#: g10/armor.c:804 g10/armor.c:1359
+#: g10/armor.c:805 g10/armor.c:1360
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC viga; %06lx - %06lx\n"
 
-#: g10/armor.c:824
+#: g10/armor.c:825
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "enneaegne failil�pp (l�petaval real)\n"
 
-#: g10/armor.c:828
+#: g10/armor.c:829
 msgid "error in trailer line\n"
 msgstr "viga l�petaval real\n"
 
-#: g10/armor.c:1137
+#: g10/armor.c:1138
 msgid "no valid OpenPGP data found.\n"
 msgstr "ei leia OpenPGP andmeid.\n"
 
-#: g10/armor.c:1142
+#: g10/armor.c:1143
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "vigane pakend: rida on pikem, kui %d s�mbolit\n"
 
-#: g10/armor.c:1146
+#: g10/armor.c:1147
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "kvooditud s�mbol pakendis - t�en�oliselt on kasutatud vigast MTA programmi\n"
 
-#: g10/card-util.c:58 g10/card-util.c:295
+#: g10/card-util.c:63 g10/card-util.c:303
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "salajane v�ti ei ole k�ttesaadav"
 
-#: g10/card-util.c:63
+#: g10/card-util.c:68
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1329 g10/delkey.c:127 g10/keyedit.c:1430
-#: g10/keygen.c:2439 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1510
+#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "seda ei saa teha pakettmoodis\n"
 
-#: g10/card-util.c:97 g10/card-util.c:1108 g10/card-util.c:1191
-#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
-#: g10/keygen.c:1365
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
+#: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "Teie valik? "
 
-#: g10/card-util.c:206 g10/card-util.c:256
+#: g10/card-util.c:213 g10/card-util.c:263
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:391
+#: g10/card-util.c:410
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 #, fuzzy
 msgid "unspecified"
 msgstr "P�hjus puudub"
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 #, fuzzy
 msgid "not forced"
 msgstr "ei t��deldud"
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:497
+#: g10/card-util.c:516
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:499
+#: g10/card-util.c:518
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:501
+#: g10/card-util.c:520
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:518
+#: g10/card-util.c:537
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:539
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:538
+#: g10/card-util.c:557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:559
+#: g10/card-util.c:578
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "vastavat avalikku v�tit pole: %s\n"
 
-#: g10/card-util.c:567
+#: g10/card-util.c:586
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:665 g10/card-util.c:734 g10/import.c:261
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:692
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:683
+#: g10/card-util.c:702
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:742
+#: g10/card-util.c:761
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:752
+#: g10/card-util.c:771
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:772
+#: g10/card-util.c:791
 #, fuzzy
 msgid "Language preferences: "
 msgstr "uuendatud eelistused"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:799
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "lubamatu s�mbol eelistuste s�nes\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:808
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "lubamatu s�mbol eelistuste s�nes\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:829
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:824
+#: g10/card-util.c:843
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "viga: vigane s�rmej�lg\n"
 
-#: g10/card-util.c:845
+#: g10/card-util.c:864
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "n�ita s�rmej�lge"
 
-#: g10/card-util.c:868
+#: g10/card-util.c:887
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "viga: vigane s�rmej�lg\n"
 
-#: g10/card-util.c:916
+#: g10/card-util.c:935
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: g10/card-util.c:917
+#: g10/card-util.c:936
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "ei leia OpenPGP andmeid.\n"
 
-#: g10/card-util.c:926
+#: g10/card-util.c:945
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1030
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1030 g10/card-util.c:1039
+#: g10/card-util.c:1051 g10/card-util.c:1060
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1051
+#: g10/card-util.c:1072
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1060
+#: g10/card-util.c:1081
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -521,282 +543,286 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1099
+#: g10/card-util.c:1120
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Palun valige, millist v�tmet��pi te soovite:\n"
 
-#: g10/card-util.c:1101 g10/card-util.c:1182
+#: g10/card-util.c:1122 g10/card-util.c:1203
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/card-util.c:1102 g10/card-util.c:1184
+#: g10/card-util.c:1123 g10/card-util.c:1205
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/card-util.c:1103 g10/card-util.c:1186
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1119 g10/card-util.c:1202 g10/keyedit.c:908
-#: g10/keygen.c:1404 g10/revoke.c:642
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
+#: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "Vigane valik.\n"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1200
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Palun valige t�histamise p�hjus:\n"
 
-#: g10/card-util.c:1214
+#: g10/card-util.c:1235
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "tundmatu kaitsealgoritm\n"
 
-#: g10/card-util.c:1219
+#: g10/card-util.c:1240
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
 
-#: g10/card-util.c:1224
+#: g10/card-util.c:1245
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/card-util.c:1294 g10/keyedit.c:1317
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "v�lju sellest men��st"
 
-#: g10/card-util.c:1296
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "show admin commands"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/card-util.c:1297 g10/keyedit.c:1320
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "n�ita seda abiinfot"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "list all available data"
 msgstr "V�tme leiate: "
 
-#: g10/card-util.c:1302
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1303
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1304
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1305
+#: g10/card-util.c:1327
 #, fuzzy
 msgid "change the login name"
 msgstr "muuda aegumise kuup�eva"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muuda omaniku usaldust"
 
-#: g10/card-util.c:1307
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1308
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "n�ita s�rmej�lge"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1310
+#: g10/card-util.c:1332
 #, fuzzy
 msgid "generate new keys"
 msgstr "genereeri uus v�tmepaar"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1377 g10/keyedit.c:1526
+#: g10/card-util.c:1334
+msgid "verify the PIN and list all data"
+msgstr ""
+
+#: g10/card-util.c:1454 g10/keyedit.c:1609
 msgid "Command> "
 msgstr "K�sklus> "
 
-#: g10/card-util.c:1412
+#: g10/card-util.c:1492
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/card-util.c:1430
+#: g10/card-util.c:1525
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/card-util.c:1499 g10/keyedit.c:2104
+#: g10/card-util.c:1599 g10/keyedit.c:2210
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Vigane k�sklus (proovige \"help\")\n"
 
-#: g10/cardglue.c:287
+#: g10/cardglue.c:396
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:519
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:380
+#: g10/cardglue.c:527
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:852
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:853
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:854
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:691
+#: g10/cardglue.c:855
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:705
+#: g10/cardglue.c:872
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Korrake parooli: "
 
-#: g10/cardglue.c:719
+#: g10/cardglue.c:886
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "parooli ei korratud �ieti; proovige uuesti"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
-#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' ei �nnestu avada\n"
 
-#: g10/decrypt.c:104 g10/encode.c:859
+#: g10/decrypt.c:105 g10/encode.c:846
 msgid "--output doesn't work for this command\n"
 msgstr "v�ti --output ei t��ta selle k�suga\n"
 
-#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3167 g10/keyserver.c:1511
-#: g10/revoke.c:226
+#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3346 g10/keyserver.c:1541
+#: g10/revoke.c:227
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "v�tit '%s' ei leitud: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2300 g10/keyserver.c:1525
-#: g10/revoke.c:232 g10/revoke.c:439
+#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "viga v�tmebloki lugemisel: %s\n"
 
-#: g10/delkey.c:128 g10/delkey.c:135
+#: g10/delkey.c:129 g10/delkey.c:136
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(kui te just ei m��ra v�tit s�rmej�ljega)\n"
 
-#: g10/delkey.c:134
+#: g10/delkey.c:135
 #, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "pakettmoodis ei �nnestu seda teha v�tmeta \"--yes\"\n"
 
-#: g10/delkey.c:146
+#: g10/delkey.c:147
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Kustutan selle v�tme v�tmehoidlast? "
 
-#: g10/delkey.c:154
+#: g10/delkey.c:155
 #, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "See on salajane v�ti! - kas kustutan t�esti? "
 
-#: g10/delkey.c:164
+#: g10/delkey.c:165
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: g10/delkey.c:174
+#: g10/delkey.c:175
 msgid "ownertrust information cleared\n"
 msgstr "omaniku usalduse info puhastatud\n"
 
-#: g10/delkey.c:205
+#: g10/delkey.c:206
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "avaliku v�tme \"%s\" jaoks on salajane v�ti!\n"
 
-#: g10/delkey.c:207
+#: g10/delkey.c:208
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "selle kustutamiseks kasutage v�tit \"--delete-secret-keys\".\n"
 
-#: g10/encode.c:210 g10/sign.c:1186
+#: g10/encode.c:211 g10/sign.c:1218
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: g10/encode.c:215
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "S2K moodi t�ttu ei saa s�mmeetrilist ESK paketti kasutada\n"
 
-#: g10/encode.c:228
+#: g10/encode.c:229
 #, c-format
 msgid "using cipher %s\n"
 msgstr "kasutan �iffrit %s\n"
 
-#: g10/encode.c:238 g10/encode.c:558
+#: g10/encode.c:239 g10/encode.c:545
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' on juba pakitud\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
+#: g10/encode.c:302 g10/encode.c:591 g10/sign.c:566
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "HOIATUS: `%s' on t�hi fail\n"
 
-#: g10/encode.c:472
+#: g10/encode.c:466
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "RSA v�tmeid pikkusega kuni 2048 bitti saab kr�pteerida ainult --pgp2 moodis\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:488
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "loen failist `%s'\n"
 
-#: g10/encode.c:530
+#: g10/encode.c:517
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "k�ikide kr�pteeritavate v�tmetega ei saa IDEA �iffrit kasutada.\n"
 
-#: g10/encode.c:540
+#: g10/encode.c:527
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "s�mmetrilise �ifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:635 g10/sign.c:899
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -804,127 +830,127 @@ msgid ""
 msgstr ""
 "pakkimise algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/encode.c:735
+#: g10/encode.c:722
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "s�mmetrilise �ifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/encode.c:805 g10/pkclist.c:721 g10/pkclist.c:757
+#: g10/encode.c:792 g10/pkclist.c:722 g10/pkclist.c:758
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/encode.c:832
+#: g10/encode.c:819
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s kr�ptitud kasutajale: \"%s\"\n"
 
-#: g10/encr-data.c:66 g10/mainproc.c:301
+#: g10/encr-data.c:67 g10/mainproc.c:302
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s kr�pteeritud andmed\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:305
+#: g10/encr-data.c:69 g10/mainproc.c:306
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "kr�pteeritud tundmatu algoritmiga %d\n"
 
-#: g10/encr-data.c:92
+#: g10/encr-data.c:93
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "HOIATUS: teade on kr�ptitud s�mmeetrilise �ifri n�rga v�tmega.\n"
 
-#: g10/encr-data.c:103
+#: g10/encr-data.c:104
 msgid "problem handling encrypted packet\n"
 msgstr "probleem kr�ptitud paketi k�sitlemisel\n"
 
-#: g10/exec.c:48
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "mittelokaalse programmi k�ivitamist ei toetata\n"
 
-#: g10/exec.c:184 g10/openfile.c:406
+#: g10/exec.c:173 g10/openfile.c:410
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "kataloogi `%s' ei �nnestu luua: %s\n"
 
-#: g10/exec.c:325
+#: g10/exec.c:314
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "v�liste programmide k�ivitamine on blokeeritud, kuna seadete failil on\n"
 "ebaturvalised �igused\n"
 
-#: g10/exec.c:355
+#: g10/exec.c:344
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "see platvorm n�uab v�liste programmide k�ivitamiseks ajutiste failide "
 "kasutamist\n"
 
-#: g10/exec.c:433
+#: g10/exec.c:422
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "ei �nnestu k�ivitada %s \"%s\": %s\n"
 
-#: g10/exec.c:436
+#: g10/exec.c:425
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "ei �nnestu k�ivitada %s \"%s\": %s\n"
 
-#: g10/exec.c:521
+#: g10/exec.c:510
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "s�steemi viga v�lise programmi kasutamisel: %s\n"
 
-#: g10/exec.c:532 g10/exec.c:598
+#: g10/exec.c:521 g10/exec.c:587
 msgid "unnatural exit of external program\n"
 msgstr "v�line programm l�petas erandlikult\n"
 
-#: g10/exec.c:547
+#: g10/exec.c:536
 msgid "unable to execute external program\n"
 msgstr "v�list programmi ei �nnestu k�ivitada\n"
 
-#: g10/exec.c:563
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "ei �nnestu lugeda v�lise programmi vastust: %s\n"
 
-#: g10/exec.c:609 g10/exec.c:616
+#: g10/exec.c:598 g10/exec.c:605
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
 
-#: g10/exec.c:621
+#: g10/exec.c:610
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "HOIATUS: ei �nnestu eemaldada ajutist kataloogi `%s': %s\n"
 
-#: g10/export.c:183
+#: g10/export.c:184
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/export.c:212
+#: g10/export.c:213
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "v�ti %08lX: ei ole kaitstud - j�tsin vahele\n"
 
-#: g10/export.c:220
+#: g10/export.c:221
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "v�ti %08lX: PGP 2.x stiilis v�ti - j�tsin vahele\n"
 
-#: g10/export.c:395
+#: g10/export.c:398
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "HOIATUS: salajases v�tmes %08lX puudub lihtne SK kontrollsumma\n"
 
-#: g10/export.c:427
+#: g10/export.c:430
 msgid "WARNING: nothing exported\n"
 msgstr "HOIATUS: midagi ei eksporditud\n"
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid ""
 "@Commands:\n"
 " "
@@ -932,128 +958,128 @@ msgstr ""
 "@K�sud:\n"
 " "
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "|[file]|make a signature"
 msgstr "|[fail]|loo allkiri"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "|[file]|make a clear text signature"
 msgstr "|[fail]|loo avateksti allkiri"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "make a detached signature"
 msgstr "loo eraldiseisev allkiri"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encrypt data"
 msgstr "kr�pteeri andmed"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "encryption only with symmetric cipher"
 msgstr "kr�pteerimine kasutades ainult s�mmeetrilist �ifrit"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "decrypt data (default)"
 msgstr "dekr�pteeri andmed (vaikimisi)"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "verify a signature"
 msgstr "kontrolli allkirja"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys"
 msgstr "n�ita v�tmeid"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and signatures"
 msgstr "n�ita v�tmeid ja allkirju"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kontrolli v�tmete allkirju"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "list keys and fingerprints"
 msgstr "n�ita v�tmeid ja s�rmej�lgi"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "list secret keys"
 msgstr "n�ita salajasi v�tmeid"
 
-#: g10/g10.c:379
+#: g10/g10.c:381
 msgid "generate a new key pair"
 msgstr "genereeri uus v�tmepaar"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the public keyring"
 msgstr "eemalda v�tmed avalike v�tmete hoidlast"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "remove keys from the secret keyring"
 msgstr "eemalda v�tmed salajaste v�tmete hoidlast"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign a key"
 msgstr "allkirjasta v�ti"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "sign a key locally"
 msgstr "allkirjasta v�ti lokaalselt"
 
-#: g10/g10.c:385
+#: g10/g10.c:387
 msgid "sign or edit a key"
 msgstr "allkirjasta v�i toimeta v�tit"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "generate a revocation certificate"
 msgstr "genereeri t�histamise sertifikaat"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "export keys"
 msgstr "ekspordi v�tmed"
 
-#: g10/g10.c:389
+#: g10/g10.c:391
 msgid "export keys to a key server"
 msgstr "ekspordi v�tmed v�tmeserverisse"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "import keys from a key server"
 msgstr "impordi v�tmed v�tmeserverist"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "search for keys on a key server"
 msgstr "otsi v�tmeid v�tmeserverist"
 
-#: g10/g10.c:394
+#: g10/g10.c:396
 msgid "update all keys from a keyserver"
 msgstr "uuenda v�tmeid v�tmeserverist"
 
-#: g10/g10.c:397
+#: g10/g10.c:399
 msgid "import/merge keys"
 msgstr "impordi/mesti v�tmed"
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "print the card status"
 msgstr ""
 
-#: g10/g10.c:401
+#: g10/g10.c:403
 msgid "change data on a card"
 msgstr ""
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/g10.c:410
+#: g10/g10.c:412
 msgid "update the trust database"
 msgstr "uuenda usalduse andmebaasi"
 
-#: g10/g10.c:417
+#: g10/g10.c:419
 msgid "|algo [files]|print message digests"
 msgstr "|algo [failid]|tr�ki teatel�hendid"
 
-#: g10/g10.c:421 g10/gpgv.c:66
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1063,51 +1089,51 @@ msgstr ""
 "V�tmed:\n"
 " "
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "create ascii armored output"
 msgstr "loo ascii pakendis v�ljund"
 
-#: g10/g10.c:425
+#: g10/g10.c:427
 msgid "|NAME|encrypt for NAME"
 msgstr "|NIMI|kr�pti NIMEle"
 
-#: g10/g10.c:436
+#: g10/g10.c:438
 msgid "use this user-id to sign or decrypt"
 msgstr "kasuta seda kasutaja IDd"
 
-#: g10/g10.c:437
+#: g10/g10.c:439
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|m��ra pakkimise tase N (0 blokeerib)"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "use canonical text mode"
 msgstr "kasuta kanoonilist tekstimoodi"
 
-#: g10/g10.c:452
+#: g10/g10.c:458
 msgid "use as output file"
 msgstr "kasuta v�ljundfailina"
 
-#: g10/g10.c:454 g10/gpgv.c:68
+#: g10/g10.c:460 g10/gpgv.c:73
 msgid "verbose"
 msgstr "ole jutukas"
 
-#: g10/g10.c:465
+#: g10/g10.c:471
 msgid "do not make any changes"
 msgstr "�ra tee mingeid muutusi"
 
-#: g10/g10.c:466
+#: g10/g10.c:472
 msgid "prompt before overwriting"
 msgstr "k�si enne �lekirjutamist"
 
-#: g10/g10.c:507
+#: g10/g10.c:513
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:508
+#: g10/g10.c:514
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:536
+#: g10/g10.c:542
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1115,7 +1141,7 @@ msgstr ""
 "@\n"
 "(K�ikide k�skude ja v�tmete t�ieliku kirjelduse leiate manualist)\n"
 
-#: g10/g10.c:539
+#: g10/g10.c:545
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1135,15 +1161,15 @@ msgstr ""
 " --list-keys [nimed]        n�ita v�tmeid\n"
 " --fingerprint [nimed]      n�ita s�rmej�lgi\n"
 
-#: g10/g10.c:720 g10/gpgv.c:93
+#: g10/g10.c:724 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Palun saatke veateated aadressil <[email protected]>.\n"
 
-#: g10/g10.c:737
+#: g10/g10.c:741
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: g10/g10.c:740
+#: g10/g10.c:744
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1153,7 +1179,7 @@ msgstr ""
 "allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
 "vaikimisi operatsioon s�ltub sisendandmetest\n"
 
-#: g10/g10.c:751
+#: g10/g10.c:755
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1161,458 +1187,468 @@ msgstr ""
 "\n"
 "Toetatud algoritmid:\n"
 
-#: g10/g10.c:754
+#: g10/g10.c:758
 msgid "Pubkey: "
 msgstr "Avalik v�ti: "
 
-#: g10/g10.c:760 g10/keyedit.c:2141
+#: g10/g10.c:764 g10/keyedit.c:2248
 msgid "Cipher: "
 msgstr "�iffer: "
 
-#: g10/g10.c:766
+#: g10/g10.c:770
 msgid "Hash: "
 msgstr "R�si: "
 
-#: g10/g10.c:772 g10/keyedit.c:2187
+#: g10/g10.c:776 g10/keyedit.c:2294
 msgid "Compression: "
 msgstr "Pakkimine: "
 
-#: g10/g10.c:855
+#: g10/g10.c:859
 msgid "usage: gpg [options] "
 msgstr "kasuta: gpg [v�tmed] "
 
-#: g10/g10.c:1003
+#: g10/g10.c:1007
 msgid "conflicting commands\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/g10.c:1021
+#: g10/g10.c:1025
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "grupi definitsioonis \"%s\" puudub s�mbol =\n"
 
-#: g10/g10.c:1218
+#: g10/g10.c:1222
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/g10.c:1221
+#: g10/g10.c:1225
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/g10.c:1224
+#: g10/g10.c:1228
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/g10.c:1230
+#: g10/g10.c:1234
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/g10.c:1233
+#: g10/g10.c:1237
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1240
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/g10.c:1242
+#: g10/g10.c:1246
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/g10.c:1245
+#: g10/g10.c:1249
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/g10.c:1248
+#: g10/g10.c:1252
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1258
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/g10.c:1257
+#: g10/g10.c:1261
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/g10.c:1260
+#: g10/g10.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/g10.c:1401
+#: g10/g10.c:1405
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "tundmatu seade \"%s\"\n"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1802
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "M�RKUS: ignoreerin vana vaikimisi v�tmete faili `%s'\n"
 
-#: g10/g10.c:1838
+#: g10/g10.c:1844
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
 
-#: g10/g10.c:1842
+#: g10/g10.c:1848
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "v�tmete fail `%s': %s\n"
 
-#: g10/g10.c:1849
+#: g10/g10.c:1855
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "M�RKUS: %s ei ole tavap�raseks kasutamiseks!\n"
 
-#: g10/g10.c:2076
+#: g10/g10.c:2082
 #, 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/g10.c:2293
+#: g10/g10.c:2236 g10/g10.c:2248
+#, fuzzy, c-format
+msgid "`%s' is not a valid signature expiration\n"
+msgstr "%s ei ole lubatud kooditabel\n"
+
+#: g10/g10.c:2321
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3683
+#: g10/g10.c:2340 g10/keyedit.c:3862
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2346
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2349
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2356
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2359
 msgid "invalid import options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2366
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2369
 msgid "invalid export options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2376
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2379
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2401
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2404
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2411
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path v��rtuseks ei �nnestu seada %s\n"
 
-#: g10/g10.c:2573
+#: g10/g10.c:2602
 msgid "WARNING: program may create a core file!\n"
 msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2606
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "HOIATUS: %s m��rab �le %s\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2615
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2618
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s ei oma koos m�tet!\n"
 
-#: g10/g10.c:2603
+#: g10/g10.c:2625
+#, fuzzy, c-format
+msgid "NOTE: %s is not available in this version\n"
+msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
+
+#: g10/g10.c:2640
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/g10.c:2617
+#: g10/g10.c:2654
 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/g10.c:2623
+#: g10/g10.c:2660
 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/g10.c:2629
+#: g10/g10.c:2666
 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/g10.c:2642
+#: g10/g10.c:2679
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "teate kr�pteerimine --pgp2 moodis n�uab IDEA �iffrit\n"
 
-#: g10/g10.c:2712 g10/g10.c:2736
+#: g10/g10.c:2746 g10/g10.c:2770
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/g10.c:2718 g10/g10.c:2742
+#: g10/g10.c:2752 g10/g10.c:2776
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud l�hendi algoritm ei ole lubatud\n"
 
-#: g10/g10.c:2724
+#: g10/g10.c:2758
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2764
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valitud sertifikaadi l�hendi algoritm ei ole lubatud\n"
 
-#: g10/g10.c:2745
+#: g10/g10.c:2779
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed peab olema suurem, kui 0\n"
 
-#: g10/g10.c:2747
+#: g10/g10.c:2781
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed peab olema suurem, kui 1\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2783
 #, 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/g10.c:2751
+#: g10/g10.c:2785
 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/g10.c:2753
+#: g10/g10.c:2787
 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/g10.c:2756
+#: g10/g10.c:2790
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "M�RKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2794
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "vigane S2K mood; peab olema 0, 1 v�i 3\n"
 
-#: g10/g10.c:2767
+#: g10/g10.c:2801
 msgid "invalid default preferences\n"
 msgstr "vigased vaikimisi eelistused\n"
 
-#: g10/g10.c:2776
+#: g10/g10.c:2810
 msgid "invalid personal cipher preferences\n"
 msgstr "vigased isikliku �ifri eelistused\n"
 
-#: g10/g10.c:2780
+#: g10/g10.c:2814
 msgid "invalid personal digest preferences\n"
 msgstr "vigased isikliku l�hendi eelistused\n"
 
-#: g10/g10.c:2784
+#: g10/g10.c:2818
 msgid "invalid personal compress preferences\n"
 msgstr "vigased isikliku pakkimise eelistused\n"
 
-#: g10/g10.c:2817
+#: g10/g10.c:2851
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ei t��ta veel koos %s-ga\n"
 
-#: g10/g10.c:2864
+#: g10/g10.c:2898
 #, 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/g10.c:2869
+#: g10/g10.c:2903
 #, 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/g10.c:2874
+#: g10/g10.c:2908
 #, 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/g10.c:2970
+#: g10/g10.c:3004
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/g10.c:2981
+#: g10/g10.c:3015
 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/g10.c:2992
+#: g10/g10.c:3026
 msgid "--store [filename]"
 msgstr "--store [failinimi]"
 
-#: g10/g10.c:2999
+#: g10/g10.c:3033
 msgid "--symmetric [filename]"
 msgstr "--symmetric [failinimi]"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3035
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/g10.c:3011
+#: g10/g10.c:3045
 msgid "--encrypt [filename]"
 msgstr "--encrypt [failinimi]"
 
-#: g10/g10.c:3024
+#: g10/g10.c:3058
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3060
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3029
+#: g10/g10.c:3063
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/g10.c:3047
+#: g10/g10.c:3081
 msgid "--sign [filename]"
 msgstr "--sign [failinimi]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3094
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/g10.c:3075
+#: g10/g10.c:3109
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/g10.c:3077
+#: g10/g10.c:3111
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3080
+#: g10/g10.c:3114
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/g10.c:3100
+#: g10/g10.c:3134
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [failinimi]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3143
 msgid "--clearsign [filename]"
 msgstr "--clearsign [failinimi]"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3168
 msgid "--decrypt [filename]"
 msgstr "--decrypt [failinimi]"
 
-#: g10/g10.c:3142
+#: g10/g10.c:3176
 msgid "--sign-key user-id"
 msgstr "--sign-key kasutaja-id"
 
-#: g10/g10.c:3146
+#: g10/g10.c:3180
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kasutaja-id"
 
-#: g10/g10.c:3167
+#: g10/g10.c:3201
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kasutaja-id [k�sud]"
 
-#: g10/g10.c:3238
+#: g10/g10.c:3272
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [kasutaja-id] [v�tmehoidla]"
 
-#: g10/g10.c:3275
+#: g10/g10.c:3309
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
 
-#: g10/g10.c:3277
+#: g10/g10.c:3311
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3313
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "v�tme eksport eba�nnestus: %s\n"
 
-#: g10/g10.c:3290
+#: g10/g10.c:3324
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "v�tmeserveri otsing eba�nnestus: %s\n"
 
-#: g10/g10.c:3300
+#: g10/g10.c:3334
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "v�tmeserveri uuendamine eba�nnestus: %s\n"
 
-#: g10/g10.c:3341
+#: g10/g10.c:3375
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "lahtipakendamine eba�nnestus: %s\n"
 
-#: g10/g10.c:3349
+#: g10/g10.c:3383
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "pakendamine eba�nnestus: %s\n"
 
-#: g10/g10.c:3436
+#: g10/g10.c:3470
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "vigane r�sialgoritm `%s'\n"
 
-#: g10/g10.c:3559
+#: g10/g10.c:3593
 msgid "[filename]"
 msgstr "[failinimi]"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3597
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjutage n��d oma teade ...\n"
 
-#: g10/g10.c:3853
+#: g10/g10.c:3887
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1620,79 +1656,84 @@ msgstr ""
 "noteerimise nimes v�ivad olla ainult tr�kitavad s�mbolid v�i t�hikud\n"
 "ning l�pus peab olema '='\n"
 
-#: g10/g10.c:3861
+#: g10/g10.c:3895
 msgid "a user notation name must contain the '@' character\n"
 msgstr "kasutaja noteerimise nimi peab sisaldama '@' m�rki\n"
 
-#: g10/g10.c:3871
+#: g10/g10.c:3900
+#, fuzzy
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr "kasutaja noteerimise nimi peab sisaldama '@' m�rki\n"
+
+#: g10/g10.c:3911
 msgid "a notation value must not use any control characters\n"
 msgstr "noteerimise v��rtus ei v�i sisaldada kontroll s�mboleid\n"
 
-#: g10/g10.c:3905
+#: g10/g10.c:3945
 msgid "the given certification policy URL is invalid\n"
 msgstr "antud sertifikaadi poliisi URL on vigane\n"
 
-#: g10/g10.c:3907
+#: g10/g10.c:3947
 msgid "the given signature policy URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/g10.c:3940
+#: g10/g10.c:3980
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "avalike v�tmete puhvris on liiga palju v�tmeid - blokeerin\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2750
+#: g10/getkey.c:187 g10/getkey.c:2757
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Kasutaja id puudub]"
 
-#: g10/getkey.c:1677
+#: g10/getkey.c:1684
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Vigane v�ti %08lX muudeti kehtivaks v�tme --allow-non-selfsigned-uid "
 "kasutamisega\n"
 
-#: g10/getkey.c:2228
+#: g10/getkey.c:2235
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "avalikul alamv�tmel %08lX puudub salajane alamv�ti - ignoreerin\n"
 
-#: g10/getkey.c:2459
+#: g10/getkey.c:2466
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "kasutan sekundaarset v�tit %08lX primaarse v�tme %08lX asemel\n"
 
-#: g10/getkey.c:2506
+#: g10/getkey.c:2513
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "v�ti %08lX: salajane v�ti avaliku v�tmeta - j�tsin vahele\n"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:74
 msgid "be somewhat more quiet"
 msgstr "ole m�nev�rra vaiksem"
 
-#: g10/gpgv.c:70
+#: g10/gpgv.c:75
 msgid "take the keys from this keyring"
 msgstr "v�ta v�tmed sellest v�tmehoidlast"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:77
 msgid "make timestamp conflicts only a warning"
 msgstr "teata ajatemplite konfliktist ainult hoiatusega"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:78
 msgid "|FD|write status info to this FD"
 msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
 
-#: g10/gpgv.c:97
+#: g10/gpgv.c:102
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Kasuta: gpgv [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:105
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1700,7 +1741,7 @@ msgstr ""
 "S�ntaks: gpg [v�tmed] [failid]\n"
 "kontrolli allkirju tuntud usaldusv��rsete v�tmetega\n"
 
-#: g10/helptext.c:48
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1709,7 +1750,7 @@ msgstr ""
 "Teie �lesanne on sisestada n��d v��rtus; seda v��rtust ei avalikustata\n"
 "kolmandatele pooltele. Seda v��rtust on vaja et realiseerida usaldusv�rk."
 
-#: g10/helptext.c:54
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1721,17 +1762,17 @@ msgstr ""
 "on teil juurdep��s ka nende salajastele v�tmetele. Kui soovite\n"
 "m��rata seda v�tit absoluutselt usaldatavaks, vastake \"jah\"\n"
 
-#: g10/helptext.c:61
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Kui te ikkagi soovite kasutada seda mitteusaldatavat v�tit, vastake \"jah\"."
 
-#: g10/helptext.c:65
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Sisestage kasutaja ID aadressile, kellele te soovite teadet saata."
 
-#: g10/helptext.c:69
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1745,7 +1786,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:83
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -1755,16 +1796,16 @@ msgstr ""
 "kr�pteerimiseks. Seda algoritmi tuleks kasutada ainult teatud piirides.\n"
 "Enne kasutamist konsulteerige palun oma turva eksperdiga."
 
-#: g10/helptext.c:90
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "Sisestage v�tmepikkus"
 
-#: g10/helptext.c:94 g10/helptext.c:99 g10/helptext.c:111 g10/helptext.c:143
-#: g10/helptext.c:171 g10/helptext.c:176 g10/helptext.c:181
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "Vastake \"jah\" v�i \"ei\""
 
-#: g10/helptext.c:104
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1776,19 +1817,19 @@ msgstr ""
 "saa korrektset veateadet, kuna s�steem �ritab antud v��rtust\n"
 "t�lgendada vahemikuna."
 
-#: g10/helptext.c:116
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "Sisestage v�tmehoidja nimi"
 
-#: g10/helptext.c:121
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr "palun e-posti aadress, aadress ei ole kohustuslik, aga v�ga soovitav"
 
-#: g10/helptext.c:125
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "Te v�ite n��d sisestada kommentaari"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1802,11 +1843,11 @@ msgstr ""
 "O  et j�tkata v�tme loomist.\n"
 "V  et l�petada v�tme loomine."
 
-#: g10/helptext.c:139
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Vastake \"jah\" (v�i \"j\"), kui v�ib alustada alamv�tme loomisega."
 
-#: g10/helptext.c:147
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -1877,12 +1918,12 @@ msgstr ""
 "\n"
 "Kui te ei tea �iget vastust, vastake \"0\"."
 
-#: g10/helptext.c:185
+#: g10/helptext.c:186
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Kui te soovite allkirjastada K�IK kasutaja IDd, vastake \"jah\""
 
-#: g10/helptext.c:189
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -1890,11 +1931,11 @@ msgstr ""
 "Kui te t�esti soovite seda kasutaja IDd kustutada, vastake \"jah\".\n"
 "Sertifikaadid kustutatakse samuti!"
 
-#: g10/helptext.c:194
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Kui selle alamv�tme v�ib kustutada, vastake \"jah\""
 
-#: g10/helptext.c:199
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -1904,7 +1945,7 @@ msgstr ""
 "kuna see allkiri v�ib olla vajalik, et kirjeldada antud v�tme v�i\n"
 "antud v�tmega sertifitseeritud teise v�tme usaldatavust."
 
-#: g10/helptext.c:204
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -1916,13 +1957,13 @@ msgstr ""
 "kasutab, sest see v�ti v�ib moodustada usaldussuhte l�bi m�ne juba\n"
 "sertifitseeritud v�tme."
 
-#: g10/helptext.c:210
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "Allkiri ei ole kehtiv. Oleks m�istlik see v�tmehoidlast kustutada."
 
-#: g10/helptext.c:214
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -1936,7 +1977,7 @@ msgstr ""
 "vaid siis, kui see allkiri ei ole miskip�rast kehtiv ja on\n"
 "olemas ka teine allkiri, mis kasutajat v�tmega seob."
 
-#: g10/helptext.c:222
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -1946,23 +1987,23 @@ msgstr ""
 "vastavaks hetkel m��ratud seadetele. K�ikide asjasse puutuvate\n"
 "ise loodud allkirjade ajatempleid suurendatakse �he sekundi v�rra.\n"
 
-#: g10/helptext.c:229
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: g10/helptext.c:235
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Palun korrake parooli, siis saate oma kirjutatus kindel olla."
 
-#: g10/helptext.c:239
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "Sisestage palun failinimi, mida allkirjastada"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Vastake \"jah\", kui faili v�ib �le kirjutada"
 
-#: g10/helptext.c:249
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -1970,7 +2011,7 @@ msgstr ""
 "Palun sisestage uus failinimi. Kui te vajutate lihtsalt reavahetust,\n"
 "kasutatakse vaikimisi faili (nimi on nurksulgudes)."
 
-#: g10/helptext.c:255
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -1999,7 +2040,7 @@ msgstr ""
 "      kasutama; seda kasutatakse tavaliselt m�rkimaks vigast e-posti "
 "aadressi.\n"
 
-#: g10/helptext.c:271
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2009,472 +2050,477 @@ msgstr ""
 "soovite seda t�histamise sertifikaati esitada. Palun kirjutage\n"
 "l�hidalt. T�hi rida l�petab teksti.\n"
 
-#: g10/helptext.c:286
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "Abiinfo puudub"
 
-#: g10/helptext.c:294
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "`%s' kohta abiinfo puudub"
 
-#: g10/import.c:247
+#: g10/import.c:248
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "j�tan bloki t��biga %d vahele\n"
 
-#: g10/import.c:256
+#: g10/import.c:257
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu v�tit on seni t��deldud\n"
 
-#: g10/import.c:273
+#: g10/import.c:274
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "T��deldud kokku: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr " vahele j�etud uusi v�tmeid: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:279
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "    puudub kasutaja ID: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "              imported: %lu"
 msgstr "            imporditud: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:287
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "              muutmata: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "       uusi kasutajaid: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "      uusi alamv�tmeid: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "         uusi allkirju: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "      uusi t�histamisi: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " loetud salajasi v�tmeid: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr " salajasi v�tmeid imporditud: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " muutmata salajasi v�tmeid: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "       pole imporditud: %lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:544
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:545
+#: g10/import.c:546
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Te olete allkirjastanud j�rgnevad kasutaja IDd:\n"
 
-#: g10/import.c:582
+#: g10/import.c:583
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:594
+#: g10/import.c:595
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
 
-#: g10/import.c:606
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:620
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:646
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:694 g10/import.c:1048
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "v�ti %08lX: kasutaja ID puudub\n"
 
-#: g10/import.c:713
+#: g10/import.c:714
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "v�ti %08lX: HKP alamv�tme rike parandatud\n"
 
-#: g10/import.c:728
+#: g10/import.c:729
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr ""
 "v�ti %08lX: aktsepteerisin iseenda poolt allakirjutamata kasutaja ID '%s'\n"
 
-#: g10/import.c:734
+#: g10/import.c:735
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "v�ti %08lX: puudub kehtiv kasutaja ID\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 msgid "this may be caused by a missing self-signature\n"
 msgstr "see v�ib olla p�hjustatud puuduvast iseenda allkirjast\n"
 
-#: g10/import.c:746 g10/import.c:1168
+#: g10/import.c:747 g10/import.c:1169
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "v�ti %08lX: avalikku v�tit ei leitud: %s\n"
 
-#: g10/import.c:752
+#: g10/import.c:753
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "v�ti %08lX: uus v�ti - j�tsin vahele\n"
 
-#: g10/import.c:761
+#: g10/import.c:762
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "ei leia kirjutatavat v�tmehoidlat: %s\n"
 
-#: g10/import.c:766 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
-#: g10/import.c:2314 g10/import.c:2336
+#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
+#: g10/import.c:2315 g10/import.c:2337
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/import.c:791
+#: g10/import.c:792
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "v�ti %08lX: avalik v�ti \"%s\" on imporditud\n"
 
-#: g10/import.c:815
+#: g10/import.c:816
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "v�ti %08lX: ei sobi meie koopiaga\n"
 
-#: g10/import.c:832 g10/import.c:1186
+#: g10/import.c:833 g10/import.c:1187
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "v�ti %08lX: ei leia algset v�tmeblokki: %s\n"
 
-#: g10/import.c:840 g10/import.c:1193
+#: g10/import.c:841 g10/import.c:1194
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "v�ti %08lX: ei �nnestu lugeda algset v�tmeblokki: %s\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "v�ti %08lX: \"%s\" 1 uus kasutaja ID\n"
 
-#: g10/import.c:875
+#: g10/import.c:876
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "v�ti %08lX: \"%s\" %d uut kasutaja IDd\n"
 
-#: g10/import.c:878
+#: g10/import.c:879
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "v�ti %08lX: \"%s\" 1 uus allkiri\n"
 
-#: g10/import.c:881
+#: g10/import.c:882
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
 
-#: g10/import.c:884
+#: g10/import.c:885
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "v�ti %08lX: \"%s\" 1 uus alamv�ti\n"
 
-#: g10/import.c:887
+#: g10/import.c:888
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "v�ti %08lX: \"%s\" %d uut alamv�tit\n"
 
-#: g10/import.c:908
+#: g10/import.c:909
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "v�ti %08lX: \"%s\" ei muudetud\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1054
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "v�ti %08lX: salajane v�ti vigase �ifriga %d - j�tsin vahele\n"
 
-#: g10/import.c:1064
+#: g10/import.c:1065
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/import.c:1081 g10/import.c:2329
+#: g10/import.c:1082 g10/import.c:2330
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "puudub salajaste v�tmete vaikimisi v�tmehoidla: %s\n"
 
-#: g10/import.c:1092
+#: g10/import.c:1093
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "v�ti %08lX: salajane v�ti on imporditud\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1122
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "v�ti %08lX: on juba salajaste v�tmete hoidlas\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1132
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "v�ti %08lX: salajast v�tit ei leitud: %s\n"
 
-#: g10/import.c:1161
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "v�ti %08lX: avalik v�ti puudub - t�histamise sertifikaati ei saa rakendada\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1205
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "v�ti %08lX: vigane t�histamise sertifikaat: %s - l�kkasin tagasi\n"
 
-#: g10/import.c:1236
+#: g10/import.c:1237
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "v�ti %08lX: \"%s\" t�histamise sertifikaat imporditud\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1302
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "v�ti %08lX: allkirjal puudub kasutaja ID\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1317
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm kasutajaga \"%s\"\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "v�ti %08lX: kasutajal \"%s\" on vigane iseenda allkiri\n"
 
-#: g10/import.c:1336
+#: g10/import.c:1337
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "v�ti %08lX: v�tmeseosel puudub alamv�ti\n"
 
-#: g10/import.c:1347 g10/import.c:1397
+#: g10/import.c:1348 g10/import.c:1398
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm\n"
 
-#: g10/import.c:1349
+#: g10/import.c:1350
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "v�ti %08lX: vigane alamv�tme seos\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1365
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "v�ti %08lX: vigane mitme alamv�tme seos\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "v�ti %08lX: v�tme t�histamiseks puudub alamv�ti\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "v�ti %08lX: vigane alamv�tme t�histamine\n"
 
-#: g10/import.c:1414
+#: g10/import.c:1415
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "v�ti %08lX: eemaldasin mitme alamv�tme t�histamise\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1457
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "v�ti %08lX: j�tsin vahele kasutaja ID '"
 
-#: g10/import.c:1477
+#: g10/import.c:1478
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "v�ti %08lX: j�tsin alamv�tme vahele\n"
 
-#: g10/import.c:1504
+#: g10/import.c:1505
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "v�ti %08lX: mitte eksporditav allkiri (klass %02x) - j�tan vahele\n"
 
-#: g10/import.c:1514
+#: g10/import.c:1515
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "v�ti %08lX: t�histamise sertifikaat on vales kohas - j�tan vahele\n"
 
-#: g10/import.c:1531
+#: g10/import.c:1532
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "v�ti %08lX: vigane t�histamise sertifikaat: %s - j�tan vahele\n"
 
-#: g10/import.c:1545
+#: g10/import.c:1546
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "v�ti %08lX: alamv�tme allkiri on vales kohas - j�tan vahele\n"
 
-#: g10/import.c:1553
+#: g10/import.c:1554
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "v�ti %08lX: ootamatu allkirja klass (0x%02x) - j�tan vahele\n"
 
-#: g10/import.c:1574
+#: g10/import.c:1575
 #, fuzzy, c-format
 msgid "key %s: expired signature from key %s - skipped\n"
 msgstr "v�ti %08lX: ootamatu allkirja klass (0x%02x) - j�tan vahele\n"
 
-#: g10/import.c:1677
+#: g10/import.c:1678
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "v�ti %08lX: tuvastasin dubleeritud kasutaja ID - mestisin\n"
 
-#: g10/import.c:1739
+#: g10/import.c:1740
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "HOIATUS: v�ti %08lX v�ib olla t�histatud: laen t�histamise v�tit %08lX\n"
 
-#: g10/import.c:1753
+#: g10/import.c:1754
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "HOIATUS: v�ti %08lX v�ib olla t�histatud: t�histamise v�tit %08lX pole.\n"
 
-#: g10/import.c:1812
+#: g10/import.c:1813
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "v�ti %08lX: \"%s\" t�histamise sertifikaat lisatud\n"
 
-#: g10/import.c:1846
+#: g10/import.c:1847
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "v�ti %08lX: lisatud vahetu v�tme allkiri\n"
 
-#: g10/import.c:2235
+#: g10/import.c:2236
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "avalik v�ti ei sobi salajase v�tmega!\n"
 
-#: g10/import.c:2243
+#: g10/import.c:2244
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/import.c:2245
+#: g10/import.c:2246
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/keydb.c:167
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
 
-#: g10/keydb.c:174
+#: g10/keydb.c:175
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "v�tmehoidla `%s' on loodud\n"
 
-#: g10/keydb.c:685
+#: g10/keydb.c:316 g10/keydb.c:319
+#, fuzzy, c-format
+msgid "keyblock resource `%s': %s\n"
+msgstr "viga `%s' loomisel: %s\n"
+
+#: g10/keydb.c:698
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "v�tmehoidla vahem�lu uuesti loomine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[t�histamine]"
 
-#: g10/keyedit.c:255
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[iseenda allkiri]"
 
-#: g10/keyedit.c:333 g10/keylist.c:405
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 halb allkiri\n"
 
-#: g10/keyedit.c:335 g10/keylist.c:407
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d halba allkirja\n"
 
-#: g10/keyedit.c:337 g10/keylist.c:409
+#: g10/keyedit.c:344 g10/keylist.c:410
 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:339 g10/keylist.c:411
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, 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:341 g10/keylist.c:413
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 allkiri j�i vea t�ttu kontrollimata\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:415
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d allkirja j�i vigade t�ttu kontrollimata\n"
 
-#: g10/keyedit.c:345
+#: g10/keyedit.c:352
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "tuvastasin �he kehtiva iseenda allkirjata kasutaja ID\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:354
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "tuvastasin %d kehtiva iseenda allkirjata kasutaja IDd\n"
 
-#: g10/keyedit.c:403 g10/pkclist.c:262
+#: g10/keyedit.c:410 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2487,53 +2533,63 @@ msgstr ""
 "passe, kontrollige erinevatest allikatest n�puj�lgi...)?\n"
 "\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:274
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Usaldan v�hesel m��ral\n"
 
-#: g10/keyedit.c:408 g10/pkclist.c:276
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Usaldan t�iesti\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:434
 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:443
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Kasutaja ID \"%s\" on t�histatud."
 
-#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
-#: g10/keyedit.c:858 g10/keyedit.c:1642
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1728
 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:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
-#: g10/keyedit.c:1648
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
+#: g10/keyedit.c:1734
 msgid "  Unable to sign.\n"
 msgstr "  Ei saa allkirjastada.\n"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Kasutaja ID \"%s\" on aegunud."
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:650
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Kasutaja ID \"%s\" ei ole ise allkirjastatud."
 
-#: g10/keyedit.c:676
+#: g10/keyedit.c:678
+#, fuzzy, c-format
+msgid "User ID \"%s\" is signable.  "
+msgstr "Kasutaja ID \"%s\" ei ole ise allkirjastatud."
+
+#: g10/keyedit.c:680
+#, fuzzy
+msgid "Sign it? (y/N) "
+msgstr "Allkirjastan t�esti? "
+
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2542,11 +2598,11 @@ msgstr ""
 "Iseenda allkiri \"%s\"\n"
 "on PGP 2.x stiilis allkiri.\n"
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:711
 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:699
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2555,11 +2611,11 @@ msgstr ""
 "Teie praegune allkiri \"%s\"\n"
 "on aegunud.\n"
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:729
 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:724
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2568,54 +2624,54 @@ msgstr ""
 "Teie praegune allkiri \"%s\"\n"
 "on lokaalne allkiri.\n"
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:754
 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:749
+#: g10/keyedit.c:775
 #, 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:752
+#: g10/keyedit.c:778
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" on juba allkirjastatud v�tmega %08lX\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:783
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/E) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:805
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "V�tmega %08lX pole midagi allkirjastada\n"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "See v�ti on aegunud!"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "See v�ti aegub %s.\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:844
 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:851
+#: g10/keyedit.c:882
 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:853
+#: g10/keyedit.c:884
 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:878
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2625,32 +2681,32 @@ msgstr ""
 "kuulub ka tegelikult �lal mainitud isikule? Kui te ei tea, mida vastata,\n"
 "sisestage \"0\".\n"
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Ma ei vasta.%s\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Ma ei ole �ldse kontrollinud.%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Ma olen teinud pealiskaudset kontrolli.%s\n"
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:920
 #, 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:895
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Teie valik? (lisainfo saamiseks vajutage '?'): "
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:950
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2659,100 +2715,100 @@ msgstr ""
 "Olete t�esti kindel, et soovite seda v�tit oma\n"
 "v�tmega allkirjastada: \""
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "See saab olema iseenda allkiri.\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:963
 #, 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:940
+#: g10/keyedit.c:971
 #, 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:950
+#: g10/keyedit.c:981
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Allkiri m�rgitakse mitte-eksporditavaks.\n"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:988
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Allkiri m�rgitakse kehtetuks mitte-tunnistatavaks.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:995
 #, 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:969
+#: g10/keyedit.c:1000
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Ma olen seda v�tit kontrollinud ainult pealiskaudselt.\n"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1005
 #, 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:984
+#: g10/keyedit.c:1015
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Allkirjastan t�esti? "
 
-#: g10/keyedit.c:1029 g10/keyedit.c:4132 g10/keyedit.c:4223 g10/keyedit.c:4287
-#: g10/keyedit.c:4348 g10/sign.c:369
+#: g10/keyedit.c:1060 g10/keyedit.c:4350 g10/keyedit.c:4441 g10/keyedit.c:4505
+#: g10/keyedit.c:4566 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allkirjastamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1105 g10/keygen.c:3057
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "See v�ti ei ole kaitstud.\n"
 
-#: g10/keyedit.c:1109 g10/keygen.c:3045
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
 
-#: g10/keyedit.c:1113 g10/keygen.c:3060
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 #, 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:1117 g10/keygen.c:3064
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "V�ti on kaitstud.\n"
 
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Seda v�tit ei �nnestu toimetada: %s\n"
 
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2760,11 +2816,11 @@ msgstr ""
 "Sisestage sellele salajasele v�tmele uus parool.\n"
 "\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:1825
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "parooli ei korratud �ieti; proovige uuesti"
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2772,193 +2828,193 @@ msgstr ""
 "Te ei soovi parooli - see on t�en�oliselt *halb* idee!\n"
 "\n"
 
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1195
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Kas te t�esti soovite seda teha? "
 
-#: g10/keyedit.c:1235
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "t�stan v�tme allkirja �igesse kohta\n"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "salvesta ja v�lju"
 
-#: g10/keyedit.c:1322
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "n�ita s�rmej�lge"
 
-#: g10/keyedit.c:1323
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "n�ita v�tit ja kasutaja IDd"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "vali kasutaja ID N"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "vali kasutaja ID N"
 
-#: g10/keyedit.c:1327
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "t�hista allkirjad"
 
-#: g10/keyedit.c:1330
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1335
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "allkirjasta v�ti lokaalselt"
 
-#: g10/keyedit.c:1337
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1343
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "lisa kasutaja ID"
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "lisa foto ID"
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "kustuta kasutaja ID"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "kustuta sekundaarne v�ti"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr "lisa t�histamise v�ti"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1402
 #, 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:1372
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "m�rgi kasutaja ID primaarseks"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "l�lita salajaste v�i avalike v�tmete loendi vahel"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "n�ita eelistusi (ekspert)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "n�ita eelistusi (detailsena)"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1418
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "muuda parooli"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "muuda omaniku usaldust"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1426
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Kas t�histan t�esti k�ik valitud kasutaja IDd? "
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "t�hista kasutaja ID"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "t�hista sekundaarne v�ti"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "enable key"
 msgstr "luba v�ti"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "disable key"
 msgstr "blokeeri v�ti"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1436
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "n�ita foto ID"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1556
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "viga salajase v�tmebloki `%s' lugemisel: %s\n"
 
-#: g10/keyedit.c:1494
+#: g10/keyedit.c:1574
 msgid "Secret key is available.\n"
 msgstr "Salajane v�ti on kasutatav.\n"
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1655
 msgid "Need the secret key to do this.\n"
 msgstr "Selle tegamiseks on vaja salajast v�tit.\n"
 
-#: g10/keyedit.c:1579
+#: g10/keyedit.c:1663
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Palun kasutage k�igepealt k�sku \"toggle\".\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1682
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -2966,236 +3022,241 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1722
 msgid "Key is revoked."
 msgstr "V�ti on t�histatud."
 
-#: g10/keyedit.c:1657
+#: g10/keyedit.c:1741
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Kas allkirjastan t�esti k�ik kasutaja IDd? "
 
-#: g10/keyedit.c:1660
-msgid "Hint: Select the user IDs to sign\n"
-msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
-
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1748
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "tundmatu allkirja klass"
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1771
 #, 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:1713 g10/keyedit.c:1733 g10/keyedit.c:1899
+#: g10/keyedit.c:1793 g10/keyedit.c:1813 g10/keyedit.c:1979
 msgid "You must select at least one user ID.\n"
 msgstr "Te peate valima v�hemalt �he kasutaja ID.\n"
 
-#: g10/keyedit.c:1715
+#: g10/keyedit.c:1795
 msgid "You can't delete the last user ID!\n"
 msgstr "Viimast kasutaja ID ei saa kustutada!\n"
 
-#: g10/keyedit.c:1717
+#: g10/keyedit.c:1797
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Kas kustutan t�esti k�ik kasutaja IDd? "
 
-#: g10/keyedit.c:1718
+#: g10/keyedit.c:1798
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Kas eemaldan t�esti selle kasutaja ID? "
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1848
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Kas eemaldan t�esti selle kasutaja ID? "
 
-#: g10/keyedit.c:1780
+#: g10/keyedit.c:1860
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Te peata valima v�hemalt �he v�tme.\n"
 
-#: g10/keyedit.c:1808
+#: g10/keyedit.c:1888
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1822
+#: g10/keyedit.c:1902
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "`%s' ei �nnestu avada: %s\n"
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1919
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
 
-#: g10/keyedit.c:1863
+#: g10/keyedit.c:1943
 msgid "You must select at least one key.\n"
 msgstr "Te peata valima v�hemalt �he v�tme.\n"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1946
 #, 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:1867
+#: g10/keyedit.c:1947
 #, 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:1902
+#: g10/keyedit.c:1982
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Kas t�histan t�esti k�ik valitud kasutaja IDd? "
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1983
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Kas t�histan t�esti selle kasutaja ID? "
 
-#: g10/keyedit.c:1921
+#: g10/keyedit.c:2001
 #, 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:1932
+#: g10/keyedit.c:2012
 #, 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:1934
+#: g10/keyedit.c:2014
 #, 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:1975
+#: g10/keyedit.c:2055
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2007
+#: g10/keyedit.c:2087
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "sea eelistuste nimekiri"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2093
 #, 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:2015
+#: g10/keyedit.c:2095
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Kas t�esti uuendan seaded? "
 
-#: g10/keyedit.c:2065
+#: g10/keyedit.c:2157
+#, fuzzy, c-format
+msgid "Unable to clean `%s'\n"
+msgstr "ei �nnestu k�ivitada %s \"%s\": %s\n"
+
+#: g10/keyedit.c:2160
+msgid "Please specify item to clean: `sigs', `uids', or `all'\n"
+msgstr ""
+
+#: g10/keyedit.c:2171
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvestan muutused? "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2174
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "V�ljun salvestamata? "
 
-#: g10/keyedit.c:2078
+#: g10/keyedit.c:2184
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2191
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:2092
+#: g10/keyedit.c:2198
 msgid "Key not changed so no update needed.\n"
 msgstr "V�tit ei muudetud, seega pole uuendamist vaja.\n"
 
-#: g10/keyedit.c:2164
+#: g10/keyedit.c:2271
 msgid "Digest: "
 msgstr "Teatel�hend: "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2323
 msgid "Features: "
 msgstr "Omadused: "
 
-#: g10/keyedit.c:2227
+#: g10/keyedit.c:2334
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2242 g10/keylist.c:307
+#: g10/keyedit.c:2349 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2473
+#: g10/keyedit.c:2580
 #, 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:2494
+#: g10/keyedit.c:2601
 #, 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:2500
+#: g10/keyedit.c:2607
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (tundlik)"
 
-#: g10/keyedit.c:2516 g10/keyedit.c:2572 g10/keyedit.c:2684 g10/keyedit.c:2699
-#: g10/keylist.c:193 g10/keyserver.c:422
+#: g10/keyedit.c:2623 g10/keyedit.c:2679 g10/keyedit.c:2792 g10/keyedit.c:2807
+#: g10/keylist.c:194 g10/keyserver.c:421
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s ei �nnestu luua: %s\n"
 
-#: g10/keyedit.c:2519 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:931
+#: g10/keyedit.c:2626 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:948
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[t�histatud] "
 
-#: g10/keyedit.c:2521 g10/keylist.c:757 g10/keylist.c:886
+#: g10/keyedit.c:2628 g10/keylist.c:758 g10/keylist.c:887
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [aegub: %s]"
 
-#: g10/keyedit.c:2523 g10/keyedit.c:2574 g10/keyedit.c:2686 g10/keyedit.c:2701
-#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
-#: g10/keylist.c:913 g10/keyserver.c:428 g10/mainproc.c:937
+#: g10/keyedit.c:2630 g10/keyedit.c:2681 g10/keyedit.c:2794 g10/keyedit.c:2809
+#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
+#: g10/keylist.c:914 g10/keyserver.c:427 g10/mainproc.c:954
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [aegub: %s]"
 
-#: g10/keyedit.c:2525
+#: g10/keyedit.c:2632
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:2540
+#: g10/keyedit.c:2647
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2651
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2658
 msgid "This key has been disabled"
 msgstr "See v�ti on blokeeritud"
 
-#: g10/keyedit.c:2579 g10/keylist.c:199
+#: g10/keyedit.c:2686 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2754
 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:2654
+#: g10/keyedit.c:2762
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3203,19 +3264,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:2718 g10/keyserver.c:432 g10/mainproc.c:1577
-#: g10/trustdb.c:1178
+#: g10/keyedit.c:2826 g10/keyedit.c:3201 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1690
 #, fuzzy
 msgid "revoked"
 msgstr "[t�histatud] "
 
-#: g10/keyedit.c:2720 g10/keyserver.c:436 g10/mainproc.c:1579
-#: g10/trustdb.c:531
+#: g10/keyedit.c:2828 g10/keyedit.c:3203 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1692
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2893
 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"
@@ -3223,7 +3284,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:2845
+#: g10/keyedit.c:2953
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3232,45 +3293,75 @@ msgstr ""
 "HOIATUS: See on PGP2-stiilis v�ti. Foto ID lisamine v�ib sundida m�ningaid\n"
 "         PGP versioone seda v�tit tagasi l�kkama.\n"
 
-#: g10/keyedit.c:2850 g10/keyedit.c:3128
+#: g10/keyedit.c:2958 g10/keyedit.c:3307
 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:2856
+#: g10/keyedit.c:2964
 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:2996
+#: g10/keyedit.c:3104
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Kustutan selle korrektse allkirja? (j/E/v)"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3114
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Kustutan selle vigase allkirja? (j/E/v)"
 
-#: g10/keyedit.c:3010
+#: g10/keyedit.c:3118
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
 
-#: g10/keyedit.c:3016
+#: g10/keyedit.c:3124
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Kas t�esti kustutan selle iseenda allkirja? (j/E)"
 
-#: g10/keyedit.c:3030
+#: g10/keyedit.c:3138
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Kustutatud %d allkiri.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3139
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Kustutatud %d allkirja.\n"
 
-#: g10/keyedit.c:3034
+#: g10/keyedit.c:3142
 msgid "Nothing deleted.\n"
 msgstr "Midagi ei kustutatud.\n"
 
-#: g10/keyedit.c:3123
+#: g10/keyedit.c:3167
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed.\n"
+msgstr "Kasutaja ID \"%s\" on t�histatud."
+
+#: g10/keyedit.c:3168
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed.\n"
+msgstr "Kasutaja ID \"%s\" on t�histatud."
+
+#: g10/keyedit.c:3173
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean.\n"
+msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
+
+#: g10/keyedit.c:3205 g10/trustdb.c:1694
+#, fuzzy
+msgid "invalid"
+msgstr "vigane pakend"
+
+#: g10/keyedit.c:3207
+#, fuzzy, c-format
+msgid "User ID \"%s\" removed: %s\n"
+msgstr "Kasutaja ID \"%s\" on t�histatud."
+
+#: g10/keyedit.c:3214
+#, fuzzy
+msgid "No user IDs are removable.\n"
+msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
+
+#: g10/keyedit.c:3302
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3279,340 +3370,345 @@ 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:3134
+#: g10/keyedit.c:3313
 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:3154
+#: g10/keyedit.c:3333
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Sisestage m��ratud t�histaja kasutaja ID: "
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3356
 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:3192
+#: g10/keyedit.c:3371
 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:3214
+#: g10/keyedit.c:3393
 #, 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:3233
+#: g10/keyedit.c:3412
 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:3239
+#: g10/keyedit.c:3418
 #, 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:3300
+#: g10/keyedit.c:3479
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Palun eemaldage salajastelt v�tmetelt valikud.\n"
 
-#: g10/keyedit.c:3306
+#: g10/keyedit.c:3485
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "palun valige �limalt �ks sekundaarne v�ti.\n"
 
-#: g10/keyedit.c:3310
+#: g10/keyedit.c:3489
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Muudan sekundaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:3313
+#: g10/keyedit.c:3492
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muudan primaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:3359
+#: g10/keyedit.c:3538
 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:3375
+#: g10/keyedit.c:3554
 msgid "No corresponding signature in secret ring\n"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/keyedit.c:3455
+#: g10/keyedit.c:3634
 msgid "Please select exactly one user ID.\n"
 msgstr "Palun valige t�pselt �ks kasutaja ID.\n"
 
-#: g10/keyedit.c:3494 g10/keyedit.c:3604 g10/keyedit.c:3724
+#: g10/keyedit.c:3673 g10/keyedit.c:3783 g10/keyedit.c:3903
 #, 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:3665
+#: g10/keyedit.c:3844
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3745
+#: g10/keyedit.c:3924
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:3746
+#: g10/keyedit.c:3925
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3987
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:3854
+#: g10/keyedit.c:4045
+#, fuzzy, c-format
+msgid "No user ID with hash %s\n"
+msgstr "Kasutaja ID numbriga %d puudub\n"
+
+#: g10/keyedit.c:4072
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:3971
+#: g10/keyedit.c:4189
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "kasutaja ID: \""
 
-#: g10/keyedit.c:3974 g10/keyedit.c:4038 g10/keyedit.c:4081
+#: g10/keyedit.c:4192 g10/keyedit.c:4256 g10/keyedit.c:4299
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   allkirjastanud %08lX %s%s%s\n"
 
-#: g10/keyedit.c:3976 g10/keyedit.c:4040 g10/keyedit.c:4083
+#: g10/keyedit.c:4194 g10/keyedit.c:4258 g10/keyedit.c:4301
 msgid " (non-exportable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:3980
+#: g10/keyedit.c:4198
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "See allkiri aegub %s.\n"
 
-#: g10/keyedit.c:3984
+#: g10/keyedit.c:4202
 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:3988
+#: g10/keyedit.c:4206
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Loon sellele allkirjale t�histamise sertifikaadi? (j/E) "
 
-#: g10/keyedit.c:4015
+#: g10/keyedit.c:4233
 #, 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:4041
+#: g10/keyedit.c:4259
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:4048
+#: g10/keyedit.c:4266
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   t�histanud %08lX %s\n"
 
-#: g10/keyedit.c:4070
+#: g10/keyedit.c:4288
 msgid "You are about to revoke these signatures:\n"
 msgstr "Te asute t�histama j�rgmisi allkirju:\n"
 
-#: g10/keyedit.c:4090
+#: g10/keyedit.c:4308
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Kas t�esti loon t�histamise sertifikaadid? (j/E) "
 
-#: g10/keyedit.c:4120
+#: g10/keyedit.c:4338
 msgid "no secret key\n"
 msgstr "salajast v�tit pole\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4408
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4425
 #, 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:4271
+#: g10/keyedit.c:4489
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:4333
+#: g10/keyedit.c:4551
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4646
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "N�itan %s foto IDd suurusega %ld, v�ti 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:293
+#: g10/keygen.c:258
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "eelistus %c%lu on duplikaat\n"
 
-#: g10/keygen.c:300
+#: g10/keygen.c:265
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "liiga palju `%c' eelistusi\n"
 
-#: g10/keygen.c:302
+#: g10/keygen.c:267
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "liiga palju `%c' eelistusi\n"
 
-#: g10/keygen.c:304
+#: g10/keygen.c:269
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "liiga palju `%c' eelistusi\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:394
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "lubamatu s�mbol eelistuste s�nes\n"
 
-#: g10/keygen.c:829
+#: g10/keygen.c:822
 msgid "writing direct signature\n"
 msgstr "kirjutan otsese allkirja\n"
 
-#: g10/keygen.c:868
+#: g10/keygen.c:861
 msgid "writing self signature\n"
 msgstr "kirjutan iseenda allkirja\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing key binding signature\n"
 msgstr "kirjutan v�tit siduva allkirja\n"
 
-#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2632
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "vigane v�tme suurus; kasutan %u bitti\n"
 
-#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2638
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "v�tme suurus �mardatud �les %u bitini\n"
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1239
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1252
+#: g10/keygen.c:1242
 #, fuzzy
 msgid "Encrypt"
 msgstr "kr�pteeri andmed"
 
-#: g10/keygen.c:1255
+#: g10/keygen.c:1245
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1263
+#: g10/keygen.c:1253
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1268
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1282
+#: g10/keygen.c:1272
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1287
+#: g10/keygen.c:1277
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1290
+#: g10/keygen.c:1280
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (ainult kr�ptimiseks)\n"
 
-#: g10/keygen.c:1293
+#: g10/keygen.c:1283
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1296
+#: g10/keygen.c:1286
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1340
 msgid "Please select what kind of key you want:\n"
 msgstr "Palun valige, millist v�tmet��pi te soovite:\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1342
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA ja ElGamal (vaikimisi)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1343
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1345
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/keygen.c:1357
+#: g10/keygen.c:1347
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (ainult kr�ptimiseks)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1348
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1350
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/keygen.c:1362
+#: g10/keygen.c:1352
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/keygen.c:1431 g10/keygen.c:2509
+#: g10/keygen.c:1421 g10/keygen.c:2506
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA v�tmepaari pikkuseks saab 1024 bitti.\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1431
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1438
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Millist v�tmepikkust te soovite? (1024) "
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1452
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1468
+#: g10/keygen.c:1458
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Soovitud v�tmepikkus on %u bitti\n"
 
-#: g10/keygen.c:1473 g10/keygen.c:1478
+#: g10/keygen.c:1463 g10/keygen.c:1468
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "�mardatud �les %u bitini\n"
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1515
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3628,7 +3724,7 @@ msgstr ""
 "      <n>m = v�ti aegub n kuuga\n"
 "      <n>y = v�ti aegub n aastaga\n"
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1526
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3644,39 +3740,40 @@ msgstr ""
 "      <n>m = allkiri aegub n kuuga\n"
 "      <n>y = allkiri aegub n aastaga\n"
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1549
 msgid "Key is valid for? (0) "
 msgstr "V�ti on kehtiv kuni? (0) "
 
-#: g10/keygen.c:1563
-msgid "Signature is valid for? (0) "
+#: g10/keygen.c:1554
+#, fuzzy, c-format
+msgid "Signature is valid for? (%s) "
 msgstr "Allkiri on kehtiv kuni? (0) "
 
-#: g10/keygen.c:1568
+#: g10/keygen.c:1572
 msgid "invalid value\n"
 msgstr "vigane v��rtus\n"
 
-#: g10/keygen.c:1575
+#: g10/keygen.c:1579
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s ei aegu kunagi\n"
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1580
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s ei aegu kunagi\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1585
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s aegub %s\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1586
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Allkiri aegub %s\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1592
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3684,12 +3781,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:1595
+#: g10/keygen.c:1597
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "On see �ige (j/e)? "
 
-#: g10/keygen.c:1638
+#: g10/keygen.c:1641
 #, fuzzy
 msgid ""
 "\n"
@@ -3705,44 +3802,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1651
+#: g10/keygen.c:1654
 msgid "Real name: "
 msgstr "P�risnimi: "
 
-#: g10/keygen.c:1659
+#: g10/keygen.c:1662
 msgid "Invalid character in name\n"
 msgstr "Lubamatu s�mbol nimes\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1664
 msgid "Name may not start with a digit\n"
 msgstr "Nimi ei v�i alata numbriga\n"
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1666
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nimes peab olema v�hemalt 5 s�mbolit\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1674
 msgid "Email address: "
 msgstr "E-posti aadress: "
 
-#: g10/keygen.c:1682
+#: g10/keygen.c:1685
 msgid "Not a valid email address\n"
 msgstr "Selline e-posti aadress ei ole lubatud\n"
 
-#: g10/keygen.c:1690
+#: g10/keygen.c:1693
 msgid "Comment: "
 msgstr "Kommentaar: "
 
-#: g10/keygen.c:1696
+#: g10/keygen.c:1699
 msgid "Invalid character in comment\n"
 msgstr "Lubamatu s�mbol kommentaaris\n"
 
-#: g10/keygen.c:1719
+#: g10/keygen.c:1722
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Te kasutate kooditabelit `%s'.\n"
 
-#: g10/keygen.c:1725
+#: g10/keygen.c:1728
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3753,7 +3850,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1733
 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"
 
@@ -3768,23 +3865,23 @@ msgstr "�rge palun kirjutage e-posti aadressi p�risnimesse ega kommentaari\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1746
+#: g10/keygen.c:1749
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoVv"
 
-#: g10/keygen.c:1756
+#: g10/keygen.c:1759
 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:1757
+#: g10/keygen.c:1760
 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:1776
+#: g10/keygen.c:1779
 msgid "Please correct the error first\n"
 msgstr "Palun parandage k�igepealt viga\n"
 
-#: g10/keygen.c:1816
+#: g10/keygen.c:1819
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3792,12 +3889,12 @@ msgstr ""
 "Te vajate oma salajase v�tme kaitsmiseks parooli.\n"
 "\n"
 
-#: g10/keygen.c:1826 g10/passphrase.c:1105
+#: g10/keygen.c:1829 g10/passphrase.c:786
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1832
+#: g10/keygen.c:1835
 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"
@@ -3809,7 +3906,7 @@ msgstr ""
 "kasutades seda programmi v�tmega \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1857
 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"
@@ -3821,50 +3918,50 @@ msgstr ""
 "kasutada kettaid jne), see annaks juhuarvude generaatorile v�imaluse\n"
 "koguda paremat entroopiat.\n"
 
-#: g10/keygen.c:2578
+#: g10/keygen.c:2575
 msgid "Key generation canceled.\n"
 msgstr "V�tme genereerimine katkestati.\n"
 
-#: g10/keygen.c:2766 g10/keygen.c:2910
+#: g10/keygen.c:2774 g10/keygen.c:2918
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "kirjutan avaliku v�tme faili `%s'\n"
 
-#: g10/keygen.c:2768 g10/keygen.c:2913
+#: g10/keygen.c:2776 g10/keygen.c:2921
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/keygen.c:2771 g10/keygen.c:2916
+#: g10/keygen.c:2779 g10/keygen.c:2924
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2907
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjutatavat avalike v�tmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:2905
+#: g10/keygen.c:2913
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kirjutatavat salajaste v�tmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2931
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "viga avaliku v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2938
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:2953
+#: g10/keygen.c:2961
 msgid "public and secret key created and signed.\n"
 msgstr "avalik ja salajane v�ti on loodud ja allkirjastatud.\n"
 
-#: g10/keygen.c:2964
+#: g10/keygen.c:2972
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -3874,386 +3971,367 @@ msgstr ""
 "Kr�ptimiseks tuleb genereerida teine v�ti, seda saate teha\n"
 "kasutades v�tit \"--edit-key\".\n"
 
-#: g10/keygen.c:2976 g10/keygen.c:3105 g10/keygen.c:3220
+#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3156 g10/sign.c:290
+#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
 #, 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:3030 g10/keygen.c:3158 g10/sign.c:292
+#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
 #, 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:3039 g10/keygen.c:3169
+#: g10/keygen.c:3047 g10/keygen.c:3177
 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:3078 g10/keygen.c:3202
+#: g10/keygen.c:3086 g10/keygen.c:3210
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Loon t�esti? "
 
-#: g10/keygen.c:3355
+#: g10/keygen.c:3363
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: g10/keygen.c:3402
+#: g10/keygen.c:3410
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
 
-#: g10/keygen.c:3428
+#: g10/keygen.c:3436
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "M�RKUS: salajane v�ti %08lX aegus %s\n"
 
-#: g10/keygen.c:3508
-#, c-format
-msgid "length of RSA modulus is not %d\n"
-msgstr ""
-
-#: g10/keygen.c:3514
-msgid "public exponent too large (more than 32 bits)\n"
-msgstr ""
-
-#: g10/keygen.c:3520 g10/keygen.c:3526
-#, c-format
-msgid "length of an RSA prime is not %d\n"
-msgstr ""
-
-#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
+#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
 msgid "never     "
 msgstr "mitte kunagi"
 
-#: g10/keylist.c:264
+#: g10/keylist.c:265
 msgid "Critical signature policy: "
 msgstr "Kriitiline allkirja poliitika: "
 
-#: g10/keylist.c:266
+#: g10/keylist.c:267
 msgid "Signature policy: "
 msgstr "Allkirja poliitika: "
 
-#: g10/keylist.c:305
+#: g10/keylist.c:306
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:354 g10/keylist.c:398
+#: 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:372
+#: g10/keylist.c:373
 msgid "Critical signature notation: "
 msgstr "Kriitiline allkirja noteerimine: "
 
-#: g10/keylist.c:374
+#: g10/keylist.c:375
 msgid "Signature notation: "
 msgstr "Allkirja noteerimine: "
 
-#: g10/keylist.c:385
+#: g10/keylist.c:386
 msgid "not human readable"
 msgstr "pole inimese poolt loetav"
 
-#: g10/keylist.c:486
+#: g10/keylist.c:487
 msgid "Keyring"
 msgstr "V�tmehoidla"
 
-#: g10/keylist.c:792
+#: g10/keylist.c:793
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr " [aegub: %s]"
 
-#: g10/keylist.c:1488
+#: g10/keylist.c:1489
 msgid "Primary key fingerprint:"
 msgstr "Primaarse v�tme s�rmej�lg:"
 
-#: g10/keylist.c:1490
+#: g10/keylist.c:1491
 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:1497
+#: g10/keylist.c:1498
 msgid " Primary key fingerprint:"
 msgstr " Primaarse v�tme s�rmej�lg:"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1500
 msgid "      Subkey fingerprint:"
 msgstr "     Alamv�tme s�rmej�lg:"
 
-#: g10/keylist.c:1503 g10/keylist.c:1507
+#: g10/keylist.c:1504 g10/keylist.c:1508
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     V�tme s�rmej�lg ="
 
-#: g10/keylist.c:1574
+#: g10/keylist.c:1575
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1245
+#: g10/keyring.c:1246
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "pakendamine eba�nnestus: %s\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1252
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "HOIATUS: on olemas 2 faili konfidentsiaalse infoga.\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s ei ole muudetud\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1255
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s on uus\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1256
 msgid "Please fix this possible security flaw\n"
 msgstr "Palun parandage see v�imalik turvaprobleem\n"
 
-#: g10/keyring.c:1375
+#: g10/keyring.c:1376
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "kontrollin v�tmehoidlat `%s'\n"
 
-#: g10/keyring.c:1421
+#: g10/keyring.c:1422
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "kontrollitud %lu v�tit (%lu allkirja)\n"
 
-#: g10/keyring.c:1433
+#: g10/keyring.c:1434
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "kontrollitud %lu v�tit (%lu allkirja)\n"
 
-#: g10/keyring.c:1504
+#: g10/keyring.c:1505
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: v�tmehoidla on loodud\n"
 
-#: g10/keyserver.c:107
+#: g10/keyserver.c:105
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "HOIATUS: seaded failis `%s' pole seekord veel aktiivsed\n"
 
-#: g10/keyserver.c:434
+#: g10/keyserver.c:433
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:635
+#: g10/keyserver.c:634
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:718 g10/keyserver.c:1238
+#: g10/keyserver.c:717 g10/keyserver.c:1267
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/keyserver.c:808
+#: g10/keyserver.c:815
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "v�tit '%s' ei leitud: %s\n"
 
-#: g10/keyserver.c:810
+#: g10/keyserver.c:817
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "v�tit '%s' ei leitud: %s\n"
 
-#: g10/keyserver.c:985
+#: g10/keyserver.c:1014
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
 
-#: g10/keyserver.c:989
+#: g10/keyserver.c:1018
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
 
-#: g10/keyserver.c:1141
+#: g10/keyserver.c:1170
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "allkirjastatud teie v�tmega %08lX %s\n"
 
-#: g10/keyserver.c:1188
+#: g10/keyserver.c:1217
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1191
+#: g10/keyserver.c:1220
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1198 g10/keyserver.c:1293
+#: g10/keyserver.c:1227 g10/keyserver.c:1322
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1275
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1255
+#: g10/keyserver.c:1284
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1314
+#: g10/keyserver.c:1343
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1320
+#: g10/keyserver.c:1349
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1361
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1366
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1374
 #, c-format
-msgid "gpgkeys_%s does not support handler version %d\n"
+msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1351
+#: g10/keyserver.c:1381
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "v�tmeserveri viga"
 
-#: g10/keyserver.c:1356
+#: g10/keyserver.c:1386
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "v�tmeserveri viga"
 
-#: g10/keyserver.c:1365
+#: g10/keyserver.c:1395
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
 
-#: g10/keyserver.c:1390 g10/keyserver.c:1424
+#: g10/keyserver.c:1420 g10/keyserver.c:1454
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1681
+#: g10/keyserver.c:1711
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1703
+#: g10/keyserver.c:1733
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
 
-#: g10/keyserver.c:1705
+#: g10/keyserver.c:1735
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:249
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "veider suurus kr�ptitud sessiooni v�tme jaoks (%d)\n"
 
-#: g10/mainproc.c:262
-#, c-format
-msgid "bad passphrase or unknown cipher algorithm (%d)\n"
-msgstr "halb parool v�i tundmatu �ifri algoritm (%d)\n"
-
-#: g10/mainproc.c:299
+#: g10/mainproc.c:300
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s kr�pteeritud sessiooni v�ti\n"
 
-#: g10/mainproc.c:309
+#: g10/mainproc.c:310
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "kr�pteeritud tundmatu algoritmiga %d\n"
 
-#: g10/mainproc.c:375
+#: g10/mainproc.c:376
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "avalik v�ti on %08lX\n"
 
-#: g10/mainproc.c:430
+#: g10/mainproc.c:431
 msgid "public key encrypted data: good DEK\n"
 msgstr "avaliku v�tmega kr�pteeritud andmed: hea DEK\n"
 
-#: g10/mainproc.c:463
+#: g10/mainproc.c:464
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "kr�pteeritud %u-bitise %s v�tmega, ID %08lX, loodud %s\n"
 
-#: g10/mainproc.c:467 g10/pkclist.c:218
+#: g10/mainproc.c:468 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                 ka \""
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:472
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "kr�pteeritud %s v�tmega, ID %08lX\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "avaliku v�tmega lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/mainproc.c:499
+#: g10/mainproc.c:500
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "kr�pteeritud kasutades %lu parooli\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:502
 msgid "encrypted with 1 passphrase\n"
 msgstr "kr�pteeritud �he parooliga\n"
 
-#: g10/mainproc.c:529 g10/mainproc.c:551
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "eeldan %s kr�pteeritud andmeid\n"
 
-#: g10/mainproc.c:537
+#: g10/mainproc.c:538
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA �iffer pole saadaval, loodan kasutada selle asemel %s\n"
 
-#: g10/mainproc.c:569
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr "lahtikr�pteerimine �nnestus\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:574
 msgid "WARNING: message was not integrity protected\n"
 msgstr "HOIATUS: teate koosk�lalisus ei ole tagatud\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "HOIATUS: kr�pteeritud teadet on muudetud!\n"
 
-#: g10/mainproc.c:592
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
@@ -4267,302 +4345,291 @@ 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:786
+#: g10/mainproc.c:803
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "eraldiseisev t�histus - realiseerimiseks kasutage \"gpg --import\"\n"
 
-#: g10/mainproc.c:1290
+#: g10/mainproc.c:1307
 msgid "signature verification suppressed\n"
 msgstr "allkirja kontroll j�eti �ra\n"
 
-#: g10/mainproc.c:1332 g10/mainproc.c:1342
+#: g10/mainproc.c:1349 g10/mainproc.c:1359
 msgid "can't handle these multiple signatures\n"
 msgstr "neid allkirju ei �nnestu t��delda\n"
 
-#: g10/mainproc.c:1352
+#: g10/mainproc.c:1369
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/mainproc.c:1353
+#: g10/mainproc.c:1370
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                 ka \""
 
-#: g10/mainproc.c:1357
+#: g10/mainproc.c:1374
 #, 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:1377
+#: g10/mainproc.c:1394
 msgid "Key available at: "
 msgstr "V�tme leiate: "
 
-#: g10/mainproc.c:1482 g10/mainproc.c:1530
+#: g10/mainproc.c:1499 g10/mainproc.c:1547
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "HALB allkiri kasutajalt \""
 
-#: g10/mainproc.c:1484 g10/mainproc.c:1532
+#: g10/mainproc.c:1501 g10/mainproc.c:1549
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Aegunud allkiri kasutajalt \""
 
-#: g10/mainproc.c:1486 g10/mainproc.c:1534
+#: g10/mainproc.c:1503 g10/mainproc.c:1551
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: g10/mainproc.c:1538
+#: g10/mainproc.c:1555
 msgid "[uncertain]"
 msgstr "[ebakindel]"
 
-#: g10/mainproc.c:1570
+#: g10/mainproc.c:1587
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                 ka \""
 
-#: g10/mainproc.c:1664
+#: g10/mainproc.c:1681
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/mainproc.c:1669
+#: g10/mainproc.c:1686
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Allkiri aegub %s\n"
 
-#: g10/mainproc.c:1672
+#: g10/mainproc.c:1689
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
 
-#: g10/mainproc.c:1673
+#: g10/mainproc.c:1690
 msgid "binary"
 msgstr "binaarne"
 
-#: g10/mainproc.c:1674
+#: g10/mainproc.c:1691
 msgid "textmode"
 msgstr "tekstimood"
 
-#: g10/mainproc.c:1674 g10/trustdb.c:530
+#: g10/mainproc.c:1691 g10/trustdb.c:531
 msgid "unknown"
 msgstr "tundmatu"
 
-#: g10/mainproc.c:1694
+#: g10/mainproc.c:1711
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allkirja ei saa kontrollida: %s\n"
 
-#: g10/mainproc.c:1762 g10/mainproc.c:1778 g10/mainproc.c:1864
+#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
 msgid "not a detached signature\n"
 msgstr "ei ole eraldiseisev allkiri\n"
 
-#: g10/mainproc.c:1805
+#: g10/mainproc.c:1822
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "HOIATUS: leidsin mitu allkirja. Kontrollitakse ainult esimest.\n"
 
-#: g10/mainproc.c:1813
+#: g10/mainproc.c:1830
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "eraldiseisev allkiri klassiga 0x%02x\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1887
 msgid "old style (PGP 2.x) signature\n"
 msgstr "vana stiili (PGP 2.x) allkiri\n"
 
-#: g10/mainproc.c:1880
+#: g10/mainproc.c:1897
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() tuvastas vigase juurmise paketi\n"
 
-#: g10/misc.c:121
+#: g10/misc.c:122
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "ei �nnestu blokeerida m�lupildi salvestamist: %s\n"
 
-#: g10/misc.c:141 g10/misc.c:169 g10/misc.c:241
+#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "faili ei �nnestu avada: %s\n"
 
-#: g10/misc.c:206
+#: g10/misc.c:207
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: lugemine eba�nnestus (n=%d): %s\n"
 
-#: g10/misc.c:315
+#: g10/misc.c:316
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "ei oska k�sitleda avaliku v�tme algoritmi %d\n"
 
-#: g10/misc.c:330
+#: g10/misc.c:331
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "realiseerimata �ifri algoritm"
 
-#: g10/misc.c:345
+#: g10/misc.c:346
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:351
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "s�numil�hendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/misc.c:446
+#: g10/misc.c:447
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA �ifri lisandprogrammi pole\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:448
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr "lisainfot leiate lehelt http://www.gnupg.org/why-not-idea.html\n"
 
-#: g10/misc.c:680
+#: g10/misc.c:681
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: ebasoovitav v�ti \"%s\"\n"
 
-#: g10/misc.c:684
+#: g10/misc.c:685
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
 
-#: g10/misc.c:686
+#: g10/misc.c:687
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "palun kasutage selle asemel \"%s%s\"\n"
 
-#: g10/misc.c:697
+#: g10/misc.c:694
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
+msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
+
+#: g10/misc.c:707
 msgid "Uncompressed"
 msgstr "Pakkimata"
 
-#: g10/misc.c:722
+#: g10/misc.c:732
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Pakkimata"
 
-#: g10/misc.c:832
+#: g10/misc.c:842
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "see teade ei pruugi olla programmiga %s kasutatav\n"
 
-#: g10/misc.c:989
+#: g10/misc.c:999
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: g10/misc.c:1014
+#: g10/misc.c:1024
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: g10/openfile.c:84
+#: g10/openfile.c:86
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Fail `%s' on olemas. "
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Kirjutan �le (j/E)? "
 
-#: g10/openfile.c:119
+#: g10/openfile.c:121
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: tundmatu suffiks\n"
 
-#: g10/openfile.c:141
+#: g10/openfile.c:143
 msgid "Enter new filename"
 msgstr "Sisestage uus failinimi"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:188
 msgid "writing to stdout\n"
 msgstr "kirjutan standardv�ljundisse\n"
 
-#: g10/openfile.c:296
+#: g10/openfile.c:300
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "eeldan allkirjastatud andmeid failis `%s'\n"
 
-#: g10/openfile.c:375
+#: g10/openfile.c:379
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "uus omaduste fail `%s' on loodud\n"
 
-#: g10/openfile.c:377
+#: g10/openfile.c:381
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "HOIATUS: seaded failis `%s' pole seekord veel aktiivsed\n"
 
-#: g10/openfile.c:409
+#: g10/openfile.c:413
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: kataloog on loodud\n"
 
-#: g10/parse-packet.c:137
+#: g10/parse-packet.c:138
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "ei oska k�sitleda avaliku v�tme algoritmi %d\n"
 
-#: g10/parse-packet.c:707
+#: g10/parse-packet.c:708
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "HOIATUS: t�en�oliselt ebaturvaline s�mmeetriliselt kr�pteeritud sessiooni "
 "v�ti\n"
 
-#: g10/parse-packet.c:1132
+#: g10/parse-packet.c:1145
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "alampaketil t��biga %d on kriitiline bitt seatud\n"
 
-#: g10/passphrase.c:478 g10/passphrase.c:525
+#: g10/passphrase.c:305
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: g10/passphrase.c:486
-msgid "can't set client pid for the agent\n"
-msgstr "agendile ei �nnestu seada kliendi pid\n"
-
-#: g10/passphrase.c:494
-msgid "can't get server read FD for the agent\n"
-msgstr "agendiga suhtlemiseks ei �nnestu saada lugemise FD\n"
-
-#: g10/passphrase.c:501
-msgid "can't get server write FD for the agent\n"
-msgstr "agendiga suhtlemiseks ei �nnestu saada kirjutamise FD\n"
-
-#: g10/passphrase.c:534
+#: g10/passphrase.c:317
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "vigane GPG_AGENT_INFO keskkonnamuutuja\n"
 
-#: g10/passphrase.c:547
+#: g10/passphrase.c:332
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n"
 
-#: g10/passphrase.c:568
+#: g10/passphrase.c:345
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
 
-#: g10/passphrase.c:590
-msgid "communication problem with gpg-agent\n"
-msgstr "probleem gpg-agent programmiga suhtlemisel\n"
-
-#: g10/passphrase.c:597 g10/passphrase.c:937 g10/passphrase.c:1049
+#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
 msgid "problem with the agent - disabling agent use\n"
 msgstr "probleem agendiga - blokeerin agendi kasutamise\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1209
+#: g10/passphrase.c:511 g10/passphrase.c:890
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (peamise v�tme ID %08lX)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:525
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4573,41 +4640,28 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bitti %s v�ti, ID %08lX, loodud %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:550
 msgid "Repeat passphrase\n"
 msgstr "Korrake parooli\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:552
 msgid "Enter passphrase\n"
 msgstr "Sisestage parool\n"
 
-#: g10/passphrase.c:781
-msgid "passphrase too long\n"
-msgstr "liiga pikk parool\n"
-
-#: g10/passphrase.c:794
-msgid "invalid response from agent\n"
-msgstr "vigane vastus agendilt\n"
-
-#: g10/passphrase.c:810 g10/passphrase.c:931
+#: g10/passphrase.c:628
 msgid "cancelled by user\n"
 msgstr "katkestatud kasutaja poolt\n"
 
-#: g10/passphrase.c:815 g10/passphrase.c:1020
-#, c-format
-msgid "problem with the agent: agent returns 0x%lx\n"
-msgstr "probleem agendiga: agent tagastas 0x%lx\n"
-
-#: g10/passphrase.c:1100 g10/passphrase.c:1263
+#: g10/passphrase.c:781 g10/passphrase.c:944
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "pakettmoodis ei saa parooli k�sida\n"
 
-#: g10/passphrase.c:1107 g10/passphrase.c:1268
+#: g10/passphrase.c:788 g10/passphrase.c:949
 msgid "Enter passphrase: "
 msgstr "Sisestage parool: "
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:871
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4617,21 +4671,21 @@ msgstr ""
 "Te vajate kasutaja salajase v�tme lahtilukustamiseks\n"
 "parooli: \""
 
-#: g10/passphrase.c:1196
+#: g10/passphrase.c:877
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bitine %s v�ti, ID %08lX, loodud %s"
 
-#: g10/passphrase.c:1205
+#: g10/passphrase.c:886
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1272
+#: g10/passphrase.c:953
 msgid "Repeat passphrase: "
 msgstr "Korrake parooli: "
 
-#: g10/photoid.c:66
+#: g10/photoid.c:67
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4645,158 +4699,158 @@ msgstr ""
 "v�ga suurt pilti, on ka k�ti v�ha suur!\n"
 "M�istlik pildi suurus v�iks olla umbes 240x288.\n"
 
-#: g10/photoid.c:80
+#: g10/photoid.c:81
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Sisestage foto ID jaoks JPEG faili nimi: "
 
-#: g10/photoid.c:94
+#: g10/photoid.c:95
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "faili ei �nnestu avada: %s\n"
 
-#: g10/photoid.c:102
+#: g10/photoid.c:103
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:104
+#: g10/photoid.c:105
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/photoid.c:119
+#: g10/photoid.c:120
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\": ei ole JPEG fail\n"
 
-#: g10/photoid.c:136
+#: g10/photoid.c:137
 msgid "Is this photo correct (y/N/q)? "
 msgstr "On see foto �ige (j/E/v)? "
 
-#: g10/photoid.c:338
+#: g10/photoid.c:339
 msgid "unable to display photo ID!\n"
 msgstr "foto ID ei saa n�idata!\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:580
+#: g10/pkclist.c:62 g10/revoke.c:581
 msgid "No reason specified"
 msgstr "P�hjus puudub"
 
-#: g10/pkclist.c:63 g10/revoke.c:582
+#: g10/pkclist.c:64 g10/revoke.c:583
 msgid "Key is superseded"
 msgstr "V�ti on asendatud"
 
-#: g10/pkclist.c:65 g10/revoke.c:581
+#: g10/pkclist.c:66 g10/revoke.c:582
 msgid "Key has been compromised"
 msgstr "V�ti on kompromiteeritud"
 
-#: g10/pkclist.c:67 g10/revoke.c:583
+#: g10/pkclist.c:68 g10/revoke.c:584
 msgid "Key is no longer used"
 msgstr "V�ti ei ole enam kasutusel"
 
-#: g10/pkclist.c:69 g10/revoke.c:584
+#: g10/pkclist.c:70 g10/revoke.c:585
 msgid "User ID is no longer valid"
 msgstr "Kasutaja ID ei ole enam kehtiv"
 
-#: g10/pkclist.c:73
+#: g10/pkclist.c:74
 msgid "reason for revocation: "
 msgstr "t�histamise p�hjus: "
 
-#: g10/pkclist.c:90
+#: g10/pkclist.c:91
 msgid "revocation comment: "
 msgstr "t�histamise kommentaar: "
 
-#: g10/pkclist.c:205
+#: g10/pkclist.c:206
 msgid "iImMqQsS"
 msgstr "iItTvVjJ"
 
-#: g10/pkclist.c:213
+#: g10/pkclist.c:214
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "Usalduse v��rtus puudub:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:245
+#: g10/pkclist.c:246
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "                 ka \""
 
-#: g10/pkclist.c:255
+#: g10/pkclist.c:256
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "See v�ti kuulub t�en�oliselt omanikule\n"
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:271
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = Ei tea\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = EI usalda\n"
 
-#: g10/pkclist.c:278
+#: g10/pkclist.c:279
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Usaldan absoluutselt\n"
 
-#: g10/pkclist.c:284
+#: g10/pkclist.c:285
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " t = tagasi p�himen��sse\n"
 
-#: g10/pkclist.c:287
+#: g10/pkclist.c:288
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " j = j�ta see v�ti vahele\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " v = v�lju\n"
 
-#: g10/pkclist.c:292
+#: g10/pkclist.c:293
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:298 g10/revoke.c:609
+#: g10/pkclist.c:299 g10/revoke.c:610
 msgid "Your decision? "
 msgstr "Teie otsus? "
 
-#: g10/pkclist.c:319
+#: g10/pkclist.c:320
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Kas te t�esti soovite seda v�tit absoluutselt usaldada? "
 
-#: g10/pkclist.c:333
+#: g10/pkclist.c:334
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Sertifikaadid t�iesti usaldatava v�tmeni:\n"
 
-#: g10/pkclist.c:418
+#: g10/pkclist.c:419
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr "%08lX: Ei ole midagi, mis n�itaks, et see v�ti kuulub omanikule\n"
 
-#: g10/pkclist.c:423
+#: g10/pkclist.c:424
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr "%08lX: Ei ole midagi, mis n�itaks, et see v�ti kuulub omanikule\n"
 
-#: g10/pkclist.c:429
+#: g10/pkclist.c:430
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "See v�ti kuulub t�en�oliselt omanikule\n"
 
-#: g10/pkclist.c:434
+#: g10/pkclist.c:435
 msgid "This key belongs to us\n"
 msgstr "See v�ti kuulub meile\n"
 
-#: g10/pkclist.c:460
+#: g10/pkclist.c:461
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -4808,91 +4862,91 @@ msgstr ""
 "v�ite j�rgnevale k�simusele vastata jaatavalt\n"
 "\n"
 
-#: g10/pkclist.c:467
+#: g10/pkclist.c:468
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Kasutan seda v�tit ikka? "
 
-#: g10/pkclist.c:501
+#: g10/pkclist.c:502
 msgid "WARNING: Using untrusted key!\n"
 msgstr "HOIATUS: Kasutan mitteusaldatavat v�tit!\n"
 
-#: g10/pkclist.c:508
+#: g10/pkclist.c:509
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "HOIATUS: see v�ti v�ib olla t�histatud (t�histamise v�tit pole)\n"
 
-#: g10/pkclist.c:517
+#: g10/pkclist.c:518
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "HOIATUS: See v�ti on m��ratud t�histaja poolt t�histatud!\n"
 
-#: g10/pkclist.c:520
+#: g10/pkclist.c:521
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "HOIATUS: See v�ti on omaniku poolt t�histatud!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         See v�ib t�hendada, et allkiri on v�ltsing.\n"
 
-#: g10/pkclist.c:527
+#: g10/pkclist.c:528
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "HOIATUS: See alamv�ti on omaniku poolt t�histatud!\n"
 
-#: g10/pkclist.c:532
+#: g10/pkclist.c:533
 msgid "Note: This key has been disabled.\n"
 msgstr "M�rkus: See v�ti on blokeeritud.\n"
 
-#: g10/pkclist.c:537
+#: g10/pkclist.c:538
 msgid "Note: This key has expired!\n"
 msgstr "M�rkus: See v�ti on aegunud!\n"
 
-#: g10/pkclist.c:548
+#: g10/pkclist.c:549
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "HOIATUS: Seda v�tit ei ole sertifitseeritud usaldatava allkirjaga!\n"
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:551
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         Ei ole midagi, mis n�itaks, et allkiri kuulub omanikule.\n"
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:559
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "HOIATUS: Me EI usalda seda v�tit!\n"
 
-#: g10/pkclist.c:559
+#: g10/pkclist.c:560
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Allkiri on t�en�oliselt V�LTSING.\n"
 
-#: g10/pkclist.c:567
+#: g10/pkclist.c:568
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "HOIATUS: Seda v�tit ei ole sertifitseeritud piisavalt usaldatava "
 "allkirjaga!\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:570
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Ei ole kindel, et allkiri kuulub omanikule.\n"
 
-#: g10/pkclist.c:734 g10/pkclist.c:767 g10/pkclist.c:936 g10/pkclist.c:996
+#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: j�tsin vahele: %s\n"
 
-#: g10/pkclist.c:744 g10/pkclist.c:968
+#: g10/pkclist.c:745 g10/pkclist.c:969
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/pkclist.c:786
+#: g10/pkclist.c:787
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Te ei m��ranud kasutaja IDd. (v�ite kasutada v�tit \"-r\")\n"
 
-#: g10/pkclist.c:802
+#: g10/pkclist.c:803
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:828
+#: g10/pkclist.c:829
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -4900,170 +4954,170 @@ msgstr ""
 "\n"
 "Sisestage kasutaja ID.  L�petage t�hja reaga: "
 
-#: g10/pkclist.c:844
+#: g10/pkclist.c:845
 msgid "No such user ID.\n"
 msgstr "Tundmatu kasutaja ID.\n"
 
-#: g10/pkclist.c:849 g10/pkclist.c:911
+#: g10/pkclist.c:850 g10/pkclist.c:912
 msgid "skipped: public key already set as default recipient\n"
 msgstr "j�tsin vahele: avalik v�ti on juba vaikimisi saaja\n"
 
-#: g10/pkclist.c:867
+#: g10/pkclist.c:868
 msgid "Public key is disabled.\n"
 msgstr "Avalik v�ti on blokeeritud.\n"
 
-#: g10/pkclist.c:874
+#: g10/pkclist.c:875
 msgid "skipped: public key already set\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:904
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: g10/pkclist.c:948
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: j�tsin vahele: avalik v�ti on blokeeritud\n"
 
-#: g10/pkclist.c:1003
+#: g10/pkclist.c:1004
 msgid "no valid addressees\n"
 msgstr "kehtivaid aadresse pole\n"
 
-#: g10/plaintext.c:90
+#: g10/plaintext.c:91
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "andmeid ei salvestatud; salvestamiseks kasutage v�tit \"--output\"\n"
 
-#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
+#: g10/plaintext.c:136 g10/plaintext.c:141 g10/plaintext.c:159
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "viga `%s' loomisel: %s\n"
 
-#: g10/plaintext.c:446
+#: g10/plaintext.c:447
 msgid "Detached signature.\n"
 msgstr "Eraldiseisev allkiri.\n"
 
-#: g10/plaintext.c:450
+#: g10/plaintext.c:452
 msgid "Please enter name of data file: "
 msgstr "Palun sisestage andmefaili nimi: "
 
-#: g10/plaintext.c:478
+#: g10/plaintext.c:481
 msgid "reading stdin ...\n"
 msgstr "loen standardsisendit ...\n"
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:515
 msgid "no signed data\n"
 msgstr "allkirjastatud andmeid pole\n"
 
-#: g10/plaintext.c:526
+#: g10/plaintext.c:529
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "allkirjastatud andmete avamine eba�nnestus `%s'\n"
 
-#: g10/pubkey-enc.c:103
+#: g10/pubkey-enc.c:104
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "anon��mne saaja; proovin salajast v�tit %08lX ...\n"
 
-#: g10/pubkey-enc.c:119
+#: g10/pubkey-enc.c:120
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "ok, me oleme anon��mne teate saaja.\n"
 
-#: g10/pubkey-enc.c:207
+#: g10/pubkey-enc.c:208
 msgid "old encoding of the DEK is not supported\n"
 msgstr "vana DEK kodeerimine ei ole toetatud\n"
 
-#: g10/pubkey-enc.c:228
+#: g10/pubkey-enc.c:229
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "�ifri algoritm %d%s on tundmatu v�i blokeeritud\n"
 
-#: g10/pubkey-enc.c:266
+#: g10/pubkey-enc.c:267
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "M�RKUS: �ifri algoritm %d puudub eelistustes\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:287
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "M�RKUS: salajane v�ti %08lX aegus %s\n"
 
-#: g10/pubkey-enc.c:292
+#: g10/pubkey-enc.c:293
 msgid "NOTE: key has been revoked"
 msgstr "M�RKUS: v�ti on t�histatud"
 
-#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:545
+#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
+#: g10/revoke.c:188 g10/revoke.c:546
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet eba�nnestus: %s\n"
 
-#: g10/revoke.c:146
+#: g10/revoke.c:147
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "v�ti %08lX: kasutaja ID puudub\n"
 
-#: g10/revoke.c:272
+#: g10/revoke.c:273
 msgid "To be revoked by:\n"
 msgstr "T�histaja:\n"
 
-#: g10/revoke.c:276
+#: g10/revoke.c:277
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(See on tundlik t�histamise v�ti)\n"
 
-#: g10/revoke.c:280
+#: g10/revoke.c:281
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Loon sellele v�tmele t�histamise sertifikaadi? "
 
-#: g10/revoke.c:293 g10/revoke.c:511
+#: g10/revoke.c:294 g10/revoke.c:512
 msgid "ASCII armored output forced.\n"
 msgstr "V�ljundis sunnitakse kasutama ASCII vormingut.\n"
 
-#: g10/revoke.c:307 g10/revoke.c:525
+#: g10/revoke.c:308 g10/revoke.c:526
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet eba�nnestus: %s\n"
 
-#: g10/revoke.c:370
+#: g10/revoke.c:371
 msgid "Revocation certificate created.\n"
 msgstr "T�histamise sertifikaat on loodud.\n"
 
-#: g10/revoke.c:376
+#: g10/revoke.c:377
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr ""
 "`%s' jaoks pole t�histamise v�tmeid\n"
 "\n"
 
-#: g10/revoke.c:432
+#: g10/revoke.c:433
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "salajast v�tit `%s' ei leitud: %s\n"
 
-#: g10/revoke.c:461
+#: g10/revoke.c:462
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "vastavat avalikku v�tit pole: %s\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:473
 msgid "public key does not match secret key!\n"
 msgstr "avalik v�ti ei sobi salajase v�tmega!\n"
 
-#: g10/revoke.c:479
+#: g10/revoke.c:480
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Loon sellele v�tmele t�histamise sertifikaadi? "
 
-#: g10/revoke.c:496
+#: g10/revoke.c:497
 msgid "unknown protection algorithm\n"
 msgstr "tundmatu kaitsealgoritm\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 msgid "NOTE: This key is not protected!\n"
 msgstr "M�RKUS: See v�ti ei ole kaitstud!\n"
 
-#: g10/revoke.c:551
+#: g10/revoke.c:552
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5084,164 +5138,164 @@ msgstr ""
 "tr�kis�steem\n"
 "v�ib salvestada need andmed ja teha teistele k�ttesaadavaks! \n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid "Please select the reason for the revocation:\n"
 msgstr "Palun valige t�histamise p�hjus:\n"
 
-#: g10/revoke.c:602
+#: g10/revoke.c:603
 msgid "Cancel"
 msgstr "Katkesta"
 
-#: g10/revoke.c:604
+#: g10/revoke.c:605
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(T�en�oliselt soovite siin valida %d)\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:646
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Sisestage mittekohustuslik kirjeldus. L�petage t�hja reaga:\n"
 
-#: g10/revoke.c:673
+#: g10/revoke.c:674
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "T�histamise p�hjus: %s\n"
 
-#: g10/revoke.c:675
+#: g10/revoke.c:676
 msgid "(No description given)\n"
 msgstr "(Kirjeldust ei antud)\n"
 
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "On see h�sti? "
 
-#: g10/seckey-cert.c:54
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "salajase v�tme komponendid ei ole k�ttesaadavad\n"
 
-#: g10/seckey-cert.c:60
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 
-#: g10/seckey-cert.c:71
+#: g10/seckey-cert.c:72
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 
-#: g10/seckey-cert.c:265
+#: g10/seckey-cert.c:266
 msgid "Invalid passphrase; please try again"
 msgstr "Vigane parool; palun proovige uuesti"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:267
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:326
+#: g10/seckey-cert.c:327
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "HOIATUS: Tuvastasin n�rga v�tme - palun muutke uuesti parooli.\n"
 
-#: g10/seckey-cert.c:364
+#: g10/seckey-cert.c:365
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "loon salajase v�tme kaitseks mittesoovitavat 16 bitist kontrollsummat\n"
 
-#: g10/seskey.c:52
+#: g10/seskey.c:53
 msgid "weak key created - retrying\n"
 msgstr "loodi n�rk v�ti - proovin uuesti\n"
 
-#: g10/seskey.c:57
+#: g10/seskey.c:58
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "s�mmeetrilises �ifris ei �nnestu v�ltida n�rga v�tme kasutamist; proovisin %"
 "d korda!\n"
 
-#: g10/seskey.c:213
+#: g10/seskey.c:214
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA n�uab 160 bitist r�sialgoritmi kasutamist\n"
 
-#: g10/sig-check.c:75
+#: g10/sig-check.c:76
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "HOIATUS: allkirja l�hend on teatega konfliktne\n"
 
-#: g10/sig-check.c:99
+#: g10/sig-check.c:100
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "HOIATUS: allkirjastamise alamv�ti %08lX ei ole rist-sertifitseeritud\n"
 
-#: g10/sig-check.c:102
+#: g10/sig-check.c:103
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "HOIATUS: allkirjastamise alamv�tmel %08lX on vigane rist-sertifikaat\n"
 
-#: g10/sig-check.c:168
+#: g10/sig-check.c:169
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "avalik v�ti %08lX on %lu sekund uuem, kui allkiri\n"
 
-#: g10/sig-check.c:169
+#: g10/sig-check.c:170
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "avalik v�ti %08lX on %lu sekundit uuem, kui allkiri\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:181
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr "v�ti loodi %lu sekund tulevikus (ajah�pe v�i kella probleem)\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:183
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr "v�ti loodi %lu sekundit tulevikus (ajah�pe v�i kella probleem)\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:193
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "M�RKUS: allkirja v�ti %08lX aegus %s\n"
 
-#: g10/sig-check.c:275
+#: g10/sig-check.c:276
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "eeldan tundmatu kriitilise biti t�ttu v�tmel %08lX vigast allkirja\n"
 
-#: g10/sig-check.c:532
+#: g10/sig-check.c:533
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "v�ti %08lX: alamv�tme t�histamise paketile puudub alamv�ti\n"
 
-#: g10/sig-check.c:558
+#: g10/sig-check.c:559
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "v�ti %08lX: alamv�tme allkirjaga sidumiseks puudub alamv�ti\n"
 
-#: g10/sign.c:85
+#: g10/sign.c:86
 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:93
+#: g10/sign.c:94
 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:112
+#: g10/sign.c:113
 #, 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:138
+#: g10/sign.c:139
 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:146
+#: g10/sign.c:147
 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:159
+#: g10/sign.c:160
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5249,7 +5303,7 @@ msgstr ""
 "HOIATUS: poliisi urli %%-asendus eba�nnestus (liiga suur). Kasutan "
 "kompaktset.\n"
 
-#: g10/sign.c:187
+#: g10/sign.c:188
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5258,74 +5312,74 @@ msgstr ""
 "HOIATUS: poliisi urli %%-asendus eba�nnestus (liiga suur). Kasutan "
 "kompaktset.\n"
 
-#: g10/sign.c:364
+#: g10/sign.c:365
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
 
-#: g10/sign.c:373
+#: g10/sign.c:374
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s allkiri kasutajalt: \"%s\"\n"
 
-#: g10/sign.c:741
+#: g10/sign.c:761
 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:808
+#: g10/sign.c:830
 #, 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:900
+#: g10/sign.c:922
 msgid "signing:"
 msgstr "allkirjastan:"
 
-#: g10/sign.c:1007
+#: g10/sign.c:1034
 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:1180
+#: g10/sign.c:1212
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "kasutatakse %s kr�pteerimist\n"
 
-#: g10/skclist.c:126 g10/skclist.c:190
+#: g10/skclist.c:127 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "v�ti ei ole m�rgitud ebaturvaliseks - sellega ei saa v�lts RNGd kasutada!\n"
 
-#: g10/skclist.c:157
+#: g10/skclist.c:158
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "`%s' j�tsin vahele: duplikaat\n"
 
-#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "`%s' j�tsin vahele: %s\n"
 
-#: g10/skclist.c:170
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/skclist.c:185
+#: g10/skclist.c:186
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "j�tsin `%s' vahele: see on PGP genereeritud ElGamal v�ti,\n"
 "mis ei ole allkirjades kasutamiseks turvaline!\n"
 
-#: g10/tdbdump.c:59 g10/trustdb.c:365
+#: g10/tdbdump.c:60 g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "usalduse kirje %lu, t��p %d: kirjutamine eba�nnestus: %s\n"
 
-#: g10/tdbdump.c:104
+#: g10/tdbdump.c:105
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5334,347 +5388,347 @@ msgstr ""
 "# Omistatud usalduse v��rtuste loend, loodud: %s\n"
 "# (Taastamiseks kasutage \"gpg --import-ownertrust\")\n"
 
-#: g10/tdbdump.c:159 g10/tdbdump.c:167 g10/tdbdump.c:172 g10/tdbdump.c:177
+#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: g10/tdbdump.c:159
+#: g10/tdbdump.c:160
 #, fuzzy
 msgid "line too long"
 msgstr "rida on liiga pikk\n"
 
-#: g10/tdbdump.c:167
+#: g10/tdbdump.c:168
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:173
+#: g10/tdbdump.c:174
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "viga: vigane s�rmej�lg\n"
 
-#: g10/tdbdump.c:178
+#: g10/tdbdump.c:179
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr "impordi usalduse v��rtused"
 
-#: g10/tdbdump.c:214
+#: g10/tdbdump.c:215
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "viga usalduse kirje otsimisel: %s\n"
 
-#: g10/tdbdump.c:218
+#: g10/tdbdump.c:219
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "viga lugemisel: %s\n"
 
-#: g10/tdbdump.c:227 g10/trustdb.c:380
+#: g10/tdbdump.c:228 g10/trustdb.c:381
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync eba�nnestus: %s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1440
+#: g10/tdbio.c:129 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb kirje %lu: lseek eba�nnestus: %s\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1447
+#: g10/tdbio.c:135 g10/tdbio.c:1448
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
 
-#: g10/tdbio.c:244
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "trustdb transaktsioon on liiga suur\n"
 
-#: g10/tdbio.c:497
+#: g10/tdbio.c:498
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "`%s' ei �nnestu sulgeda: %s\n"
 
-#: g10/tdbio.c:512
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: kataloogi ei ole!\n"
 
-#: g10/tdbio.c:522 g10/tdbio.c:545 g10/tdbio.c:588
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
 
-#: g10/tdbio.c:524 g10/tdbio.c:591
+#: g10/tdbio.c:525 g10/tdbio.c:592
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "`%s' ei �nnestu avada\n"
 
-#: g10/tdbio.c:550
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: versioonikirje loomine ei �nnestu: %s"
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: loodi vigane usalduse andmebaas\n"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: trustdb on loodud\n"
 
-#: g10/tdbio.c:597
+#: g10/tdbio.c:598
 msgid "NOTE: trustdb not writable\n"
 msgstr "M�RKUS: trustdb pole kirjutatav\n"
 
-#: g10/tdbio.c:614
+#: g10/tdbio.c:615
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: vigane trustdb\n"
 
-#: g10/tdbio.c:646
+#: g10/tdbio.c:647
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: paisktabeli loomine eba�nnestus: %s\n"
 
-#: g10/tdbio.c:654
+#: g10/tdbio.c:655
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: viga versioonikirje uuendamisel: %s\n"
 
-#: g10/tdbio.c:671 g10/tdbio.c:691 g10/tdbio.c:707 g10/tdbio.c:721
-#: g10/tdbio.c:751 g10/tdbio.c:1373 g10/tdbio.c:1400
+#: g10/tdbio.c:672 g10/tdbio.c:692 g10/tdbio.c:708 g10/tdbio.c:722
+#: g10/tdbio.c:752 g10/tdbio.c:1374 g10/tdbio.c:1401
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: viga versioonikirje lugemisel: %s\n"
 
-#: g10/tdbio.c:730
+#: g10/tdbio.c:731
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: viga versioonikirje kirjutamisel: %s\n"
 
-#: g10/tdbio.c:1169
+#: g10/tdbio.c:1170
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek eba�nnestus: %s\n"
 
-#: g10/tdbio.c:1177
+#: g10/tdbio.c:1178
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: lugemine eba�nnestus (n=%d): %s\n"
 
-#: g10/tdbio.c:1198
+#: g10/tdbio.c:1199
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ei ole trustdb fail\n"
 
-#: g10/tdbio.c:1216
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versioonikirje kirje numbriga %lu\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1222
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: vigane faili versioon %d\n"
 
-#: g10/tdbio.c:1406
+#: g10/tdbio.c:1407
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: viga vaba kirje lugemisel: %s\n"
 
-#: g10/tdbio.c:1414
+#: g10/tdbio.c:1415
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: viga kataloogikirje kirjutamisel: %s\n"
 
-#: g10/tdbio.c:1424
+#: g10/tdbio.c:1425
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: kirje nullimine eba�nnestus: %s\n"
 
-#: g10/tdbio.c:1454
+#: g10/tdbio.c:1455
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: kirje lisamine eba�nnestus: %s\n"
 
-#: g10/tdbio.c:1499
+#: g10/tdbio.c:1500
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "trustdb on vigane; palun k�ivitage \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:147
+#: g10/textfilter.c:148
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "ei suuda k�sitleda tekstiridu mis on pikemad, kui %d s�mbolit\n"
 
-#: g10/textfilter.c:244
+#: g10/textfilter.c:245
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "sisendrida on pikem, kui %d s�mbolit\n"
 
-#: g10/trustdb.c:226
+#: g10/trustdb.c:227
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' ei ole kehtiv pikk v�tmeID\n"
 
-#: g10/trustdb.c:257
+#: g10/trustdb.c:258
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "v�ti %08lX: aktsepteerin usaldusv��rse v�tmena\n"
 
-#: g10/trustdb.c:295
+#: g10/trustdb.c:296
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "v�ti %08lX esineb trustdb failis enam kui korra\n"
 
-#: g10/trustdb.c:310
+#: g10/trustdb.c:311
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "v�ti %08lX: usaldataval v�tmel pole avalikku v�tit - j�tsin vahele\n"
 
-#: g10/trustdb.c:320
+#: g10/trustdb.c:321
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "v�ti on m�rgitud abslouutselt usaldatuks.\n"
 
-#: g10/trustdb.c:344
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "usalduse kirje %lu, p�ringu t��p %d: lugemine eba�nnestus: %s\n"
 
-#: g10/trustdb.c:350
+#: g10/trustdb.c:351
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "usalduse kirje %lu ei oma soovitud t��pi %d\n"
 
-#: g10/trustdb.c:446
+#: g10/trustdb.c:447
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:452
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:506
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[t�histatud] "
 
-#: g10/trustdb.c:508 g10/trustdb.c:513
+#: g10/trustdb.c:509 g10/trustdb.c:514
 #, fuzzy
 msgid "[ expired]"
 msgstr "[aegunud] "
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 #, fuzzy
 msgid "[ unknown]"
 msgstr "tundmatu"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 #, fuzzy
 msgid "never"
 msgstr "mitte kunagi"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:536
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:576
+#: g10/trustdb.c:577
 msgid "no need for a trustdb check\n"
 msgstr "trustdb kontrolliks puudub vajadus\n"
 
-#: g10/trustdb.c:582 g10/trustdb.c:2157
+#: g10/trustdb.c:583 g10/trustdb.c:2309
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "trustdb j�rgmine kontroll %s\n"
 
-#: g10/trustdb.c:591
+#: 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:606
+#: 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:838 g10/trustdb.c:1276
+#: 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:1033
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr "palun tehke --check-trustdb\n"
 
-#: g10/trustdb.c:1037
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "kontrollin trustdb faili\n"
 
-#: g10/trustdb.c:1901
+#: g10/trustdb.c:2053
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d v�tit t��deldud (%d kehtivust puhastatud)\n"
 
-#: g10/trustdb.c:1965
+#: g10/trustdb.c:2117
 msgid "no ultimately trusted keys found\n"
 msgstr "absoluutselt usaldatavaid v�tmeid pole\n"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:2131
 #, 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:2002
+#: g10/trustdb.c:2154
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2240
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2163
+#: g10/trustdb.c:2315
 #, 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"
 
-#: g10/verify.c:116
+#: g10/verify.c:117
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -5684,304 +5738,335 @@ msgstr ""
 "Palun pidage meeles, et allkirja fail (.sig v�i .asc)\n"
 "peab olema k�sureal esimene fail.\n"
 
-#: g10/verify.c:189
+#: g10/verify.c:190
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "sisendrida %u on liiga pikk v�i seavahetus puudub\n"
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "�ldine viga"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "tundmatu paketi t��p"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "tundmatu versioon"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "tundmatu avaliku v�tme algoritm"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "tundmatu l�hendi algoritm"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "halb avalik v�ti"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "halb salajane v�ti"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "halb allkiri"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "kontrollsumma viga"
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "halb parool"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "ei leia avalikku v�tit"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "tundmatu �ifri algoritm"
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "v�tmehoidlat ei �nnestu avada"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "vigane pakett"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "vigane pakend"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "sellist kasutaja id pole"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "salajane v�ti ei ole k�ttesaadav"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "kasutati valet salajast v�tit"
 
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "ei ole toetatud"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "halb v�ti"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "viga faili lugemisel"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "viga faili kirjutamisel"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "tundmatu pakkimisalgoritm"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "viga faili avamisel"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "viga faili loomisel"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "vigane parool"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "realiseerimata avaliku v�tme algoritm"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "realiseerimata �ifri algoritm"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "tundmatu allkirja klass"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "usalduse andmebaasi viga"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "halb MPI"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "ressursi limiit"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "vigane v�tmehoidla"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "halb sertifikaat"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "vigane kasutaja id"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "viga faili sulgemisel"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "viga faili �mber nimetamisel"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "viga faili kustutamisel"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "ootamatud andmed"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "ajatemplite konflikt"
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "mittekasutatav avaliku v�tme algoritm"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "fail on olemas"
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "n�rk v�ti"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "vigane argument"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "halb URI"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "mittetoetatud URI"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "v�rgu viga"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "kr�ptimata"
 
-#: util/errors.c:103
+#: util/errors.c:104
 msgid "not processed"
 msgstr "ei t��deldud"
 
-#: util/errors.c:105
+#: util/errors.c:106
 msgid "unusable public key"
 msgstr "mittekasutatav avalik v�ti"
 
-#: util/errors.c:106
+#: util/errors.c:107
 msgid "unusable secret key"
 msgstr "mittekasutatav salajane v�ti"
 
-#: util/errors.c:107
+#: util/errors.c:108
 msgid "keyserver error"
 msgstr "v�tmeserveri viga"
 
-#: util/errors.c:108
+#: util/errors.c:109
 #, fuzzy
 msgid "canceled"
 msgstr "Katkesta"
 
-#: util/errors.c:109
+#: util/errors.c:110
 #, fuzzy
 msgid "no card"
 msgstr "kr�ptimata"
 
-#: util/logger.c:157
+#: util/logger.c:158
 msgid "ERROR: "
 msgstr ""
 
-#: util/logger.c:160
+#: util/logger.c:161
 msgid "WARNING: "
 msgstr ""
 
-#: util/logger.c:223
+#: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... see on viga (%s:%d:%s)\n"
 
-#: util/logger.c:229
+#: util/logger.c:230
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "te leidsite vea ... (%s:%d)\n"
 
-#: util/miscutil.c:336 util/miscutil.c:373
+#: util/miscutil.c:330 util/miscutil.c:367
 msgid "yes"
 msgstr "jah"
 
-#: util/miscutil.c:337 util/miscutil.c:378
+#: util/miscutil.c:331 util/miscutil.c:372
 msgid "yY"
 msgstr "jJ"
 
-#: util/miscutil.c:339 util/miscutil.c:375
+#: util/miscutil.c:333 util/miscutil.c:369
 msgid "no"
 msgstr "ei"
 
-#: util/miscutil.c:340 util/miscutil.c:379
+#: util/miscutil.c:334 util/miscutil.c:373
 msgid "nN"
 msgstr "eE"
 
-#: util/miscutil.c:377
+#: util/miscutil.c:371
 msgid "quit"
 msgstr "v�lju"
 
-#: util/miscutil.c:380
+#: util/miscutil.c:374
 msgid "qQ"
 msgstr "vV"
 
-#: util/miscutil.c:413
+#: util/miscutil.c:407
 msgid "okay|okay"
 msgstr ""
 
-#: util/miscutil.c:415
+#: util/miscutil.c:409
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:416
+#: util/miscutil.c:410
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:417
+#: util/miscutil.c:411
 #, fuzzy
 msgid "cC"
 msgstr "c"
 
-#: util/secmem.c:90
+#: util/secmem.c:91
 msgid "WARNING: using insecure memory!\n"
 msgstr "HOIATUS: kasutan ebaturvalist m�lu!\n"
 
-#: util/secmem.c:91
+#: util/secmem.c:92
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "Lisainfot leiate lehelt http://www.gnupg.org/faq.html\n"
 
-#: util/secmem.c:343
+#: util/secmem.c:344
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "initsialiseerimata turvalise m�luta ei ole operatsioon v�imalik\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:345
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(te kasutasite vahest selle t�� jaoks valet programmi)\n"
 
+#, fuzzy
+#~ msgid "error getting serial number: %s\n"
+#~ msgstr "viga parooli loomisel: %s\n"
+
+#~ msgid "Hint: Select the user IDs to sign\n"
+#~ msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
+
+#~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+#~ msgstr "halb parool v�i tundmatu �ifri algoritm (%d)\n"
+
+#~ msgid "can't set client pid for the agent\n"
+#~ msgstr "agendile ei �nnestu seada kliendi pid\n"
+
+#~ msgid "can't get server read FD for the agent\n"
+#~ msgstr "agendiga suhtlemiseks ei �nnestu saada lugemise FD\n"
+
+#~ msgid "can't get server write FD for the agent\n"
+#~ msgstr "agendiga suhtlemiseks ei �nnestu saada kirjutamise FD\n"
+
+#~ msgid "communication problem with gpg-agent\n"
+#~ msgstr "probleem gpg-agent programmiga suhtlemisel\n"
+
+#~ msgid "passphrase too long\n"
+#~ msgstr "liiga pikk parool\n"
+
+#~ msgid "invalid response from agent\n"
+#~ msgstr "vigane vastus agendilt\n"
+
+#~ msgid "problem with the agent: agent returns 0x%lx\n"
+#~ msgstr "probleem agendiga: agent tagastas 0x%lx\n"
+
 #~ msgid "select secondary key N"
 #~ msgstr "vali sekundaarne v�ti N"
 
diff --git a/po/fi.po b/po/fi.po
index ec8d392bc..0f1314020 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: 2005-03-15 16:35+0100\n"
+"POT-Creation-Date: 2005-05-31 10:05+0200\n"
 "PO-Revision-Date: 2004-06-16 22:40+0300\n"
 "Last-Translator: Tommi Vainikainen <[email protected]>\n"
 "Language-Team: Finnish <[email protected]>\n"
@@ -30,81 +30,81 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:120
+#: cipher/primegen.c:121
 #, fuzzy, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr "alkulukua, jossa on alle %d bittiä, ei voi luoda\n"
 
-#: cipher/primegen.c:311
+#: cipher/primegen.c:312
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "alkulukua, jossa on alle %d bittiä, ei voi luoda\n"
 
-#: cipher/random.c:163
+#: cipher/random.c:164
 msgid "no entropy gathering module detected\n"
 msgstr "entropian keräysmoduulia ei havaittu\n"
 
-#: cipher/random.c:387 g10/card-util.c:656 g10/card-util.c:725
-#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2255
-#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
-#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
-#: g10/tdbio.c:600
+#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
+#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
+#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
+#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
+#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/tdbio.c:601
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
 
-#: cipher/random.c:391
+#: cipher/random.c:392
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "tiedoston \"%s\" tilaa ei voi lukea: %s\n"
 
-#: cipher/random.c:396
+#: cipher/random.c:397
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "\"%s\" on erikoistiedosto - ohitettiin\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:402
 msgid "note: random_seed file is empty\n"
 msgstr "huom: random_seed-tiedosto on tyhjä\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:408
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "VAROITUS: random_seed-tiedosto on väärän kokoinen - tiedostoa ei käytetä\n"
 
-#: cipher/random.c:415
+#: cipher/random.c:416
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi lukea: %s\n"
 
-#: cipher/random.c:453
+#: cipher/random.c:454
 msgid "note: random_seed file not updated\n"
 msgstr "huom: random_seed-tiedostoa ei päivitetty\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2723
-#: g10/keygen.c:2753 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
-#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:481
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "tiedostoon \"%s\" ei voi kirjoittaa: %s\n"
 
-#: cipher/random.c:483
+#: cipher/random.c:484
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
 
-#: cipher/random.c:728
+#: cipher/random.c:729
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "VAROITUS: käytetty satunnaislukugeneraattori ei ole turvallinen.\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:730
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -117,7 +117,7 @@ msgstr ""
 "\n"
 "ÄLÄ KÄYTÄ OHJELMAN TUOTTAMAA DATAA!!\n"
 
-#: cipher/rndegd.c:204
+#: cipher/rndegd.c:205
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -127,7 +127,7 @@ msgstr ""
 "estäisi sinua pitkästymästä.  Se nimittäin samalla parantaa entropian "
 "laatua.\n"
 
-#: cipher/rndlinux.c:134
+#: cipher/rndlinux.c:135
 #, c-format
 msgid ""
 "\n"
@@ -139,45 +139,62 @@ msgstr ""
 "antaaksesi käyttöjärjestelmälle mahdollisuuden kerätä lisää entropiaa! \n"
 "(Vielä tarvitaan %d tavua)\n"
 
-#: g10/app-openpgp.c:547
+#: g10/app-openpgp.c:596
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/app-openpgp.c:560
+#: g10/app-openpgp.c:609
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
 
-#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
+#: g10/app-openpgp.c:977
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "avainlohkojen poisto epäonnistui: %s\n"
+
+#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+msgid "response does not contain the public key data\n"
+msgstr ""
+
+#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
-#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
+#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
+#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: g10/app-openpgp.c:836
+#: g10/app-openpgp.c:1310
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:857
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:862
+#: g10/app-openpgp.c:1336
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -185,178 +202,183 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:869
+#: g10/app-openpgp.c:1343
 msgid "|A|Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1018
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:1492
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1018
+#: g10/app-openpgp.c:1492
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1022
+#: g10/app-openpgp.c:1496
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
+#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "virhe luettaessa avainlohkoa: %s\n"
 
-#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
+#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
 
-#: g10/app-openpgp.c:1104
+#: g10/app-openpgp.c:1562
 #, fuzzy
 msgid "key already exists\n"
 msgstr "\"%s\" on jo pakattu\n"
 
-#: g10/app-openpgp.c:1108
+#: g10/app-openpgp.c:1566
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1110
+#: g10/app-openpgp.c:1568
 #, fuzzy
 msgid "generating new key\n"
 msgstr "luo uusi avainpari"
 
-#: g10/app-openpgp.c:1120
+#: g10/app-openpgp.c:1735
+msgid "creation timestamp missing\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1742
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1749
+#, c-format
+msgid "RSA public exponent missing or largerr than %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1827
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
+
+#: g10/app-openpgp.c:1886
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1135
+#: g10/app-openpgp.c:1901
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1904
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
-msgid "response does not contain the public key data\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
-msgid "response does not contain the RSA modulus\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
-msgid "response does not contain the RSA public exponent\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1195
+#: g10/app-openpgp.c:1961
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1356
+#: g10/app-openpgp.c:2130
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1364
+#: g10/app-openpgp.c:2138
 #, c-format
-msgid "PIN [sigs done: %lu]"
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
+#: g10/app-openpgp.c:2399
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
 
-#: g10/app-openpgp.c:1731
-#, fuzzy, c-format
-msgid "error getting serial number: %s\n"
-msgstr "virhe luotaessa salasanaa: %s\n"
-
-#: g10/app-openpgp.c:1826
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
-
-#: g10/app-openpgp.c:1868
-#, fuzzy
-msgid "reading the key failed\n"
-msgstr "avainlohkojen poisto epäonnistui: %s\n"
-
-#: g10/armor.c:317
+#: g10/armor.c:318
 #, c-format
 msgid "armor: %s\n"
 msgstr "ascii-koodaus: %s\n"
 
-#: g10/armor.c:346
+#: g10/armor.c:347
 msgid "invalid armor header: "
 msgstr "epäkelpo ascii-koodausotsake: "
 
-#: g10/armor.c:353
+#: g10/armor.c:354
 msgid "armor header: "
 msgstr "ascii-koodausotsake: "
 
-#: g10/armor.c:364
+#: g10/armor.c:365
 msgid "invalid clearsig header\n"
 msgstr "epäkelpo selkotekstisen allekirjoituksen otsikko\n"
 
-#: g10/armor.c:416
+#: g10/armor.c:417
 msgid "nested clear text signatures\n"
 msgstr "sisäkkäisiä tekstimuotoisia allekirjoituksia\n"
 
-#: g10/armor.c:551
+#: g10/armor.c:552
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "odottamaton ascii-koodaus:"
 
-#: g10/armor.c:563
+#: g10/armor.c:564
 msgid "invalid dash escaped line: "
 msgstr "epäkelpo viiva rivin lopussa: "
 
-#: g10/armor.c:715 g10/armor.c:1322
+#: g10/armor.c:716 g10/armor.c:1323
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "epäkelpo radix64-merkki %02x ohitettu\n"
 
-#: g10/armor.c:758
+#: g10/armor.c:759
 msgid "premature eof (no CRC)\n"
 msgstr "ennenaikainen tiedoston loppu (ei CRC:tä)\n"
 
-#: g10/armor.c:792
+#: g10/armor.c:793
 msgid "premature eof (in CRC)\n"
 msgstr "ennenaikainen tiedoston loppu (CRC:ssä)\n"
 
-#: g10/armor.c:800
+#: g10/armor.c:801
 msgid "malformed CRC\n"
 msgstr "väärinmuotoiltu CRC\n"
 
-#: g10/armor.c:804 g10/armor.c:1359
+#: g10/armor.c:805 g10/armor.c:1360
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC-virhe; %06lx - %06lx\n"
 
-#: g10/armor.c:824
+#: g10/armor.c:825
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "Ennenaikainen tiedoston loppu (Trailerissa)\n"
 
-#: g10/armor.c:828
+#: g10/armor.c:829
 msgid "error in trailer line\n"
 msgstr "virhe trailer-rivissä\n"
 
-#: g10/armor.c:1137
+#: g10/armor.c:1138
 msgid "no valid OpenPGP data found.\n"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
 
-#: g10/armor.c:1142
+#: g10/armor.c:1143
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "epäkelpo ascii-koodaus: yli %d merkkiä pitkä rivi\n"
 
-#: g10/armor.c:1146
+#: g10/armor.c:1147
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -364,176 +386,176 @@ msgstr ""
 "viallista\n"
 "MTA:ta on käytetty\n"
 
-#: g10/card-util.c:58 g10/card-util.c:295
+#: g10/card-util.c:63 g10/card-util.c:303
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "salaista avainta ei löydy"
 
-#: g10/card-util.c:63
+#: g10/card-util.c:68
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1329 g10/delkey.c:127 g10/keyedit.c:1430
-#: g10/keygen.c:2439 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1510
+#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "tätä ei voi tehdä eräajossa\n"
 
-#: g10/card-util.c:97 g10/card-util.c:1108 g10/card-util.c:1191
-#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
-#: g10/keygen.c:1365
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
+#: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "Valintasi? "
 
-#: g10/card-util.c:206 g10/card-util.c:256
+#: g10/card-util.c:213 g10/card-util.c:263
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:391
+#: g10/card-util.c:410
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 #, fuzzy
 msgid "unspecified"
 msgstr "Ei eriteltyä syytä"
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 #, fuzzy
 msgid "not forced"
 msgstr "ei käsitelty"
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:497
+#: g10/card-util.c:516
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:499
+#: g10/card-util.c:518
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:501
+#: g10/card-util.c:520
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:518
+#: g10/card-util.c:537
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:539
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:538
+#: g10/card-util.c:557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:559
+#: g10/card-util.c:578
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "ei vastaavaa julkista avainta: %s\n"
 
-#: g10/card-util.c:567
+#: g10/card-util.c:586
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:665 g10/card-util.c:734 g10/import.c:261
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:692
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:683
+#: g10/card-util.c:702
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:742
+#: g10/card-util.c:761
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:752
+#: g10/card-util.c:771
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:772
+#: g10/card-util.c:791
 #, fuzzy
 msgid "Language preferences: "
 msgstr "päivitä valinnat"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:799
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:808
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:829
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:824
+#: g10/card-util.c:843
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/card-util.c:845
+#: g10/card-util.c:864
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "näytä sormenjälki"
 
-#: g10/card-util.c:868
+#: g10/card-util.c:887
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/card-util.c:916
+#: g10/card-util.c:935
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: g10/card-util.c:917
+#: g10/card-util.c:936
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
 
-#: g10/card-util.c:926
+#: g10/card-util.c:945
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1030
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1030 g10/card-util.c:1039
+#: g10/card-util.c:1051 g10/card-util.c:1060
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1051
+#: g10/card-util.c:1072
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1060
+#: g10/card-util.c:1081
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -541,410 +563,414 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1099
+#: g10/card-util.c:1120
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Valitse millaisen avaimen haluat:\n"
 
-#: g10/card-util.c:1101 g10/card-util.c:1182
+#: g10/card-util.c:1122 g10/card-util.c:1203
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/card-util.c:1102 g10/card-util.c:1184
+#: g10/card-util.c:1123 g10/card-util.c:1205
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/card-util.c:1103 g10/card-util.c:1186
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1119 g10/card-util.c:1202 g10/keyedit.c:908
-#: g10/keygen.c:1404 g10/revoke.c:642
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
+#: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "Valinta ei kelpaa.\n"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1200
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Valitse mitätöinnin syy:\n"
 
-#: g10/card-util.c:1214
+#: g10/card-util.c:1235
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "tuntematon suojausalgoritmi\n"
 
-#: g10/card-util.c:1219
+#: g10/card-util.c:1240
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 
-#: g10/card-util.c:1224
+#: g10/card-util.c:1245
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/card-util.c:1294 g10/keyedit.c:1317
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "ulos tästä valikosta"
 
-#: g10/card-util.c:1296
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "show admin commands"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1297 g10/keyedit.c:1320
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "näytä tämä ohje"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "list all available data"
 msgstr "Avain saatavilla kohteessa: "
 
-#: g10/card-util.c:1302
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1303
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1304
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1305
+#: g10/card-util.c:1327
 #, fuzzy
 msgid "change the login name"
 msgstr "muuta voimassoloaikaa"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muuta luottamusastetta"
 
-#: g10/card-util.c:1307
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1308
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "näytä sormenjälki"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1310
+#: g10/card-util.c:1332
 #, fuzzy
 msgid "generate new keys"
 msgstr "luo uusi avainpari"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1377 g10/keyedit.c:1526
+#: g10/card-util.c:1334
+msgid "verify the PIN and list all data"
+msgstr ""
+
+#: g10/card-util.c:1454 g10/keyedit.c:1609
 msgid "Command> "
 msgstr "Komento> "
 
-#: g10/card-util.c:1412
+#: g10/card-util.c:1492
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1430
+#: g10/card-util.c:1525
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/card-util.c:1499 g10/keyedit.c:2104
+#: g10/card-util.c:1599 g10/keyedit.c:2210
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
 
-#: g10/cardglue.c:287
+#: g10/cardglue.c:396
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:519
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:380
+#: g10/cardglue.c:527
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:852
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:853
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:854
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:691
+#: g10/cardglue.c:855
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:705
+#: g10/cardglue.c:872
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Toista salasana: "
 
-#: g10/cardglue.c:719
+#: g10/cardglue.c:886
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
-#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tiedostoa \"%s\" ei voi avata\n"
 
-#: g10/decrypt.c:104 g10/encode.c:859
+#: g10/decrypt.c:105 g10/encode.c:846
 msgid "--output doesn't work for this command\n"
 msgstr "--output ei toimi yhdessä tämän komennon kanssa\n"
 
-#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3167 g10/keyserver.c:1511
-#: g10/revoke.c:226
+#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3346 g10/keyserver.c:1541
+#: g10/revoke.c:227
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2300 g10/keyserver.c:1525
-#: g10/revoke.c:232 g10/revoke.c:439
+#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "virhe luettaessa avainlohkoa: %s\n"
 
-#: g10/delkey.c:128 g10/delkey.c:135
+#: g10/delkey.c:129 g10/delkey.c:136
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(ellet määritä avainta sormenjäljen perusteella)\n"
 
-#: g10/delkey.c:134
+#: g10/delkey.c:135
 #, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "ei onnistu eräajossa ilman \"--yes\"-valitsinta\n"
 
-#: g10/delkey.c:146
+#: g10/delkey.c:147
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Poista tämä avain avainrenkaasta? "
 
-#: g10/delkey.c:154
+#: g10/delkey.c:155
 #, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Tämä on salainen avain! - poista varmasti? "
 
-#: g10/delkey.c:164
+#: g10/delkey.c:165
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: g10/delkey.c:174
+#: g10/delkey.c:175
 msgid "ownertrust information cleared\n"
 msgstr "luottamustiedot pyyhitty\n"
 
-#: g10/delkey.c:205
+#: g10/delkey.c:206
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "julkiselle avaimelle \"%s\" löytyy vastaava salainen avain!\n"
 
-#: g10/delkey.c:207
+#: g10/delkey.c:208
 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:210 g10/sign.c:1186
+#: g10/encode.c:211 g10/sign.c:1218
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: g10/encode.c:215
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "symmetristä ESK-pakettia ei voi käyttää S2K-tilan vuoksi\n"
 
-#: g10/encode.c:228
+#: g10/encode.c:229
 #, c-format
 msgid "using cipher %s\n"
 msgstr "käytetään salakirjoitusalgoritmia %s\n"
 
-#: g10/encode.c:238 g10/encode.c:558
+#: g10/encode.c:239 g10/encode.c:545
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "\"%s\" on jo pakattu\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
+#: g10/encode.c:302 g10/encode.c:591 g10/sign.c:566
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VAROITUS: \"%s\" on tyhjä tiedosto\n"
 
-#: g10/encode.c:472
+#: g10/encode.c:466
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "--pgp2-tilassa voidaan salata korkeintaan 2048-bittisillä RSA-avaimilla\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:488
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "luetaan kohteesta \"%s\"\n"
 
-#: g10/encode.c:530
+#: g10/encode.c:517
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "kaikille salattaville avaimille ei voi käyttää IDEA-salainta.\n"
 
-#: g10/encode.c:540
+#: g10/encode.c:527
 #, fuzzy, c-format
 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:648 g10/sign.c:877
+#: g10/encode.c:635 g10/sign.c:899
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "valittu pakkausalgoritmi %s (%d) ei ole vastaanottajan suosima\n"
 
-#: g10/encode.c:735
+#: g10/encode.c:722
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "valittu symmetrinen salain %s (%d) ei ole vastaanottajan suosima\n"
 
-#: g10/encode.c:805 g10/pkclist.c:721 g10/pkclist.c:757
+#: g10/encode.c:792 g10/pkclist.c:722 g10/pkclist.c:758
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
 
-#: g10/encode.c:832
+#: g10/encode.c:819
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s salattu vastaanottajalle: \"%s\"\n"
 
-#: g10/encr-data.c:66 g10/mainproc.c:301
+#: g10/encr-data.c:67 g10/mainproc.c:302
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s salattua dataa\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:305
+#: g10/encr-data.c:69 g10/mainproc.c:306
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "salattu tuntemattomalla algoritmilla %d\n"
 
-#: g10/encr-data.c:92
+#: g10/encr-data.c:93
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "VAROITUS: viesti salattiin symmetrisessä salaimessa \n"
 "esiintyvällä heikolla avaimella.\n"
 
-#: g10/encr-data.c:103
+#: g10/encr-data.c:104
 msgid "problem handling encrypted packet\n"
 msgstr "ongelma käsiteltäessä salattua pakettia\n"
 
-#: g10/exec.c:48
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "etäohjelman suorittamista ei tueta\n"
 
-#: g10/exec.c:184 g10/openfile.c:406
+#: g10/exec.c:173 g10/openfile.c:410
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
 
-#: g10/exec.c:325
+#: g10/exec.c:314
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "ulkoisen ohjelman kutsuminen poistettu käytöstä johtuen turvattomista \n"
 "asetustiedoston oikeuksista\n"
 
-#: g10/exec.c:355
+#: g10/exec.c:344
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "tämä ympäristö vaatii väliaikaistiedoston kutsuttaessa ulkoisia ohjelmia\n"
 
-#: g10/exec.c:433
+#: g10/exec.c:422
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "komentoa %s \"%s\" ei voi suorittaa: %s\n"
 
-#: g10/exec.c:436
+#: g10/exec.c:425
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "komentoa %s \"%s\" ei voi suorittaa: %s\n"
 
-#: g10/exec.c:521
+#: g10/exec.c:510
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "järjestelmävirhe kutsuttaessa ulkoista ohjelmaa: %s\n"
 
-#: g10/exec.c:532 g10/exec.c:598
+#: g10/exec.c:521 g10/exec.c:587
 msgid "unnatural exit of external program\n"
 msgstr "ulkoisen ohjelman luonnoton päättyminen\n"
 
-#: g10/exec.c:547
+#: g10/exec.c:536
 msgid "unable to execute external program\n"
 msgstr "ulkoista ohjelmaa ei voi suorittaa\n"
 
-#: g10/exec.c:563
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "ulkoisen ohjelman vastausta ei voi lukea: %s\n"
 
-#: g10/exec.c:609 g10/exec.c:616
+#: g10/exec.c:598 g10/exec.c:605
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
 
-#: g10/exec.c:621
+#: g10/exec.c:610
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "VAROITUS: väliaikaishakemistoa \"%s\" ei voi poistaa: %s\n"
 
-#: g10/export.c:183
+#: g10/export.c:184
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/export.c:212
+#: g10/export.c:213
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "avain %08lX: ei suojattu - ohitetaan\n"
 
-#: g10/export.c:220
+#: g10/export.c:221
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "avain %08lX: PGP 2.x -muodon avain - ohitetaan\n"
 
-#: g10/export.c:395
+#: g10/export.c:398
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 "VAROITUS: salaisella avaimella %08lX ei ole yksinkertaista SK-"
 "tarkistussummaa\n"
 
-#: g10/export.c:427
+#: g10/export.c:430
 msgid "WARNING: nothing exported\n"
 msgstr "VAROITUS: mitään ei viety\n"
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid ""
 "@Commands:\n"
 " "
@@ -952,128 +978,128 @@ msgstr ""
 "@Komennot:\n"
 " "
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "|[file]|make a signature"
 msgstr "|[tiedosto]|tee allekirjoitus"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "|[file]|make a clear text signature"
 msgstr "|[tiedosto]|tee selkokielinen allekirjoitus"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "make a detached signature"
 msgstr "tee erillinen allekirjoitus"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encrypt data"
 msgstr "salaa tiedot"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "encryption only with symmetric cipher"
 msgstr "salaa vain symmetrisellä salaimella"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "decrypt data (default)"
 msgstr "avaa tiedot (oletus)"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "verify a signature"
 msgstr "tarkista allekirjoitus"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys"
 msgstr "näytä avaimet"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and signatures"
 msgstr "näytä avaimet allekirjoituksineen"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "tarkista avainten allekirjoitukset"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "list keys and fingerprints"
 msgstr "näytä avaimet sormenjälkineen"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "list secret keys"
 msgstr "näytä salaiset avaimet"
 
-#: g10/g10.c:379
+#: g10/g10.c:381
 msgid "generate a new key pair"
 msgstr "luo uusi avainpari"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the public keyring"
 msgstr "poista avaimet julkisten avainten renkaasta"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "remove keys from the secret keyring"
 msgstr "poista avaimet salaisten avainten renkaasta"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign a key"
 msgstr "allekirjoita avain"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "sign a key locally"
 msgstr "allekirjoita avain paikallisesti"
 
-#: g10/g10.c:385
+#: g10/g10.c:387
 msgid "sign or edit a key"
 msgstr "allekirjoita tai muokkaa avainta"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "generate a revocation certificate"
 msgstr "luo mitätöintivarmenne"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "export keys"
 msgstr "vie avaimia"
 
-#: g10/g10.c:389
+#: g10/g10.c:391
 msgid "export keys to a key server"
 msgstr "vie avaimia palvelimelle"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "import keys from a key server"
 msgstr "nouda avaimia avainpalvelimelta"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "search for keys on a key server"
 msgstr "etsi avaimia avainpalvelimelta"
 
-#: g10/g10.c:394
+#: g10/g10.c:396
 msgid "update all keys from a keyserver"
 msgstr "päivitä kaikki avaimet avainpalvelimelta"
 
-#: g10/g10.c:397
+#: g10/g10.c:399
 msgid "import/merge keys"
 msgstr "nouda/liitä avaimia"
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "print the card status"
 msgstr ""
 
-#: g10/g10.c:401
+#: g10/g10.c:403
 msgid "change data on a card"
 msgstr ""
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/g10.c:410
+#: g10/g10.c:412
 msgid "update the trust database"
 msgstr "päivitä luottamustietokanta"
 
-#: g10/g10.c:417
+#: g10/g10.c:419
 msgid "|algo [files]|print message digests"
 msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
 
-#: g10/g10.c:421 g10/gpgv.c:66
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1083,51 +1109,51 @@ msgstr ""
 "Valitsimet:\n"
 " "
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "create ascii armored output"
 msgstr "tuota ascii-koodattu tuloste"
 
-#: g10/g10.c:425
+#: g10/g10.c:427
 msgid "|NAME|encrypt for NAME"
 msgstr "|NIMI|salaa vastaanottajalle NIMI"
 
-#: g10/g10.c:436
+#: g10/g10.c:438
 msgid "use this user-id to sign or decrypt"
 msgstr "käytä tätä käyttäjätunnusta allekirjoittamiseen ja avaamiseen"
 
-#: g10/g10.c:437
+#: g10/g10.c:439
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|aseta pakkausaste N (0 poistaa käytöstä)"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "use canonical text mode"
 msgstr "käytä tekstimuotoa"
 
-#: g10/g10.c:452
+#: g10/g10.c:458
 msgid "use as output file"
 msgstr "käytä tulostustiedostona"
 
-#: g10/g10.c:454 g10/gpgv.c:68
+#: g10/g10.c:460 g10/gpgv.c:73
 msgid "verbose"
 msgstr "monisanainen"
 
-#: g10/g10.c:465
+#: g10/g10.c:471
 msgid "do not make any changes"
 msgstr "älä tee muutoksia"
 
-#: g10/g10.c:466
+#: g10/g10.c:472
 msgid "prompt before overwriting"
 msgstr "kysy ennen ylikirjoittamista"
 
-#: g10/g10.c:507
+#: g10/g10.c:513
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:508
+#: g10/g10.c:514
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:536
+#: g10/g10.c:542
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1136,7 +1162,7 @@ msgstr ""
 "(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
 "sivuilta)\n"
 
-#: g10/g10.c:539
+#: g10/g10.c:545
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1155,16 +1181,16 @@ msgstr ""
 " --list-keys [nimet]        näytä avaimet\n"
 " --fingerprint [nimet]      näytä sormenjäljet\n"
 
-#: g10/g10.c:720 g10/gpgv.c:93
+#: g10/g10.c:724 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <[email protected]>.\n"
 
-#: g10/g10.c:737
+#: g10/g10.c:741
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: g10/g10.c:740
+#: g10/g10.c:744
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1174,7 +1200,7 @@ msgstr ""
 "allekirjoita, tarkista, salaa tai avaa\n"
 "oletustoiminto riippuu syötteestä\n"
 
-#: g10/g10.c:751
+#: g10/g10.c:755
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1182,459 +1208,469 @@ msgstr ""
 "\n"
 "Tuetut algoritmit:\n"
 
-#: g10/g10.c:754
+#: g10/g10.c:758
 msgid "Pubkey: "
 msgstr "JulkAvain: "
 
-#: g10/g10.c:760 g10/keyedit.c:2141
+#: g10/g10.c:764 g10/keyedit.c:2248
 msgid "Cipher: "
 msgstr "Salaus: "
 
-#: g10/g10.c:766
+#: g10/g10.c:770
 msgid "Hash: "
 msgstr "Tiiviste: "
 
-#: g10/g10.c:772 g10/keyedit.c:2187
+#: g10/g10.c:776 g10/keyedit.c:2294
 msgid "Compression: "
 msgstr "Pakkaus: "
 
-#: g10/g10.c:855
+#: g10/g10.c:859
 msgid "usage: gpg [options] "
 msgstr "käyttö: gpg [valitsimet] "
 
-#: g10/g10.c:1003
+#: g10/g10.c:1007
 msgid "conflicting commands\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/g10.c:1021
+#: g10/g10.c:1025
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "=-merkkiä ei löytynyt ryhmämäärityksessä \"%s\"\n"
 
-#: g10/g10.c:1218
+#: g10/g10.c:1222
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/g10.c:1221
+#: g10/g10.c:1225
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/g10.c:1224
+#: g10/g10.c:1228
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/g10.c:1230
+#: g10/g10.c:1234
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/g10.c:1233
+#: g10/g10.c:1237
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1240
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/g10.c:1242
+#: g10/g10.c:1246
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
 
-#: g10/g10.c:1245
+#: g10/g10.c:1249
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
 
-#: g10/g10.c:1248
+#: g10/g10.c:1252
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1258
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 
-#: g10/g10.c:1257
+#: g10/g10.c:1261
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 
-#: g10/g10.c:1260
+#: g10/g10.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 
-#: g10/g10.c:1401
+#: g10/g10.c:1405
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "tuntematon asetus \"%s\"\n"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1802
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "HUOM: Vanhat oletusarvoiset asetukset löytyvät tiedostosta \"%s\"\n"
 
-#: g10/g10.c:1838
+#: g10/g10.c:1844
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
 
-#: g10/g10.c:1842
+#: g10/g10.c:1848
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "asetustiedosto \"%s\": %s\n"
 
-#: g10/g10.c:1849
+#: g10/g10.c:1855
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "HUOM: %s ei ole normaaliin käyttöön!\n"
 
-#: g10/g10.c:2076
+#: g10/g10.c:2082
 #, 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/g10.c:2293
+#: g10/g10.c:2236 g10/g10.c:2248
+#, fuzzy, c-format
+msgid "`%s' is not a valid signature expiration\n"
+msgstr "%s ei kelpaa merkistöksi\n"
+
+#: g10/g10.c:2321
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3683
+#: g10/g10.c:2340 g10/keyedit.c:3862
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2346
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2349
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2356
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2359
 msgid "invalid import options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2366
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2369
 msgid "invalid export options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2376
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2379
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2401
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2404
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2411
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
 
-#: g10/g10.c:2573
+#: g10/g10.c:2602
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2606
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROITUS: %s korvaa %s:n\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2615
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2618
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s yhdessä on järjetöntä!\n"
 
-#: g10/g10.c:2603
+#: g10/g10.c:2625
+#, 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/g10.c:2640
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/g10.c:2617
+#: g10/g10.c:2654
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "erillisen allekirjoituksen voi luoda vain --pgp2-tilassa\n"
 
-#: g10/g10.c:2623
+#: g10/g10.c:2660
 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/g10.c:2629
+#: g10/g10.c:2666
 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/g10.c:2642
+#: g10/g10.c:2679
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "viestin salaaaminen --pgp2-tilassa vaatii IDEA-salaimen\n"
 
-#: g10/g10.c:2712 g10/g10.c:2736
+#: g10/g10.c:2746 g10/g10.c:2770
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/g10.c:2718 g10/g10.c:2742
+#: g10/g10.c:2752 g10/g10.c:2776
 msgid "selected digest algorithm is invalid\n"
 msgstr "valittu tiivistealgoritmi ei kelpaa\n"
 
-#: g10/g10.c:2724
+#: g10/g10.c:2758
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2764
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
 
-#: g10/g10.c:2745
+#: g10/g10.c:2779
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed täytyy olla suurempi kuin 0\n"
 
-#: g10/g10.c:2747
+#: g10/g10.c:2781
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2783
 #, 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/g10.c:2751
+#: g10/g10.c:2785
 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/g10.c:2753
+#: g10/g10.c:2787
 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/g10.c:2756
+#: g10/g10.c:2790
 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/g10.c:2760
+#: g10/g10.c:2794
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "virheellinen S2K-tila; täytyy olla 0, 1 tai 3\n"
 
-#: g10/g10.c:2767
+#: g10/g10.c:2801
 msgid "invalid default preferences\n"
 msgstr "virheelliset oletusarvoiset valinnat\n"
 
-#: g10/g10.c:2776
+#: g10/g10.c:2810
 msgid "invalid personal cipher preferences\n"
 msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
 
-#: g10/g10.c:2780
+#: g10/g10.c:2814
 msgid "invalid personal digest preferences\n"
 msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
 
-#: g10/g10.c:2784
+#: g10/g10.c:2818
 msgid "invalid personal compress preferences\n"
 msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
 
-#: g10/g10.c:2817
+#: g10/g10.c:2851
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ja %s eivät vielä toimi yhdessä\n"
 
-#: g10/g10.c:2864
+#: g10/g10.c:2898
 #, 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/g10.c:2869
+#: g10/g10.c:2903
 #, 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/g10.c:2874
+#: g10/g10.c:2908
 #, 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/g10.c:2970
+#: g10/g10.c:3004
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/g10.c:2981
+#: g10/g10.c:3015
 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/g10.c:2992
+#: g10/g10.c:3026
 msgid "--store [filename]"
 msgstr "--store [tiedostonimi]"
 
-#: g10/g10.c:2999
+#: g10/g10.c:3033
 msgid "--symmetric [filename]"
 msgstr "--symmetric [tiedostonimi]"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3035
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/g10.c:3011
+#: g10/g10.c:3045
 msgid "--encrypt [filename]"
 msgstr "--encrypt [tiedostonimi]"
 
-#: g10/g10.c:3024
+#: g10/g10.c:3058
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3060
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3029
+#: g10/g10.c:3063
 #, 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/g10.c:3047
+#: g10/g10.c:3081
 msgid "--sign [filename]"
 msgstr "--allekirjoita [tiedostonimi]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3094
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/g10.c:3075
+#: g10/g10.c:3109
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/g10.c:3077
+#: g10/g10.c:3111
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3080
+#: g10/g10.c:3114
 #, 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/g10.c:3100
+#: g10/g10.c:3134
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [tiedostonimi]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3143
 msgid "--clearsign [filename]"
 msgstr "--clearsign [tiedostonimi]"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3168
 msgid "--decrypt [filename]"
 msgstr "--decrypt [tiedostonimi]"
 
-#: g10/g10.c:3142
+#: g10/g10.c:3176
 msgid "--sign-key user-id"
 msgstr "--sign-key käyttäjätunnus"
 
-#: g10/g10.c:3146
+#: g10/g10.c:3180
 msgid "--lsign-key user-id"
 msgstr "--lsign-key käyttäjätunnus"
 
-#: g10/g10.c:3167
+#: g10/g10.c:3201
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key käyttäjätunnus [komennot]"
 
-#: g10/g10.c:3238
+#: g10/g10.c:3272
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [käyttäjätunnus] [avainrengas]"
 
-#: g10/g10.c:3275
+#: g10/g10.c:3309
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: g10/g10.c:3277
+#: g10/g10.c:3311
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3313
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "avaimen vienti epäonnistui: %s\n"
 
-#: g10/g10.c:3290
+#: g10/g10.c:3324
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
 
-#: g10/g10.c:3300
+#: g10/g10.c:3334
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
 
-#: g10/g10.c:3341
+#: g10/g10.c:3375
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ascii-koodauksen purku epäonnistui: %s\n"
 
-#: g10/g10.c:3349
+#: g10/g10.c:3383
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: g10/g10.c:3436
+#: g10/g10.c:3470
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: g10/g10.c:3559
+#: g10/g10.c:3593
 msgid "[filename]"
 msgstr "[tiedostonimi]"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3597
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjoita viestisi...\n"
 
-#: g10/g10.c:3853
+#: g10/g10.c:3887
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1642,81 +1678,86 @@ msgstr ""
 "notaation nimen täytyy sisältää vain tulostettavia merkkejä tai "
 "välilyöntejä, ja sen täytyy loppua merkkiin \"=\"\n"
 
-#: g10/g10.c:3861
+#: g10/g10.c:3895
 msgid "a user notation name must contain the '@' character\n"
 msgstr "käyttäjänotaatin täytyy sisältää \"@\"-merkki\n"
 
-#: g10/g10.c:3871
+#: g10/g10.c:3900
+#, 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/g10.c:3911
 msgid "a notation value must not use any control characters\n"
 msgstr "notaatiosssa ei saa olla erikoismerkkejä\n"
 
-#: g10/g10.c:3905
+#: g10/g10.c:3945
 msgid "the given certification policy URL is invalid\n"
 msgstr "annettu varmennekäytännön URL on virheellinen\n"
 
-#: g10/g10.c:3907
+#: g10/g10.c:3947
 msgid "the given signature policy URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/g10.c:3940
+#: g10/g10.c:3980
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk-välimuistissa on liian monta kohdetta - poistettu käytöstä\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2750
+#: g10/getkey.c:187 g10/getkey.c:2757
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Käyttäjätunnusta ei löytynyt]"
 
-#: g10/getkey.c:1677
+#: g10/getkey.c:1684
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Epäkelpo avain %08lX hyväksytty valitsimella --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2228
+#: g10/getkey.c:2235
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "ei salaista aliavainta julkiselle aliavaimelle %08lX - ohitetaan\n"
 
-#: g10/getkey.c:2459
+#: g10/getkey.c:2466
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr ""
 "käytetään toissijaista avainta %08lX ensisijaisen avaimen %08lX sijasta\n"
 
-#: g10/getkey.c:2506
+#: g10/getkey.c:2513
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
 "avain %08lX: salaisella avaimella ei ole vastaavaa \n"
 "julkista avainta - ohitetaan\n"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:74
 msgid "be somewhat more quiet"
 msgstr "ole jonkinverran hiljaisempi"
 
-#: g10/gpgv.c:70
+#: g10/gpgv.c:75
 msgid "take the keys from this keyring"
 msgstr "ota avaimet tästä avainrenkaasta"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:77
 msgid "make timestamp conflicts only a warning"
 msgstr "käsittele aikaleimakonfliktit pelkkinä varoituksina"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:78
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tilatiedot kirjoitetaan FD:iin"
 
-#: g10/gpgv.c:97
+#: g10/gpgv.c:102
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Käyttö: gpgv [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:105
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1724,7 +1765,7 @@ msgstr ""
 "Käyttö: gpg [valitsimet] [tiedostot]\n"
 "Tarkista allekirjoituksia tunnetuille luotetuille avaimille\n"
 
-#: g10/helptext.c:48
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1735,7 +1776,7 @@ msgstr ""
 "luottamusverkko eikä sillä ei ole mitään tekemistä (epäsuorasti luotujen) \n"
 "varmenneverkkojen kanssa."
 
-#: g10/helptext.c:54
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1747,18 +1788,18 @@ msgstr ""
 "salainen \n"
 "pari on sinulla.  Vastaa \"kyllä\" luottaaksesi tähän avaimeen ehdoitta\n"
 
-#: g10/helptext.c:61
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Vastaa \"kyllä\" jos haluat kaikesta huolimatta käyttää tätä epäluotettavaa\n"
 "avainta."
 
-#: g10/helptext.c:65
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Syötä vastaanottajan, jolle haluat lähettää viestin, käyttäjätunnus."
 
-#: g10/helptext.c:69
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1772,7 +1813,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:83
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -1783,16 +1824,16 @@ msgstr ""
 "ympäristöissä.\n"
 "Ole hyvä ja kysy tietoturva-asiantuntijaltasi ensin"
 
-#: g10/helptext.c:90
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "Syötä avaimen koko"
 
-#: g10/helptext.c:94 g10/helptext.c:99 g10/helptext.c:111 g10/helptext.c:143
-#: g10/helptext.c:171 g10/helptext.c:176 g10/helptext.c:181
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "Vastaa \"kyllä\" tai \" ei\""
 
-#: g10/helptext.c:104
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1804,19 +1845,19 @@ msgstr ""
 "mutta sen seurauksena et saa kunnollista virheilmoitusta \n"
 "vaan järjestelmä yrittää tulkita arvon aikajaksona."
 
-#: g10/helptext.c:116
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "Anna avaimen haltijan nimi"
 
-#: g10/helptext.c:121
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr "anna vapaaehtoinen, mutta erittäin suositeltava sähköpostiosoite"
 
-#: g10/helptext.c:125
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "Kirjoita vapaaehtoinen huomautus"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1830,11 +1871,11 @@ msgstr ""
 "O   jatka avaimen luomista\n"
 "L   lopeta"
 
-#: g10/helptext.c:139
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Vastaa \"kyllä\" (tai vain \"k\") jos haluat luoda aliavaimen."
 
-#: g10/helptext.c:147
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -1905,12 +1946,12 @@ msgstr ""
 "\n"
 "Jos et tiedä mikä olisi sopiva vastaus, vastaa \"0\"."
 
-#: g10/helptext.c:185
+#: g10/helptext.c:186
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Vastaa \"kyllä\" jos haluat allekirjoittaa KAIKKI käyttäjätunnukset"
 
-#: g10/helptext.c:189
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -1918,11 +1959,11 @@ msgstr ""
 "Vastaa \"kyllä\", jos haluat poistaa tämän käyttäjätunnuksen.\n"
 "Menetät samalla kaikki siihen liittyvät varmenteet!"
 
-#: g10/helptext.c:194
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Vastaa \"kyllä\", jos aliavaimen voi poistaa"
 
-#: g10/helptext.c:199
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -1933,7 +1974,7 @@ msgstr ""
 "luottamussuhteen luomiseksi avaimeen tai johonkin toiseen tämän avaimen\n"
 "varmentamaan avaimeen."
 
-#: g10/helptext.c:204
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -1946,7 +1987,7 @@ msgstr ""
 "avain saattaa luoda luottamusketjun toisen, jo ennalta \n"
 "varmennetun avaimen kautta."
 
-#: g10/helptext.c:210
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -1954,7 +1995,7 @@ msgstr ""
 "Allekirjoitus ei ole pätevä.  Järkevintä olisi poistaa se \n"
 "avainrenkaastasi."
 
-#: g10/helptext.c:214
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -1968,7 +2009,7 @@ msgstr ""
 "allekirjoitus vain, jos se ei ole jostain syystä pätevä, ja \n"
 "avaimella on jo toinen allekirjoitus."
 
-#: g10/helptext.c:222
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -1978,23 +2019,23 @@ msgstr ""
 "nykyiseen luetteloon valinnoista.  Kaikkien muutettujen\n"
 "oma-allekirjoitusten aikaleima siirretään yhdellä sekunnilla eteenpäin.\n"
 
-#: g10/helptext.c:229
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: g10/helptext.c:235
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Toista edellinen salasanasi varmistuaksesi siitä, mitä kirjoitit."
 
-#: g10/helptext.c:239
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "Anna allekirjoitetun tiedoston nimi"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Vastaa \"kyllä\", jos tiedoston voi ylikirjoittaa"
 
-#: g10/helptext.c:249
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2002,7 +2043,7 @@ msgstr ""
 "Syötä uusi tiedostonimi. Jos painat vain RETURN, käytetään\n"
 "oletustiedostoa (joka näkyy sulkeissa)."
 
-#: g10/helptext.c:255
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2031,7 +2072,7 @@ msgstr ""
 "      tätä normaalisti käytetään merkitsemään sähköpostiosoite "
 "vanhenneeksi.\n"
 
-#: g10/helptext.c:271
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2041,476 +2082,481 @@ msgstr ""
 "mitätöintivarmenteen.  Kirjoita lyhyesti.\n"
 "Tyhjä rivi päättää tekstin.\n"
 
-#: g10/helptext.c:286
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "Ei ohjeita saatavilla"
 
-#: g10/helptext.c:294
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Ei ohjetta aiheesta \"%s\""
 
-#: g10/import.c:247
+#: g10/import.c:248
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ohitetaan tyypin %d lohko\n"
 
-#: g10/import.c:256
+#: g10/import.c:257
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "tähän mennessä käsitelty %lu avainta\n"
 
-#: g10/import.c:273
+#: g10/import.c:274
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Kaikkiaan käsitelty: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      ohitetaan uudet avaimet: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:279
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          ilman käyttäjätunnuksia: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "              imported: %lu"
 msgstr "              tuotu: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:287
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             muuttamatonta: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          uusia käyttäjätunnuksia: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           uusia aliavaimia: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        uusia allekirjoituksia: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   uusia avainten mitätöintejä: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      luettuja salaisia avaimia: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  tuotuja salaisia avaimia: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " muuttamattomia salaisia avaimia: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "          ei tuotu: %lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:544
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:545
+#: g10/import.c:546
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Olet allekirjoittanut seuraavat käyttäjätunnukset:\n"
 
-#: g10/import.c:582
+#: g10/import.c:583
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
 # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: g10/import.c:594
+#: g10/import.c:595
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: g10/import.c:606
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:620
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:646
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:694 g10/import.c:1048
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "avain %08lX: ei käyttäjätunnusta\n"
 
-#: g10/import.c:713
+#: g10/import.c:714
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "avain %08lX: HKP-aliavainvirhe korjattu\n"
 
-#: g10/import.c:728
+#: g10/import.c:729
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr ""
 "avain %08lX: käyttäjätunnus \"%s\" hyväksytty ilman omaa allekirjoitusta\n"
 
-#: g10/import.c:734
+#: g10/import.c:735
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "avain %08lX: ei voimassaolevia käyttäjätunnuksia\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 msgid "this may be caused by a missing self-signature\n"
 msgstr "tämän voi aiheuttaa puuttuva oma-allekirjoitus\n"
 
-#: g10/import.c:746 g10/import.c:1168
+#: g10/import.c:747 g10/import.c:1169
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "avain %08lX: julkista avainta ei löydetty: %s\n"
 
-#: g10/import.c:752
+#: g10/import.c:753
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "avain %08lX: uusi avain - ohitetaan\n"
 
-#: g10/import.c:761
+#: g10/import.c:762
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa avainrengasta ei löydy: %s\n"
 
-#: g10/import.c:766 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
-#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
-#: g10/import.c:2314 g10/import.c:2336
+#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
+#: g10/import.c:2315 g10/import.c:2337
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
 
-#: g10/import.c:791
+#: g10/import.c:792
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "avain %08lX: julkinen avain \"%s\" tuotu\n"
 
-#: g10/import.c:815
+#: g10/import.c:816
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "avain %08lX: ei vastaa omaa kopiotamme\n"
 
-#: g10/import.c:832 g10/import.c:1186
+#: g10/import.c:833 g10/import.c:1187
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "avain %08lX: alkuperäistä avainlohkoa ei löydy: %s\n"
 
-#: g10/import.c:840 g10/import.c:1193
+#: g10/import.c:841 g10/import.c:1194
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "avain %08lX. alkuperäisen avainlohko lukeminen ei onnistu: %s\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "avain %08lX: \"%s\" 1 uusi käyttäjätunnus\n"
 
-#: g10/import.c:875
+#: g10/import.c:876
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
 
-#: g10/import.c:878
+#: g10/import.c:879
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "avain %08lX: \"%s\" 1 uusi allekirjoitus\n"
 
-#: g10/import.c:881
+#: g10/import.c:882
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
 
-#: g10/import.c:884
+#: g10/import.c:885
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "avain %08lX: \"%s\" 1 uusi aliavain\n"
 
-#: g10/import.c:887
+#: g10/import.c:888
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "avain %08lX: \"%s\" %d uutta aliavainta\n"
 
-#: g10/import.c:908
+#: g10/import.c:909
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "avain %08lX: \"%s\" ei muutoksia\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1054
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "avain %08lX: avaimella on epäkelpo salain %d - ohitetaan\n"
 
-#: g10/import.c:1064
+#: g10/import.c:1065
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/import.c:1081 g10/import.c:2329
+#: g10/import.c:1082 g10/import.c:2330
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "salaiselle avainrenkaalle ei ole asetettu oletusarvoa: %s\n"
 
-#: g10/import.c:1092
+#: g10/import.c:1093
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "avain %08lX: salainen avain tuotu\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1122
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "avain %08lX: avain on jo avainrenkaassa\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1132
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "avain %08lX: salaista avainta ei löydy: %s\n"
 
-#: g10/import.c:1161
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "avain %08lX: ei julkista avainta - mitätöintivarmennetta ei voida käyttää\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1205
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "avain %08lX: pätemätön mitätöintivarmenne: %s - hylätty\n"
 
-#: g10/import.c:1236
+#: g10/import.c:1237
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "avain %08lX: mitätöintivarmenne \"%s\" tuotu\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1302
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "avain %08lX: allekirjoitukselle ei ole käyttäjätunnusta\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1317
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "avain %08lX: julkisen avaimen algoritmia \"%s\" ei tueta\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "avain %08lX: epäkelpo oma-allekirjoitus käyttäjätunnuksella \"%s\"\n"
 
-#: g10/import.c:1336
+#: g10/import.c:1337
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "avain %08lX: ei aliavainta avainten riippuvuuksiin\n"
 
-#: g10/import.c:1347 g10/import.c:1397
+#: g10/import.c:1348 g10/import.c:1398
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "avain %08lX: julkisen avaimen algoritmia ei tueta\n"
 
-#: g10/import.c:1349
+#: g10/import.c:1350
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "avain %08lX: pätemätön aliavainriippuvuus\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1365
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "avain %08lX: moninkertainen aliavainriippuvuus poistettu\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "avain %08lX: ei aliavainta avainten mitätöintiä varten\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "avain %08lX: epäkelpo aliavaimen mitätöinti\n"
 
-#: g10/import.c:1414
+#: g10/import.c:1415
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "avain %08lX: useiden aliavainten mitätöinti poistettu\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1457
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "avain %08lX: käyttäjätunnus ohitettu '"
 
-#: g10/import.c:1477
+#: g10/import.c:1478
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "avain %08lX: aliavain ohitettu\n"
 
-#: g10/import.c:1504
+#: g10/import.c:1505
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr ""
 "avain %08lX: allekirjoitusta ei voida viedä (luokka %02x) - ohitetaan\n"
 
-#: g10/import.c:1514
+#: g10/import.c:1515
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "avain %08lX: mitätöintivarmenne väärässä paikassa - ohitetaan\n"
 
-#: g10/import.c:1531
+#: g10/import.c:1532
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "avain %08lX: epäkelpo mitätöintivarmenne: %s - ohitetaan\n"
 
-#: g10/import.c:1545
+#: g10/import.c:1546
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "avain %08lX: aliavaimen allekirjoitus väärässä paikassa - ohitetaan\n"
 
-#: g10/import.c:1553
+#: g10/import.c:1554
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "avain %08lX: odottamaton allekirjoitusluokka (0x%02X) - ohitetaan\n"
 
-#: g10/import.c:1574
+#: g10/import.c:1575
 #, fuzzy, c-format
 msgid "key %s: expired signature from key %s - skipped\n"
 msgstr "avain %08lX: odottamaton allekirjoitusluokka (0x%02X) - ohitetaan\n"
 
-#: g10/import.c:1677
+#: g10/import.c:1678
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "avain %08lX: käyttäjätunnuksen kaksoiskappale havaittu - liitetty\n"
 
-#: g10/import.c:1739
+#: g10/import.c:1740
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "VAROITUS: avain %08lX saattaa olla mitätöity: haetaan mitätöintiavain %08lX\n"
 
-#: g10/import.c:1753
+#: g10/import.c:1754
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "VAROITUS: avain %08lX saattaa olla mitätöity: mitätöintiavainta %08lX \n"
 "ei saatavilla.\n"
 
-#: g10/import.c:1812
+#: g10/import.c:1813
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "avain %08lX: \"%s\"-mitätöintivarmenne lisätty\n"
 
-#: g10/import.c:1846
+#: g10/import.c:1847
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "avain %08lX: lisättiin suora avainallekirjoitus\n"
 
-#: g10/import.c:2235
+#: g10/import.c:2236
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "julkinen avain ei täsmää salaiseen avaimeen!\n"
 
-#: g10/import.c:2243
+#: g10/import.c:2244
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/import.c:2245
+#: g10/import.c:2246
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/keydb.c:167
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
 
-#: g10/keydb.c:174
+#: g10/keydb.c:175
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "avainrengas \"%s\" luotu\n"
 
-#: g10/keydb.c:685
+#: g10/keydb.c:316 g10/keydb.c:319
+#, fuzzy, c-format
+msgid "keyblock resource `%s': %s\n"
+msgstr "virhe luotaessa \"%s\": %s\n"
+
+#: g10/keydb.c:698
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[mitätöinti]"
 
-#: g10/keyedit.c:255
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[oma-allekirjoitus]"
 
-#: g10/keyedit.c:333 g10/keylist.c:405
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 väärä allekirjoitus\n"
 
-#: g10/keyedit.c:335 g10/keylist.c:407
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d väärää allekirjoitusta\n"
 
-#: g10/keyedit.c:337 g10/keylist.c:409
+#: g10/keyedit.c:344 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 allekirjoitus jätetty tarkistamatta puuttuvan avaimen vuoksi\n"
 
-#: g10/keyedit.c:339 g10/keylist.c:411
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, 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:341 g10/keylist.c:413
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 allekirjoitus jätetty tarkistamatta virheen vuoksi\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:415
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d allekirjoitusta jätetty tarkistamatta virheiden vuoksi\n"
 
-#: g10/keyedit.c:345
+#: g10/keyedit.c:352
 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:347
+#: g10/keyedit.c:354
 #, 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:403 g10/pkclist.c:262
+#: g10/keyedit.c:410 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2523,53 +2569,63 @@ msgstr ""
 "lähteistä...)?\n"
 "\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:274
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Luotan osittain\n"
 
-#: g10/keyedit.c:408 g10/pkclist.c:276
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Luotan täysin\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:434
 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:443
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Käyttäjätunnus \"%s\" on mitätöity."
 
-#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
-#: g10/keyedit.c:858 g10/keyedit.c:1642
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1728
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Haluatko varmasti edelleen allekirjoittaa? (k/E) "
 
-#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
-#: g10/keyedit.c:1648
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
+#: g10/keyedit.c:1734
 msgid "  Unable to sign.\n"
 msgstr "  Allekirjoittaminen ei onnistu.\n"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Käyttäjätunnus \"%s\" on vanhentunut."
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:650
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Käyttäjätunnuksella \"%s\" ei ole oma-allekirjoitusta."
 
-#: g10/keyedit.c:676
+#: g10/keyedit.c:678
+#, fuzzy, c-format
+msgid "User ID \"%s\" is signable.  "
+msgstr "Käyttäjätunnuksella \"%s\" ei ole oma-allekirjoitusta."
+
+#: g10/keyedit.c:680
+#, fuzzy
+msgid "Sign it? (y/N) "
+msgstr "Varmastiko allekirjoita? "
+
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2578,13 +2634,13 @@ msgstr ""
 "Oma-allekirjoitus kohteessa \"%s\"\n"
 "on PGP 2.x -muodon allekirjoitus.\n"
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:711
 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:699
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2593,11 +2649,11 @@ msgstr ""
 "Nykyinen allekirjoituksesi kohteessa \"%s\"\n"
 "on vanhentunut.\n"
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:729
 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:724
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2606,55 +2662,55 @@ msgstr ""
 "Nykyinen allekirjoituksesi kohteessa \"%s\"\n"
 "on paikallinen allekirjoitus.\n"
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:754
 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:749
+#: g10/keyedit.c:775
 #, 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:752
+#: g10/keyedit.c:778
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" on jo allekirjoitettu avaimella %08lX\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:783
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Haluatko allekirjoittaa uudelleen joka tapauksessa? (k/E) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:805
 #, 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:794
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "Tämä avain on vanhentunut!"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Avain vanhenee %s.\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:844
 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:851
+#: g10/keyedit.c:882
 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:853
+#: g10/keyedit.c:884
 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:878
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2663,32 +2719,32 @@ msgstr ""
 "Kuinka huolellisesti olet vahvistanut avaimen haltijan henkilöllisyyden?\n"
 "Jos et tiedä vastausta, syötä \"0\".\n"
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) En vastaa.%s\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) En ole tarkistanut lainkaan.%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Olen suorittanut arkisen tarkistuksen.%s\n"
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Olen suorittanut huolellisen tarkistuksen.%s\n"
 
-#: g10/keyedit.c:895
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Valintasi? (syöttämällä \"?\" saat lisätietoja): "
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:950
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2697,100 +2753,100 @@ msgstr ""
 "Haluatko varmasti allekirjoittaa tämän avaimen\n"
 "omalla avaimellasi: \""
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Tämä tulee olemaan oma-allekirjoitus.\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:963
 #, 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:940
+#: g10/keyedit.c:971
 #, 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:950
+#: g10/keyedit.c:981
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Tämä allekirjoitus määritellään vientikelvottomaksi.\n"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:988
 #, 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:964
+#: g10/keyedit.c:995
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "En ole tarkistanut tätä avainta lainkaan.\n"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1000
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Olen tarkistanut avaimen arkisesti.\n"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1005
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Olen tarkistanut avaimen erittäin huolellisesti.\n"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1015
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Varmastiko allekirjoita? "
 
-#: g10/keyedit.c:1029 g10/keyedit.c:4132 g10/keyedit.c:4223 g10/keyedit.c:4287
-#: g10/keyedit.c:4348 g10/sign.c:369
+#: g10/keyedit.c:1060 g10/keyedit.c:4350 g10/keyedit.c:4441 g10/keyedit.c:4505
+#: g10/keyedit.c:4566 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allekirjoitus epäonnistui: %s\n"
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1105 g10/keygen.c:3057
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "Avainta ei ole suojattu.\n"
 
-#: g10/keyedit.c:1109 g10/keygen.c:3045
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 
-#: g10/keyedit.c:1113 g10/keygen.c:3060
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 #, 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:1117 g10/keygen.c:3064
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "Avain on suojattu.\n"
 
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Ei voi muokata avainta: %s\n"
 
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2798,11 +2854,11 @@ msgstr ""
 "Syötä uusi salasana salaiselle avaimelle.\n"
 "\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:1825
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2810,193 +2866,193 @@ msgstr ""
 "Et halua salasanaa - tämä on todennäköisesti *huono* ajatus!\n"
 "\n"
 
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1195
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Haluatko varmasti tehdä tämän? "
 
-#: g10/keyedit.c:1235
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "siirretään avaimen allekirjoitus oikealle paikalle\n"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "tallenna ja lopeta"
 
-#: g10/keyedit.c:1322
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "näytä sormenjälki"
 
-#: g10/keyedit.c:1323
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "näytä avaimet ja käyttäjätunnukset"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "valitse käyttäjätunnus N"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "valitse käyttäjätunnus N"
 
-#: g10/keyedit.c:1327
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "mitätöi allekirjoitus"
 
-#: g10/keyedit.c:1330
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1335
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "allekirjoita avain paikallisesti"
 
-#: g10/keyedit.c:1337
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Vihje: Valitse allekirjoitettavat käyttäjätunnukset\n"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1343
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "lisää käyttäjätunnus"
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "lisää valokuva"
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "poista käyttäjätunnus"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "poista toissijainen avain"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr "lisää mitätöintiavain"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "merkitse käyttäjätunnus ensisijaiseksi"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "vaihda salaisten ja julkisten avainten luettelon välillä"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "näytä valinnat (asiantuntija)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "näytä valinnat (monisanaisesti)"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1418
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "muuta salasanaa"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "muuta luottamusastetta"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1426
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Varmastiko mitätöi kaikki valitut käyttäjätunnukset? "
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "mitätöi käyttäjätunnus"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "mitätöi toissijainen avain"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "enable key"
 msgstr "ota avain käyttöön"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "disable key"
 msgstr "poista avain käytöstä"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1436
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "näytä valokuvatunniste"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1556
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "virhe luettaessa salaista avainlohkoa \"%s\": %s\n"
 
-#: g10/keyedit.c:1494
+#: g10/keyedit.c:1574
 msgid "Secret key is available.\n"
 msgstr "Salainen avain on saatavilla.\n"
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1655
 msgid "Need the secret key to do this.\n"
 msgstr "Tähän tarvitaan salainen avain.\n"
 
-#: g10/keyedit.c:1579
+#: g10/keyedit.c:1663
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Käytä ensin komentoa \"toggle\".\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1682
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3004,236 +3060,241 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1722
 msgid "Key is revoked."
 msgstr "Avain on mitätöity."
 
-#: g10/keyedit.c:1657
+#: g10/keyedit.c:1741
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Varmastiko allekirjoita kaikki käyttäjätunnukset?"
 
-#: g10/keyedit.c:1660
-msgid "Hint: Select the user IDs to sign\n"
-msgstr "Vihje: Valitse allekirjoitettavat käyttäjätunnukset\n"
-
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1748
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "tuntematon allekirjoitusluokka"
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1771
 #, 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:1713 g10/keyedit.c:1733 g10/keyedit.c:1899
+#: g10/keyedit.c:1793 g10/keyedit.c:1813 g10/keyedit.c:1979
 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:1715
+#: g10/keyedit.c:1795
 msgid "You can't delete the last user ID!\n"
 msgstr "Et voi poistaa viimeistä käyttäjätunnusta!\n"
 
-#: g10/keyedit.c:1717
+#: g10/keyedit.c:1797
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Varmastiko poista kaikki valitut käyttäjätunnukset? "
 
-#: g10/keyedit.c:1718
+#: g10/keyedit.c:1798
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Varmastiko poista tämä käyttäjätunnus? "
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1848
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Varmastiko poista tämä käyttäjätunnus? "
 
-#: g10/keyedit.c:1780
+#: g10/keyedit.c:1860
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Sinun täytyy valita ainakin yksi avain.\n"
 
-#: g10/keyedit.c:1808
+#: g10/keyedit.c:1888
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1822
+#: g10/keyedit.c:1902
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1919
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
 
-#: g10/keyedit.c:1863
+#: g10/keyedit.c:1943
 msgid "You must select at least one key.\n"
 msgstr "Sinun täytyy valita ainakin yksi avain.\n"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1946
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Haluatko varmasti poistaa valitut avaimet? "
 
-#: g10/keyedit.c:1867
+#: g10/keyedit.c:1947
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Haluatko varmasti poistaa tämän avaimen? "
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1982
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Varmastiko mitätöi kaikki valitut käyttäjätunnukset? "
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1983
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Varmastiko mitätöi tämä käyttäjätunnus? "
 
-#: g10/keyedit.c:1921
+#: g10/keyedit.c:2001
 #, 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:1932
+#: g10/keyedit.c:2012
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Haluatko varmasti mitätöidä valitut avaimet? "
 
-#: g10/keyedit.c:1934
+#: g10/keyedit.c:2014
 #, 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:1975
+#: g10/keyedit.c:2055
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2007
+#: g10/keyedit.c:2087
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "näytä valinnat"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2093
 #, 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:2015
+#: g10/keyedit.c:2095
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Varmastiko päivitä valinnat? "
 
-#: g10/keyedit.c:2065
+#: g10/keyedit.c:2157
+#, fuzzy, c-format
+msgid "Unable to clean `%s'\n"
+msgstr "komentoa %s \"%s\" ei voi suorittaa: %s\n"
+
+#: g10/keyedit.c:2160
+msgid "Please specify item to clean: `sigs', `uids', or `all'\n"
+msgstr ""
+
+#: g10/keyedit.c:2171
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Tallenna muutokset? "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2174
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Lopeta tallentamatta muutoksia?"
 
-#: g10/keyedit.c:2078
+#: g10/keyedit.c:2184
 #, c-format
 msgid "update failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2191
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "salaisen päivitys epäonnistui: %s\n"
 
-#: g10/keyedit.c:2092
+#: g10/keyedit.c:2198
 msgid "Key not changed so no update needed.\n"
 msgstr "Päivitystä ei tarvita, koska avain ei ole muuttunut.\n"
 
-#: g10/keyedit.c:2164
+#: g10/keyedit.c:2271
 msgid "Digest: "
 msgstr "Tiiviste: "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2323
 msgid "Features: "
 msgstr "Ominaisuudet: "
 
-#: g10/keyedit.c:2227
+#: g10/keyedit.c:2334
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2242 g10/keylist.c:307
+#: g10/keyedit.c:2349 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2473
+#: g10/keyedit.c:2580
 #, 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:2494
+#: g10/keyedit.c:2601
 #, 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:2500
+#: g10/keyedit.c:2607
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (luottamuksellinen)"
 
-#: g10/keyedit.c:2516 g10/keyedit.c:2572 g10/keyedit.c:2684 g10/keyedit.c:2699
-#: g10/keylist.c:193 g10/keyserver.c:422
+#: g10/keyedit.c:2623 g10/keyedit.c:2679 g10/keyedit.c:2792 g10/keyedit.c:2807
+#: g10/keylist.c:194 g10/keyserver.c:421
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: g10/keyedit.c:2519 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:931
+#: g10/keyedit.c:2626 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:948
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[mitätöity] "
 
-#: g10/keyedit.c:2521 g10/keylist.c:757 g10/keylist.c:886
+#: g10/keyedit.c:2628 g10/keylist.c:758 g10/keylist.c:887
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [vanhenee: %s]"
 
-#: g10/keyedit.c:2523 g10/keyedit.c:2574 g10/keyedit.c:2686 g10/keyedit.c:2701
-#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
-#: g10/keylist.c:913 g10/keyserver.c:428 g10/mainproc.c:937
+#: g10/keyedit.c:2630 g10/keyedit.c:2681 g10/keyedit.c:2794 g10/keyedit.c:2809
+#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
+#: g10/keylist.c:914 g10/keyserver.c:427 g10/mainproc.c:954
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [vanhenee: %s]"
 
-#: g10/keyedit.c:2525
+#: g10/keyedit.c:2632
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:2540
+#: g10/keyedit.c:2647
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2651
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2658
 msgid "This key has been disabled"
 msgstr "Tämä avain on poistettu käytöstä"
 
-#: g10/keyedit.c:2579 g10/keylist.c:199
+#: g10/keyedit.c:2686 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2754
 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:2654
+#: g10/keyedit.c:2762
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3241,19 +3302,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:2718 g10/keyserver.c:432 g10/mainproc.c:1577
-#: g10/trustdb.c:1178
+#: g10/keyedit.c:2826 g10/keyedit.c:3201 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1690
 #, fuzzy
 msgid "revoked"
 msgstr "[mitätöity] "
 
-#: g10/keyedit.c:2720 g10/keyserver.c:436 g10/mainproc.c:1579
-#: g10/trustdb.c:531
+#: g10/keyedit.c:2828 g10/keyedit.c:3203 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1692
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2893
 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"
@@ -3261,7 +3322,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:2845
+#: g10/keyedit.c:2953
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3270,45 +3331,75 @@ msgstr ""
 "VAROITUS: Tämä on PGP2-muodon avain.  Valokuvan lisääminen voi\n"
 "          saada jotkin PGP:n versiot hylkäämään avaimen.\n"
 
-#: g10/keyedit.c:2850 g10/keyedit.c:3128
+#: g10/keyedit.c:2958 g10/keyedit.c:3307
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Haluatko edelleen varmasti lisätä sen? (k/E) "
 
-#: g10/keyedit.c:2856
+#: g10/keyedit.c:2964
 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:2996
+#: g10/keyedit.c:3104
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Poistetaanko tämä kelvollinen allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3114
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Poistetaanko tämä epäkelpo allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:3010
+#: g10/keyedit.c:3118
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Poistetaanko tämä tuntematon allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:3016
+#: g10/keyedit.c:3124
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Varmastiko poista oma-allekirjoitus? (k/E)"
 
-#: g10/keyedit.c:3030
+#: g10/keyedit.c:3138
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d allekirjoitus poistettu.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3139
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d allekirjoitusta poistettu.\n"
 
-#: g10/keyedit.c:3034
+#: g10/keyedit.c:3142
 msgid "Nothing deleted.\n"
 msgstr "Mitään ei poistettu.\n"
 
-#: g10/keyedit.c:3123
+#: g10/keyedit.c:3167
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed.\n"
+msgstr "Käyttäjätunnus \"%s\" on mitätöity."
+
+#: g10/keyedit.c:3168
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed.\n"
+msgstr "Käyttäjätunnus \"%s\" on mitätöity."
+
+#: g10/keyedit.c:3173
+#, 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:3205 g10/trustdb.c:1694
+#, fuzzy
+msgid "invalid"
+msgstr "virheellinen ascii-koodaus"
+
+#: g10/keyedit.c:3207
+#, fuzzy, c-format
+msgid "User ID \"%s\" removed: %s\n"
+msgstr "Käyttäjätunnus \"%s\" on mitätöity."
+
+#: g10/keyedit.c:3214
+#, fuzzy
+msgid "No user IDs are removable.\n"
+msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
+
+#: g10/keyedit.c:3302
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3318,344 +3409,349 @@ msgstr ""
 "voi\n"
 "          saada jotkin PGP:n versiot hylkäämään avaimen.\n"
 
-#: g10/keyedit.c:3134
+#: g10/keyedit.c:3313
 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:3154
+#: g10/keyedit.c:3333
 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:3177
+#: g10/keyedit.c:3356
 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:3192
+#: g10/keyedit.c:3371
 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:3214
+#: g10/keyedit.c:3393
 #, 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:3233
+#: g10/keyedit.c:3412
 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:3239
+#: g10/keyedit.c:3418
 #, 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:3300
+#: g10/keyedit.c:3479
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Poista salaisten avainten valinnat, kiitos.\n"
 
-#: g10/keyedit.c:3306
+#: g10/keyedit.c:3485
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Valitse korkeintaan yksi toissijainen avain, kiitos.\n"
 
-#: g10/keyedit.c:3310
+#: g10/keyedit.c:3489
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Muutetaan toissijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:3313
+#: g10/keyedit.c:3492
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muutetaan ensisijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:3359
+#: g10/keyedit.c:3538
 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:3375
+#: g10/keyedit.c:3554
 msgid "No corresponding signature in secret ring\n"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/keyedit.c:3455
+#: g10/keyedit.c:3634
 msgid "Please select exactly one user ID.\n"
 msgstr "Valitse tasan yksi käyttäjätunnus!\n"
 
-#: g10/keyedit.c:3494 g10/keyedit.c:3604 g10/keyedit.c:3724
+#: g10/keyedit.c:3673 g10/keyedit.c:3783 g10/keyedit.c:3903
 #, 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:3665
+#: g10/keyedit.c:3844
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3745
+#: g10/keyedit.c:3924
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:3746
+#: g10/keyedit.c:3925
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3987
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:3854
+#: g10/keyedit.c:4045
+#, 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:4072
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:3971
+#: g10/keyedit.c:4189
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "käyttäjätunnus: \""
 
-#: g10/keyedit.c:3974 g10/keyedit.c:4038 g10/keyedit.c:4081
+#: g10/keyedit.c:4192 g10/keyedit.c:4256 g10/keyedit.c:4299
 #, 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:3976 g10/keyedit.c:4040 g10/keyedit.c:4083
+#: g10/keyedit.c:4194 g10/keyedit.c:4258 g10/keyedit.c:4301
 msgid " (non-exportable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:3980
+#: g10/keyedit.c:4198
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Tämä allekirjoitus vanheni %s.\n"
 
-#: g10/keyedit.c:3984
+#: g10/keyedit.c:4202
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Haluatko varmasti mitätöidä sen? (k/E) "
 
-#: g10/keyedit.c:3988
+#: g10/keyedit.c:4206
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Luodaanko tälle alekirjoitukselle mitätöintivarmenne? (k/E) "
 
-#: g10/keyedit.c:4015
+#: g10/keyedit.c:4233
 #, 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:4041
+#: g10/keyedit.c:4259
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:4048
+#: g10/keyedit.c:4266
 #, 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:4070
+#: g10/keyedit.c:4288
 msgid "You are about to revoke these signatures:\n"
 msgstr "Olet mitätöimässä seuraavat allekirjoitukset:\n"
 
-#: g10/keyedit.c:4090
+#: g10/keyedit.c:4308
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Varmastiko luo mitätöintivarmenteet? (k/E) "
 
-#: g10/keyedit.c:4120
+#: g10/keyedit.c:4338
 msgid "no secret key\n"
 msgstr "salainen avain ei ole saatavilla\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4408
 #, 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:4207
+#: g10/keyedit.c:4425
 #, 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:4271
+#: g10/keyedit.c:4489
 #, 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:4333
+#: g10/keyedit.c:4551
 #, 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:4428
+#: g10/keyedit.c:4646
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Näytetään valokuva %s, kokoa %ld avaimelle 0x%08lX\n"
 "(käyttäjätunnus %d)\n"
 
-#: g10/keygen.c:293
+#: g10/keygen.c:258
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "valinta %c%lu on kopio\n"
 
-#: g10/keygen.c:300
+#: g10/keygen.c:265
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "liian monta \"%c\" valintaa\n"
 
-#: g10/keygen.c:302
+#: g10/keygen.c:267
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "liian monta \"%c\" valintaa\n"
 
-#: g10/keygen.c:304
+#: g10/keygen.c:269
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "liian monta \"%c\" valintaa\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:394
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/keygen.c:829
+#: g10/keygen.c:822
 msgid "writing direct signature\n"
 msgstr "kirjoitetaan suora allekirjoitus\n"
 
-#: g10/keygen.c:868
+#: g10/keygen.c:861
 msgid "writing self signature\n"
 msgstr "kirjoitetaan oma-allekirjoitus\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing key binding signature\n"
 msgstr "kirjoitetaan avaimen varmentava allekirjoitus\n"
 
-#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2632
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "avaimen koko on virheellinen, käytetään %u bittiä\n"
 
-#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2638
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "avaimen koko on pyöristetty %u bittiin\n"
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1239
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1252
+#: g10/keygen.c:1242
 #, fuzzy
 msgid "Encrypt"
 msgstr "salaa tiedot"
 
-#: g10/keygen.c:1255
+#: g10/keygen.c:1245
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1263
+#: g10/keygen.c:1253
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1268
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1282
+#: g10/keygen.c:1272
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1287
+#: g10/keygen.c:1277
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1290
+#: g10/keygen.c:1280
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (vain salaus)\n"
 
-#: g10/keygen.c:1293
+#: g10/keygen.c:1283
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1296
+#: g10/keygen.c:1286
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1340
 msgid "Please select what kind of key you want:\n"
 msgstr "Valitse millaisen avaimen haluat:\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1342
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA ja ElGamal (oletus)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1343
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (vain allekirjoitus)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1345
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:1357
+#: g10/keygen.c:1347
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (vain salaus)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1348
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (vain allekirjoitus)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1350
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:1362
+#: g10/keygen.c:1352
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:1431 g10/keygen.c:2509
+#: g10/keygen.c:1421 g10/keygen.c:2506
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA-avainparissa on 1024 bittiä.\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1431
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1438
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Minkä kokoisen avaimen haluat? (1024) "
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1452
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1468
+#: g10/keygen.c:1458
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Halutun avaimen koko on %u bittiä\n"
 
-#: g10/keygen.c:1473 g10/keygen.c:1478
+#: g10/keygen.c:1463 g10/keygen.c:1468
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "pyöristetty %u bittiin\n"
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1515
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3671,7 +3767,7 @@ msgstr ""
 "     <n>m = Avain vanhenee n kuukauden kuluttua\n"
 "     <n>y = Avain vanhenee n vuoden kuluttua\n"
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1526
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3687,39 +3783,40 @@ msgstr ""
 "     <n>m = Allekirjoitus vanhenee n kuukauden kuluttua\n"
 "     <n>y = Allekirjoitus vanhenee n vuoden kuluttua\n"
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1549
 msgid "Key is valid for? (0) "
 msgstr "Avain on voimassa? (0) "
 
-#: g10/keygen.c:1563
-msgid "Signature is valid for? (0) "
+#: g10/keygen.c:1554
+#, fuzzy, c-format
+msgid "Signature is valid for? (%s) "
 msgstr "Allekirjoitus on voimassa? (0) "
 
-#: g10/keygen.c:1568
+#: g10/keygen.c:1572
 msgid "invalid value\n"
 msgstr "arvo ei kelpaa\n"
 
-#: g10/keygen.c:1575
+#: g10/keygen.c:1579
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s ei vanhene koskaan\n"
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1580
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s ei vanhene koskaan\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1585
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s vanhenee %s\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1586
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Allekirjoitus vanhenee %s\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1592
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3727,12 +3824,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:1595
+#: g10/keygen.c:1597
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Onko tämä oikein (k/e) "
 
-#: g10/keygen.c:1638
+#: g10/keygen.c:1641
 #, fuzzy
 msgid ""
 "\n"
@@ -3750,44 +3847,44 @@ msgstr ""
 "     \"Matti Meikäläinen (nuorempi) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1651
+#: g10/keygen.c:1654
 msgid "Real name: "
 msgstr "Oikea nimi: "
 
-#: g10/keygen.c:1659
+#: g10/keygen.c:1662
 msgid "Invalid character in name\n"
 msgstr "Nimessä on epäkelpo merkki\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1664
 msgid "Name may not start with a digit\n"
 msgstr "Nimi ei voi alkaa numerolla\n"
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1666
 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:1671
+#: g10/keygen.c:1674
 msgid "Email address: "
 msgstr "Sähköpostiosoite: "
 
-#: g10/keygen.c:1682
+#: g10/keygen.c:1685
 msgid "Not a valid email address\n"
 msgstr "Sähköpostiosoite ei kelpaa\n"
 
-#: g10/keygen.c:1690
+#: g10/keygen.c:1693
 msgid "Comment: "
 msgstr "Huomautus: "
 
-#: g10/keygen.c:1696
+#: g10/keygen.c:1699
 msgid "Invalid character in comment\n"
 msgstr "Huomautuksessa on epäkelpo merkki\n"
 
-#: g10/keygen.c:1719
+#: g10/keygen.c:1722
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Käytät merkistöä \"%s\".\n"
 
-#: g10/keygen.c:1725
+#: g10/keygen.c:1728
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3798,7 +3895,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1733
 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"
 
@@ -3813,23 +3910,23 @@ msgstr "Älä syötä sähköpostiosoitetta nimen tai huomautuksen paikalle\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1746
+#: g10/keygen.c:1749
 msgid "NnCcEeOoQq"
 msgstr "NnHhSsOoLl"
 
-#: g10/keygen.c:1756
+#: g10/keygen.c:1759
 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:1757
+#: g10/keygen.c:1760
 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:1776
+#: g10/keygen.c:1779
 msgid "Please correct the error first\n"
 msgstr "Ole hyvä ja korjaa ensin virhe\n"
 
-#: g10/keygen.c:1816
+#: g10/keygen.c:1819
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3837,12 +3934,12 @@ msgstr ""
 "Tarvitset salasanan suojaamaan salaista avaintasi.\n"
 "\n"
 
-#: g10/keygen.c:1826 g10/passphrase.c:1105
+#: g10/keygen.c:1829 g10/passphrase.c:786
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1832
+#: g10/keygen.c:1835
 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"
@@ -3854,7 +3951,7 @@ msgstr ""
 "tämän ohjelman valitsimella \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1857
 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"
@@ -3866,50 +3963,50 @@ msgstr ""
 "alkulukujen luomisen aikana, tämä antaa satunnaislukugeneraattorille\n"
 "paremmat mahdollisuudet kerätä riittävästi entropiaa.\n"
 
-#: g10/keygen.c:2578
+#: g10/keygen.c:2575
 msgid "Key generation canceled.\n"
 msgstr "Avaimen luonti keskeytetty.\n"
 
-#: g10/keygen.c:2766 g10/keygen.c:2910
+#: g10/keygen.c:2774 g10/keygen.c:2918
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "kirjoitan julkisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:2768 g10/keygen.c:2913
+#: g10/keygen.c:2776 g10/keygen.c:2921
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:2771 g10/keygen.c:2916
+#: g10/keygen.c:2779 g10/keygen.c:2924
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2907
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa julkista avainrengasta ei löydy: %s\n"
 
-#: g10/keygen.c:2905
+#: g10/keygen.c:2913
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa salaista avainrengasta ei löydy: %s\n"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2931
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa julkiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2938
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/keygen.c:2953
+#: g10/keygen.c:2961
 msgid "public and secret key created and signed.\n"
 msgstr "julkinen ja salainen avain on luotu ja allekirjoitettu.\n"
 
-#: g10/keygen.c:2964
+#: g10/keygen.c:2972
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -3918,12 +4015,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:2976 g10/keygen.c:3105 g10/keygen.c:3220
+#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3156 g10/sign.c:290
+#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -3931,7 +4028,7 @@ msgstr ""
 "avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/keygen.c:3030 g10/keygen.c:3158 g10/sign.c:292
+#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -3939,373 +4036,354 @@ msgstr ""
 "avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/keygen.c:3039 g10/keygen.c:3169
+#: g10/keygen.c:3047 g10/keygen.c:3177
 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:3078 g10/keygen.c:3202
+#: g10/keygen.c:3086 g10/keygen.c:3210
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Haluatko varmasti luoda? "
 
-#: g10/keygen.c:3355
+#: g10/keygen.c:3363
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: g10/keygen.c:3402
+#: g10/keygen.c:3410
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: g10/keygen.c:3428
+#: g10/keygen.c:3436
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "HUOM: salainen avain %08lX vanheni %s\n"
 
-#: g10/keygen.c:3508
-#, c-format
-msgid "length of RSA modulus is not %d\n"
-msgstr ""
-
-#: g10/keygen.c:3514
-msgid "public exponent too large (more than 32 bits)\n"
-msgstr ""
-
-#: g10/keygen.c:3520 g10/keygen.c:3526
-#, c-format
-msgid "length of an RSA prime is not %d\n"
-msgstr ""
-
-#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
+#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
 msgid "never     "
 msgstr "ei koskaan"
 
-#: g10/keylist.c:264
+#: g10/keylist.c:265
 msgid "Critical signature policy: "
 msgstr "Kriittinen allekirjoituskäytäntö: "
 
-#: g10/keylist.c:266
+#: g10/keylist.c:267
 msgid "Signature policy: "
 msgstr "Allekirjoituskäytäntö: "
 
-#: g10/keylist.c:305
+#: g10/keylist.c:306
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:354 g10/keylist.c:398
+#: 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:372
+#: g10/keylist.c:373
 msgid "Critical signature notation: "
 msgstr "Kriittinen allekirjoitusnotaatio: "
 
-#: g10/keylist.c:374
+#: g10/keylist.c:375
 msgid "Signature notation: "
 msgstr "Allekirjoitusnotaatio: "
 
-#: g10/keylist.c:385
+#: g10/keylist.c:386
 msgid "not human readable"
 msgstr "ei ihmisten luettavissa"
 
-#: g10/keylist.c:486
+#: g10/keylist.c:487
 msgid "Keyring"
 msgstr "Avainrengas"
 
-#: g10/keylist.c:792
+#: g10/keylist.c:793
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr " [vanhenee: %s]"
 
-#: g10/keylist.c:1488
+#: g10/keylist.c:1489
 msgid "Primary key fingerprint:"
 msgstr "Ensisijaisen avaimen sormenjälki:"
 
-#: g10/keylist.c:1490
+#: g10/keylist.c:1491
 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:1497
+#: g10/keylist.c:1498
 msgid " Primary key fingerprint:"
 msgstr " Ensisijaisen avaimen sormenjälki:"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1500
 msgid "      Subkey fingerprint:"
 msgstr "      Aliavaimen sormenjälki:"
 
-#: g10/keylist.c:1503 g10/keylist.c:1507
+#: g10/keylist.c:1504 g10/keylist.c:1508
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Avaimen sormenjälki ="
 
-#: g10/keylist.c:1574
+#: g10/keylist.c:1575
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1245
+#: g10/keyring.c:1246
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1252
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "VAROITUS: löytyi 2 tiedostoa, joissa on luottamuksellisia tietoja.\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s säilyi muuttumattomana\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1255
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s on uusi\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1256
 msgid "Please fix this possible security flaw\n"
 msgstr "Ole hyvä ja korjaa tämä mahdollinen tietoturvareikä\n"
 
-#: g10/keyring.c:1375
+#: g10/keyring.c:1376
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "tarkistetaan avainrengasta \"%s\"\n"
 
-#: g10/keyring.c:1421
+#: g10/keyring.c:1422
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "käsiteltiin %lu avainta (%lu allekirjoitusta)\n"
 
-#: g10/keyring.c:1433
+#: g10/keyring.c:1434
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "käsiteltiin %lu avainta (%lu allekirjoitusta)\n"
 
-#: g10/keyring.c:1504
+#: g10/keyring.c:1505
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: avainrengas luotu\n"
 
-#: g10/keyserver.c:107
+#: g10/keyserver.c:105
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "VAROITUS: asetukset tiedostossa \"%s\" eivät ole käytössä vielä tässä "
 "ajossa\n"
 
-#: g10/keyserver.c:434
+#: g10/keyserver.c:433
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:635
+#: g10/keyserver.c:634
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:718 g10/keyserver.c:1238
+#: g10/keyserver.c:717 g10/keyserver.c:1267
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/keyserver.c:808
+#: g10/keyserver.c:815
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/keyserver.c:810
+#: g10/keyserver.c:817
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/keyserver.c:985
+#: g10/keyserver.c:1014
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:989
+#: g10/keyserver.c:1018
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1141
+#: g10/keyserver.c:1170
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "allekirjoitettu avaimellasi %08lX %s\n"
 
-#: g10/keyserver.c:1188
+#: g10/keyserver.c:1217
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1191
+#: g10/keyserver.c:1220
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1198 g10/keyserver.c:1293
+#: g10/keyserver.c:1227 g10/keyserver.c:1322
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1275
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1255
+#: g10/keyserver.c:1284
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1314
+#: g10/keyserver.c:1343
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1320
+#: g10/keyserver.c:1349
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1361
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1366
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1374
 #, c-format
-msgid "gpgkeys_%s does not support handler version %d\n"
+msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1351
+#: g10/keyserver.c:1381
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "avainpalvelinvirhe"
 
-#: g10/keyserver.c:1356
+#: g10/keyserver.c:1386
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "avainpalvelinvirhe"
 
-#: g10/keyserver.c:1365
+#: g10/keyserver.c:1395
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/keyserver.c:1390 g10/keyserver.c:1424
+#: g10/keyserver.c:1420 g10/keyserver.c:1454
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1681
+#: g10/keyserver.c:1711
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
 
-#: g10/keyserver.c:1703
+#: g10/keyserver.c:1733
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1705
+#: g10/keyserver.c:1735
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:249
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "outo koko salatulle istuntoavaimelle (%d)\n"
 
-#: g10/mainproc.c:262
-#, c-format
-msgid "bad passphrase or unknown cipher algorithm (%d)\n"
-msgstr "väärä salasana tai tuntematon salausalgoritmi (%d)\n"
-
-#: g10/mainproc.c:299
+#: g10/mainproc.c:300
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s-salattu istuntoavain\n"
 
-#: g10/mainproc.c:309
+#: g10/mainproc.c:310
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "salattu tuntemattomalla algoritmilla %d\n"
 
-#: g10/mainproc.c:375
+#: g10/mainproc.c:376
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "julkinen avain on %08lX\n"
 
-#: g10/mainproc.c:430
+#: g10/mainproc.c:431
 msgid "public key encrypted data: good DEK\n"
 msgstr "julkisella avaimella salattu data: DEK kelpaa\n"
 
-#: g10/mainproc.c:463
+#: g10/mainproc.c:464
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "salattu %u-bittisella %s-avaimella, tunnus %08lX, luotu %s\n"
 
-#: g10/mainproc.c:467 g10/pkclist.c:218
+#: g10/mainproc.c:468 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                aka \""
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:472
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "salattu %s-avaimella, tunnus %08lX\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "julkisen avaimen avaus epäonnistui: %s\n"
 
-#: g10/mainproc.c:499
+#: g10/mainproc.c:500
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "salattu %lu salasanalla\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:502
 msgid "encrypted with 1 passphrase\n"
 msgstr "salattu yhdellä salasanalla\n"
 
-#: g10/mainproc.c:529 g10/mainproc.c:551
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "oletettavasti %s-salattua dataa\n"
 
-#: g10/mainproc.c:537
+#: g10/mainproc.c:538
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "IDEA-salain ei käytettävissä, yritetään optimistisesti \n"
 "käyttää sen sijaan salainta %s\n"
 
-#: g10/mainproc.c:569
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr "avaus onnistui\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:574
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VAROITUS: viestin eheyttä ei oltu suojattu\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROITUS: salattua viestiä on muokattu!\n"
 
-#: g10/mainproc.c:592
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
@@ -4319,307 +4397,296 @@ 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:786
+#: g10/mainproc.c:803
 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:1290
+#: g10/mainproc.c:1307
 msgid "signature verification suppressed\n"
 msgstr "allekirjoituksen varmistus vaiennetaan\n"
 
-#: g10/mainproc.c:1332 g10/mainproc.c:1342
+#: g10/mainproc.c:1349 g10/mainproc.c:1359
 msgid "can't handle these multiple signatures\n"
 msgstr "näitä allekirjoituksia ei voi käsitellä\n"
 
-#: g10/mainproc.c:1352
+#: g10/mainproc.c:1369
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/mainproc.c:1353
+#: g10/mainproc.c:1370
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                aka \""
 
-#: g10/mainproc.c:1357
+#: g10/mainproc.c:1374
 #, 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:1377
+#: g10/mainproc.c:1394
 msgid "Key available at: "
 msgstr "Avain saatavilla kohteessa: "
 
-#: g10/mainproc.c:1482 g10/mainproc.c:1530
+#: g10/mainproc.c:1499 g10/mainproc.c:1547
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "VÄÄRÄ allekirjoitus lähettäjältä \""
 
-#: g10/mainproc.c:1484 g10/mainproc.c:1532
+#: g10/mainproc.c:1501 g10/mainproc.c:1549
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Vanhentunut allekirjoitus lähettäjältä \""
 
-#: g10/mainproc.c:1486 g10/mainproc.c:1534
+#: g10/mainproc.c:1503 g10/mainproc.c:1551
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Allekirjoitus täsmää lähettäjään \""
 
-#: g10/mainproc.c:1538
+#: g10/mainproc.c:1555
 msgid "[uncertain]"
 msgstr "[ei tiedossa]"
 
-#: g10/mainproc.c:1570
+#: g10/mainproc.c:1587
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \""
 
-#: g10/mainproc.c:1664
+#: g10/mainproc.c:1681
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/mainproc.c:1669
+#: g10/mainproc.c:1686
 #, 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:1672
+#: g10/mainproc.c:1689
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: g10/mainproc.c:1673
+#: g10/mainproc.c:1690
 msgid "binary"
 msgstr "binääri"
 
-#: g10/mainproc.c:1674
+#: g10/mainproc.c:1691
 msgid "textmode"
 msgstr "teksti"
 
-#: g10/mainproc.c:1674 g10/trustdb.c:530
+#: g10/mainproc.c:1691 g10/trustdb.c:531
 msgid "unknown"
 msgstr "tuntematon "
 
-#: g10/mainproc.c:1694
+#: g10/mainproc.c:1711
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allekirjoitusta ei voi tarkistaa: %s\n"
 
-#: g10/mainproc.c:1762 g10/mainproc.c:1778 g10/mainproc.c:1864
+#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
 msgid "not a detached signature\n"
 msgstr "allekirjoitus ei ole erillinen\n"
 
-#: g10/mainproc.c:1805
+#: g10/mainproc.c:1822
 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:1813
+#: g10/mainproc.c:1830
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "itsenäinen allekirjoitus luokkaa 0x%02x\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1887
 msgid "old style (PGP 2.x) signature\n"
 msgstr "vanhan tyylin (PGP 2.x) allekirjoitus\n"
 
-#: g10/mainproc.c:1880
+#: g10/mainproc.c:1897
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "epäkelpo juuripaketti havaittu proc_tree():ssä\n"
 
-#: g10/misc.c:121
+#: g10/misc.c:122
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "core-tiedostojen luontia ei voi estää: %s\n"
 
-#: g10/misc.c:141 g10/misc.c:169 g10/misc.c:241
+#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "ei voi avata tiedostoa: %s\n"
 
-#: g10/misc.c:206
+#: g10/misc.c:207
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
 
-#: g10/misc.c:315
+#: g10/misc.c:316
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "julkisen avaimen algorimin %d käsittely ei onnistu\n"
 
-#: g10/misc.c:330
+#: g10/misc.c:331
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "salausalgoritmi ei ole käytössä"
 
 # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: g10/misc.c:345
+#: g10/misc.c:346
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:351
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "valittua tiivistesalgoritmia %s (%d) ei löydy vastaanottajan valinnoista\n"
 
-#: g10/misc.c:446
+#: g10/misc.c:447
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA-salaimen liitännäinen ei käytettävissä\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:448
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr "lue lisätietoja osoitteesta http://www.gnupg.org/why-not-idea.html\n"
 
-#: g10/misc.c:680
+#: g10/misc.c:681
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: paheksuttava valitsin \"%s\"\n"
 
-#: g10/misc.c:684
+#: g10/misc.c:685
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
 
-#: g10/misc.c:686
+#: g10/misc.c:687
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "käytä valitsinta \"%s%s\" sen sijaan\n"
 
-#: g10/misc.c:697
+#: g10/misc.c:694
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
+msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
+
+#: g10/misc.c:707
 msgid "Uncompressed"
 msgstr "pakkaamaton"
 
-#: g10/misc.c:722
+#: g10/misc.c:732
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "pakkaamaton"
 
-#: g10/misc.c:832
+#: g10/misc.c:842
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "%s ei kenties voi käsitellä tätä viestiä\n"
 
-#: g10/misc.c:989
+#: g10/misc.c:999
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: g10/misc.c:1014
+#: g10/misc.c:1024
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 
-#: g10/openfile.c:84
+#: g10/openfile.c:86
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Tiedosto \"%s\" on olemassa."
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Ylikirjoita (k/E)? "
 
-#: g10/openfile.c:119
+#: g10/openfile.c:121
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: tuntematon pääte\n"
 
-#: g10/openfile.c:141
+#: g10/openfile.c:143
 msgid "Enter new filename"
 msgstr "Syötä uusi tiedostonimi"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:188
 msgid "writing to stdout\n"
 msgstr "kirjoitetaan vakiotulosteeseen\n"
 
-#: g10/openfile.c:296
+#: g10/openfile.c:300
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "data kohteessa \"%s\" oletetaan allekirjoitetuksi\n"
 
-#: g10/openfile.c:375
+#: g10/openfile.c:379
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "uusi asetustiedosto \"%s\" luotu\n"
 
-#: g10/openfile.c:377
+#: g10/openfile.c:381
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 "VAROITUS: asetukset tiedostossa \"%s\" eivät ole käytössä vielä tässä "
 "ajossa\n"
 
-#: g10/openfile.c:409
+#: g10/openfile.c:413
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: hakemisto luotu\n"
 
-#: g10/parse-packet.c:137
+#: g10/parse-packet.c:138
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "julkisen avaimen algorimin %d käsittely ei onnistu\n"
 
-#: g10/parse-packet.c:707
+#: g10/parse-packet.c:708
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "VAROITUS: mahdollisesti turvaton symmetrisesti salattu istuntoavain\n"
 
-#: g10/parse-packet.c:1132
+#: g10/parse-packet.c:1145
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "tyypin %d alipaketilla on kriittinen bitti asetettuna\n"
 
-#: g10/passphrase.c:478 g10/passphrase.c:525
+#: g10/passphrase.c:305
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
 
-#: g10/passphrase.c:486
-msgid "can't set client pid for the agent\n"
-msgstr "agentille ei voida asettaa pid:tä\n"
-
-#: g10/passphrase.c:494
-msgid "can't get server read FD for the agent\n"
-msgstr "palvelin ei lue agentin FD:tä\n"
-
-#: g10/passphrase.c:501
-msgid "can't get server write FD for the agent\n"
-msgstr "palvelin ei kirjoita agentille FD:tä\n"
-
-#: g10/passphrase.c:534
+#: g10/passphrase.c:317
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO-ympäristömuuttuja on väärin muotoiltu\n"
 
-#: g10/passphrase.c:547
+#: g10/passphrase.c:332
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent-protokollaversio %d ei ole tuettu\n"
 
-#: g10/passphrase.c:568
+#: g10/passphrase.c:345
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
 
-#: g10/passphrase.c:590
-msgid "communication problem with gpg-agent\n"
-msgstr "gpg-agentin kanssa yhteysongelma\n"
-
-#: g10/passphrase.c:597 g10/passphrase.c:937 g10/passphrase.c:1049
+#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
 msgid "problem with the agent - disabling agent use\n"
 msgstr "agentin käytössä on ongelmia - agenttia ei käytetä\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1209
+#: g10/passphrase.c:511 g10/passphrase.c:890
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (pääavaimen tunnus %08lX)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:525
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4630,41 +4697,28 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bittinen %s-avain, tunnus %08lX, luotu %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:550
 msgid "Repeat passphrase\n"
 msgstr "Toista salasana\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:552
 msgid "Enter passphrase\n"
 msgstr "Syötä salasana\n"
 
-#: g10/passphrase.c:781
-msgid "passphrase too long\n"
-msgstr "salasana on liian pitkä\n"
-
-#: g10/passphrase.c:794
-msgid "invalid response from agent\n"
-msgstr "agentin lähettämä vastaus ei kelpaa\n"
-
-#: g10/passphrase.c:810 g10/passphrase.c:931
+#: g10/passphrase.c:628
 msgid "cancelled by user\n"
 msgstr "käyttäjän peruma\n"
 
-#: g10/passphrase.c:815 g10/passphrase.c:1020
-#, c-format
-msgid "problem with the agent: agent returns 0x%lx\n"
-msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
-
-#: g10/passphrase.c:1100 g10/passphrase.c:1263
+#: g10/passphrase.c:781 g10/passphrase.c:944
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "salasanan kysyminen ei onnistu eräajossa\n"
 
-#: g10/passphrase.c:1107 g10/passphrase.c:1268
+#: g10/passphrase.c:788 g10/passphrase.c:949
 msgid "Enter passphrase: "
 msgstr "Syötä salasana: "
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:871
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4673,21 +4727,21 @@ msgstr ""
 "\n"
 "Tarvitset salasanan avataksesi salaisen avaimen käyttäjälle: \""
 
-#: g10/passphrase.c:1196
+#: g10/passphrase.c:877
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bittinen %s-avain, tunnus %08lX, luotu %s"
 
-#: g10/passphrase.c:1205
+#: g10/passphrase.c:886
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1272
+#: g10/passphrase.c:953
 msgid "Repeat passphrase: "
 msgstr "Toista salasana: "
 
-#: g10/photoid.c:66
+#: g10/photoid.c:67
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4702,162 +4756,162 @@ msgstr ""
 "käytät erittäin suurta kuvaa, myös avaimesta tulee erittäin suuri!\n"
 "Kuvan koon ollessa suunnilleen 240x288, on koko sopiva käyttöön.\n"
 
-#: g10/photoid.c:80
+#: g10/photoid.c:81
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Syötä JPEG-tiedostonimi valokuvatunnisteelle: "
 
-#: g10/photoid.c:94
+#: g10/photoid.c:95
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "ei voi avata tiedostoa: %s\n"
 
-#: g10/photoid.c:102
+#: g10/photoid.c:103
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:104
+#: g10/photoid.c:105
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/photoid.c:119
+#: g10/photoid.c:120
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\" ei ole JPEG-tiedosto\n"
 
-#: g10/photoid.c:136
+#: g10/photoid.c:137
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Onko tämä oikein (k/E/l)? "
 
-#: g10/photoid.c:338
+#: g10/photoid.c:339
 msgid "unable to display photo ID!\n"
 msgstr "valokuvatunnistetta ei voi näyttää!\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:580
+#: g10/pkclist.c:62 g10/revoke.c:581
 msgid "No reason specified"
 msgstr "Ei eriteltyä syytä"
 
-#: g10/pkclist.c:63 g10/revoke.c:582
+#: g10/pkclist.c:64 g10/revoke.c:583
 msgid "Key is superseded"
 msgstr "Avain on uusittu"
 
-#: g10/pkclist.c:65 g10/revoke.c:581
+#: g10/pkclist.c:66 g10/revoke.c:582
 msgid "Key has been compromised"
 msgstr "Avain on murrettu"
 
-#: g10/pkclist.c:67 g10/revoke.c:583
+#: g10/pkclist.c:68 g10/revoke.c:584
 msgid "Key is no longer used"
 msgstr "Avain ei ole enää käytössä"
 
-#: g10/pkclist.c:69 g10/revoke.c:584
+#: g10/pkclist.c:70 g10/revoke.c:585
 msgid "User ID is no longer valid"
 msgstr "Käyttäjätunnus ei ole enää käytössä"
 
-#: g10/pkclist.c:73
+#: g10/pkclist.c:74
 msgid "reason for revocation: "
 msgstr "mitätöinnin syy: "
 
-#: g10/pkclist.c:90
+#: g10/pkclist.c:91
 msgid "revocation comment: "
 msgstr "mitätöintikommentti: "
 
-#: g10/pkclist.c:205
+#: g10/pkclist.c:206
 msgid "iImMqQsS"
 msgstr "iImMlLoO"
 
-#: g10/pkclist.c:213
+#: g10/pkclist.c:214
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "Luottamusarvoa ei ole asetettu seuraavalle:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:245
+#: g10/pkclist.c:246
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "                aka \""
 
-#: g10/pkclist.c:255
+#: g10/pkclist.c:256
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Tämä avain todennäköisesti kuuluu haltijalle\n"
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:271
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = En tiedä\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = EN luota\n"
 
-#: g10/pkclist.c:278
+#: g10/pkclist.c:279
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Luotan ehdottomasti\n"
 
-#: g10/pkclist.c:284
+#: g10/pkclist.c:285
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = takaisin päävalikkoon\n"
 
-#: g10/pkclist.c:287
+#: g10/pkclist.c:288
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " o = ohita tämä avain\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " l = lopeta\n"
 
-#: g10/pkclist.c:292
+#: g10/pkclist.c:293
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:298 g10/revoke.c:609
+#: g10/pkclist.c:299 g10/revoke.c:610
 msgid "Your decision? "
 msgstr "Valintasi? "
 
-#: g10/pkclist.c:319
+#: g10/pkclist.c:320
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Haluatko varmasti luottaa tähän avaimeen ehdottomasti? "
 
-#: g10/pkclist.c:333
+#: g10/pkclist.c:334
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Varmennepolku ehdottomasti luotettuun julkiseen avaimeen:\n"
 
-#: g10/pkclist.c:418
+#: g10/pkclist.c:419
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Mikään ei takaa sitä, että allekirjoitus todella kuuluu "
 "haltijalleen.\n"
 
-#: g10/pkclist.c:423
+#: g10/pkclist.c:424
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Mikään ei takaa sitä, että allekirjoitus todella kuuluu "
 "haltijalleen.\n"
 
-#: g10/pkclist.c:429
+#: g10/pkclist.c:430
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Tämä avain todennäköisesti kuuluu haltijalle\n"
 
-#: g10/pkclist.c:434
+#: g10/pkclist.c:435
 msgid "This key belongs to us\n"
 msgstr "Tämä on oma avain\n"
 
-#: g10/pkclist.c:460
+#: g10/pkclist.c:461
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -4869,96 +4923,96 @@ msgstr ""
 "kysymykseen kyllä\n"
 "\n"
 
-#: g10/pkclist.c:467
+#: g10/pkclist.c:468
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Haluatko käyttää tätä avainta kaikesta huolimatta? "
 
-#: g10/pkclist.c:501
+#: g10/pkclist.c:502
 msgid "WARNING: Using untrusted key!\n"
 msgstr "VAROITUS: Käytettyyn avaimeen ei luoteta!\n"
 
-#: g10/pkclist.c:508
+#: g10/pkclist.c:509
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "VAROITUS: tämä avain saattaa olla mitätöity (mitätöintiavainta ei "
 "saatavilla)\n"
 
-#: g10/pkclist.c:517
+#: g10/pkclist.c:518
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "VAROITUS: Tämän avaimen nimetty mitätöijä on mitätöinyt avaimen!\n"
 
-#: g10/pkclist.c:520
+#: g10/pkclist.c:521
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "VAROITUS: Tämän avaimen haltija on mitätöinyt avaimen!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Tämä voi merkitä sitä, että allekirjoitus on väärennös.\n"
 
-#: g10/pkclist.c:527
+#: g10/pkclist.c:528
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "VAROITUS: Haltija on mitätöinyt tämän aliavaimen!\n"
 
-#: g10/pkclist.c:532
+#: g10/pkclist.c:533
 msgid "Note: This key has been disabled.\n"
 msgstr "Huom: Tämä avain on poistettu käytöstä\n"
 
-#: g10/pkclist.c:537
+#: g10/pkclist.c:538
 msgid "Note: This key has expired!\n"
 msgstr "Huom: Tämä avain on vanhentunut!\n"
 
-#: g10/pkclist.c:548
+#: g10/pkclist.c:549
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "VAROITUS: Tätä avainta ei ole varmennettu luotettavalla allekirjoituksella!\n"
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:551
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Mikään ei takaa sitä, että allekirjoitus todella kuuluu "
 "haltijalleen.\n"
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:559
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "VAROITUS: Tähän avaimeen EI luoteta!\n"
 
-#: g10/pkclist.c:559
+#: g10/pkclist.c:560
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Allekirjoitus on luultavasti VÄÄRENNÖS.\n"
 
-#: g10/pkclist.c:567
+#: g10/pkclist.c:568
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "VAROITUS: Tätä avainta ei ole varmennettu tarpeeksi luotettavalla \n"
 "allekirjoituksella!\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:570
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Ei ole varmaa, että allekirjoitus kuuluu haltijalle.\n"
 
-#: g10/pkclist.c:734 g10/pkclist.c:767 g10/pkclist.c:936 g10/pkclist.c:996
+#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ohitettu: %s\n"
 
-#: g10/pkclist.c:744 g10/pkclist.c:968
+#: g10/pkclist.c:745 g10/pkclist.c:969
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ohitettu: julkinen avain on jo olemassa\n"
 
-#: g10/pkclist.c:786
+#: g10/pkclist.c:787
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Et määritellyt käyttäjätunnusta. (voit käyttää valitsinta \"-r\")\n"
 
-#: g10/pkclist.c:802
+#: g10/pkclist.c:803
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:828
+#: g10/pkclist.c:829
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -4966,169 +5020,169 @@ msgstr ""
 "\n"
 "Syötä käyttäjätunnus.  Lopeta tyhjällä rivillä: "
 
-#: g10/pkclist.c:844
+#: g10/pkclist.c:845
 msgid "No such user ID.\n"
 msgstr "Käyttäjätunnusta ei löydy.\n"
 
-#: g10/pkclist.c:849 g10/pkclist.c:911
+#: g10/pkclist.c:850 g10/pkclist.c:912
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ohitettu: julkinen avain on jo asetettu oletusvastaanottajaksi\n"
 
-#: g10/pkclist.c:867
+#: g10/pkclist.c:868
 msgid "Public key is disabled.\n"
 msgstr "Julkinen avain on poistettu käytöstä\n"
 
-#: g10/pkclist.c:874
+#: g10/pkclist.c:875
 msgid "skipped: public key already set\n"
 msgstr "ohitettu: julkinen avain on jo asetettu\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:904
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 
-#: g10/pkclist.c:948
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s ohitettu: julkinen avain on poistettu käytöstä\n"
 
-#: g10/pkclist.c:1003
+#: g10/pkclist.c:1004
 msgid "no valid addressees\n"
 msgstr "ei kelvollisia vastaanottajia\n"
 
-#: g10/plaintext.c:90
+#: g10/plaintext.c:91
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "dataa ei ole tallennettu, käytä valitsinta \"--output\" tallentaaksesi\n"
 
-#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
+#: g10/plaintext.c:136 g10/plaintext.c:141 g10/plaintext.c:159
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "virhe luotaessa \"%s\": %s\n"
 
-#: g10/plaintext.c:446
+#: g10/plaintext.c:447
 msgid "Detached signature.\n"
 msgstr "Erillinen allekirjoitus.\n"
 
-#: g10/plaintext.c:450
+#: g10/plaintext.c:452
 msgid "Please enter name of data file: "
 msgstr "Anna datatiedoston nimi: "
 
-#: g10/plaintext.c:478
+#: g10/plaintext.c:481
 msgid "reading stdin ...\n"
 msgstr "luetaan vakiosyötettä ...\n"
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:515
 msgid "no signed data\n"
 msgstr "ei allekirjoitettua dataa\n"
 
-#: g10/plaintext.c:526
+#: g10/plaintext.c:529
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "allekirjoitetun datan \"%s\" avaaminen ei onnistu\n"
 
-#: g10/pubkey-enc.c:103
+#: g10/pubkey-enc.c:104
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "nimetön vastaanottaja; yritän käyttää salaista avainta %08lX ...\n"
 
-#: g10/pubkey-enc.c:119
+#: g10/pubkey-enc.c:120
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "ok, nimetön vastaanottaja olet sinä.\n"
 
-#: g10/pubkey-enc.c:207
+#: g10/pubkey-enc.c:208
 msgid "old encoding of the DEK is not supported\n"
 msgstr "vanhaa DEK-koodaus ei tueta\n"
 
-#: g10/pubkey-enc.c:228
+#: g10/pubkey-enc.c:229
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "salausalgoritmi %d%s on tuntematon tai poistettu käytöstä\n"
 
-#: g10/pubkey-enc.c:266
+#: g10/pubkey-enc.c:267
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "HUOM: salausalgoritmia %d ei löydy valinnoista\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:287
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "HUOM: salainen avain %08lX vanheni %s\n"
 
-#: g10/pubkey-enc.c:292
+#: g10/pubkey-enc.c:293
 msgid "NOTE: key has been revoked"
 msgstr "HUOM: avain on mitätöity!"
 
-#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:545
+#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
+#: g10/revoke.c:188 g10/revoke.c:546
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet epäonnistui: %s\n"
 
-#: g10/revoke.c:146
+#: g10/revoke.c:147
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "avain %08lX: ei käyttäjätunnusta\n"
 
-#: g10/revoke.c:272
+#: g10/revoke.c:273
 msgid "To be revoked by:\n"
 msgstr "Mitätöinnin tekee:\n"
 
-#: g10/revoke.c:276
+#: g10/revoke.c:277
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Tämä on arkaluonteinen mitätöintiavain)\n"
 
-#: g10/revoke.c:280
+#: g10/revoke.c:281
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Luo tälle avaimelle mitätöintivarmenne? "
 
-#: g10/revoke.c:293 g10/revoke.c:511
+#: g10/revoke.c:294 g10/revoke.c:512
 msgid "ASCII armored output forced.\n"
 msgstr "ASCII-koodattu tuloste määritetty.\n"
 
-#: g10/revoke.c:307 g10/revoke.c:525
+#: g10/revoke.c:308 g10/revoke.c:526
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet epäonnistui: %s\n"
 
-#: g10/revoke.c:370
+#: g10/revoke.c:371
 msgid "Revocation certificate created.\n"
 msgstr "Mitätöintivarmenne luotu.\n"
 
-#: g10/revoke.c:376
+#: g10/revoke.c:377
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "mitätöintiavainta ei löydy avaimelle \"%s\"\n"
 
-#: g10/revoke.c:432
+#: g10/revoke.c:433
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "salaista avainta \"%s\" ei löydy: %s\n"
 
-#: g10/revoke.c:461
+#: g10/revoke.c:462
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "ei vastaavaa julkista avainta: %s\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:473
 msgid "public key does not match secret key!\n"
 msgstr "julkinen avain ei täsmää salaiseen avaimeen!\n"
 
-#: g10/revoke.c:479
+#: g10/revoke.c:480
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Luo tälle avaimelle mitätöintivarmenne? "
 
-#: g10/revoke.c:496
+#: g10/revoke.c:497
 msgid "unknown protection algorithm\n"
 msgstr "tuntematon suojausalgoritmi\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 msgid "NOTE: This key is not protected!\n"
 msgstr "HUOM: Tätä avainta ei ole suojattu!\n"
 
-#: g10/revoke.c:551
+#: g10/revoke.c:552
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5148,110 +5202,110 @@ msgstr ""
 "tulostusjärjestelmä saattaa tallentaa datan ja saattaa sen muiden "
 "saataville!\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid "Please select the reason for the revocation:\n"
 msgstr "Valitse mitätöinnin syy:\n"
 
-#: g10/revoke.c:602
+#: g10/revoke.c:603
 msgid "Cancel"
 msgstr "Peru"
 
-#: g10/revoke.c:604
+#: g10/revoke.c:605
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Todennäköisesti haluat valita %d tässä)\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:646
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Syötä vapaaehtoinen kuvaus; lopeta tyhjään riviin:\n"
 
-#: g10/revoke.c:673
+#: g10/revoke.c:674
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Mitätöinnin syy: %s\n"
 
-#: g10/revoke.c:675
+#: g10/revoke.c:676
 msgid "(No description given)\n"
 msgstr "(Kuvausta ei annettu)\n"
 
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Kelpaako tämä? "
 
-#: g10/seckey-cert.c:54
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "salaisen avaimen osat eivät ole käytettävissä\n"
 
-#: g10/seckey-cert.c:60
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 
-#: g10/seckey-cert.c:71
+#: g10/seckey-cert.c:72
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 
-#: g10/seckey-cert.c:265
+#: g10/seckey-cert.c:266
 msgid "Invalid passphrase; please try again"
 msgstr "Salasana ei kelpaa; yritä uudestaan"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:267
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:326
+#: g10/seckey-cert.c:327
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "VAROITUS: Havaittiin heikko avain -  vaihda salasanaa uudestaan.\n"
 
-#: g10/seckey-cert.c:364
+#: g10/seckey-cert.c:365
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "luodaan paheksuttava 16-bittinen tarkistussumma salaisen avaimen suojaksi\n"
 
-#: g10/seskey.c:52
+#: g10/seskey.c:53
 msgid "weak key created - retrying\n"
 msgstr "luotu avain on heikko - yritän uudestaan\n"
 
-#: g10/seskey.c:57
+#: g10/seskey.c:58
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "heikon avaimen luomista symmetriselle salaimelle ei voitu välttää; \n"
 "yritettiin %d kertaa!\n"
 
-#: g10/seskey.c:213
+#: g10/seskey.c:214
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA vaatii 160-bittisen tiivistealgoritmin käyttöä\n"
 
-#: g10/sig-check.c:75
+#: g10/sig-check.c:76
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "VAROITUS: allekirjoitustiiviste ei täsmää viestin kanssa\n"
 
-#: g10/sig-check.c:99
+#: g10/sig-check.c:100
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "VAROITUS: allekirjoitusaliavain %08lX ei ole ristiinvarmennettu\n"
 
-#: g10/sig-check.c:102
+#: g10/sig-check.c:103
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "VAROITUS: allekirjoitusaliavaimella %08lX on epäkelpo ristiinvarmennus\n"
 
-#: g10/sig-check.c:168
+#: g10/sig-check.c:169
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "julkinen avain %08lX on %lu sekuntia uudempi kuin allekirjoitus\n"
 
-#: g10/sig-check.c:169
+#: g10/sig-check.c:170
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "julkinen avain %08lX on %lu sekuntia uudempi kuin allekirjoitus\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:181
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5259,7 +5313,7 @@ msgstr ""
 "avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:183
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5267,57 +5321,57 @@ msgstr ""
 "avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:193
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "HUOM: allekirjoitusavain %08lX vanheni %s\n"
 
-#: g10/sig-check.c:275
+#: g10/sig-check.c:276
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "Epäkelpo allekirjoitus avaimelta %08lX oletettavasti johtuen tuntemattomasta "
 "\"critical bit\":istä\n"
 
-#: g10/sig-check.c:532
+#: g10/sig-check.c:533
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "avain %08lX: ei vastaavaa aliavainta aliavaimen mitätöintipaketille\n"
 
-#: g10/sig-check.c:558
+#: g10/sig-check.c:559
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "avain %08lX: ei aliavainta aliavaimen liitosallekirjoitukselle\n"
 
-#: g10/sign.c:85
+#: g10/sign.c:86
 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:93
+#: g10/sign.c:94
 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:112
+#: g10/sign.c:113
 #, 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:138
+#: g10/sign.c:139
 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:146
+#: g10/sign.c:147
 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:159
+#: g10/sign.c:160
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5325,7 +5379,7 @@ msgstr ""
 "VAROITUS: käytäntö-url:n %%-laajennus ei onnistu (liian suuri). \n"
 "Käytetään laajentamatonta.\n"
 
-#: g10/sign.c:187
+#: g10/sign.c:188
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5334,77 +5388,77 @@ msgstr ""
 "VAROITUS: käytäntö-url:n %%-laajennus ei onnistu (liian suuri). \n"
 "Käytetään laajentamatonta.\n"
 
-#: g10/sign.c:364
+#: g10/sign.c:365
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: g10/sign.c:373
+#: g10/sign.c:374
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s-allekirjoitus lähettäjältä: \"%s\"\n"
 
-#: g10/sign.c:741
+#: g10/sign.c:761
 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:808
+#: g10/sign.c:830
 #, 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:900
+#: g10/sign.c:922
 msgid "signing:"
 msgstr "allekirjoitetaan:"
 
-#: g10/sign.c:1007
+#: g10/sign.c:1034
 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:1180
+#: g10/sign.c:1212
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "käytetään %s-salausta\n"
 
-#: g10/skclist.c:126 g10/skclist.c:190
+#: g10/skclist.c:127 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "avainta ei ole merkitty turvattomaksi - sitä ei voida käyttää jäljitellyn\n"
 "satunnaislukugeneraattorin kanssa!\n"
 
-#: g10/skclist.c:157
+#: g10/skclist.c:158
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "ohitetaan \"%s\": kopio\n"
 
-#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "ohitetaan \"%s\": %s\n"
 
-#: g10/skclist.c:170
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/skclist.c:185
+#: g10/skclist.c:186
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "ohitetaan \"%s\": tämä on PGP:n luoma ElGamal-avain, jolla ei voi "
 "allekirjoittaa turvallisesti!\n"
 
-#: g10/tdbdump.c:59 g10/trustdb.c:365
+#: g10/tdbdump.c:60 g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "luottamustietue %lu, tyyppi %d: kirjoittaminen epäonnistui: %s\n"
 
-#: g10/tdbdump.c:104
+#: g10/tdbdump.c:105
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5413,348 +5467,348 @@ msgstr ""
 "# Luettelo annettuista luottamusarvoista, luotu %s\n"
 "# (Käytä \"gpg --import-ownertrust\" palauttaaksesi ne)\n"
 
-#: g10/tdbdump.c:159 g10/tdbdump.c:167 g10/tdbdump.c:172 g10/tdbdump.c:177
+#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: g10/tdbdump.c:159
+#: g10/tdbdump.c:160
 #, fuzzy
 msgid "line too long"
 msgstr "rivi on liian pitkä\n"
 
-#: g10/tdbdump.c:167
+#: g10/tdbdump.c:168
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:173
+#: g10/tdbdump.c:174
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/tdbdump.c:178
+#: g10/tdbdump.c:179
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr "tuo luottamusasteet"
 
-#: g10/tdbdump.c:214
+#: g10/tdbdump.c:215
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "virhe etsittäessä luottamustietuetta: %s\n"
 
-#: g10/tdbdump.c:218
+#: g10/tdbdump.c:219
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "lukuvirhe: %s\n"
 
-#: g10/tdbdump.c:227 g10/trustdb.c:380
+#: g10/tdbdump.c:228 g10/trustdb.c:381
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: synkronointi epäonnistui: %s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1440
+#: g10/tdbio.c:129 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek epäonnistui: %s\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1447
+#: g10/tdbio.c:135 g10/tdbio.c:1448
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: kirjoittaminen epäonnistuin (n=%d): %s\n"
 
-#: g10/tdbio.c:244
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "trustdb-tapahtuma on liian suuri\n"
 
-#: g10/tdbio.c:497
+#: g10/tdbio.c:498
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
 
-#: g10/tdbio.c:512
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: hakemistoa ei ole olemassa!\n"
 
-#: g10/tdbio.c:522 g10/tdbio.c:545 g10/tdbio.c:588
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: g10/tdbio.c:524 g10/tdbio.c:591
+#: g10/tdbio.c:525 g10/tdbio.c:592
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "tiedostoa \"%s\" ei voi avata\n"
 
-#: g10/tdbio.c:550
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: versiotietueen luonti epäonnistui: %s"
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: luotu trustdb ei kelpaa\n"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: trustdb luotu\n"
 
-#: g10/tdbio.c:597
+#: g10/tdbio.c:598
 msgid "NOTE: trustdb not writable\n"
 msgstr "HUOM: trustdb:n ei voida kirjoittaa\n"
 
-#: g10/tdbio.c:614
+#: g10/tdbio.c:615
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: trustdb ei kelpaa\n"
 
-#: g10/tdbio.c:646
+#: g10/tdbio.c:647
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
 
-#: g10/tdbio.c:654
+#: g10/tdbio.c:655
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: virhe päivitettäessä versiotietuetta: %s\n"
 
-#: g10/tdbio.c:671 g10/tdbio.c:691 g10/tdbio.c:707 g10/tdbio.c:721
-#: g10/tdbio.c:751 g10/tdbio.c:1373 g10/tdbio.c:1400
+#: g10/tdbio.c:672 g10/tdbio.c:692 g10/tdbio.c:708 g10/tdbio.c:722
+#: g10/tdbio.c:752 g10/tdbio.c:1374 g10/tdbio.c:1401
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: virhe luettaessa versiotietuetta: %s\n"
 
-#: g10/tdbio.c:730
+#: g10/tdbio.c:731
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: virhe kirjoitettaessa versiotietuetta: %s\n"
 
-#: g10/tdbio.c:1169
+#: g10/tdbio.c:1170
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek epäonnistui: %s\n"
 
-#: g10/tdbio.c:1177
+#: g10/tdbio.c:1178
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
 
-#: g10/tdbio.c:1198
+#: g10/tdbio.c:1199
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ei ole trustdb-tiedosto\n"
 
-#: g10/tdbio.c:1216
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versiotietue tietuenumerolla %lu\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1222
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: tiedostoversio %d ei kelpaa\n"
 
-#: g10/tdbio.c:1406
+#: g10/tdbio.c:1407
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
 
-#: g10/tdbio.c:1414
+#: g10/tdbio.c:1415
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: virhe kirjoitettaessa hakemistotietuetta: %s\n"
 
-#: g10/tdbio.c:1424
+#: g10/tdbio.c:1425
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: tietueen nollaaminen epäonnistui: %s\n"
 
-#: g10/tdbio.c:1454
+#: g10/tdbio.c:1455
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: tietueeseen lisääminen epäonnistui: %s\n"
 
-#: g10/tdbio.c:1499
+#: g10/tdbio.c:1500
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "trustdb on turmeltunut; suorita \"gpg --fix-trustdb\"\n"
 
-#: g10/textfilter.c:147
+#: g10/textfilter.c:148
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "yli %d merkkiä pitkiä tekstirivejä ei voi käsitellä\n"
 
-#: g10/textfilter.c:244
+#: g10/textfilter.c:245
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "syöterivi on yli %d merkkiä pitkä\n"
 
-#: g10/trustdb.c:226
+#: g10/trustdb.c:227
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "\"%s\" ei kelpaa pitkänä avaintunnuksena\n"
 
-#: g10/trustdb.c:257
+#: g10/trustdb.c:258
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "avain %08lX: hyväksytty luotettuna avaimena\n"
 
-#: g10/trustdb.c:295
+#: g10/trustdb.c:296
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "avain %08lX esiintyy trustdb:ssä useammin kuin kerran\n"
 
-#: g10/trustdb.c:310
+#: g10/trustdb.c:311
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "avain %08lX: luotetulle avaimelle ei löydy julkista avainta - ohitetaan\n"
 
-#: g10/trustdb.c:320
+#: g10/trustdb.c:321
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "Avain on määritelty ehdottoman luotettavaksi.\n"
 
-#: g10/trustdb.c:344
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "luottamustietue %lu, pyyntötyyppi %d: luku epäonnistui: %s\n"
 
-#: g10/trustdb.c:350
+#: g10/trustdb.c:351
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "luottamustietue %lu ei ole pyydettyä tyyppiä %d\n"
 
-#: g10/trustdb.c:446
+#: g10/trustdb.c:447
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:452
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:506
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[mitätöity] "
 
-#: g10/trustdb.c:508 g10/trustdb.c:513
+#: g10/trustdb.c:509 g10/trustdb.c:514
 #, fuzzy
 msgid "[ expired]"
 msgstr "[vanhentunut] "
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 #, fuzzy
 msgid "[ unknown]"
 msgstr "tuntematon "
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 #, fuzzy
 msgid "never"
 msgstr "ei koskaan"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:536
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:576
+#: g10/trustdb.c:577
 msgid "no need for a trustdb check\n"
 msgstr "trustdb:n tarkistusta ei tarvita\n"
 
-#: g10/trustdb.c:582 g10/trustdb.c:2157
+#: g10/trustdb.c:583 g10/trustdb.c:2309
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "seuraava trustdb tarkistus %s\n"
 
-#: g10/trustdb.c:591
+#: 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:606
+#: 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:838 g10/trustdb.c:1276
+#: 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:1033
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr "tee --check-trustdb, kiitos\n"
 
-#: g10/trustdb.c:1037
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "tarkistetaan trustdb:tä\n"
 
-#: g10/trustdb.c:1901
+#: g10/trustdb.c:2053
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d avainta käsitelty (%d kelpoisuuslaskuria tyhjätty)\n"
 
-#: g10/trustdb.c:1965
+#: g10/trustdb.c:2117
 msgid "no ultimately trusted keys found\n"
 msgstr "ehdottomasti luotettavia avaimia ei löytynyt\n"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:2131
 #, 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:2002
+#: g10/trustdb.c:2154
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2240
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2163
+#: g10/trustdb.c:2315
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "luottamustietue %lu, tyyppi %d: kirjoittaminen epäonnistui: %s\n"
 
-#: g10/verify.c:116
+#: g10/verify.c:117
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -5764,304 +5818,335 @@ msgstr ""
 "Muista, että allekirjoitustiedosto (.sig tai .asc)\n"
 "tulee antaa komentorivillä ensimmäisenä.\n"
 
-#: g10/verify.c:189
+#: g10/verify.c:190
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "syöterivi %u on liian pitkä tai rivinvaihto puutuu\n"
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "yleinen virhe"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "tuntematon pakettityyppi"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "tuntematon versio"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "tuntematon julkisen avaimen algoritmi"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "tuntematon tiivistealgoritmi"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "julkinen avain ei kelpaa"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "salainen avain ei kelpaa"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "allekirjoitus ei täsmää"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "tarkistussumma ei täsmää"
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "väärä salasana"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "julkista avainta ei löydy"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "tuntematon salausalgoritmi"
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "avainrenkaan avaaminen ei onnistu"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "virheellinen paketti"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "virheellinen ascii-koodaus"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "käyttäjätunnusta ei löydy"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "salaista avainta ei löydy"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "käytetty salainen avain on väärä"
 
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "ei tuettu"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "avain ei kelpaa"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "virhe tiedostoa luettaessa"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "virhe tiedostoon kirjoitettaessa"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "tuntematon pakkausalgoritmi"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "virhe tiedostoa avattaessa"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "virhe tiedostoa luotaessa"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "väärä salasana"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "julkisen avaimen algoritmi ei ole käytössä"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "salausalgoritmi ei ole käytössä"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "tuntematon allekirjoitusluokka"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "luottamustietokantavirhe"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "MPI ei kelpaa"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "resurssiraja"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "virheellinen avainrengas"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "virheellinen varmenne"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "väärin muotoiltu käyttäjätunnus"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "virhe tiedostoa suljettaessa"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "virhe nimettäessä tiedostoa uudelleen"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "virhe tiedostoa poistettaessa"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "odottamatonta dataa"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "aikaleima ei täsmää"
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "käyttökelvoton julkisen avaimen algoritmi"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "tiedosto on olemassa"
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "heikko avain"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "virheellinen argumentti"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "URI ei kelpaa"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "URI-muotoa ei tueta"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "verkkovirhe"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "salaamaton"
 
-#: util/errors.c:103
+#: util/errors.c:104
 msgid "not processed"
 msgstr "ei käsitelty"
 
-#: util/errors.c:105
+#: util/errors.c:106
 msgid "unusable public key"
 msgstr "julkista avainta ei voi käyttää"
 
-#: util/errors.c:106
+#: util/errors.c:107
 msgid "unusable secret key"
 msgstr "salaista avainta ei voi käyttää"
 
-#: util/errors.c:107
+#: util/errors.c:108
 msgid "keyserver error"
 msgstr "avainpalvelinvirhe"
 
-#: util/errors.c:108
+#: util/errors.c:109
 #, fuzzy
 msgid "canceled"
 msgstr "Peru"
 
-#: util/errors.c:109
+#: util/errors.c:110
 #, fuzzy
 msgid "no card"
 msgstr "salaamaton"
 
-#: util/logger.c:157
+#: util/logger.c:158
 msgid "ERROR: "
 msgstr ""
 
-#: util/logger.c:160
+#: util/logger.c:161
 msgid "WARNING: "
 msgstr ""
 
-#: util/logger.c:223
+#: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "...tämä on ohjelmistovika (%s:%d:%s)\n"
 
-#: util/logger.c:229
+#: util/logger.c:230
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "olet löytänyt ohjelmistovian ... (%s:%d)\n"
 
-#: util/miscutil.c:336 util/miscutil.c:373
+#: util/miscutil.c:330 util/miscutil.c:367
 msgid "yes"
 msgstr "kyllä|kylla|joo"
 
-#: util/miscutil.c:337 util/miscutil.c:378
+#: util/miscutil.c:331 util/miscutil.c:372
 msgid "yY"
 msgstr "kK"
 
-#: util/miscutil.c:339 util/miscutil.c:375
+#: util/miscutil.c:333 util/miscutil.c:369
 msgid "no"
 msgstr "ei"
 
-#: util/miscutil.c:340 util/miscutil.c:379
+#: util/miscutil.c:334 util/miscutil.c:373
 msgid "nN"
 msgstr "eE"
 
-#: util/miscutil.c:377
+#: util/miscutil.c:371
 msgid "quit"
 msgstr "lopeta|sulje"
 
-#: util/miscutil.c:380
+#: util/miscutil.c:374
 msgid "qQ"
 msgstr "lLsS"
 
-#: util/miscutil.c:413
+#: util/miscutil.c:407
 msgid "okay|okay"
 msgstr ""
 
-#: util/miscutil.c:415
+#: util/miscutil.c:409
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:416
+#: util/miscutil.c:410
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:417
+#: util/miscutil.c:411
 #, fuzzy
 msgid "cC"
 msgstr "c"
 
-#: util/secmem.c:90
+#: util/secmem.c:91
 msgid "WARNING: using insecure memory!\n"
 msgstr "VAROITUS: käytetään suojaamatonta muistia!\n"
 
-#: util/secmem.c:91
+#: util/secmem.c:92
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "lisätietoja osoitteesta http://www.gnupg.org/faq.html\n"
 
-#: util/secmem.c:343
+#: util/secmem.c:344
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "toiminto on mahdollinen vain, jos suojattu muisti alustetaan\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:345
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(olet ehkä käyttänyt tehtävään väärää ohjelmaa)\n"
 
+#, fuzzy
+#~ msgid "error getting serial number: %s\n"
+#~ msgstr "virhe luotaessa salasanaa: %s\n"
+
+#~ msgid "Hint: Select the user IDs to sign\n"
+#~ msgstr "Vihje: Valitse allekirjoitettavat käyttäjätunnukset\n"
+
+#~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+#~ msgstr "väärä salasana tai tuntematon salausalgoritmi (%d)\n"
+
+#~ msgid "can't set client pid for the agent\n"
+#~ msgstr "agentille ei voida asettaa pid:tä\n"
+
+#~ msgid "can't get server read FD for the agent\n"
+#~ msgstr "palvelin ei lue agentin FD:tä\n"
+
+#~ msgid "can't get server write FD for the agent\n"
+#~ msgstr "palvelin ei kirjoita agentille FD:tä\n"
+
+#~ msgid "communication problem with gpg-agent\n"
+#~ msgstr "gpg-agentin kanssa yhteysongelma\n"
+
+#~ msgid "passphrase too long\n"
+#~ msgstr "salasana on liian pitkä\n"
+
+#~ msgid "invalid response from agent\n"
+#~ msgstr "agentin lähettämä vastaus ei kelpaa\n"
+
+#~ msgid "problem with the agent: agent returns 0x%lx\n"
+#~ msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
+
 #~ msgid "select secondary key N"
 #~ msgstr "valitse toissijainen avain N"
 
diff --git a/po/fr.po b/po/fr.po
index f8c6dfe0e..a96a61b0e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.3.93-cvs\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-03-15 16:35+0100\n"
+"POT-Creation-Date: 2005-05-31 10:05+0200\n"
 "PO-Revision-Date: 2004-11-08 01:13+0100\n"
 "Last-Translator: Ga�l Qu�ri <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -19,83 +19,83 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: cipher/primegen.c:120
+#: cipher/primegen.c:121
 #, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr "impossible de g�n�rer un nombre premier avec pbits=%u qbits=%u\n"
 
-#: cipher/primegen.c:311
+#: cipher/primegen.c:312
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "impossible de g�n�rer un nombre premier avec moins de %d bits\n"
 
-#: cipher/random.c:163
+#: cipher/random.c:164
 msgid "no entropy gathering module detected\n"
 msgstr "aucun module de r�cup�ration d'entropie n'a �t� trouv�.\n"
 
-#: cipher/random.c:387 g10/card-util.c:656 g10/card-util.c:725
-#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2255
-#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
-#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
-#: g10/tdbio.c:600
+#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
+#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
+#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
+#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
+#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/tdbio.c:601
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossible d'ouvrir `%s': %s\n"
 
-#: cipher/random.c:391
+#: cipher/random.c:392
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "impossible d'acc�der � `%s': %s\n"
 
-#: cipher/random.c:396
+#: cipher/random.c:397
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' n'est pas un fichier r�gulier - ignor�\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:402
 msgid "note: random_seed file is empty\n"
 msgstr "note: le fichier `random_seed' est vide\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:408
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "AVERTISSEMENT: la taille du fichier `random_seed' est invalide.\n"
 "Celui-ci ne sera pas utilis�.\n"
 
-#: cipher/random.c:415
+#: cipher/random.c:416
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "impossible de lire `%s': %s\n"
 
-#: cipher/random.c:453
+#: cipher/random.c:454
 msgid "note: random_seed file not updated\n"
 msgstr "note: le fichier `random_seed' n'a pas �t� mis � jour\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2723
-#: g10/keygen.c:2753 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
-#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossible de cr�er `%s': %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:481
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "impossible d'�crire `%s': %s\n"
 
-#: cipher/random.c:483
+#: cipher/random.c:484
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "impossible de fermer `%s': %s\n"
 
-#: cipher/random.c:728
+#: cipher/random.c:729
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "ATTENTION: utilisation d'un g�n�rateur de nombres al�atoires peu s�r !!\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:730
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -109,7 +109,7 @@ msgstr ""
 "N'UTILISEZ PAS LES DONN�ES G�N�R�ES PAR CE PROGRAMME !!\n"
 "\n"
 
-#: cipher/rndegd.c:204
+#: cipher/rndegd.c:205
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -119,7 +119,7 @@ msgstr ""
 "faire autre chose pour ne pas vous ennuyer, car cela donnera une\n"
 "meilleure qualit� � l'entropie.\n"
 
-#: cipher/rndlinux.c:134
+#: cipher/rndlinux.c:135
 #, c-format
 msgid ""
 "\n"
@@ -130,47 +130,64 @@ msgstr ""
 "Il n'y a pas assez d'octets al�atoires disponibles. Faites autre chose\n"
 "pour que l'OS puisse amasser plus d'entropie ! (il faut %d octets de plus)\n"
 
-#: g10/app-openpgp.c:547
+#: g10/app-openpgp.c:596
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "impossible de stocker l'empreinte: %s\n"
 
-#: g10/app-openpgp.c:560
+#: g10/app-openpgp.c:609
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "impossible de stocker la date de cr�ation: %s\n"
 
-#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
+#: g10/app-openpgp.c:977
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "la lecture de la cl� a �chou�\n"
+
+#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+msgid "response does not contain the public key data\n"
+msgstr "la r�ponse ne contient pas les donn�es de cl� publique\n"
+
+#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+msgid "response does not contain the RSA modulus\n"
+msgstr "la r�ponse ne contient pas le modulo RSA\n"
+
+#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+msgid "response does not contain the RSA public exponent\n"
+msgstr "la r�ponse ne contient pas l'exposant public RSA\n"
+
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "l'appel du PIN a retourn� une erreur: %s\n"
 
-#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 "Le code PIN pour CHV%d est trop court ; la longueur minimale\n"
 "est %d\n"
 
-#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
-#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
+#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
+#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "la v�rification CHV%d a �chou�: %s\n"
 
-#: g10/app-openpgp.c:836
+#: g10/app-openpgp.c:1310
 msgid "access to admin commands is not configured\n"
 msgstr "l'acc�s aux commandes d'administration n'est pas configur�\n"
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
 msgid "error retrieving CHV status from card\n"
 msgstr "erreur pendant la r�cup�ration de l'�tat CHV de la carte\n"
 
-#: g10/app-openpgp.c:857
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
 msgid "card is permanently locked!\n"
 msgstr "la carte est irr�m�diablement bloqu�e !\n"
 
-#: g10/app-openpgp.c:862
+#: g10/app-openpgp.c:1336
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -180,344 +197,350 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:869
+#: g10/app-openpgp.c:1343
 #, fuzzy
 msgid "|A|Admin PIN"
 msgstr "PIN d'administration"
 
-#: g10/app-openpgp.c:1018
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:1492
 #, fuzzy
 msgid "|AN|New Admin PIN"
 msgstr "PIN d'administration"
 
-#: g10/app-openpgp.c:1018
+#: g10/app-openpgp.c:1492
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1022
+#: g10/app-openpgp.c:1496
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erreur pendant la lecture du num�ro de s�rie: %s\n"
 
-#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
+#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "erreur pendant la lecture du bloc de cl� : %s\n"
 
-#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
+#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: erreur pendant la lecture de l'enregistrement libre: %s\n"
 
-#: g10/app-openpgp.c:1104
+#: g10/app-openpgp.c:1562
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' d�j� compress�\n"
 
-#: g10/app-openpgp.c:1108
+#: g10/app-openpgp.c:1566
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1110
+#: g10/app-openpgp.c:1568
 #, fuzzy
 msgid "generating new key\n"
 msgstr "g�n�rer de nouvelles cl�s"
 
-#: g10/app-openpgp.c:1120
+#: g10/app-openpgp.c:1735
+msgid "creation timestamp missing\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1742
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1749
+#, fuzzy, c-format
+msgid "RSA public exponent missing or largerr than %d bits\n"
+msgstr "l'exposant public est trop �lev� (plus de 32 bits)\n"
+
+#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1827
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "le stockage de la cl� a �chou�: %s\n"
+
+#: g10/app-openpgp.c:1886
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1135
+#: g10/app-openpgp.c:1901
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "la lecture de la cl� a �chou�\n"
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1904
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "La g�n�ration de cl� a �chou�: %s\n"
 
-#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
-msgid "response does not contain the public key data\n"
-msgstr "la r�ponse ne contient pas les donn�es de cl� publique\n"
-
-#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
-msgid "response does not contain the RSA modulus\n"
-msgstr "la r�ponse ne contient pas le modulo RSA\n"
-
-#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
-msgid "response does not contain the RSA public exponent\n"
-msgstr "la r�ponse ne contient pas l'exposant public RSA\n"
-
-#: g10/app-openpgp.c:1195
+#: g10/app-openpgp.c:1961
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1356
+#: g10/app-openpgp.c:2130
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1364
-#, c-format
-msgid "PIN [sigs done: %lu]"
+#: g10/app-openpgp.c:2138
+#, fuzzy, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "PIN [sigs faites: %lu]"
 
-#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
+#: g10/app-openpgp.c:2399
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "impossible d'acc�der � %s - carte OpenPGP invalide ?\n"
 
-#: g10/app-openpgp.c:1731
-#, c-format
-msgid "error getting serial number: %s\n"
-msgstr "erreur pendant la lecture du num�ro de s�rie: %s\n"
-
-#: g10/app-openpgp.c:1826
-#, c-format
-msgid "failed to store the key: %s\n"
-msgstr "le stockage de la cl� a �chou�: %s\n"
-
-#: g10/app-openpgp.c:1868
-msgid "reading the key failed\n"
-msgstr "la lecture de la cl� a �chou�\n"
-
-#: g10/armor.c:317
+#: g10/armor.c:318
 #, c-format
 msgid "armor: %s\n"
 msgstr "armure: %s\n"
 
-#: g10/armor.c:346
+#: g10/armor.c:347
 msgid "invalid armor header: "
 msgstr "en-t�te d'armure invalide: "
 
-#: g10/armor.c:353
+#: g10/armor.c:354
 msgid "armor header: "
 msgstr "en-t�te d'armure: "
 
-#: g10/armor.c:364
+#: g10/armor.c:365
 msgid "invalid clearsig header\n"
 msgstr "en-t�te de signature claire invalide\n"
 
-#: g10/armor.c:416
+#: g10/armor.c:417
 msgid "nested clear text signatures\n"
 msgstr "signatures en texte clair imbriqu�es\n"
 
-#: g10/armor.c:551
+#: g10/armor.c:552
 msgid "unexpected armor: "
 msgstr "armure inattendue: "
 
-#: g10/armor.c:563
+#: g10/armor.c:564
 msgid "invalid dash escaped line: "
 msgstr "ligne �chapp�e par `-' invalide: "
 
-#: g10/armor.c:715 g10/armor.c:1322
+#: g10/armor.c:716 g10/armor.c:1323
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "caract�re %02X invalide en radix64 ignor�\n"
 
-#: g10/armor.c:758
+#: g10/armor.c:759
 msgid "premature eof (no CRC)\n"
 msgstr "fin de fichier pr�matur�e (pas de CRC)\n"
 
-#: g10/armor.c:792
+#: g10/armor.c:793
 msgid "premature eof (in CRC)\n"
 msgstr "fin de fichier pr�matur�e (dans le CRC)\n"
 
-#: g10/armor.c:800
+#: g10/armor.c:801
 msgid "malformed CRC\n"
 msgstr "CRC d�form�\n"
 
-#: g10/armor.c:804 g10/armor.c:1359
+#: g10/armor.c:805 g10/armor.c:1360
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Erreur de CRC; %06lX - %06lX\n"
 
-#: g10/armor.c:824
+#: g10/armor.c:825
 msgid "premature eof (in trailer)\n"
 msgstr "fin de fichier pr�matur�e (dans la remorque)\n"
 
-#: g10/armor.c:828
+#: g10/armor.c:829
 msgid "error in trailer line\n"
 msgstr "erreur dans la ligne de remorque\n"
 
-#: g10/armor.c:1137
+#: g10/armor.c:1138
 msgid "no valid OpenPGP data found.\n"
 msgstr "aucune donn�e OpenPGP valide n'a �t� trouv�e.\n"
 
-#: g10/armor.c:1142
+#: g10/armor.c:1143
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armure invalide: ligne plus longue que %d caract�res\n"
 
-#: g10/armor.c:1146
+#: g10/armor.c:1147
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "caract�re cit�-imprimable (quoted-printable) dans l'armure provenant\n"
 "certainement d'un agent de transfert de messages bogu�\n"
 
-#: g10/card-util.c:58 g10/card-util.c:295
+#: g10/card-util.c:63 g10/card-util.c:303
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "la carte OpenPGP n'est pas disponible: %s\n"
 
-#: g10/card-util.c:63
+#: g10/card-util.c:68
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "carte OpenPGP n� %s d�tect�e\n"
 
-#: g10/card-util.c:70 g10/card-util.c:1329 g10/delkey.c:127 g10/keyedit.c:1430
-#: g10/keygen.c:2439 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1510
+#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
 msgid "can't do this in batch mode\n"
 msgstr "impossible de faire cela en mode automatique\n"
 
-#: g10/card-util.c:97 g10/card-util.c:1108 g10/card-util.c:1191
-#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
-#: g10/keygen.c:1365
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
+#: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "Votre choix ? "
 
-#: g10/card-util.c:206 g10/card-util.c:256
+#: g10/card-util.c:213 g10/card-util.c:263
 msgid "[not set]"
 msgstr "[non positionn�]"
 
-#: g10/card-util.c:391
+#: g10/card-util.c:410
 msgid "male"
 msgstr "masculin"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 msgid "female"
 msgstr "f�minin"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 msgid "unspecified"
 msgstr "non sp�cifi�"
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 msgid "not forced"
 msgstr "non forc�"
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 msgid "forced"
 msgstr "forc�"
 
-#: g10/card-util.c:497
+#: g10/card-util.c:516
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Erreur: Seul l'ASCII standard est permis pour l'instant.\n"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:518
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Erreur: Le caract�re � < � ne peut pas �tre utilis�.\n"
 
-#: g10/card-util.c:501
+#: g10/card-util.c:520
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Erreur: Les espaces doubles ne sont pas permis.\n"
 
-#: g10/card-util.c:518
+#: g10/card-util.c:537
 msgid "Cardholder's surname: "
 msgstr "Nom du d�teneur de la carte: "
 
-#: g10/card-util.c:520
+#: g10/card-util.c:539
 msgid "Cardholder's given name: "
 msgstr "Pr�nom du d�teneur de la carte: "
 
-#: g10/card-util.c:538
+#: g10/card-util.c:557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Erreur: Nom combin� trop long (la limite est %d caract�res).\n"
 
-#: g10/card-util.c:559
+#: g10/card-util.c:578
 msgid "URL to retrieve public key: "
 msgstr "URL pour r�cup�rer la cl� publique: %s"
 
-#: g10/card-util.c:567
+#: g10/card-util.c:586
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Erreur: URL trop long (la limite est %d caract�res).\n"
 
-#: g10/card-util.c:665 g10/card-util.c:734 g10/import.c:261
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:692
 msgid "Login data (account name): "
 msgstr "Donn�es d'identification (nom du compte): "
 
-#: g10/card-util.c:683
+#: g10/card-util.c:702
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 "Erreur: Donn�es d'indentification trop longues (la limite est\n"
 "%d caract�res).\n"
 
-#: g10/card-util.c:742
+#: g10/card-util.c:761
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:752
+#: g10/card-util.c:771
 #, fuzzy, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Erreur: URL trop long (la limite est %d caract�res).\n"
 
-#: g10/card-util.c:772
+#: g10/card-util.c:791
 msgid "Language preferences: "
 msgstr "Pr�f�rences de langue: "
 
-#: g10/card-util.c:780
+#: g10/card-util.c:799
 msgid "Error: invalid length of preference string.\n"
 msgstr "Erreur: longueur invalide de la cha�ne de pr�f�rences.\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:808
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Erreur: caract�res invalide dans la cha�ne de pr�f�rences.\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:829
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Sexe ((M)asculin, (F)�minin ou espace): "
 
-#: g10/card-util.c:824
+#: g10/card-util.c:843
 msgid "Error: invalid response.\n"
 msgstr "Erreur: r�ponse invalide.\n"
 
-#: g10/card-util.c:845
+#: g10/card-util.c:864
 msgid "CA fingerprint: "
 msgstr "empreinte de l'autorit� de certification: "
 
-#: g10/card-util.c:868
+#: g10/card-util.c:887
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Erreur: empreinte mal format�e.\n"
 
-#: g10/card-util.c:916
+#: g10/card-util.c:935
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "l'op�ration sur la cl� n'est pas possible: %s\n"
 
-#: g10/card-util.c:917
+#: g10/card-util.c:936
 msgid "not an OpenPGP card"
 msgstr "ce n'est pas une carte OpenPGP"
 
-#: g10/card-util.c:926
+#: g10/card-util.c:945
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr ""
 "erreur durant la lecture des informations contenues actuellement\n"
 "dans la cl�: %s\n"
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1030
 msgid "Replace existing key? (y/N) "
 msgstr "Remplacer la cl� existante ? (o/N) "
 
-#: g10/card-util.c:1030 g10/card-util.c:1039
+#: g10/card-util.c:1051 g10/card-util.c:1060
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Faire une sauvegarde hors carte de la cl� de chiffrement ? (O/n) "
 
-#: g10/card-util.c:1051
+#: g10/card-util.c:1072
 msgid "Replace existing keys? (y/N) "
 msgstr "Remplacer les cl�s existantes ? (o/N) "
 
-#: g10/card-util.c:1060
+#: g10/card-util.c:1081
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -528,126 +551,130 @@ msgstr ""
 "   PIN = `%s'     PIN admin = `%s'\n"
 "Vous devriez les changer avec la commande --change-pin\n"
 
-#: g10/card-util.c:1099
+#: g10/card-util.c:1120
 msgid "Please select the type of key to generate:\n"
 msgstr "S�lectionnez le type de cl� � g�n�rer:\n"
 
-#: g10/card-util.c:1101 g10/card-util.c:1182
+#: g10/card-util.c:1122 g10/card-util.c:1203
 msgid "   (1) Signature key\n"
 msgstr "   (1) Cl� de signature\n"
 
-#: g10/card-util.c:1102 g10/card-util.c:1184
+#: g10/card-util.c:1123 g10/card-util.c:1205
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Cl� de chiffrement\n"
 
-#: g10/card-util.c:1103 g10/card-util.c:1186
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Cl� d'authentification\n"
 
-#: g10/card-util.c:1119 g10/card-util.c:1202 g10/keyedit.c:908
-#: g10/keygen.c:1404 g10/revoke.c:642
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
+#: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "Choix invalide.\n"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1200
 msgid "Please select where to store the key:\n"
 msgstr "S�lectionnez l'endroit o� stocker la cl�:\n"
 
-#: g10/card-util.c:1214
+#: g10/card-util.c:1235
 msgid "unknown key protection algorithm\n"
 msgstr "algorithme de protection de cl� inconnu\n"
 
-#: g10/card-util.c:1219
+#: g10/card-util.c:1240
 msgid "secret parts of key are not available\n"
 msgstr "Les parties secr�tes de la cl� ne sont pas disponibles.\n"
 
-#: g10/card-util.c:1224
+#: g10/card-util.c:1245
 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:1294 g10/keyedit.c:1317
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "quitter ce menu"
 
-#: g10/card-util.c:1296
+#: g10/card-util.c:1318
 msgid "show admin commands"
 msgstr "indiquer les commandes d'administration"
 
-#: g10/card-util.c:1297 g10/keyedit.c:1320
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "afficher cette aide"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1321
 msgid "list all available data"
 msgstr "lister toutes les donn�es disponibles"
 
-#: g10/card-util.c:1302
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr "changer le nom du propri�taire de la carte"
 
-#: g10/card-util.c:1303
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr "changer l'URL pour r�cup�rer la cl�"
 
-#: g10/card-util.c:1304
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr "aller chercher la cl� sp�cifi�e dans l'URL de la carte"
 
-#: g10/card-util.c:1305
+#: g10/card-util.c:1327
 msgid "change the login name"
 msgstr "changer le nom d'identification"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1328
 msgid "change the language preferences"
 msgstr "changer les pr�f�rences de langue"
 
-#: g10/card-util.c:1307
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr "changer le sexe du propri�taire de la carte"
 
-#: g10/card-util.c:1308
+#: g10/card-util.c:1330
 msgid "change a CA fingerprint"
 msgstr "changer l'empreinte d'une autorit� de certification"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr ""
 "inverser le param�tre obligeant � rentrer le code PIN pour les\n"
 "signatures"
 
-#: g10/card-util.c:1310
+#: g10/card-util.c:1332
 msgid "generate new keys"
 msgstr "g�n�rer de nouvelles cl�s"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr "menu pour changer ou d�verrouiller le PIN"
 
-#: g10/card-util.c:1377 g10/keyedit.c:1526
+#: g10/card-util.c:1334
+msgid "verify the PIN and list all data"
+msgstr ""
+
+#: g10/card-util.c:1454 g10/keyedit.c:1609
 msgid "Command> "
 msgstr "Commande> "
 
-#: g10/card-util.c:1412
+#: g10/card-util.c:1492
 msgid "Admin-only command\n"
 msgstr "La commande n'est utilisable qu'en mode administration\n"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1523
 msgid "Admin commands are allowed\n"
 msgstr "Les commandes d'administration sont permises\n"
 
-#: g10/card-util.c:1430
+#: g10/card-util.c:1525
 msgid "Admin commands are not allowed\n"
 msgstr "Les commandes d'administration ne sont pas permises\n"
 
-#: g10/card-util.c:1499 g10/keyedit.c:2104
+#: g10/card-util.c:1599 g10/keyedit.c:2210
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Commande invalide  (essayez �help�)\n"
 
-#: g10/cardglue.c:287
+#: g10/cardglue.c:396
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr "Ins�rez la carte et tapez entr�e ou entrez 'c' pour annuler: "
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:519
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -657,138 +684,138 @@ msgstr ""
 "s�rie:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:380
+#: g10/cardglue.c:527
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "Tapez entr�e quand vous �tes pr�t ou entrez 'c' pour annuler: "
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:852
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Entrez le code PIN admin: "
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:853
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "Entrez le code PIN: "
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:854
 msgid "Enter Admin PIN: "
 msgstr "Entrez le code PIN admin: "
 
-#: g10/cardglue.c:691
+#: g10/cardglue.c:855
 msgid "Enter PIN: "
 msgstr "Entrez le code PIN: "
 
-#: g10/cardglue.c:705
+#: g10/cardglue.c:872
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "R�p�tez le mot de passe: "
 
-#: g10/cardglue.c:719
+#: g10/cardglue.c:886
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "le mot de passe n'a pas �t� correctement r�p�t� ; recommencez."
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
-#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossible d'ouvrir `%s'\n"
 
-#: g10/decrypt.c:104 g10/encode.c:859
+#: g10/decrypt.c:105 g10/encode.c:846
 msgid "--output doesn't work for this command\n"
 msgstr "--output n'est pas compatible avec cette commande\n"
 
-#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3167 g10/keyserver.c:1511
-#: g10/revoke.c:226
+#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3346 g10/keyserver.c:1541
+#: g10/revoke.c:227
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "cl� � %s � introuvable: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2300 g10/keyserver.c:1525
-#: g10/revoke.c:232 g10/revoke.c:439
+#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erreur pendant la lecture du bloc de cl� : %s\n"
 
-#: g10/delkey.c:128 g10/delkey.c:135
+#: g10/delkey.c:129 g10/delkey.c:136
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(� moins de sp�cifier la cl� par son empreinte)\n"
 
-#: g10/delkey.c:134
+#: g10/delkey.c:135
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "impossible de faire cela en mode automatique sans � --yes �\n"
 
-#: g10/delkey.c:146
+#: g10/delkey.c:147
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Enlever cette cl� du porte-cl�s ? (o/N) "
 
-#: g10/delkey.c:154
+#: g10/delkey.c:155
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "C'est une cl� secr�te ! - faut-il vraiment l'effacer ? (o/N) "
 
-#: g10/delkey.c:164
+#: g10/delkey.c:165
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "la suppression du bloc de cl�s a �chou� : %s\n"
 
-#: g10/delkey.c:174
+#: g10/delkey.c:175
 msgid "ownertrust information cleared\n"
 msgstr "les informations de confiance au propri�taires ont �t� effac�es\n"
 
-#: g10/delkey.c:205
+#: g10/delkey.c:206
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "il y a une cl� secr�te pour la cl� publique \"%s\" !\n"
 
-#: g10/delkey.c:207
+#: g10/delkey.c:208
 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:210 g10/sign.c:1186
+#: g10/encode.c:211 g10/sign.c:1218
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erreur pendant la cr�ation du mot de passe: %s\n"
 
-#: g10/encode.c:215
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 "il n'est pas possible d'utiliser un paquet ESK sym�trique en mode S2K\n"
 
-#: g10/encode.c:228
+#: g10/encode.c:229
 #, c-format
 msgid "using cipher %s\n"
 msgstr "utilisation de l'algorithme de chiffrement %s\n"
 
-#: g10/encode.c:238 g10/encode.c:558
+#: g10/encode.c:239 g10/encode.c:545
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' d�j� compress�\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
+#: g10/encode.c:302 g10/encode.c:591 g10/sign.c:566
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTISSEMENT: `%s' est un fichier vide\n"
 
-#: g10/encode.c:472
+#: g10/encode.c:466
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "le chiffrement RSA ne se fait qu'avec des cl�s de moins de 2048 bits\n"
 "en mode --pgp2\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:488
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lecture de `%s'\n"
 
-#: g10/encode.c:530
+#: g10/encode.c:517
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "impossible d'utiliser le chiffre IDEA pour toutes les cl�s vers\n"
 "lesquelles vous chiffrez.\n"
 
-#: g10/encode.c:540
+#: g10/encode.c:527
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -796,7 +823,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:648 g10/sign.c:877
+#: g10/encode.c:635 g10/sign.c:899
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -805,134 +832,134 @@ msgstr ""
 "AVERTISSEMENT: forcer l'algorithme de compression %s (%d) entre\n"
 "en d�saccord avec les pr�f�rences du destinataire\n"
 
-#: g10/encode.c:735
+#: g10/encode.c:722
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forcer le chiffrement sym�trique %s (%d) entre en d�saccord\n"
 "avec les pr�ferences du destinataire\n"
 
-#: g10/encode.c:805 g10/pkclist.c:721 g10/pkclist.c:757
+#: g10/encode.c:792 g10/pkclist.c:722 g10/pkclist.c:758
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "vous ne pouvez pas utiliser %s en mode %s.\n"
 
-#: g10/encode.c:832
+#: g10/encode.c:819
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s chiffr� pour: \"%s\"\n"
 
-#: g10/encr-data.c:66 g10/mainproc.c:301
+#: g10/encr-data.c:67 g10/mainproc.c:302
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "donn�es chiffr�es avec %s\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:305
+#: g10/encr-data.c:69 g10/mainproc.c:306
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "chiffr� avec l'algorithme inconnu %d\n"
 
-#: g10/encr-data.c:92
+#: g10/encr-data.c:93
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ATTENTION: Le message a �t� chiffr� avec une cl� faible pendant le\n"
 "chiffrement sym�trique.\n"
 
-#: g10/encr-data.c:103
+#: g10/encr-data.c:104
 msgid "problem handling encrypted packet\n"
 msgstr "probl�me de gestion des paquets chiffr�s\n"
 
-#: g10/exec.c:48
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "aucun programme d'ex�cution distante n'est support�\n"
 
-#: g10/exec.c:184 g10/openfile.c:406
+#: g10/exec.c:173 g10/openfile.c:410
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "impossible de cr�er le r�pertoire `%s': %s\n"
 
-#: g10/exec.c:325
+#: g10/exec.c:314
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "les appels aux programmes externes sont d�sactiv�s car les permissions\n"
 "du fichier d'options sont trop peu s�res\n"
 
-#: g10/exec.c:355
+#: g10/exec.c:344
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "cette plateforme a besoin de fichiers temporaires pour appeler des\n"
 "programmes externes\n"
 
-#: g10/exec.c:433
+#: g10/exec.c:422
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "impossible d'ex�cuter le programme `%s': %s\n"
 
-#: g10/exec.c:436
+#: g10/exec.c:425
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "impossible d'ex�cuter l'int�rpr�teur de commandes `%s': %s\n"
 
-#: g10/exec.c:521
+#: g10/exec.c:510
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "erreur syst�me pendant l'appel du programme externe: %s\n"
 
-#: g10/exec.c:532 g10/exec.c:598
+#: g10/exec.c:521 g10/exec.c:587
 msgid "unnatural exit of external program\n"
 msgstr "sortie non naturelle du programme externe\n"
 
-#: g10/exec.c:547
+#: g10/exec.c:536
 msgid "unable to execute external program\n"
 msgstr "impossible d'ex�cuter le programme externe\n"
 
-#: g10/exec.c:563
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "impossible de lire la r�ponse du programme externe: %s\n"
 
-#: g10/exec.c:609 g10/exec.c:616
+#: g10/exec.c:598 g10/exec.c:605
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr ""
 "AVERTISSEMENT: impossible d'enlever le fichier temporaire\n"
 "(%s) `%s': %s\n"
 
-#: g10/exec.c:621
+#: g10/exec.c:610
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr ""
 "AVERTISSEMENT: impossible d'effacer le r�pertoire temporaire `%s':\n"
 "%s\n"
 
-#: g10/export.c:183
+#: g10/export.c:184
 msgid "exporting secret keys not allowed\n"
 msgstr "il est interdit d'exporter les cl� secr�tes\n"
 
-#: g10/export.c:212
+#: g10/export.c:213
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "cl� %s: non prot�g�e - ignor�e\n"
 
-#: g10/export.c:220
+#: g10/export.c:221
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "cl� %s: cl� de style PGP 2.x - ignor�e\n"
 
-#: g10/export.c:395
+#: g10/export.c:398
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 "AVERTISSEMENT: la cl� secr�te %s n'a pas de somme de contr�le SK\n"
 "simple\n"
 
-#: g10/export.c:427
+#: g10/export.c:430
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENTION: rien n'a �t� export�\n"
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid ""
 "@Commands:\n"
 " "
@@ -940,127 +967,127 @@ msgstr ""
 "@Commandes:\n"
 " "
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "|[file]|make a signature"
 msgstr "|[fichier]|faire une signature"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "|[file]|make a clear text signature"
 msgstr "|[fichier]|faire une signature en texte clair"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "make a detached signature"
 msgstr "faire une signature d�tach�e"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encrypt data"
 msgstr "chiffrer les donn�es"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "encryption only with symmetric cipher"
 msgstr "chiffrement sym�trique seulement"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "decrypt data (default)"
 msgstr "d�chiffrer les donn�es (d�faut)"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "verify a signature"
 msgstr "v�rifier une signature"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys"
 msgstr "lister les cl�s"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and signatures"
 msgstr "lister les cl�s et les signatures"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 msgid "list and check key signatures"
 msgstr "lister et v�rifier les signatures des cl�s"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "list keys and fingerprints"
 msgstr "lister les cl�s et les empreintes"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "list secret keys"
 msgstr "lister les cl�s secr�tes"
 
-#: g10/g10.c:379
+#: g10/g10.c:381
 msgid "generate a new key pair"
 msgstr "g�n�rer une nouvelle paire de cl�s"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the public keyring"
 msgstr "enlever les cl�s du porte-cl�s public"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "remove keys from the secret keyring"
 msgstr "enlever les cl�s du porte-cl�s secret"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign a key"
 msgstr "signer une cl�"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "sign a key locally"
 msgstr "signer une cl� localement"
 
-#: g10/g10.c:385
+#: g10/g10.c:387
 msgid "sign or edit a key"
 msgstr "signer ou �diter une cl�"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "generate a revocation certificate"
 msgstr "g�n�rer un certificat de r�vocation"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "export keys"
 msgstr "exporter les cl�s"
 
-#: g10/g10.c:389
+#: g10/g10.c:391
 msgid "export keys to a key server"
 msgstr "exporter les cl�s vers un serveur de cl�s"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "import keys from a key server"
 msgstr "importer les cl�s d'un serveur de cl�s"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "search for keys on a key server"
 msgstr "chercher les cl�s avec un serveur de cl�s"
 
-#: g10/g10.c:394
+#: g10/g10.c:396
 msgid "update all keys from a keyserver"
 msgstr "mettre � jour les cl�s depuis un serveur"
 
-#: g10/g10.c:397
+#: g10/g10.c:399
 msgid "import/merge keys"
 msgstr "importer/fusionner les cl�s"
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "print the card status"
 msgstr "afficher l'�tat de la carte"
 
-#: g10/g10.c:401
+#: g10/g10.c:403
 msgid "change data on a card"
 msgstr "changer les donn�es d'une carte"
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "change a card's PIN"
 msgstr "changer le code PIN d'une carte"
 
-#: g10/g10.c:410
+#: g10/g10.c:412
 msgid "update the trust database"
 msgstr "mettre la base de confiance � jour"
 
-#: g10/g10.c:417
+#: g10/g10.c:419
 msgid "|algo [files]|print message digests"
 msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
 
-#: g10/g10.c:421 g10/gpgv.c:66
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1070,51 +1097,51 @@ msgstr ""
 "Options:\n"
 " "
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "create ascii armored output"
 msgstr "cr�er une sortie ascii avec armure"
 
-#: g10/g10.c:425
+#: g10/g10.c:427
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: g10/g10.c:436
+#: g10/g10.c:438
 msgid "use this user-id to sign or decrypt"
 msgstr "utiliser ce nom pour signer ou d�chiffrer"
 
-#: g10/g10.c:437
+#: g10/g10.c:439
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|niveau de compression N (0 d�sactive)"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "use canonical text mode"
 msgstr "utiliser le mode texte canonique"
 
-#: g10/g10.c:452
+#: g10/g10.c:458
 msgid "use as output file"
 msgstr "utiliser comme fichier de sortie"
 
-#: g10/g10.c:454 g10/gpgv.c:68
+#: g10/g10.c:460 g10/gpgv.c:73
 msgid "verbose"
 msgstr "bavard"
 
-#: g10/g10.c:465
+#: g10/g10.c:471
 msgid "do not make any changes"
 msgstr "ne rien changer"
 
-#: g10/g10.c:466
+#: g10/g10.c:472
 msgid "prompt before overwriting"
 msgstr "demander avant d'�craser un fichier"
 
-#: g10/g10.c:507
+#: g10/g10.c:513
 msgid "use strict OpenPGP behavior"
 msgstr "utiliser strictement le comportement OpenPGP"
 
-#: g10/g10.c:508
+#: g10/g10.c:514
 msgid "generate PGP 2.x compatible messages"
 msgstr "g�n�rer des messages compatibles avec PGP 2.x"
 
-#: g10/g10.c:536
+#: g10/g10.c:542
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1122,7 +1149,7 @@ msgstr ""
 "@\n"
 "(Voir la page de manuel pour une liste compl�te des commandes et options)\n"
 
-#: g10/g10.c:539
+#: g10/g10.c:545
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1142,17 +1169,17 @@ msgstr ""
 " --list-keys [utilisateur]    montrer les cl�s\n"
 " --fingerprint [utilisateur]  montrer les empreintes\n"
 
-#: g10/g10.c:720 g10/gpgv.c:93
+#: g10/g10.c:724 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Signaler toutes anomalies � <[email protected]> (en anglais)\n"
 "et tout probl�me de traduction � <[email protected]>.\n"
 
-#: g10/g10.c:737
+#: g10/g10.c:741
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: g10/g10.c:740
+#: g10/g10.c:744
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1162,7 +1189,7 @@ msgstr ""
 "signer, v�rifier, chiffrer ou d�chiffrer\n"
 "l'op�ration par d�faut d�pend des donn�es entr�es\n"
 
-#: g10/g10.c:751
+#: g10/g10.c:755
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1170,85 +1197,85 @@ msgstr ""
 "\n"
 "Algorithmes support�s:\n"
 
-#: g10/g10.c:754
+#: g10/g10.c:758
 msgid "Pubkey: "
 msgstr "Cl� publique: "
 
-#: g10/g10.c:760 g10/keyedit.c:2141
+#: g10/g10.c:764 g10/keyedit.c:2248
 msgid "Cipher: "
 msgstr "Chiffrement: "
 
-#: g10/g10.c:766
+#: g10/g10.c:770
 msgid "Hash: "
 msgstr "Hachage: "
 
-#: g10/g10.c:772 g10/keyedit.c:2187
+#: g10/g10.c:776 g10/keyedit.c:2294
 msgid "Compression: "
 msgstr "Compression: "
 
-#: g10/g10.c:855
+#: g10/g10.c:859
 msgid "usage: gpg [options] "
 msgstr "utilisation: gpg [options] "
 
-#: g10/g10.c:1003
+#: g10/g10.c:1007
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/g10.c:1021
+#: g10/g10.c:1025
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "aucun signe = trouv� dans la d�finition du groupe `%s'\n"
 
-#: g10/g10.c:1218
+#: g10/g10.c:1222
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire personnel `%s' est\n"
 "peu s�r\n"
 
-#: g10/g10.c:1221
+#: g10/g10.c:1225
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du fichier de configuration `%s'\n"
 "est peu s�r\n"
 
-#: g10/g10.c:1224
+#: g10/g10.c:1228
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire de l'extension `%s' est peu\n"
 "s�r\n"
 
-#: g10/g10.c:1230
+#: g10/g10.c:1234
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire personnel `%s'\n"
 "sont peu s�res\n"
 
-#: g10/g10.c:1233
+#: g10/g10.c:1237
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du fichier de configuration\n"
 "`%s' sont peu s�res\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1240
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions de l'extension `%s' sont\n"
 "peu s�res\n"
 
-#: g10/g10.c:1242
+#: g10/g10.c:1246
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
 "s�r pour le r�pertoire personnel `%s'\n"
 
-#: g10/g10.c:1245
+#: g10/g10.c:1249
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1256,21 +1283,21 @@ msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
 "s�r pour le fichier de configuration `%s'\n"
 
-#: g10/g10.c:1248
+#: g10/g10.c:1252
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
 "s�r pour l'extension `%s'\n"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1258
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire contenant le\n"
 "r�pertoire personnel `%s' sont peu s�res\n"
 
-#: g10/g10.c:1257
+#: g10/g10.c:1261
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1278,383 +1305,393 @@ msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire contenant le\n"
 "fichier de configuration `%s' sont peu s�res\n"
 
-#: g10/g10.c:1260
+#: g10/g10.c:1264
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire contenant\n"
 "l'extension `%s' sont peu s�res\n"
 
-#: g10/g10.c:1401
+#: g10/g10.c:1405
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "�l�ment de configuration `%s' inconnu\n"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1802
 #, 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/g10.c:1838
+#: g10/g10.c:1844
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTE: pas de fichier d'options par d�faut `%s'\n"
 
-#: g10/g10.c:1842
+#: g10/g10.c:1848
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s': %s\n"
 
-#: g10/g10.c:1849
+#: g10/g10.c:1855
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTE: %s n'est pas pour une utilisation normale !\n"
 
-#: g10/g10.c:2076
+#: g10/g10.c:2082
 #, 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/g10.c:2293
+#: g10/g10.c:2236 g10/g10.c:2248
+#, fuzzy, c-format
+msgid "`%s' is not a valid signature expiration\n"
+msgstr "`%s' n'est pas un jeu de caract�res valide\n"
+
+#: g10/g10.c:2321
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' n'est pas un jeu de caract�res valide\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3683
+#: g10/g10.c:2340 g10/keyedit.c:3862
 msgid "could not parse keyserver URL\n"
 msgstr "impossible d'interpr�ter l'URL du serveur de cl�s\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2346
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: les options du serveur de cl�s sont invalides\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2349
 msgid "invalid keyserver options\n"
 msgstr "les options du serveur de cl�s sont invalides\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2356
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: options d'import invalides\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2359
 msgid "invalid import options\n"
 msgstr "options d'import invalides\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2366
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: options d'export invalides\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2369
 msgid "invalid export options\n"
 msgstr "options d'export invalides\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2376
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: options de liste invalides\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2379
 msgid "invalid list options\n"
 msgstr "options de liste invalides\n"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2401
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: options de v�rification invalides\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2404
 msgid "invalid verify options\n"
 msgstr "options de v�rification invalides\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2411
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossible de mettre le chemin d'ex�cution � %s\n"
 
-#: g10/g10.c:2573
+#: g10/g10.c:2602
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENTION: Le programme peut cr�er un fichier �core� !\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2606
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENTION: %s remplace %s\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2615
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2618
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s !\n"
 
-#: g10/g10.c:2603
+#: g10/g10.c:2625
+#, fuzzy, c-format
+msgid "NOTE: %s is not available in this version\n"
+msgstr "gpg-agent n'est pas disponible dans cette session\n"
+
+#: g10/g10.c:2640
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "�criture d'un bout de cl� secr�te vers `%s'\n"
 
-#: g10/g10.c:2617
+#: g10/g10.c:2654
 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/g10.c:2623
+#: g10/g10.c:2660
 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/g10.c:2629
+#: g10/g10.c:2666
 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/g10.c:2642
+#: g10/g10.c:2679
 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/g10.c:2712 g10/g10.c:2736
+#: g10/g10.c:2746 g10/g10.c:2770
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
 
-#: g10/g10.c:2718 g10/g10.c:2742
+#: g10/g10.c:2752 g10/g10.c:2776
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage s�lectionn�e est invalide\n"
 
-#: g10/g10.c:2724
+#: g10/g10.c:2758
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorithme de compression s�lectionn� est invalide\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2764
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "la fonction de hachage de certification s�lectionn�e est invalide\n"
 
-#: g10/g10.c:2745
+#: g10/g10.c:2779
 msgid "completes-needed must be greater than 0\n"
 msgstr "�completes-needed� doit �tre sup�rieur � 0\n"
 
-#: g10/g10.c:2747
+#: g10/g10.c:2781
 msgid "marginals-needed must be greater than 1\n"
 msgstr "�marginals-needed� doit �tre sup�rieur � 1\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2783
 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/g10.c:2751
+#: g10/g10.c:2785
 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/g10.c:2753
+#: g10/g10.c:2787
 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/g10.c:2756
+#: g10/g10.c:2790
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: le mode S2K simple (0) est fortement d�conseill�\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2794
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K invalide; ce doit �tre 0, 1 ou 3\n"
 
-#: g10/g10.c:2767
+#: g10/g10.c:2801
 msgid "invalid default preferences\n"
 msgstr "pr�f�rences par d�faut invalides\n"
 
-#: g10/g10.c:2776
+#: g10/g10.c:2810
 msgid "invalid personal cipher preferences\n"
 msgstr "pr�f�rences de chiffrement personnelles invalides\n"
 
-#: g10/g10.c:2780
+#: g10/g10.c:2814
 msgid "invalid personal digest preferences\n"
 msgstr "pr�f�rences de hachage personnelles invalides\n"
 
-#: g10/g10.c:2784
+#: g10/g10.c:2818
 msgid "invalid personal compress preferences\n"
 msgstr "pr�f�rences de compression personnelles invalides\n"
 
-#: g10/g10.c:2817
+#: g10/g10.c:2851
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne marche pas encore avec %s\n"
 
-#: g10/g10.c:2864
+#: g10/g10.c:2898
 #, 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/g10.c:2869
+#: g10/g10.c:2903
 #, 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/g10.c:2874
+#: g10/g10.c:2908
 #, 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/g10.c:2970
+#: g10/g10.c:3004
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance: %s\n"
 
-#: g10/g10.c:2981
+#: g10/g10.c:3015
 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/g10.c:2992
+#: g10/g10.c:3026
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/g10.c:2999
+#: g10/g10.c:3033
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3035
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "le chiffrement sym�trique de `%s' a �chou�: %s\n"
 
-#: g10/g10.c:3011
+#: g10/g10.c:3045
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/g10.c:3024
+#: g10/g10.c:3058
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nom du fichier]"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3060
 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/g10.c:3029
+#: g10/g10.c:3063
 #, 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/g10.c:3047
+#: g10/g10.c:3081
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3094
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/g10.c:3075
+#: g10/g10.c:3109
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nom du fichier]"
 
-#: g10/g10.c:3077
+#: g10/g10.c:3111
 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/g10.c:3080
+#: g10/g10.c:3114
 #, 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/g10.c:3100
+#: g10/g10.c:3134
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom du fichier]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3143
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3168
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/g10.c:3142
+#: g10/g10.c:3176
 msgid "--sign-key user-id"
 msgstr "--sign-key utilisateur"
 
-#: g10/g10.c:3146
+#: g10/g10.c:3180
 msgid "--lsign-key user-id"
 msgstr "--lsign-key utilisateur"
 
-#: g10/g10.c:3167
+#: g10/g10.c:3201
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/g10.c:3238
+#: g10/g10.c:3272
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [utilisateur] [porte-cl�s]"
 
-#: g10/g10.c:3275
+#: g10/g10.c:3309
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'envoi vers le serveur de cl�s a �chou�: %s\n"
 
-#: g10/g10.c:3277
+#: g10/g10.c:3311
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la r�ception depuis le serveur de cl�s a �chou�: %s\n"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3313
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'export de la cl� a �chou�: %s\n"
 
-#: g10/g10.c:3290
+#: g10/g10.c:3324
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "la recherche au sein du serveur de cl�s a �chou�: %s\n"
 
-#: g10/g10.c:3300
+#: g10/g10.c:3334
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "le rafra�chissement par le serveur de cl�s a �chou�: %s\n"
 
-#: g10/g10.c:3341
+#: g10/g10.c:3375
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "la suppression d'une armure a �chou�: %s\n"
 
-#: g10/g10.c:3349
+#: g10/g10.c:3383
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "la construction d'une armure a �chou�: %s \n"
 
-#: g10/g10.c:3436
+#: g10/g10.c:3470
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/g10.c:3559
+#: g10/g10.c:3593
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3597
 msgid "Go ahead and type your message ...\n"
 msgstr "Vous pouvez taper votre message...\n"
 
-#: g10/g10.c:3853
+#: g10/g10.c:3887
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1662,81 +1699,86 @@ 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/g10.c:3861
+#: g10/g10.c:3895
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nom de notation utilisateur doit contenir le caract�re '@'\n"
 
-#: g10/g10.c:3871
+#: g10/g10.c:3900
+#, fuzzy
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr "un nom de notation utilisateur doit contenir le caract�re '@'\n"
+
+#: g10/g10.c:3911
 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/g10.c:3905
+#: g10/g10.c:3945
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL de politique de certification donn�e est invalide\n"
 
-#: g10/g10.c:3907
+#: g10/g10.c:3947
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL de politique de signature donn�e est invalide\n"
 
-#: g10/g10.c:3940
+#: g10/g10.c:3980
 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"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "trop d'entr�es dans le cache pk - d�sactiv�\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2750
+#: g10/getkey.c:187 g10/getkey.c:2757
 msgid "[User ID not found]"
 msgstr "[Nom utilisateur introuvable]"
 
-#: g10/getkey.c:1677
+#: g10/getkey.c:1684
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "La cl� invalide %s a �t� rendue valide par\n"
 "--allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2228
+#: g10/getkey.c:2235
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "pas de sous-cl� secr�te pour la cl� publique %s - ignor�e\n"
 
-#: g10/getkey.c:2459
+#: g10/getkey.c:2466
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr ""
 "utilisation de la cl� secondaire %s � la place de la cl�\n"
 "principale %s\n"
 
-#: g10/getkey.c:2506
+#: g10/getkey.c:2513
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "cl� %s: cl� secr�te sans cl� publique - non prise en compte\n"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:74
 msgid "be somewhat more quiet"
 msgstr "devenir beaucoup plus silencieux"
 
-#: g10/gpgv.c:70
+#: g10/gpgv.c:75
 msgid "take the keys from this keyring"
 msgstr "enlever les cl�s de ce porte-cl�s"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:77
 msgid "make timestamp conflicts only a warning"
 msgstr ""
 "faire en sorte que les conflits d'horodatage ne soient qu'un\n"
 "avertissement non fatal"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:78
 msgid "|FD|write status info to this FD"
 msgstr "|FD|�crire l'�tat sur ce descripteur"
 
-#: g10/gpgv.c:97
+#: g10/gpgv.c:102
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Utilisation: gpgv [options] [fichiers] (-h pour l'aide)"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:105
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1744,7 +1786,7 @@ msgstr ""
 "Syntaxe: gpg [options] [fichiers]\n"
 "Verifier des signatures avec des cl�s de confiance connues\n"
 
-#: g10/helptext.c:48
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1755,7 +1797,7 @@ msgstr ""
 "de confiance (web-of-trust); cela n'a rien � voir avec le r�seau des\n"
 "certificats (cr�� implicitement)"
 
-#: g10/helptext.c:54
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1767,18 +1809,18 @@ msgstr ""
 "en g�n�ral les cl�s dont vous avez acc�s � la cl� secr�te. R�pondez\n"
 "\"oui\" pour indiquer que votre confiance en cette cl� est ultime\n"
 
-#: g10/helptext.c:61
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "Si vous voulez utiliser cette cl� peu s�re quand-m�me, r�pondez �oui�."
 
-#: g10/helptext.c:65
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr ""
 "Entrez le nom d'utilisateur de la personne � qui vous voulez envoyer\n"
 "le message."
 
-#: g10/helptext.c:69
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1803,7 +1845,7 @@ msgstr ""
 "La premi�re cl� (cl� principale) doit toujours �tre une cl� capable\n"
 "de signer."
 
-#: g10/helptext.c:83
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -1814,16 +1856,16 @@ msgstr ""
 "pour certains domaines.\n"
 "Consultez votre expert en s�curit� d'abord."
 
-#: g10/helptext.c:90
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "Entrez la taille de la cl�"
 
-#: g10/helptext.c:94 g10/helptext.c:99 g10/helptext.c:111 g10/helptext.c:143
-#: g10/helptext.c:171 g10/helptext.c:176 g10/helptext.c:181
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "R�pondez �oui� ou �non�"
 
-#: g10/helptext.c:104
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1835,19 +1877,19 @@ msgstr ""
 "mauvais - le syst�me essaierait d'interpr�ter la valeur donn�e comme un\n"
 "intervalle."
 
-#: g10/helptext.c:116
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "Entrez le nom du propri�taire de la cl�"
 
-#: g10/helptext.c:121
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr "entrez une adresse e-mail optionnelle mais hautement recommand�e"
 
-#: g10/helptext.c:125
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "Entrez un commentaire optionnel"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1861,11 +1903,11 @@ msgstr ""
 "O pour continuer � g�n�rer la cl�.\n"
 "Q pour arr�ter de g�n�rer de cl�."
 
-#: g10/helptext.c:139
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "R�pondez �oui� (ou simplement �o�) pour g�n�rer la sous-cl�"
 
-#: g10/helptext.c:147
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -1932,11 +1974,11 @@ msgstr ""
 "\n"
 "Si vous ne savez pas quelle r�ponse est la bonne, r�pondez \"0\"."
 
-#: g10/helptext.c:185
+#: g10/helptext.c:186
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "R�pondez �oui� si vous voulez signer TOUS les noms d'utilisateurs"
 
-#: g10/helptext.c:189
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -1944,11 +1986,11 @@ msgstr ""
 "R�pondez �oui� si vous voulez vraiment supprimer ce nom\n"
 "d'utilisateur. Tous les certificats seront alors perdus en m�me temps !"
 
-#: g10/helptext.c:194
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "R�pondez �oui� s'il faut vraiment supprimer la sous-cl�"
 
-#: g10/helptext.c:199
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -1959,7 +2001,7 @@ msgstr ""
 "�tablir une connection de confiance vers la cl� ou une autre cl� certifi�e\n"
 "par celle-l�."
 
-#: g10/helptext.c:204
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -1971,7 +2013,7 @@ msgstr ""
 "vous soyez s�r de quelle cl� a �t� utilis�e car cette cl� de signature\n"
 "peut �tablir une connection de confiance vers une autre cl� d�j� certifi�e."
 
-#: g10/helptext.c:210
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -1979,7 +2021,7 @@ msgstr ""
 "Cette signature n'est pas valide. Vous devriez la supprimer de votre\n"
 "porte-cl�s."
 
-#: g10/helptext.c:214
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -1993,7 +2035,7 @@ msgstr ""
 "cette auto-signature est invalide pour une certaine raison et si une autre\n"
 "est disponible."
 
-#: g10/helptext.c:222
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2003,24 +2045,24 @@ msgstr ""
 "ceux qui sont s�lectionn�s) vers la liste actuelle. La date de toutes\n"
 "les auto-signatures affect�es seront avanc�es d'une seconde.\n"
 
-#: g10/helptext.c:229
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Entrez le mot de passe ; c'est une phrase secr�te \n"
 
-#: g10/helptext.c:235
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "R�p�tez le dernier mot de passe pour �tre s�r de ce que vous avez tap�."
 
-#: g10/helptext.c:239
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "Donnez le nom du fichier auquel la signature se rapporte"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "R�pondez �oui� s'il faut vraiment r��crire le fichier"
 
-#: g10/helptext.c:249
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2028,7 +2070,7 @@ msgstr ""
 "Entrez le nouveau nom de fichier. Si vous tapez simplement ENTR�E le\n"
 "fichier par d�faut (indiqu� entre crochets) sera utilis�."
 
-#: g10/helptext.c:255
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2057,7 +2099,7 @@ msgstr ""
 "      utilis�. Cela sert g�n�ralement � indiquer qu'une adresse e-mail\n"
 "      est invalide.\n"
 
-#: g10/helptext.c:271
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2067,480 +2109,485 @@ msgstr ""
 "avez �mis ce certificat de r�vocation. Essayez de garder ce texte concis.\n"
 "Une ligne vide d�limite la fin du texte.\n"
 
-#: g10/helptext.c:286
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "Pas d'aide disponible"
 
-#: g10/helptext.c:294
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Pas d'aide disponible pour `%s'"
 
-#: g10/import.c:247
+#: g10/import.c:248
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "un bloc de type %d a �t� ignor�\n"
 
-#: g10/import.c:256
+#: g10/import.c:257
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu cl�s trait�es jusqu'ici\n"
 
-#: g10/import.c:273
+#: g10/import.c:274
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "       Quantit� totale trait�e: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "       nouvelles cl�s ignor�es: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:279
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "        sans nom d'utilisateur: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "              imported: %lu"
 msgstr "                      import�e: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:287
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                     inchang�e: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "  nouveaux noms d'utilisateurs: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nouvelles sous-cl�s: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "          nouvelles signatures: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr " nouvelles r�vocations de cl�s: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "            cl�s secr�tes lues: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "       cl�s secr�tes import�es: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "      cl�s secr�tes inchang�es: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "                  non import�e: %lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:544
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr "AVERTISSEMENT: la cl� %s contient des pr�ferences pour des\n"
 
-#: g10/import.c:545
+#: g10/import.c:546
 msgid "algorithms on these user IDs:\n"
 msgstr "algorithmes indisponibles sur ces noms d'utilisateurs:\n"
 
-#: g10/import.c:582
+#: g10/import.c:583
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         � %s �: pr�f�rence pour l'algorithme de chiffrement %s\n"
 
-#: g10/import.c:594
+#: g10/import.c:595
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         � %s �: pr�f�rence pour l'algorithme de hachage %s\n"
 
-#: g10/import.c:606
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         � %s �: pr�f�rence pour l'algorithme de compression %s\n"
 
-#: g10/import.c:619
+#: g10/import.c:620
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "il est fortement sugg�r� de mettre � jour vos pr�f�rences et\n"
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "redistribuer cette cl� pour �viter les probl�mes potentiels qui seraient\n"
 "caus�s par des algorithmes non appropri�s\n"
 
-#: g10/import.c:645
+#: g10/import.c:646
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "vous pouvez mettre � jour vos pr�f�rences avec: \n"
 "gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:694 g10/import.c:1048
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "cl� %s: pas de nom d'utilisateur\n"
 
-#: g10/import.c:713
+#: g10/import.c:714
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "cl� %s: corruption de sous-cl� PKS r�par�e\n"
 
-#: g10/import.c:728
+#: g10/import.c:729
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "cl� %s: nom d'utilisateur non auto-sign� accept� � %s �\n"
 
-#: g10/import.c:734
+#: g10/import.c:735
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "cl� %s: pas de nom d'utilisateur valide\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 msgid "this may be caused by a missing self-signature\n"
 msgstr "cela peut provenir d'une auto-signature manquante\n"
 
-#: g10/import.c:746 g10/import.c:1168
+#: g10/import.c:747 g10/import.c:1169
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "cl� %s: cl� publique non trouv�e: %s\n"
 
-#: g10/import.c:752
+#: g10/import.c:753
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "cl� %s: nouvelle cl� - ignor�e\n"
 
-#: g10/import.c:761
+#: g10/import.c:762
 #, c-format
 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:766 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�criture de `%s'\n"
 
-#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
-#: g10/import.c:2314 g10/import.c:2336
+#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
+#: g10/import.c:2315 g10/import.c:2337
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
 
-#: g10/import.c:791
+#: g10/import.c:792
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "cl� %s: cl� publique � %s � import�e\n"
 
-#: g10/import.c:815
+#: g10/import.c:816
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "cl� %s: ne ressemble pas � notre copie\n"
 
-#: g10/import.c:832 g10/import.c:1186
+#: g10/import.c:833 g10/import.c:1187
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "cl� %s: impossible de trouver le bloc de cl�s original: %s\n"
 
-#: g10/import.c:840 g10/import.c:1193
+#: g10/import.c:841 g10/import.c:1194
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "cl� %s: impossible de lire le bloc de cl�s original: %s\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "cl� %s: � %s � un nouvel utilisateur\n"
 
-#: g10/import.c:875
+#: g10/import.c:876
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "cl� %s: � %s � %d nouveaux utilisateurs\n"
 
-#: g10/import.c:878
+#: g10/import.c:879
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "cl� %s: � %s � une nouvelle signature\n"
 
-#: g10/import.c:881
+#: g10/import.c:882
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "cl� %s: � %s � %d nouvelles signatures\n"
 
-#: g10/import.c:884
+#: g10/import.c:885
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "cl� %s: � %s � une nouvelle sous-cl�\n"
 
-#: g10/import.c:887
+#: g10/import.c:888
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "cl� %s: � %s � %d nouvelles sous-cl�s\n"
 
-#: g10/import.c:908
+#: g10/import.c:909
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "cl� %s: � %s � n'a pas chang�\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1054
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "cl� %s: cl� secr�te avec le chiffrement invalide %d - non prise\n"
 "en compte\n"
 
-#: g10/import.c:1064
+#: g10/import.c:1065
 msgid "importing secret keys not allowed\n"
 msgstr "il est interdit d'importer les cl� secr�tes\n"
 
-#: g10/import.c:1081 g10/import.c:2329
+#: g10/import.c:1082 g10/import.c:2330
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "pas de porte-cl�s par d�faut: %s\n"
 
-#: g10/import.c:1092
+#: g10/import.c:1093
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "cl� %s: cl� secr�te import�e\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1122
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "cl� %s: d�j� dans le porte-cl�s secret\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1132
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "cl� %s: cl� secr�te non trouv�e: %s\n"
 
-#: g10/import.c:1161
+#: g10/import.c:1162
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "cl� %s: pas de cl� publique - le certificat de r�vocation ne peut\n"
 "�tre appliqu�\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1205
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "cl� %s: certificat de r�vocation invalide: %s - rejet�\n"
 
-#: g10/import.c:1236
+#: g10/import.c:1237
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "cl� %s: � %s � certificat de r�vocation import�\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1302
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "cl� %s: pas de nom d'utilisateur pour la signature\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1317
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "cl� %s: algorithme de cl� publique non support� avec le nom\n"
 "d'utilisateur � %s �\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "cl� %s: auto-signature du nom d'utilisateur � %s � invalide\n"
 
-#: g10/import.c:1336
+#: g10/import.c:1337
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "cl� %s: pas de sous-cl� pour relier la cl�\n"
 
-#: g10/import.c:1347 g10/import.c:1397
+#: g10/import.c:1348 g10/import.c:1398
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "cl� %s: algorithme de cl� publique non support�\n"
 
-#: g10/import.c:1349
+#: g10/import.c:1350
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "cl� %s: liaison avec la sous-cl� invalide\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1365
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "cl� %s: supression de liaisons multiples avec des sous-cl�s\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "cl� %s: pas de sous-cl� pour r�voquer la cl�\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "cl� %s: r�vocation de sous-cl� invalide\n"
 
-#: g10/import.c:1414
+#: g10/import.c:1415
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "cl� %s: suppression de la r�vocation de sous-cl�s multiples\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1457
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "cl� %s: nom d'utilisateur � %s � non pris en compte\n"
 
-#: g10/import.c:1477
+#: g10/import.c:1478
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "cl� %s: sous-cl� non prise en compte\n"
 
-#: g10/import.c:1504
+#: g10/import.c:1505
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "cl� %s: signature non exportable (classe 0x%02X) - ignor�e\n"
 
-#: g10/import.c:1514
+#: g10/import.c:1515
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "cl� %s: certificat de r�vocation au mauvais endroit - ignor�e\n"
 
-#: g10/import.c:1531
+#: g10/import.c:1532
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "cl� %s: certificat de r�vocation invalide: %s - ignor�e\n"
 
-#: g10/import.c:1545
+#: g10/import.c:1546
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "cl� %s: signature de sous-cl� au mauvais endroit - ignor�e\n"
 
-#: g10/import.c:1553
+#: g10/import.c:1554
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "cl� %s: classe de signature non attendue (0x%02X) - ignor�e\n"
 
-#: g10/import.c:1574
+#: g10/import.c:1575
 #, fuzzy, c-format
 msgid "key %s: expired signature from key %s - skipped\n"
 msgstr "cl� %s: classe de signature non attendue (0x%02X) - ignor�e\n"
 
-#: g10/import.c:1677
+#: g10/import.c:1678
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "cl� %s: nom d'utilisateur en double d�tect� - fusion accomplie\n"
 
-#: g10/import.c:1739
+#: g10/import.c:1740
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVERTISSEMENT: la cl� %s est peut-�tre r�voqu�e: recherche de\n"
 "la cl� de r�vocation %s\n"
 
-#: g10/import.c:1753
+#: g10/import.c:1754
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVERTISSEMENT: la cl� %s est peut-�tre r�voqu�e: la cl� de\n"
 "r�vocation %s est absente.\n"
 
-#: g10/import.c:1812
+#: g10/import.c:1813
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "cl� %s: certificat de r�vocation � %s � ajout�\n"
 
-#: g10/import.c:1846
+#: g10/import.c:1847
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "cl� %s: ajout de la signature de cl� directe\n"
 
-#: g10/import.c:2235
+#: g10/import.c:2236
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "la cl� publique ne correspond pas � la cl� secr�te !\n"
 
-#: g10/import.c:2243
+#: g10/import.c:2244
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "la cl� secr�te est d�j� stock�e sur une carte\n"
 
-#: g10/import.c:2245
+#: g10/import.c:2246
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "la cl� secr�te est d�j� stock�e sur une carte\n"
 
-#: g10/keydb.c:167
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "erreur durant la cr�ation du porte-cl�s `%s' : %s\n"
 
-#: g10/keydb.c:174
+#: g10/keydb.c:175
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "le porte-cl�s `%s` a �t� cr��\n"
 
-#: g10/keydb.c:685
+#: g10/keydb.c:316 g10/keydb.c:319
+#, fuzzy, c-format
+msgid "keyblock resource `%s': %s\n"
+msgstr "erreur pendant la cr�ation de `%s': %s\n"
+
+#: g10/keydb.c:698
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "la reconstruction du cache de porte-cl�s a �chou� : %s\n"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[r�vocation]"
 
-#: g10/keyedit.c:255
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[auto-signature]"
 
-#: g10/keyedit.c:333 g10/keylist.c:405
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "une mauvaise signature\n"
 
-#: g10/keyedit.c:335 g10/keylist.c:407
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d mauvaises signatures\n"
 
-#: g10/keyedit.c:337 g10/keylist.c:409
+#: g10/keyedit.c:344 g10/keylist.c:410
 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:339 g10/keylist.c:411
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, 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:341 g10/keylist.c:413
+#: g10/keyedit.c:348 g10/keylist.c:414
 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:343 g10/keylist.c:415
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, 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:345
+#: g10/keyedit.c:352
 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:347
+#: g10/keyedit.c:354
 #, 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:403 g10/pkclist.c:262
+#: g10/keyedit.c:410 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2552,17 +2599,17 @@ msgstr ""
 "v�rifier son passeport, v�rifier les empreintes de plusieurs sources\n"
 "diff�rentes, etc.)\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:274
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = je crois marginalement\n"
 
-#: g10/keyedit.c:408 g10/pkclist.c:276
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = je fais enti�rement confiance\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:434
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2572,38 +2619,48 @@ 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:443
+#: g10/keyedit.c:450
 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:585
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Le nom d'utilisateur \"%s\" est r�voqu�."
 
-#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
-#: g10/keyedit.c:858 g10/keyedit.c:1642
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1728
 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:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
-#: g10/keyedit.c:1648
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
+#: g10/keyedit.c:1734
 msgid "  Unable to sign.\n"
 msgstr "  Impossible de signer.\n"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Le nom d'utilisateur \"%s\" est expir�."
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:650
 #, 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:676
+#: g10/keyedit.c:678
+#, fuzzy, c-format
+msgid "User ID \"%s\" is signable.  "
+msgstr "Le nom d'utilisateur \"%s\" ne comporte pas d'auto-signature."
+
+#: g10/keyedit.c:680
+#, fuzzy
+msgid "Sign it? (y/N) "
+msgstr "Signer r�ellement ? (o/N) "
+
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2612,11 +2669,11 @@ msgstr ""
 "L'auto-signature de \"%s\"\n"
 "est de style PGP 2.x.\n"
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:711
 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:699
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2625,13 +2682,13 @@ msgstr ""
 "Votre signature actuelle de \"%s\"\n"
 "a expir�.\n"
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:729
 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:724
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2640,43 +2697,43 @@ msgstr ""
 "Votre signature actuelle de \"%s\"\n"
 "est locale.\n"
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:754
 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:749
+#: g10/keyedit.c:775
 #, 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:752
+#: g10/keyedit.c:778
 #, 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:757
+#: g10/keyedit.c:783
 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:779
+#: g10/keyedit.c:805
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Rien � signer avec la cl� %s\n"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "Cette cl� a expir� !"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Cette cl� va expirer le %s.\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:844
 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:851
+#: g10/keyedit.c:882
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2684,11 +2741,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:853
+#: g10/keyedit.c:884
 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:878
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2698,32 +2755,32 @@ msgstr ""
 "appartient r�ellement � la personne sus-nomm�e ? Si vous ne savez\n"
 "quoi r�pondre, entrez \"0\".\n"
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Je ne r�pondrai pas.%s\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:916
 #, 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:887
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) J'ai un peu v�rifi�.%s\n"
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:920
 #, 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:895
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Votre s�lection ? (entrer '?' pour plus d'informations): "
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:950
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2732,89 +2789,89 @@ msgstr ""
 "Etes-vous vraiment s�r(e) que vous voulez signer cette cl�\n"
 "avec votre cl� � %s � (%s)\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:957
 msgid "This will be a self-signature.\n"
 msgstr "Ceci sera une auto-signature.\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:963
 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:940
+#: g10/keyedit.c:971
 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:950
+#: g10/keyedit.c:981
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "La signature sera marqu�e comme non-exportable.\n"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:988
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "La signature sera marqu�e comme non-r�vocable.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:995
 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:969
+#: g10/keyedit.c:1000
 msgid "I have checked this key casually.\n"
 msgstr "J'ai un peu v�rifi� cette cl�.\n"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1005
 msgid "I have checked this key very carefully.\n"
 msgstr "J'ai v�rifi� cette cl� avec grand soin.\n"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1015
 msgid "Really sign? (y/N) "
 msgstr "Signer r�ellement ? (o/N) "
 
-#: g10/keyedit.c:1029 g10/keyedit.c:4132 g10/keyedit.c:4223 g10/keyedit.c:4287
-#: g10/keyedit.c:4348 g10/sign.c:369
+#: g10/keyedit.c:1060 g10/keyedit.c:4350 g10/keyedit.c:4441 g10/keyedit.c:4505
+#: g10/keyedit.c:4566 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "la signature a �chou�: %s\n"
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1105 g10/keygen.c:3057
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "Cette cl� n'est pas prot�g�e.\n"
 
-#: g10/keyedit.c:1109 g10/keygen.c:3045
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 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:1113 g10/keygen.c:3060
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Les parties secr�tes de la cl� principale ne sont pas disponibles.\n"
 
-#: g10/keyedit.c:1117 g10/keygen.c:3064
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "La cl� est prot�g�e.\n"
 
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossible d'�diter cette cl�: %s\n"
 
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr "Entrez le nouveau mot de passe pour cette cl� secr�te.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:1825
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "le mot de passe n'a pas �t� correctement r�p�t� ; recommencez."
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2823,197 +2880,197 @@ msgstr ""
 "*mauvaise* id�e\n"
 "\n"
 
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1195
 msgid "Do you really want to do this? (y/N) "
 msgstr "Voulez-vous vraiment faire cela ? (o/N) "
 
-#: g10/keyedit.c:1235
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "replacer la signature d'une cl� � l'endroit correct\n"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "enregistrer et quitter"
 
-#: g10/keyedit.c:1322
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "afficher l'empreinte"
 
-#: g10/keyedit.c:1323
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "lister la cl� et les noms d'utilisateurs"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "s�lectionner le nom d'utilisateur N"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "s�lectionner le nom d'utilisateur N"
 
-#: g10/keyedit.c:1327
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "r�voquer les signatures"
 
-#: g10/keyedit.c:1330
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1335
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "signer la cl� localement"
 
-#: g10/keyedit.c:1337
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Aide: S�lectionner les utilisateurs � signer\n"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1343
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "ajouter un utilisateur"
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "ajouter une photo d'identit�"
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "enlever un utilisateur"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "add a subkey"
 msgstr "aj.cl�"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr "ajouter une cl� � une carte � puce"
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr "d�placer une cl� vers une carte � puce"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1392
 #, fuzzy
 msgid "move a backup key to a smartcard"
 msgstr "d�placer une cl� vers une carte � puce"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "enlever une cl� secondaire"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr "ajouter une cl� de r�vocation"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "Mettre � jour r�ellement les pr�f�rences des noms d'utilisateurs\n"
 "s�lectionn�s ? (o/N) "
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Vous ne pouvez pas changer la date d'expiration d'une cl� v3\n"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "marquer le nom d'utilisateur comme principal"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "passer de la liste des cl�s secr�tes aux cl�s priv�es et inversement"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "lister les pr�f�rences (expert)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "lister les pr�f�rences (bavard)"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "Mettre � jour r�ellement les pr�f�rences des noms d'utilisateurs\n"
 "s�lectionn�s ? (o/N) "
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1418
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "indiquer l'URL du serveur de cl�s pr�f�r�"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "changer le mot de passe"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "changer la confiance"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1426
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "R�voquer r�ellement tous les noms d'utilisateurs s�lectionn�s ? (o/N) "
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "r�voquer un nom d'utilisateur"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "r�voquer une cl� secondaire"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "enable key"
 msgstr "activer une cl�"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "disable key"
 msgstr "d�sactiver une cl�"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1436
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "montrer la photo d'identit�"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1556
 #, 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:1494
+#: g10/keyedit.c:1574
 msgid "Secret key is available.\n"
 msgstr "La cl� secr�te est disponible.\n"
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1655
 msgid "Need the secret key to do this.\n"
 msgstr "Il faut la cl� secr�te pour faire cela.\n"
 
-#: g10/keyedit.c:1579
+#: g10/keyedit.c:1663
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Utilisez la commande �toggle� d'abord.\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1682
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3021,227 +3078,232 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1722
 msgid "Key is revoked."
 msgstr "La cl� est r�voqu�e."
 
-#: g10/keyedit.c:1657
+#: g10/keyedit.c:1741
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Signer vraiment tous les nom d'utilisateurs ? (o/N) "
 
-#: g10/keyedit.c:1660
-msgid "Hint: Select the user IDs to sign\n"
-msgstr "Aide: S�lectionner les utilisateurs � signer\n"
-
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1748
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "classe de signature inconnue"
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1771
 #, 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:1713 g10/keyedit.c:1733 g10/keyedit.c:1899
+#: g10/keyedit.c:1793 g10/keyedit.c:1813 g10/keyedit.c:1979
 msgid "You must select at least one user ID.\n"
 msgstr "Vous devez s�lectionner au moins un utilisateur.\n"
 
-#: g10/keyedit.c:1715
+#: g10/keyedit.c:1795
 msgid "You can't delete the last user ID!\n"
 msgstr "Vous ne pouvez pas supprimer le dernier utilisateur !\n"
 
-#: g10/keyedit.c:1717
+#: g10/keyedit.c:1797
 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:1718
+#: g10/keyedit.c:1798
 msgid "Really remove this user ID? (y/N) "
 msgstr "Enlever r�ellement ce nom d'utilisateur ? (o/N) "
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1848
 msgid "Really move the primary key? (y/N) "
 msgstr "Enlever r�ellement la cl� principale ? (o/N) "
 
-#: g10/keyedit.c:1780
+#: g10/keyedit.c:1860
 msgid "You must select exactly one key.\n"
 msgstr "Vous devez s�lectionner exactement une cl�.\n"
 
-#: g10/keyedit.c:1808
+#: g10/keyedit.c:1888
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1822
+#: g10/keyedit.c:1902
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "impossible d'ouvrir `%s': %s\n"
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1919
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "erreur durant la cr�ation du porte-cl�s `%s' : %s\n"
 
-#: g10/keyedit.c:1863
+#: g10/keyedit.c:1943
 msgid "You must select at least one key.\n"
 msgstr "Vous devez s�lectionner au moins une cl�.\n"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1946
 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:1867
+#: g10/keyedit.c:1947
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Voulez-vous vraiment supprimer cette cl� ? (o/N) "
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1982
 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:1903
+#: g10/keyedit.c:1983
 msgid "Really revoke this user ID? (y/N) "
 msgstr "R�voquer r�ellement ce nom d'utilisateur ? (o/N) "
 
-#: g10/keyedit.c:1921
+#: g10/keyedit.c:2001
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Voulez-vous vraiment r�voquer cette cl� ? (o/N) "
 
-#: g10/keyedit.c:1932
+#: g10/keyedit.c:2012
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Voulez-vous vraiment r�voquer les cl�s s�lectionn�es ? (o/N) "
 
-#: g10/keyedit.c:1934
+#: g10/keyedit.c:2014
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Voulez-vous vraiment r�voquer cette cl� ? (o/N) "
 
-#: g10/keyedit.c:1975
+#: g10/keyedit.c:2055
 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:2007
+#: g10/keyedit.c:2087
 msgid "Set preference list to:\n"
 msgstr "Changer la liste de pr�f�rences en :\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2093
 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:2015
+#: g10/keyedit.c:2095
 msgid "Really update the preferences? (y/N) "
 msgstr "Faut-il vraiment mettre � jour les pr�f�rences ? (o/N) "
 
-#: g10/keyedit.c:2065
+#: g10/keyedit.c:2157
+#, fuzzy, c-format
+msgid "Unable to clean `%s'\n"
+msgstr "impossible d'ex�cuter le programme `%s': %s\n"
+
+#: g10/keyedit.c:2160
+msgid "Please specify item to clean: `sigs', `uids', or `all'\n"
+msgstr ""
+
+#: g10/keyedit.c:2171
 msgid "Save changes? (y/N) "
 msgstr "Enregistrer les changements? (o/N) "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2174
 msgid "Quit without saving? (y/N) "
 msgstr "Quitter sans enregistrer ? (o/N) "
 
-#: g10/keyedit.c:2078
+#: g10/keyedit.c:2184
 #, c-format
 msgid "update failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2191
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "la mise � jour de la cl� secr�te a �chou�: %s\n"
 
-#: g10/keyedit.c:2092
+#: g10/keyedit.c:2198
 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:2164
+#: g10/keyedit.c:2271
 msgid "Digest: "
 msgstr "Hachage: "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2323
 msgid "Features: "
 msgstr "Fonctions: "
 
-#: g10/keyedit.c:2227
+#: g10/keyedit.c:2334
 msgid "Keyserver no-modify"
 msgstr "Serveur de cl�s: pas-de-modification"
 
-#: g10/keyedit.c:2242 g10/keylist.c:307
+#: g10/keyedit.c:2349 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "Serveur de cl�s pr�f�r�: "
 
-#: g10/keyedit.c:2473
+#: g10/keyedit.c:2580
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Cette cl� peut �tre r�voqu�e par la cl� %s %s"
 
-#: g10/keyedit.c:2494
+#: g10/keyedit.c:2601
 #, 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:2500
+#: g10/keyedit.c:2607
 msgid "(sensitive)"
 msgstr "(sensible)"
 
-#: g10/keyedit.c:2516 g10/keyedit.c:2572 g10/keyedit.c:2684 g10/keyedit.c:2699
-#: g10/keylist.c:193 g10/keyserver.c:422
+#: g10/keyedit.c:2623 g10/keyedit.c:2679 g10/keyedit.c:2792 g10/keyedit.c:2807
+#: g10/keylist.c:194 g10/keyserver.c:421
 #, c-format
 msgid "created: %s"
 msgstr "cr��: %s"
 
-#: g10/keyedit.c:2519 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:931
+#: g10/keyedit.c:2626 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:948
 #, c-format
 msgid "revoked: %s"
 msgstr "revoqu�: %s"
 
-#: g10/keyedit.c:2521 g10/keylist.c:757 g10/keylist.c:886
+#: g10/keyedit.c:2628 g10/keylist.c:758 g10/keylist.c:887
 #, c-format
 msgid "expired: %s"
 msgstr "expir�: %s"
 
-#: g10/keyedit.c:2523 g10/keyedit.c:2574 g10/keyedit.c:2686 g10/keyedit.c:2701
-#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
-#: g10/keylist.c:913 g10/keyserver.c:428 g10/mainproc.c:937
+#: g10/keyedit.c:2630 g10/keyedit.c:2681 g10/keyedit.c:2794 g10/keyedit.c:2809
+#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
+#: g10/keylist.c:914 g10/keyserver.c:427 g10/mainproc.c:954
 #, c-format
 msgid "expires: %s"
 msgstr "expire: %s"
 
-#: g10/keyedit.c:2525
+#: g10/keyedit.c:2632
 #, c-format
 msgid "usage: %s"
 msgstr "utilisation: %s"
 
-#: g10/keyedit.c:2540
+#: g10/keyedit.c:2647
 #, c-format
 msgid "trust: %s"
 msgstr " confiance: %s"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2651
 #, c-format
 msgid "validity: %s"
 msgstr "validit�: %s"
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2658
 msgid "This key has been disabled"
 msgstr "Cette cl� a �t� d�sactiv�e"
 
-#: g10/keyedit.c:2579 g10/keylist.c:199
+#: g10/keyedit.c:2686 g10/keylist.c:200
 msgid "card-no: "
 msgstr "n� de carte: "
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2754
 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:2654
+#: g10/keyedit.c:2762
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3249,17 +3311,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:2718 g10/keyserver.c:432 g10/mainproc.c:1577
-#: g10/trustdb.c:1178
+#: g10/keyedit.c:2826 g10/keyedit.c:3201 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1690
 msgid "revoked"
 msgstr "revoqu�e"
 
-#: g10/keyedit.c:2720 g10/keyserver.c:436 g10/mainproc.c:1579
-#: g10/trustdb.c:531
+#: g10/keyedit.c:2828 g10/keyedit.c:3203 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1692
 msgid "expired"
 msgstr "expir�e"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2893
 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"
@@ -3268,7 +3330,7 @@ msgstr ""
 "Cette commande risque de rendre un autre nom d'utilisateur principal\n"
 "par d�faut.\n"
 
-#: g10/keyedit.c:2845
+#: g10/keyedit.c:2953
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3278,46 +3340,76 @@ msgstr ""
 "d'identit� peut emp�cher certaines versions de PGP d'accepter\n"
 "cette cl�\n"
 
-#: g10/keyedit.c:2850 g10/keyedit.c:3128
+#: g10/keyedit.c:2958 g10/keyedit.c:3307
 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:2856
+#: g10/keyedit.c:2964
 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:2996
+#: g10/keyedit.c:3104
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Supprimer cette bonne signature ? (o/N/q)"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3114
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Supprimer cette signature invalide ? (o/N/q)"
 
-#: g10/keyedit.c:3010
+#: g10/keyedit.c:3118
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Supprimer cette signature inconnue ? (o/N/q)"
 
-#: g10/keyedit.c:3016
+#: g10/keyedit.c:3124
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Faut-il vraiment supprimer cette auto-signature ? (o/N)"
 
-#: g10/keyedit.c:3030
+#: g10/keyedit.c:3138
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d signature supprim�e.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3139
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d signatures supprim�es\n"
 
-#: g10/keyedit.c:3034
+#: g10/keyedit.c:3142
 msgid "Nothing deleted.\n"
 msgstr "Rien n'a �t� supprim�.\n"
 
-#: g10/keyedit.c:3123
+#: g10/keyedit.c:3167
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed.\n"
+msgstr "Le nom d'utilisateur \"%s\" est r�voqu�."
+
+#: g10/keyedit.c:3168
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed.\n"
+msgstr "Le nom d'utilisateur \"%s\" est r�voqu�."
+
+#: g10/keyedit.c:3173
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean.\n"
+msgstr "Le nom d'utilisateur \"%s\" est d�j� r�voqu�.\n"
+
+#: g10/keyedit.c:3205 g10/trustdb.c:1694
+#, fuzzy
+msgid "invalid"
+msgstr "armure invalide"
+
+#: g10/keyedit.c:3207
+#, fuzzy, c-format
+msgid "User ID \"%s\" removed: %s\n"
+msgstr "Le nom d'utilisateur \"%s\" est r�voqu�."
+
+#: g10/keyedit.c:3214
+#, fuzzy
+msgid "No user IDs are removable.\n"
+msgstr "Le nom d'utilisateur \"%s\" est d�j� r�voqu�.\n"
+
+#: g10/keyedit.c:3302
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3327,345 +3419,350 @@ msgstr ""
 "d�sign� peut emp�cher certaines versions de PGP d'accepter\n"
 "cette cl�.\n"
 
-#: g10/keyedit.c:3134
+#: g10/keyedit.c:3313
 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:3154
+#: g10/keyedit.c:3333
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Entrez le nom d'utilisateur du r�vocateur d�sign�: "
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3356
 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:3192
+#: g10/keyedit.c:3371
 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:3214
+#: g10/keyedit.c:3393
 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:3233
+#: g10/keyedit.c:3412
 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:3239
+#: g10/keyedit.c:3418
 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:3300
+#: g10/keyedit.c:3479
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Enlevez les s�lections des cl�s secr�tes.\n"
 
-#: g10/keyedit.c:3306
+#: g10/keyedit.c:3485
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Vous devez s�lectionner au plus une cl� secondaire.\n"
 
-#: g10/keyedit.c:3310
+#: g10/keyedit.c:3489
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Changer la date d'expiration d'une cl� secondaire.\n"
 
-#: g10/keyedit.c:3313
+#: g10/keyedit.c:3492
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changer la date d'expiration de la cl� principale.\n"
 
-#: g10/keyedit.c:3359
+#: g10/keyedit.c:3538
 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:3375
+#: g10/keyedit.c:3554
 msgid "No corresponding signature in secret ring\n"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/keyedit.c:3455
+#: g10/keyedit.c:3634
 msgid "Please select exactly one user ID.\n"
 msgstr "Vous devez s�lectionner exactement un utilisateur.\n"
 
-#: g10/keyedit.c:3494 g10/keyedit.c:3604 g10/keyedit.c:3724
+#: g10/keyedit.c:3673 g10/keyedit.c:3783 g10/keyedit.c:3903
 #, 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:3665
+#: g10/keyedit.c:3844
 msgid "Enter your preferred keyserver URL: "
 msgstr "Entrez l'URL de votre serveur de cl�s favori: "
 
-#: g10/keyedit.c:3745
+#: g10/keyedit.c:3924
 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:3746
+#: g10/keyedit.c:3925
 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:3808
+#: g10/keyedit.c:3987
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Pas d'utilisateur avec l'index %d\n"
 
-#: g10/keyedit.c:3854
+#: g10/keyedit.c:4045
+#, fuzzy, c-format
+msgid "No user ID with hash %s\n"
+msgstr "Pas d'utilisateur avec l'index %d\n"
+
+#: g10/keyedit.c:4072
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Pas d'utilisateur avec l'index %d\n"
 
-#: g10/keyedit.c:3971
+#: g10/keyedit.c:4189
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "nom d'utilisateur: � %s �\n"
 
-#: g10/keyedit.c:3974 g10/keyedit.c:4038 g10/keyedit.c:4081
+#: g10/keyedit.c:4192 g10/keyedit.c:4256 g10/keyedit.c:4299
 #, 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:3976 g10/keyedit.c:4040 g10/keyedit.c:4083
+#: g10/keyedit.c:4194 g10/keyedit.c:4258 g10/keyedit.c:4301
 msgid " (non-exportable)"
 msgstr " (non-exportable)"
 
-#: g10/keyedit.c:3980
+#: g10/keyedit.c:4198
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Cette signature a expir� le %s.\n"
 
-#: g10/keyedit.c:3984
+#: g10/keyedit.c:4202
 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:3988
+#: g10/keyedit.c:4206
 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:4015
+#: g10/keyedit.c:4233
 #, 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:4041
+#: g10/keyedit.c:4259
 msgid " (non-revocable)"
 msgstr " (non-r�vocable)"
 
-#: g10/keyedit.c:4048
+#: g10/keyedit.c:4266
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "r�voqu� par votre cl� %s � %s\n"
 
-#: g10/keyedit.c:4070
+#: g10/keyedit.c:4288
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vous �tes sur le point de r�voquer ces signatures:\n"
 
-#: g10/keyedit.c:4090
+#: g10/keyedit.c:4308
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Cr�er r�ellement les certificats de r�vocation ? (o/N) "
 
-#: g10/keyedit.c:4120
+#: g10/keyedit.c:4338
 msgid "no secret key\n"
 msgstr "pas de cl� secr�te\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4408
 #, 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:4207
+#: g10/keyedit.c:4425
 #, 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:4271
+#: g10/keyedit.c:4489
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Le nom d'utilisateur \"%s\" est d�j� r�voqu�.\n"
 
-#: g10/keyedit.c:4333
+#: g10/keyedit.c:4551
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Le nom d'utilisateur \"%s\" est d�j� r�voqu�.\n"
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4646
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Affichage %s photo d'identit� de taille %ld pour la cl�\n"
 "0x%s (uid %d)\n"
 
-#: g10/keygen.c:293
+#: g10/keygen.c:258
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "pr�f�rence `%s' dupliqu�e\n"
 
-#: g10/keygen.c:300
+#: g10/keygen.c:265
 msgid "too many cipher preferences\n"
 msgstr "trop de pr�f�rences de chiffrement\n"
 
-#: g10/keygen.c:302
+#: g10/keygen.c:267
 msgid "too many digest preferences\n"
 msgstr "trop de pr�f�rences de hachage\n"
 
-#: g10/keygen.c:304
+#: g10/keygen.c:269
 msgid "too many compression preferences\n"
 msgstr "trop de pr�f�rences de compression\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:394
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "�l�ment `%s' invalide dans la cha�ne de pr�f�rences\n"
 
 # g10/keygen.c:123 ???
-#: g10/keygen.c:829
+#: g10/keygen.c:822
 msgid "writing direct signature\n"
 msgstr "�criture de la signature directe\n"
 
 # g10/keygen.c:123 ???
-#: g10/keygen.c:868
+#: g10/keygen.c:861
 msgid "writing self signature\n"
 msgstr "�criture de l'auto-signature\n"
 
 # g10/keygen.c:161 ???
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing key binding signature\n"
 msgstr "�criture de la signature de liaison\n"
 
-#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2632
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Taille invalide; utilisation de %u bits\n"
 
-#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2638
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "taille arrondie � %u bits\n"
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1239
 msgid "Sign"
 msgstr "Signer"
 
-#: g10/keygen.c:1252
+#: g10/keygen.c:1242
 msgid "Encrypt"
 msgstr "Chiffrer"
 
-#: g10/keygen.c:1255
+#: g10/keygen.c:1245
 msgid "Authenticate"
 msgstr "Authentifier"
 
-#: g10/keygen.c:1263
+#: g10/keygen.c:1253
 msgid "SsEeAaQq"
 msgstr "SsCcAaQq"
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1268
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Actions possibles pour une cl� %s: "
 
-#: g10/keygen.c:1282
+#: g10/keygen.c:1272
 msgid "Current allowed actions: "
 msgstr "Actions actuellement permises: "
 
-#: g10/keygen.c:1287
+#: g10/keygen.c:1277
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Inverser la capacit� de signer\n"
 
-#: g10/keygen.c:1290
+#: g10/keygen.c:1280
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Inverser la capacit� de chiffrement\n"
 
-#: g10/keygen.c:1293
+#: g10/keygen.c:1283
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Inverser la capacit� d'authentifier\n"
 
-#: g10/keygen.c:1296
+#: g10/keygen.c:1286
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Termin�\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1340
 msgid "Please select what kind of key you want:\n"
 msgstr "S�lectionnez le type de cl� d�sir�:\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1342
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA et Elgamal (par d�faut)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1343
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (signature seule)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1345
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (indiquez vous-m�me les capacit�s)\n"
 
-#: g10/keygen.c:1357
+#: g10/keygen.c:1347
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (chiffrement seul)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1348
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (signature seule)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1350
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (chiffrement seul)\n"
 
-#: g10/keygen.c:1362
+#: g10/keygen.c:1352
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (indiquez vous-m�me les capacit�s)\n"
 
-#: g10/keygen.c:1431 g10/keygen.c:2509
+#: g10/keygen.c:1421 g10/keygen.c:2506
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "La paire de cl�s DSA fera 1024 bits.\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1431
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1438
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Quelle taille de cl� d�sirez-vous ? (1024) "
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1452
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1468
+#: g10/keygen.c:1458
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La taille demand�e est %u bits\n"
 
-#: g10/keygen.c:1473 g10/keygen.c:1478
+#: g10/keygen.c:1463 g10/keygen.c:1468
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrondie � %u bits\n"
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1515
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3681,7 +3778,7 @@ msgstr ""
 "      <n>m = la cl� expire dans n mois\n"
 "      <n>y = la cl� expire dans n ann�es\n"
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1526
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3697,39 +3794,40 @@ msgstr ""
 "      <n>m = la signature expire dans n mois\n"
 "      <n>y = la signature expire dans n ann�es\n"
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1549
 msgid "Key is valid for? (0) "
 msgstr "La cl� est valide pour ? (0) "
 
-#: g10/keygen.c:1563
-msgid "Signature is valid for? (0) "
+#: g10/keygen.c:1554
+#, fuzzy, c-format
+msgid "Signature is valid for? (%s) "
 msgstr "La signature est valide pour ? (0) "
 
-#: g10/keygen.c:1568
+#: g10/keygen.c:1572
 msgid "invalid value\n"
 msgstr "valeur invalide\n"
 
-#: g10/keygen.c:1575
+#: g10/keygen.c:1579
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s n'expire pas du tout\n"
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1580
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s n'expire pas du tout\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1585
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s expire le %s\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1586
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "La signature expire le %s\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1592
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3737,11 +3835,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:1595
+#: g10/keygen.c:1597
 msgid "Is this correct? (y/N) "
 msgstr "Est-ce correct ? (o/N) "
 
-#: g10/keygen.c:1638
+#: g10/keygen.c:1641
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3757,44 +3855,44 @@ msgstr ""
 "   � Heinrich Heine (Der Dichter) <[email protected]> �\n"
 "\n"
 
-#: g10/keygen.c:1651
+#: g10/keygen.c:1654
 msgid "Real name: "
 msgstr "Nom r�el: "
 
-#: g10/keygen.c:1659
+#: g10/keygen.c:1662
 msgid "Invalid character in name\n"
 msgstr "Caract�re invalide dans le nom\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1664
 msgid "Name may not start with a digit\n"
 msgstr "Le nom ne doit pas commencer par un chiffre\n"
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1666
 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:1671
+#: g10/keygen.c:1674
 msgid "Email address: "
 msgstr "Adresse e-mail: "
 
-#: g10/keygen.c:1682
+#: g10/keygen.c:1685
 msgid "Not a valid email address\n"
 msgstr "Ce n'est pas une adresse e-mail valide\n"
 
-#: g10/keygen.c:1690
+#: g10/keygen.c:1693
 msgid "Comment: "
 msgstr "Commentaire: "
 
-#: g10/keygen.c:1696
+#: g10/keygen.c:1699
 msgid "Invalid character in comment\n"
 msgstr "Caract�re invalide dans le commentaire\n"
 
-#: g10/keygen.c:1719
+#: g10/keygen.c:1722
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vous utilisez le jeu de caract�res '%s'.\n"
 
-#: g10/keygen.c:1725
+#: g10/keygen.c:1728
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3805,7 +3903,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1733
 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"
@@ -3821,23 +3919,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1746
+#: g10/keygen.c:1749
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1756
+#: g10/keygen.c:1759
 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:1757
+#: g10/keygen.c:1760
 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:1776
+#: g10/keygen.c:1779
 msgid "Please correct the error first\n"
 msgstr "Corrigez l'erreur d'abord\n"
 
-#: g10/keygen.c:1816
+#: g10/keygen.c:1819
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3845,12 +3943,12 @@ msgstr ""
 "Vous avez besoin d'un mot de passe pour prot�ger votre cl� secr�te.\n"
 "\n"
 
-#: g10/keygen.c:1826 g10/passphrase.c:1105
+#: g10/keygen.c:1829 g10/passphrase.c:786
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1832
+#: g10/keygen.c:1835
 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"
@@ -3862,7 +3960,7 @@ msgstr ""
 "le d�sirez, en utilisant ce programme avec l'option � --edit-key �.\n"
 "\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1857
 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"
@@ -3874,52 +3972,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:2578
+#: g10/keygen.c:2575
 msgid "Key generation canceled.\n"
 msgstr "La g�n�ration de cl� a �t� annul�e.\n"
 
-#: g10/keygen.c:2766 g10/keygen.c:2910
+#: g10/keygen.c:2774 g10/keygen.c:2918
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "�criture de la cl� publique vers `%s'\n"
 
-#: g10/keygen.c:2768 g10/keygen.c:2913
+#: g10/keygen.c:2776 g10/keygen.c:2921
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "�criture d'un bout de cl� secr�te vers `%s'\n"
 
-#: g10/keygen.c:2771 g10/keygen.c:2916
+#: g10/keygen.c:2779 g10/keygen.c:2924
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "�criture de la cl� secr�te vers `%s'\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2907
 #, 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:2905
+#: g10/keygen.c:2913
 #, 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:2923
+#: g10/keygen.c:2931
 #, 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:2930
+#: g10/keygen.c:2938
 #, 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:2953
+#: g10/keygen.c:2961
 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:2964
+#: g10/keygen.c:2972
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -3929,13 +4027,13 @@ msgstr ""
 "utiliser la commande �--edit-key� pour g�n�rer une cl� secondaire �\n"
 "cette fin.\n"
 
-#: g10/keygen.c:2976 g10/keygen.c:3105 g10/keygen.c:3220
+#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
 #, 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:3028 g10/keygen.c:3156 g10/sign.c:290
+#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -3943,7 +4041,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:3030 g10/keygen.c:3158 g10/sign.c:292
+#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -3951,374 +4049,355 @@ 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:3039 g10/keygen.c:3169
+#: g10/keygen.c:3047 g10/keygen.c:3177
 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:3078 g10/keygen.c:3202
+#: g10/keygen.c:3086 g10/keygen.c:3210
 msgid "Really create? (y/N) "
 msgstr "Cr�er vraiment ? (o/N) "
 
-#: g10/keygen.c:3355
+#: g10/keygen.c:3363
 #, 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:3402
+#: g10/keygen.c:3410
 #, 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:3428
+#: g10/keygen.c:3436
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTE: sauvegarde de la cl� de la carte dans `%s'\n"
 
-#: g10/keygen.c:3508
-#, c-format
-msgid "length of RSA modulus is not %d\n"
-msgstr "la longueur du modulo RSA n'est pas %d\n"
-
-#: g10/keygen.c:3514
-msgid "public exponent too large (more than 32 bits)\n"
-msgstr "l'exposant public est trop �lev� (plus de 32 bits)\n"
-
-#: g10/keygen.c:3520 g10/keygen.c:3526
-#, c-format
-msgid "length of an RSA prime is not %d\n"
-msgstr "la longueur d'un nombre premier RSA n'est pas %d\n"
-
-#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
+#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
 msgid "never     "
 msgstr "jamais    "
 
-#: g10/keylist.c:264
+#: g10/keylist.c:265
 msgid "Critical signature policy: "
 msgstr "Politique de signature critique: "
 
-#: g10/keylist.c:266
+#: g10/keylist.c:267
 msgid "Signature policy: "
 msgstr "Politique de signature: "
 
-#: g10/keylist.c:305
+#: g10/keylist.c:306
 msgid "Critical preferred keyserver: "
 msgstr "Serveur de cl�s critique favori: "
 
-#: g10/keylist.c:354 g10/keylist.c:398
+#: 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:372
+#: g10/keylist.c:373
 msgid "Critical signature notation: "
 msgstr "Notation de signature critique: "
 
-#: g10/keylist.c:374
+#: g10/keylist.c:375
 msgid "Signature notation: "
 msgstr "Notation de signature: "
 
-#: g10/keylist.c:385
+#: g10/keylist.c:386
 msgid "not human readable"
 msgstr "illisible par un humain"
 
-#: g10/keylist.c:486
+#: g10/keylist.c:487
 msgid "Keyring"
 msgstr "Porte-cl�s"
 
-#: g10/keylist.c:792
+#: g10/keylist.c:793
 #, c-format
 msgid "expired: %s)"
 msgstr "expir�e: %s)"
 
-#: g10/keylist.c:1488
+#: g10/keylist.c:1489
 msgid "Primary key fingerprint:"
 msgstr "Empreinte de cl� principale:"
 
-#: g10/keylist.c:1490
+#: g10/keylist.c:1491
 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:1497
+#: g10/keylist.c:1498
 msgid " Primary key fingerprint:"
 msgstr " Empreinte de la cl� principale:"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1500
 msgid "      Subkey fingerprint:"
 msgstr "       Empreinte de la sous-cl�:"
 
-#: g10/keylist.c:1503 g10/keylist.c:1507
+#: g10/keylist.c:1504 g10/keylist.c:1508
 msgid "      Key fingerprint ="
 msgstr "    Empreinte de la cl� ="
 
-#: g10/keylist.c:1574
+#: g10/keylist.c:1575
 msgid "      Card serial no. ="
 msgstr "N� de s�rie de la carte ="
 
-#: g10/keyring.c:1245
+#: g10/keyring.c:1246
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "renommer `%s' en `%s' a �chou�: %s \n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1252
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 "ATTENTION: 2 fichiers avec des informations confidentielles existent.\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s est le fichier original\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1255
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s est le nouveau\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1256
 msgid "Please fix this possible security flaw\n"
 msgstr "R�parez ce probl�me de s�curit� possible\n"
 
-#: g10/keyring.c:1375
+#: g10/keyring.c:1376
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "mise en ant�m�moire du porte-cl�s `%s'\n"
 
-#: g10/keyring.c:1421
+#: g10/keyring.c:1422
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu cl�s en ant�m�moire v�rifi�es pour l'instant (%lu signatures)\n"
 
-#: g10/keyring.c:1433
+#: g10/keyring.c:1434
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu cl�s en ant�m�moire (%lu signatures)\n"
 
-#: g10/keyring.c:1504
+#: g10/keyring.c:1505
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: porte-cl�s cr��\n"
 
-#: g10/keyserver.c:107
+#: g10/keyserver.c:105
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "AVERTISSEMENT: les options de serveur de cl�s `%s' ne sont pas\n"
 "utilis�es dans cette plateforme\n"
 
-#: g10/keyserver.c:434
+#: g10/keyserver.c:433
 msgid "disabled"
 msgstr "d�sactiv�"
 
-#: g10/keyserver.c:635
+#: g10/keyserver.c:634
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Entrez le(s) nombre(s), S)uivant, ou Q)uitter > "
 
-#: g10/keyserver.c:718 g10/keyserver.c:1238
+#: g10/keyserver.c:717 g10/keyserver.c:1267
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "protocole serveur de cl�s invalide (nous %d!=gestionnaire %d)\n"
 
-#: g10/keyserver.c:808
+#: g10/keyserver.c:815
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "cl� � %s � introuvable dans le serveur de cl�s\n"
 
-#: g10/keyserver.c:810
+#: g10/keyserver.c:817
 msgid "key not found on keyserver\n"
 msgstr "cl� non trouv�e dans le serveur de cl�s\n"
 
-#: g10/keyserver.c:985
+#: g10/keyserver.c:1014
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "requ�te de la cl� %s du serveur %s %s\n"
 
-#: g10/keyserver.c:989
+#: g10/keyserver.c:1018
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "requ�te de la cl� %s de %s\n"
 
-#: g10/keyserver.c:1141
+#: g10/keyserver.c:1170
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "envoi de la cl� %s au serveur %s %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1174
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "envoi de la cl� %s � %s\n"
 
-#: g10/keyserver.c:1188
+#: g10/keyserver.c:1217
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "recherche de � %s � du serveur %s %s\n"
 
-#: g10/keyserver.c:1191
+#: g10/keyserver.c:1220
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "recherche de � %s � de %s\n"
 
-#: g10/keyserver.c:1198 g10/keyserver.c:1293
+#: g10/keyserver.c:1227 g10/keyserver.c:1322
 msgid "no keyserver action!\n"
 msgstr "pas d'action pour le serveur de cl�s !\n"
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1275
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 "AVERTISSEMENT: le gestionnaire de serveurs de cl�s provient d'une\n"
 "version diff�rente de GnuPG (%s)\n"
 
-#: g10/keyserver.c:1255
+#: g10/keyserver.c:1284
 msgid "keyserver did not send VERSION\n"
 msgstr "le serveurs de cl�s n'a pas envoy� son num�ro de VERSION\n"
 
-#: g10/keyserver.c:1314
+#: g10/keyserver.c:1343
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "pas de serveur de cl�s connu (utilisez l'option --keyserver)\n"
 
-#: g10/keyserver.c:1320
+#: g10/keyserver.c:1349
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 "les appels externes � un serveur de cl� ne sont pas support�s dans\n"
 "cette compilation\n"
 
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1361
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "pas de gestionnaire pour le type de serveurs de cl�s `%s'\n"
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1366
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 "l'action `%s' n'est pas support�e avec le type de serveurs\n"
 "de cl�s `%s'\n"
 
-#: g10/keyserver.c:1345
-#, c-format
-msgid "gpgkeys_%s does not support handler version %d\n"
+#: g10/keyserver.c:1374
+#, fuzzy, c-format
+msgid "%s does not support handler version %d\n"
 msgstr "gpgkeys_%s ne supporte pas le gestionnaire de version %d\n"
 
-#: g10/keyserver.c:1351
+#: g10/keyserver.c:1381
 msgid "keyserver timed out\n"
 msgstr "le d�lai d'attente du serveur de cl�s a expir�\n"
 
-#: g10/keyserver.c:1356
+#: g10/keyserver.c:1386
 msgid "keyserver internal error\n"
 msgstr "erreur interne du serveur de cl�s\n"
 
-#: g10/keyserver.c:1365
+#: g10/keyserver.c:1395
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "erreur de communication avec le serveur de cl�s: %s\n"
 
-#: g10/keyserver.c:1390 g10/keyserver.c:1424
+#: g10/keyserver.c:1420 g10/keyserver.c:1454
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "� %s � n'est pas une ID de cl�: ignor�\n"
 
-#: g10/keyserver.c:1681
+#: g10/keyserver.c:1711
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 "AVERTISSEMENT: impossible de rafra�chir la cl� %s\n"
 "via %s: %s\n"
 
-#: g10/keyserver.c:1703
+#: g10/keyserver.c:1733
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "rafra�chissement d'une cl� depuis %s\n"
 
-#: g10/keyserver.c:1705
+#: g10/keyserver.c:1735
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "rafra�chissement de %d cl�s depuis %s\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:249
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "taille �tonnante pour une cl� de session chiffr�e (%d)\n"
 
-#: g10/mainproc.c:262
-#, c-format
-msgid "bad passphrase or unknown cipher algorithm (%d)\n"
-msgstr "mauvais mot de passe ou algorithme de chiffrement inconnu (%d)\n"
-
-#: g10/mainproc.c:299
+#: g10/mainproc.c:300
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "cl� de session chiffr�e %s\n"
 
-#: g10/mainproc.c:309
+#: g10/mainproc.c:310
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "phrase de passe g�n�r�e avec l'algorithme de hachage %d inconnu\n"
 
-#: g10/mainproc.c:375
+#: g10/mainproc.c:376
 #, c-format
 msgid "public key is %s\n"
 msgstr "la cl� publique est %s\n"
 
-#: g10/mainproc.c:430
+#: g10/mainproc.c:431
 msgid "public key encrypted data: good DEK\n"
 msgstr "donn�es chiffr�es par cl� publique: bonne cl� de chiffrement (DEK)\n"
 
-#: g10/mainproc.c:463
+#: g10/mainproc.c:464
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "chiffr� avec une cl� de %u bits %s, ID %s, cr��e le %s\n"
 
-#: g10/mainproc.c:467 g10/pkclist.c:218
+#: g10/mainproc.c:468 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      � %s �\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:472
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "chiffr� avec une cl� %s, ID %s\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "le d�chiffrement par cl� publique a �chou�: %s\n"
 
-#: g10/mainproc.c:499
+#: g10/mainproc.c:500
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "chiffr� avec %lu mots de passe\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:502
 msgid "encrypted with 1 passphrase\n"
 msgstr "chiffr� avec 1 mot de passe\n"
 
-#: g10/mainproc.c:529 g10/mainproc.c:551
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "on suppose des donn�es chiffr�es avec %s\n"
 
-#: g10/mainproc.c:537
+#: g10/mainproc.c:538
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "L'algorithme IDEA n'est pas disponible, avec un peu de chance %s marchera\n"
 "peut-�tre\n"
 
-#: g10/mainproc.c:569
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr "le d�chiffrement a r�ussi\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:574
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVERTISSEMENT: l'int�grit� du message n'�tait pas prot�g�e\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTISSEMENT: le message chiffr� a �t� manipul� !\n"
 
-#: g10/mainproc.c:592
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "le d�chiffrement a �chou�: %s\n"
@@ -4332,98 +4411,98 @@ 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:786
+#: g10/mainproc.c:803
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "r�vocation autonome - utilisez �gpg --import� pour l'appliquer\n"
 
-#: g10/mainproc.c:1290
+#: g10/mainproc.c:1307
 msgid "signature verification suppressed\n"
 msgstr "v�rification de signature supprim�e\n"
 
-#: g10/mainproc.c:1332 g10/mainproc.c:1342
+#: g10/mainproc.c:1349 g10/mainproc.c:1359
 msgid "can't handle these multiple signatures\n"
 msgstr "le traitement de ces signatures multiples est impossible\n"
 
-#: g10/mainproc.c:1352
+#: g10/mainproc.c:1369
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signature faite le %s\n"
 
-#: g10/mainproc.c:1353
+#: g10/mainproc.c:1370
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               en utilisant la cl� %s %s\n"
 
-#: g10/mainproc.c:1357
+#: g10/mainproc.c:1374
 #, 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:1377
+#: g10/mainproc.c:1394
 msgid "Key available at: "
 msgstr "Cl� disponible sur: "
 
-#: g10/mainproc.c:1482 g10/mainproc.c:1530
+#: g10/mainproc.c:1499 g10/mainproc.c:1547
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "MAUVAISE signature de � %s �"
 
-#: g10/mainproc.c:1484 g10/mainproc.c:1532
+#: g10/mainproc.c:1501 g10/mainproc.c:1549
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signature expir�e de � %s �"
 
-#: g10/mainproc.c:1486 g10/mainproc.c:1534
+#: g10/mainproc.c:1503 g10/mainproc.c:1551
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Bonne signature de � %s �"
 
-#: g10/mainproc.c:1538
+#: g10/mainproc.c:1555
 msgid "[uncertain]"
 msgstr "[incertain]"
 
-#: g10/mainproc.c:1570
+#: g10/mainproc.c:1587
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias � %s �"
 
-#: g10/mainproc.c:1664
+#: g10/mainproc.c:1681
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "La signature a expir� le %s\n"
 
-#: g10/mainproc.c:1669
+#: g10/mainproc.c:1686
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "La signature expire le %s\n"
 
-#: g10/mainproc.c:1672
+#: g10/mainproc.c:1689
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "signature %s, algorithme de hachage %s\n"
 
-#: g10/mainproc.c:1673
+#: g10/mainproc.c:1690
 msgid "binary"
 msgstr "binaire"
 
-#: g10/mainproc.c:1674
+#: g10/mainproc.c:1691
 msgid "textmode"
 msgstr "modetexte"
 
-#: g10/mainproc.c:1674 g10/trustdb.c:530
+#: g10/mainproc.c:1691 g10/trustdb.c:531
 msgid "unknown"
 msgstr "inconnu"
 
-#: g10/mainproc.c:1694
+#: g10/mainproc.c:1711
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossible de v�rifier la signature: %s\n"
 
-#: g10/mainproc.c:1762 g10/mainproc.c:1778 g10/mainproc.c:1864
+#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
 msgid "not a detached signature\n"
 msgstr "la signature n'est pas d�tach�e\n"
 
-#: g10/mainproc.c:1805
+#: g10/mainproc.c:1822
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
@@ -4431,210 +4510,196 @@ msgstr ""
 "premi�re\n"
 "sera v�rifi�e.\n"
 
-#: g10/mainproc.c:1813
+#: g10/mainproc.c:1830
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signature autonome de classe 0x%02x\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1887
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature d'un ancien style (PGP 2.x)\n"
 
-#: g10/mainproc.c:1880
+#: g10/mainproc.c:1897
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquet racine invalide d�tect� dans proc_tree()\n"
 
-#: g10/misc.c:121
+#: g10/misc.c:122
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "impossible d'emp�cher la g�n�ration de fichiers �core�: %s\n"
 
-#: g10/misc.c:141 g10/misc.c:169 g10/misc.c:241
+#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "fstat de `%s' �chou� dans %s: %s\n"
 
-#: g10/misc.c:206
+#: g10/misc.c:207
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) �chou� dans %s: %s\n"
 
-#: g10/misc.c:315
+#: g10/misc.c:316
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "impossible de g�rer l'algorithme � cl� publique %d\n"
 
-#: g10/misc.c:330
+#: g10/misc.c:331
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algorithme de chiffrement non implant�"
 
-#: g10/misc.c:345
+#: g10/misc.c:346
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "signature %s, algorithme de hachage %s\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:351
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "AVERTISSEMENT: forcer l'algorithme de hachage %s (%d) entre en\n"
 "d�saccord avec les pr�f�rences du destinataire\n"
 
-#: g10/misc.c:446
+#: g10/misc.c:447
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "le module de chiffrement IDEA n'est pas pr�sent\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:448
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 "voir http://www.gnupg.org/fr/why-not-idea.html pour plus d'informations\n"
 
-#: g10/misc.c:680
+#: g10/misc.c:681
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: option d�conseill�e \"%s\"\n"
 
-#: g10/misc.c:684
+#: g10/misc.c:685
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVERTISSEMENT: \"%s\" est une option d�conseill�e.\n"
 
-#: g10/misc.c:686
+#: g10/misc.c:687
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "utilisez \"%s%s\" � la place\n"
 
-#: g10/misc.c:697
+#: g10/misc.c:694
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
+msgstr "AVERTISSEMENT: \"%s\" est une option d�conseill�e.\n"
+
+#: g10/misc.c:707
 msgid "Uncompressed"
 msgstr "Non-compress�"
 
-#: g10/misc.c:722
+#: g10/misc.c:732
 msgid "uncompressed|none"
 msgstr "noncompress�|non"
 
-#: g10/misc.c:832
+#: g10/misc.c:842
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "ce message ne sera pas utilisable par %s\n"
 
-#: g10/misc.c:989
+#: g10/misc.c:999
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "option ambigu� `%s'\n"
 
-#: g10/misc.c:1014
+#: g10/misc.c:1024
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "option `%s' inconnue\n"
 
-#: g10/openfile.c:84
+#: g10/openfile.c:86
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Le fichier `%s' existe. "
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 msgid "Overwrite? (y/N) "
 msgstr "R��crire par-dessus ? (o/N) "
 
-#: g10/openfile.c:119
+#: g10/openfile.c:121
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: suffixe inconnu\n"
 
-#: g10/openfile.c:141
+#: g10/openfile.c:143
 msgid "Enter new filename"
 msgstr "Entrez le nouveau nom de fichier"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:188
 msgid "writing to stdout\n"
 msgstr "�criture vers la sortie standard\n"
 
-#: g10/openfile.c:296
+#: g10/openfile.c:300
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "les donn�es sign�es sont suppos�es �tre dans `%s'\n"
 
-#: g10/openfile.c:375
+#: g10/openfile.c:379
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr " nouveau fichier de configuration `%s' cr��\n"
 
-#: g10/openfile.c:377
+#: g10/openfile.c:381
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 "AVERTISSEMENT: les options de `%s' ne sont pas encore actives cette fois\n"
 
-#: g10/openfile.c:409
+#: g10/openfile.c:413
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "r�pertoire `%s' cr��\n"
 
-#: g10/parse-packet.c:137
+#: g10/parse-packet.c:138
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossible de g�rer l'algorithme � cl� publique %d\n"
 
-#: g10/parse-packet.c:707
+#: g10/parse-packet.c:708
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVERISSEMENT: la cl� de session chiffr�e de mani�re sym�trique est\n"
 "potentiellement non s�re\n"
 
-#: g10/parse-packet.c:1132
+#: g10/parse-packet.c:1145
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un sous-paquet de type %d poss�de un bit critique\n"
 
-#: g10/passphrase.c:478 g10/passphrase.c:525
+#: g10/passphrase.c:305
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent n'est pas disponible dans cette session\n"
 
-#: g10/passphrase.c:486
-msgid "can't set client pid for the agent\n"
-msgstr "impossible d'obtenir le pid du client pour l'agent\n"
-
-#: g10/passphrase.c:494
-msgid "can't get server read FD for the agent\n"
-msgstr ""
-"impossible d'obtenir le descripteur de lecture du serveur\n"
-"pour l'agent\n"
-
-#: g10/passphrase.c:501
-msgid "can't get server write FD for the agent\n"
-msgstr ""
-"impossible d'obtenir le descripteur d'�criture du serveur pour l'agent\n"
-
-#: g10/passphrase.c:534
+#: g10/passphrase.c:317
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "la variable d'environnement GPG_AGENT_INFO est mal d�finie\n"
 
-#: g10/passphrase.c:547
+#: g10/passphrase.c:332
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "le protocole gpg-agent version %d n'est pas support�\n"
 
-#: g10/passphrase.c:568
+#: g10/passphrase.c:345
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "impossible de se connecter � `%s': %s\n"
 
-#: g10/passphrase.c:590
-msgid "communication problem with gpg-agent\n"
-msgstr "probl�me de communication avec ssh-agent\n"
-
-#: g10/passphrase.c:597 g10/passphrase.c:937 g10/passphrase.c:1049
+#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
 msgid "problem with the agent - disabling agent use\n"
 msgstr "probl�me avec l'agent - arr�t d'utilisation de l'agent\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1209
+#: g10/passphrase.c:511 g10/passphrase.c:890
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (ID cl� principale %s)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:525
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4646,40 +4711,27 @@ msgstr ""
 "\"%.*s\"\n"
 "cl� %u bits %s, ID %s, cr��e %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:550
 msgid "Repeat passphrase\n"
 msgstr "R�p�tez le mot de passe\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:552
 msgid "Enter passphrase\n"
 msgstr "Entrez le mot de passe\n"
 
-#: g10/passphrase.c:781
-msgid "passphrase too long\n"
-msgstr "mot de passe trop long\n"
-
-#: g10/passphrase.c:794
-msgid "invalid response from agent\n"
-msgstr "r�ponse de l'agent invalide\n"
-
-#: g10/passphrase.c:810 g10/passphrase.c:931
+#: g10/passphrase.c:628
 msgid "cancelled by user\n"
 msgstr "annul� par l'utilisateur\n"
 
-#: g10/passphrase.c:815 g10/passphrase.c:1020
-#, c-format
-msgid "problem with the agent: agent returns 0x%lx\n"
-msgstr "probl�me avec l'agent : l'agent renvoie 0x%lx\n"
-
-#: g10/passphrase.c:1100 g10/passphrase.c:1263
+#: g10/passphrase.c:781 g10/passphrase.c:944
 msgid "can't query passphrase in batch mode\n"
 msgstr "impossible de demander la phrase de passe en mode automatique\n"
 
-#: g10/passphrase.c:1107 g10/passphrase.c:1268
+#: g10/passphrase.c:788 g10/passphrase.c:949
 msgid "Enter passphrase: "
 msgstr "Entrez le mot de passe: "
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:871
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4688,21 +4740,21 @@ msgstr ""
 "Vous avez besoin d'une phrase de passe pour d�verrouiller la\n"
 "cl� secr�te pour l'utilisateur: � %s �\n"
 
-#: g10/passphrase.c:1196
+#: g10/passphrase.c:877
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "cl� de %u bits %s, ID %s, cr��e le %s"
 
-#: g10/passphrase.c:1205
+#: g10/passphrase.c:886
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "        (sous-cl� de la cl� principale ID %s)"
 
-#: g10/passphrase.c:1272
+#: g10/passphrase.c:953
 msgid "Repeat passphrase: "
 msgstr "R�p�tez le mot de passe: "
 
-#: g10/photoid.c:66
+#: g10/photoid.c:67
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4717,113 +4769,113 @@ msgstr ""
 "en sera de m�me pour votre cl� !\n"
 "La meilleure taille � utiliser est 240x288.\n"
 
-#: g10/photoid.c:80
+#: g10/photoid.c:81
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Entrez le nom du fichier JPEG pour la photo d'identit�: "
 
-#: g10/photoid.c:94
+#: g10/photoid.c:95
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "impossible d'ouvrir le fichier JPEG `%s': %s\n"
 
-#: g10/photoid.c:102
+#: g10/photoid.c:103
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Ce JPEG est vraiment tr�s grand (%d octets) !\n"
 
-#: g10/photoid.c:104
+#: g10/photoid.c:105
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "�tes-vous s�r de vouloir l'utiliser ? (o/N) "
 
-#: g10/photoid.c:119
+#: g10/photoid.c:120
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "`%s' n'est pas un fichier JPEG\n"
 
-#: g10/photoid.c:136
+#: g10/photoid.c:137
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Cette photo est-elle correcte (o/N/q) ? "
 
-#: g10/photoid.c:338
+#: g10/photoid.c:339
 msgid "unable to display photo ID!\n"
 msgstr "impossible d'afficher la photo d'identit� !\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:580
+#: g10/pkclist.c:62 g10/revoke.c:581
 msgid "No reason specified"
 msgstr "Aucune raison sp�cifi�e"
 
-#: g10/pkclist.c:63 g10/revoke.c:582
+#: g10/pkclist.c:64 g10/revoke.c:583
 msgid "Key is superseded"
 msgstr "La cl� a �t� remplac�e"
 
-#: g10/pkclist.c:65 g10/revoke.c:581
+#: g10/pkclist.c:66 g10/revoke.c:582
 msgid "Key has been compromised"
 msgstr "La cl� a �t� compromise"
 
-#: g10/pkclist.c:67 g10/revoke.c:583
+#: g10/pkclist.c:68 g10/revoke.c:584
 msgid "Key is no longer used"
 msgstr "La cl� n'est plus utilis�e"
 
-#: g10/pkclist.c:69 g10/revoke.c:584
+#: g10/pkclist.c:70 g10/revoke.c:585
 msgid "User ID is no longer valid"
 msgstr "Le nom d'utilisateur n'est plus valide"
 
-#: g10/pkclist.c:73
+#: g10/pkclist.c:74
 msgid "reason for revocation: "
 msgstr "cause de r�vocation: "
 
-#: g10/pkclist.c:90
+#: g10/pkclist.c:91
 msgid "revocation comment: "
 msgstr "commentaire de r�vocation: "
 
-#: g10/pkclist.c:205
+#: g10/pkclist.c:206
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:213
+#: g10/pkclist.c:214
 msgid "No trust value assigned to:\n"
 msgstr "Pas de valeur de confiance d�finie pour :\n"
 
-#: g10/pkclist.c:245
+#: g10/pkclist.c:246
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "  alias � %s �\n"
 
-#: g10/pkclist.c:255
+#: g10/pkclist.c:256
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr ""
 "Jusqu'� quel point avez-vous confiance au fait que cette cl�\n"
 "appartient r��llement � l'utilisateur nomm� ?\n"
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:271
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr "  %d = ne sais pas ou ne dirai pas\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr "  %d = je ne fais PAS confiance\n"
 
-#: g10/pkclist.c:278
+#: g10/pkclist.c:279
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr "  %d = je donne une confiance ultime\n"
 
-#: g10/pkclist.c:284
+#: g10/pkclist.c:285
 msgid "  m = back to the main menu\n"
 msgstr "  m = retour au menu principal\n"
 
-#: g10/pkclist.c:287
+#: g10/pkclist.c:288
 msgid "  s = skip this key\n"
 msgstr "  s = sauter cette cl�\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 msgid "  q = quit\n"
 msgstr "  q = quitter\n"
 
-#: g10/pkclist.c:292
+#: g10/pkclist.c:293
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
@@ -4832,41 +4884,41 @@ msgstr ""
 "Le niveau de confiance minimal pour cette cl� est: %s\n"
 "\n"
 
-#: g10/pkclist.c:298 g10/revoke.c:609
+#: g10/pkclist.c:299 g10/revoke.c:610
 msgid "Your decision? "
 msgstr "Votre d�cision ? "
 
-#: g10/pkclist.c:319
+#: g10/pkclist.c:320
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Voulez-vous vraiment donner une confiance ultime � cette cl� ? (o/N) "
 
-#: g10/pkclist.c:333
+#: g10/pkclist.c:334
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificats conduisant vers une cl� � confiance ultime:\n"
 
-#: g10/pkclist.c:418
+#: g10/pkclist.c:419
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Rien ne dit que la cl� appartient vraiment � l'utilisateur\n"
 "nomm�.\n"
 
-#: g10/pkclist.c:423
+#: g10/pkclist.c:424
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Il n'est pas vraiment s�r que la cl� appartient vraiment\n"
 "� l'utilisateur nomm�.\n"
 
-#: g10/pkclist.c:429
+#: g10/pkclist.c:430
 msgid "This key probably belongs to the named user\n"
 msgstr "Cette cl� appartient probablement � l'utilisateur nomm�\n"
 
-#: g10/pkclist.c:434
+#: g10/pkclist.c:435
 msgid "This key belongs to us\n"
 msgstr "Cette cl� nous appartient\n"
 
-#: g10/pkclist.c:460
+#: g10/pkclist.c:461
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -4877,97 +4929,97 @@ msgstr ""
 "vous pouvez r�pondre oui � la prochaine question.\n"
 "\n"
 
-#: g10/pkclist.c:467
+#: g10/pkclist.c:468
 msgid "Use this key anyway? (y/N) "
 msgstr "Utiliser cette cl� quand m�me ? (o/N) "
 
-#: g10/pkclist.c:501
+#: g10/pkclist.c:502
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ATTENTION: Utilisation d'une cl� sans confiance !\n"
 
-#: g10/pkclist.c:508
+#: g10/pkclist.c:509
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "AVERTISSEMENT: cette cl� est peut-�tre r�voqu�e (cl� de r�vocation\n"
 "absente)\n"
 
-#: g10/pkclist.c:517
+#: g10/pkclist.c:518
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "AVERTISSEMENT: Cette cl� � �t� r�voqu�e par son r�vocateur d�sign� !\n"
 
-#: g10/pkclist.c:520
+#: g10/pkclist.c:521
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ATTENTION: Cette cl� � �t� r�voqu�e par son propri�taire !\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 msgid "         This could mean that the signature is forged.\n"
 msgstr "           Cela pourrait signifier que la signature est fausse.\n"
 
-#: g10/pkclist.c:527
+#: g10/pkclist.c:528
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ATTENTION: Cette sous-cl� � �t� r�voqu�e par son propri�taire !\n"
 
-#: g10/pkclist.c:532
+#: g10/pkclist.c:533
 msgid "Note: This key has been disabled.\n"
 msgstr "Note: cette cl� a �t� d�sactiv�e.\n"
 
-#: g10/pkclist.c:537
+#: g10/pkclist.c:538
 msgid "Note: This key has expired!\n"
 msgstr "Note: Cette cl� a expir� !\n"
 
-#: g10/pkclist.c:548
+#: g10/pkclist.c:549
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "ATTENTION: Cette cl� n'est pas certifi�e avec une signature de confiance !\n"
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:551
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "           Rien ne dit que la signature appartient � son propri�taire.\n"
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:559
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATTENTION: Nous ne faisons PAS confiance � cette cl� !\n"
 
-#: g10/pkclist.c:559
+#: g10/pkclist.c:560
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "           La signature est certainement FAUSSE.\n"
 
-#: g10/pkclist.c:567
+#: g10/pkclist.c:568
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ATTENTION: Les signatures de cette cl� n'ont pas une confiance suffisante !\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:570
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 "            Il n'est pas s�r que la signature appartient � son "
 "propri�taire.\n"
 
-#: g10/pkclist.c:734 g10/pkclist.c:767 g10/pkclist.c:936 g10/pkclist.c:996
+#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignor�: %s\n"
 
-#: g10/pkclist.c:744 g10/pkclist.c:968
+#: g10/pkclist.c:745 g10/pkclist.c:969
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignor�: cl� publique d�j� pr�sente\n"
 
-#: g10/pkclist.c:786
+#: g10/pkclist.c:787
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Vous n'avez pas sp�cifi� de nom d'utilisateur. (vous pouvez\n"
 "utiliser �-r�)\n"
 "\n"
 
-#: g10/pkclist.c:802
+#: g10/pkclist.c:803
 msgid "Current recipients:\n"
 msgstr "R�cipients actuels:\n"
 
-#: g10/pkclist.c:828
+#: g10/pkclist.c:829
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -4975,170 +5027,170 @@ msgstr ""
 "\n"
 "Entrez le nom d'utilisateur, en terminant par une ligne vide: "
 
-#: g10/pkclist.c:844
+#: g10/pkclist.c:845
 msgid "No such user ID.\n"
 msgstr "Pas d'utilisateur de ce nom.\n"
 
-#: g10/pkclist.c:849 g10/pkclist.c:911
+#: g10/pkclist.c:850 g10/pkclist.c:912
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignor�: la cl� publique est d�j� le destinataire par d�faut\n"
 
-#: g10/pkclist.c:867
+#: g10/pkclist.c:868
 msgid "Public key is disabled.\n"
 msgstr "La cl� publique est d�sactiv�e.\n"
 
-#: g10/pkclist.c:874
+#: g10/pkclist.c:875
 msgid "skipped: public key already set\n"
 msgstr "ignor�: cl� publique d�j� activ�e\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:904
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "destinataire par d�faut � %s � inconnu\n"
 
-#: g10/pkclist.c:948
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignor�: la cl� publique est d�sactiv�e\n"
 
-#: g10/pkclist.c:1003
+#: g10/pkclist.c:1004
 msgid "no valid addressees\n"
 msgstr "pas de destinataire valide\n"
 
-#: g10/plaintext.c:90
+#: g10/plaintext.c:91
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "les donn�es ne sont pas enregistr�es; utilisez l'option �--output� pour\n"
 "les enregistrer\n"
 
-#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
+#: g10/plaintext.c:136 g10/plaintext.c:141 g10/plaintext.c:159
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erreur pendant la cr�ation de `%s': %s\n"
 
-#: g10/plaintext.c:446
+#: g10/plaintext.c:447
 msgid "Detached signature.\n"
 msgstr "Signature d�tach�e.\n"
 
-#: g10/plaintext.c:450
+#: g10/plaintext.c:452
 msgid "Please enter name of data file: "
 msgstr "Entrez le nom du fichier de donn�es: "
 
-#: g10/plaintext.c:478
+#: g10/plaintext.c:481
 msgid "reading stdin ...\n"
 msgstr "lecture de l'entr�e standard...\n"
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:515
 msgid "no signed data\n"
 msgstr "pas de donn�es sign�es\n"
 
-#: g10/plaintext.c:526
+#: g10/plaintext.c:529
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "impossible d'ouvir les donn�es sign�es `%s'\n"
 
-#: g10/pubkey-enc.c:103
+#: g10/pubkey-enc.c:104
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "destinataire anonyme; essai de la cl� secr�te %s...\n"
 
-#: g10/pubkey-enc.c:119
+#: g10/pubkey-enc.c:120
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "d'accord, nous sommes le destinataire anonyme.\n"
 
-#: g10/pubkey-enc.c:207
+#: g10/pubkey-enc.c:208
 msgid "old encoding of the DEK is not supported\n"
 msgstr "l'ancien codage de la cl� de chiffrement (DEK) n'est pas support�\n"
 
-#: g10/pubkey-enc.c:228
+#: g10/pubkey-enc.c:229
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "l'algorithme de chiffrement %d%s est inconnu ou d�sactiv�\n"
 
-#: g10/pubkey-enc.c:266
+#: g10/pubkey-enc.c:267
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 "AVERTISSEMENT: l'algorithme de chiffrement %s n'a pas �t� trouv�\n"
 "dans les pr�f�rences du destinataire\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:287
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTE: la cl� secr�te %s a expir� le %s\n"
 
-#: g10/pubkey-enc.c:292
+#: g10/pubkey-enc.c:293
 msgid "NOTE: key has been revoked"
 msgstr "NOTE: la cl� a �t� r�voqu�e"
 
-#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:545
+#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
+#: g10/revoke.c:188 g10/revoke.c:546
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet a �chou�: %s\n"
 
-#: g10/revoke.c:146
+#: g10/revoke.c:147
 #, c-format
 msgid "key %s has no user IDs\n"
 msgstr "cl� %s: pas de nom d'utilisateur\n"
 
-#: g10/revoke.c:272
+#: g10/revoke.c:273
 msgid "To be revoked by:\n"
 msgstr "Doit �tre r�voqu� par:\n"
 
-#: g10/revoke.c:276
+#: g10/revoke.c:277
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(c'est une cl� de r�vocation sensible)\n"
 
-#: g10/revoke.c:280
+#: g10/revoke.c:281
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "G�n�rer un certificat de r�vocation d�sign�e pour cette cl� ? (o/N) "
 
-#: g10/revoke.c:293 g10/revoke.c:511
+#: g10/revoke.c:294 g10/revoke.c:512
 msgid "ASCII armored output forced.\n"
 msgstr "sortie avec armure ASCII forc�e.\n"
 
-#: g10/revoke.c:307 g10/revoke.c:525
+#: g10/revoke.c:308 g10/revoke.c:526
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet a �chou�: %s\n"
 
-#: g10/revoke.c:370
+#: g10/revoke.c:371
 msgid "Revocation certificate created.\n"
 msgstr "Certificat de r�vocation cr��.\n"
 
-#: g10/revoke.c:376
+#: g10/revoke.c:377
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "aucune cl� de r�vocation trouv�e pour � %s �\n"
 
-#: g10/revoke.c:432
+#: g10/revoke.c:433
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "la cl� secr�te � %s � n'a pas �t� trouv�e: %s\n"
 
-#: g10/revoke.c:461
+#: g10/revoke.c:462
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "pas de cl� publique correspondante: %s\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:473
 msgid "public key does not match secret key!\n"
 msgstr "la cl� publique ne correspond pas � la cl� secr�te !\n"
 
-#: g10/revoke.c:479
+#: g10/revoke.c:480
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "G�n�rer un certificat de r�vocation pour cette cl� ? (o/N) "
 
-#: g10/revoke.c:496
+#: g10/revoke.c:497
 msgid "unknown protection algorithm\n"
 msgstr "algorithme de protection inconnu\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOTE: Cette cl� n'est pas prot�g�e !\n"
 
-#: g10/revoke.c:551
+#: g10/revoke.c:552
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5158,114 +5210,114 @@ msgstr ""
 "le syst�me d'impression de votre machine pourrait stocker ces\n"
 "donn�es et les rendre accessibles � d'autres personnes !\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid "Please select the reason for the revocation:\n"
 msgstr "choisissez la cause de la r�vocation:\n"
 
-#: g10/revoke.c:602
+#: g10/revoke.c:603
 msgid "Cancel"
 msgstr "Annuler"
 
-#: g10/revoke.c:604
+#: g10/revoke.c:605
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Vous devriez s�rement s�lectionner %d ici)\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:646
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Entrez une description optionnelle ; terminez-l� par une ligne vide:\n"
 
-#: g10/revoke.c:673
+#: g10/revoke.c:674
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Cause de r�vocation: %s\n"
 
-#: g10/revoke.c:675
+#: g10/revoke.c:676
 msgid "(No description given)\n"
 msgstr "(Aucune description donn�e)\n"
 
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 msgid "Is this okay? (y/N) "
 msgstr "Est-ce d'accord ? (o/N) "
 
-#: g10/seckey-cert.c:54
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "les parties secr�tes ne sont pas disponibles\n"
 
-#: g10/seckey-cert.c:60
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "l'algorithme de protection %d%s n'est pas support�\n"
 
-#: g10/seckey-cert.c:71
+#: g10/seckey-cert.c:72
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "le hachage de protection %d n'est pas support�\n"
 
-#: g10/seckey-cert.c:265
+#: g10/seckey-cert.c:266
 msgid "Invalid passphrase; please try again"
 msgstr "Mot de passe invalide ; r�essayez"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:267
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:326
+#: g10/seckey-cert.c:327
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "ATTENTION: Cl� faible d�tect�e - changez encore le mot de passe.\n"
 
-#: g10/seckey-cert.c:364
+#: g10/seckey-cert.c:365
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "g�n�ration de la somme de contr�le de 16 bits (d�pr�ci�e) pour prot�ger\n"
 "la cl� secr�te\n"
 
-#: g10/seskey.c:52
+#: g10/seskey.c:53
 msgid "weak key created - retrying\n"
 msgstr "cl� faible g�n�r�e - nouvel essai\n"
 
-#: g10/seskey.c:57
+#: g10/seskey.c:58
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "impossible d'�viter une cl� faible pour le chiffrement sym�trique:\n"
 "%d essais ont eu lieu !\n"
 
-#: g10/seskey.c:213
+#: g10/seskey.c:214
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA n�cessite l'utilisation d'un algorithme de hachage de 160 bits\n"
 
-#: g10/sig-check.c:75
+#: g10/sig-check.c:76
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "AVERTISSEMENT: conflit de hachage de signature dans le message\n"
 
-#: g10/sig-check.c:99
+#: g10/sig-check.c:100
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 "AVERTISSEMENT: la sous-cl� de signature %s n'a pas de certificat\n"
 "crois�\n"
 
-#: g10/sig-check.c:102
+#: g10/sig-check.c:103
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "AVERTISSEMENT: la sous-cl� de signature %s a un certificat crois�\n"
 "invalide\n"
 
-#: g10/sig-check.c:168
+#: g10/sig-check.c:169
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "la cl� publique %s est plus r�cente de %lu seconde que la signature\n"
 
-#: g10/sig-check.c:169
+#: g10/sig-check.c:170
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "la cl� publique %s est plus r�cente de %lu secondes que la signature\n"
 
 # on s'amuse comme on peut...
-#: g10/sig-check.c:180
+#: g10/sig-check.c:181
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5273,7 +5325,7 @@ msgstr ""
 "la cl� %s a �t� cr��e %lu seconde dans le futur (rupture\n"
 "spatio-temporelle ou probl�me d'horloge)\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:183
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5281,62 +5333,62 @@ msgstr ""
 "la cl� %s a �t� cr��e %lu secondes dans le futur (rupture\n"
 "spatio-temporelle ou probl�me d'horloge)\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:193
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTE: la cl� de signature %s a expir� le %s\n"
 
-#: g10/sig-check.c:275
+#: g10/sig-check.c:276
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "la signature de la cl� %s est suppos�e �tre fausse car un bit\n"
 "critique est inconnu\n"
 
-#: g10/sig-check.c:532
+#: g10/sig-check.c:533
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "cl� %s: pas de sous-cl� pour la signature de r�vocation de sous-cl�\n"
 
-#: g10/sig-check.c:558
+#: g10/sig-check.c:559
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
 "cl� %s: pas de sous-cl� pour la signature de liaison � la\n"
 "sous-cl�\n"
 
-#: g10/sign.c:85
+#: g10/sign.c:86
 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:93
+#: g10/sign.c:94
 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:112
+#: g10/sign.c:113
 #, 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:138
+#: g10/sign.c:139
 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:146
+#: g10/sign.c:147
 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:159
+#: g10/sign.c:160
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5344,7 +5396,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:187
+#: g10/sign.c:188
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5353,23 +5405,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:364
+#: g10/sign.c:365
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Impossible de v�rifier la signature cr��e: %s\n"
 
-#: g10/sign.c:373
+#: g10/sign.c:374
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s signature de: � %s �\n"
 
-#: g10/sign.c:741
+#: g10/sign.c:761
 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:808
+#: g10/sign.c:830
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5377,53 +5429,53 @@ 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:900
+#: g10/sign.c:922
 msgid "signing:"
 msgstr "signature:"
 
-#: g10/sign.c:1007
+#: g10/sign.c:1034
 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:1180
+#: g10/sign.c:1212
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "le chiffrement %s sera utilis�\n"
 
-#: g10/skclist.c:126 g10/skclist.c:190
+#: g10/skclist.c:127 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "la cl� n'est pas marqu�e comme non-s�re; on ne peut pas l'utiliser avec le\n"
 "pseudo-g�n�rateur de nombres al�atiores !\n"
 
-#: g10/skclist.c:157
+#: g10/skclist.c:158
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "� %s � a �t� ignor�: dupliqu�\n"
 
-#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "� %s � a �t� ignor�: %s\n"
 
-#: g10/skclist.c:170
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "ignor�: cl� secr�te d�j� pr�sente\n"
 
-#: g10/skclist.c:185
+#: g10/skclist.c:186
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "c'est une cl� ElGamal g�n�r�e par PGP qui n'est pas s�re pour\n"
 "les signatures !"
 
-#: g10/tdbdump.c:59 g10/trustdb.c:365
+#: g10/tdbdump.c:60 g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "enregistrement de confiance %lu, type %d: l'�criture a �chou�: %s\n"
 
-#: g10/tdbdump.c:104
+#: g10/tdbdump.c:105
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5432,349 +5484,349 @@ msgstr ""
 "# Liste des valeurs de confiance assign�es, cr��e le %s\n"
 "# (Utilisez � gpg --import-ownertrust � pour les restaurer)\n"
 
-#: g10/tdbdump.c:159 g10/tdbdump.c:167 g10/tdbdump.c:172 g10/tdbdump.c:177
+#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
 #, c-format
 msgid "error in `%s': %s\n"
 msgstr "erreur dans `%s': %s\n"
 
-#: g10/tdbdump.c:159
+#: g10/tdbdump.c:160
 msgid "line too long"
 msgstr "ligne trop longue"
 
-#: g10/tdbdump.c:167
+#: g10/tdbdump.c:168
 msgid "colon missing"
 msgstr "symbole deux-points manquant"
 
-#: g10/tdbdump.c:173
+#: g10/tdbdump.c:174
 msgid "invalid fingerprint"
 msgstr "empreinte invalide"
 
-#: g10/tdbdump.c:178
+#: g10/tdbdump.c:179
 msgid "ownertrust value missing"
 msgstr "valeur de confiance au propri�taire manquante"
 
-#: g10/tdbdump.c:214
+#: g10/tdbdump.c:215
 #, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr ""
 "erreur pendant la recherche de l'enregistrement de confiance\n"
 "dans `%s': %s\n"
 
-#: g10/tdbdump.c:218
+#: g10/tdbdump.c:219
 #, c-format
 msgid "read error in `%s': %s\n"
 msgstr "erreur de lecture dans `%s': %s\n"
 
-#: g10/tdbdump.c:227 g10/trustdb.c:380
+#: g10/tdbdump.c:228 g10/trustdb.c:381
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de confiance: la synchronisation a �chou�: %s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1440
+#: g10/tdbio.c:129 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "enregistrement de base de confiance %lu: lseek a �chou�: %s\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1447
+#: g10/tdbio.c:135 g10/tdbio.c:1448
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 "enregistrement de la base de confiance %lu: l'�criture a �chou� (n=%d): %s\n"
 
-#: g10/tdbio.c:244
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "transaction de base de confiance trop volumineuse\n"
 
-#: g10/tdbio.c:497
+#: g10/tdbio.c:498
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "impossible d'acc�der � `%s': %s\n"
 
-#: g10/tdbio.c:512
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: le r�pertoire n'existe pas !\n"
 
-#: g10/tdbio.c:522 g10/tdbio.c:545 g10/tdbio.c:588
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "impossible de cr�er un verrou pour `%s'\n"
 
-#: g10/tdbio.c:524 g10/tdbio.c:591
+#: g10/tdbio.c:525 g10/tdbio.c:592
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "impossible de verrouiller `%s'\n"
 
-#: g10/tdbio.c:550
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: impossible de cr�er un enregistrement de version: %s"
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: base de confiance invalide cr��e\n"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: base de confiance cr��e\n"
 
-#: g10/tdbio.c:597
+#: g10/tdbio.c:598
 msgid "NOTE: trustdb not writable\n"
 msgstr "NOTE: la base de confiance n'a pas les permissions d'�criture\n"
 
-#: g10/tdbio.c:614
+#: g10/tdbio.c:615
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de confiance invalide\n"
 
-#: g10/tdbio.c:646
+#: g10/tdbio.c:647
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: la cr�ation de la table de hachage a �chou�: %s\n"
 
-#: g10/tdbio.c:654
+#: g10/tdbio.c:655
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: erreur pendant la mise � jour de l'enregistrement de version: %s\n"
 
-#: g10/tdbio.c:671 g10/tdbio.c:691 g10/tdbio.c:707 g10/tdbio.c:721
-#: g10/tdbio.c:751 g10/tdbio.c:1373 g10/tdbio.c:1400
+#: g10/tdbio.c:672 g10/tdbio.c:692 g10/tdbio.c:708 g10/tdbio.c:722
+#: g10/tdbio.c:752 g10/tdbio.c:1374 g10/tdbio.c:1401
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: erreur pendant la lecture de l'enregistrement de version: %s\n"
 
-#: g10/tdbio.c:730
+#: g10/tdbio.c:731
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: erreur pendant l'�criture de l'enregistrement de version: %s\n"
 
-#: g10/tdbio.c:1169
+#: g10/tdbio.c:1170
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de confiance: �lseek()� a �chou�: %s\n"
 
-#: g10/tdbio.c:1177
+#: g10/tdbio.c:1178
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de confiance: la lecture a �chou� (n=%d): %s\n"
 
-#: g10/tdbio.c:1198
+#: g10/tdbio.c:1199
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ce n'est pas un fichier de base de confiance\n"
 
-#: g10/tdbio.c:1216
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: enregistrement de version avec un num�ro %lu\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1222
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: version %d du fichier invalide\n"
 
-#: g10/tdbio.c:1406
+#: g10/tdbio.c:1407
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: erreur pendant la lecture de l'enregistrement libre: %s\n"
 
-#: g10/tdbio.c:1414
+#: g10/tdbio.c:1415
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr ""
 "%s: erreur pendant l'�criture de l'enregistrement de\n"
 "r�pertoire: %s\n"
 
-#: g10/tdbio.c:1424
+#: g10/tdbio.c:1425
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: n'a pu mettre un enregistrement � z�ro: %s\n"
 
-#: g10/tdbio.c:1454
+#: g10/tdbio.c:1455
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: impossible d'ajouter un enregistrement: %s\n"
 
-#: g10/tdbio.c:1499
+#: g10/tdbio.c:1500
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "la base de confiance est corrompue; ex�cutez �gpg --fix-trustdb�.\n"
 
-#: g10/textfilter.c:147
+#: g10/textfilter.c:148
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "impossible de traiter les lignes plus longues que %d caract�res\n"
 
-#: g10/textfilter.c:244
+#: g10/textfilter.c:245
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "la ligne d'entr�e est plus longue que %d caract�res\n"
 
-#: g10/trustdb.c:226
+#: g10/trustdb.c:227
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' n'est pas une identification de cl� longue valide\n"
 
-#: g10/trustdb.c:257
+#: g10/trustdb.c:258
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "cl� %s: accept�e comme cl� de confiance.\n"
 
-#: g10/trustdb.c:295
+#: g10/trustdb.c:296
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "la cl� %s appara�t plusieurs fois dans la base de confiance\n"
 
-#: g10/trustdb.c:310
+#: g10/trustdb.c:311
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "cl� %s: pas de cl� publique pour la cl� de confiance - ignor�e\n"
 
-#: g10/trustdb.c:320
+#: g10/trustdb.c:321
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "cl� %s marqu�e comme ayant une confiance ultime.\n"
 
-#: g10/trustdb.c:344
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr ""
 "enregistrement de confiance %lu, type de requ�te %d: la lecture a �chou�: %"
 "s\n"
 
-#: g10/trustdb.c:350
+#: g10/trustdb.c:351
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "l'enregistrement de confiance %lu: n'est pas du type demand� %d\n"
 
-#: g10/trustdb.c:446
+#: g10/trustdb.c:447
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "impossible d'utiliser ce mod�le de confiance inconnu (%d) -\n"
 "on utilise � la place le mod�le de confiance %s\n"
 
-#: g10/trustdb.c:452
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr "utilisation du mod�le de confiance %s\n"
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:506
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ revoked]"
 msgstr "revoqu�e"
 
-#: g10/trustdb.c:508 g10/trustdb.c:513
+#: g10/trustdb.c:509 g10/trustdb.c:514
 #, fuzzy
 msgid "[ expired]"
 msgstr "expir�e"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 #, fuzzy
 msgid "[ unknown]"
 msgstr "inconnu"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 #, fuzzy
 msgid "[marginal]"
 msgstr "marginale"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:518
 #, fuzzy
 msgid "[ultimate]"
 msgstr "ultime"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr "ind�fini"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 msgid "never"
 msgstr "jamais"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr "marginale"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:536
 msgid "full"
 msgstr "pleine"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr "ultime"
 
-#: g10/trustdb.c:576
+#: 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:582 g10/trustdb.c:2157
+#: g10/trustdb.c:583 g10/trustdb.c:2309
 #, 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:591
+#: 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:606
+#: 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:838 g10/trustdb.c:1276
+#: 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:1033
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr "faites un --check-trustdb\n"
 
-#: g10/trustdb.c:1037
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "v�rifier la base de confiance\n"
 
-#: g10/trustdb.c:1901
+#: g10/trustdb.c:2053
 #, 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:1965
+#: g10/trustdb.c:2117
 msgid "no ultimately trusted keys found\n"
 msgstr "aucune cl� de confiance ultime n'a �t� trouv�e\n"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:2131
 #, 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:2002
+#: g10/trustdb.c:2154
 #, 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:2088
+#: g10/trustdb.c:2240
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -5782,14 +5834,14 @@ msgstr ""
 "profondeur: %d  valide: %3d  sign�: %3d\n"
 "confiance: %d-. %dg. %dn. %dm. %df. %du\n"
 
-#: g10/trustdb.c:2163
+#: g10/trustdb.c:2315
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 "impossible de mettre � jour l'enregistrement de version de la\n"
 "base de confiance: l'�criture a �chou�: %s\n"
 
-#: g10/verify.c:116
+#: g10/verify.c:117
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -5799,305 +5851,344 @@ msgstr ""
 "Rappelez-vous bien que le fichier de signature (.sig ou .asc)\n"
 "doit �tre le premier fichier indiqu� sur la ligne de commande.\n"
 
-#: g10/verify.c:189
+#: g10/verify.c:190
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 "la ligne d'entr�e %u est trop longue ou il manque un caract�re de saut\n"
 "de ligne\n"
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "erreur g�n�rale"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "type de paquet inconnu"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "version inconnue"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "algorithme � cl� publique inconnu"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "algorithme de hachage inconnu"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "mauvaise cl� publique"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "mauvaise cl� secr�te"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "mauvaise signature"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "somme de contr�le erron�e"
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "mauvais mot de passe"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "cl� publique non trouv�e"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "algorithme de chiffrement inconnu"
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "impossible d'ouvrir le porte-cl�s"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "paquet invalide"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "armure invalide"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "pas d'utilisateur de ce nom"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "la cl� secr�te n'est pas disponible"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "mauvaise cl� secr�te utilis�e"
 
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "non support�"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "mauvaise cl�"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "erreur de lecture"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "erreur d'�criture"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "algorithme de compression inconnu"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "erreur d'ouverture de fichier"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "erreur de cr�ation de fichier"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "mot de passe invalide"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "algorithme � cl� publique non implant�"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "algorithme de chiffrement non implant�"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "classe de signature inconnue"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "erreur dans la base de confiance"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "mauvais entier en pr�cision multiple (MPI)"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "limite de ressources atteinte"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "porte-cl�s invalide"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "mauvais certificat"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "nom d'utilisateur malform�"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "erreur de fermeture de fichier"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "erreur pendant le changement de nom du fichier"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "erreur pendant la suppression du fichier"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "donn�es inattendues"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "conflit de dates"
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "algorithme de cl�s publiques inutilisable"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "le fichier existe"
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "cl� faible"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "argument invalide"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "mauvaise adresse (URI)"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "URI non support�e"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "erreur de r�seau"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "non chiffr�"
 
-#: util/errors.c:103
+#: util/errors.c:104
 msgid "not processed"
 msgstr "non trait�"
 
-#: util/errors.c:105
+#: util/errors.c:106
 msgid "unusable public key"
 msgstr "cl� publique inutilisable"
 
-#: util/errors.c:106
+#: util/errors.c:107
 msgid "unusable secret key"
 msgstr "cl� secr�te inutilisable"
 
-#: util/errors.c:107
+#: util/errors.c:108
 msgid "keyserver error"
 msgstr "erreur du serveur de cl�s"
 
-#: util/errors.c:108
+#: util/errors.c:109
 msgid "canceled"
 msgstr "annul�"
 
-#: util/errors.c:109
+#: util/errors.c:110
 msgid "no card"
 msgstr "pas de carte"
 
-#: util/logger.c:157
+#: util/logger.c:158
 msgid "ERROR: "
 msgstr "ERREUR: "
 
-#: util/logger.c:160
+#: util/logger.c:161
 msgid "WARNING: "
 msgstr "AVERTISSEMENT: "
 
-#: util/logger.c:223
+#: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... c'est un bug (%s:%d:%s)\n"
 
-#: util/logger.c:229
+#: util/logger.c:230
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "vous avez trouv� un bug... (%s:%d)\n"
 
-#: util/miscutil.c:336 util/miscutil.c:373
+#: util/miscutil.c:330 util/miscutil.c:367
 msgid "yes"
 msgstr "oui"
 
-#: util/miscutil.c:337 util/miscutil.c:378
+#: util/miscutil.c:331 util/miscutil.c:372
 msgid "yY"
 msgstr "oO"
 
-#: util/miscutil.c:339 util/miscutil.c:375
+#: util/miscutil.c:333 util/miscutil.c:369
 msgid "no"
 msgstr "non"
 
-#: util/miscutil.c:340 util/miscutil.c:379
+#: util/miscutil.c:334 util/miscutil.c:373
 msgid "nN"
 msgstr "nN"
 
-#: util/miscutil.c:377
+#: util/miscutil.c:371
 msgid "quit"
 msgstr "quitter"
 
-#: util/miscutil.c:380
+#: util/miscutil.c:374
 msgid "qQ"
 msgstr "qQ"
 
-#: util/miscutil.c:413
+#: util/miscutil.c:407
 msgid "okay|okay"
 msgstr "ok|ok"
 
-#: util/miscutil.c:415
+#: util/miscutil.c:409
 msgid "cancel|cancel"
 msgstr "annuler|annuler"
 
-#: util/miscutil.c:416
+#: util/miscutil.c:410
 msgid "oO"
 msgstr "oO"
 
-#: util/miscutil.c:417
+#: util/miscutil.c:411
 msgid "cC"
 msgstr "aA"
 
-#: util/secmem.c:90
+#: util/secmem.c:91
 msgid "WARNING: using insecure memory!\n"
 msgstr "AVERTISSEMENT: l'utilisation de la m�moire n'est pas s�re !\n"
 
-#: util/secmem.c:91
+#: util/secmem.c:92
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "voir http://www.gnupg.org/fr/faq.html pour plus d'informations\n"
 
-#: util/secmem.c:343
+#: util/secmem.c:344
 msgid "operation is not possible without initialized secure memory\n"
 msgstr ""
 "l'op�ration n'est pas possible tant que la m�moire s�re n'est pas\n"
 "initialis�e\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:345
 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 "error getting serial number: %s\n"
+#~ msgstr "erreur pendant la lecture du num�ro de s�rie: %s\n"
+
+#~ msgid "Hint: Select the user IDs to sign\n"
+#~ msgstr "Aide: S�lectionner les utilisateurs � signer\n"
+
+#~ msgid "length of RSA modulus is not %d\n"
+#~ msgstr "la longueur du modulo RSA n'est pas %d\n"
+
+#~ msgid "length of an RSA prime is not %d\n"
+#~ msgstr "la longueur d'un nombre premier RSA n'est pas %d\n"
+
+#~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+#~ msgstr "mauvais mot de passe ou algorithme de chiffrement inconnu (%d)\n"
+
+#~ msgid "can't set client pid for the agent\n"
+#~ msgstr "impossible d'obtenir le pid du client pour l'agent\n"
+
+#~ msgid "can't get server read FD for the agent\n"
+#~ msgstr ""
+#~ "impossible d'obtenir le descripteur de lecture du serveur\n"
+#~ "pour l'agent\n"
+
+#~ msgid "can't get server write FD for the agent\n"
+#~ msgstr ""
+#~ "impossible d'obtenir le descripteur d'�criture du serveur pour l'agent\n"
+
+#~ msgid "communication problem with gpg-agent\n"
+#~ msgstr "probl�me de communication avec ssh-agent\n"
+
+#~ msgid "passphrase too long\n"
+#~ msgstr "mot de passe trop long\n"
+
+#~ msgid "invalid response from agent\n"
+#~ msgstr "r�ponse de l'agent invalide\n"
+
+#~ msgid "problem with the agent: agent returns 0x%lx\n"
+#~ msgstr "probl�me avec l'agent : l'agent renvoie 0x%lx\n"
+
 #~ msgid "select secondary key N"
 #~ msgstr "s�lectionner la cl� secondaire N"
 
diff --git a/po/gl.po b/po/gl.po
index b51e63395..33de0a698 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: 2005-03-15 16:35+0100\n"
+"POT-Creation-Date: 2005-05-31 10:05+0200\n"
 "PO-Revision-Date: 2003-12-04 11:39+0100\n"
 "Last-Translator: Jacobo Tarrio <[email protected]>\n"
 "Language-Team: Galician <[email protected]>\n"
@@ -14,80 +14,80 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:120
+#: cipher/primegen.c:121
 #, fuzzy, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr "non se pode xerar un n�mero primo de menos de %d bits\n"
 
-#: cipher/primegen.c:311
+#: cipher/primegen.c:312
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "non se pode xerar un n�mero primo de menos de %d bits\n"
 
-#: cipher/random.c:163
+#: cipher/random.c:164
 msgid "no entropy gathering module detected\n"
 msgstr "non se detectou un m�dulo de acumulaci�n de entrop�a\n"
 
-#: cipher/random.c:387 g10/card-util.c:656 g10/card-util.c:725
-#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2255
-#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
-#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
-#: g10/tdbio.c:600
+#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
+#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
+#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
+#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
+#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/tdbio.c:601
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
 
-#: cipher/random.c:391
+#: cipher/random.c:392
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "non se puido facer stat sobre `%s': %s\n"
 
-#: cipher/random.c:396
+#: cipher/random.c:397
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' non � un ficheiro normal - ign�rase\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:402
 msgid "note: random_seed file is empty\n"
 msgstr "nota: o ficheiro random_seed est� baleiro\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:408
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "AVISO: tama�o do ficheiro random_seed non v�lido - non se emprega\n"
 
-#: cipher/random.c:415
+#: cipher/random.c:416
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "non se pode ler de `%s': %s\n"
 
-#: cipher/random.c:453
+#: cipher/random.c:454
 msgid "note: random_seed file not updated\n"
 msgstr "nota: o ficheiro random_seed non se actualiza\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2723
-#: g10/keygen.c:2753 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
-#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:481
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "non se pode escribir en `%s': %s\n"
 
-#: cipher/random.c:483
+#: cipher/random.c:484
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "non se pode pechar `%s': %s\n"
 
-#: cipher/random.c:728
+#: cipher/random.c:729
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVISO: ��empr�gase un xerador de n�meros aleatorios inseguro!!\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:730
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -102,7 +102,7 @@ msgstr ""
 "�NON USE NINGUN DATO XERADO POR ESTE PROGRAMA!\n"
 "\n"
 
-#: cipher/rndegd.c:204
+#: cipher/rndegd.c:205
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -112,7 +112,7 @@ msgstr ""
 "pouco se iso evita que se aburra, que iso ha aumenta-la\n"
 "calidade da entrop�a.\n"
 
-#: cipher/rndlinux.c:134
+#: cipher/rndlinux.c:135
 #, c-format
 msgid ""
 "\n"
@@ -124,45 +124,62 @@ msgstr ""
 "traballo para lle dar ao sistema operativo unha oportunidade de acumular\n"
 "m�is entrop�a (Prec�sanse %d bytes m�is)\n"
 
-#: g10/app-openpgp.c:547
+#: g10/app-openpgp.c:596
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: g10/app-openpgp.c:560
+#: g10/app-openpgp.c:609
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "fallo ao reconstru�-la cach� de chaveiros: %s\n"
 
-#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
+#: g10/app-openpgp.c:977
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "fallou o borrado do bloque de chaves: %s\n"
+
+#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+msgid "response does not contain the public key data\n"
+msgstr ""
+
+#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
-#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
+#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
+#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "o env�o ao servidor de chaves fallou: %s\n"
 
-#: g10/app-openpgp.c:836
+#: g10/app-openpgp.c:1310
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:857
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:862
+#: g10/app-openpgp.c:1336
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -170,354 +187,359 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:869
+#: g10/app-openpgp.c:1343
 msgid "|A|Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1018
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:1492
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1018
+#: g10/app-openpgp.c:1492
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1022
+#: g10/app-openpgp.c:1496
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
+#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "erro ao le-lo bloque de chaves: %s\n"
 
-#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
+#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: erro ao ler un rexistro libre: %s\n"
 
-#: g10/app-openpgp.c:1104
+#: g10/app-openpgp.c:1562
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' xa est� comprimido\n"
 
-#: g10/app-openpgp.c:1108
+#: g10/app-openpgp.c:1566
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1110
+#: g10/app-openpgp.c:1568
 #, fuzzy
 msgid "generating new key\n"
 msgstr "xerar un novo par de chaves"
 
-#: g10/app-openpgp.c:1120
+#: g10/app-openpgp.c:1735
+msgid "creation timestamp missing\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1742
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1749
+#, c-format
+msgid "RSA public exponent missing or largerr than %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1827
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
+
+#: g10/app-openpgp.c:1886
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1135
+#: g10/app-openpgp.c:1901
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1904
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
-msgid "response does not contain the public key data\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
-msgid "response does not contain the RSA modulus\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
-msgid "response does not contain the RSA public exponent\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1195
+#: g10/app-openpgp.c:1961
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1356
+#: g10/app-openpgp.c:2130
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1364
+#: g10/app-openpgp.c:2138
 #, c-format
-msgid "PIN [sigs done: %lu]"
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
+#: g10/app-openpgp.c:2399
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "non se atoparon datos OpenPGP v�lidos.\n"
 
-#: g10/app-openpgp.c:1731
-#, fuzzy, c-format
-msgid "error getting serial number: %s\n"
-msgstr "erro ao crea-lo contrasinal: %s\n"
-
-#: g10/app-openpgp.c:1826
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
-
-#: g10/app-openpgp.c:1868
-#, fuzzy
-msgid "reading the key failed\n"
-msgstr "fallou o borrado do bloque de chaves: %s\n"
-
-#: g10/armor.c:317
+#: g10/armor.c:318
 #, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:346
+#: g10/armor.c:347
 msgid "invalid armor header: "
 msgstr "cabeceira de armadura non v�lida: "
 
-#: g10/armor.c:353
+#: g10/armor.c:354
 msgid "armor header: "
 msgstr "cabeceira de armadura: "
 
-#: g10/armor.c:364
+#: g10/armor.c:365
 msgid "invalid clearsig header\n"
 msgstr "cabeceira de sinatura en claro non v�lida\n"
 
-#: g10/armor.c:416
+#: g10/armor.c:417
 msgid "nested clear text signatures\n"
 msgstr "sinaturas en texto claro ani�adas\n"
 
-#: g10/armor.c:551
+#: g10/armor.c:552
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "armadura inesperada:"
 
-#: g10/armor.c:563
+#: g10/armor.c:564
 msgid "invalid dash escaped line: "
 msgstr "li�a escapada cunha barra non v�lida: "
 
-#: g10/armor.c:715 g10/armor.c:1322
+#: g10/armor.c:716 g10/armor.c:1323
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "car�cter radix64 non v�lido %02x omitido\n"
 
-#: g10/armor.c:758
+#: g10/armor.c:759
 msgid "premature eof (no CRC)\n"
 msgstr "fin de ficheiro prematura (non hai CRC)\n"
 
-#: g10/armor.c:792
+#: g10/armor.c:793
 msgid "premature eof (in CRC)\n"
 msgstr "fin de ficheiro prematura (no CRC)\n"
 
-#: g10/armor.c:800
+#: g10/armor.c:801
 msgid "malformed CRC\n"
 msgstr "CRC mal formado\n"
 
-#: g10/armor.c:804 g10/armor.c:1359
+#: g10/armor.c:805 g10/armor.c:1360
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Erro de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:824
+#: g10/armor.c:825
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "fin de ficheiro prematura (nas li�as adicionais)\n"
 
-#: g10/armor.c:828
+#: g10/armor.c:829
 msgid "error in trailer line\n"
 msgstr "error nunha li�a adicional\n"
 
-#: g10/armor.c:1137
+#: g10/armor.c:1138
 msgid "no valid OpenPGP data found.\n"
 msgstr "non se atoparon datos OpenPGP v�lidos.\n"
 
-#: g10/armor.c:1142
+#: g10/armor.c:1143
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura incorrecta: li�a m�is longa ca %d caracteres\n"
 
-#: g10/armor.c:1146
+#: g10/armor.c:1147
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "car�cter quoted-printable na armadura - seguramente empregouse un MTA con "
 "erros\n"
 
-#: g10/card-util.c:58 g10/card-util.c:295
+#: g10/card-util.c:63 g10/card-util.c:303
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "a chave secreta non est� dispo�ible"
 
-#: g10/card-util.c:63
+#: g10/card-util.c:68
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1329 g10/delkey.c:127 g10/keyedit.c:1430
-#: g10/keygen.c:2439 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1510
+#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
 #, 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:97 g10/card-util.c:1108 g10/card-util.c:1191
-#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
-#: g10/keygen.c:1365
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
+#: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "�A s�a selecci�n? "
 
-#: g10/card-util.c:206 g10/card-util.c:256
+#: g10/card-util.c:213 g10/card-util.c:263
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:391
+#: g10/card-util.c:410
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 #, fuzzy
 msgid "unspecified"
 msgstr "Non se especificou un motivo"
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 #, fuzzy
 msgid "not forced"
 msgstr "non procesado"
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:497
+#: g10/card-util.c:516
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:499
+#: g10/card-util.c:518
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:501
+#: g10/card-util.c:520
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:518
+#: g10/card-util.c:537
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:539
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:538
+#: g10/card-util.c:557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:559
+#: g10/card-util.c:578
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "non hai unha chave p�blica correspondente: %s\n"
 
-#: g10/card-util.c:567
+#: g10/card-util.c:586
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:665 g10/card-util.c:734 g10/import.c:261
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:692
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:683
+#: g10/card-util.c:702
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:742
+#: g10/card-util.c:761
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:752
+#: g10/card-util.c:771
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:772
+#: g10/card-util.c:791
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferencias actualizadas"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:799
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "caracter non v�lido na cadea de preferencias\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:808
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "caracter non v�lido na cadea de preferencias\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:829
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:824
+#: g10/card-util.c:843
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "erro: pegada dactilar non v�lida\n"
 
-#: g10/card-util.c:845
+#: g10/card-util.c:864
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Pegada dactilar:"
 
-#: g10/card-util.c:868
+#: g10/card-util.c:887
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "erro: pegada dactilar non v�lida\n"
 
-#: g10/card-util.c:916
+#: g10/card-util.c:935
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: g10/card-util.c:917
+#: g10/card-util.c:936
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "non se atoparon datos OpenPGP v�lidos.\n"
 
-#: g10/card-util.c:926
+#: g10/card-util.c:945
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1030
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1030 g10/card-util.c:1039
+#: g10/card-util.c:1051 g10/card-util.c:1060
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1051
+#: g10/card-util.c:1072
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1060
+#: g10/card-util.c:1081
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -525,287 +547,291 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1099
+#: g10/card-util.c:1120
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Por favor, seleccione o tipo de chave que quere:\n"
 
-#: g10/card-util.c:1101 g10/card-util.c:1182
+#: g10/card-util.c:1122 g10/card-util.c:1203
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/card-util.c:1102 g10/card-util.c:1184
+#: g10/card-util.c:1123 g10/card-util.c:1205
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/card-util.c:1103 g10/card-util.c:1186
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1119 g10/card-util.c:1202 g10/keyedit.c:908
-#: g10/keygen.c:1404 g10/revoke.c:642
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
+#: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "Selecci�n non v�lida.\n"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1200
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Por favor, escolla o motivo da revocaci�n:\n"
 
-#: g10/card-util.c:1214
+#: g10/card-util.c:1235
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de protecci�n desco�ecido\n"
 
-#: g10/card-util.c:1219
+#: g10/card-util.c:1240
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "as partes secretas da chave primaria non est�n dispo�ibles.\n"
 
-#: g10/card-util.c:1224
+#: g10/card-util.c:1245
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
 
-#: g10/card-util.c:1294 g10/keyedit.c:1317
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "sa�r deste men�"
 
-#: g10/card-util.c:1296
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1297 g10/keyedit.c:1320
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "amosar esta axuda"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "list all available data"
 msgstr "Chave dispo�ible en: "
 
-#: g10/card-util.c:1302
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1303
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1304
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1305
+#: g10/card-util.c:1327
 #, fuzzy
 msgid "change the login name"
 msgstr "cambia-la fecha de expiraci�n"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the language preferences"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/card-util.c:1307
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1308
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "amosar fingerprint"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1310
+#: g10/card-util.c:1332
 #, fuzzy
 msgid "generate new keys"
 msgstr "xerar un novo par de chaves"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1377 g10/keyedit.c:1526
+#: g10/card-util.c:1334
+msgid "verify the PIN and list all data"
+msgstr ""
+
+#: g10/card-util.c:1454 g10/keyedit.c:1609
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1412
+#: g10/card-util.c:1492
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1430
+#: g10/card-util.c:1525
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/card-util.c:1499 g10/keyedit.c:2104
+#: g10/card-util.c:1599 g10/keyedit.c:2210
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando incorrecto (tente \"help\")\n"
 
-#: g10/cardglue.c:287
+#: g10/cardglue.c:396
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:519
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:380
+#: g10/cardglue.c:527
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:852
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Introduza o ID de usuario: "
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:853
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "Introduza o ID de usuario: "
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:854
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:691
+#: g10/cardglue.c:855
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Introduza o ID de usuario: "
 
-#: g10/cardglue.c:705
+#: g10/cardglue.c:872
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Repita o contrasinal: "
 
-#: g10/cardglue.c:719
+#: g10/cardglue.c:886
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "o contrasinal non se repetiu correctamente; t�nteo de novo"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
-#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "non se puido abrir `%s'\n"
 
-#: g10/decrypt.c:104 g10/encode.c:859
+#: g10/decrypt.c:105 g10/encode.c:846
 msgid "--output doesn't work for this command\n"
 msgstr "--output non traballa con este comando\n"
 
-#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3167 g10/keyserver.c:1511
-#: g10/revoke.c:226
+#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3346 g10/keyserver.c:1541
+#: g10/revoke.c:227
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2300 g10/keyserver.c:1525
-#: g10/revoke.c:232 g10/revoke.c:439
+#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erro ao le-lo bloque de chaves: %s\n"
 
-#: g10/delkey.c:128 g10/delkey.c:135
+#: g10/delkey.c:129 g10/delkey.c:136
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(a menos que especifique a chave por pegada dactilar)\n"
 
-#: g10/delkey.c:134
+#: g10/delkey.c:135
 #, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr ""
 "iso non se pode facer no modo de procesamento por lotes sen \"--yes\"\n"
 
-#: g10/delkey.c:146
+#: g10/delkey.c:147
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "�Borrar esta chave do chaveiro? "
 
-#: g10/delkey.c:154
+#: g10/delkey.c:155
 #, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "�Esta � unha chave secreta! - �est� seguro de que quere borrala? "
 
-#: g10/delkey.c:164
+#: g10/delkey.c:165
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: g10/delkey.c:174
+#: g10/delkey.c:175
 msgid "ownertrust information cleared\n"
 msgstr "borrouse a informaci�n de confianza\n"
 
-#: g10/delkey.c:205
+#: g10/delkey.c:206
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "�hai unha chave secreta para a chave p�blica \"%s\"!\n"
 
-#: g10/delkey.c:207
+#: g10/delkey.c:208
 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:210 g10/sign.c:1186
+#: g10/encode.c:211 g10/sign.c:1218
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: g10/encode.c:215
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "non se pode empregar un paquete sim�trico ESK debido ao modo S2K\n"
 
-#: g10/encode.c:228
+#: g10/encode.c:229
 #, fuzzy, c-format
 msgid "using cipher %s\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: g10/encode.c:238 g10/encode.c:558
+#: g10/encode.c:239 g10/encode.c:545
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' xa est� comprimido\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
+#: g10/encode.c:302 g10/encode.c:591 g10/sign.c:566
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � un ficheiro baleiro\n"
 
-#: g10/encode.c:472
+#: g10/encode.c:466
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "s� pode cifrar a chaves RSA de 2048 bits ou menos en modo --pgp2\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:488
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encode.c:530
+#: g10/encode.c:517
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "non se puido emprega-la cifra IDEA para t�dalas chaves �s que est� a "
 "cifrar.\n"
 
-#: g10/encode.c:540
+#: g10/encode.c:527
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forza-la cifra sim�trica %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:635 g10/sign.c:899
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -814,128 +840,128 @@ msgstr ""
 "forza-lo algoritmo de compresi�n %s (%d) viola as preferencias do "
 "destinatario\n"
 
-#: g10/encode.c:735
+#: g10/encode.c:722
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forza-la cifra sim�trica %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/encode.c:805 g10/pkclist.c:721 g10/pkclist.c:757
+#: g10/encode.c:792 g10/pkclist.c:722 g10/pkclist.c:758
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "non se pode empregar %s no modo %s\n"
 
-#: g10/encode.c:832
+#: g10/encode.c:819
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
 
-#: g10/encr-data.c:66 g10/mainproc.c:301
+#: g10/encr-data.c:67 g10/mainproc.c:302
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "datos cifrados con %s\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:305
+#: g10/encr-data.c:69 g10/mainproc.c:306
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado cun algoritmo desco�ecido %d\n"
 
-#: g10/encr-data.c:92
+#: g10/encr-data.c:93
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "AVISO: cifrouse a mensaxe cunha chave feble no cifrado sim�trico.\n"
 
-#: g10/encr-data.c:103
+#: g10/encr-data.c:104
 msgid "problem handling encrypted packet\n"
 msgstr "problema ao manexa-lo paquete cifrado\n"
 
-#: g10/exec.c:48
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "non se soporta a execuci�n remota de programas\n"
 
-#: g10/exec.c:184 g10/openfile.c:406
+#: g10/exec.c:173 g10/openfile.c:410
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "non se pode crea-lo directorio `%s': %s\n"
 
-#: g10/exec.c:325
+#: g10/exec.c:314
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "as chamadas a programas externos est�n desactivadas debido a opci�ns de "
 "permisos de ficheiros non seguras\n"
 
-#: g10/exec.c:355
+#: g10/exec.c:344
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "esta plataforma precisa de ficheiros temporais ao chamar a programas "
 "externos\n"
 
-#: g10/exec.c:433
+#: g10/exec.c:422
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "non se puido executar %s \"%s\": %s\n"
 
-#: g10/exec.c:436
+#: g10/exec.c:425
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "non se puido executar %s \"%s\": %s\n"
 
-#: g10/exec.c:521
+#: g10/exec.c:510
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "erro do sistema ao chamar a un programa externo: %s\n"
 
-#: g10/exec.c:532 g10/exec.c:598
+#: g10/exec.c:521 g10/exec.c:587
 msgid "unnatural exit of external program\n"
 msgstr "sa�da non natural do programa externo\n"
 
-#: g10/exec.c:547
+#: g10/exec.c:536
 msgid "unable to execute external program\n"
 msgstr "non se puido executar un programa externo\n"
 
-#: g10/exec.c:563
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "non se puido le-la resposta do programa externo: %s\n"
 
-#: g10/exec.c:609 g10/exec.c:616
+#: g10/exec.c:598 g10/exec.c:605
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
 
-#: g10/exec.c:621
+#: g10/exec.c:610
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "AVISO: non se puido elimina-lo directorio temporal `%s': %s\n"
 
-#: g10/export.c:183
+#: g10/export.c:184
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/export.c:212
+#: g10/export.c:213
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "chave %08lX: non est� protexida - omitida\n"
 
-#: g10/export.c:220
+#: g10/export.c:221
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "chave %08lX: chave estilo PGP 2.x - omitida\n"
 
-#: g10/export.c:395
+#: g10/export.c:398
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 "AVISO: a chave secreta %08lX non ten unha suma de comprobaci�n SK simple\n"
 
-#: g10/export.c:427
+#: g10/export.c:430
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: non se exportou nada\n"
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid ""
 "@Commands:\n"
 " "
@@ -943,128 +969,128 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|facer unha sinatura"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|facer unha sinatura en texto claro"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "make a detached signature"
 msgstr "facer unha sinatura separada"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encrypt data"
 msgstr "cifrar datos"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar s� con cifrado sim�trico"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "decrypt data (default)"
 msgstr "descifrar datos (por defecto)"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "verify a signature"
 msgstr "verificar unha sinatura"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys"
 msgstr "ve-la lista de chaves"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and signatures"
 msgstr "ve-la lista de chaves e sinaturas"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verifica-las sinaturas das chaves"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "list keys and fingerprints"
 msgstr "ve-la lista de chaves e pegadas dactilares"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "list secret keys"
 msgstr "ve-la lista de chaves secretas"
 
-#: g10/g10.c:379
+#: g10/g10.c:381
 msgid "generate a new key pair"
 msgstr "xerar un novo par de chaves"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the public keyring"
 msgstr "borrar chaves do chaveiro p�blico"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "remove keys from the secret keyring"
 msgstr "borrar chaves do chaveiro secreto"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign a key"
 msgstr "asinar unha chave"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "sign a key locally"
 msgstr "asinar unha chave localmente"
 
-#: g10/g10.c:385
+#: g10/g10.c:387
 msgid "sign or edit a key"
 msgstr "asinar ou editar unha chave"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "generate a revocation certificate"
 msgstr "xerar un certificado de revocaci�n"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:389
+#: g10/g10.c:391
 msgid "export keys to a key server"
 msgstr "exportar chaves a un servidor de chaves"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "import keys from a key server"
 msgstr "importar chaves dun servidor de chaves"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "search for keys on a key server"
 msgstr "buscar chaves nun servidor de chaves"
 
-#: g10/g10.c:394
+#: g10/g10.c:396
 msgid "update all keys from a keyserver"
 msgstr "actualizar t�dalas chaves dun servidor de chaves"
 
-#: g10/g10.c:397
+#: g10/g10.c:399
 msgid "import/merge keys"
 msgstr "importar/mesturar chaves"
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "print the card status"
 msgstr ""
 
-#: g10/g10.c:401
+#: g10/g10.c:403
 msgid "change data on a card"
 msgstr ""
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/g10.c:410
+#: g10/g10.c:412
 msgid "update the trust database"
 msgstr "actualiza-la base de datos de confianza"
 
-#: g10/g10.c:417
+#: g10/g10.c:419
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
 
-#: g10/g10.c:421 g10/gpgv.c:66
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1074,51 +1100,51 @@ msgstr ""
 "Opci�ns:\n"
 " "
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "create ascii armored output"
 msgstr "crear sa�da con armadura en ascii"
 
-#: g10/g10.c:425
+#: g10/g10.c:427
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/g10.c:436
+#: g10/g10.c:438
 msgid "use this user-id to sign or decrypt"
 msgstr "empregar este id de usuario para asinar ou descifrar"
 
-#: g10/g10.c:437
+#: g10/g10.c:439
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|axusta-lo nivel de compresi�n a N (0 desactiva)"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/g10.c:452
+#: g10/g10.c:458
 msgid "use as output file"
 msgstr "usar coma ficheiro de sa�da"
 
-#: g10/g10.c:454 g10/gpgv.c:68
+#: g10/g10.c:460 g10/gpgv.c:73
 msgid "verbose"
 msgstr "lareto"
 
-#: g10/g10.c:465
+#: g10/g10.c:471
 msgid "do not make any changes"
 msgstr "non facer ning�n cambio"
 
-#: g10/g10.c:466
+#: g10/g10.c:472
 msgid "prompt before overwriting"
 msgstr "avisar antes de sobrescribir"
 
-#: g10/g10.c:507
+#: g10/g10.c:513
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:508
+#: g10/g10.c:514
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:536
+#: g10/g10.c:542
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1126,7 +1152,7 @@ msgstr ""
 "@\n"
 "(Vexa a p�xina man para un listado completo de comandos e opci�ns)\n"
 
-#: g10/g10.c:539
+#: g10/g10.c:545
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1146,17 +1172,17 @@ msgstr ""
 " --list-keys [nomes]        amosa-las chaves\n"
 " --fingerprint [nomes]      amosa-las pegadas dactilares\n"
 
-#: g10/g10.c:720 g10/gpgv.c:93
+#: g10/g10.c:724 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Por favor, informe dos erros no programa a <[email protected]>,\n"
 "e dos erros na traducci�n a <[email protected]>.\n"
 
-#: g10/g10.c:737
+#: g10/g10.c:741
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: g10/g10.c:740
+#: g10/g10.c:744
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1166,7 +1192,7 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operaci�n por defecto depende dos datos de entrada\n"
 
-#: g10/g10.c:751
+#: g10/g10.c:755
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1174,462 +1200,472 @@ msgstr ""
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/g10.c:754
+#: g10/g10.c:758
 msgid "Pubkey: "
 msgstr "P�blica: "
 
-#: g10/g10.c:760 g10/keyedit.c:2141
+#: g10/g10.c:764 g10/keyedit.c:2248
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/g10.c:766
+#: g10/g10.c:770
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:772 g10/keyedit.c:2187
+#: g10/g10.c:776 g10/keyedit.c:2294
 msgid "Compression: "
 msgstr "Compresi�n: "
 
-#: g10/g10.c:855
+#: g10/g10.c:859
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opci�ns] "
 
-#: g10/g10.c:1003
+#: g10/g10.c:1007
 msgid "conflicting commands\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/g10.c:1021
+#: g10/g10.c:1025
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "non se atopou un signo = na definici�n do grupo \"%s\"\n"
 
-#: g10/g10.c:1218
+#: g10/g10.c:1222
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/g10.c:1221
+#: g10/g10.c:1225
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/g10.c:1224
+#: g10/g10.c:1228
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/g10.c:1230
+#: g10/g10.c:1234
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/g10.c:1233
+#: g10/g10.c:1237
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1240
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/g10.c:1242
+#: g10/g10.c:1246
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/g10.c:1245
+#: g10/g10.c:1249
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/g10.c:1248
+#: g10/g10.c:1252
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1258
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/g10.c:1257
+#: g10/g10.c:1261
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/g10.c:1260
+#: g10/g10.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/g10.c:1401
+#: g10/g10.c:1405
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1802
 #, 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/g10.c:1838
+#: g10/g10.c:1844
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: non existe o ficheiro de opci�ns por defecto `%s'\n"
 
-#: g10/g10.c:1842
+#: g10/g10.c:1848
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de opci�ns `%s': %s\n"
 
-#: g10/g10.c:1849
+#: g10/g10.c:1855
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
 
-#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s non � para uso normal!\n"
 
-#: g10/g10.c:2076
+#: g10/g10.c:2082
 #, 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/g10.c:2293
+#: g10/g10.c:2236 g10/g10.c:2248
+#, fuzzy, c-format
+msgid "`%s' is not a valid signature expiration\n"
+msgstr "%s non � un xogo de caracteres v�lido\n"
+
+#: g10/g10.c:2321
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3683
+#: g10/g10.c:2340 g10/keyedit.c:3862
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2346
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2349
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2356
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2359
 msgid "invalid import options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2366
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2369
 msgid "invalid export options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2376
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2379
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2401
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2404
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2411
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "non se puido estabrecer exec-path a %s\n"
 
-#: g10/g10.c:2573
+#: g10/g10.c:2602
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: �o programa pode crear un ficheiro 'core'!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2606
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s fai que se ignore %s\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2615
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s non se admite con %s!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2618
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s non ten sentido empreg�ndoo con %s!\n"
 
-#: g10/g10.c:2603
+#: g10/g10.c:2625
+#, 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/g10.c:2640
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/g10.c:2617
+#: g10/g10.c:2654
 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/g10.c:2623
+#: g10/g10.c:2660
 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/g10.c:2629
+#: g10/g10.c:2666
 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/g10.c:2642
+#: g10/g10.c:2679
 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/g10.c:2712 g10/g10.c:2736
+#: g10/g10.c:2746 g10/g10.c:2770
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/g10.c:2718 g10/g10.c:2742
+#: g10/g10.c:2752 g10/g10.c:2776
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo seleccionado non � v�lido\n"
 
-#: g10/g10.c:2724
+#: g10/g10.c:2758
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2764
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo de certificaci�n seleccionado non � v�lido\n"
 
-#: g10/g10.c:2745
+#: g10/g10.c:2779
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser superior a 0\n"
 
-#: g10/g10.c:2747
+#: g10/g10.c:2781
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser superior a 1\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2783
 #, 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/g10.c:2751
+#: g10/g10.c:2785
 #, 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/g10.c:2753
+#: g10/g10.c:2787
 #, 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/g10.c:2756
+#: g10/g10.c:2790
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: desacons�llase encarecidamente o modo S2K simple (0)\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2794
 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/g10.c:2767
+#: g10/g10.c:2801
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto non v�lidas\n"
 
-#: g10/g10.c:2776
+#: g10/g10.c:2810
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias de cifrado personais non v�lidas\n"
 
-#: g10/g10.c:2780
+#: g10/g10.c:2814
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias de resumo personais non v�lidas\n"
 
-#: g10/g10.c:2784
+#: g10/g10.c:2818
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias de compresi�n personais non v�lidas\n"
 
-#: g10/g10.c:2817
+#: g10/g10.c:2851
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�%s a�nda non traballa con %s!\n"
 
-#: g10/g10.c:2864
+#: g10/g10.c:2898
 #, 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/g10.c:2869
+#: g10/g10.c:2903
 #, 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/g10.c:2874
+#: g10/g10.c:2908
 #, 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/g10.c:2970
+#: g10/g10.c:3004
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: g10/g10.c:2981
+#: g10/g10.c:3015
 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/g10.c:2992
+#: g10/g10.c:3026
 msgid "--store [filename]"
 msgstr "--store [ficheiro]"
 
-#: g10/g10.c:2999
+#: g10/g10.c:3033
 msgid "--symmetric [filename]"
 msgstr "--symmetric [ficheiro]"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3035
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/g10.c:3011
+#: g10/g10.c:3045
 msgid "--encrypt [filename]"
 msgstr "--encrypt [ficheiro]"
 
-#: g10/g10.c:3024
+#: g10/g10.c:3058
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3060
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3029
+#: g10/g10.c:3063
 #, 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/g10.c:3047
+#: g10/g10.c:3081
 msgid "--sign [filename]"
 msgstr "--sign [ficheiro]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3094
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/g10.c:3075
+#: g10/g10.c:3109
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/g10.c:3077
+#: g10/g10.c:3111
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3080
+#: g10/g10.c:3114
 #, 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/g10.c:3100
+#: g10/g10.c:3134
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [ficheiro]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3143
 msgid "--clearsign [filename]"
 msgstr "--clearsign [ficheiro]"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3168
 msgid "--decrypt [filename]"
 msgstr "--decrypt [ficheiro]"
 
-#: g10/g10.c:3142
+#: g10/g10.c:3176
 msgid "--sign-key user-id"
 msgstr "--sign-key id-de-usuario"
 
-#: g10/g10.c:3146
+#: g10/g10.c:3180
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-de-usuario"
 
-#: g10/g10.c:3167
+#: g10/g10.c:3201
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-de-usuario [comandos]"
 
-#: g10/g10.c:3238
+#: g10/g10.c:3272
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-de-usuario] [chaveiro]"
 
-#: g10/g10.c:3275
+#: g10/g10.c:3309
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "o env�o ao servidor de chaves fallou: %s\n"
 
-#: g10/g10.c:3277
+#: g10/g10.c:3311
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "a recepci�n do servidor de chaves fallou: %s\n"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3313
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "a exportaci�n da chave fallou: %s\n"
 
-#: g10/g10.c:3290
+#: g10/g10.c:3324
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "a busca no servidor de chaves fallou fallou: %s\n"
 
-#: g10/g10.c:3300
+#: g10/g10.c:3334
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "a actualizaci�n no servidor de chaves fallou: %s\n"
 
-#: g10/g10.c:3341
+#: g10/g10.c:3375
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "non se puido quita-la armadura: %s\n"
 
-#: g10/g10.c:3349
+#: g10/g10.c:3383
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "non se puido po�e-la armadura: %s\n"
 
-#: g10/g10.c:3436
+#: g10/g10.c:3470
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash non v�lido `%s'\n"
 
-#: g10/g10.c:3559
+#: g10/g10.c:3593
 msgid "[filename]"
 msgstr "[ficheiro]"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3597
 msgid "Go ahead and type your message ...\n"
 msgstr "Escriba a s�a mensaxe ...\n"
 
-#: g10/g10.c:3853
+#: g10/g10.c:3887
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1637,79 +1673,84 @@ msgstr ""
 "un nome de notaci�n s� debe ter caracteres imprimibles ou espacios, e debe "
 "rematar en '='\n"
 
-#: g10/g10.c:3861
+#: g10/g10.c:3895
 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/g10.c:3871
+#: g10/g10.c:3900
+#, 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/g10.c:3911
 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/g10.c:3905
+#: g10/g10.c:3945
 msgid "the given certification policy URL is invalid\n"
 msgstr "o URL de normativa de certificaci�n dado non � v�lido\n"
 
-#: g10/g10.c:3907
+#: g10/g10.c:3947
 msgid "the given signature policy URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/g10.c:3940
+#: g10/g10.c:3980
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "demasiadas entradas na cach� de chaves p�blicas - desactivada\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2750
+#: g10/getkey.c:187 g10/getkey.c:2757
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Non se atopou o id de usuario]"
 
-#: g10/getkey.c:1677
+#: g10/getkey.c:1684
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Chave %08lX non v�lida convertida en v�lida por --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2228
+#: g10/getkey.c:2235
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "non hai unha sub-chave secreta para a sub-chave p�blica %08lX - ign�rase\n"
 
-#: g10/getkey.c:2459
+#: g10/getkey.c:2466
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "empr�gase a chave secundaria %08lX no canto da primaria %08lX\n"
 
-#: g10/getkey.c:2506
+#: g10/getkey.c:2513
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sen chave p�blica - omitida\n"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:74
 msgid "be somewhat more quiet"
 msgstr "ser un pouqui�o m�is calado"
 
-#: g10/gpgv.c:70
+#: g10/gpgv.c:75
 msgid "take the keys from this keyring"
 msgstr "toma-las chaves deste chaveiro"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:77
 msgid "make timestamp conflicts only a warning"
 msgstr "converte-los conflictos de selo de data nun aviso"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:78
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribi-la informaci�n de estado a este DF"
 
-#: g10/gpgv.c:97
+#: g10/gpgv.c:102
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpgv [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:105
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1717,7 +1758,7 @@ msgstr ""
 "Sintaxe: gpg [opci�ns] [ficheiros]\n"
 "Comproba as sinaturas contra chaves de confianza co�ecidas\n"
 
-#: g10/helptext.c:48
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1727,7 +1768,7 @@ msgstr ""
 "a ning�n terceiro. Prec�sase para implementa-la rede de confianza; non ten\n"
 "nada que ver coa rede de certificados."
 
-#: g10/helptext.c:54
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1738,16 +1779,16 @@ msgstr ""
 "confianza absoluta - esas adoitan se-las chaves das que ten acceso � chave\n"
 "secreta. Responda \"si\" para lle dar confianza total a esta chave\n"
 
-#: g10/helptext.c:61
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "Se desexa empregar esta clave na que non se conf�a, conteste \"si\"."
 
-#: g10/helptext.c:65
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Introduza o ID de usuario da persoa � que lle quere manda-la mensaxe."
 
-#: g10/helptext.c:69
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1761,7 +1802,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:83
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -1771,16 +1812,16 @@ msgstr ""
 "Este algoritmo deber�a empregarse s� en determinados dominios.\n"
 "Consulte antes co seu experto en seguridade."
 
-#: g10/helptext.c:90
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "Introduza o tama�o da chave"
 
-#: g10/helptext.c:94 g10/helptext.c:99 g10/helptext.c:111 g10/helptext.c:143
-#: g10/helptext.c:171 g10/helptext.c:176 g10/helptext.c:181
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "Conteste \"si\" ou \"non\""
 
-#: g10/helptext.c:104
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1792,19 +1833,19 @@ msgstr ""
 "boa resposta de erro - no canto diso, o sistema ha tratar de interpreta-lo\n"
 "valor proporcionado coma se fora un intervalo."
 
-#: g10/helptext.c:116
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "Introduza o nome do propietario da chave"
 
-#: g10/helptext.c:121
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr "por favor, introduza un enderezo de e-mail (opcional pero recomendado)"
 
-#: g10/helptext.c:125
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "Por favor, introduza un comentario (opcional)"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1818,11 +1859,11 @@ msgstr ""
 "O  para continuar coa xeraci�n da chave.\n"
 "S  para sa�r da xeraci�n da chave."
 
-#: g10/helptext.c:139
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Conteste \"si\" (ou s� \"s\") se � correcto xerar esta subchave."
 
-#: g10/helptext.c:147
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -1895,12 +1936,12 @@ msgstr ""
 "\n"
 "Se non sabe cal � a resposta correcta, resposte \"0\"."
 
-#: g10/helptext.c:185
+#: g10/helptext.c:186
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Conteste \"si\" se quere asinar T�DOLOS IDs de usuario"
 
-#: g10/helptext.c:189
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -1908,11 +1949,11 @@ msgstr ""
 "Conteste \"si\" se realmente desexa borrar este ID de usuario.\n"
 "�Tam�n se han perder t�dolos certificados!"
 
-#: g10/helptext.c:194
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Conteste \"si\" se � correcto borrar esta subchave"
 
-#: g10/helptext.c:199
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -1922,7 +1963,7 @@ msgstr ""
 "sinatura porque pode ser importante para estabrecer unha conexi�n de\n"
 "confianza na chave ou noutra chave certificada por esta chave."
 
-#: g10/helptext.c:204
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -1934,13 +1975,13 @@ msgstr ""
 "se empregou porque esta chave de sinatura poder�a estabrecer unha\n"
 "conexi�n de confianza mediante outra chave xa certificada."
 
-#: g10/helptext.c:210
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "A sinatura non � correcta. Ten sentido borrala do chaveiro."
 
-#: g10/helptext.c:214
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -1954,7 +1995,7 @@ msgstr ""
 "s� se esta auto-sinatura non � correcta por algun motivo e hai\n"
 "unha segunda � s�a disposici�n."
 
-#: g10/helptext.c:222
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -1964,24 +2005,24 @@ msgstr ""
 "� lista actual de preferencias. A marca de tempo de t�dalas auto-sinaturas\n"
 "afectadas ha avanzar un segundo.\n"
 
-#: g10/helptext.c:229
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
 
-#: g10/helptext.c:235
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "Por favor, repita o �ltimo contrasinal, para estar seguro do que tecleou."
 
-#: g10/helptext.c:239
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "Introduza o nome do ficheiro ao que corresponde a sinatura"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Conteste \"si\" se � correcto sobrescribi-lo ficheiro"
 
-#: g10/helptext.c:249
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -1989,7 +2030,7 @@ msgstr ""
 "Por favor, introduza un novo nome de ficheiro. Se s� preme ENTER, hase\n"
 "emprega-lo ficheiro por defecto (que se amosa entre corchetes)."
 
-#: g10/helptext.c:255
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2017,7 +2058,7 @@ msgstr ""
 "     Empr�gueo para indicar que o ID de usuario xa non se deber�a empregar;\n"
 "     adoita empregarse para marcar un enderezo de correo non v�lido.\n"
 
-#: g10/helptext.c:271
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2027,483 +2068,488 @@ msgstr ""
 "certificado de revocaci�n. Por favor, mante�a este texto breve.\n"
 "Unha li�a en branco remata o texto.\n"
 
-#: g10/helptext.c:286
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "Non hai axuda dispo�ible"
 
-#: g10/helptext.c:294
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Non hai axuda dispo�ible para `%s'"
 
-#: g10/import.c:247
+#: g10/import.c:248
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "pasando por alto un bloque de tipo %d\n"
 
-#: g10/import.c:256
+#: g10/import.c:257
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu chaves procesadas hasta polo momento\n"
 
-#: g10/import.c:273
+#: g10/import.c:274
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "N�mero total procesado: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "novas chaves omitidas: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:279
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "   sin IDs de usuario: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "              imported: %lu"
 msgstr "           importadas: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:287
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "          sin cambios: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr " novos IDs de usuario: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "     novas sub-chaves: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "         novas sinaturas: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr " novas revocaci�ns de chaves: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "chaves secretas lidas: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "chaves secretas importadas: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chaves secretas sin cambios: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "       non importadas: %lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:544
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:545
+#: g10/import.c:546
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Asinou estes IDs de usuario: \n"
 
-#: g10/import.c:582
+#: g10/import.c:583
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:594
+#: g10/import.c:595
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: g10/import.c:606
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:620
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:646
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:694 g10/import.c:1048
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chave %08lX: non hai ID de usuario\n"
 
-#: g10/import.c:713
+#: g10/import.c:714
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "chave %08lX: arranxouse a corrupci�n da sub-chave HKP\n"
 
-#: g10/import.c:728
+#: g10/import.c:729
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "chave %08lX: aceptouse o ID de usuario '%s' sen auto-sinatura\n"
 
-#: g10/import.c:734
+#: g10/import.c:735
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chave %08lX: non hai IDs de usuario v�lidos\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por unha auto-sinatura que falta\n"
 
-#: g10/import.c:746 g10/import.c:1168
+#: g10/import.c:747 g10/import.c:1169
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "chave %08lX: chave p�blica non atopada: %s\n"
 
-#: g10/import.c:752
+#: g10/import.c:753
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chave %08lX: nova chave - omitida\n"
 
-#: g10/import.c:761
+#: g10/import.c:762
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "non se atopou un chaveiro no que se poida escribir: %s\n"
 
-#: g10/import.c:766 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribindo a `%s'\n"
 
-#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
-#: g10/import.c:2314 g10/import.c:2336
+#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
+#: g10/import.c:2315 g10/import.c:2337
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: g10/import.c:791
+#: g10/import.c:792
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave p�blica \"%s\" importada\n"
 
-#: g10/import.c:815
+#: g10/import.c:816
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chave %08lX: non coincide coa nosa copia\n"
 
-#: g10/import.c:832 g10/import.c:1186
+#: g10/import.c:833 g10/import.c:1187
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr ""
 "chave %08lX: non foi posible localiza-lo bloque de chaves original:\n"
 "%s\n"
 
-#: g10/import.c:840 g10/import.c:1193
+#: g10/import.c:841 g10/import.c:1194
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr ""
 "chave %08lX: non foi posible le-lo bloque de chaves original:\n"
 "%s\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chave %08lX: \"%s\" 1 novo ID de usuario\n"
 
-#: g10/import.c:875
+#: g10/import.c:876
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
 
-#: g10/import.c:878
+#: g10/import.c:879
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: \"%s\" 1 nova sinatura\n"
 
-#: g10/import.c:881
+#: g10/import.c:882
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
 
-#: g10/import.c:884
+#: g10/import.c:885
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: \"%s\" 1 nova sub-chave\n"
 
-#: g10/import.c:887
+#: g10/import.c:888
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: \"%s\" %d novas sub-chaves\n"
 
-#: g10/import.c:908
+#: g10/import.c:909
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chave %08lX: \"%s\" sen cambios\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1054
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "chave %08lX: chave secreta cunha cifra %d non v�lida - omitida\n"
 
-#: g10/import.c:1064
+#: g10/import.c:1065
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/import.c:1081 g10/import.c:2329
+#: g10/import.c:1082 g10/import.c:2330
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "non hai un chaveiro privado por defecto: %s\n"
 
-#: g10/import.c:1092
+#: g10/import.c:1093
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1122
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chave %08lX: xa estaba no chaveiro secreto\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1132
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta non atopada: %s\n"
 
-#: g10/import.c:1161
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chave %08lX: non hai chave p�blica - non se pode aplica-lo\n"
 "certificado de revocaci�n\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1205
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 "chave %08lX: certificado de revocaci�n incorrecto:\n"
 "%s - rechazado\n"
 
-#: g10/import.c:1236
+#: g10/import.c:1237
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: \"%s\" certificado de revocaci�n importado\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1302
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "chave %08lX: non hai ID de usuario para a sinatura\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1317
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "chave %08lX: algoritmo de chave p�blica non soportado no ID de usuario \"%s"
 "\"\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr ""
 "chave %08lX: auto-sinatura non v�lida no identificadr de usuario \"%s\"\n"
 
-#: g10/import.c:1336
+#: g10/import.c:1337
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "chave %08lX: non hai sub-chave para a ligaz�n da chave\n"
 
-#: g10/import.c:1347 g10/import.c:1397
+#: g10/import.c:1348 g10/import.c:1398
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave p�blica non soportado\n"
 
-#: g10/import.c:1349
+#: g10/import.c:1350
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chave %08lX: ligaz�n de sub-chave incorrecta\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1365
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chave %08lX: eliminouse unha ligaz�n de sub-chave m�ltiple\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "chave %08lX: non hai unha sub-chave para a revocaci�n da chave\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chave %08lX: revocaci�n de sub-chave non v�lida\n"
 
-#: g10/import.c:1414
+#: g10/import.c:1415
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chave %08lX: eliminouse a revocaci�n de sub-chaves m�ltiples\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1457
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chave %08lX: omitido o ID de usuario '"
 
-#: g10/import.c:1477
+#: g10/import.c:1478
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chave %08lX: omitida a sub-chave\n"
 
-#: g10/import.c:1504
+#: g10/import.c:1505
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "chave %08lX: sinatura non exportable (clase %02x) - omitida\n"
 
-#: g10/import.c:1514
+#: g10/import.c:1515
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revocaci�n no lugar err�neo - omitido\n"
 
-#: g10/import.c:1531
+#: g10/import.c:1532
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revocaci�n incorrecto: %s - omitido\n"
 
-#: g10/import.c:1545
+#: g10/import.c:1546
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "chave %08lX: sinatura da sub-chave nun lugar incorrecto - omitida\n"
 
-#: g10/import.c:1553
+#: g10/import.c:1554
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chave %08lX: clase de sinatura non esperada (0x%02X) - omitida\n"
 
-#: g10/import.c:1574
+#: g10/import.c:1575
 #, fuzzy, c-format
 msgid "key %s: expired signature from key %s - skipped\n"
 msgstr "chave %08lX: clase de sinatura non esperada (0x%02X) - omitida\n"
 
-#: g10/import.c:1677
+#: g10/import.c:1678
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: ID de usuario duplicado detectado - mesturado\n"
 
-#: g10/import.c:1739
+#: g10/import.c:1740
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: obtendo a chave de revocaci�n %"
 "08lX\n"
 
-#: g10/import.c:1753
+#: g10/import.c:1754
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: chave de revocaci�n %08lX "
 "ausente.\n"
 
-#: g10/import.c:1812
+#: g10/import.c:1813
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: \"%s\" certificado de revocaci�n engadido\n"
 
-#: g10/import.c:1846
+#: g10/import.c:1847
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: engadiuse unha sinatura de chave directa\n"
 
-#: g10/import.c:2235
+#: g10/import.c:2236
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "�a chave p�blica con coincide coa chave secreta!\n"
 
-#: g10/import.c:2243
+#: g10/import.c:2244
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
 
-#: g10/import.c:2245
+#: g10/import.c:2246
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
 
-#: g10/keydb.c:167
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "erro ao crea-lo chaveiro `%s': %s\n"
 
-#: g10/keydb.c:174
+#: g10/keydb.c:175
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "chaveiro `%s' creado\n"
 
-#: g10/keydb.c:685
+#: g10/keydb.c:316 g10/keydb.c:319
+#, fuzzy, c-format
+msgid "keyblock resource `%s': %s\n"
+msgstr "erro ao crear `%s': %s\n"
+
+#: g10/keydb.c:698
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "fallo ao reconstru�-la cach� de chaveiros: %s\n"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[revocaci�n]"
 
-#: g10/keyedit.c:255
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[auto-sinatura]"
 
-#: g10/keyedit.c:333 g10/keylist.c:405
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 sinatura err�nea\n"
 
-#: g10/keyedit.c:335 g10/keylist.c:407
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d sinaturas err�neas\n"
 
-#: g10/keyedit.c:337 g10/keylist.c:409
+#: g10/keyedit.c:344 g10/keylist.c:410
 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:339 g10/keylist.c:411
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, 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:341 g10/keylist.c:413
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 sinatura non verificada debido a un erro\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:415
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d sinaturas non verificadas debido a erros\n"
 
-#: g10/keyedit.c:345
+#: g10/keyedit.c:352
 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:347
+#: g10/keyedit.c:354
 #, 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:403 g10/pkclist.c:262
+#: g10/keyedit.c:410 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2515,53 +2561,63 @@ msgstr ""
 "correctamente as chaves de outros usuarios (mirando nos pasaportes,\n"
 "comprobando pegadas dactilares de varias fontes...).\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:274
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Conf�o marxinalmente\n"
 
-#: g10/keyedit.c:408 g10/pkclist.c:276
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Conf�o totalmente\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:434
 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:443
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "O ID de usuario \"%s\" est� revocado."
 
-#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
-#: g10/keyedit.c:858 g10/keyedit.c:1642
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1728
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�Est� seguro de que quere asinalo? (s/N) "
 
-#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
-#: g10/keyedit.c:1648
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
+#: g10/keyedit.c:1734
 msgid "  Unable to sign.\n"
 msgstr " Non se puido asinar.\n"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "O ID de usuario \"%s\" est� caducado."
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:650
 #, 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:676
+#: g10/keyedit.c:678
+#, fuzzy, c-format
+msgid "User ID \"%s\" is signable.  "
+msgstr "O ID de usuario \"%s\" non est� asinado por el mesmo."
+
+#: g10/keyedit.c:680
+#, fuzzy
+msgid "Sign it? (y/N) "
+msgstr "�Asinar de verdade? "
+
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2570,11 +2626,11 @@ msgstr ""
 "A auto-sinatura de \"%s\"\n"
 "� unha sinatura tipo PGP 2.x\n"
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:711
 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:699
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2583,11 +2639,11 @@ msgstr ""
 "A s�a sinatura actual en \"%s\"\n"
 "caducou.\n"
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:729
 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:724
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2596,54 +2652,54 @@ msgstr ""
 "A s�a sinatura actual en \"%s\"\n"
 "� unha sinatura local.\n"
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:754
 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:749
+#: g10/keyedit.c:775
 #, 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:752
+#: g10/keyedit.c:778
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" xa estaba asinado coa chave %08lX\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:783
 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:779
+#: g10/keyedit.c:805
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nada que asinar coa chave %08lX\n"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "�Esta chave caducou!"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave ha caducar o %s.\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:844
 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:851
+#: g10/keyedit.c:882
 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:853
+#: g10/keyedit.c:884
 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:878
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2652,32 +2708,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:883
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Non hei respostar.%s\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Non o comprobei en absoluto.%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Fixen algunhas comprobaci�ns.%s\n"
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Fixen comprobaci�ns moi exhaustivas.%s\n"
 
-#: g10/keyedit.c:895
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "�A s�a elecci�n? (introduza '?' para ter m�is informaci�n): "
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:950
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2686,100 +2742,100 @@ msgstr ""
 "�Esta seguro de que quere asinar esta chave\n"
 "coa s�a chave: \""
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Esta ha ser unha auto-sinatura.\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:963
 #, 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:940
+#: g10/keyedit.c:971
 #, 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:950
+#: g10/keyedit.c:981
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "A sinatura hase marcar coma non exportable.\n"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:988
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "A sinatura hase marcar coma non revocable.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:995
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Non se comprobou esta chave en absoluto.\n"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1000
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Comprobouse esta chave de xeito informal.\n"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1005
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Comprobouse esta chave con moito tino.\n"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1015
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "�Asinar de verdade? "
 
-#: g10/keyedit.c:1029 g10/keyedit.c:4132 g10/keyedit.c:4223 g10/keyedit.c:4287
-#: g10/keyedit.c:4348 g10/sign.c:369
+#: g10/keyedit.c:1060 g10/keyedit.c:4350 g10/keyedit.c:4441 g10/keyedit.c:4505
+#: g10/keyedit.c:4566 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1105 g10/keygen.c:3057
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "Esta chave non est� protexida.\n"
 
-#: g10/keyedit.c:1109 g10/keygen.c:3045
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 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:1113 g10/keygen.c:3060
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 #, 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:1117 g10/keygen.c:3064
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "A chave est� protexida.\n"
 
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Non se pode editar esta chave: %s\n"
 
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2787,11 +2843,11 @@ msgstr ""
 "Introduza o novo contrasinal para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:1825
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "o contrasinal non se repetiu correctamente; t�nteo de novo"
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2799,197 +2855,197 @@ msgstr ""
 "Non desexa un contrainal - �o que � unha *mala* idea!\n"
 "\n"
 
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1195
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "�Seguro que quere facer esto? "
 
-#: g10/keyedit.c:1235
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "movendo a sinatura dunha chave � seu sitio\n"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "gardar e sa�r"
 
-#: g10/keyedit.c:1322
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "amosar fingerprint"
 
-#: g10/keyedit.c:1323
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "listar chave e IDs de usuario"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "selecciona-lo ID de usuario N"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "selecciona-lo ID de usuario N"
 
-#: g10/keyedit.c:1327
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "revocar sinaturas"
 
-#: g10/keyedit.c:1330
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1335
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "asina-la chave localmente"
 
-#: g10/keyedit.c:1337
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1343
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "engadir un ID de usuario"
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "engadir unha identificaci�n fotogr�fica"
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "borrar un ID de usuario"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "borrar unha chave secundaria"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr "engadir unha chave de revocaci�n"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1402
 #, 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:1372
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "marcar un ID de usuario coma primario"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "cambiar entre o listado de chaves p�blicas e secretas"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "lista-las preferencias (expertos)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "lista-las preferencias (moitos datos)"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1413
 #, 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:1386
+#: g10/keyedit.c:1418
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1426
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "�Seguro de que quere revocar t�dolos IDs de usuario seleccionados? "
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revocar un ID de usuario"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revocar unha chave secundaria"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "enable key"
 msgstr "habilitar unha chave"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "disable key"
 msgstr "deshabilitar unha chave"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1436
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "amosa-la identificaci�n fotogr�fica"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1556
 #, 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:1494
+#: g10/keyedit.c:1574
 msgid "Secret key is available.\n"
 msgstr "A chave secreta est� disponible.\n"
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1655
 msgid "Need the secret key to do this.\n"
 msgstr "C�mpre a chave secreta para facer isto.\n"
 
-#: g10/keyedit.c:1579
+#: g10/keyedit.c:1663
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor, empregue o comando \"toggle\" antes.\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1682
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -2997,238 +3053,243 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1722
 msgid "Key is revoked."
 msgstr "A chave est� revocada."
 
-#: g10/keyedit.c:1657
+#: g10/keyedit.c:1741
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "�Seguro de que quere asinar t�dolos IDs de usuario? "
 
-#: g10/keyedit.c:1660
-msgid "Hint: Select the user IDs to sign\n"
-msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
-
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1748
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "clase de sinatura desco�ecida"
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1771
 #, 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:1713 g10/keyedit.c:1733 g10/keyedit.c:1899
+#: g10/keyedit.c:1793 g10/keyedit.c:1813 g10/keyedit.c:1979
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar alomenos un ID de usuario.\n"
 
-#: g10/keyedit.c:1715
+#: g10/keyedit.c:1795
 msgid "You can't delete the last user ID!\n"
 msgstr "�Non pode borra-lo �ltimo ID de usuario!\n"
 
-#: g10/keyedit.c:1717
+#: g10/keyedit.c:1797
 #, 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:1718
+#: g10/keyedit.c:1798
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "�Seguro de que quere borrar este ID de usuario? "
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1848
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "�Seguro de que quere borrar este ID de usuario? "
 
-#: g10/keyedit.c:1780
+#: g10/keyedit.c:1860
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Debe seleccionar alomenos unha chave.\n"
 
-#: g10/keyedit.c:1808
+#: g10/keyedit.c:1888
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1822
+#: g10/keyedit.c:1902
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1919
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "erro ao crea-lo chaveiro `%s': %s\n"
 
-#: g10/keyedit.c:1863
+#: g10/keyedit.c:1943
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar alomenos unha chave.\n"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1946
 #, 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:1867
+#: g10/keyedit.c:1947
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "�Seguro de que quere borrar esta chave? "
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1982
 #, 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:1903
+#: g10/keyedit.c:1983
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "�Seguro de que quere revocar este ID de usuario? "
 
-#: g10/keyedit.c:1921
+#: g10/keyedit.c:2001
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "�Realmente quere revocar esta chave? "
 
-#: g10/keyedit.c:1932
+#: g10/keyedit.c:2012
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "�Realmente quere revoca-las chaves seleccionadas? "
 
-#: g10/keyedit.c:1934
+#: g10/keyedit.c:2014
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "�Realmente quere revocar esta chave? "
 
-#: g10/keyedit.c:1975
+#: g10/keyedit.c:2055
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2007
+#: g10/keyedit.c:2087
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "estabrece-la lista de preferencias"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2093
 #, 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:2015
+#: g10/keyedit.c:2095
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "�Realmente desexa actualiza-las preferencias? "
 
-#: g10/keyedit.c:2065
+#: g10/keyedit.c:2157
+#, fuzzy, c-format
+msgid "Unable to clean `%s'\n"
+msgstr "non se puido executar %s \"%s\": %s\n"
+
+#: g10/keyedit.c:2160
+msgid "Please specify item to clean: `sigs', `uids', or `all'\n"
+msgstr ""
+
+#: g10/keyedit.c:2171
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "�Garda-los cambios? "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2174
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "�Sa�r sin gardar? "
 
-#: g10/keyedit.c:2078
+#: g10/keyedit.c:2184
 #, c-format
 msgid "update failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2191
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "o segredo da actualizaci�n fallou: %s\n"
 
-#: g10/keyedit.c:2092
+#: g10/keyedit.c:2198
 msgid "Key not changed so no update needed.\n"
 msgstr "A chave non cambiou, polo que non fai falla actualizar.\n"
 
-#: g10/keyedit.c:2164
+#: g10/keyedit.c:2271
 msgid "Digest: "
 msgstr "Resumo: "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2323
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:2227
+#: g10/keyedit.c:2334
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2242 g10/keylist.c:307
+#: g10/keyedit.c:2349 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2473
+#: g10/keyedit.c:2580
 #, 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:2494
+#: g10/keyedit.c:2601
 #, 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:2500
+#: g10/keyedit.c:2607
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:2516 g10/keyedit.c:2572 g10/keyedit.c:2684 g10/keyedit.c:2699
-#: g10/keylist.c:193 g10/keyserver.c:422
+#: g10/keyedit.c:2623 g10/keyedit.c:2679 g10/keyedit.c:2792 g10/keyedit.c:2807
+#: g10/keylist.c:194 g10/keyserver.c:421
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "non foi posible crear %s: %s\n"
 
-#: g10/keyedit.c:2519 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:931
+#: g10/keyedit.c:2626 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:948
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada] "
 
-#: g10/keyedit.c:2521 g10/keylist.c:757 g10/keylist.c:886
+#: g10/keyedit.c:2628 g10/keylist.c:758 g10/keylist.c:887
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2523 g10/keyedit.c:2574 g10/keyedit.c:2686 g10/keyedit.c:2701
-#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
-#: g10/keylist.c:913 g10/keyserver.c:428 g10/mainproc.c:937
+#: g10/keyedit.c:2630 g10/keyedit.c:2681 g10/keyedit.c:2794 g10/keyedit.c:2809
+#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
+#: g10/keylist.c:914 g10/keyserver.c:427 g10/mainproc.c:954
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2525
+#: g10/keyedit.c:2632
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:2540
+#: g10/keyedit.c:2647
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2651
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2658
 msgid "This key has been disabled"
 msgstr "Esta chave est� desactivada"
 
-#: g10/keyedit.c:2579 g10/keylist.c:199
+#: g10/keyedit.c:2686 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2754
 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:2654
+#: g10/keyedit.c:2762
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3236,19 +3297,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:2718 g10/keyserver.c:432 g10/mainproc.c:1577
-#: g10/trustdb.c:1178
+#: g10/keyedit.c:2826 g10/keyedit.c:3201 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1690
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada] "
 
-#: g10/keyedit.c:2720 g10/keyserver.c:436 g10/mainproc.c:1579
-#: g10/trustdb.c:531
+#: g10/keyedit.c:2828 g10/keyedit.c:3203 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1692
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2893
 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"
@@ -3256,7 +3317,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:2845
+#: g10/keyedit.c:2953
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3265,47 +3326,77 @@ msgstr ""
 "AVISO: Esta � unha chave de estilo PGP2. Se engade unha identificaci�n\n"
 "       fotogr�fica algunhas versi�ns de PGP han rexeitar esta chave.\n"
 
-#: g10/keyedit.c:2850 g10/keyedit.c:3128
+#: g10/keyedit.c:2958 g10/keyedit.c:3307
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�Est� seguro de que quere engadila? (s/N) "
 
-#: g10/keyedit.c:2856
+#: g10/keyedit.c:2964
 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:2996
+#: g10/keyedit.c:3104
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�Borrar esta sinatura correcta? (s/N/q)"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3114
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�Borrar esta sinatura incorrecta? (s/N/q)"
 
-#: g10/keyedit.c:3010
+#: g10/keyedit.c:3118
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�Borrar esta sinatura desco�ecida? (s/N/q)"
 
-#: g10/keyedit.c:3016
+#: g10/keyedit.c:3124
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�Realmente quere borrar esta auto-sinatura? (s/N)"
 
-#: g10/keyedit.c:3030
+#: g10/keyedit.c:3138
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Borrada %d sinatura.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3139
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Borradas %d sinaturas.\n"
 
-#: g10/keyedit.c:3034
+#: g10/keyedit.c:3142
 msgid "Nothing deleted.\n"
 msgstr "Non se borrou nada.\n"
 
-#: g10/keyedit.c:3123
+#: g10/keyedit.c:3167
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed.\n"
+msgstr "O ID de usuario \"%s\" est� revocado."
+
+#: g10/keyedit.c:3168
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed.\n"
+msgstr "O ID de usuario \"%s\" est� revocado."
+
+#: g10/keyedit.c:3173
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean.\n"
+msgstr "o ID de usuario \"%s\" xa est� revocado\n"
+
+#: g10/keyedit.c:3205 g10/trustdb.c:1694
+#, fuzzy
+msgid "invalid"
+msgstr "armadura non v�lida"
+
+#: g10/keyedit.c:3207
+#, fuzzy, c-format
+msgid "User ID \"%s\" removed: %s\n"
+msgstr "O ID de usuario \"%s\" est� revocado."
+
+#: g10/keyedit.c:3214
+#, fuzzy
+msgid "No user IDs are removable.\n"
+msgstr "Non hai un ID de usuario para a chave\n"
+
+#: g10/keyedit.c:3302
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3315,346 +3406,351 @@ msgstr ""
 "designado\n"
 "       pode facer que algunhas versi�ns de PGP rexeiten esta chave.\n"
 
-#: g10/keyedit.c:3134
+#: g10/keyedit.c:3313
 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:3154
+#: g10/keyedit.c:3333
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduza o ID de usuario do revocador designado: "
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3356
 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:3192
+#: g10/keyedit.c:3371
 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:3214
+#: g10/keyedit.c:3393
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
 
-#: g10/keyedit.c:3233
+#: g10/keyedit.c:3412
 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:3239
+#: g10/keyedit.c:3418
 #, 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:3300
+#: g10/keyedit.c:3479
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite as selecci�ns das chaves secretas.\n"
 
-#: g10/keyedit.c:3306
+#: g10/keyedit.c:3485
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor, seleccione como m�ximo unha chave secundaria.\n"
 
-#: g10/keyedit.c:3310
+#: g10/keyedit.c:3489
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambiando a data de expiraci�n para a chave secundaria.\n"
 
-#: g10/keyedit.c:3313
+#: g10/keyedit.c:3492
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando a data de expiraci�n da chave primaria.\n"
 
-#: g10/keyedit.c:3359
+#: g10/keyedit.c:3538
 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:3375
+#: g10/keyedit.c:3554
 msgid "No corresponding signature in secret ring\n"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/keyedit.c:3455
+#: g10/keyedit.c:3634
 msgid "Please select exactly one user ID.\n"
 msgstr "Escolla exactamente un ID de usuario.\n"
 
-#: g10/keyedit.c:3494 g10/keyedit.c:3604 g10/keyedit.c:3724
+#: g10/keyedit.c:3673 g10/keyedit.c:3783 g10/keyedit.c:3903
 #, 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:3665
+#: g10/keyedit.c:3844
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3745
+#: g10/keyedit.c:3924
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�Est� seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:3746
+#: g10/keyedit.c:3925
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�Est� seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3987
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:3854
+#: g10/keyedit.c:4045
+#, fuzzy, c-format
+msgid "No user ID with hash %s\n"
+msgstr "Non hai ID de usuario con �ndice %d\n"
+
+#: g10/keyedit.c:4072
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:3971
+#: g10/keyedit.c:4189
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:3974 g10/keyedit.c:4038 g10/keyedit.c:4081
+#: g10/keyedit.c:4192 g10/keyedit.c:4256 g10/keyedit.c:4299
 #, 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:3976 g10/keyedit.c:4040 g10/keyedit.c:4083
+#: g10/keyedit.c:4194 g10/keyedit.c:4258 g10/keyedit.c:4301
 msgid " (non-exportable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:3980
+#: g10/keyedit.c:4198
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta sinatura caducou o %s.\n"
 
-#: g10/keyedit.c:3984
+#: g10/keyedit.c:4202
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�Est� seguro de que quere revocala? (s/N) "
 
-#: g10/keyedit.c:3988
+#: g10/keyedit.c:4206
 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:4015
+#: g10/keyedit.c:4233
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Asinou estes IDs de usuario: \n"
 
-#: g10/keyedit.c:4041
+#: g10/keyedit.c:4259
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:4048
+#: g10/keyedit.c:4266
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocada por %08lX no %s\n"
 
-#: g10/keyedit.c:4070
+#: g10/keyedit.c:4288
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� a punto de revocar estas sinaturas:\n"
 
-#: g10/keyedit.c:4090
+#: g10/keyedit.c:4308
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�Realmente desexa crea-los certificados de revocaci�n? (s/N) "
 
-#: g10/keyedit.c:4120
+#: g10/keyedit.c:4338
 msgid "no secret key\n"
 msgstr "non hai chave secreta\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4408
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4425
 #, 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:4271
+#: g10/keyedit.c:4489
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:4333
+#: g10/keyedit.c:4551
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4646
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Amosando a id. fotogr�fica %s de tama�o %ld da chave 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:293
+#: g10/keygen.c:258
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "preferencia %c%lu duplicada\n"
 
-#: g10/keygen.c:300
+#: g10/keygen.c:265
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "demasiadas preferencias `%c'\n"
 
-#: g10/keygen.c:302
+#: g10/keygen.c:267
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "demasiadas preferencias `%c'\n"
 
-#: g10/keygen.c:304
+#: g10/keygen.c:269
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "demasiadas preferencias `%c'\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:394
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "caracter non v�lido na cadea de preferencias\n"
 
-#: g10/keygen.c:829
+#: g10/keygen.c:822
 msgid "writing direct signature\n"
 msgstr "escribindo unha sinatura directa\n"
 
-#: g10/keygen.c:868
+#: g10/keygen.c:861
 msgid "writing self signature\n"
 msgstr "escribindo a propia sinatura\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing key binding signature\n"
 msgstr "escribindo unha sinatura que liga a chave\n"
 
-#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2632
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tama�o de chave non v�lido; empregando %u bits\n"
 
-#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2638
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tama�o de chave redondeado a %u bits\n"
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1239
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1252
+#: g10/keygen.c:1242
 #, fuzzy
 msgid "Encrypt"
 msgstr "cifrar datos"
 
-#: g10/keygen.c:1255
+#: g10/keygen.c:1245
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1263
+#: g10/keygen.c:1253
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1268
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1282
+#: g10/keygen.c:1272
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1287
+#: g10/keygen.c:1277
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1290
+#: g10/keygen.c:1280
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (s� cifrar)\n"
 
-#: g10/keygen.c:1293
+#: g10/keygen.c:1283
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1296
+#: g10/keygen.c:1286
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1340
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor, seleccione o tipo de chave que quere:\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1342
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (por defecto)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1343
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (s� asinar)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1345
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/keygen.c:1357
+#: g10/keygen.c:1347
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (s� cifrar)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1348
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (s� asinar)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1350
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/keygen.c:1362
+#: g10/keygen.c:1352
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/keygen.c:1431 g10/keygen.c:2509
+#: g10/keygen.c:1421 g10/keygen.c:2506
 #, 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:1441
+#: g10/keygen.c:1431
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1438
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "�Qu� tama�o de chave quere? (1024) "
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1452
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1468
+#: g10/keygen.c:1458
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tama�o de chave requerido son %u bits\n"
 
-#: g10/keygen.c:1473 g10/keygen.c:1478
+#: g10/keygen.c:1463 g10/keygen.c:1468
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeado a %u bits\n"
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1515
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3670,7 +3766,7 @@ msgstr ""
 "      <n>m = a chave caduca en n meses\n"
 "      <n>y = a chave caduca en n anos\n"
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1526
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3686,39 +3782,40 @@ msgstr ""
 "      <n>m = a sinatura caduca en n meses\n"
 "      <n>y = a sinatura caduca en n anos\n"
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1549
 msgid "Key is valid for? (0) "
 msgstr "�Por canto tempo � v�lida a chave? (0) "
 
-#: g10/keygen.c:1563
-msgid "Signature is valid for? (0) "
+#: g10/keygen.c:1554
+#, fuzzy, c-format
+msgid "Signature is valid for? (%s) "
 msgstr "�Por canto tempo � v�lida a sinatura? (0) "
 
-#: g10/keygen.c:1568
+#: g10/keygen.c:1572
 msgid "invalid value\n"
 msgstr "valor non v�lido\n"
 
-#: g10/keygen.c:1575
+#: g10/keygen.c:1579
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s non caduca nunca\n"
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1580
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s non caduca nunca\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1585
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s caduca o %s\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1586
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "A sinatura caduca o %s\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1592
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3726,12 +3823,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:1595
+#: g10/keygen.c:1597
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "�Isto � correcto? (s/n) "
 
-#: g10/keygen.c:1638
+#: g10/keygen.c:1641
 #, fuzzy
 msgid ""
 "\n"
@@ -3748,44 +3845,44 @@ msgstr ""
 "     \"Heinrich Heime (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1651
+#: g10/keygen.c:1654
 msgid "Real name: "
 msgstr "Nome: "
 
-#: g10/keygen.c:1659
+#: g10/keygen.c:1662
 msgid "Invalid character in name\n"
 msgstr "Caracter non v�lido no nome\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1664
 msgid "Name may not start with a digit\n"
 msgstr "O nome non pode comezar cun d�xito\n"
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1666
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome debe ter alomenos 5 caracteres\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1674
 msgid "Email address: "
 msgstr "Enderezo de E-mail: "
 
-#: g10/keygen.c:1682
+#: g10/keygen.c:1685
 msgid "Not a valid email address\n"
 msgstr "Non � un enderezo de e-mail v�lido\n"
 
-#: g10/keygen.c:1690
+#: g10/keygen.c:1693
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:1696
+#: g10/keygen.c:1699
 msgid "Invalid character in comment\n"
 msgstr "Car�cter non v�lido no comentario\n"
 
-#: g10/keygen.c:1719
+#: g10/keygen.c:1722
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Est� a usa-lo xogo de caracteres `%s'.\n"
 
-#: g10/keygen.c:1725
+#: g10/keygen.c:1728
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3796,7 +3893,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1733
 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"
@@ -3812,23 +3909,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1746
+#: g10/keygen.c:1749
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeAaSs"
 
-#: g10/keygen.c:1756
+#: g10/keygen.c:1759
 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:1757
+#: g10/keygen.c:1760
 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:1776
+#: g10/keygen.c:1779
 msgid "Please correct the error first\n"
 msgstr "Por favor, corrixa antes o erro\n"
 
-#: g10/keygen.c:1816
+#: g10/keygen.c:1819
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3836,12 +3933,12 @@ msgstr ""
 "Necesita un contrasinal para protexe-la s�a chave secreta.\n"
 "\n"
 
-#: g10/keygen.c:1826 g10/passphrase.c:1105
+#: g10/keygen.c:1829 g10/passphrase.c:786
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1832
+#: g10/keygen.c:1835
 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"
@@ -3853,7 +3950,7 @@ msgstr ""
 "momento, empregando este programa coa opci�n \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1857
 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"
@@ -3865,50 +3962,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:2578
+#: g10/keygen.c:2575
 msgid "Key generation canceled.\n"
 msgstr "Cancelouse a xeraci�n de chaves.\n"
 
-#: g10/keygen.c:2766 g10/keygen.c:2910
+#: g10/keygen.c:2774 g10/keygen.c:2918
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "gravando a chave p�blica en `%s'\n"
 
-#: g10/keygen.c:2768 g10/keygen.c:2913
+#: g10/keygen.c:2776 g10/keygen.c:2921
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/keygen.c:2771 g10/keygen.c:2916
+#: g10/keygen.c:2779 g10/keygen.c:2924
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2907
 #, 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:2905
+#: g10/keygen.c:2913
 #, 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:2923
+#: g10/keygen.c:2931
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro p�blico `%s': %s\n"
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2938
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: g10/keygen.c:2953
+#: g10/keygen.c:2961
 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:2964
+#: g10/keygen.c:2972
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -3918,12 +4015,12 @@ msgstr ""
 "queira emprega-lo comando \"--edit-key\" para xerar unha chave secundaria\n"
 "con esa finalidade.\n"
 
-#: g10/keygen.c:2976 g10/keygen.c:3105 g10/keygen.c:3220
+#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3156 g10/sign.c:290
+#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -3931,7 +4028,7 @@ msgstr ""
 "creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:3030 g10/keygen.c:3158 g10/sign.c:292
+#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -3939,370 +4036,351 @@ msgstr ""
 "creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:3039 g10/keygen.c:3169
+#: g10/keygen.c:3047 g10/keygen.c:3177
 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:3078 g10/keygen.c:3202
+#: g10/keygen.c:3086 g10/keygen.c:3210
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "�Crear realmente? "
 
-#: g10/keygen.c:3355
+#: g10/keygen.c:3363
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: g10/keygen.c:3402
+#: g10/keygen.c:3410
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: g10/keygen.c:3428
+#: g10/keygen.c:3436
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: a chave secreta %08lX caducou o %s\n"
 
-#: g10/keygen.c:3508
-#, c-format
-msgid "length of RSA modulus is not %d\n"
-msgstr ""
-
-#: g10/keygen.c:3514
-msgid "public exponent too large (more than 32 bits)\n"
-msgstr ""
-
-#: g10/keygen.c:3520 g10/keygen.c:3526
-#, c-format
-msgid "length of an RSA prime is not %d\n"
-msgstr ""
-
-#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
+#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
 msgid "never     "
 msgstr "nunca     "
 
-#: g10/keylist.c:264
+#: g10/keylist.c:265
 msgid "Critical signature policy: "
 msgstr "Normativa de sinaturas cr�ticas: "
 
-#: g10/keylist.c:266
+#: g10/keylist.c:267
 msgid "Signature policy: "
 msgstr "Normativa de sinaturas: "
 
-#: g10/keylist.c:305
+#: g10/keylist.c:306
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:354 g10/keylist.c:398
+#: 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:372
+#: g10/keylist.c:373
 msgid "Critical signature notation: "
 msgstr "Notaci�n de sinaturas cr�ticas: "
 
-#: g10/keylist.c:374
+#: g10/keylist.c:375
 msgid "Signature notation: "
 msgstr "Notaci�n de sinaturas: "
 
-#: g10/keylist.c:385
+#: g10/keylist.c:386
 msgid "not human readable"
 msgstr "non lexible por humanos"
 
-#: g10/keylist.c:486
+#: g10/keylist.c:487
 msgid "Keyring"
 msgstr "Chaveiro"
 
-#: g10/keylist.c:792
+#: g10/keylist.c:793
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr " [caduca: %s]"
 
-#: g10/keylist.c:1488
+#: g10/keylist.c:1489
 msgid "Primary key fingerprint:"
 msgstr "Pegada dactilar da chave primaria:"
 
-#: g10/keylist.c:1490
+#: g10/keylist.c:1491
 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:1497
+#: g10/keylist.c:1498
 msgid " Primary key fingerprint:"
 msgstr "Pegada dactilar da chave primaria:"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1500
 msgid "      Subkey fingerprint:"
 msgstr "     Pegada dactilar da sub-chave:"
 
-#: g10/keylist.c:1503 g10/keylist.c:1507
+#: g10/keylist.c:1504 g10/keylist.c:1508
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Pegada dactilar ="
 
-#: g10/keylist.c:1574
+#: g10/keylist.c:1575
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1245
+#: g10/keyring.c:1246
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "non se puido po�e-la armadura: %s\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1252
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVISO: existen dous ficheiros con informaci�n confidencial.\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � o que non cambiou\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1255
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � o novo\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1256
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor, ama�e este posible fallo de seguridade\n"
 
-#: g10/keyring.c:1375
+#: g10/keyring.c:1376
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "comprobando o chaveiro `%s'\n"
 
-#: g10/keyring.c:1421
+#: g10/keyring.c:1422
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu chaves comprobadas (%lu sinaturas)\n"
 
-#: g10/keyring.c:1433
+#: g10/keyring.c:1434
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu chaves comprobadas (%lu sinaturas)\n"
 
-#: g10/keyring.c:1504
+#: g10/keyring.c:1505
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: chaveiro creado\n"
 
-#: g10/keyserver.c:107
+#: g10/keyserver.c:105
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "AVISO: as opci�ns de `%s' a�nda non est�n activas nesta execuci�n\n"
 
-#: g10/keyserver.c:434
+#: g10/keyserver.c:433
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:635
+#: g10/keyserver.c:634
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:718 g10/keyserver.c:1238
+#: g10/keyserver.c:717 g10/keyserver.c:1267
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/keyserver.c:808
+#: g10/keyserver.c:815
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/keyserver.c:810
+#: g10/keyserver.c:817
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/keyserver.c:985
+#: g10/keyserver.c:1014
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:989
+#: g10/keyserver.c:1018
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1141
+#: g10/keyserver.c:1170
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "asinado coa s�a chave %08lX no %s\n"
 
-#: g10/keyserver.c:1188
+#: g10/keyserver.c:1217
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1191
+#: g10/keyserver.c:1220
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1198 g10/keyserver.c:1293
+#: g10/keyserver.c:1227 g10/keyserver.c:1322
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1275
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1255
+#: g10/keyserver.c:1284
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1314
+#: g10/keyserver.c:1343
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 "non hai un servidor de chaves co�ecido (empregue a opci�n --keyserver)\n"
 
-#: g10/keyserver.c:1320
+#: g10/keyserver.c:1349
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1361
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1366
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1374
 #, c-format
-msgid "gpgkeys_%s does not support handler version %d\n"
+msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1351
+#: g10/keyserver.c:1381
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1356
+#: g10/keyserver.c:1386
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1365
+#: g10/keyserver.c:1395
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "a recepci�n do servidor de chaves fallou: %s\n"
 
-#: g10/keyserver.c:1390 g10/keyserver.c:1424
+#: g10/keyserver.c:1420 g10/keyserver.c:1454
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: non � un ID de chave v�lido\n"
 
-#: g10/keyserver.c:1681
+#: g10/keyserver.c:1711
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1703
+#: g10/keyserver.c:1733
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1705
+#: g10/keyserver.c:1735
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:249
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "tama�o moi estra�o para unha chave de sesi�n cifrada (%d)\n"
 
-#: g10/mainproc.c:262
-#, c-format
-msgid "bad passphrase or unknown cipher algorithm (%d)\n"
-msgstr "contrasinal incorrecto ou algoritmo de cifrado desco�ecido (%d)\n"
-
-#: g10/mainproc.c:299
+#: g10/mainproc.c:300
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "chave de sesi�n cifrada con %s\n"
 
-#: g10/mainproc.c:309
+#: g10/mainproc.c:310
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "cifrado cun algoritmo desco�ecido %d\n"
 
-#: g10/mainproc.c:375
+#: g10/mainproc.c:376
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "a chave p�blica � %08lX\n"
 
-#: g10/mainproc.c:430
+#: g10/mainproc.c:431
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados coa chave p�blica: DEK correcto\n"
 
-#: g10/mainproc.c:463
+#: g10/mainproc.c:464
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "cifrado cunha chave de %u bits, %s, ID %08lX, creado o %s\n"
 
-#: g10/mainproc.c:467 g10/pkclist.c:218
+#: g10/mainproc.c:468 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "               alias \""
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:472
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado cunha chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "fallou o descifrado de chave p�blica: %s\n"
 
-#: g10/mainproc.c:499
+#: g10/mainproc.c:500
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrado con %lu contrasinais\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:502
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrado con 1 contrasinal\n"
 
-#: g10/mainproc.c:529 g10/mainproc.c:551
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "supo�endo datos cifrados con %s\n"
 
-#: g10/mainproc.c:537
+#: g10/mainproc.c:538
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "A cifra IDEA non est� dispo�ible, t�ntase empregar %s no seu canto\n"
 
-#: g10/mainproc.c:569
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:574
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVISO: a mensaxe non ti�a protecci�n de integridade\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVISO: �a mensaxe cifrada foi manipulada!\n"
 
-#: g10/mainproc.c:592
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
@@ -4316,305 +4394,294 @@ msgstr "NOTA: o remitente pediu \"confidencial\"\n"
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro orixinal='%.*s'\n"
 
-#: g10/mainproc.c:786
+#: g10/mainproc.c:803
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocaci�n independente - empregue \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:1290
+#: g10/mainproc.c:1307
 msgid "signature verification suppressed\n"
 msgstr "verificaci�n de sinatura suprimida\n"
 
-#: g10/mainproc.c:1332 g10/mainproc.c:1342
+#: g10/mainproc.c:1349 g10/mainproc.c:1359
 msgid "can't handle these multiple signatures\n"
 msgstr "non se poden manexar estas sinaturas m�ltiples\n"
 
-#: g10/mainproc.c:1352
+#: g10/mainproc.c:1369
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/mainproc.c:1353
+#: g10/mainproc.c:1370
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "               alias \""
 
-#: g10/mainproc.c:1357
+#: g10/mainproc.c:1374
 #, 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:1377
+#: g10/mainproc.c:1394
 msgid "Key available at: "
 msgstr "Chave dispo�ible en: "
 
-#: g10/mainproc.c:1482 g10/mainproc.c:1530
+#: g10/mainproc.c:1499 g10/mainproc.c:1547
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Sinatura INCORRECTA de\""
 
-#: g10/mainproc.c:1484 g10/mainproc.c:1532
+#: g10/mainproc.c:1501 g10/mainproc.c:1549
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Sinatura caducada de \""
 
-#: g10/mainproc.c:1486 g10/mainproc.c:1534
+#: g10/mainproc.c:1503 g10/mainproc.c:1551
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Sinatura correcta de \""
 
-#: g10/mainproc.c:1538
+#: g10/mainproc.c:1555
 msgid "[uncertain]"
 msgstr "[incerto]"
 
-#: g10/mainproc.c:1570
+#: g10/mainproc.c:1587
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "               alias \""
 
-#: g10/mainproc.c:1664
+#: g10/mainproc.c:1681
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/mainproc.c:1669
+#: g10/mainproc.c:1686
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "A sinatura caduca o %s\n"
 
-#: g10/mainproc.c:1672
+#: g10/mainproc.c:1689
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: g10/mainproc.c:1673
+#: g10/mainproc.c:1690
 msgid "binary"
 msgstr "binario"
 
-#: g10/mainproc.c:1674
+#: g10/mainproc.c:1691
 msgid "textmode"
 msgstr "modo texto"
 
-#: g10/mainproc.c:1674 g10/trustdb.c:530
+#: g10/mainproc.c:1691 g10/trustdb.c:531
 msgid "unknown"
 msgstr "desco�ecido"
 
-#: g10/mainproc.c:1694
+#: g10/mainproc.c:1711
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Non foi posible verifica-la sinatura: %s\n"
 
-#: g10/mainproc.c:1762 g10/mainproc.c:1778 g10/mainproc.c:1864
+#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
 msgid "not a detached signature\n"
 msgstr "non � unha sinatura separada\n"
 
-#: g10/mainproc.c:1805
+#: g10/mainproc.c:1822
 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:1813
+#: g10/mainproc.c:1830
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "sinatura independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1887
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Sinatura � vello estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:1880
+#: g10/mainproc.c:1897
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z incorrecto detectado en proc_tree()\n"
 
-#: g10/misc.c:121
+#: g10/misc.c:122
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "non � posible deshabilita-los volcados de 'core': %s\n"
 
-#: g10/misc.c:141 g10/misc.c:169 g10/misc.c:241
+#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr ""
 "a actualizaci�n da base de datos de confianza fallou:\n"
 "%s\n"
 
-#: g10/misc.c:206
+#: g10/misc.c:207
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "base de datos de confianza: fallou a lectura (n=%d): %s\n"
 
-#: g10/misc.c:315
+#: g10/misc.c:316
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "non � posible manexa-lo algoritmo de chave p�blica %d\n"
 
-#: g10/misc.c:330
+#: g10/misc.c:331
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algoritmo de cifrado non implementado"
 
-#: g10/misc.c:345
+#: g10/misc.c:346
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:351
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "forza-lo algoritmo de resumo %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/misc.c:446
+#: g10/misc.c:447
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "o plugin de cifra IDEA non est� presente\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:448
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 "mire en http://www.gnupg.org/why-not-idea.html para obter m�is informaci�n\n"
 
-#: g10/misc.c:680
+#: g10/misc.c:681
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opci�n a extinguir \"%s\"\n"
 
-#: g10/misc.c:684
+#: g10/misc.c:685
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
 
-#: g10/misc.c:686
+#: g10/misc.c:687
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "empregue \"%s%s\" no seu canto\n"
 
-#: g10/misc.c:697
+#: g10/misc.c:694
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
+msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
+
+#: g10/misc.c:707
 msgid "Uncompressed"
 msgstr "Sen comprimir"
 
-#: g10/misc.c:722
+#: g10/misc.c:732
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Sen comprimir"
 
-#: g10/misc.c:832
+#: g10/misc.c:842
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "esta mensaxe pode non ser utilizable por %s\n"
 
-#: g10/misc.c:989
+#: g10/misc.c:999
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
 
-#: g10/misc.c:1014
+#: g10/misc.c:1024
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinatario por defecto `%s' desco�ecido\n"
 
-#: g10/openfile.c:84
+#: g10/openfile.c:86
 #, c-format
 msgid "File `%s' exists. "
 msgstr "O ficheiro `%s' xa existe. "
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "�Sobrescribir? (s/N) "
 
-#: g10/openfile.c:119
+#: g10/openfile.c:121
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: sufixo desco�ecido\n"
 
-#: g10/openfile.c:141
+#: g10/openfile.c:143
 msgid "Enter new filename"
 msgstr "Introduza o novo nome de ficheiro"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:188
 msgid "writing to stdout\n"
 msgstr "escribindo na sa�da est�ndar\n"
 
-#: g10/openfile.c:296
+#: g10/openfile.c:300
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "suponse que hai datos asinados en `%s'\n"
 
-#: g10/openfile.c:375
+#: g10/openfile.c:379
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
 
-#: g10/openfile.c:377
+#: g10/openfile.c:381
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "AVISO: as opci�ns de `%s' a�nda non est�n activas nesta execuci�n\n"
 
-#: g10/openfile.c:409
+#: g10/openfile.c:413
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: directorio creado\n"
 
-#: g10/parse-packet.c:137
+#: g10/parse-packet.c:138
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "non � posible manexa-lo algoritmo de chave p�blica %d\n"
 
-#: g10/parse-packet.c:707
+#: g10/parse-packet.c:708
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVISO: chave de sesi�n cifrada simetricamente potencialmente insegura\n"
 
-#: g10/parse-packet.c:1132
+#: g10/parse-packet.c:1145
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un subpaquete de tipo %d ten o bit cr�tico posto\n"
 
-#: g10/passphrase.c:478 g10/passphrase.c:525
+#: g10/passphrase.c:305
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
 
-#: g10/passphrase.c:486
-msgid "can't set client pid for the agent\n"
-msgstr "non se pode estabrece-lo pid do cliente para o axente\n"
-
-#: g10/passphrase.c:494
-msgid "can't get server read FD for the agent\n"
-msgstr "non se pode obte-lo FD de lectura do servidor para o axente\n"
-
-#: g10/passphrase.c:501
-msgid "can't get server write FD for the agent\n"
-msgstr "non se pode obte-lo FD de escritura do servidor para o axente\n"
-
-#: g10/passphrase.c:534
+#: g10/passphrase.c:317
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variable de ambiente GPG_AGENT_INFO mal formada\n"
 
-#: g10/passphrase.c:547
+#: g10/passphrase.c:332
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "a versi�n %d do protocolo de gpg-agent non est� soportada\n"
 
-#: g10/passphrase.c:568
+#: g10/passphrase.c:345
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "non se puido conectar a `%s': %s\n"
 
-#: g10/passphrase.c:590
-msgid "communication problem with gpg-agent\n"
-msgstr "problema de comunicaci�n con gpg-agent\n"
-
-#: g10/passphrase.c:597 g10/passphrase.c:937 g10/passphrase.c:1049
+#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema co axente - desactivando o emprego do axente\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1209
+#: g10/passphrase.c:511 g10/passphrase.c:890
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:525
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4625,41 +4692,28 @@ msgstr ""
 "\"%.*s\"\n"
 "Chave de %u bits, %s, ID %08lX, creada o %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:550
 msgid "Repeat passphrase\n"
 msgstr "Repita o contrasinal\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:552
 msgid "Enter passphrase\n"
 msgstr "Introduza o contrasinal\n"
 
-#: g10/passphrase.c:781
-msgid "passphrase too long\n"
-msgstr "contrasinal demasiado longo\n"
-
-#: g10/passphrase.c:794
-msgid "invalid response from agent\n"
-msgstr "resposta do axente non v�lida\n"
-
-#: g10/passphrase.c:810 g10/passphrase.c:931
+#: g10/passphrase.c:628
 msgid "cancelled by user\n"
 msgstr "cancelado polo usuario\n"
 
-#: g10/passphrase.c:815 g10/passphrase.c:1020
-#, c-format
-msgid "problem with the agent: agent returns 0x%lx\n"
-msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
-
-#: g10/passphrase.c:1100 g10/passphrase.c:1263
+#: g10/passphrase.c:781 g10/passphrase.c:944
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "non se pode consulta-lo contrasinal en modo de proceso por lotes\n"
 
-#: g10/passphrase.c:1107 g10/passphrase.c:1268
+#: g10/passphrase.c:788 g10/passphrase.c:949
 msgid "Enter passphrase: "
 msgstr "Introduza o contrasinal: "
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:871
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4669,21 +4723,21 @@ msgstr ""
 "Necesita un contrasinal para desbloquea-la chave secreta para\n"
 "o usuario \""
 
-#: g10/passphrase.c:1196
+#: g10/passphrase.c:877
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bits, chave %s, ID %08lX, creada %s"
 
-#: g10/passphrase.c:1205
+#: g10/passphrase.c:886
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1272
+#: g10/passphrase.c:953
 msgid "Repeat passphrase: "
 msgstr "Repita o contrasinal: "
 
-#: g10/photoid.c:66
+#: g10/photoid.c:67
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4697,160 +4751,160 @@ msgstr ""
 "p�blica. Se emprega unha imaxe moi grande, a s�a chave tam�n se ha volver\n"
 "moi grande. Un bo tama�o para empregar � un semellante a 240x288.\n"
 
-#: g10/photoid.c:80
+#: g10/photoid.c:81
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Introduza o nome do ficheiro JPEG: "
 
-#: g10/photoid.c:94
+#: g10/photoid.c:95
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "non se puido abrir un ficheiro: %s\n"
 
-#: g10/photoid.c:102
+#: g10/photoid.c:103
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:104
+#: g10/photoid.c:105
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "�Est� seguro de que quere empregala (s/N)? "
 
-#: g10/photoid.c:119
+#: g10/photoid.c:120
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\" non � un ficheiro JPEG\n"
 
-#: g10/photoid.c:136
+#: g10/photoid.c:137
 msgid "Is this photo correct (y/N/q)? "
 msgstr "�� esta foto correcta (s/N/q)? "
 
-#: g10/photoid.c:338
+#: g10/photoid.c:339
 msgid "unable to display photo ID!\n"
 msgstr "�non se pode amosa-la identificaci�n fotogr�fica!\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:580
+#: g10/pkclist.c:62 g10/revoke.c:581
 msgid "No reason specified"
 msgstr "Non se especificou un motivo"
 
-#: g10/pkclist.c:63 g10/revoke.c:582
+#: g10/pkclist.c:64 g10/revoke.c:583
 msgid "Key is superseded"
 msgstr "A chave � obsoleta"
 
-#: g10/pkclist.c:65 g10/revoke.c:581
+#: g10/pkclist.c:66 g10/revoke.c:582
 msgid "Key has been compromised"
 msgstr "Esta chave quedou descoberta"
 
-#: g10/pkclist.c:67 g10/revoke.c:583
+#: g10/pkclist.c:68 g10/revoke.c:584
 msgid "Key is no longer used"
 msgstr "Xa non se emprega esta chave"
 
-#: g10/pkclist.c:69 g10/revoke.c:584
+#: g10/pkclist.c:70 g10/revoke.c:585
 msgid "User ID is no longer valid"
 msgstr "O ID de usuario xa non � v�lido"
 
-#: g10/pkclist.c:73
+#: g10/pkclist.c:74
 msgid "reason for revocation: "
 msgstr "motivo para a revocaci�n: "
 
-#: g10/pkclist.c:90
+#: g10/pkclist.c:91
 msgid "revocation comment: "
 msgstr "comentario de revocaci�n: "
 
-#: g10/pkclist.c:205
+#: g10/pkclist.c:206
 msgid "iImMqQsS"
 msgstr "iImMsSoO"
 
-#: g10/pkclist.c:213
+#: g10/pkclist.c:214
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "Non se asignou un valor de confianza a:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:245
+#: g10/pkclist.c:246
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "               alias \""
 
-#: g10/pkclist.c:255
+#: g10/pkclist.c:256
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Esta chave probablemente pertenza ao propietario\n"
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:271
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = Non sei\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = NON conf�o\n"
 
-#: g10/pkclist.c:278
+#: g10/pkclist.c:279
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Conf�o absolutamente\n"
 
-#: g10/pkclist.c:284
+#: g10/pkclist.c:285
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = voltar ao men� principal\n"
 
-#: g10/pkclist.c:287
+#: g10/pkclist.c:288
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " o = omitir esta chave\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " s = sa�r\n"
 
-#: g10/pkclist.c:292
+#: g10/pkclist.c:293
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:298 g10/revoke.c:609
+#: g10/pkclist.c:299 g10/revoke.c:610
 msgid "Your decision? "
 msgstr "�A s�a decisi�n? "
 
-#: g10/pkclist.c:319
+#: g10/pkclist.c:320
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "�Est� seguro de querer dar confianza absoluta a esta chave? "
 
-#: g10/pkclist.c:333
+#: g10/pkclist.c:334
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificados que conducen a unha chave de confianza absoluta:\n"
 
-#: g10/pkclist.c:418
+#: g10/pkclist.c:419
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Non hai indicaci�ns de que a sinatura pertenza ao seu propietario.\n"
 
-#: g10/pkclist.c:423
+#: g10/pkclist.c:424
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Non hai indicaci�ns de que a sinatura pertenza ao seu propietario.\n"
 
-#: g10/pkclist.c:429
+#: g10/pkclist.c:430
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Esta chave probablemente pertenza ao propietario\n"
 
-#: g10/pkclist.c:434
+#: g10/pkclist.c:435
 msgid "This key belongs to us\n"
 msgstr "Esta chave pert�ncenos a n�s\n"
 
-#: g10/pkclist.c:460
+#: g10/pkclist.c:461
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -4862,96 +4916,96 @@ msgstr ""
 "respostar � seguinte pregunta cun \"si\"\n"
 "\n"
 
-#: g10/pkclist.c:467
+#: g10/pkclist.c:468
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "�Empregar esta chave de t�dolos xeitos?"
 
-#: g10/pkclist.c:501
+#: g10/pkclist.c:502
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVISO: �Empr�gase unha chave que non � de confianza!\n"
 
-#: g10/pkclist.c:508
+#: g10/pkclist.c:509
 #, fuzzy
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: chave de revocaci�n %08lX "
 "ausente.\n"
 
-#: g10/pkclist.c:517
+#: g10/pkclist.c:518
 #, fuzzy
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
 
-#: g10/pkclist.c:520
+#: g10/pkclist.c:521
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "       Isto pode significar que a sinatura est� falsificada.\n"
 
-#: g10/pkclist.c:527
+#: g10/pkclist.c:528
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVISO: �Esta subchave est� revocada polo propietario!\n"
 
-#: g10/pkclist.c:532
+#: g10/pkclist.c:533
 msgid "Note: This key has been disabled.\n"
 msgstr "Nota: Esta chave est� desactivada.\n"
 
-#: g10/pkclist.c:537
+#: g10/pkclist.c:538
 msgid "Note: This key has expired!\n"
 msgstr "Nota: �Esta chave xa caducou!\n"
 
-#: g10/pkclist.c:548
+#: g10/pkclist.c:549
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVISO: �Esta chave non est� certificada cunha sinatura de confianza!\n"
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:551
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "       Non hai indicaci�ns de que a sinatura pertenza ao seu propietario.\n"
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:559
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVISO: �Esta chave NON � de confianza!\n"
 
-#: g10/pkclist.c:559
+#: g10/pkclist.c:560
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "       Probablemente, a sinatura estea FALSIFICADA.\n"
 
-#: g10/pkclist.c:567
+#: g10/pkclist.c:568
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVISO: �Esta chave non est� certificada con sinaturas de suficiente "
 "confianza!\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:570
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "       Non � seguro que a sinatura pertenza ao seu propietario.\n"
 
-#: g10/pkclist.c:734 g10/pkclist.c:767 g10/pkclist.c:936 g10/pkclist.c:996
+#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: omitido: %s\n"
 
-#: g10/pkclist.c:744 g10/pkclist.c:968
+#: g10/pkclist.c:745 g10/pkclist.c:969
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: omitido: a chave p�blica xa est� presente\n"
 
-#: g10/pkclist.c:786
+#: g10/pkclist.c:787
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Non especificou un ID de usuario. (pode empregar \"-r\")\n"
 
-#: g10/pkclist.c:802
+#: g10/pkclist.c:803
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:828
+#: g10/pkclist.c:829
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -4959,169 +5013,169 @@ msgstr ""
 "\n"
 "Introduza o ID de usuario. Remate cunha li�a en branco: "
 
-#: g10/pkclist.c:844
+#: g10/pkclist.c:845
 msgid "No such user ID.\n"
 msgstr "Non hai tal ID de usuario.\n"
 
-#: g10/pkclist.c:849 g10/pkclist.c:911
+#: g10/pkclist.c:850 g10/pkclist.c:912
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "omitido: a chave p�blica xa est� estabrecida coma destinatario por defecto\n"
 
-#: g10/pkclist.c:867
+#: g10/pkclist.c:868
 msgid "Public key is disabled.\n"
 msgstr "A chave p�blica est� desactivada.\n"
 
-#: g10/pkclist.c:874
+#: g10/pkclist.c:875
 msgid "skipped: public key already set\n"
 msgstr "omitido: chave p�blica xa estabrecida\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:904
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "destinatario por defecto `%s' desco�ecido\n"
 
-#: g10/pkclist.c:948
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: omitido: a chave p�blica est� desactivada\n"
 
-#: g10/pkclist.c:1003
+#: g10/pkclist.c:1004
 msgid "no valid addressees\n"
 msgstr "non hai enderezos v�lidos\n"
 
-#: g10/plaintext.c:90
+#: g10/plaintext.c:91
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "os datos non foron gardados; use a opci�n \"--output\" para gardalos\n"
 
-#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
+#: g10/plaintext.c:136 g10/plaintext.c:141 g10/plaintext.c:159
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erro ao crear `%s': %s\n"
 
-#: g10/plaintext.c:446
+#: g10/plaintext.c:447
 msgid "Detached signature.\n"
 msgstr "Sinatura non adxunta.\n"
 
-#: g10/plaintext.c:450
+#: g10/plaintext.c:452
 msgid "Please enter name of data file: "
 msgstr "Por favor, introduza o nome do ficheiro de datos: "
 
-#: g10/plaintext.c:478
+#: g10/plaintext.c:481
 msgid "reading stdin ...\n"
 msgstr "lendo de stdin ...\n"
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:515
 msgid "no signed data\n"
 msgstr "non hai datos asinados\n"
 
-#: g10/plaintext.c:526
+#: g10/plaintext.c:529
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "non foi posible abri-los datos asinados `%s'\n"
 
-#: g10/pubkey-enc.c:103
+#: g10/pubkey-enc.c:104
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "destinatario an�nimo; tentando a chave secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:119
+#: g10/pubkey-enc.c:120
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "vale, n�s somo-lo destinatario an�nimo.\n"
 
-#: g10/pubkey-enc.c:207
+#: g10/pubkey-enc.c:208
 msgid "old encoding of the DEK is not supported\n"
 msgstr "a codificaci�n vella do DEK non est� soportada\n"
 
-#: g10/pubkey-enc.c:228
+#: g10/pubkey-enc.c:229
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "o algoritmo de cifrado %d%s � desco�ecido ou est� desactivado\n"
 
-#: g10/pubkey-enc.c:266
+#: g10/pubkey-enc.c:267
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "NOTA: o algoritmo de cifrado %d non foi atopado nas preferencias\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:287
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTA: a chave secreta %08lX caducou o %s\n"
 
-#: g10/pubkey-enc.c:292
+#: g10/pubkey-enc.c:293
 msgid "NOTE: key has been revoked"
 msgstr "NOTA: a chave est� revocada"
 
-#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:545
+#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
+#: g10/revoke.c:188 g10/revoke.c:546
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "a chamada a build_packet fallou: %s\n"
 
-#: g10/revoke.c:146
+#: g10/revoke.c:147
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "chave %08lX: non hai ID de usuario\n"
 
-#: g10/revoke.c:272
+#: g10/revoke.c:273
 msgid "To be revoked by:\n"
 msgstr "Ha ser revocada por:\n"
 
-#: g10/revoke.c:276
+#: g10/revoke.c:277
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Esta � unha chave de revocaci�n sensible)\n"
 
-#: g10/revoke.c:280
+#: g10/revoke.c:281
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta sinatura? "
 
-#: g10/revoke.c:293 g10/revoke.c:511
+#: g10/revoke.c:294 g10/revoke.c:512
 msgid "ASCII armored output forced.\n"
 msgstr "Forzouse unha sa�da con armadura ASCII.\n"
 
-#: g10/revoke.c:307 g10/revoke.c:525
+#: g10/revoke.c:308 g10/revoke.c:526
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "a chamada a make_keysig_packet fallou: %s\n"
 
-#: g10/revoke.c:370
+#: g10/revoke.c:371
 msgid "Revocation certificate created.\n"
 msgstr "Creouse o certificado de revocaci�n.\n"
 
-#: g10/revoke.c:376
+#: g10/revoke.c:377
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "non se atoparon chaves de revocaci�n para `%s'\n"
 
-#: g10/revoke.c:432
+#: g10/revoke.c:433
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "non se atopou a chave secreta `%s': %s\n"
 
-#: g10/revoke.c:461
+#: g10/revoke.c:462
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "non hai unha chave p�blica correspondente: %s\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:473
 msgid "public key does not match secret key!\n"
 msgstr "�a chave p�blica con coincide coa chave secreta!\n"
 
-#: g10/revoke.c:479
+#: g10/revoke.c:480
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta sinatura? "
 
-#: g10/revoke.c:496
+#: g10/revoke.c:497
 msgid "unknown protection algorithm\n"
 msgstr "algoritmo de protecci�n desco�ecido\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOTA: �Esta chave non est� protexida!\n"
 
-#: g10/revoke.c:551
+#: g10/revoke.c:552
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5139,114 +5193,114 @@ msgstr ""
 "se volve ilexible. Pero te�a coidado: o sistema de impresi�n da s�a\n"
 "m�quina poder�a armacena-los datos e deix�rllelos dispo�ibles a outros.\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid "Please select the reason for the revocation:\n"
 msgstr "Por favor, escolla o motivo da revocaci�n:\n"
 
-#: g10/revoke.c:602
+#: g10/revoke.c:603
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: g10/revoke.c:604
+#: g10/revoke.c:605
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(probablemente queira seleccionar %d aqu�)\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:646
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Introduza unha descrici�n opcional; rem�tea cunha li�a en branco:\n"
 
-#: g10/revoke.c:673
+#: g10/revoke.c:674
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Motivo para a revocaci�n: %s\n"
 
-#: g10/revoke.c:675
+#: g10/revoke.c:676
 msgid "(No description given)\n"
 msgstr "(Non se deu unha descrici�n)\n"
 
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "�� correcto? "
 
-#: g10/seckey-cert.c:54
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "hai partes da chave secreta non dispo�ibles\n"
 
-#: g10/seckey-cert.c:60
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
 
-#: g10/seckey-cert.c:71
+#: g10/seckey-cert.c:72
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
 
-#: g10/seckey-cert.c:265
+#: g10/seckey-cert.c:266
 msgid "Invalid passphrase; please try again"
 msgstr "Contrasinal non v�lido; por favor, t�nteo de novo"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:267
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:326
+#: g10/seckey-cert.c:327
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVISO: Detectouse unha chave feble - por favor, cambie o contrasinal outra "
 "vez.\n"
 
-#: g10/seckey-cert.c:364
+#: g10/seckey-cert.c:365
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "xerando o checksum de 16-bits a extinguir para a protecci�n da chave "
 "secreta\n"
 
-#: g10/seskey.c:52
+#: g10/seskey.c:53
 msgid "weak key created - retrying\n"
 msgstr "creouse unha chave feble - volvendo a tentalo\n"
 
-#: g10/seskey.c:57
+#: g10/seskey.c:58
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "non se pode evitar unha chave feble para o cifrado sim�trico; tentouse %d "
 "veces\n"
 
-#: g10/seskey.c:213
+#: g10/seskey.c:214
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA require o emprego dun algoritmo hash de 160 bits\n"
 
-#: g10/sig-check.c:75
+#: g10/sig-check.c:76
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "AVISO: conflicto de resumo de sinatura na mensaxe\n"
 
-#: g10/sig-check.c:99
+#: g10/sig-check.c:100
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 
-#: g10/sig-check.c:102
+#: g10/sig-check.c:103
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "AVISO: �o nomeamento dunha chave coma o seu propio revocador designado non "
 "se pode desfacer!\n"
 
-#: g10/sig-check.c:168
+#: g10/sig-check.c:169
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "a chave p�blica %08lX � %lu segundo m�is nova c� sinatura\n"
 
-#: g10/sig-check.c:169
+#: g10/sig-check.c:170
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "a chave p�blica %08lX � %lu segundos m�is nova c� sinatura\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:181
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5254,7 +5308,7 @@ msgstr ""
 "creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:183
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5262,141 +5316,141 @@ msgstr ""
 "creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:193
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTA: a chave de sinatura %08lX caducou o %s\n"
 
-#: g10/sig-check.c:275
+#: g10/sig-check.c:276
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "asumindo unha sinatura incorrecta da chave %08lX debido a un bit cr�tico "
 "desco�ecido\n"
 
-#: g10/sig-check.c:532
+#: g10/sig-check.c:533
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
 "chave %08lX: non hai unha sub-chave para o paquete de a revocaci�n de "
 "subchave\n"
 
-#: g10/sig-check.c:558
+#: g10/sig-check.c:559
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "chave %08lX: non hai sub-chave para a sinatura da ligaz�n da chave\n"
 
-#: g10/sign.c:85
+#: g10/sign.c:86
 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:93
+#: g10/sign.c:94
 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:112
+#: g10/sign.c:113
 #, 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:138
+#: g10/sign.c:139
 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:146
+#: g10/sign.c:147
 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:159
+#: g10/sign.c:160
 #, 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:187
+#: g10/sign.c:188
 #, 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:364
+#: g10/sign.c:365
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
 
-#: g10/sign.c:373
+#: g10/sign.c:374
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "Sinatura %s de: \"%s\"\n"
 
-#: g10/sign.c:741
+#: g10/sign.c:761
 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:808
+#: g10/sign.c:830
 #, 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:900
+#: g10/sign.c:922
 msgid "signing:"
 msgstr "asinando:"
 
-#: g10/sign.c:1007
+#: g10/sign.c:1034
 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:1180
+#: g10/sign.c:1212
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "hase empregar cifrado %s\n"
 
-#: g10/skclist.c:126 g10/skclist.c:190
+#: g10/skclist.c:127 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "a chave non est� marcada coma insegura - non se pode empregar co xerador de "
 "n�meros aleatorios falso\n"
 
-#: g10/skclist.c:157
+#: g10/skclist.c:158
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "om�tese `%s': duplicada\n"
 
-#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "om�tese `%s': %s\n"
 
-#: g10/skclist.c:170
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
 
-#: g10/skclist.c:185
+#: g10/skclist.c:186
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "om�tese `%s': �esta � unha chave ElGamal xerada por PGP que non � segura "
 "para sinaturas!\n"
 
-#: g10/tdbdump.c:59 g10/trustdb.c:365
+#: g10/tdbdump.c:60 g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "rexistro de confianza %lu, tipo %d: fallou a escritura: %s\n"
 
-#: g10/tdbdump.c:104
+#: g10/tdbdump.c:105
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5405,351 +5459,351 @@ msgstr ""
 "# Lista de valores de confianza asignados, creada o %s\n"
 "# (Empregue \"gpg --import-ownertrust\" para restauralos)\n"
 
-#: g10/tdbdump.c:159 g10/tdbdump.c:167 g10/tdbdump.c:172 g10/tdbdump.c:177
+#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: g10/tdbdump.c:159
+#: g10/tdbdump.c:160
 #, fuzzy
 msgid "line too long"
 msgstr "li�a longa de m�is\n"
 
-#: g10/tdbdump.c:167
+#: g10/tdbdump.c:168
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:173
+#: g10/tdbdump.c:174
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "erro: pegada dactilar non v�lida\n"
 
-#: g10/tdbdump.c:178
+#: g10/tdbdump.c:179
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr "importa-los valores de confianza no propietario"
 
-#: g10/tdbdump.c:214
+#: g10/tdbdump.c:215
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "erro ao buscar un rexistro de confianza: %s\n"
 
-#: g10/tdbdump.c:218
+#: g10/tdbdump.c:219
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "erro de lectura: %s\n"
 
-#: g10/tdbdump.c:227 g10/trustdb.c:380
+#: g10/tdbdump.c:228 g10/trustdb.c:381
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de datos de confianza: fallou a sincronizaci�n: %s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1440
+#: g10/tdbio.c:129 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "rexistro da base de datos de confianza %lu: lseek fallou: %s\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1447
+#: g10/tdbio.c:135 g10/tdbio.c:1448
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 "rexistro da base de datos de confianza %lu: fallou a escritura (n=%d): %s\n"
 
-#: g10/tdbio.c:244
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "transacci�n da base de datos de confianza demasiado grande\n"
 
-#: g10/tdbio.c:497
+#: g10/tdbio.c:498
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "non se pode pechar `%s': %s\n"
 
-#: g10/tdbio.c:512
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: �o directorio non existe!\n"
 
-#: g10/tdbio.c:522 g10/tdbio.c:545 g10/tdbio.c:588
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: g10/tdbio.c:524 g10/tdbio.c:591
+#: g10/tdbio.c:525 g10/tdbio.c:592
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "non se puido abrir `%s'\n"
 
-#: g10/tdbio.c:550
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: non se puido crea-lo rexistro de versi�n: %s"
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: creouse unha base de datos de confianza incorrecta\n"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: creouse a base de datos de confianza\n"
 
-#: g10/tdbio.c:597
+#: g10/tdbio.c:598
 msgid "NOTE: trustdb not writable\n"
 msgstr "NOTA: non se pode escribir na base de datos de confianza\n"
 
-#: g10/tdbio.c:614
+#: g10/tdbio.c:615
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de datos de confianza non v�lida\n"
 
-#: g10/tdbio.c:646
+#: g10/tdbio.c:647
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: fallo ao crear unha t�boa hash: %s\n"
 
-#: g10/tdbio.c:654
+#: g10/tdbio.c:655
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: erro ao actualiza-lo rexistro de versi�n: %s\n"
 
-#: g10/tdbio.c:671 g10/tdbio.c:691 g10/tdbio.c:707 g10/tdbio.c:721
-#: g10/tdbio.c:751 g10/tdbio.c:1373 g10/tdbio.c:1400
+#: g10/tdbio.c:672 g10/tdbio.c:692 g10/tdbio.c:708 g10/tdbio.c:722
+#: g10/tdbio.c:752 g10/tdbio.c:1374 g10/tdbio.c:1401
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: erro ao le-lo rexistro de versi�n: %s\n"
 
-#: g10/tdbio.c:730
+#: g10/tdbio.c:731
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: erro ao escribi-lo rexistro de versi�n: %s\n"
 
-#: g10/tdbio.c:1169
+#: g10/tdbio.c:1170
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de datos de confianza: lseek fallou: %s\n"
 
-#: g10/tdbio.c:1177
+#: g10/tdbio.c:1178
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de datos de confianza: fallou a lectura (n=%d): %s\n"
 
-#: g10/tdbio.c:1198
+#: g10/tdbio.c:1199
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: non � un ficheiro de base de datos de confianza\n"
 
-#: g10/tdbio.c:1216
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: rexistro de versi�n con n�mero de rexistro %lu\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1222
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versi�n do ficheiro incorrecta %d\n"
 
-#: g10/tdbio.c:1406
+#: g10/tdbio.c:1407
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: erro ao ler un rexistro libre: %s\n"
 
-#: g10/tdbio.c:1414
+#: g10/tdbio.c:1415
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: erro ao escribi-lo rexistro de directorios: %s\n"
 
-#: g10/tdbio.c:1424
+#: g10/tdbio.c:1425
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: non se puido p�r a cero un rexistro: %s\n"
 
-#: g10/tdbio.c:1454
+#: g10/tdbio.c:1455
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: non se puido engadir un rexistro: %s\n"
 
-#: g10/tdbio.c:1499
+#: g10/tdbio.c:1500
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "a base de datos de confianza est� corrompida; execute \"gpg --fix-trustdb"
 "\".\n"
 
-#: g10/textfilter.c:147
+#: g10/textfilter.c:148
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "non � posible manexar li�as de texto maiores que %d caracteres\n"
 
-#: g10/textfilter.c:244
+#: g10/textfilter.c:245
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "a li�a de entrada cont�n m�is de %d caracteres\n"
 
-#: g10/trustdb.c:226
+#: g10/trustdb.c:227
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' non � un ID longo de chave v�lido\n"
 
-#: g10/trustdb.c:257
+#: g10/trustdb.c:258
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "chave %08lX: aceptada como chave de confianza\n"
 
-#: g10/trustdb.c:295
+#: g10/trustdb.c:296
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "a chave %08lX aparece m�is dunha vez na base de datos de confianza\n"
 
-#: g10/trustdb.c:310
+#: g10/trustdb.c:311
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "chave %08lX: non hai unha chave p�blica para a chave de confianza - omitida\n"
 
-#: g10/trustdb.c:320
+#: g10/trustdb.c:321
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "chave marcada coma de confianza absoluta.\n"
 
-#: g10/trustdb.c:344
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "rexistro de confianza %lu, tipo da petici�n %d: fallou a lectura: %s\n"
 
-#: g10/trustdb.c:350
+#: g10/trustdb.c:351
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "o rexistro de confianza %lu non � do tipo %d solicitado\n"
 
-#: g10/trustdb.c:446
+#: g10/trustdb.c:447
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:452
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:506
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[revocada] "
 
-#: g10/trustdb.c:508 g10/trustdb.c:513
+#: g10/trustdb.c:509 g10/trustdb.c:514
 #, fuzzy
 msgid "[ expired]"
 msgstr "[caducada ]"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 #, fuzzy
 msgid "[ unknown]"
 msgstr "desco�ecido"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 #, fuzzy
 msgid "never"
 msgstr "nunca     "
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:536
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:576
+#: 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:582 g10/trustdb.c:2157
+#: g10/trustdb.c:583 g10/trustdb.c:2309
 #, 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:591
+#: 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:606
+#: 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:838 g10/trustdb.c:1276
+#: 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:1033
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr "por favor, execute con --check-trustdb\n"
 
-#: g10/trustdb.c:1037
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "comprobando a base de datos de confianza\n"
 
-#: g10/trustdb.c:1901
+#: g10/trustdb.c:2053
 #, 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:1965
+#: g10/trustdb.c:2117
 msgid "no ultimately trusted keys found\n"
 msgstr "non se atoparon chaves de confianza absoluta\n"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:2131
 #, 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:2002
+#: g10/trustdb.c:2154
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2240
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2163
+#: g10/trustdb.c:2315
 #, 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"
 
-#: g10/verify.c:116
+#: g10/verify.c:117
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -5759,305 +5813,336 @@ msgstr ""
 "Por favor, lembre que o ficheiro de sinatura (.sig ou .asc) deber�a\n"
 "se-lo primeiro ficheiro que se indique na li�a de comandos.\n"
 
-#: g10/verify.c:189
+#: g10/verify.c:190
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 "a li�a de entrada %u � longa de m�is ou f�ltalle a marca de fin de li�a\n"
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "erro xeral"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "tipo de paquete desco�ecido"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "versi�n desco�ecida"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "algoritmo de chave p�blica desco�ecido"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "algoritmo de resumo desco�ecido"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "chave p�blica err�nea"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "chave secreta err�nea"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "sinatura err�nea"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "error de checksum"
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "contrasinal err�neo"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "non se atopou a chave p�blica"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "algoritmo de cifrado desco�ecido"
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "non foi posible abri-lo chaveiro"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "paquete non v�lido"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "armadura non v�lida"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "non hai tal id de usuario"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "a chave secreta non est� dispo�ible"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "empregouse unha chave secreta err�nea"
 
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "non est� soportado"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "chave incorrecta"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "erro de lectura de ficheiro"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "erro de escritura de ficheiro"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "algoritmo de compresi�n desco�ecido"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "erro de apertura de ficheiro"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "erro de creaci�n de ficheiro"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "contrasinal incorrecto"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "algoritmo de chave p�blica non implementado"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "algoritmo de cifrado non implementado"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "clase de sinatura desco�ecida"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "erro da base de datos de confianza"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "MPI err�neo"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "l�mite de recursos"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "chaveiro incorrecto"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "certificado err�neo"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "id de usuario mal formado"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "erro de peche de ficheiro"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "erro de cambio de nome de ficheiro"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "erro de borrado de ficheiro"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "datos inesperados"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "conflicto de selo de data"
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "algoritmo de chave p�blica imposible de usar"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "o ficheiro xa existe"
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "chave feble"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "argumento non v�lido"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "URI incorrecto"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "URI non soportado"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "erro de rede"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "non cifrado"
 
-#: util/errors.c:103
+#: util/errors.c:104
 msgid "not processed"
 msgstr "non procesado"
 
-#: util/errors.c:105
+#: util/errors.c:106
 msgid "unusable public key"
 msgstr "chave p�blica non utilizable"
 
-#: util/errors.c:106
+#: util/errors.c:107
 msgid "unusable secret key"
 msgstr "chave secreta non utilizable"
 
-#: util/errors.c:107
+#: util/errors.c:108
 msgid "keyserver error"
 msgstr "erro do servidor de chaves"
 
-#: util/errors.c:108
+#: util/errors.c:109
 #, fuzzy
 msgid "canceled"
 msgstr "Cancelar"
 
-#: util/errors.c:109
+#: util/errors.c:110
 #, fuzzy
 msgid "no card"
 msgstr "non cifrado"
 
-#: util/logger.c:157
+#: util/logger.c:158
 msgid "ERROR: "
 msgstr ""
 
-#: util/logger.c:160
+#: util/logger.c:161
 msgid "WARNING: "
 msgstr ""
 
-#: util/logger.c:223
+#: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... isto � un erro (%s:%d:%s)\n"
 
-#: util/logger.c:229
+#: util/logger.c:230
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "atopou un erro ... (%s:%d)\n"
 
-#: util/miscutil.c:336 util/miscutil.c:373
+#: util/miscutil.c:330 util/miscutil.c:367
 msgid "yes"
 msgstr "si|sim"
 
-#: util/miscutil.c:337 util/miscutil.c:378
+#: util/miscutil.c:331 util/miscutil.c:372
 msgid "yY"
 msgstr "sS"
 
-#: util/miscutil.c:339 util/miscutil.c:375
+#: util/miscutil.c:333 util/miscutil.c:369
 msgid "no"
 msgstr "non|nom"
 
-#: util/miscutil.c:340 util/miscutil.c:379
+#: util/miscutil.c:334 util/miscutil.c:373
 msgid "nN"
 msgstr "nN"
 
-#: util/miscutil.c:377
+#: util/miscutil.c:371
 msgid "quit"
 msgstr "abandonar"
 
-#: util/miscutil.c:380
+#: util/miscutil.c:374
 msgid "qQ"
 msgstr "aA"
 
-#: util/miscutil.c:413
+#: util/miscutil.c:407
 msgid "okay|okay"
 msgstr ""
 
-#: util/miscutil.c:415
+#: util/miscutil.c:409
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:416
+#: util/miscutil.c:410
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:417
+#: util/miscutil.c:411
 #, fuzzy
 msgid "cC"
 msgstr "v"
 
-#: util/secmem.c:90
+#: util/secmem.c:91
 msgid "WARNING: using insecure memory!\n"
 msgstr "AVISO: ��sase memoria insegura!\n"
 
-#: util/secmem.c:91
+#: util/secmem.c:92
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "mire en http://www.gnupg.org/faq.html para obter m�is informaci�n\n"
 
-#: util/secmem.c:343
+#: util/secmem.c:344
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "a operaci�n non � posible sen memoria inicializada como segura\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:345
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(pode que usara o programa equivocado para esta tarefa)\n"
 
+#, fuzzy
+#~ msgid "error getting serial number: %s\n"
+#~ msgstr "erro ao crea-lo contrasinal: %s\n"
+
+#~ msgid "Hint: Select the user IDs to sign\n"
+#~ msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
+
+#~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+#~ msgstr "contrasinal incorrecto ou algoritmo de cifrado desco�ecido (%d)\n"
+
+#~ msgid "can't set client pid for the agent\n"
+#~ msgstr "non se pode estabrece-lo pid do cliente para o axente\n"
+
+#~ msgid "can't get server read FD for the agent\n"
+#~ msgstr "non se pode obte-lo FD de lectura do servidor para o axente\n"
+
+#~ msgid "can't get server write FD for the agent\n"
+#~ msgstr "non se pode obte-lo FD de escritura do servidor para o axente\n"
+
+#~ msgid "communication problem with gpg-agent\n"
+#~ msgstr "problema de comunicaci�n con gpg-agent\n"
+
+#~ msgid "passphrase too long\n"
+#~ msgstr "contrasinal demasiado longo\n"
+
+#~ msgid "invalid response from agent\n"
+#~ msgstr "resposta do axente non v�lida\n"
+
+#~ msgid "problem with the agent: agent returns 0x%lx\n"
+#~ msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
+
 #~ msgid "select secondary key N"
 #~ msgstr "selecciona-la chave secundaria N"
 
@@ -7084,9 +7169,6 @@ msgstr "(pode que usara o programa equivocado para esta tarefa)\n"
 #~ msgid "No key for user ID\n"
 #~ msgstr "Non hay unha chave para o ID de usuario\n"
 
-#~ msgid "No user ID for key\n"
-#~ msgstr "Non hai un ID de usuario para a chave\n"
-
 #~ msgid "no secret key for decryption available\n"
 #~ msgstr "non hai chave secreta disponible para desencriptar\n"
 
diff --git a/po/hu.po b/po/hu.po
index 8a85843f0..8c2a865a4 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: 2005-03-15 16:35+0100\n"
+"POT-Creation-Date: 2005-05-31 10:05+0200\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"
@@ -14,81 +14,81 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:120
+#: cipher/primegen.c:121
 #, fuzzy, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr "Nem tudok l�trehozni %d bitesn�l kisebb pr�msz�mot.\n"
 
-#: cipher/primegen.c:311
+#: cipher/primegen.c:312
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "Nem tudok l�trehozni %d bitesn�l kisebb pr�msz�mot.\n"
 
-#: cipher/random.c:163
+#: cipher/random.c:164
 msgid "no entropy gathering module detected\n"
 msgstr "Nem �szleltem entr�piagy�jt� modult.\n"
 
-#: cipher/random.c:387 g10/card-util.c:656 g10/card-util.c:725
-#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2255
-#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
-#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
-#: g10/tdbio.c:600
+#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
+#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
+#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
+#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
+#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/tdbio.c:601
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: cipher/random.c:391
+#: cipher/random.c:392
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "Nem tudom a stat m�veletet elv�gezni a(z) \"%s\" �llom�nyon: %s.\n"
 
-#: cipher/random.c:396
+#: cipher/random.c:397
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "\"%s\" nem szab�lyos �llom�ny. Figyelmen k�v�l hagyom.\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:402
 msgid "note: random_seed file is empty\n"
 msgstr ""
 "Megjegyz�s: random_seed �llom�ny (v�letlensz�m-gener�tor �llapota) �res.\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:408
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "FIGYELEM: �rv�nytelen m�ret� random_seed �llom�ny. Nem haszn�lom.\n"
 
-#: cipher/random.c:415
+#: cipher/random.c:416
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "Nem tudom olvasni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: cipher/random.c:453
+#: cipher/random.c:454
 msgid "note: random_seed file not updated\n"
 msgstr "Megjegyz�s: random_seed �llom�nyt nem friss�tettem.\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2723
-#: g10/keygen.c:2753 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
-#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 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"
 
-#: cipher/random.c:480
+#: cipher/random.c:481
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "Nem tudom �rni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: cipher/random.c:483
+#: cipher/random.c:484
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "Nem tudom bez�rni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: cipher/random.c:728
+#: cipher/random.c:729
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "FIGYELEM: Nem biztons�gos v�letlensz�m-gener�tort haszn�lok!!!\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:730
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -102,7 +102,7 @@ msgstr ""
 "NE HASZN�LJON SEMMILYEN ADATOT, AMIT EZ A PROGRAM EL��LL�T!\n"
 "\n"
 
-#: cipher/rndegd.c:204
+#: cipher/rndegd.c:205
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -111,7 +111,7 @@ msgstr ""
 "K�rem, v�rjon, entr�pi�t gy�jt�k! Vagy ink�bb csin�ljon k�zben valamit\n"
 "a g�pen, az az entr�pi�m min�s�g�t is jav�tani fogja!\n"
 
-#: cipher/rndlinux.c:134
+#: cipher/rndlinux.c:135
 #, c-format
 msgid ""
 "\n"
@@ -123,45 +123,62 @@ msgstr ""
 "m�st, hogy az oper�ci�s rendszer entr�pi�t gy�jthessen!\n"
 "(M�g %d b�jt sz�ks�ges.)\n"
 
-#: g10/app-openpgp.c:547
+#: g10/app-openpgp.c:596
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: g10/app-openpgp.c:560
+#: g10/app-openpgp.c:609
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "Nem tudtam �jra�p�teni a kulcskarika cache-�t: %s\n"
 
-#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
+#: g10/app-openpgp.c:977
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
+
+#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+msgid "response does not contain the public key data\n"
+msgstr ""
+
+#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
-#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
+#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
+#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
 
-#: g10/app-openpgp.c:836
+#: g10/app-openpgp.c:1310
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:857
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:862
+#: g10/app-openpgp.c:1336
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -169,353 +186,358 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:869
+#: g10/app-openpgp.c:1343
 msgid "|A|Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1018
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:1492
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1018
+#: g10/app-openpgp.c:1492
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1022
+#: g10/app-openpgp.c:1496
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
+#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "Hiba a kulcsblokk olvas�sakor: %s\n"
 
-#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
+#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: Hiba szabad rekord olvas�sakor: %s.\n"
 
-#: g10/app-openpgp.c:1104
+#: g10/app-openpgp.c:1562
 #, fuzzy
 msgid "key already exists\n"
 msgstr "\"%s\" m�r t�m�r�tett.\n"
 
-#: g10/app-openpgp.c:1108
+#: g10/app-openpgp.c:1566
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1110
+#: g10/app-openpgp.c:1568
 #, fuzzy
 msgid "generating new key\n"
 msgstr "�j kulcsp�r l�trehoz�sa"
 
-#: g10/app-openpgp.c:1120
+#: g10/app-openpgp.c:1735
+msgid "creation timestamp missing\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1742
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1749
+#, c-format
+msgid "RSA public exponent missing or largerr than %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1827
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
+
+#: g10/app-openpgp.c:1886
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1135
+#: g10/app-openpgp.c:1901
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1904
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Kulcsgener�l�s sikertelen: %s\n"
 
-#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
-msgid "response does not contain the public key data\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
-msgid "response does not contain the RSA modulus\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
-msgid "response does not contain the RSA public exponent\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1195
+#: g10/app-openpgp.c:1961
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1356
+#: g10/app-openpgp.c:2130
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1364
+#: g10/app-openpgp.c:2138
 #, c-format
-msgid "PIN [sigs done: %lu]"
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
+#: g10/app-openpgp.c:2399
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
 
-#: g10/app-openpgp.c:1731
-#, fuzzy, c-format
-msgid "error getting serial number: %s\n"
-msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
-
-#: g10/app-openpgp.c:1826
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
-
-#: g10/app-openpgp.c:1868
-#, fuzzy
-msgid "reading the key failed\n"
-msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
-
-#: g10/armor.c:317
+#: g10/armor.c:318
 #, c-format
 msgid "armor: %s\n"
 msgstr "P�nc�l: %s\n"
 
-#: g10/armor.c:346
+#: g10/armor.c:347
 msgid "invalid armor header: "
 msgstr "�rv�nytelen p�nc�lfejl�c: "
 
-#: g10/armor.c:353
+#: g10/armor.c:354
 msgid "armor header: "
 msgstr "P�nc�lfejl�c: "
 
-#: g10/armor.c:364
+#: g10/armor.c:365
 msgid "invalid clearsig header\n"
 msgstr "�rv�nytelen al��r�sfejl�c!\n"
 
-#: g10/armor.c:416
+#: g10/armor.c:417
 msgid "nested clear text signatures\n"
 msgstr "Egym�sba �gyazott olvashat�sz�veg-al��r�sok!\n"
 
-#: g10/armor.c:551
+#: g10/armor.c:552
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "V�ratlan p�nc�l:"
 
-#: g10/armor.c:563
+#: g10/armor.c:564
 msgid "invalid dash escaped line: "
 msgstr "�rv�nytelen k�t�jeles sor: "
 
-#: g10/armor.c:715 g10/armor.c:1322
+#: g10/armor.c:716 g10/armor.c:1323
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "Kihagytam a %02x k�d� �rv�nytelen radix64 karaktert.\n"
 
-#: g10/armor.c:758
+#: g10/armor.c:759
 msgid "premature eof (no CRC)\n"
 msgstr "Korai �llom�nyv�g (nincs CRC).\n"
 
-#: g10/armor.c:792
+#: g10/armor.c:793
 msgid "premature eof (in CRC)\n"
 msgstr "Korai �llom�nyv�g (a CRC-ben).\n"
 
-#: g10/armor.c:800
+#: g10/armor.c:801
 msgid "malformed CRC\n"
 msgstr "Hib�s form�j� CRC.\n"
 
-#: g10/armor.c:804 g10/armor.c:1359
+#: g10/armor.c:805 g10/armor.c:1360
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC hiba; %06lx - %06lx\n"
 
-#: g10/armor.c:824
+#: g10/armor.c:825
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "Korai �llom�nyv�g (a lez�r�sban).\n"
 
-#: g10/armor.c:828
+#: g10/armor.c:829
 msgid "error in trailer line\n"
 msgstr "Hiba a z�r� sorban!\n"
 
-#: g10/armor.c:1137
+#: g10/armor.c:1138
 msgid "no valid OpenPGP data found.\n"
 msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
 
-#: g10/armor.c:1142
+#: g10/armor.c:1143
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "�rv�nytelen p�nc�l: %d karaktern�l hosszabb sor.\n"
 
-#: g10/armor.c:1146
+#: g10/armor.c:1147
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "quoted printable karakter a p�nc�lban - val�sz�n�leg egy bugos MTA b�ne.\n"
 
-#: g10/card-util.c:58 g10/card-util.c:295
+#: g10/card-util.c:63 g10/card-util.c:303
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "titkos kulcs nem �ll rendelkez�sre"
 
-#: g10/card-util.c:63
+#: g10/card-util.c:68
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1329 g10/delkey.c:127 g10/keyedit.c:1430
-#: g10/keygen.c:2439 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1510
+#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
 #, 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:97 g10/card-util.c:1108 g10/card-util.c:1191
-#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
-#: g10/keygen.c:1365
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
+#: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "Mit v�laszt? "
 
-#: g10/card-util.c:206 g10/card-util.c:256
+#: g10/card-util.c:213 g10/card-util.c:263
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:391
+#: g10/card-util.c:410
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 #, fuzzy
 msgid "unspecified"
 msgstr "Nincs megadva ok."
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 #, fuzzy
 msgid "not forced"
 msgstr "nem feldolgozott"
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:497
+#: g10/card-util.c:516
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:499
+#: g10/card-util.c:518
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:501
+#: g10/card-util.c:520
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:518
+#: g10/card-util.c:537
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:539
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:538
+#: g10/card-util.c:557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:559
+#: g10/card-util.c:578
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "Nincs hozz� tartoz� nyilv�nos kulcs: %s\n"
 
-#: g10/card-util.c:567
+#: g10/card-util.c:586
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:665 g10/card-util.c:734 g10/import.c:261
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:692
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:683
+#: g10/card-util.c:702
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:742
+#: g10/card-util.c:761
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:752
+#: g10/card-util.c:771
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:772
+#: g10/card-util.c:791
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferenci�k friss�t�se"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:799
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "�rv�nytelen karakter a preferenci�k k�z�tt!\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:808
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "�rv�nytelen karakter a preferenci�k k�z�tt!\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:829
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:824
+#: g10/card-util.c:843
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
 
-#: g10/card-util.c:845
+#: g10/card-util.c:864
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/card-util.c:868
+#: g10/card-util.c:887
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
 
-#: g10/card-util.c:916
+#: g10/card-util.c:935
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Kulcsgener�l�s sikertelen: %s\n"
 
-#: g10/card-util.c:917
+#: g10/card-util.c:936
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
 
-#: g10/card-util.c:926
+#: g10/card-util.c:945
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1030
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1030 g10/card-util.c:1039
+#: g10/card-util.c:1051 g10/card-util.c:1060
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1051
+#: g10/card-util.c:1072
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1060
+#: g10/card-util.c:1081
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -523,408 +545,412 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1099
+#: g10/card-util.c:1120
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "K�rem, adja meg, milyen kulcsot k�v�n:\n"
 
-#: g10/card-util.c:1101 g10/card-util.c:1182
+#: g10/card-util.c:1122 g10/card-util.c:1203
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Az al��r�s lej�rt: %s.\n"
 
-#: g10/card-util.c:1102 g10/card-util.c:1184
+#: g10/card-util.c:1123 g10/card-util.c:1205
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (csak titkos�t�s)\n"
 
-#: g10/card-util.c:1103 g10/card-util.c:1186
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1119 g10/card-util.c:1202 g10/keyedit.c:908
-#: g10/keygen.c:1404 g10/revoke.c:642
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
+#: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "�rv�nytelen v�laszt�s.\n"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1200
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "K�rem, v�lassza ki a visszavon�s ok�t:\n"
 
-#: g10/card-util.c:1214
+#: g10/card-util.c:1235
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "Ismeretlen v�delmi algoritmus!\n"
 
-#: g10/card-util.c:1219
+#: g10/card-util.c:1240
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Az els�dleges kulcs titkos r�szei nem el�rhet�k.\n"
 
-#: g10/card-util.c:1224
+#: g10/card-util.c:1245
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
 
-#: g10/card-util.c:1294 g10/keyedit.c:1317
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "kil�p�s ebb�l a men�b�l"
 
-#: g10/card-util.c:1296
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "show admin commands"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/card-util.c:1297 g10/keyedit.c:1320
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "megmutatja ezt a s�g�t"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "list all available data"
 msgstr "Kulcs tal�lhat�: "
 
-#: g10/card-util.c:1302
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1303
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1304
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1305
+#: g10/card-util.c:1327
 #, fuzzy
 msgid "change the login name"
 msgstr "lej�rat megv�ltoztat�sa"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the language preferences"
 msgstr "kulcstulajdonos megb�zhat�s�g�nak be�ll�t�sa"
 
-#: g10/card-util.c:1307
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1308
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1310
+#: g10/card-util.c:1332
 #, fuzzy
 msgid "generate new keys"
 msgstr "�j kulcsp�r l�trehoz�sa"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1377 g10/keyedit.c:1526
+#: g10/card-util.c:1334
+msgid "verify the PIN and list all data"
+msgstr ""
+
+#: g10/card-util.c:1454 g10/keyedit.c:1609
 msgid "Command> "
 msgstr "Parancs> "
 
-#: g10/card-util.c:1412
+#: g10/card-util.c:1492
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/card-util.c:1430
+#: g10/card-util.c:1525
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/card-util.c:1499 g10/keyedit.c:2104
+#: g10/card-util.c:1599 g10/keyedit.c:2210
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�rv�nytelen parancs! (Pr�b�lja a s�g�t: \"help\".)\n"
 
-#: g10/cardglue.c:287
+#: g10/cardglue.c:396
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:519
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:380
+#: g10/cardglue.c:527
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:852
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:853
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:854
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:691
+#: g10/cardglue.c:855
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:705
+#: g10/cardglue.c:872
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Ism�telje meg a jelsz�t: "
 
-#: g10/cardglue.c:719
+#: g10/cardglue.c:886
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "Nem ism�telte meg helyesen a jelsz�t! Pr�b�lja �jra!"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
-#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "Nem tudom megnyitni %s-t!\n"
 
-#: g10/decrypt.c:104 g10/encode.c:859
+#: g10/decrypt.c:105 g10/encode.c:846
 msgid "--output doesn't work for this command\n"
 msgstr "Az --output opci� nem m�k�dik ehhez a parancshoz.\n"
 
-#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3167 g10/keyserver.c:1511
-#: g10/revoke.c:226
+#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3346 g10/keyserver.c:1541
+#: g10/revoke.c:227
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2300 g10/keyserver.c:1525
-#: g10/revoke.c:232 g10/revoke.c:439
+#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "Hiba a kulcsblokk olvas�sakor: %s\n"
 
-#: g10/delkey.c:128 g10/delkey.c:135
+#: g10/delkey.c:129 g10/delkey.c:136
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(Kiv�ve, ha megad egy kulcsot az ujjlenyomat�val.)\n"
 
-#: g10/delkey.c:134
+#: g10/delkey.c:135
 #, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "Nem tudom ezt megcsin�lni k�tegelt m�dban \"--yes\" n�lk�l.\n"
 
-#: g10/delkey.c:146
+#: g10/delkey.c:147
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "T�r�ljem ezt a kulcsot a kulcskarik�r�l? "
 
-#: g10/delkey.c:154
+#: g10/delkey.c:155
 #, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Ez egy titkos kulcs! Val�ban t�r�ljem? "
 
-#: g10/delkey.c:164
+#: g10/delkey.c:165
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: g10/delkey.c:174
+#: g10/delkey.c:175
 msgid "ownertrust information cleared\n"
 msgstr "Kulcstulajdonos megb�zhat�s�gi adatait t�r�ltem.\n"
 
-#: g10/delkey.c:205
+#: g10/delkey.c:206
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "Van egy titkos kulcs a \"%s\" nyilv�nos kulcshoz!\n"
 
-#: g10/delkey.c:207
+#: g10/delkey.c:208
 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:210 g10/sign.c:1186
+#: g10/encode.c:211 g10/sign.c:1218
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: g10/encode.c:215
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "Nem tudok szimmetrikus ESK csomagot haszn�lni a S2K m�d miatt!\n"
 
-#: g10/encode.c:228
+#: g10/encode.c:229
 #, c-format
 msgid "using cipher %s\n"
 msgstr "%s rejtjelez�st haszn�lok.\n"
 
-#: g10/encode.c:238 g10/encode.c:558
+#: g10/encode.c:239 g10/encode.c:545
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "\"%s\" m�r t�m�r�tett.\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
+#: g10/encode.c:302 g10/encode.c:591 g10/sign.c:566
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "FIGYELEM: A(z) \"%s\" �llom�ny �res.\n"
 
-#: g10/encode.c:472
+#: g10/encode.c:466
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "Csak 2048 bites, vagy r�videbb RSA kulcsokkal titkos�that --pgp2 m�dban!\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:488
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "Olvasok a \"%s\" �llom�nyb�l.\n"
 
-#: g10/encode.c:530
+#: g10/encode.c:517
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "Nem tudom az IDEA rejtjelez�t haszn�lni az �sszes c�mzett kulcshoz.\n"
 
-#: g10/encode.c:540
+#: g10/encode.c:527
 #, fuzzy, c-format
 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:648 g10/sign.c:877
+#: g10/encode.c:635 g10/sign.c:899
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "A %s (%d) t�m�r�t�s haszn�lata s�rti a c�mzett preferenci�it!\n"
 
-#: g10/encode.c:735
+#: g10/encode.c:722
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "A %s (%d) rejtjelez� haszn�lata s�rti a c�mzett preferenci�it!\n"
 
-#: g10/encode.c:805 g10/pkclist.c:721 g10/pkclist.c:757
+#: g10/encode.c:792 g10/pkclist.c:722 g10/pkclist.c:758
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
 
-#: g10/encode.c:832
+#: g10/encode.c:819
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s titkos�tva \"%s\" sz�m�ra\n"
 
-#: g10/encr-data.c:66 g10/mainproc.c:301
+#: g10/encr-data.c:67 g10/mainproc.c:302
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s titkos�tott adat.\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:305
+#: g10/encr-data.c:69 g10/mainproc.c:306
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "Ismeretlen algoritmussal (%d) titkos�tva.\n"
 
-#: g10/encr-data.c:92
+#: g10/encr-data.c:93
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "FIGYELEM: Az �zenet szimmetrikus titkos�t�s�t gyenge kulccsal v�gezt�k.\n"
 
-#: g10/encr-data.c:103
+#: g10/encr-data.c:104
 msgid "problem handling encrypted packet\n"
 msgstr "Probl�ma a titkos�tott csomag kezel�sekor!\n"
 
-#: g10/exec.c:48
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "K�ls� program megh�v�sa nem t�mogatott.\n"
 
-#: g10/exec.c:184 g10/openfile.c:406
+#: g10/exec.c:173 g10/openfile.c:410
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "Nem tudom a \"%s\" k�nyvt�rat l�trehozni: %s.\n"
 
-#: g10/exec.c:325
+#: g10/exec.c:314
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "A k�ls� programok h�v�sa tiltott, mert az \"options\" �llom�ny enged�lyei\n"
 "nem biztons�gosak.\n"
 
-#: g10/exec.c:355
+#: g10/exec.c:344
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "Ez a platform �tmeneti �llom�nyokat ig�nyel k�ls� programok h�v�s�hoz.\n"
 
-#: g10/exec.c:433
+#: g10/exec.c:422
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "Nem tudom v�grehajtani a k�vetkez� \"%s\"-t: \"%s\": %s.\n"
 
-#: g10/exec.c:436
+#: g10/exec.c:425
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "Nem tudom v�grehajtani a k�vetkez� \"%s\"-t: \"%s\": %s.\n"
 
-#: g10/exec.c:521
+#: g10/exec.c:510
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "Rendszerhiba k�ls� program h�v�sakor: %s.\n"
 
-#: g10/exec.c:532 g10/exec.c:598
+#: g10/exec.c:521 g10/exec.c:587
 msgid "unnatural exit of external program\n"
 msgstr "A k�ls� program nem term�szetes m�don �rt v�get.\n"
 
-#: g10/exec.c:547
+#: g10/exec.c:536
 msgid "unable to execute external program\n"
 msgstr "Nem tudom a v�grehajtani a k�ls� programot.\n"
 
-#: g10/exec.c:563
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "Nem tudom beolvasni a k�ls� program v�lasz�t: %s\n"
 
-#: g10/exec.c:609 g10/exec.c:616
+#: g10/exec.c:598 g10/exec.c:605
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr ""
 "FIGYELEM: Nem tudom t�r�lni az (\"%s\") �tmeneti �llom�nyt: \"%s\": %s.\n"
 
-#: g10/exec.c:621
+#: g10/exec.c:610
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "FIGYELEM: nem tudom t�r�lni a \"%s\" �tmeneti k�nyvt�rat: %s\n"
 
-#: g10/export.c:183
+#: g10/export.c:184
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/export.c:212
+#: g10/export.c:213
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "%08lX kulcs: nem v�dett - kihagytam.\n"
 
-#: g10/export.c:220
+#: g10/export.c:221
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "%08lX kulcs: PGP 2.x st�lus� kulcs - kihagytam.\n"
 
-#: g10/export.c:395
+#: g10/export.c:398
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "FIGYELEM: %08lX titkos kulcsnak nincs egyszer� SK ellen�rz��sszege.\n"
 
-#: g10/export.c:427
+#: g10/export.c:430
 msgid "WARNING: nothing exported\n"
 msgstr "FIGYELEM: Semmit sem export�ltam.\n"
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid ""
 "@Commands:\n"
 " "
@@ -932,128 +958,128 @@ msgstr ""
 "@Parancsok:\n"
 " "
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "|[file]|make a signature"
 msgstr "|[f�jl]|al��r�s k�sz�t�se"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "|[file]|make a clear text signature"
 msgstr "|[f�jl]|olvashat� sz�veg al��r�sa"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "make a detached signature"
 msgstr "k�l�n�ll� al��r�s k�sz�t�se"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encrypt data"
 msgstr "adat titkos�t�sa"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "encryption only with symmetric cipher"
 msgstr "titkos�t�s csak szimmetrikus rejtjelez�vel"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "decrypt data (default)"
 msgstr "adat visszafejt�se (alap�rtelmez�s)"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "verify a signature"
 msgstr "al��r�s ellen�rz�se"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys"
 msgstr "kulcsok list�z�sa"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and signatures"
 msgstr "kulcsok �s al��r�sok list�z�sa"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kulcsal��r�sok ellen�rz�se"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "list keys and fingerprints"
 msgstr "kulcsok �s ujjlenyomatok list�z�sa"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "list secret keys"
 msgstr "titkos kulcsok list�z�sa"
 
-#: g10/g10.c:379
+#: g10/g10.c:381
 msgid "generate a new key pair"
 msgstr "�j kulcsp�r l�trehoz�sa"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the public keyring"
 msgstr "kulcsok elt�vol�t�sa a nyilv�noskulcs-karik�r�l"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "remove keys from the secret keyring"
 msgstr "kulcsok elt�vol�t�sa a titkoskulcs-karik�r�l"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign a key"
 msgstr "kulcs al��r�sa"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "sign a key locally"
 msgstr "kulcs al��r�sa helyileg"
 
-#: g10/g10.c:385
+#: g10/g10.c:387
 msgid "sign or edit a key"
 msgstr "kulcs al��r�sa vagy szerkeszt�se"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "generate a revocation certificate"
 msgstr "visszavon�si igazol�s k�sz�t�se"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "export keys"
 msgstr "kulcsok export�l�sa"
 
-#: g10/g10.c:389
+#: g10/g10.c:391
 msgid "export keys to a key server"
 msgstr "kulcsok export�l�sa kulcsszerverre"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "import keys from a key server"
 msgstr "kulcsok import�l�sa kulcsszerverr�l"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "search for keys on a key server"
 msgstr "kulcsok keres�se kulcsszerveren"
 
-#: g10/g10.c:394
+#: g10/g10.c:396
 msgid "update all keys from a keyserver"
 msgstr "minden kulcs friss�t�se kulcsszerverr�l"
 
-#: g10/g10.c:397
+#: g10/g10.c:399
 msgid "import/merge keys"
 msgstr "kulcsok import�l�sa/�sszef�z�se"
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "print the card status"
 msgstr ""
 
-#: g10/g10.c:401
+#: g10/g10.c:403
 msgid "change data on a card"
 msgstr ""
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/g10.c:410
+#: g10/g10.c:412
 msgid "update the trust database"
 msgstr "bizalmi adatb�zis friss�t�se"
 
-#: g10/g10.c:417
+#: g10/g10.c:419
 msgid "|algo [files]|print message digests"
 msgstr "|algo [f�jlok]|�zenet kivonat�nak ki�r�sa"
 
-#: g10/g10.c:421 g10/gpgv.c:66
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1063,51 +1089,51 @@ msgstr ""
 "Opci�k:\n"
 " "
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "create ascii armored output"
 msgstr "ascii p�nc�lozott kimenet l�trehoz�sa"
 
-#: g10/g10.c:425
+#: g10/g10.c:427
 msgid "|NAME|encrypt for NAME"
 msgstr "|N�V|titkos�t�s N�V r�sz�re"
 
-#: g10/g10.c:436
+#: g10/g10.c:438
 msgid "use this user-id to sign or decrypt"
 msgstr "felh. azonos�t� al��r�shoz �s visszafejt�shez"
 
-#: g10/g10.c:437
+#: g10/g10.c:439
 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/g10.c:442
+#: g10/g10.c:444
 msgid "use canonical text mode"
 msgstr "kanonikus sz�veges m�d haszn�lata"
 
-#: g10/g10.c:452
+#: g10/g10.c:458
 msgid "use as output file"
 msgstr "kimeneti �llom�ny megad�sa"
 
-#: g10/g10.c:454 g10/gpgv.c:68
+#: g10/g10.c:460 g10/gpgv.c:73
 msgid "verbose"
 msgstr "b�besz�d� m�d"
 
-#: g10/g10.c:465
+#: g10/g10.c:471
 msgid "do not make any changes"
 msgstr "ne csin�ljon semmi v�ltoztat�st"
 
-#: g10/g10.c:466
+#: g10/g10.c:472
 msgid "prompt before overwriting"
 msgstr "fel�l�r�s el�tt r�k�rdez�s"
 
-#: g10/g10.c:507
+#: g10/g10.c:513
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:508
+#: g10/g10.c:514
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:536
+#: g10/g10.c:542
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1115,7 +1141,7 @@ msgstr ""
 "@\n"
 "(A parancsok �s opci�k teljes list�j�t a man oldalon tekintheti meg.)\n"
 
-#: g10/g10.c:539
+#: g10/g10.c:545
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1135,15 +1161,15 @@ msgstr ""
 " --list-keys [nevek]        kulcsok ki�rat�sa\n"
 " --fingerprint [nevek]      ujjlenyomatok ki�rat�sa\n"
 
-#: g10/g10.c:720 g10/gpgv.c:93
+#: g10/g10.c:724 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "A hib�kat (angolul) a <[email protected]> c�mre �rja meg!\n"
 
-#: g10/g10.c:737
+#: g10/g10.c:741
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: g10/g10.c:740
+#: g10/g10.c:744
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1153,7 +1179,7 @@ msgstr ""
 "Al��r�s, ellen�rz�s, titkos�t�s vagy visszafejt�s.\n"
 "Az alap�rtelmezett m�velet a bemeneti adatt�l f�gg.\n"
 
-#: g10/g10.c:751
+#: g10/g10.c:755
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1161,459 +1187,469 @@ msgstr ""
 "\n"
 "T�mogatott algoritmusok:\n"
 
-#: g10/g10.c:754
+#: g10/g10.c:758
 msgid "Pubkey: "
 msgstr "Nyilv�nos kulcs� (pubkey): "
 
-#: g10/g10.c:760 g10/keyedit.c:2141
+#: g10/g10.c:764 g10/keyedit.c:2248
 msgid "Cipher: "
 msgstr "Rejtjelez� (cipher): "
 
-#: g10/g10.c:766
+#: g10/g10.c:770
 msgid "Hash: "
 msgstr "Kivonatol� (hash): "
 
-#: g10/g10.c:772 g10/keyedit.c:2187
+#: g10/g10.c:776 g10/keyedit.c:2294
 msgid "Compression: "
 msgstr "T�m�r�t� (compression): "
 
-#: g10/g10.c:855
+#: g10/g10.c:859
 msgid "usage: gpg [options] "
 msgstr "Haszn�lat: gpg [opci�k] "
 
-#: g10/g10.c:1003
+#: g10/g10.c:1007
 msgid "conflicting commands\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/g10.c:1021
+#: g10/g10.c:1025
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "Nem tal�ltam = jelet a \"%s\" csoportdefin�ci�ban!\n"
 
-#: g10/g10.c:1218
+#: g10/g10.c:1222
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/g10.c:1221
+#: g10/g10.c:1225
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/g10.c:1224
+#: g10/g10.c:1228
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/g10.c:1230
+#: g10/g10.c:1234
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/g10.c:1233
+#: g10/g10.c:1237
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1240
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/g10.c:1242
+#: g10/g10.c:1246
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
 
-#: g10/g10.c:1245
+#: g10/g10.c:1249
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
 
-#: g10/g10.c:1248
+#: g10/g10.c:1252
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1258
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
 
-#: g10/g10.c:1257
+#: g10/g10.c:1261
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
 
-#: g10/g10.c:1260
+#: g10/g10.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
 
-#: g10/g10.c:1401
+#: g10/g10.c:1405
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "\"%s\": ismeretlen konfigur�ci�s elem.\n"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1802
 #, 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/g10.c:1838
+#: g10/g10.c:1844
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "MEGJEGYZ�S: Nincs alap�rtelmezett opci�s f�jl (%s).\n"
 
-#: g10/g10.c:1842
+#: g10/g10.c:1848
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "\"%s\" opci�s f�jl: %s\n"
 
-#: g10/g10.c:1849
+#: g10/g10.c:1855
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
 
-#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "MEGJEGYZ�S: %s nem norm�l haszn�latra van!\n"
 
-#: g10/g10.c:2076
+#: g10/g10.c:2082
 #, 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/g10.c:2293
+#: g10/g10.c:2236 g10/g10.c:2248
+#, fuzzy, c-format
+msgid "`%s' is not a valid signature expiration\n"
+msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
+
+#: g10/g10.c:2321
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3683
+#: g10/g10.c:2340 g10/keyedit.c:3862
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2346
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2349
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2356
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2359
 msgid "invalid import options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2366
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2369
 msgid "invalid export options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2376
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2379
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2401
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2404
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2411
 #, 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/g10.c:2573
+#: g10/g10.c:2602
 msgid "WARNING: program may create a core file!\n"
 msgstr "FIGYELEM: A program core �llom�nyt hozhat l�tre!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2606
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "FIGYELEM: %s hat�stalan�tja %s-t!\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2615
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s �s %s nem haszn�lhat� egy�tt!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2618
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s �rtelmetlen %s mellett!\n"
 
-#: g10/g10.c:2603
+#: g10/g10.c:2625
+#, 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/g10.c:2640
 #, 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/g10.c:2617
+#: g10/g10.c:2654
 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/g10.c:2623
+#: g10/g10.c:2660
 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/g10.c:2629
+#: g10/g10.c:2666
 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/g10.c:2642
+#: g10/g10.c:2679
 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/g10.c:2712 g10/g10.c:2736
+#: g10/g10.c:2746 g10/g10.c:2770
 msgid "selected cipher algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/g10.c:2718 g10/g10.c:2742
+#: g10/g10.c:2752 g10/g10.c:2776
 msgid "selected digest algorithm is invalid\n"
 msgstr "A kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/g10.c:2724
+#: g10/g10.c:2758
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2764
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Az igazol�shoz kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/g10.c:2745
+#: g10/g10.c:2779
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed nagyobb kell legyen 0-n�l!\n"
 
-#: g10/g10.c:2747
+#: g10/g10.c:2781
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed nagyobb kell legyen 1-n�l!\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2783
 #, 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/g10.c:2751
+#: g10/g10.c:2785
 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/g10.c:2753
+#: g10/g10.c:2787
 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/g10.c:2756
+#: g10/g10.c:2790
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "MEGJEGYZ�S: Egyszer� S2K m�d (0) er�sen ellenjavallt!\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2794
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�rv�nytelen S2K m�d; 0, 1 vagy 3 lehet.\n"
 
-#: g10/g10.c:2767
+#: g10/g10.c:2801
 msgid "invalid default preferences\n"
 msgstr "�rv�nytelen alap�rtelmezett preferenci�k!\n"
 
-#: g10/g10.c:2776
+#: g10/g10.c:2810
 msgid "invalid personal cipher preferences\n"
 msgstr "�rv�nytelen szem�lyes rejtjelez�-preferenci�k!\n"
 
-#: g10/g10.c:2780
+#: g10/g10.c:2814
 msgid "invalid personal digest preferences\n"
 msgstr "�rv�nytelen szem�lyes kivonatol�preferenci�k!\n"
 
-#: g10/g10.c:2784
+#: g10/g10.c:2818
 msgid "invalid personal compress preferences\n"
 msgstr "�rv�nytelen szem�lyes t�m�r�t�preferenci�k!\n"
 
-#: g10/g10.c:2817
+#: g10/g10.c:2851
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s �s %s egyel�re nem haszn�lhat� egy�tt!\n"
 
-#: g10/g10.c:2864
+#: g10/g10.c:2898
 #, 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/g10.c:2869
+#: g10/g10.c:2903
 #, 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/g10.c:2874
+#: g10/g10.c:2908
 #, 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/g10.c:2970
+#: g10/g10.c:3004
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: g10/g10.c:2981
+#: g10/g10.c:3015
 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/g10.c:2992
+#: g10/g10.c:3026
 msgid "--store [filename]"
 msgstr "--store [f�jln�v]"
 
-#: g10/g10.c:2999
+#: g10/g10.c:3033
 msgid "--symmetric [filename]"
 msgstr "--symmetric [f�jln�v]"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3035
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Visszafejt�s sikertelen: %s.\n"
 
-#: g10/g10.c:3011
+#: g10/g10.c:3045
 msgid "--encrypt [filename]"
 msgstr "--encrypt [f�jln�v]"
 
-#: g10/g10.c:3024
+#: g10/g10.c:3058
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3060
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3029
+#: g10/g10.c:3063
 #, 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/g10.c:3047
+#: g10/g10.c:3081
 msgid "--sign [filename]"
 msgstr "--sign [f�jln�v]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3094
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/g10.c:3075
+#: g10/g10.c:3109
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/g10.c:3077
+#: g10/g10.c:3111
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3080
+#: g10/g10.c:3114
 #, 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/g10.c:3100
+#: g10/g10.c:3134
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [f�jln�v]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3143
 msgid "--clearsign [filename]"
 msgstr "--clearsign [f�jln�v]"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3168
 msgid "--decrypt [filename]"
 msgstr "--decrypt [f�jln�v]"
 
-#: g10/g10.c:3142
+#: g10/g10.c:3176
 msgid "--sign-key user-id"
 msgstr "--sign-key felh-azonos�t�"
 
-#: g10/g10.c:3146
+#: g10/g10.c:3180
 msgid "--lsign-key user-id"
 msgstr "--lsign-key felh-azonos�t�"
 
-#: g10/g10.c:3167
+#: g10/g10.c:3201
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key felh-azonos�t� [parancsok]"
 
-#: g10/g10.c:3238
+#: g10/g10.c:3272
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [felh-azonos�t�] [kulcskarika]"
 
-#: g10/g10.c:3275
+#: g10/g10.c:3309
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
 
-#: g10/g10.c:3277
+#: g10/g10.c:3311
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3313
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Kulcsexport�l�s sikertelen: %s\n"
 
-#: g10/g10.c:3290
+#: g10/g10.c:3324
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Keres�s a kulcsszerveren sikertelen: %s\n"
 
-#: g10/g10.c:3300
+#: g10/g10.c:3334
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Friss�t�s a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/g10.c:3341
+#: g10/g10.c:3375
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "P�nc�l elt�vol�t�sa nem siker�lt: %s\n"
 
-#: g10/g10.c:3349
+#: g10/g10.c:3383
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "P�nc�loz�s nem siker�lt: %s\n"
 
-#: g10/g10.c:3436
+#: g10/g10.c:3470
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
 
-#: g10/g10.c:3559
+#: g10/g10.c:3593
 msgid "[filename]"
 msgstr "[f�jln�v]"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3597
 msgid "Go ahead and type your message ...\n"
 msgstr "Kezdheti g�pelni az �zenetet...\n"
 
-#: g10/g10.c:3853
+#: g10/g10.c:3887
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1621,80 +1657,85 @@ msgstr ""
 "Egy jel�l�s neve csak nyomtathat� karaktereket �s sz�k�zt tartalmazhat, �s = "
 "jellel kell befejez�dj�n.\n"
 
-#: g10/g10.c:3861
+#: g10/g10.c:3895
 msgid "a user notation name must contain the '@' character\n"
 msgstr "Egy felhaszn�l�jel�l�snek tartalmaznia kell a \"@\" karaktert!\n"
 
-#: g10/g10.c:3871
+#: g10/g10.c:3900
+#, 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/g10.c:3911
 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/g10.c:3905
+#: g10/g10.c:3945
 msgid "the given certification policy URL is invalid\n"
 msgstr "A megadott igazol�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/g10.c:3907
+#: g10/g10.c:3947
 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/g10.c:3940
+#: g10/g10.c:3980
 #, 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"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "T�l sok bejegyz�s van a nyilv�noskulcs-gyors�t�t�rban - letiltom.\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2750
+#: g10/getkey.c:187 g10/getkey.c:2757
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[ismeretlen kulcs]"
 
-#: g10/getkey.c:1677
+#: g10/getkey.c:1684
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "%08lX �rv�nytelen kulcsot �rv�nyes�tett�k az\n"
 "--allow-non-selfsigned-uid opci�val.\n"
 
-#: g10/getkey.c:2228
+#: g10/getkey.c:2235
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "Nincs titkos alkulcs a %08lX nyilv�nos alkulcshoz - figyelmen k�v�l hagyom.\n"
 
-#: g10/getkey.c:2459
+#: g10/getkey.c:2466
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "A %08lX m�sodlagos kulcsot haszn�ljuk a %08lX els�dleges helyett.\n"
 
-#: g10/getkey.c:2506
+#: g10/getkey.c:2513
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "%08lX kulcs: titkos kulcs nyilv�nos kulcs n�lk�l - kihagytam.\n"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:74
 msgid "be somewhat more quiet"
 msgstr "m�g sz�kszav�bb m�d"
 
-#: g10/gpgv.c:70
+#: g10/gpgv.c:75
 msgid "take the keys from this keyring"
 msgstr "a megadott kulcskarik�r�l vegye a kulcsokat"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:77
 msgid "make timestamp conflicts only a warning"
 msgstr "id�b�lyeg-konfliktus eset�n csak figyelmeztessen"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:78
 msgid "|FD|write status info to this FD"
 msgstr "|�L|�llapotinform�ci�k �r�sa �L �llom�nyle�r�ra"
 
-#: g10/gpgv.c:97
+#: g10/gpgv.c:102
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Haszn�lat: gpgv [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:105
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1702,7 +1743,7 @@ msgstr ""
 "Szintaxis: gpg [opci�k] [f�jlok]\n"
 "Ellen�rzi az al��r�sokat az ismert, megb�zhat� kulcsok seg�ts�g�vel.\n"
 
-#: g10/helptext.c:48
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1712,7 +1753,7 @@ msgstr ""
 "nem export�ljuk m�sok r�sz�re. Ez a bizalmak h�l�zat�hoz (web-of-trust)\n"
 "sz�ks�ges, semmi k�ze az igazol�sok h�l�zat�hoz (web-of-certificates)."
 
-#: g10/helptext.c:54
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1724,18 +1765,18 @@ msgstr ""
 "melyek titkos kulcs�hoz hozz�f�r. V�laszoljon \"igen\"-nel, ha kulcsot\n"
 "alapvet�en megb�zhat�nak jel�li!\n"
 
-#: g10/helptext.c:61
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Ha m�gis haszn�lni akarja ezt a kulcsot, melyben nem b�zunk,\n"
 "v�laszoljon \"igen\"-nel!"
 
-#: g10/helptext.c:65
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Adja meg a c�mzett felhaszn�l�i azonos�t�j�t!"
 
-#: g10/helptext.c:69
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1749,7 +1790,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:83
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -1759,16 +1800,16 @@ msgstr ""
 "titkos�t�shoz. Ezt az algoritmust csak bizonyos ter�leteken aj�nlatos\n"
 "haszn�lni. K�rem, el�sz�r konzult�ljon a biztons�gi szak�rt�j�vel!"
 
-#: g10/helptext.c:90
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "Adja meg a kulcs m�ret�t!"
 
-#: g10/helptext.c:94 g10/helptext.c:99 g10/helptext.c:111 g10/helptext.c:143
-#: g10/helptext.c:171 g10/helptext.c:176 g10/helptext.c:181
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "K�rem, adjon \"igen\" vagy \"nem\" v�laszt!"
 
-#: g10/helptext.c:104
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1780,19 +1821,19 @@ msgstr ""
 "hiba�zenetet kapni, hanem a rendszer megpr�b�lja az �rt�ket\n"
 "intervallumk�nt �rtelmezni."
 
-#: g10/helptext.c:116
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "Adja meg a kulcs tulajdonos�nak a nev�t!"
 
-#: g10/helptext.c:121
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr "K�rem, adjon meg egy opcion�lis, de nagyon aj�nlott e-mail c�met!"
 
-#: g10/helptext.c:125
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "K�rem, adjon meg egy opcion�lis megjegyz�st!"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1806,13 +1847,13 @@ msgstr ""
 "R  kulcsgener�l�s folytat�sa\n"
 "Q  kil�p�s a kulcsgener�l�sb�l"
 
-#: g10/helptext.c:139
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr ""
 "V�laszoljon \"igen\"-nel (vagy csak \"i\"-vel), ha kezdhetj�k az alkulcs\n"
 "l�trehoz�s�t!"
 
-#: g10/helptext.c:147
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -1886,13 +1927,13 @@ msgstr ""
 "\n"
 "Ha nem tudja, hogy mit v�laszoljon, �rjon \"0\"-t!"
 
-#: g10/helptext.c:185
+#: g10/helptext.c:186
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr ""
 "V�laszoljon \"igen\"-nel, ha az �SSZES felhaszn�l�azonos�t�t al� akarja �rni!"
 
-#: g10/helptext.c:189
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -1901,11 +1942,11 @@ msgstr ""
 "felhaszn�l�azonos�t�t!\n"
 "Minden igazol�s t�rl�dik vele egy�tt!"
 
-#: g10/helptext.c:194
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "V�laszoljon \"igen\"-nel, ha az alkulcs t�r�lhet�."
 
-#: g10/helptext.c:199
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -1915,7 +1956,7 @@ msgstr ""
 "t�r�lni, mert fontos lehet ahhoz, hogy �rv�nyes�tse ezt a kulcsot,\n"
 "vagy egy m�sikat, melyet ezzel a kulccsal igazolnak."
 
-#: g10/helptext.c:204
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -1927,13 +1968,13 @@ msgstr ""
 "hogy melyik kulcsot haszn�lt�k, mert ez az al��r� kulcs bizalmi\n"
 "kapcsolatot hozhat l�tre egy m�r hiteles�tett kulcson kereszt�l."
 
-#: g10/helptext.c:210
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "Ez az al��r�s nem �rv�nyes. �rtelmetlen elt�vol�tani a kulcskarik�r�l."
 
-#: g10/helptext.c:214
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -1947,7 +1988,7 @@ msgstr ""
 "a kulcsot. Csak akkor tegye ezt, ha valami okb�l ez az �nal��r�s nem\n"
 "�rv�nyes, �s rendelkez�sre �ll egy m�sik!"
 
-#: g10/helptext.c:222
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -1957,23 +1998,23 @@ msgstr ""
 "tartoz� preferenci�kat az aktu�lis preferenci�kra. Minden �rintett\n"
 "�nal��r�s id�pontj�t egy m�sodperccel n�veli.\n"
 
-#: g10/helptext.c:229
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
 
-#: g10/helptext.c:235
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "K�rem, ism�telje meg az el�z� jelsz�t ellen�rz�sk�ppen!"
 
-#: g10/helptext.c:239
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "Adja meg az �llom�ny nev�t, melyhez az al��r�s tartozik!"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "V�laszoljon \"igen\"-nel, ha fel�l�rhat� az �llom�ny!"
 
-#: g10/helptext.c:249
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -1981,7 +2022,7 @@ msgstr ""
 "K�rem, adjon meg egy �j f�jlnevet! Ha RETURN-t/ENTER-t nyom, akkor\n"
 "a sz�gletes z�r�jelben lev� alap�rtelmezett nevet haszn�lom."
 
-#: g10/helptext.c:255
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2009,7 +2050,7 @@ msgstr ""
 "      Haszn�lja ezt akkor, ha azt �ll�tja, hogy a felhaszn�l�azonos�t�\n"
 "      m�r nem haszn�latos! �ltal�ban �rv�nytelen e-mail c�met jelent.\n"
 
-#: g10/helptext.c:271
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2019,475 +2060,480 @@ msgstr ""
 "adta ki ezt a visszavon� igazol�st. K�rem, fogalmazzon t�m�ren!\n"
 "Egy �res sor jelzi a sz�veg v�g�t.\n"
 
-#: g10/helptext.c:286
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "Nem �ll rendelkez�sre seg�ts�g."
 
-#: g10/helptext.c:294
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Nem �ll rendelkez�sre seg�ts�g \"%s\" t�m�hoz."
 
-#: g10/import.c:247
+#: g10/import.c:248
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "%d t�pus� blokkot kihagyom.\n"
 
-#: g10/import.c:256
+#: g10/import.c:257
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "Eddig %lu kulcsot dolgoztam fel.\n"
 
-#: g10/import.c:273
+#: g10/import.c:274
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "     �sszesen feldolgoztam: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "       �j kulcsok kihagyva: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:279
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "    felh. azonos�t� n�lk�l: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "              imported: %lu"
 msgstr "                import�lva: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:287
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "               v�ltozatlan: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "       �j felh. azonos�t�k: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "              �j alkulcsok: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "              �j al��r�sok: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "     �j kulcsvisszavon�sok: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   olvasott titkos kulcsok: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  import�lt titkos kulcsok: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "v�ltozatlan titkos kulcsok: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "             nem import�lt: %lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:544
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:545
+#: g10/import.c:546
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "�n al��rta a k�vetkez� felhaszn�l�azonos�t�kat:\n"
 
-#: g10/import.c:582
+#: g10/import.c:583
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:594
+#: g10/import.c:595
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
 
-#: g10/import.c:606
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:620
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:646
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:694 g10/import.c:1048
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:713
+#: g10/import.c:714
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "%08lX kulcs: HKP alkulcss�r�l�s kijav�tva.\n"
 
-#: g10/import.c:728
+#: g10/import.c:729
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "%08lX kulcs: Nem �nal��rt felh. azonos�t� (\"%s\") elfogadva.\n"
 
-#: g10/import.c:734
+#: g10/import.c:735
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "%08lX kulcs: Nincs �rv�nyes felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 msgid "this may be caused by a missing self-signature\n"
 msgstr "Ezt okozhatja egy hi�nyz� �nal��r�s.\n"
 
-#: g10/import.c:746 g10/import.c:1168
+#: g10/import.c:747 g10/import.c:1169
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "%08lX kulcs: Nyilv�nos kulcs nem tal�lhat�: %s\n"
 
-#: g10/import.c:752
+#: g10/import.c:753
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "%08lX kulcs: �j kulcs - kihagytam.\n"
 
-#: g10/import.c:761
+#: g10/import.c:762
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "Nem �rhat� kulcskarik�t tal�ltam: %s\n"
 
-#: g10/import.c:766 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�rok a \"%s\" �llom�nyba.\n"
 
-#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
-#: g10/import.c:2314 g10/import.c:2336
+#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
+#: g10/import.c:2315 g10/import.c:2337
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "Hiba a \"%s\" kulcskarika �r�sakor: %s\n"
 
-#: g10/import.c:791
+#: g10/import.c:792
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "%08lX kulcs: \"%s\" nyilv�nos kulcs import�lva.\n"
 
-#: g10/import.c:815
+#: g10/import.c:816
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "%08lX kulcs: Nem egyezik a mi m�solatunkkal!\n"
 
-#: g10/import.c:832 g10/import.c:1186
+#: g10/import.c:833 g10/import.c:1187
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "%08lX kulcs: Nem tal�lom az eredeti kulcsblokkot: %s\n"
 
-#: g10/import.c:840 g10/import.c:1193
+#: g10/import.c:841 g10/import.c:1194
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "%08lX kulcs: Nem tudom beolvasni az eredeti kulcsblokkot: %s\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "%08lX kulcs: \"%s\" 1 �j felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:875
+#: g10/import.c:876
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "%08lX kulcs: \"%s\" %d �j felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:878
+#: g10/import.c:879
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "%08lX kulcs: \"%s\" 1 �j al��r�s.\n"
 
-#: g10/import.c:881
+#: g10/import.c:882
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
 
-#: g10/import.c:884
+#: g10/import.c:885
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "%08lX kulcs: \"%s\" 1 �j alkulcs.\n"
 
-#: g10/import.c:887
+#: g10/import.c:888
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "%08lX kulcs: \"%s\" %d �j alkulcs.\n"
 
-#: g10/import.c:908
+#: g10/import.c:909
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "%08lX kulcs: \"%s\" nem v�ltozott.\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1054
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "%08lX kulcs: Titkos kulcs �rv�nytelen (%d) rejtjelez�vel - kihagytam.\n"
 
-#: g10/import.c:1064
+#: g10/import.c:1065
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/import.c:1081 g10/import.c:2329
+#: g10/import.c:1082 g10/import.c:2330
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "Nincs alap�rtelmezett titkoskulcs-karika: %s\n"
 
-#: g10/import.c:1092
+#: g10/import.c:1093
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "%08lX kulcs: Titkos kulcs import�lva.\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1122
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "%08lX kulcs: M�r szerepel a titkoskulcs-karik�n.\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1132
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "%08lX kulcs: Titkos kulcs nem tal�lhat�: %s\n"
 
-#: g10/import.c:1161
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "%08lX kulcs: Nincs nyilv�nos kulcs - nem tudok visszavonni.\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1205
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "%08lX kulcs: �rv�nytelen visszavon� igazol�s: %s - visszautas�tva.\n"
 
-#: g10/import.c:1236
+#: g10/import.c:1237
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "%08lX kulcs: \"%s\" visszavon� igazol�st import�ltam.\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1302
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t� ehhez az al��r�shoz!\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1317
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "%08lX kulcs: Nem t�mogatott nyilv�nos kulcs� alg. a \"%s\" felh. "
 "azonos�t�n!\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "%08lX kulcs: �rv�nytelen �nal��r�s a \"%s\" felh. azonos�t�n!\n"
 
-#: g10/import.c:1336
+#: g10/import.c:1337
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "%08lX kulcs: Nincs alkulcs a kulcsk�t�shez!\n"
 
-#: g10/import.c:1347 g10/import.c:1397
+#: g10/import.c:1348 g10/import.c:1398
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "%08lX kulcs: Nem t�mogatott nyilv�nos kulcs� algoritmus!\n"
 
-#: g10/import.c:1349
+#: g10/import.c:1350
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "%08lX kulcs: �rv�nytelen alkulcsk�t�s!\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1365
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "%08lX kulcs: Elt�vol�tottam a t�bbsz�r�s alkulcsk�t�st.\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "%08lX kulcs: Nincs alkulcs a kulcsvisszavon�shoz.\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "%08lX kulcs: �rv�nytelen alkulcsvisszavon�s.\n"
 
-#: g10/import.c:1414
+#: g10/import.c:1415
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "%08lX kulcs: Elt�vol�tottam a t�bbsz�r�s alkulcsvisszavon�st.\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1457
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "%08lX kulcs: Kihagytam a felh. azonos�t�t: '"
 
-#: g10/import.c:1477
+#: g10/import.c:1478
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "%08lX kulcs: Alkulcsot kihagytam.\n"
 
-#: g10/import.c:1504
+#: g10/import.c:1505
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "%08lX kulcs: Nem export�lhat� al��r�s (%02x. oszt�ly) - kihagytam.\n"
 
-#: g10/import.c:1514
+#: g10/import.c:1515
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "%08lX kulcs: Visszavon� igazol�s rossz helyen - kihagytam.\n"
 
-#: g10/import.c:1531
+#: g10/import.c:1532
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "%08lX kulcs: �rv�nytelen visszavon� igazol�s: %s - kihagytam.\n"
 
-#: g10/import.c:1545
+#: g10/import.c:1546
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "%08lX kulcs: Alkulcsal��r�s rossz helyen - kihagytam.\n"
 
-#: g10/import.c:1553
+#: g10/import.c:1554
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "%08lX kulcs: V�ratlan al��r�soszt�ly (0x%02X) - kihagytam.\n"
 
-#: g10/import.c:1574
+#: g10/import.c:1575
 #, fuzzy, c-format
 msgid "key %s: expired signature from key %s - skipped\n"
 msgstr "%08lX kulcs: V�ratlan al��r�soszt�ly (0x%02X) - kihagytam.\n"
 
-#: g10/import.c:1677
+#: g10/import.c:1678
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "%08lX kulcs: Dupl�zott felh. azonos�t�t tal�ltam - �sszef�ztem.\n"
 
-#: g10/import.c:1739
+#: g10/import.c:1740
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "FIGYELEM: %08lX kulcsot visszavonhatt�k:\n"
 "leh�vom a %08lX visszavon� kulcsot.\n"
 
-#: g10/import.c:1753
+#: g10/import.c:1754
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "FIGYELEM: %08lX kulcsot visszavonhatt�k:\n"
 "visszavon� kulcs (%08lX) nincs jelen.\n"
 
-#: g10/import.c:1812
+#: g10/import.c:1813
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "%08lX kulcs: \"%s\" visszavon� igazol�st hozz�adtam.\n"
 
-#: g10/import.c:1846
+#: g10/import.c:1847
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "%08lX kulcs: Kulcsal��r�st hozz�adtam.\n"
 
-#: g10/import.c:2235
+#: g10/import.c:2236
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "A nyilv�nos kulcs nem passzol a titkos kulcshoz!\n"
 
-#: g10/import.c:2243
+#: g10/import.c:2244
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
 
-#: g10/import.c:2245
+#: g10/import.c:2246
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
 
-#: g10/keydb.c:167
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
 
-#: g10/keydb.c:174
+#: g10/keydb.c:175
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "\"%s\" kulcskarik�t l�trehoztam.\n"
 
-#: g10/keydb.c:685
+#: g10/keydb.c:316 g10/keydb.c:319
+#, fuzzy, c-format
+msgid "keyblock resource `%s': %s\n"
+msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
+
+#: g10/keydb.c:698
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "Nem tudtam �jra�p�teni a kulcskarika cache-�t: %s\n"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[visszavon�s]"
 
-#: g10/keyedit.c:255
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[�nal��r�s]"
 
-#: g10/keyedit.c:333 g10/keylist.c:405
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 rossz al��r�s.\n"
 
-#: g10/keyedit.c:335 g10/keylist.c:407
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d rossz al��r�s.\n"
 
-#: g10/keyedit.c:337 g10/keylist.c:409
+#: g10/keyedit.c:344 g10/keylist.c:410
 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:339 g10/keylist.c:411
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, 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:341 g10/keylist.c:413
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 al��r�st nem ellen�riztem hiba miatt.\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:415
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, 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:345
+#: g10/keyedit.c:352
 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:347
+#: g10/keyedit.c:354
 #, 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:403 g10/pkclist.c:262
+#: g10/keyedit.c:410 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2500,53 +2546,63 @@ msgstr ""
 "k�l�nb�z� forr�sb�l sz�rmaz� digit�lis ujjlenyomatokkal...)!\n"
 "\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:274
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = r�szlegesen megb�zom benne\n"
 
-#: g10/keyedit.c:408 g10/pkclist.c:276
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = teljesen megb�zom benne\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:434
 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:443
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
 
-#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
-#: g10/keyedit.c:858 g10/keyedit.c:1642
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1728
 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:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
-#: g10/keyedit.c:1648
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
+#: g10/keyedit.c:1734
 msgid "  Unable to sign.\n"
 msgstr "  Nem tudom al��rni.\n"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "\"%s\" felhaszn�l�i azonos�t� lej�rt."
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:650
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "\"%s\" felhaszn�l�azonos�t�n nincs �nal��r�s."
 
-#: g10/keyedit.c:676
+#: g10/keyedit.c:678
+#, fuzzy, c-format
+msgid "User ID \"%s\" is signable.  "
+msgstr "\"%s\" felhaszn�l�azonos�t�n nincs �nal��r�s."
+
+#: g10/keyedit.c:680
+#, fuzzy
+msgid "Sign it? (y/N) "
+msgstr "Val�ban al��rja? "
+
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2555,11 +2611,11 @@ msgstr ""
 "\"%s\" �nal��r�sa\n"
 "PGP 2.x st�lus�.\n"
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:711
 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:699
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2568,11 +2624,11 @@ msgstr ""
 "Az �n jelenlegi al��r�sa a(z) \"%s\"\n"
 "kulcson lej�rt.\n"
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:729
 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:724
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2581,54 +2637,54 @@ msgstr ""
 "Az �n jelenlegi al��r�sa a(z) \"%s\"\n"
 "kulcson helyi al��r�s.\n"
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:754
 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:749
+#: g10/keyedit.c:775
 #, 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:752
+#: g10/keyedit.c:778
 #, 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:757
+#: g10/keyedit.c:783
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "M�g egyszer al� akarja �rni? (i/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:805
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nincs mit al��rni a %08lX kulccsal!\n"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "Ez a kulcs lej�rt!"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Ez a kulcs lej�r: %s.\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:844
 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:851
+#: g10/keyedit.c:882
 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:853
+#: g10/keyedit.c:884
 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:878
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2637,32 +2693,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:883
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Nem v�laszolok.%s\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:916
 #, 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:887
+#: g10/keyedit.c:918
 #, 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:889
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Nagyon alaposan ellen�riztem.%s\n"
 
-#: g10/keyedit.c:895
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Mi a v�lasza? (Adjon meg \"?\"-et magyar�zathoz!): "
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:950
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2671,100 +2727,100 @@ msgstr ""
 "Teljesen biztos abban, hogy al� akarja �rni ezt a kulcsot\n"
 "az �n kulcs�val: \""
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Ez egy �nal��r�s lesz.\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:963
 #, 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:940
+#: g10/keyedit.c:971
 #, 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:950
+#: g10/keyedit.c:981
 #, 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:957
+#: g10/keyedit.c:988
 #, 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:964
+#: g10/keyedit.c:995
 #, 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:969
+#: g10/keyedit.c:1000
 #, 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:974
+#: g10/keyedit.c:1005
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Nagyon gondosan ellen�riztem ezt a kulcsot.\n"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1015
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Val�ban al��rja? "
 
-#: g10/keyedit.c:1029 g10/keyedit.c:4132 g10/keyedit.c:4223 g10/keyedit.c:4287
-#: g10/keyedit.c:4348 g10/sign.c:369
+#: g10/keyedit.c:1060 g10/keyedit.c:4350 g10/keyedit.c:4441 g10/keyedit.c:4505
+#: g10/keyedit.c:4566 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Al��r�s sikertelen: %s\n"
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1105 g10/keygen.c:3057
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "Ez a kulcs nem v�dett.\n"
 
-#: g10/keyedit.c:1109 g10/keygen.c:3045
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 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:1113 g10/keygen.c:3060
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 #, 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:1117 g10/keygen.c:3064
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "A kulcs v�dett.\n"
 
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Nem tudom szerkeszteni ezt a kulcsot: %s\n"
 
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2772,11 +2828,11 @@ msgstr ""
 "�rja be az �j jelsz�t ehhez a titkos kulcshoz!\n"
 "\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:1825
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "Nem ism�telte meg helyesen a jelsz�t! Pr�b�lja �jra!"
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2784,193 +2840,193 @@ msgstr ""
 "�n nem akar jelsz�t. Ez val�sz�n�leg *rossz* �tlet!\n"
 "\n"
 
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1195
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Val�ban ezt akarja? "
 
-#: g10/keyedit.c:1235
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "�trakom a kulcsal��r�st a megfelel� helyre.\n"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "ment�s �s kil�p�s"
 
-#: g10/keyedit.c:1322
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/keyedit.c:1323
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "kilist�zza a kulcs- �s felhaszn�l�azonos�t�kat"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "N. felhaszn�l�i azonos�t� kiv�laszt�sa"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "N. felhaszn�l�i azonos�t� kiv�laszt�sa"
 
-#: g10/keyedit.c:1327
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "al��r�sok visszavon�sa"
 
-#: g10/keyedit.c:1330
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1335
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "kulcs helyi al��r�sa"
 
-#: g10/keyedit.c:1337
+#: g10/keyedit.c:1369
 #, 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:1339
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1343
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "felhaszn�l�i azonos�t� hozz�ad�sa"
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "fot�azonos�t� hozz�ad�sa"
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "felhaszn�l�i azonos�t� t�rl�se"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "m�sodlagos kulcs t�rl�se"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr "visszavon� kulcs hozz�ad�sa"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1400
 #, 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:1370
+#: g10/keyedit.c:1402
 #, 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:1372
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "felhaszn�l�azonos�t� megjel�l�se els�dlegesk�nt"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1406
 #, 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:1377
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "preferenci�k list�z�sa (szak�rt�)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "preferenci�k list�z�sa (r�szletes)"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1413
 #, 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:1386
+#: g10/keyedit.c:1418
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "jelsz�v�ltoztat�s"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "kulcstulajdonos megb�zhat�s�g�nak be�ll�t�sa"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1426
 #, 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:1396
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "felhaszn�l�i azonos�t� visszavon�sa"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "m�sodlagos kulcs visszavon�sa"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "enable key"
 msgstr "kulcs enged�lyez�se"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "disable key"
 msgstr "kulcs tilt�sa"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1436
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "fot�azonos�t� megmutat�sa"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1556
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "Hiba \"%s\" titkoskulcs-blokk olvas�sakor: %s.\n"
 
-#: g10/keyedit.c:1494
+#: g10/keyedit.c:1574
 msgid "Secret key is available.\n"
 msgstr "Titkos kulcs rendelkez�sre �ll.\n"
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1655
 msgid "Need the secret key to do this.\n"
 msgstr "Ehhez sz�ks�g van a titkos kulcsra.\n"
 
-#: g10/keyedit.c:1579
+#: g10/keyedit.c:1663
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "K�rem, haszn�lja el�bb a \"toggle\" parancsot!\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1682
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -2978,236 +3034,241 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1722
 msgid "Key is revoked."
 msgstr "A kulcsot visszavont�k."
 
-#: g10/keyedit.c:1657
+#: g10/keyedit.c:1741
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Val�ban al��rja az �sszes felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1660
-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:1668
+#: g10/keyedit.c:1748
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "ismeretlen al��r�soszt�ly"
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1771
 #, 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:1713 g10/keyedit.c:1733 g10/keyedit.c:1899
+#: g10/keyedit.c:1793 g10/keyedit.c:1813 g10/keyedit.c:1979
 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:1715
+#: g10/keyedit.c:1795
 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:1717
+#: g10/keyedit.c:1797
 #, 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:1718
+#: g10/keyedit.c:1798
 #, 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:1768
+#: g10/keyedit.c:1848
 #, 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:1780
+#: g10/keyedit.c:1860
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Legal�bb egy kulcsot ki kell v�lasztania!\n"
 
-#: g10/keyedit.c:1808
+#: g10/keyedit.c:1888
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1822
+#: g10/keyedit.c:1902
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1919
 #, 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:1863
+#: g10/keyedit.c:1943
 msgid "You must select at least one key.\n"
 msgstr "Legal�bb egy kulcsot ki kell v�lasztania!\n"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1946
 #, 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:1867
+#: g10/keyedit.c:1947
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Val�ban t�rli ezt a kulcsot? "
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1982
 #, 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:1903
+#: g10/keyedit.c:1983
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Val�ban visszavonja ezt a felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1921
+#: g10/keyedit.c:2001
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Val�ban visszavonja ezt a kulcsot? "
 
-#: g10/keyedit.c:1932
+#: g10/keyedit.c:2012
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Val�ban visszavonja a kijel�lt kulcsokat? "
 
-#: g10/keyedit.c:1934
+#: g10/keyedit.c:2014
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Val�ban visszavonja ezt a kulcsot? "
 
-#: g10/keyedit.c:1975
+#: g10/keyedit.c:2055
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2007
+#: g10/keyedit.c:2087
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "preferencialista be�ll�t�sa"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2093
 #, 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:2015
+#: g10/keyedit.c:2095
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Val�ban friss�tsem a preferenci�kat? "
 
-#: g10/keyedit.c:2065
+#: g10/keyedit.c:2157
+#, fuzzy, c-format
+msgid "Unable to clean `%s'\n"
+msgstr "Nem tudom v�grehajtani a k�vetkez� \"%s\"-t: \"%s\": %s.\n"
+
+#: g10/keyedit.c:2160
+msgid "Please specify item to clean: `sigs', `uids', or `all'\n"
+msgstr ""
+
+#: g10/keyedit.c:2171
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Mentsem a v�ltoztat�sokat? "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2174
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Kil�pjek ment�s n�lk�l? "
 
-#: g10/keyedit.c:2078
+#: g10/keyedit.c:2184
 #, c-format
 msgid "update failed: %s\n"
 msgstr "Friss�t�s sikertelen: %s.\n"
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2191
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "Titkoskulcs-blokk friss�t�se sikertelen: %s\n"
 
-#: g10/keyedit.c:2092
+#: g10/keyedit.c:2198
 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:2164
+#: g10/keyedit.c:2271
 msgid "Digest: "
 msgstr "Kivonat: "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2323
 msgid "Features: "
 msgstr "Jellemz�k: "
 
-#: g10/keyedit.c:2227
+#: g10/keyedit.c:2334
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2242 g10/keylist.c:307
+#: g10/keyedit.c:2349 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2473
+#: g10/keyedit.c:2580
 #, 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:2494
+#: g10/keyedit.c:2601
 #, 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:2500
+#: g10/keyedit.c:2607
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (�rz�keny)"
 
-#: g10/keyedit.c:2516 g10/keyedit.c:2572 g10/keyedit.c:2684 g10/keyedit.c:2699
-#: g10/keylist.c:193 g10/keyserver.c:422
+#: g10/keyedit.c:2623 g10/keyedit.c:2679 g10/keyedit.c:2792 g10/keyedit.c:2807
+#: g10/keylist.c:194 g10/keyserver.c:421
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s nem hozhat� l�tre: %s\n"
 
-#: g10/keyedit.c:2519 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:931
+#: g10/keyedit.c:2626 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:948
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[visszavont] "
 
-#: g10/keyedit.c:2521 g10/keylist.c:757 g10/keylist.c:886
+#: g10/keyedit.c:2628 g10/keylist.c:758 g10/keylist.c:887
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [lej�r: %s]"
 
-#: g10/keyedit.c:2523 g10/keyedit.c:2574 g10/keyedit.c:2686 g10/keyedit.c:2701
-#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
-#: g10/keylist.c:913 g10/keyserver.c:428 g10/mainproc.c:937
+#: g10/keyedit.c:2630 g10/keyedit.c:2681 g10/keyedit.c:2794 g10/keyedit.c:2809
+#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
+#: g10/keylist.c:914 g10/keyserver.c:427 g10/mainproc.c:954
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [lej�r: %s]"
 
-#: g10/keyedit.c:2525
+#: g10/keyedit.c:2632
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:2540
+#: g10/keyedit.c:2647
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2651
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2658
 msgid "This key has been disabled"
 msgstr "Ez a kulcs tiltott."
 
-#: g10/keyedit.c:2579 g10/keylist.c:199
+#: g10/keyedit.c:2686 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2754
 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:2654
+#: g10/keyedit.c:2762
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3215,19 +3276,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:2718 g10/keyserver.c:432 g10/mainproc.c:1577
-#: g10/trustdb.c:1178
+#: g10/keyedit.c:2826 g10/keyedit.c:3201 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1690
 #, fuzzy
 msgid "revoked"
 msgstr "[visszavont] "
 
-#: g10/keyedit.c:2720 g10/keyserver.c:436 g10/mainproc.c:1579
-#: g10/trustdb.c:531
+#: g10/keyedit.c:2828 g10/keyedit.c:3203 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1692
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2893
 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"
@@ -3235,7 +3296,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:2845
+#: g10/keyedit.c:2953
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3245,45 +3306,75 @@ msgstr ""
 "okozhatja,\n"
 "          hogy a PGP egyes verzi�i visszautas�tj�k ezt a kulcsot.\n"
 
-#: g10/keyedit.c:2850 g10/keyedit.c:3128
+#: g10/keyedit.c:2958 g10/keyedit.c:3307
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Tov�bbra is hozz� akarja adni? (i/N) "
 
-#: g10/keyedit.c:2856
+#: g10/keyedit.c:2964
 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:2996
+#: g10/keyedit.c:3104
 msgid "Delete this good signature? (y/N/q)"
 msgstr "T�rli ezt a j� al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3114
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "T�rli ezt az �rv�nytelen al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:3010
+#: g10/keyedit.c:3118
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "T�rli ezt az ismeretlen al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:3016
+#: g10/keyedit.c:3124
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Val�ban t�rli ezt az �nal��r�st? (i/N)"
 
-#: g10/keyedit.c:3030
+#: g10/keyedit.c:3138
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "T�r�ltem %d al��r�st.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3139
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "T�r�ltem %d al��r�st.\n"
 
-#: g10/keyedit.c:3034
+#: g10/keyedit.c:3142
 msgid "Nothing deleted.\n"
 msgstr "Nem t�r�ltem semmit.\n"
 
-#: g10/keyedit.c:3123
+#: g10/keyedit.c:3167
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed.\n"
+msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
+
+#: g10/keyedit.c:3168
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed.\n"
+msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
+
+#: g10/keyedit.c:3173
+#, 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:3205 g10/trustdb.c:1694
+#, fuzzy
+msgid "invalid"
+msgstr "�rv�nytelen p�nc�l"
+
+#: g10/keyedit.c:3207
+#, fuzzy, c-format
+msgid "User ID \"%s\" removed: %s\n"
+msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
+
+#: g10/keyedit.c:3214
+#, fuzzy
+msgid "No user IDs are removable.\n"
+msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
+
+#: g10/keyedit.c:3302
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3293,342 +3384,347 @@ msgstr ""
 "          azt okozhatja, hogy egyes PGP verzi�k visszautas�tj�k ezt a "
 "kulcsot!\n"
 
-#: g10/keyedit.c:3134
+#: g10/keyedit.c:3313
 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:3154
+#: g10/keyedit.c:3333
 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:3177
+#: g10/keyedit.c:3356
 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:3192
+#: g10/keyedit.c:3371
 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:3214
+#: g10/keyedit.c:3393
 #, 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:3233
+#: g10/keyedit.c:3412
 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:3239
+#: g10/keyedit.c:3418
 #, 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:3300
+#: g10/keyedit.c:3479
 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:3306
+#: g10/keyedit.c:3485
 #, 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:3310
+#: g10/keyedit.c:3489
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "M�sodlagos kulcs lej�rati idej�nek v�ltoztat�sa.\n"
 
-#: g10/keyedit.c:3313
+#: g10/keyedit.c:3492
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Els�dleges kulcs lej�rati idej�nek v�ltoztat�sa.\n"
 
-#: g10/keyedit.c:3359
+#: g10/keyedit.c:3538
 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:3375
+#: g10/keyedit.c:3554
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/keyedit.c:3455
+#: g10/keyedit.c:3634
 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:3494 g10/keyedit.c:3604 g10/keyedit.c:3724
+#: g10/keyedit.c:3673 g10/keyedit.c:3783 g10/keyedit.c:3903
 #, 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:3665
+#: g10/keyedit.c:3844
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3745
+#: g10/keyedit.c:3924
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
 
-#: g10/keyedit.c:3746
+#: g10/keyedit.c:3925
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3987
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:3854
+#: g10/keyedit.c:4045
+#, fuzzy, c-format
+msgid "No user ID with hash %s\n"
+msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
+
+#: g10/keyedit.c:4072
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:3971
+#: g10/keyedit.c:4189
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Felhaszn�l�azonos�t�: \""
 
-#: g10/keyedit.c:3974 g10/keyedit.c:4038 g10/keyedit.c:4081
+#: g10/keyedit.c:4192 g10/keyedit.c:4256 g10/keyedit.c:4299
 #, 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:3976 g10/keyedit.c:4040 g10/keyedit.c:4083
+#: g10/keyedit.c:4194 g10/keyedit.c:4258 g10/keyedit.c:4301
 msgid " (non-exportable)"
 msgstr " (nem export�lhat�)"
 
-#: g10/keyedit.c:3980
+#: g10/keyedit.c:4198
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Ez az al��r�s lej�rt %s id�pontban.\n"
 
-#: g10/keyedit.c:3984
+#: g10/keyedit.c:4202
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Biztos benne, hogy m�gis visszavonja? (i/N) "
 
-#: g10/keyedit.c:3988
+#: g10/keyedit.c:4206
 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:4015
+#: g10/keyedit.c:4233
 #, 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:4041
+#: g10/keyedit.c:4259
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nem export�lhat�)"
 
-#: g10/keyedit.c:4048
+#: g10/keyedit.c:4266
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   visszavonva %08lX �ltal %s id�pontban.\n"
 
-#: g10/keyedit.c:4070
+#: g10/keyedit.c:4288
 msgid "You are about to revoke these signatures:\n"
 msgstr "A k�vetkez� al��r�sokat fogja visszavonni:\n"
 
-#: g10/keyedit.c:4090
+#: g10/keyedit.c:4308
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Val�ban l�trehozzam a visszavon� igazol�st? (i/N) "
 
-#: g10/keyedit.c:4120
+#: g10/keyedit.c:4338
 msgid "no secret key\n"
 msgstr "Nincs titkos kulcs.\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4408
 #, 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:4207
+#: g10/keyedit.c:4425
 #, 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:4271
+#: g10/keyedit.c:4489
 #, 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:4333
+#: g10/keyedit.c:4551
 #, 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:4428
+#: g10/keyedit.c:4646
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "%s fot�azonos�t� (m�ret: %ld, kulcs: 0x%08lX, felh: %d) mutat�sa.\n"
 
-#: g10/keygen.c:293
+#: g10/keygen.c:258
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "%c%lu preferencia k�tszer szerepel!\n"
 
-#: g10/keygen.c:300
+#: g10/keygen.c:265
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "T�l sok \"%c\" preferencia.\n"
 
-#: g10/keygen.c:302
+#: g10/keygen.c:267
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "T�l sok \"%c\" preferencia.\n"
 
-#: g10/keygen.c:304
+#: g10/keygen.c:269
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "T�l sok \"%c\" preferencia.\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:394
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "�rv�nytelen karakter a preferenci�k k�z�tt!\n"
 
-#: g10/keygen.c:829
+#: g10/keygen.c:822
 msgid "writing direct signature\n"
 msgstr "Sima al��r�st �rok.\n"
 
-#: g10/keygen.c:868
+#: g10/keygen.c:861
 msgid "writing self signature\n"
 msgstr "�nal��r�st �rok.\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing key binding signature\n"
 msgstr "�sszef�z� al��r�st �rok.\n"
 
-#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2632
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Kulcsm�ret �rv�nytelen; %u bitet haszn�lok.\n"
 
-#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2638
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Kulcsm�retet felkerek�tettem %u bitre.\n"
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1239
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1252
+#: g10/keygen.c:1242
 #, fuzzy
 msgid "Encrypt"
 msgstr "adat titkos�t�sa"
 
-#: g10/keygen.c:1255
+#: g10/keygen.c:1245
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1263
+#: g10/keygen.c:1253
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1268
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1282
+#: g10/keygen.c:1272
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1287
+#: g10/keygen.c:1277
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1290
+#: g10/keygen.c:1280
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1293
+#: g10/keygen.c:1283
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1296
+#: g10/keygen.c:1286
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1340
 msgid "Please select what kind of key you want:\n"
 msgstr "K�rem, adja meg, milyen kulcsot k�v�n:\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1342
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA �s ElGamal (alap�rtelmez�s)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1343
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (csak al��r�s)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1345
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1357
+#: g10/keygen.c:1347
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1348
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (csak al��r�s)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1350
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1362
+#: g10/keygen.c:1352
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1431 g10/keygen.c:2509
+#: g10/keygen.c:1421 g10/keygen.c:2506
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "A DSA kulcsp�r 1024 bites lesz.\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1431
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1438
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Milyen kulcsm�retet szeretne? (1024) "
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1452
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1468
+#: g10/keygen.c:1458
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "A k�v�nt kulcsm�ret %u bit.\n"
 
-#: g10/keygen.c:1473 g10/keygen.c:1478
+#: g10/keygen.c:1463 g10/keygen.c:1468
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "Felkerek�tve %u bitre.\n"
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1515
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3644,7 +3740,7 @@ msgstr ""
 "      <n>m = a kulcs n h�napig �rv�nyes\n"
 "      <n>y = a kulcs n �vig �rv�nyes\n"
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1526
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3660,39 +3756,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:1561
+#: g10/keygen.c:1549
 msgid "Key is valid for? (0) "
 msgstr "Meddig �rv�nyes a kulcs? (0) "
 
-#: g10/keygen.c:1563
-msgid "Signature is valid for? (0) "
+#: g10/keygen.c:1554
+#, fuzzy, c-format
+msgid "Signature is valid for? (%s) "
 msgstr "Meddig �rv�nyes az al��r�s? (0) "
 
-#: g10/keygen.c:1568
+#: g10/keygen.c:1572
 msgid "invalid value\n"
 msgstr "�rv�nytelen �rt�k!\n"
 
-#: g10/keygen.c:1575
+#: g10/keygen.c:1579
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s soha nem j�r le.\n"
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1580
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s soha nem j�r le.\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1585
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s lej�r: %s\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1586
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Az al��r�s lej�r: %s.\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1592
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3700,12 +3797,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:1595
+#: g10/keygen.c:1597
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Ez �gy helyes (i/n)? "
 
-#: g10/keygen.c:1638
+#: g10/keygen.c:1641
 #, fuzzy
 msgid ""
 "\n"
@@ -3722,44 +3819,44 @@ msgstr ""
 "    \"Heinrich Heine (a k�lt�) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1651
+#: g10/keygen.c:1654
 msgid "Real name: "
 msgstr "Teljes n�v: "
 
-#: g10/keygen.c:1659
+#: g10/keygen.c:1662
 msgid "Invalid character in name\n"
 msgstr "�rv�nytelen karakter a n�vben!\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1664
 msgid "Name may not start with a digit\n"
 msgstr "A n�v lehet, hogy nem kezd�dhet sz�mmal!\n"
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1666
 msgid "Name must be at least 5 characters long\n"
 msgstr "A n�v legal�bb 5 karakter kell legyen!\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1674
 msgid "Email address: "
 msgstr "E-mail c�m: "
 
-#: g10/keygen.c:1682
+#: g10/keygen.c:1685
 msgid "Not a valid email address\n"
 msgstr "Ez nem �rv�nyes e-mail c�m.\n"
 
-#: g10/keygen.c:1690
+#: g10/keygen.c:1693
 msgid "Comment: "
 msgstr "Megjegyz�s: "
 
-#: g10/keygen.c:1696
+#: g10/keygen.c:1699
 msgid "Invalid character in comment\n"
 msgstr "�rv�nytelen karakter a megjegyz�sben!\n"
 
-#: g10/keygen.c:1719
+#: g10/keygen.c:1722
 #, 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:1725
+#: g10/keygen.c:1728
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3770,7 +3867,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1733
 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"
 
@@ -3785,24 +3882,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:1746
+#: g10/keygen.c:1749
 msgid "NnCcEeOoQq"
 msgstr "NnMmEeRrKk"
 
-#: g10/keygen.c:1756
+#: g10/keygen.c:1759
 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:1757
+#: g10/keygen.c:1760
 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:1776
+#: g10/keygen.c:1779
 msgid "Please correct the error first\n"
 msgstr "K�rem, el�bb jav�tsa ki a hib�t!\n"
 
-#: g10/keygen.c:1816
+#: g10/keygen.c:1819
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3810,12 +3907,12 @@ msgstr ""
 "Most sz�ks�g van egy jelsz�ra (vagy mondatra), amely a titkos kulcs�t v�di.\n"
 "\n"
 
-#: g10/keygen.c:1826 g10/passphrase.c:1105
+#: g10/keygen.c:1829 g10/passphrase.c:786
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1832
+#: g10/keygen.c:1835
 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"
@@ -3827,7 +3924,7 @@ msgstr ""
 "az \"--edit-key\" opci�val.\n"
 "\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1857
 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"
@@ -3839,50 +3936,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:2578
+#: g10/keygen.c:2575
 msgid "Key generation canceled.\n"
 msgstr "Kulcs l�trehoz�sa megszak�tva.\n"
 
-#: g10/keygen.c:2766 g10/keygen.c:2910
+#: g10/keygen.c:2774 g10/keygen.c:2918
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "�rom a kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:2768 g10/keygen.c:2913
+#: g10/keygen.c:2776 g10/keygen.c:2921
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:2771 g10/keygen.c:2916
+#: g10/keygen.c:2779 g10/keygen.c:2924
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2907
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "Nem �rhat� nyilv�noskulcs-karik�t tal�ltam: %s\n"
 
-#: g10/keygen.c:2905
+#: g10/keygen.c:2913
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "Nem �rhat� titkoskulcs-karik�t tal�ltam: %s\n"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2931
 #, 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:2930
+#: g10/keygen.c:2938
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
 
-#: g10/keygen.c:2953
+#: g10/keygen.c:2961
 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:2964
+#: g10/keygen.c:2972
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -3892,393 +3989,374 @@ 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:2976 g10/keygen.c:3105 g10/keygen.c:3220
+#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kulcsgener�l�s sikertelen: %s\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3156 g10/sign.c:290
+#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
 #, 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:3030 g10/keygen.c:3158 g10/sign.c:292
+#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
 #, 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:3039 g10/keygen.c:3169
+#: g10/keygen.c:3047 g10/keygen.c:3177
 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:3078 g10/keygen.c:3202
+#: g10/keygen.c:3086 g10/keygen.c:3210
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Val�ban l�trehozzam? "
 
-#: g10/keygen.c:3355
+#: g10/keygen.c:3363
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: g10/keygen.c:3402
+#: g10/keygen.c:3410
 #, 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:3428
+#: g10/keygen.c:3436
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "MEGJEGYZ�S: %08lX titkos kulcs %s-kor lej�rt.\n"
 
-#: g10/keygen.c:3508
-#, c-format
-msgid "length of RSA modulus is not %d\n"
-msgstr ""
-
-#: g10/keygen.c:3514
-msgid "public exponent too large (more than 32 bits)\n"
-msgstr ""
-
-#: g10/keygen.c:3520 g10/keygen.c:3526
-#, c-format
-msgid "length of an RSA prime is not %d\n"
-msgstr ""
-
-#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
+#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
 msgid "never     "
 msgstr "soha      "
 
-#: g10/keylist.c:264
+#: g10/keylist.c:265
 msgid "Critical signature policy: "
 msgstr "Kritikus al��r�si elj�r�sm�d: "
 
-#: g10/keylist.c:266
+#: g10/keylist.c:267
 msgid "Signature policy: "
 msgstr "Al��r�si elj�r�sm�d: "
 
-#: g10/keylist.c:305
+#: g10/keylist.c:306
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:354 g10/keylist.c:398
+#: 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:372
+#: g10/keylist.c:373
 msgid "Critical signature notation: "
 msgstr "Kritikus al��r�s-jel�l�s: "
 
-#: g10/keylist.c:374
+#: g10/keylist.c:375
 msgid "Signature notation: "
 msgstr "Al��r�s-jel�l�s: "
 
-#: g10/keylist.c:385
+#: g10/keylist.c:386
 msgid "not human readable"
 msgstr "nem olvashat� forma"
 
-#: g10/keylist.c:486
+#: g10/keylist.c:487
 msgid "Keyring"
 msgstr "Kulcskarika"
 
-#: g10/keylist.c:792
+#: g10/keylist.c:793
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr " [lej�r: %s]"
 
-#: g10/keylist.c:1488
+#: g10/keylist.c:1489
 msgid "Primary key fingerprint:"
 msgstr "Els�dlegeskulcs-ujjlenyomat:"
 
-#: g10/keylist.c:1490
+#: g10/keylist.c:1491
 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:1497
+#: g10/keylist.c:1498
 msgid " Primary key fingerprint:"
 msgstr "Els�dlegeskulcs-ujjlenyomat:"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1500
 msgid "      Subkey fingerprint:"
 msgstr "         Alkulcsujjlenyomat:"
 
-#: g10/keylist.c:1503 g10/keylist.c:1507
+#: g10/keylist.c:1504 g10/keylist.c:1508
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr " Kulcs ujjlenyomata ="
 
-#: g10/keylist.c:1574
+#: g10/keylist.c:1575
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1245
+#: g10/keyring.c:1246
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "P�nc�loz�s nem siker�lt: %s\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1252
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "FIGYELEM: 2 bizalmas inform�ci�kat tartalmaz� �llom�ny van!\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s az eredeti p�ld�ny.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1255
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s az �j p�ld�ny.\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1256
 msgid "Please fix this possible security flaw\n"
 msgstr "K�rem, oldja meg ezt a lehets�ges biztons�gi probl�m�t!\n"
 
-#: g10/keyring.c:1375
+#: g10/keyring.c:1376
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "Ellen�rz�m a(z) \"%s\" kulcskarik�t.\n"
 
-#: g10/keyring.c:1421
+#: g10/keyring.c:1422
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu kulcsot ellen�riztem (%lu al��r�ssal).\n"
 
-#: g10/keyring.c:1433
+#: g10/keyring.c:1434
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu kulcsot ellen�riztem (%lu al��r�ssal).\n"
 
-#: g10/keyring.c:1504
+#: g10/keyring.c:1505
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: Kulcskarik�t l�trehoztam.\n"
 
-#: g10/keyserver.c:107
+#: g10/keyserver.c:105
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "FIGYELEM: \"%s\" opci�i csak a k�vetkez� fut�skor lesznek �rv�nyesek!\n"
 
-#: g10/keyserver.c:434
+#: g10/keyserver.c:433
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:635
+#: g10/keyserver.c:634
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:718 g10/keyserver.c:1238
+#: g10/keyserver.c:717 g10/keyserver.c:1267
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/keyserver.c:808
+#: g10/keyserver.c:815
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
 
-#: g10/keyserver.c:810
+#: g10/keyserver.c:817
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
 
-#: g10/keyserver.c:985
+#: g10/keyserver.c:1014
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
 
-#: g10/keyserver.c:989
+#: g10/keyserver.c:1018
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
 
-#: g10/keyserver.c:1141
+#: g10/keyserver.c:1170
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "Al��rva az �n %08lX kulcs�val %s id�pontban.\n"
 
-#: g10/keyserver.c:1188
+#: g10/keyserver.c:1217
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1191
+#: g10/keyserver.c:1220
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1198 g10/keyserver.c:1293
+#: g10/keyserver.c:1227 g10/keyserver.c:1322
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1275
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1255
+#: g10/keyserver.c:1284
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1314
+#: g10/keyserver.c:1343
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1320
+#: g10/keyserver.c:1349
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1361
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1366
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1374
 #, c-format
-msgid "gpgkeys_%s does not support handler version %d\n"
+msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1351
+#: g10/keyserver.c:1381
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "kulcsszerverhiba"
 
-#: g10/keyserver.c:1356
+#: g10/keyserver.c:1386
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "kulcsszerverhiba"
 
-#: g10/keyserver.c:1365
+#: g10/keyserver.c:1395
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/keyserver.c:1390 g10/keyserver.c:1424
+#: g10/keyserver.c:1420 g10/keyserver.c:1454
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1681
+#: g10/keyserver.c:1711
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 "FIGYELEM: Nem tudom t�r�lni az (\"%s\") �tmeneti �llom�nyt: \"%s\": %s.\n"
 
-#: g10/keyserver.c:1703
+#: g10/keyserver.c:1733
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
 
-#: g10/keyserver.c:1705
+#: g10/keyserver.c:1735
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:249
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "Furcsa m�ret� (%d) titkos�tott munkafolyamatkulcs.\n"
 
-#: g10/mainproc.c:262
-#, c-format
-msgid "bad passphrase or unknown cipher algorithm (%d)\n"
-msgstr "Rossz jelsz� vagy ismeretlen rejtjelez� algoritmus (%d).\n"
-
-#: g10/mainproc.c:299
+#: g10/mainproc.c:300
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s titkos�tott munkafolyamatkulcs\n"
 
-#: g10/mainproc.c:309
+#: g10/mainproc.c:310
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "Ismeretlen algoritmussal (%d) titkos�tva.\n"
 
-#: g10/mainproc.c:375
+#: g10/mainproc.c:376
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "Nyilv�nos kulcs: %08lX\n"
 
-#: g10/mainproc.c:430
+#: g10/mainproc.c:431
 msgid "public key encrypted data: good DEK\n"
 msgstr "Nyilv�nos kulccsal titkos�tott adat: j� DEK.\n"
 
-#: g10/mainproc.c:463
+#: g10/mainproc.c:464
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "Titkos�tva %u bites %s kulccsal, azonos�t�: %08lX, l�trehozva: %s\n"
 
-#: g10/mainproc.c:467 g10/pkclist.c:218
+#: g10/mainproc.c:468 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "               azaz \""
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:472
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Titkos�tva %s kulccsal, azonos�t�: %08lX\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Nyilv�nos kulcs� visszafejt�s sikertelen: %s\n"
 
-#: g10/mainproc.c:499
+#: g10/mainproc.c:500
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu jelsz�val rejtjelezve\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:502
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 jelsz�val rejtjelezve\n"
 
-#: g10/mainproc.c:529 g10/mainproc.c:551
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s titkos�tott adatot felt�telezek.\n"
 
-#: g10/mainproc.c:537
+#: g10/mainproc.c:538
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "IDEA rejtjelez� nem �ll rendelkez�sre, optimista m�don megpr�b�lok\n"
 "%s-t haszn�lni helyette.\n"
 
-#: g10/mainproc.c:569
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr "Visszafejt�s rendben.\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:574
 msgid "WARNING: message was not integrity protected\n"
 msgstr "FIGYELEM: Az �zenetet nem l�tt�k el integrit�sv�delemmel.\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "FIGYELEM: A titkos�tott �zenetet manipul�lt�k!\n"
 
-#: g10/mainproc.c:592
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Visszafejt�s sikertelen: %s.\n"
@@ -4292,307 +4370,296 @@ 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:786
+#: g10/mainproc.c:803
 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:1290
+#: g10/mainproc.c:1307
 msgid "signature verification suppressed\n"
 msgstr "Al��r�s-ellen�rz�s elnyomva.\n"
 
-#: g10/mainproc.c:1332 g10/mainproc.c:1342
+#: g10/mainproc.c:1349 g10/mainproc.c:1359
 msgid "can't handle these multiple signatures\n"
 msgstr "Nem tudom kezelni ezeket a t�bbsz�r�s al��r�sokat!\n"
 
-#: g10/mainproc.c:1352
+#: g10/mainproc.c:1369
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Az al��r�s lej�rt: %s.\n"
 
-#: g10/mainproc.c:1353
+#: g10/mainproc.c:1370
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "               azaz \""
 
-#: g10/mainproc.c:1357
+#: g10/mainproc.c:1374
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Al��rva: %.*s; kulcs: %s, %08lX.\n"
 
-#: g10/mainproc.c:1377
+#: g10/mainproc.c:1394
 msgid "Key available at: "
 msgstr "Kulcs tal�lhat�: "
 
-#: g10/mainproc.c:1482 g10/mainproc.c:1530
+#: g10/mainproc.c:1499 g10/mainproc.c:1547
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ROSSZ al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1484 g10/mainproc.c:1532
+#: g10/mainproc.c:1501 g10/mainproc.c:1549
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Lej�rt al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1486 g10/mainproc.c:1534
+#: g10/mainproc.c:1503 g10/mainproc.c:1551
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "J� al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1538
+#: g10/mainproc.c:1555
 msgid "[uncertain]"
 msgstr "[bizonytalan]"
 
-#: g10/mainproc.c:1570
+#: g10/mainproc.c:1587
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "               azaz \""
 
-#: g10/mainproc.c:1664
+#: g10/mainproc.c:1681
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Az al��r�s lej�rt: %s.\n"
 
-#: g10/mainproc.c:1669
+#: g10/mainproc.c:1686
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Az al��r�s lej�r: %s.\n"
 
-#: g10/mainproc.c:1672
+#: g10/mainproc.c:1689
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
 
-#: g10/mainproc.c:1673
+#: g10/mainproc.c:1690
 msgid "binary"
 msgstr "Bin�ris"
 
-#: g10/mainproc.c:1674
+#: g10/mainproc.c:1691
 msgid "textmode"
 msgstr "Sz�vegm�d�"
 
-#: g10/mainproc.c:1674 g10/trustdb.c:530
+#: g10/mainproc.c:1691 g10/trustdb.c:531
 msgid "unknown"
 msgstr "Ismeretlen m�d�"
 
-#: g10/mainproc.c:1694
+#: g10/mainproc.c:1711
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nem tudom ellen�rizni az al��r�st: %s.\n"
 
-#: g10/mainproc.c:1762 g10/mainproc.c:1778 g10/mainproc.c:1864
+#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
 msgid "not a detached signature\n"
 msgstr "Nem k�l�n�ll� al��r�s.\n"
 
-#: g10/mainproc.c:1805
+#: g10/mainproc.c:1822
 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:1813
+#: g10/mainproc.c:1830
 #, 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:1870
+#: g10/mainproc.c:1887
 msgid "old style (PGP 2.x) signature\n"
 msgstr "R�gi st�lus� (PGP 2.x) al��r�s.\n"
 
-#: g10/mainproc.c:1880
+#: g10/mainproc.c:1897
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "�rv�nytelen gy�k�rcsomagot tal�ltam a proc_tree() f�ggv�nyben!\n"
 
-#: g10/misc.c:121
+#: g10/misc.c:122
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "Nem tudom letiltani a core f�jlokat: %s.\n"
 
-#: g10/misc.c:141 g10/misc.c:169 g10/misc.c:241
+#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
 
-#: g10/misc.c:206
+#: g10/misc.c:207
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "Bizalmi adatb�zis: olvas�s sikertelen (n=%d): %s.\n"
 
-#: g10/misc.c:315
+#: g10/misc.c:316
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "Nem tudom kezelni a(z) %d. sz�m� nyilv�nos kulcs� algoritmust!\n"
 
-#: g10/misc.c:330
+#: g10/misc.c:331
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "nem megval�s�tott rejtjelez� algoritmus"
 
-#: g10/misc.c:345
+#: g10/misc.c:346
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:351
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "%s (%d) kivonatol� algoritmus haszn�lat�nak er�ltet�se ellent�tes\n"
 "a c�mzett preferenci�ival.\n"
 
-#: g10/misc.c:446
+#: g10/misc.c:447
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "Az IDEA rejtjelez� b�v�t�s nincs jelen!\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:448
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 "Tov�bbi inform�ci�t a http://www.gnupg.org/why-not-idea.html oldalon tal�l.\n"
 
-#: g10/misc.c:680
+#: g10/misc.c:681
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: Elavult opci�: \"%s\"\n"
 
-#: g10/misc.c:684
+#: g10/misc.c:685
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
 
-#: g10/misc.c:686
+#: g10/misc.c:687
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "K�rem, ezt haszn�lja helyette: \"%s%s\"\n"
 
-#: g10/misc.c:697
+#: g10/misc.c:694
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
+msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
+
+#: g10/misc.c:707
 msgid "Uncompressed"
 msgstr "t�m�r�tetlen"
 
-#: g10/misc.c:722
+#: g10/misc.c:732
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "t�m�r�tetlen"
 
-#: g10/misc.c:832
+#: g10/misc.c:842
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "Lehet, hogy ez az �zenet haszn�lhatatlan a %s sz�m�ra!\n"
 
-#: g10/misc.c:989
+#: g10/misc.c:999
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
 
-#: g10/misc.c:1014
+#: g10/misc.c:1024
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
 
-#: g10/openfile.c:84
+#: g10/openfile.c:86
 #, c-format
 msgid "File `%s' exists. "
 msgstr "\"%s\" �llom�ny l�tezik. "
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Fel�l�rjam (i/N)? "
 
-#: g10/openfile.c:119
+#: g10/openfile.c:121
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: ismeretlen v�gz�d�s.\n"
 
-#: g10/openfile.c:141
+#: g10/openfile.c:143
 msgid "Enter new filename"
 msgstr "�rja be az �j �llom�nynevet"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:188
 msgid "writing to stdout\n"
 msgstr "�rok a szabv�nyos kimenetre.\n"
 
-#: g10/openfile.c:296
+#: g10/openfile.c:300
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "Azt felt�telezem, hogy az al��rt adat a %s �llom�nyban van.\n"
 
-#: g10/openfile.c:375
+#: g10/openfile.c:379
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "\"%s\" �j konfigur�ci�s �llom�nyt l�trehoztam.\n"
 
-#: g10/openfile.c:377
+#: g10/openfile.c:381
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 "FIGYELEM: \"%s\" opci�i csak a k�vetkez� fut�skor lesznek �rv�nyesek!\n"
 
-#: g10/openfile.c:409
+#: g10/openfile.c:413
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: K�nyvt�rat l�trehoztam.\n"
 
-#: g10/parse-packet.c:137
+#: g10/parse-packet.c:138
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "Nem tudom kezelni a(z) %d. sz�m� nyilv�nos kulcs� algoritmust!\n"
 
-#: g10/parse-packet.c:707
+#: g10/parse-packet.c:708
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "FIGYELEM: A rejtjelezett munkafolyamat-kulcs lehet, hogy nem biztons�gos!\n"
 
-#: g10/parse-packet.c:1132
+#: g10/parse-packet.c:1145
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "A %d t�pus� alcsomag kritikus bitje be�ll�tott.\n"
 
-#: g10/passphrase.c:478 g10/passphrase.c:525
+#: g10/passphrase.c:305
 msgid "gpg-agent is not available in this session\n"
 msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
 
-#: g10/passphrase.c:486
-msgid "can't set client pid for the agent\n"
-msgstr "Nem tudom be�ll�tani a kliens pid-et az �gyn�knek.\n"
-
-#: g10/passphrase.c:494
-msgid "can't get server read FD for the agent\n"
-msgstr "Nem tudom lek�rni a szerver olvas�si �llom�nyle�r�j�t az �gyn�knek.\n"
-
-#: g10/passphrase.c:501
-msgid "can't get server write FD for the agent\n"
-msgstr "Nem tudom lek�rni a szerver �r�si �llom�nyle�r�j�t az �gyn�knek.\n"
-
-#: g10/passphrase.c:534
+#: g10/passphrase.c:317
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "Nem megfelel� form�j� GPG_AGENT_INFO k�rnyezeti v�ltoz�!\n"
 
-#: g10/passphrase.c:547
+#: g10/passphrase.c:332
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "%d gpg-agent protokollverzi� nem t�mogatott!\n"
 
-#: g10/passphrase.c:568
+#: g10/passphrase.c:345
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "Nem tudok kapcsol�dni \"%s\" objektumhoz: %s\n"
 
-#: g10/passphrase.c:590
-msgid "communication problem with gpg-agent\n"
-msgstr "Kommunik�ci�s probl�ma a gpg �gyn�kkel!\n"
-
-#: g10/passphrase.c:597 g10/passphrase.c:937 g10/passphrase.c:1049
+#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
 msgid "problem with the agent - disabling agent use\n"
 msgstr "Probl�ma van az �gyn�kkel. Letiltom a haszn�lat�t.\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1209
+#: g10/passphrase.c:511 g10/passphrase.c:890
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr ""
 " \n"
 "  (f� kulcsazonos�t�: %08lX)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:525
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4604,41 +4671,28 @@ msgstr ""
 "\"%.*s\"\n"
 "%u bites %s key, azonos�t�: %08lX, l�trehozva: %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:550
 msgid "Repeat passphrase\n"
 msgstr "Ism�telje meg a jelsz�t!\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:552
 msgid "Enter passphrase\n"
 msgstr "�rja be a jelsz�t!\n"
 
-#: g10/passphrase.c:781
-msgid "passphrase too long\n"
-msgstr "A jelsz� t�l hossz�!\n"
-
-#: g10/passphrase.c:794
-msgid "invalid response from agent\n"
-msgstr "�rv�nytelen v�lasz az �gyn�kt�l!\n"
-
-#: g10/passphrase.c:810 g10/passphrase.c:931
+#: g10/passphrase.c:628
 msgid "cancelled by user\n"
 msgstr "A felhaszn�l� megszak�totta a m�veletet.\n"
 
-#: g10/passphrase.c:815 g10/passphrase.c:1020
-#, c-format
-msgid "problem with the agent: agent returns 0x%lx\n"
-msgstr "Probl�ma az �gyn�kkel: �gyn�k v�lasza: 0x%lx\n"
-
-#: g10/passphrase.c:1100 g10/passphrase.c:1263
+#: g10/passphrase.c:781 g10/passphrase.c:944
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "Nem tudok jelsz�t bek�rni k�tegelt m�dban!\n"
 
-#: g10/passphrase.c:1107 g10/passphrase.c:1268
+#: g10/passphrase.c:788 g10/passphrase.c:949
 msgid "Enter passphrase: "
 msgstr "�rja be a jelsz�t: "
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:871
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4649,21 +4703,21 @@ msgstr ""
 "haszn�lat�hoz:\n"
 "\""
 
-#: g10/passphrase.c:1196
+#: g10/passphrase.c:877
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u bites %s kulcs, azonos�t�: %08lX, l�trehozva: %s."
 
-#: g10/passphrase.c:1205
+#: g10/passphrase.c:886
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1272
+#: g10/passphrase.c:953
 msgid "Repeat passphrase: "
 msgstr "Ism�telje meg a jelsz�t: "
 
-#: g10/photoid.c:66
+#: g10/photoid.c:67
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4677,160 +4731,160 @@ msgstr ""
 "k�pet haszn�l, a kulcsa is nagyon nagy lesz!\n"
 "A 240x288 k�r�li k�pm�ret j�l haszn�lhat�.\n"
 
-#: g10/photoid.c:80
+#: g10/photoid.c:81
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Adja meg egy JPEG f�jl nev�t a fot�azonos�t�hoz: "
 
-#: g10/photoid.c:94
+#: g10/photoid.c:95
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
 
-#: g10/photoid.c:102
+#: g10/photoid.c:103
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:104
+#: g10/photoid.c:105
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
 
-#: g10/photoid.c:119
+#: g10/photoid.c:120
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\" nem JPEG �llom�ny.\n"
 
-#: g10/photoid.c:136
+#: g10/photoid.c:137
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Ez a fot� megfelel� (i/N/k)? "
 
-#: g10/photoid.c:338
+#: g10/photoid.c:339
 msgid "unable to display photo ID!\n"
 msgstr "Nem tudom megjelen�teni a fot�azonos�t�t!\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:580
+#: g10/pkclist.c:62 g10/revoke.c:581
 msgid "No reason specified"
 msgstr "Nincs megadva ok."
 
-#: g10/pkclist.c:63 g10/revoke.c:582
+#: g10/pkclist.c:64 g10/revoke.c:583
 msgid "Key is superseded"
 msgstr "A kulcsot lecser�lt�k."
 
-#: g10/pkclist.c:65 g10/revoke.c:581
+#: g10/pkclist.c:66 g10/revoke.c:582
 msgid "Key has been compromised"
 msgstr "A kulcs kompromitt�l�dott."
 
-#: g10/pkclist.c:67 g10/revoke.c:583
+#: g10/pkclist.c:68 g10/revoke.c:584
 msgid "Key is no longer used"
 msgstr "A kulcs m�r nem haszn�latos."
 
-#: g10/pkclist.c:69 g10/revoke.c:584
+#: g10/pkclist.c:70 g10/revoke.c:585
 msgid "User ID is no longer valid"
 msgstr "A felhaszn�l�i azonos�t� m�r nem �rv�nyes."
 
-#: g10/pkclist.c:73
+#: g10/pkclist.c:74
 msgid "reason for revocation: "
 msgstr "Visszavon�s oka: "
 
-#: g10/pkclist.c:90
+#: g10/pkclist.c:91
 msgid "revocation comment: "
 msgstr "Megjegyz�s a visszavon�shoz: "
 
-#: g10/pkclist.c:205
+#: g10/pkclist.c:206
 msgid "iImMqQsS"
 msgstr "iIfFkKhH"
 
-#: g10/pkclist.c:213
+#: g10/pkclist.c:214
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "Nincs megb�zhat�s�gi �rt�k rendelve:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:245
+#: g10/pkclist.c:246
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "               azaz \""
 
-#: g10/pkclist.c:255
+#: g10/pkclist.c:256
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Ez a kulcs val�sz�n�leg a jelzett tulajdonoshoz tartozik.\n"
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:271
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = Nem tudom\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = NEM b�zom benne\n"
 
-#: g10/pkclist.c:278
+#: g10/pkclist.c:279
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = alapvet�en megb�zom benne\n"
 
-#: g10/pkclist.c:284
+#: g10/pkclist.c:285
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " f = visszat�r�s a f�men�be\n"
 
-#: g10/pkclist.c:287
+#: g10/pkclist.c:288
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " h = kulcs kihagy�sa\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " k = kil�p�s\n"
 
-#: g10/pkclist.c:292
+#: g10/pkclist.c:293
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:298 g10/revoke.c:609
+#: g10/pkclist.c:299 g10/revoke.c:610
 msgid "Your decision? "
 msgstr "Mit v�laszt? "
 
-#: g10/pkclist.c:319
+#: g10/pkclist.c:320
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "T�nyleg be akarja �ll�tani ezt a kulcsot alapvet�en megb�zhat�ra? "
 
-#: g10/pkclist.c:333
+#: g10/pkclist.c:334
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Alapvet�en megb�zhat� kulcshoz vezet� igazol�sok:\n"
 
-#: g10/pkclist.c:418
+#: g10/pkclist.c:419
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Semmi jele, hogy ez a kulcs a megadott tulajdonoshoz tartozik.\n"
 
-#: g10/pkclist.c:423
+#: g10/pkclist.c:424
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Semmi jele, hogy ez a kulcs a megadott tulajdonoshoz tartozik.\n"
 
-#: g10/pkclist.c:429
+#: g10/pkclist.c:430
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Ez a kulcs val�sz�n�leg a jelzett tulajdonoshoz tartozik.\n"
 
-#: g10/pkclist.c:434
+#: g10/pkclist.c:435
 msgid "This key belongs to us\n"
 msgstr "Ez a kulcs hozz�nk tartozik.\n"
 
-#: g10/pkclist.c:460
+#: g10/pkclist.c:461
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -4842,92 +4896,92 @@ msgstr ""
 "a k�vetkez� k�rd�sre v�laszolhat igennel.\n"
 "\n"
 
-#: g10/pkclist.c:467
+#: g10/pkclist.c:468
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "M�gis haszn�ljuk ezt a kulcsot? "
 
-#: g10/pkclist.c:501
+#: g10/pkclist.c:502
 msgid "WARNING: Using untrusted key!\n"
 msgstr "FIGYELEM: Nem b�zunk a kulcsban, amit haszn�lunk!\n"
 
-#: g10/pkclist.c:508
+#: g10/pkclist.c:509
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "FIGYELEM: a kulcsot visszavonhatt�k (visszavon� kulcs nincs jelen).\n"
 
-#: g10/pkclist.c:517
+#: g10/pkclist.c:518
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "FIGYELEM: Ezt a kulcsot a kijel�lt visszavon� visszavonta!\n"
 
-#: g10/pkclist.c:520
+#: g10/pkclist.c:521
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "FIGYELEM: Ezt a kulcsot a tulajdonosa visszavonta!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Ez jelentheti azt, hogy az al��r�s hamis.\n"
 
-#: g10/pkclist.c:527
+#: g10/pkclist.c:528
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "FIGYELEM: Ezt az alkulcsot a tulajdonosa visszavonta!\n"
 
-#: g10/pkclist.c:532
+#: g10/pkclist.c:533
 msgid "Note: This key has been disabled.\n"
 msgstr "Megjegyz�s: Ez a kulcs le lett tiltva.\n"
 
-#: g10/pkclist.c:537
+#: g10/pkclist.c:538
 msgid "Note: This key has expired!\n"
 msgstr "Megjegyz�s: Ez a kulcs lej�rt!\n"
 
-#: g10/pkclist.c:548
+#: g10/pkclist.c:549
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "FIGYELEM: Ez a kulcs nincs hiteles�tve megb�zhat� al��r�ssal!\n"
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:551
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "          Semmi jele, hogy ez a kulcs a megadott tulajdonoshoz tartozik.\n"
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:559
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "FIGYELEM: NEM b�zunk ebben a kulcsban!\n"
 
-#: g10/pkclist.c:559
+#: g10/pkclist.c:560
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Az al��r�s val�sz�n�leg HAMIS.\n"
 
-#: g10/pkclist.c:567
+#: g10/pkclist.c:568
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "FIGYELEM: Ez a kulcs nincs igazolva kell�k�ppen megb�zhat� al��r�ssal!\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:570
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Nem biztos, hogy az al��r�s a tulajdonoshoz tartozik.\n"
 
-#: g10/pkclist.c:734 g10/pkclist.c:767 g10/pkclist.c:936 g10/pkclist.c:996
+#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: kihagyva: %s\n"
 
-#: g10/pkclist.c:744 g10/pkclist.c:968
+#: g10/pkclist.c:745 g10/pkclist.c:969
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: kihagyva: nyilv�nos kulcs m�r szerepel\n"
 
-#: g10/pkclist.c:786
+#: g10/pkclist.c:787
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Nem adott meg felhaszn�l�i azonos�t�t! (Haszn�lhatja a \"-r\" opci�t.)\n"
 
-#: g10/pkclist.c:802
+#: g10/pkclist.c:803
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:828
+#: g10/pkclist.c:829
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -4935,170 +4989,170 @@ msgstr ""
 "\n"
 "Adja meg a felhaszn�l�i azonos�t�t! �res sorral fejezze be: "
 
-#: g10/pkclist.c:844
+#: g10/pkclist.c:845
 msgid "No such user ID.\n"
 msgstr "Nincs ilyen felhaszn�l�i azonos�t�.\n"
 
-#: g10/pkclist.c:849 g10/pkclist.c:911
+#: g10/pkclist.c:850 g10/pkclist.c:912
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "Kihagyva: Nyilv�nos kulcs m�r be lett �ll�tva alap�rtelmezett c�mzettnek.\n"
 
-#: g10/pkclist.c:867
+#: g10/pkclist.c:868
 msgid "Public key is disabled.\n"
 msgstr "Nyilv�nos kulcs nincs enged�lyezve.\n"
 
-#: g10/pkclist.c:874
+#: g10/pkclist.c:875
 msgid "skipped: public key already set\n"
 msgstr "Kihagyva: Nyilv�nos kulcs m�r be lett �ll�tva.\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:904
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
 
-#: g10/pkclist.c:948
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: Kihagyva: Nyilv�nos kulcs nincs enged�lyezve.\n"
 
-#: g10/pkclist.c:1003
+#: g10/pkclist.c:1004
 msgid "no valid addressees\n"
 msgstr "Nincsenek �rv�nyes c�mzettek!\n"
 
-#: g10/plaintext.c:90
+#: g10/plaintext.c:91
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "Az adatot nem mentettem el. Haszn�lja az \"--output\" opci�t a ment�shez!\n"
 
-#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
+#: g10/plaintext.c:136 g10/plaintext.c:141 g10/plaintext.c:159
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
 
-#: g10/plaintext.c:446
+#: g10/plaintext.c:447
 msgid "Detached signature.\n"
 msgstr "K�l�n�ll� al��r�s.\n"
 
-#: g10/plaintext.c:450
+#: g10/plaintext.c:452
 msgid "Please enter name of data file: "
 msgstr "K�rem, adja meg az adat�llom�ny nev�t: "
 
-#: g10/plaintext.c:478
+#: g10/plaintext.c:481
 msgid "reading stdin ...\n"
 msgstr "Olvasom a szabv�nyos bemenetet...\n"
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:515
 msgid "no signed data\n"
 msgstr "Nincs al��rt adat.\n"
 
-#: g10/plaintext.c:526
+#: g10/plaintext.c:529
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" al��rt adatot!\n"
 
-#: g10/pubkey-enc.c:103
+#: g10/pubkey-enc.c:104
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "Anonim c�mzett. A %08lX titkos kulcsot pr�b�lom...\n"
 
-#: g10/pubkey-enc.c:119
+#: g10/pubkey-enc.c:120
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "Rendben, mi vagyunk az anonim c�mzett.\n"
 
-#: g10/pubkey-enc.c:207
+#: g10/pubkey-enc.c:208
 msgid "old encoding of the DEK is not supported\n"
 msgstr "A DEK r�gi k�dol�sa nem t�mogatott.\n"
 
-#: g10/pubkey-enc.c:228
+#: g10/pubkey-enc.c:229
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "A %d%s rejtjelez� algoritmus ismeretlen vagy tiltott.\n"
 
-#: g10/pubkey-enc.c:266
+#: g10/pubkey-enc.c:267
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "MEGJEGYZ�S: %d rejtjelez� algoritmus nincs a preferenci�k k�z�tt.\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:287
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "MEGJEGYZ�S: %08lX titkos kulcs %s-kor lej�rt.\n"
 
-#: g10/pubkey-enc.c:292
+#: g10/pubkey-enc.c:293
 msgid "NOTE: key has been revoked"
 msgstr "MEGJEGYZ�S: A kulcsot visszavont�k."
 
-#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:545
+#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
+#: g10/revoke.c:188 g10/revoke.c:546
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet sikertelen: %s.\n"
 
-#: g10/revoke.c:146
+#: g10/revoke.c:147
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t�.\n"
 
-#: g10/revoke.c:272
+#: g10/revoke.c:273
 msgid "To be revoked by:\n"
 msgstr "Visszavonja:\n"
 
-#: g10/revoke.c:276
+#: g10/revoke.c:277
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Ez egy �rz�keny visszavon� kulcs.)\n"
 
-#: g10/revoke.c:280
+#: g10/revoke.c:281
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Csin�ljunk egy visszavon� igazol�st ehhez a kulcshoz? "
 
-#: g10/revoke.c:293 g10/revoke.c:511
+#: g10/revoke.c:294 g10/revoke.c:512
 msgid "ASCII armored output forced.\n"
 msgstr "ASCII-p�nc�lozott kimenet kiv�lasztva.\n"
 
-#: g10/revoke.c:307 g10/revoke.c:525
+#: g10/revoke.c:308 g10/revoke.c:526
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet sikertelen: %s\n"
 
-#: g10/revoke.c:370
+#: g10/revoke.c:371
 msgid "Revocation certificate created.\n"
 msgstr "Visszavon� igazol�s l�trehozva.\n"
 
-#: g10/revoke.c:376
+#: g10/revoke.c:377
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "Nem tal�ltam visszavon� kulcsot a k�vetkez�h�z: \"%s\".\n"
 
-#: g10/revoke.c:432
+#: g10/revoke.c:433
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "\"%s\" titkos kulcs nem tal�lhat�: %s\n"
 
-#: g10/revoke.c:461
+#: g10/revoke.c:462
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "Nincs hozz� tartoz� nyilv�nos kulcs: %s\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:473
 msgid "public key does not match secret key!\n"
 msgstr "A nyilv�nos kulcs nem passzol a titkos kulcshoz!\n"
 
-#: g10/revoke.c:479
+#: g10/revoke.c:480
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Csin�ljunk egy visszavon� igazol�st ehhez a kulcshoz? "
 
-#: g10/revoke.c:496
+#: g10/revoke.c:497
 msgid "unknown protection algorithm\n"
 msgstr "Ismeretlen v�delmi algoritmus!\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 msgid "NOTE: This key is not protected!\n"
 msgstr "MEGJEGYZ�S: Ez a kulcs nem v�dett.\n"
 
-#: g10/revoke.c:551
+#: g10/revoke.c:552
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5116,170 +5170,170 @@ msgstr ""
 "adathordoz� olvashatatlann� v�lik. De vigy�zat: az �n g�p�nek nyomtat�si\n"
 "rendszere is t�rolhatja az adatot, �s m�sok esetleg hozz�f�rhetnek ehhez!\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid "Please select the reason for the revocation:\n"
 msgstr "K�rem, v�lassza ki a visszavon�s ok�t:\n"
 
-#: g10/revoke.c:602
+#: g10/revoke.c:603
 msgid "Cancel"
 msgstr "M�gsem"
 
-#: g10/revoke.c:604
+#: g10/revoke.c:605
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Val�sz�n�leg a(z) %d. lehet�s�get akarja v�lasztani.)\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:646
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Adjon meg egy nem k�telez� le�r�st! �res sorral fejezze be:\n"
 
-#: g10/revoke.c:673
+#: g10/revoke.c:674
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Visszavon�s oka: %s\n"
 
-#: g10/revoke.c:675
+#: g10/revoke.c:676
 msgid "(No description given)\n"
 msgstr "(Nincs le�r�s.)\n"
 
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Ez �gy rendben van? "
 
-#: g10/seckey-cert.c:54
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "Titkos kulcsr�szek nem �llnak rendelkez�sre.\n"
 
-#: g10/seckey-cert.c:60
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
 
-#: g10/seckey-cert.c:71
+#: g10/seckey-cert.c:72
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
 
-#: g10/seckey-cert.c:265
+#: g10/seckey-cert.c:266
 msgid "Invalid passphrase; please try again"
 msgstr "�rv�nytelen jelsz�. Pr�b�lja �jra"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:267
 #, c-format
 msgid "%s ...\n"
 msgstr "%s...\n"
 
-#: g10/seckey-cert.c:326
+#: g10/seckey-cert.c:327
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "FIGYELEM: Gyenge kulcsot tal�ltam. K�rem, v�ltoztassa meg ism�t a jelsz�t!\n"
 
-#: g10/seckey-cert.c:364
+#: g10/seckey-cert.c:365
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "Elavult, 16 bites ellen�rz��sszeget hozok l�tre titkos kulcs v�delm�hez.\n"
 
-#: g10/seskey.c:52
+#: g10/seskey.c:53
 msgid "weak key created - retrying\n"
 msgstr "Gyenge kulcs j�tt l�tre. �jrapr�b�lom.\n"
 
-#: g10/seskey.c:57
+#: g10/seskey.c:58
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "Nem tudom elker�lni a gyenge kulcsot a szimmetrikus titkos�t�hoz.\n"
 "%d alkalommal pr�b�ltam!\n"
 
-#: g10/seskey.c:213
+#: g10/seskey.c:214
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "A DSA 160 bites hash (kivonatol�) algoritmust ig�nyel.\n"
 
-#: g10/sig-check.c:75
+#: g10/sig-check.c:76
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "FIGYELEM: Al��r�skivonat-konfliktus az �zenetben.\n"
 
-#: g10/sig-check.c:99
+#: g10/sig-check.c:100
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "FIGYELEM: %08lX al��r� alkulcs nem kereszthiteles�tett.\n"
 
-#: g10/sig-check.c:102
+#: g10/sig-check.c:103
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "FIGYELEM: %08lX al��r� alkulcson �rv�nytelen kereszthiteles�t�s van.\n"
 
-#: g10/sig-check.c:168
+#: g10/sig-check.c:169
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "A(z) %08lX nyilv�nos kulcs %lu m�sodperccel �jabb az al��r�sn�l!\n"
 
-#: g10/sig-check.c:169
+#: g10/sig-check.c:170
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "A(z) %08lX nyilv�nos kulcs %lu m�sodperccel �jabb az al��r�sn�l!\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:181
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
 "A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:183
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr ""
 "A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:193
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "MEGJEGYZ�S: Al��r� kulcs (%08lX) lej�rt: %s\n"
 
-#: g10/sig-check.c:275
+#: g10/sig-check.c:276
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "Rossz al��r�st felt�telezek a %08lX kulcst�l egy ismeretlen\n"
 "kritikus bit miatt.\n"
 
-#: g10/sig-check.c:532
+#: g10/sig-check.c:533
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "%08lX kulcs: Nincs alkulcs az alkulcsvisszavon� csomaghoz.\n"
 
-#: g10/sig-check.c:558
+#: g10/sig-check.c:559
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "%08lX kulcs: Nincs alkulcs az alkulcsk�t� al��r�shoz!\n"
 
-#: g10/sign.c:85
+#: g10/sign.c:86
 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:93
+#: g10/sign.c:94
 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:112
+#: g10/sign.c:113
 #, 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:138
+#: g10/sign.c:139
 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:146
+#: g10/sign.c:147
 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:159
+#: g10/sign.c:160
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5288,7 +5342,7 @@ msgstr ""
 "hossz�).\n"
 "Kifejt�s n�lk�l haszn�lom.\n"
 
-#: g10/sign.c:187
+#: g10/sign.c:188
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5298,22 +5352,22 @@ msgstr ""
 "hossz�).\n"
 "Kifejt�s n�lk�l haszn�lom.\n"
 
-#: g10/sign.c:364
+#: g10/sign.c:365
 #, 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:373
+#: g10/sign.c:374
 #, 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:741
+#: g10/sign.c:761
 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:808
+#: g10/sign.c:830
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5321,53 +5375,53 @@ msgstr ""
 "%s (%d) kivonatol� algoritmus haszn�lat�nak er�ltet�se ellent�tes\n"
 "a c�mzett preferenci�ival.\n"
 
-#: g10/sign.c:900
+#: g10/sign.c:922
 msgid "signing:"
 msgstr "Al��rom:"
 
-#: g10/sign.c:1007
+#: g10/sign.c:1034
 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:1180
+#: g10/sign.c:1212
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s titkos�t�st fogok haszn�lni.\n"
 
-#: g10/skclist.c:126 g10/skclist.c:190
+#: g10/skclist.c:127 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "A kulcs nincs \"nem biztons�gosnak\" jel�lve,\n"
 "nem tudom a p�tl� v�letlensz�m-gener�torral haszn�lni!\n"
 
-#: g10/skclist.c:157
+#: g10/skclist.c:158
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "\"%s\"-t kihagytam: m�sodp�ld�ny.\n"
 
-#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "Kihagytam \"%s\"-t: %s.\n"
 
-#: g10/skclist.c:170
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
 
-#: g10/skclist.c:185
+#: g10/skclist.c:186
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "Kihagytam \"%s\"-t: ez egy PGP �ltal l�trehozott ElGamal kulcs, amely nem\n"
 "biztons�gos al��r�sokhoz!\n"
 
-#: g10/tdbdump.c:59 g10/trustdb.c:365
+#: g10/tdbdump.c:60 g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "%lu bizalmi rekord, %d t�pus: �r�s sikertelen: %s.\n"
 
-#: g10/tdbdump.c:104
+#: g10/tdbdump.c:105
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5376,348 +5430,348 @@ msgstr ""
 "# Meghat�rozott bizalmi �rt�kek list�ja, %s.\n"
 "# (Haszn�lja a \"gpg --import-ownertrust\" parancsot a vissza�ll�t�shoz!)\n"
 
-#: g10/tdbdump.c:159 g10/tdbdump.c:167 g10/tdbdump.c:172 g10/tdbdump.c:177
+#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: g10/tdbdump.c:159
+#: g10/tdbdump.c:160
 #, fuzzy
 msgid "line too long"
 msgstr "A sor t�l hossz�!\n"
 
-#: g10/tdbdump.c:167
+#: g10/tdbdump.c:168
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:173
+#: g10/tdbdump.c:174
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
 
-#: g10/tdbdump.c:178
+#: g10/tdbdump.c:179
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr "bizalmi �rt�kek importja"
 
-#: g10/tdbdump.c:214
+#: g10/tdbdump.c:215
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "Hiba bizalmi rekord keres�sekor: %s.\n"
 
-#: g10/tdbdump.c:218
+#: g10/tdbdump.c:219
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "Olvas�si hiba: %s.\n"
 
-#: g10/tdbdump.c:227 g10/trustdb.c:380
+#: g10/tdbdump.c:228 g10/trustdb.c:381
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "Bizalmi adatb�zis: szinkroniz�ci� sikertelen: %s.\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1440
+#: g10/tdbio.c:129 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "Bizalmi adatb�zis %lu. rekord: lseek sikertelen: %s.\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1447
+#: g10/tdbio.c:135 g10/tdbio.c:1448
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "Bizalmi adatb�zis %lu. rekord: �r�s sikertelen (n=%d): %s.\n"
 
-#: g10/tdbio.c:244
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "Bizalmi adatb�zis tranzakci�ja t�l nagy.\n"
 
-#: g10/tdbio.c:497
+#: g10/tdbio.c:498
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "Nem tudom bez�rni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: g10/tdbio.c:512
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: K�nyvt�r nem l�tezik!\n"
 
-#: g10/tdbio.c:522 g10/tdbio.c:545 g10/tdbio.c:588
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: g10/tdbio.c:524 g10/tdbio.c:591
+#: g10/tdbio.c:525 g10/tdbio.c:592
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "Nem tudom megnyitni %s-t!\n"
 
-#: g10/tdbio.c:550
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: Nem siker�lt verzi�rekordot l�trehoznom: %s"
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: �rv�nytelen bizalmi adatb�zis j�tt l�tre.\n"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: Bizalmi adatb�zis l�trej�tt.\n"
 
-#: g10/tdbio.c:597
+#: g10/tdbio.c:598
 msgid "NOTE: trustdb not writable\n"
 msgstr "MEGJEGYZ�S: Bizalmi adatb�zis nem �rhat�.\n"
 
-#: g10/tdbio.c:614
+#: g10/tdbio.c:615
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: �rv�nytelen bizalmi adatb�zis.\n"
 
-#: g10/tdbio.c:646
+#: g10/tdbio.c:647
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: Hasht�bla l�trehoz�sa sikertelen: %s.\n"
 
-#: g10/tdbio.c:654
+#: g10/tdbio.c:655
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: Hiba a verzi�rekord friss�t�sekor: %s.\n"
 
-#: g10/tdbio.c:671 g10/tdbio.c:691 g10/tdbio.c:707 g10/tdbio.c:721
-#: g10/tdbio.c:751 g10/tdbio.c:1373 g10/tdbio.c:1400
+#: g10/tdbio.c:672 g10/tdbio.c:692 g10/tdbio.c:708 g10/tdbio.c:722
+#: g10/tdbio.c:752 g10/tdbio.c:1374 g10/tdbio.c:1401
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: Hiba a verzi�rekord olvas�sakor: %s.\n"
 
-#: g10/tdbio.c:730
+#: g10/tdbio.c:731
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: Hiba a verzi�rekord �r�sakor: %s.\n"
 
-#: g10/tdbio.c:1169
+#: g10/tdbio.c:1170
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "Bizalmi adatb�zis: lseek sikertelen: %s.\n"
 
-#: g10/tdbio.c:1177
+#: g10/tdbio.c:1178
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "Bizalmi adatb�zis: olvas�s sikertelen (n=%d): %s.\n"
 
-#: g10/tdbio.c:1198
+#: g10/tdbio.c:1199
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: Nem bizalmi adatb�zis.\n"
 
-#: g10/tdbio.c:1216
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: Verzi�rekord, rekordsz�m: %lu.\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1222
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: �rv�nytelen �llom�nyverzi� (%d).\n"
 
-#: g10/tdbio.c:1406
+#: g10/tdbio.c:1407
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: Hiba szabad rekord olvas�sakor: %s.\n"
 
-#: g10/tdbio.c:1414
+#: g10/tdbio.c:1415
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: Hiba k�nyvt�rrekord �r�sakor: %s.\n"
 
-#: g10/tdbio.c:1424
+#: g10/tdbio.c:1425
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: Nem siker�lt egy rekord null�z�sa: %s.\n"
 
-#: g10/tdbio.c:1454
+#: g10/tdbio.c:1455
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: Nem siker�lt egy rekord hozz�ad�sa: %s.\n"
 
-#: g10/tdbio.c:1499
+#: g10/tdbio.c:1500
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "Bizalmi adatb�zis s�r�lt. K�rem, futtassa: \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:147
+#: g10/textfilter.c:148
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "Nem tudok %d karaktern�l hosszabb sz�vegsorokat kezelni!\n"
 
-#: g10/textfilter.c:244
+#: g10/textfilter.c:245
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "A bemeneti sor hosszabb, mint %d karakter.\n"
 
-#: g10/trustdb.c:226
+#: g10/trustdb.c:227
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "\"%s\" nem egy �rv�nyes hossz� kulcsazonos�t�.\n"
 
-#: g10/trustdb.c:257
+#: g10/trustdb.c:258
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "%08lX kulcs: Elfogadva megb�zhat� kulcsk�nt.\n"
 
-#: g10/trustdb.c:295
+#: g10/trustdb.c:296
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "A(z) %08lX kulcs egyn�l t�bbsz�r szerepel a bizalmi adatb�zisban.\n"
 
-#: g10/trustdb.c:310
+#: g10/trustdb.c:311
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "%08lX kulcs: Nincs nyilv�nos kulcs a megb�zhat� kulcshoz - kihagytam.\n"
 
-#: g10/trustdb.c:320
+#: g10/trustdb.c:321
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "A kulcsot alapvet�en megb�zhat�nak jel�ltem.\n"
 
-#: g10/trustdb.c:344
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "%lu bizalmi rekord, %d k�r�st�pus: olvas�s sikertelen: %s.\n"
 
-#: g10/trustdb.c:350
+#: g10/trustdb.c:351
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "%lu bizalmi rekord nem a k�rt t�pus� (%d).\n"
 
-#: g10/trustdb.c:446
+#: g10/trustdb.c:447
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:452
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:506
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[visszavont] "
 
-#: g10/trustdb.c:508 g10/trustdb.c:513
+#: g10/trustdb.c:509 g10/trustdb.c:514
 #, fuzzy
 msgid "[ expired]"
 msgstr "[lej�rt]     "
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 #, fuzzy
 msgid "[ unknown]"
 msgstr "Ismeretlen m�d�"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 #, fuzzy
 msgid "never"
 msgstr "soha      "
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:536
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:576
+#: 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:582 g10/trustdb.c:2157
+#: g10/trustdb.c:583 g10/trustdb.c:2309
 #, 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:591
+#: 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:606
+#: 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:838 g10/trustdb.c:1276
+#: 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:1033
+#: 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:1037
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "Ellen�rz�m a bizalmi adatb�zist.\n"
 
-#: g10/trustdb.c:1901
+#: g10/trustdb.c:2053
 #, 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:1965
+#: g10/trustdb.c:2117
 msgid "no ultimately trusted keys found\n"
 msgstr "Nem tal�ltam alapvet�en megb�zhat� kulcsot.\n"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:2131
 #, 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:2002
+#: g10/trustdb.c:2154
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2240
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2163
+#: g10/trustdb.c:2315
 #, 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"
 
-#: g10/verify.c:116
+#: g10/verify.c:117
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -5727,304 +5781,336 @@ msgstr ""
 "Ne felejtse el, hogy az al��r�st tartalmaz� �llom�nyt (.sig vagy .asc)\n"
 "kell az els� helyre �rni a parancssorban!\n"
 
-#: g10/verify.c:189
+#: g10/verify.c:190
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "A bemeneti sor (%u) t�l hossz�, vagy hi�nyzik a soremel�s.\n"
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "�ltal�nos hiba"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "ismeretlen csomagt�pus"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "ismeretlen verzi�"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "ismeretlen nyilv�nos kulcs� algoritmus"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "ismeretlen kivonatol� algoritmus"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "rossz nyilv�nos kulcs"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "rossz titkos kulcs"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "rossz al��r�s"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "hib�s ellen�rz��sszeg"
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "rossz jelsz�"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "nyilv�nos kulcs nem tal�lhat�"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "ismeretlen rejtjelez� algoritmus"
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "nem lehet megnyitni a kulcskarik�t"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "�rv�nytelen csomag"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "�rv�nytelen p�nc�l"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "nincs ilyen felhaszn�l�i azonos�t�"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "titkos kulcs nem �ll rendelkez�sre"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "rossz titkos kulcs haszn�lata"
 
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "nem t�mogatott"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "rossz kulcs"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "�llom�nyolvas�si hiba"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "�llom�ny�r�si hiba"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "ismeretlen t�m�r�t� algoritmus"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "�llom�nymegnyit�si hiba"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "�llom�nyl�trehoz�si hiba"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "�rv�nytelen jelsz�"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "nem megval�s�tott nyilv�nos kulcs� algoritmus"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "nem megval�s�tott rejtjelez� algoritmus"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "ismeretlen al��r�soszt�ly"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "hib�s bizalmi adatb�zis"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "hib�s MPI"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "er�forr�shat�r"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "�rv�nytelen kulcskarika"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "rossz igazol�s"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "rossz form�j� felhaszn�l�i azonos�t�"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "�llom�nyz�r�si hiba"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "�llom�ny�tnevez�si hiba"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "�llom�nyt�rl�si hiba"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "nem v�rt adat"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "id�b�lyeg-konfliktus"
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "haszn�lhatatlan nyilv�nos kulcs� algoritmus"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "�llom�ny l�tezik"
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "gyenge kulcs"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "�rv�nytelen argumentum"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "rossz URI"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "nem t�mogatott URI"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "h�l�zati hiba"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "nem titkos�tott"
 
-#: util/errors.c:103
+#: util/errors.c:104
 msgid "not processed"
 msgstr "nem feldolgozott"
 
-#: util/errors.c:105
+#: util/errors.c:106
 msgid "unusable public key"
 msgstr "haszn�lhatatlan nyilv�nos kulcs"
 
-#: util/errors.c:106
+#: util/errors.c:107
 msgid "unusable secret key"
 msgstr "haszn�lhatatlan titkos kulcs"
 
-#: util/errors.c:107
+#: util/errors.c:108
 msgid "keyserver error"
 msgstr "kulcsszerverhiba"
 
-#: util/errors.c:108
+#: util/errors.c:109
 #, fuzzy
 msgid "canceled"
 msgstr "M�gsem"
 
-#: util/errors.c:109
+#: util/errors.c:110
 #, fuzzy
 msgid "no card"
 msgstr "nem titkos�tott"
 
-#: util/logger.c:157
+#: util/logger.c:158
 msgid "ERROR: "
 msgstr ""
 
-#: util/logger.c:160
+#: util/logger.c:161
 msgid "WARNING: "
 msgstr ""
 
-#: util/logger.c:223
+#: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "Ez egy programhiba... (%s:%d:%s)\n"
 
-#: util/logger.c:229
+#: util/logger.c:230
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Tal�lt egy programhib�t... (%s:%d)\n"
 
-#: util/miscutil.c:336 util/miscutil.c:373
+#: util/miscutil.c:330 util/miscutil.c:367
 msgid "yes"
 msgstr "igen"
 
-#: util/miscutil.c:337 util/miscutil.c:378
+#: util/miscutil.c:331 util/miscutil.c:372
 msgid "yY"
 msgstr "iI"
 
-#: util/miscutil.c:339 util/miscutil.c:375
+#: util/miscutil.c:333 util/miscutil.c:369
 msgid "no"
 msgstr "nem"
 
-#: util/miscutil.c:340 util/miscutil.c:379
+#: util/miscutil.c:334 util/miscutil.c:373
 msgid "nN"
 msgstr "nN"
 
-#: util/miscutil.c:377
+#: util/miscutil.c:371
 msgid "quit"
 msgstr "kil�p�s|kilepes"
 
-#: util/miscutil.c:380
+#: util/miscutil.c:374
 msgid "qQ"
 msgstr "kK"
 
-#: util/miscutil.c:413
+#: util/miscutil.c:407
 msgid "okay|okay"
 msgstr ""
 
-#: util/miscutil.c:415
+#: util/miscutil.c:409
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:416
+#: util/miscutil.c:410
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:417
+#: util/miscutil.c:411
 #, fuzzy
 msgid "cC"
 msgstr "c"
 
-#: util/secmem.c:90
+#: util/secmem.c:91
 msgid "WARNING: using insecure memory!\n"
 msgstr "FIGYELEM: Nem biztons�gos mem�ri�t haszn�lunk!\n"
 
-#: util/secmem.c:91
+#: util/secmem.c:92
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "Tov�bbi inform�ci� a http://www.gnupg.org/faq.html c�men tal�lhat�.\n"
 
-#: util/secmem.c:343
+#: util/secmem.c:344
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "A m�velet nem lehets�ges biztons�gos mem�ria n�lk�l.\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:345
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(Lehet, hogy nem a megfelel� programot haszn�lja a feladatra.)\n"
 
+#, fuzzy
+#~ msgid "error getting serial number: %s\n"
+#~ msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+
+#~ 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"
+
+#~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+#~ msgstr "Rossz jelsz� vagy ismeretlen rejtjelez� algoritmus (%d).\n"
+
+#~ msgid "can't set client pid for the agent\n"
+#~ msgstr "Nem tudom be�ll�tani a kliens pid-et az �gyn�knek.\n"
+
+#~ msgid "can't get server read FD for the agent\n"
+#~ msgstr ""
+#~ "Nem tudom lek�rni a szerver olvas�si �llom�nyle�r�j�t az �gyn�knek.\n"
+
+#~ msgid "can't get server write FD for the agent\n"
+#~ msgstr "Nem tudom lek�rni a szerver �r�si �llom�nyle�r�j�t az �gyn�knek.\n"
+
+#~ msgid "communication problem with gpg-agent\n"
+#~ msgstr "Kommunik�ci�s probl�ma a gpg �gyn�kkel!\n"
+
+#~ msgid "passphrase too long\n"
+#~ msgstr "A jelsz� t�l hossz�!\n"
+
+#~ msgid "invalid response from agent\n"
+#~ msgstr "�rv�nytelen v�lasz az �gyn�kt�l!\n"
+
+#~ msgid "problem with the agent: agent returns 0x%lx\n"
+#~ msgstr "Probl�ma az �gyn�kkel: �gyn�k v�lasza: 0x%lx\n"
+
 #~ msgid "select secondary key N"
 #~ msgstr "N. m�sodlagos kulcs kiv�laszt�sa"
 
diff --git a/po/id.po b/po/id.po
index 10b3258e2..baeb41956 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: 2005-03-15 16:35+0100\n"
+"POT-Creation-Date: 2005-05-31 10:05+0200\n"
 "PO-Revision-Date: 2004-06-17 16:32+0700\n"
 "Last-Translator: Tedi Heriyanto <[email protected]>\n"
 "Language-Team: Indonesian <[email protected]>\n"
@@ -16,80 +16,80 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: cipher/primegen.c:120
+#: cipher/primegen.c:121
 #, fuzzy, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr "tidak dapat membuat bilangan prima dengan bit kurang dari %d\n"
 
-#: cipher/primegen.c:311
+#: cipher/primegen.c:312
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "tidak dapat membuat bilangan prima dengan bit kurang dari %d\n"
 
-#: cipher/random.c:163
+#: cipher/random.c:164
 msgid "no entropy gathering module detected\n"
 msgstr "modul entropi gathering tidak terdeteksi\n"
 
-#: cipher/random.c:387 g10/card-util.c:656 g10/card-util.c:725
-#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2255
-#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
-#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
-#: g10/tdbio.c:600
+#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
+#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
+#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
+#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
+#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/tdbio.c:601
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: cipher/random.c:391
+#: cipher/random.c:392
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "tidak dapat melakukan statistik `%s': %s\n"
 
-#: cipher/random.c:396
+#: cipher/random.c:397
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "'%s' bukan file reguler - diabaikan\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:402
 msgid "note: random_seed file is empty\n"
 msgstr "catatan: file random_seed kosong\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:408
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "peringatan: ukuran file random_seed tidak valid - tidak dipakai\n"
 
-#: cipher/random.c:415
+#: cipher/random.c:416
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "tidak dapat membaca `%s': %s\n"
 
-#: cipher/random.c:453
+#: cipher/random.c:454
 msgid "note: random_seed file not updated\n"
 msgstr "catatan: file random_seed tidak diupdate\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2723
-#: g10/keygen.c:2753 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
-#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:481
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "tidak dapat menulis `%s': %s\n"
 
-#: cipher/random.c:483
+#: cipher/random.c:484
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "tidak dapat menutup `%s': %s\n"
 
-#: cipher/random.c:728
+#: cipher/random.c:729
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "PERINGATAN: menggunakan random number generator yang tidak aman!!\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:730
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -103,7 +103,7 @@ msgstr ""
 "JANGAN MENGGUNAKAN DATA YANG DIHASILKAN PROGRAM INI!!\n"
 "\n"
 
-#: cipher/rndegd.c:204
+#: cipher/rndegd.c:205
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -113,7 +113,7 @@ msgstr ""
 "bila itu tidak akan membosankan anda, karena hal tersebut akan memperbaiki\n"
 "kualitas entropi.\n"
 
-#: cipher/rndlinux.c:134
+#: cipher/rndlinux.c:135
 #, c-format
 msgid ""
 "\n"
@@ -124,45 +124,62 @@ msgstr ""
 "Tidak tersedia cukup byte random. Silakan melakukan aktivitas lain agar\n"
 "memungkinkan SO mengumpulkan lebih banyak entropi! (Perlu %d byte lagi)\n"
 
-#: g10/app-openpgp.c:547
+#: g10/app-openpgp.c:596
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/app-openpgp.c:560
+#: g10/app-openpgp.c:609
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "gagal membuat kembali cache keyring: %s\n"
 
-#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
+#: g10/app-openpgp.c:977
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "gagal menghapus keyblok: %s\n"
+
+#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+msgid "response does not contain the public key data\n"
+msgstr ""
+
+#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
-#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
+#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
+#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: g10/app-openpgp.c:836
+#: g10/app-openpgp.c:1310
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:857
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:862
+#: g10/app-openpgp.c:1336
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -170,354 +187,359 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:869
+#: g10/app-openpgp.c:1343
 msgid "|A|Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1018
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:1492
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1018
+#: g10/app-openpgp.c:1492
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1022
+#: g10/app-openpgp.c:1496
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
+#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "gagal membaca keyblock: %s\n"
 
-#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
+#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: kesalahan membaca record bebas: %s\n"
 
-#: g10/app-openpgp.c:1104
+#: g10/app-openpgp.c:1562
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' sudah dikompresi\n"
 
-#: g10/app-openpgp.c:1108
+#: g10/app-openpgp.c:1566
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1110
+#: g10/app-openpgp.c:1568
 #, fuzzy
 msgid "generating new key\n"
 msgstr "buat sepasang kunci baru"
 
-#: g10/app-openpgp.c:1120
+#: g10/app-openpgp.c:1735
+msgid "creation timestamp missing\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1742
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1749
+#, c-format
+msgid "RSA public exponent missing or largerr than %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1827
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "gagal inisialisasi TrustDB: %s\n"
+
+#: g10/app-openpgp.c:1886
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1135
+#: g10/app-openpgp.c:1901
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1904
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
-msgid "response does not contain the public key data\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
-msgid "response does not contain the RSA modulus\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
-msgid "response does not contain the RSA public exponent\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1195
+#: g10/app-openpgp.c:1961
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1356
+#: g10/app-openpgp.c:2130
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1364
+#: g10/app-openpgp.c:2138
 #, c-format
-msgid "PIN [sigs done: %lu]"
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
+#: g10/app-openpgp.c:2399
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 
-#: g10/app-openpgp.c:1731
-#, fuzzy, c-format
-msgid "error getting serial number: %s\n"
-msgstr "kesalahan penciptaan passphrase: %s\n"
-
-#: g10/app-openpgp.c:1826
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "gagal inisialisasi TrustDB: %s\n"
-
-#: g10/app-openpgp.c:1868
-#, fuzzy
-msgid "reading the key failed\n"
-msgstr "gagal menghapus keyblok: %s\n"
-
-#: g10/armor.c:317
+#: g10/armor.c:318
 #, c-format
 msgid "armor: %s\n"
 msgstr "armor: %s\n"
 
-#: g10/armor.c:346
+#: g10/armor.c:347
 msgid "invalid armor header: "
 msgstr "header armor tidak valid: "
 
-#: g10/armor.c:353
+#: g10/armor.c:354
 msgid "armor header: "
 msgstr "header armor: "
 
-#: g10/armor.c:364
+#: g10/armor.c:365
 msgid "invalid clearsig header\n"
 msgstr "header clearsig tidak valid\n"
 
-#: g10/armor.c:416
+#: g10/armor.c:417
 msgid "nested clear text signatures\n"
 msgstr "signature teks bersarang\n"
 
-#: g10/armor.c:551
+#: g10/armor.c:552
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "armor tidak terduga:"
 
-#: g10/armor.c:563
+#: g10/armor.c:564
 msgid "invalid dash escaped line: "
 msgstr "dash escaped line tidak valid: "
 
-#: g10/armor.c:715 g10/armor.c:1322
+#: g10/armor.c:716 g10/armor.c:1323
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "karakter radix64 tidak valid %02x dilewati\n"
 
-#: g10/armor.c:758
+#: g10/armor.c:759
 msgid "premature eof (no CRC)\n"
 msgstr "eof prematur (tanpa CRC)\n"
 
-#: g10/armor.c:792
+#: g10/armor.c:793
 msgid "premature eof (in CRC)\n"
 msgstr "eof prematur (dalam CRC)\n"
 
-#: g10/armor.c:800
+#: g10/armor.c:801
 msgid "malformed CRC\n"
 msgstr "CRC tidak tepat\n"
 
-#: g10/armor.c:804 g10/armor.c:1359
+#: g10/armor.c:805 g10/armor.c:1360
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "kesalahan CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:824
+#: g10/armor.c:825
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "eof prematur (dalam Trailer)\n"
 
-#: g10/armor.c:828
+#: g10/armor.c:829
 msgid "error in trailer line\n"
 msgstr "kesalahan dalam garis trailer\n"
 
-#: g10/armor.c:1137
+#: g10/armor.c:1138
 msgid "no valid OpenPGP data found.\n"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 
-#: g10/armor.c:1142
+#: g10/armor.c:1143
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armor tidak valid: baris melebihi %d karakter\n"
 
-#: g10/armor.c:1146
+#: g10/armor.c:1147
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "karakter yang dapat dicetak dalam armor - mungkin telah digunakan MTA yang "
 "mengandung bug\n"
 
-#: g10/card-util.c:58 g10/card-util.c:295
+#: g10/card-util.c:63 g10/card-util.c:303
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "kunci rahasia tidak tersedia"
 
-#: g10/card-util.c:63
+#: g10/card-util.c:68
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1329 g10/delkey.c:127 g10/keyedit.c:1430
-#: g10/keygen.c:2439 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1510
+#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
 
-#: g10/card-util.c:97 g10/card-util.c:1108 g10/card-util.c:1191
-#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
-#: g10/keygen.c:1365
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
+#: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "Pilihan anda? "
 
-#: g10/card-util.c:206 g10/card-util.c:256
+#: g10/card-util.c:213 g10/card-util.c:263
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:391
+#: g10/card-util.c:410
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 #, fuzzy
 msgid "unspecified"
 msgstr "Tidak ada alasan diberikan"
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 #, fuzzy
 msgid "not forced"
 msgstr "tidak diproses"
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:497
+#: g10/card-util.c:516
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:499
+#: g10/card-util.c:518
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:501
+#: g10/card-util.c:520
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:518
+#: g10/card-util.c:537
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:539
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:538
+#: g10/card-util.c:557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:559
+#: g10/card-util.c:578
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "tidak ada kunci publik yang sesuai: %s\n"
 
-#: g10/card-util.c:567
+#: g10/card-util.c:586
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:665 g10/card-util.c:734 g10/import.c:261
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:692
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:683
+#: g10/card-util.c:702
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:742
+#: g10/card-util.c:761
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:752
+#: g10/card-util.c:771
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:772
+#: g10/card-util.c:791
 #, fuzzy
 msgid "Language preferences: "
 msgstr "perbarui preferensi"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:799
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:808
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:829
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:824
+#: g10/card-util.c:843
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/card-util.c:845
+#: g10/card-util.c:864
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "tampilkan fingerprint"
 
-#: g10/card-util.c:868
+#: g10/card-util.c:887
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/card-util.c:916
+#: g10/card-util.c:935
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/card-util.c:917
+#: g10/card-util.c:936
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 
-#: g10/card-util.c:926
+#: g10/card-util.c:945
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1030
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1030 g10/card-util.c:1039
+#: g10/card-util.c:1051 g10/card-util.c:1060
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1051
+#: g10/card-util.c:1072
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1060
+#: g10/card-util.c:1081
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -525,410 +547,414 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1099
+#: g10/card-util.c:1120
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
 
-#: g10/card-util.c:1101 g10/card-util.c:1182
+#: g10/card-util.c:1122 g10/card-util.c:1203
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/card-util.c:1102 g10/card-util.c:1184
+#: g10/card-util.c:1123 g10/card-util.c:1205
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/card-util.c:1103 g10/card-util.c:1186
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1119 g10/card-util.c:1202 g10/keyedit.c:908
-#: g10/keygen.c:1404 g10/revoke.c:642
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
+#: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "Pilihan tidak valid.\n"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1200
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Silakan pilih alasan untuk pembatalan:\n"
 
-#: g10/card-util.c:1214
+#: g10/card-util.c:1235
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritma proteksi tidak dikenal\n"
 
-#: g10/card-util.c:1219
+#: g10/card-util.c:1240
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/card-util.c:1224
+#: g10/card-util.c:1245
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/card-util.c:1294 g10/keyedit.c:1317
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "berhenti dari menu ini"
 
-#: g10/card-util.c:1296
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "show admin commands"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1297 g10/keyedit.c:1320
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "tampilkan bantuan"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "list all available data"
 msgstr "Kunci tersedia di:"
 
-#: g10/card-util.c:1302
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1303
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1304
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1305
+#: g10/card-util.c:1327
 #, fuzzy
 msgid "change the login name"
 msgstr "ubah tanggal kadaluarsa"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the language preferences"
 msgstr "ubah ownertrust"
 
-#: g10/card-util.c:1307
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1308
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1310
+#: g10/card-util.c:1332
 #, fuzzy
 msgid "generate new keys"
 msgstr "buat sepasang kunci baru"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1377 g10/keyedit.c:1526
+#: g10/card-util.c:1334
+msgid "verify the PIN and list all data"
+msgstr ""
+
+#: g10/card-util.c:1454 g10/keyedit.c:1609
 msgid "Command> "
 msgstr "Perintah> "
 
-#: g10/card-util.c:1412
+#: g10/card-util.c:1492
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1430
+#: g10/card-util.c:1525
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/card-util.c:1499 g10/keyedit.c:2104
+#: g10/card-util.c:1599 g10/keyedit.c:2210
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Perintah tidak valid (coba \"help\")\n"
 
-#: g10/cardglue.c:287
+#: g10/cardglue.c:396
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:519
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:380
+#: g10/cardglue.c:527
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:852
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:853
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:854
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:691
+#: g10/cardglue.c:855
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:705
+#: g10/cardglue.c:872
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Ulangi passphrase: "
 
-#: g10/cardglue.c:719
+#: g10/cardglue.c:886
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "passphrase tidak diulang dengan benar; coba lagi"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
-#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
 
-#: g10/decrypt.c:104 g10/encode.c:859
+#: g10/decrypt.c:105 g10/encode.c:846
 msgid "--output doesn't work for this command\n"
 msgstr "--output tidak berfungsi untuk perintah ini\n"
 
-#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3167 g10/keyserver.c:1511
-#: g10/revoke.c:226
+#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3346 g10/keyserver.c:1541
+#: g10/revoke.c:227
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2300 g10/keyserver.c:1525
-#: g10/revoke.c:232 g10/revoke.c:439
+#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "gagal membaca keyblock: %s\n"
 
-#: g10/delkey.c:128 g10/delkey.c:135
+#: g10/delkey.c:129 g10/delkey.c:136
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(kecuali anda menspesifikasikan kunci dengan fingerprint)\n"
 
-#: g10/delkey.c:134
+#: g10/delkey.c:135
 #, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "tidak dapat dilakukan dalam mode batch tanpa \"--yes\"\n"
 
-#: g10/delkey.c:146
+#: g10/delkey.c:147
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Menghapus kunci ini dari keyring? "
 
-#: g10/delkey.c:154
+#: g10/delkey.c:155
 #, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Ini adalah kunci rahasia! - Yakin dihapus? "
 
-#: g10/delkey.c:164
+#: g10/delkey.c:165
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: g10/delkey.c:174
+#: g10/delkey.c:175
 msgid "ownertrust information cleared\n"
 msgstr "informasi ownertrust dihapus\n"
 
-#: g10/delkey.c:205
+#: g10/delkey.c:206
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "terdapat kunci rahasia untuk kunci publik \"%s\"!\n"
 
-#: g10/delkey.c:207
+#: g10/delkey.c:208
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "gunakan pilihan \"--delete-secret-key\" untuk menghapusnya.\n"
 
-#: g10/encode.c:210 g10/sign.c:1186
+#: g10/encode.c:211 g10/sign.c:1218
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: g10/encode.c:215
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "tidak dapat menggunakan paket simetri ESK karena mode S2K\n"
 
-#: g10/encode.c:228
+#: g10/encode.c:229
 #, c-format
 msgid "using cipher %s\n"
 msgstr "menggunakan cipher %s\n"
 
-#: g10/encode.c:238 g10/encode.c:558
+#: g10/encode.c:239 g10/encode.c:545
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' sudah dikompresi\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
+#: g10/encode.c:302 g10/encode.c:591 g10/sign.c:566
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "PERINGATAN: `%s' adalah file kosong\n"
 
-#: g10/encode.c:472
+#: g10/encode.c:466
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "anda hanya dapat mengenkripsi ke kunci RSA 2048 bit atau kurang dalam mode --"
 "pgp2\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:488
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "Membaca dari `%s'\n"
 
-#: g10/encode.c:530
+#: g10/encode.c:517
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "tidak dapat menggunakan cipher IDEA untuk semua kunci yang anda enkripsi.\n"
 
-#: g10/encode.c:540
+#: g10/encode.c:527
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:635 g10/sign.c:899
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "memaksa algoritma kompresi %s (%d) melanggar preferensi penerima\n"
 
-#: g10/encode.c:735
+#: g10/encode.c:722
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
 
-#: g10/encode.c:805 g10/pkclist.c:721 g10/pkclist.c:757
+#: g10/encode.c:792 g10/pkclist.c:722 g10/pkclist.c:758
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
 
-#: g10/encode.c:832
+#: g10/encode.c:819
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s dienkripsi untuk: %s\n"
 
-#: g10/encr-data.c:66 g10/mainproc.c:301
+#: g10/encr-data.c:67 g10/mainproc.c:302
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s data terenkripsi\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:305
+#: g10/encr-data.c:69 g10/mainproc.c:306
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
 
-#: g10/encr-data.c:92
+#: g10/encr-data.c:93
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "PERINGATAN: pesan dienkripsi dengan kunci lemah dalam cipher simetrik.\n"
 
-#: g10/encr-data.c:103
+#: g10/encr-data.c:104
 msgid "problem handling encrypted packet\n"
 msgstr "masalah menangani paket terenkripsi\n"
 
-#: g10/exec.c:48
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "tidak ada eksekusi program remote yang didukung\n"
 
-#: g10/exec.c:184 g10/openfile.c:406
+#: g10/exec.c:173 g10/openfile.c:410
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "tidak dapat membuat direktori `%s': %s\n"
 
-#: g10/exec.c:325
+#: g10/exec.c:314
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "pemanggilan program eksternal ditiadakan karena permisi opsi file tidak "
 "aman\n"
 
-#: g10/exec.c:355
+#: g10/exec.c:344
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "platform ini membutuhkan file temp ketika memanggil program eksternal\n"
 
-#: g10/exec.c:433
+#: g10/exec.c:422
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "tidak dapat mengeksekusi %s \"%s\": %s\n"
 
-#: g10/exec.c:436
+#: g10/exec.c:425
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "tidak dapat mengeksekusi %s \"%s\": %s\n"
 
-#: g10/exec.c:521
+#: g10/exec.c:510
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "kesalahan sistem ketika memanggil program eksternal: %s\n"
 
-#: g10/exec.c:532 g10/exec.c:598
+#: g10/exec.c:521 g10/exec.c:587
 msgid "unnatural exit of external program\n"
 msgstr "program eksternal berhenti secara tidak natual\n"
 
-#: g10/exec.c:547
+#: g10/exec.c:536
 msgid "unable to execute external program\n"
 msgstr "tidak dapat mengeksekusi program eksternal\n"
 
-#: g10/exec.c:563
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "tidak dapat membaca tanggapan program eksternal: %s\n"
 
-#: g10/exec.c:609 g10/exec.c:616
+#: g10/exec.c:598 g10/exec.c:605
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
 
-#: g10/exec.c:621
+#: g10/exec.c:610
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus direktori temp `%s': %s\n"
 
-#: g10/export.c:183
+#: g10/export.c:184
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/export.c:212
+#: g10/export.c:213
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "kunci %08lX: tidak diproteksi - dilewati\n"
 
-#: g10/export.c:220
+#: g10/export.c:221
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "kunci %08lX: kunci gaya PGP 2.x - dilewati\n"
 
-#: g10/export.c:395
+#: g10/export.c:398
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 "PERINGATAN: kunci rahasia %08lX tidak memiliki sebuah checksum SK sederhana\n"
 
-#: g10/export.c:427
+#: g10/export.c:430
 msgid "WARNING: nothing exported\n"
 msgstr "PERINGATAN: tidak ada yang diekspor\n"
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid ""
 "@Commands:\n"
 " "
@@ -936,128 +962,128 @@ msgstr ""
 "@Perintah:\n"
 " "
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "|[file]|make a signature"
 msgstr "|[file]|buat signature"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|buat signature teks"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "make a detached signature"
 msgstr "buat detached signature"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encrypt data"
 msgstr "enkripsi data"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "encryption only with symmetric cipher"
 msgstr "enkripsi hanya dengan symmetric cipher"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "decrypt data (default)"
 msgstr "dekripsi data (default)"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "verify a signature"
 msgstr "verifikasi signature"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys"
 msgstr "tampilkan kunci"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and signatures"
 msgstr "tampilkan kunci dan signature"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "periksa signature kunci"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "list keys and fingerprints"
 msgstr "tampilkan kunci dan fingerprint"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "list secret keys"
 msgstr "tampilkan kunci rahasia"
 
-#: g10/g10.c:379
+#: g10/g10.c:381
 msgid "generate a new key pair"
 msgstr "buat sepasang kunci baru"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the public keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "remove keys from the secret keyring"
 msgstr "hapus kunci dari keyring pribadi"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign a key"
 msgstr "tandai kunci"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "sign a key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/g10.c:385
+#: g10/g10.c:387
 msgid "sign or edit a key"
 msgstr "tandai atau edit kunci"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "generate a revocation certificate"
 msgstr "buat sertifikat revokasi"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "export keys"
 msgstr "ekspor kunci"
 
-#: g10/g10.c:389
+#: g10/g10.c:391
 msgid "export keys to a key server"
 msgstr "ekspor kunci ke key server"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "import keys from a key server"
 msgstr "impor kunci dari key server"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "search for keys on a key server"
 msgstr "cari kunci di key server"
 
-#: g10/g10.c:394
+#: g10/g10.c:396
 msgid "update all keys from a keyserver"
 msgstr "update semua kunci dari keyserver"
 
-#: g10/g10.c:397
+#: g10/g10.c:399
 msgid "import/merge keys"
 msgstr "impor/gabung kunci"
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "print the card status"
 msgstr ""
 
-#: g10/g10.c:401
+#: g10/g10.c:403
 msgid "change data on a card"
 msgstr ""
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/g10.c:410
+#: g10/g10.c:412
 msgid "update the trust database"
 msgstr "perbarui database trust"
 
-#: g10/g10.c:417
+#: g10/g10.c:419
 msgid "|algo [files]|print message digests"
 msgstr "|algo [file]|cetak digest pesan"
 
-#: g10/g10.c:421 g10/gpgv.c:66
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1067,51 +1093,51 @@ msgstr ""
 "Pilihan:\n"
 "  "
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "create ascii armored output"
 msgstr "ciptakan output ascii"
 
-#: g10/g10.c:425
+#: g10/g10.c:427
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: g10/g10.c:436
+#: g10/g10.c:438
 msgid "use this user-id to sign or decrypt"
 msgstr "gunakan id-user ini untuk menandai/dekripsi"
 
-#: g10/g10.c:437
+#: g10/g10.c:439
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|set tingkat kompresi N (0 tidak ada)"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "use canonical text mode"
 msgstr "gunakan mode teks kanonikal"
 
-#: g10/g10.c:452
+#: g10/g10.c:458
 msgid "use as output file"
 msgstr "gunakan sebagai file output"
 
-#: g10/g10.c:454 g10/gpgv.c:68
+#: g10/g10.c:460 g10/gpgv.c:73
 msgid "verbose"
 msgstr "detil"
 
-#: g10/g10.c:465
+#: g10/g10.c:471
 msgid "do not make any changes"
 msgstr "jangan buat perubahan"
 
-#: g10/g10.c:466
+#: g10/g10.c:472
 msgid "prompt before overwriting"
 msgstr "tanya sebelum menimpa"
 
-#: g10/g10.c:507
+#: g10/g10.c:513
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:508
+#: g10/g10.c:514
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:536
+#: g10/g10.c:542
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1119,7 +1145,7 @@ msgstr ""
 "@\n"
 "(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
 
-#: g10/g10.c:539
+#: g10/g10.c:545
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1139,15 +1165,15 @@ msgstr ""
 " --list-keys [nama]      tampilkan kunci\n"
 " --fingerprint [nama]    tampilkan fingerprint\n"
 
-#: g10/g10.c:720 g10/gpgv.c:93
+#: g10/g10.c:724 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Laporkan bug ke <[email protected]>.\n"
 
-#: g10/g10.c:737
+#: g10/g10.c:741
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: g10/g10.c:740
+#: g10/g10.c:744
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1157,7 +1183,7 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/g10.c:751
+#: g10/g10.c:755
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1165,467 +1191,477 @@ msgstr ""
 "\n"
 "Algoritma yang didukung:\n"
 
-#: g10/g10.c:754
+#: g10/g10.c:758
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/g10.c:760 g10/keyedit.c:2141
+#: g10/g10.c:764 g10/keyedit.c:2248
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/g10.c:766
+#: g10/g10.c:770
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:772 g10/keyedit.c:2187
+#: g10/g10.c:776 g10/keyedit.c:2294
 msgid "Compression: "
 msgstr "Kompresi: "
 
-#: g10/g10.c:855
+#: g10/g10.c:859
 msgid "usage: gpg [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/g10.c:1003
+#: g10/g10.c:1007
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/g10.c:1021
+#: g10/g10.c:1025
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "tanda = tidak ditemukan dalam definisi grup \"%s\"\n"
 
-#: g10/g10.c:1218
+#: g10/g10.c:1222
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1221
+#: g10/g10.c:1225
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1224
+#: g10/g10.c:1228
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1230
+#: g10/g10.c:1234
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1233
+#: g10/g10.c:1237
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1240
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1242
+#: g10/g10.c:1246
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1245
+#: g10/g10.c:1249
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1248
+#: g10/g10.c:1252
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1258
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1257
+#: g10/g10.c:1261
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1260
+#: g10/g10.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1401
+#: g10/g10.c:1405
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1802
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "CATATAN: file pilihan baku lama `%s' diabaikan\n"
 
-#: g10/g10.c:1838
+#: g10/g10.c:1844
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
-#: g10/g10.c:1842
+#: g10/g10.c:1848
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: g10/g10.c:1849
+#: g10/g10.c:1855
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
 
-#: g10/g10.c:2076
+#: g10/g10.c:2082
 #, 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/g10.c:2293
+#: g10/g10.c:2236 g10/g10.c:2248
+#, fuzzy, c-format
+msgid "`%s' is not a valid signature expiration\n"
+msgstr "%s bukanlah set karakter yang valid\n"
+
+#: g10/g10.c:2321
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3683
+#: g10/g10.c:2340 g10/keyedit.c:3862
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2346
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2349
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2356
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2359
 msgid "invalid import options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2366
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2369
 msgid "invalid export options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2376
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2379
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2401
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2404
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2411
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "tidak dapat menset path exec ke %s\n"
 
-#: g10/g10.c:2573
+#: g10/g10.c:2602
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2606
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "PERINGATAN: %s menimpa %s\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2615
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2618
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/g10.c:2603
+#: g10/g10.c:2625
+#, fuzzy, c-format
+msgid "NOTE: %s is not available in this version\n"
+msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
+
+#: g10/g10.c:2640
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/g10.c:2617
+#: g10/g10.c:2654
 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/g10.c:2623
+#: g10/g10.c:2660
 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/g10.c:2629
+#: g10/g10.c:2666
 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/g10.c:2642
+#: g10/g10.c:2679
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "mengenkripsi pesan dalam mode --pgp2 membutuhkan cipher IDEA\n"
 
-#: g10/g10.c:2712 g10/g10.c:2736
+#: g10/g10.c:2746 g10/g10.c:2770
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/g10.c:2718 g10/g10.c:2742
+#: g10/g10.c:2752 g10/g10.c:2776
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/g10.c:2724
+#: g10/g10.c:2758
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2764
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
 
-#: g10/g10.c:2745
+#: g10/g10.c:2779
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/g10.c:2747
+#: g10/g10.c:2781
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2783
 #, 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/g10.c:2751
+#: g10/g10.c:2785
 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/g10.c:2753
+#: g10/g10.c:2787
 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/g10.c:2756
+#: g10/g10.c:2790
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2794
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K yang tidak valid; harus 0, 1 atau 3\n"
 
-#: g10/g10.c:2767
+#: g10/g10.c:2801
 msgid "invalid default preferences\n"
 msgstr "preferensi baku tidak valid\n"
 
-#: g10/g10.c:2776
+#: g10/g10.c:2810
 msgid "invalid personal cipher preferences\n"
 msgstr "preferensi cipher personal tidak valid\n"
 
-#: g10/g10.c:2780
+#: g10/g10.c:2814
 msgid "invalid personal digest preferences\n"
 msgstr "preferensi digest personal tidak valid\n"
 
-#: g10/g10.c:2784
+#: g10/g10.c:2818
 msgid "invalid personal compress preferences\n"
 msgstr "preferensi kompresi personal tidak valid\n"
 
-#: g10/g10.c:2817
+#: g10/g10.c:2851
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s belum dapat dipakai dengan %s\n"
 
-#: g10/g10.c:2864
+#: g10/g10.c:2898
 #, 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/g10.c:2869
+#: g10/g10.c:2903
 #, 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/g10.c:2874
+#: g10/g10.c:2908
 #, 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/g10.c:2970
+#: g10/g10.c:3004
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/g10.c:2981
+#: g10/g10.c:3015
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "Peringatan: penerima yang disebutkan (-r) tanpa menggunakan enkripsi public "
 "key \n"
 
-#: g10/g10.c:2992
+#: g10/g10.c:3026
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/g10.c:2999
+#: g10/g10.c:3033
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3035
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/g10.c:3011
+#: g10/g10.c:3045
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/g10.c:3024
+#: g10/g10.c:3058
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3060
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3029
+#: g10/g10.c:3063
 #, 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/g10.c:3047
+#: g10/g10.c:3081
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3094
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/g10.c:3075
+#: g10/g10.c:3109
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/g10.c:3077
+#: g10/g10.c:3111
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3080
+#: g10/g10.c:3114
 #, 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/g10.c:3100
+#: g10/g10.c:3134
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [namafile]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3143
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3168
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/g10.c:3142
+#: g10/g10.c:3176
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/g10.c:3146
+#: g10/g10.c:3180
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/g10.c:3167
+#: g10/g10.c:3201
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/g10.c:3238
+#: g10/g10.c:3272
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-user] [keyring]"
 
-#: g10/g10.c:3275
+#: g10/g10.c:3309
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: g10/g10.c:3277
+#: g10/g10.c:3311
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3313
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Ekspor kunci gagal: %s\n"
 
-#: g10/g10.c:3290
+#: g10/g10.c:3324
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Pencarian keyserver gagal: %s\n"
 
-#: g10/g10.c:3300
+#: g10/g10.c:3334
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh keyserver gagal: %s\n"
 
-#: g10/g10.c:3341
+#: g10/g10.c:3375
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/g10.c:3349
+#: g10/g10.c:3383
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/g10.c:3436
+#: g10/g10.c:3470
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/g10.c:3559
+#: g10/g10.c:3593
 msgid "[filename]"
 msgstr "[namafile]"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3597
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/g10.c:3853
+#: g10/g10.c:3887
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1633,77 +1669,82 @@ msgstr ""
 "nama notasi harus hanya terdiri dari karakter yang dapat dicetak atau spasi, "
 "dan diakhiri dengan sebuah '='\n"
 
-#: g10/g10.c:3861
+#: g10/g10.c:3895
 msgid "a user notation name must contain the '@' character\n"
 msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n"
 
-#: g10/g10.c:3871
+#: g10/g10.c:3900
+#, fuzzy
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n"
+
+#: g10/g10.c:3911
 msgid "a notation value must not use any control characters\n"
 msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n"
 
-#: g10/g10.c:3905
+#: g10/g10.c:3945
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
 
-#: g10/g10.c:3907
+#: g10/g10.c:3947
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/g10.c:3940
+#: g10/g10.c:3980
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "terlalu banyak masukan dalam pk cache - ditiadakan\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2750
+#: g10/getkey.c:187 g10/getkey.c:2757
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[User id tidak ditemukan]"
 
-#: g10/getkey.c:1677
+#: g10/getkey.c:1684
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "kunci tidak valid %08lX dibuat valid oleh --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2228
+#: g10/getkey.c:2235
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "tidak ada subkey rahasia untuk subkey publik %08lX. diabaikan\n"
 
-#: g10/getkey.c:2459
+#: g10/getkey.c:2466
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "menggunakan kunci sekunder %08lX bukannya kunci primer %08lX\n"
 
-#: g10/getkey.c:2506
+#: g10/getkey.c:2513
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "kunci %08lX: kunci rahasia tanpa kunci publik - dilewati\n"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:74
 msgid "be somewhat more quiet"
 msgstr "lebih diam"
 
-#: g10/gpgv.c:70
+#: g10/gpgv.c:75
 msgid "take the keys from this keyring"
 msgstr "mengambil kunci ini dari keyring"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:77
 msgid "make timestamp conflicts only a warning"
 msgstr "buat timestamp konflik hanya sebagai peringatan"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:78
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tulis info status ke FD ini"
 
-#: g10/gpgv.c:97
+#: g10/gpgv.c:102
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Pemakaian: gpgv [opsi] [file] (-h untuk bantuan)"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:105
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1711,7 +1752,7 @@ msgstr ""
 "Sintaks: gpg [options] [files]\n"
 "Periksa signature terhadap kunci terpercaya\n"
 
-#: g10/helptext.c:48
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1723,7 +1764,7 @@ msgstr ""
 "ada\n"
 "kaitan dengan (membuat secara implisit) web-of-certificates."
 
-#: g10/helptext.c:54
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1735,16 +1776,16 @@ msgstr ""
 "akses ke kunci rahasia.  Jawab \"yes\" untuk menset kunci ini ke\n"
 "sangat dipercaya\n"
 
-#: g10/helptext.c:61
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "Jika anda ingin menggunakan kunci tidak terpercaya ini, jawab \"ya\"."
 
-#: g10/helptext.c:65
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Masukkan ID user penerima pesan."
 
-#: g10/helptext.c:69
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1758,7 +1799,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:83
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -1769,16 +1810,16 @@ msgstr ""
 "mengenkripsi.  Algoritma ini seharusnya digunakan dalam domain tertentu.\n"
 "Silakan berkonsultasi dulu dengan ahli keamanan anda."
 
-#: g10/helptext.c:90
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "Masukkan ukuran kunci"
 
-#: g10/helptext.c:94 g10/helptext.c:99 g10/helptext.c:111 g10/helptext.c:143
-#: g10/helptext.c:171 g10/helptext.c:176 g10/helptext.c:181
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "Jawab \"ya\" atau \"tidak\""
 
-#: g10/helptext.c:104
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1790,19 +1831,19 @@ msgstr ""
 "tidak akan mendapat respon kesalahan yang baik - sebaiknya sistem akan\n"
 "berusaha menginterprestasi nilai yang diberikan sebagai sebuah interval."
 
-#: g10/helptext.c:116
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "Masukkan nama pemegang kunci"
 
-#: g10/helptext.c:121
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr "silakan masukkan alamat email (pilihan namun sangat dianjurkan)"
 
-#: g10/helptext.c:125
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "Silakan masukkan komentar tambahan"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1816,11 +1857,11 @@ msgstr ""
 "O  untuk melanjutkan dengan pembuatan kunci.\n"
 "K  untuk menghentikan pembuatan kunci."
 
-#: g10/helptext.c:139
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Jawab \"ya\" (atau \"y\") jika telah siap membuat subkey."
 
-#: g10/helptext.c:147
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -1898,12 +1939,12 @@ msgstr ""
 "\n"
 "Jika anda tidak tahu jawaban yang tepat, jawab \"0\"."
 
-#: g10/helptext.c:185
+#: g10/helptext.c:186
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Jawab \"ya\" jika anda ingin menandai seluruh ID user"
 
-#: g10/helptext.c:189
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -1911,11 +1952,11 @@ msgstr ""
 "Jawab \"ya\" jika anda benar-benar ingin menghapus ID user ini.\n"
 "Seluruh sertifikat juga akan hilang!"
 
-#: g10/helptext.c:194
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Jawab \"ya\" jika ingin menghapus subkey"
 
-#: g10/helptext.c:199
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -1925,7 +1966,7 @@ msgstr ""
 "signature ini karena mungkin penting membangun koneksi trust ke kunci atau\n"
 "ke kunci tersertifikasi lain dengan kunci ini."
 
-#: g10/helptext.c:204
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -1937,7 +1978,7 @@ msgstr ""
 "kunci yang digunakan karena kunci penanda ini mungkin membangun suatu\n"
 "koneksi trust melalui kunci yang telah tersertifikasi lain."
 
-#: g10/helptext.c:210
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -1945,7 +1986,7 @@ msgstr ""
 "Signature tidak valid.  Adalah hal yang masuk akal untuk menghapusnya dari\n"
 "keyring anda"
 
-#: g10/helptext.c:214
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -1959,7 +2000,7 @@ msgstr ""
 "ini bila self-signature untuk beberapa alasan tidak valid dan\n"
 "tersedia yang kedua."
 
-#: g10/helptext.c:222
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -1969,24 +2010,24 @@ msgstr ""
 "ke daftar preferensi saat ini.  Timestamp seluruh self-signature\n"
 "yang terpengaruh akan bertambah satu detik.\n"
 
-#: g10/helptext.c:229
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: g10/helptext.c:235
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "Silakan ulangi passphrase terakhir, sehingga anda yakin yang anda ketikkan."
 
-#: g10/helptext.c:239
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "Beri nama file tempat berlakunya signature"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Jawab \"ya\" jika tidak apa-apa menimpa file"
 
-#: g10/helptext.c:249
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -1994,7 +2035,7 @@ msgstr ""
 "Silakan masukan nama file baru. Jika anda hanya menekan RETURN nama\n"
 "file baku (yang diapit tanda kurung) akan dipakai."
 
-#: g10/helptext.c:255
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2024,7 +2065,7 @@ msgstr ""
 "      normalnya digunakan untuk menandai bahwa alamat email tidak valid "
 "lagi.\n"
 
-#: g10/helptext.c:271
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2034,472 +2075,477 @@ msgstr ""
 "mengeluarkan sertifikat pembatalan ini. Buatlah ringkas.\n"
 "Baris kosong mengakhiri teks.\n"
 
-#: g10/helptext.c:286
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "Tidak tersedia bantuan"
 
-#: g10/helptext.c:294
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Tidak tersedia bantuan untuk `%s'"
 
-#: g10/import.c:247
+#: g10/import.c:248
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "melewati blok tipe %d\n"
 
-#: g10/import.c:256
+#: g10/import.c:257
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu kunci telah diproses\n"
 
-#: g10/import.c:273
+#: g10/import.c:274
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Jumlah yang telah diproses: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "        lewati kunci baru: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:279
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         tanpa ID user: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "              imported: %lu"
 msgstr "             diimpor: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:287
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "            tidak berubah: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         ID user baru: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "          subkey baru: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "       signature baru: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  pembatalan kunci baru: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     kunci rahasia dibaca: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  kunci rahasia diimpor: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " kunci rahasia tidak berubah: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "            tidak diimpor: %lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:544
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:545
+#: g10/import.c:546
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Anda telah menandai ID user ini:\n"
 
-#: g10/import.c:582
+#: g10/import.c:583
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:594
+#: g10/import.c:595
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: g10/import.c:606
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:620
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:646
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:694 g10/import.c:1048
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
 
-#: g10/import.c:713
+#: g10/import.c:714
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "kunci %08lX: subkey HKP yang rusak diperbaiki\n"
 
-#: g10/import.c:728
+#: g10/import.c:729
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "kunci %08lX: menerima ID user '%s' yang tidak self-signed\n"
 
-#: g10/import.c:734
+#: g10/import.c:735
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "kunci %08lX: tidak ada ID user yang valid\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 msgid "this may be caused by a missing self-signature\n"
 msgstr "mungkin disebabkan oleh self-signature yang tidak ada\n"
 
-#: g10/import.c:746 g10/import.c:1168
+#: g10/import.c:747 g10/import.c:1169
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "kunci %08lX: kunci publik tidak ditemukan: %s\n"
 
-#: g10/import.c:752
+#: g10/import.c:753
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "kunci %08lX: kunci baru - dilewati\n"
 
-#: g10/import.c:761
+#: g10/import.c:762
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "tidak ditemukan keyring yang dapat ditulisi: %s\n"
 
-#: g10/import.c:766 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "menulis ke `%s'\n"
 
-#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
-#: g10/import.c:2314 g10/import.c:2336
+#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
+#: g10/import.c:2315 g10/import.c:2337
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/import.c:791
+#: g10/import.c:792
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "kunci %08lX: kunci publik \"%s\" diimpor\n"
 
-#: g10/import.c:815
+#: g10/import.c:816
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "kunci %08lX: tidak cocok dengan duplikat kami\n"
 
-#: g10/import.c:832 g10/import.c:1186
+#: g10/import.c:833 g10/import.c:1187
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "kunci %08lX: tidak dapat menemukan keyblock orisinal: %s\n"
 
-#: g10/import.c:840 g10/import.c:1193
+#: g10/import.c:841 g10/import.c:1194
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "kunci %08lX: tidak dapat membaca keyblok orisinal: %s\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "kunci %08lX: 1 user ID baru \"%s\"\n"
 
-#: g10/import.c:875
+#: g10/import.c:876
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
 
-#: g10/import.c:878
+#: g10/import.c:879
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "kunci %08lX: \"%s\" 1 signature baru\n"
 
-#: g10/import.c:881
+#: g10/import.c:882
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "kunci %08lX: \"%s\" %d signature baru\n"
 
-#: g10/import.c:884
+#: g10/import.c:885
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "kunci %08lX: \"%s\" 1 subkey baru\n"
 
-#: g10/import.c:887
+#: g10/import.c:888
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "kunci %08lX: \"%s\" %d subkey baru\n"
 
-#: g10/import.c:908
+#: g10/import.c:909
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "kunci %08lX: \"%s\" tidak berubah\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1054
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "kunci %08lX: kunci rahasia dengan cipher tidak valid %d - dilewati\n"
 
-#: g10/import.c:1064
+#: g10/import.c:1065
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/import.c:1081 g10/import.c:2329
+#: g10/import.c:1082 g10/import.c:2330
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "tidak ada keyring rahasia baku: %s\n"
 
-#: g10/import.c:1092
+#: g10/import.c:1093
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "kunci %08lX: kunci rahasia diimpor\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1122
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "kunci %08lX: sudah ada di keyring rahasia\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1132
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "kunci %08lX: kunci rahasia tidak ditemukan: %s\n"
 
-#: g10/import.c:1161
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "kunci %08lX: tdk ada kunci publik-tdk dpt mengaplikasikan sertifikat "
 "pembatalan\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1205
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - ditolak\n"
 
-#: g10/import.c:1236
+#: g10/import.c:1237
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "kunci %08lX: \"%s\" sertifikat pembatalan diimpor\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1302
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "kunci %08lX: tidak ada ID user untuk signature\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1317
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "kunci %08lX: algoritma publik key tidak didukung pada user id \"%s\"\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "kunci %08lX: self-signature tidak valid pada user id \"%s\"\n"
 
-#: g10/import.c:1336
+#: g10/import.c:1337
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "kunci %08lX: tidak ada subkey untuk key binding\n"
 
-#: g10/import.c:1347 g10/import.c:1397
+#: g10/import.c:1348 g10/import.c:1398
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
 
-#: g10/import.c:1349
+#: g10/import.c:1350
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "kunci %08lX: subkey binding tidak valid\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1365
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "kunci %08lX: hapus subkey binding ganda\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "kunci %08lX: tidak ada subkey untuk pembatalan kunci\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "kunci %08lX: pembatalan subkey tidak valid\n"
 
-#: g10/import.c:1414
+#: g10/import.c:1415
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "kunci %08lX: hapus pembatalan subkey ganda\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1457
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "kunci %08lX: melewati ID user "
 
-#: g10/import.c:1477
+#: g10/import.c:1478
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "kunci %08lX: melewati subkey\n"
 
-#: g10/import.c:1504
+#: g10/import.c:1505
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "kunci %08lX: signature tidak dapat diekpor (kelas %02x) - dilewati\n"
 
-#: g10/import.c:1514
+#: g10/import.c:1515
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "kunci %08lX: sertifikat pembatalan di tempat yang salah - dilewati\n"
 
-#: g10/import.c:1531
+#: g10/import.c:1532
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - dilewati\n"
 
-#: g10/import.c:1545
+#: g10/import.c:1546
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "kunci %08lX: signature subkey di tempat yang salah - dilewati\n"
 
-#: g10/import.c:1553
+#: g10/import.c:1554
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "kunci %08lX: klas signature tidak diharapkan (0x%02x) - dilewati\n"
 
-#: g10/import.c:1574
+#: g10/import.c:1575
 #, fuzzy, c-format
 msgid "key %s: expired signature from key %s - skipped\n"
 msgstr "kunci %08lX: klas signature tidak diharapkan (0x%02x) - dilewati\n"
 
-#: g10/import.c:1677
+#: g10/import.c:1678
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "kunci %08lX: terdeteksi ID user duplikat - digabungkan\n"
 
-#: g10/import.c:1739
+#: g10/import.c:1740
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "Peringatan: kunci %08lX dapat dibatalkan: mengambil kunci pembatalan %08lX\n"
 
-#: g10/import.c:1753
+#: g10/import.c:1754
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "Peringatan: kunci %08lX dapat dibatalkan: kunci pembatalan %08lX tidak ada\n"
 
-#: g10/import.c:1812
+#: g10/import.c:1813
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "kunci %08lX: \"%s\" penambahan sertifikat pembatalan\n"
 
-#: g10/import.c:1846
+#: g10/import.c:1847
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "kunci %08lX: signature kunci langsung ditambahkan\n"
 
-#: g10/import.c:2235
+#: g10/import.c:2236
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "kunci publik tidak cocok dengan kunci rahasia!\n"
 
-#: g10/import.c:2243
+#: g10/import.c:2244
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/import.c:2245
+#: g10/import.c:2246
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/keydb.c:167
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/keydb.c:174
+#: g10/keydb.c:175
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "%s: keyring tercipta\n"
 
-#: g10/keydb.c:685
+#: g10/keydb.c:316 g10/keydb.c:319
+#, fuzzy, c-format
+msgid "keyblock resource `%s': %s\n"
+msgstr "kesalahan penciptaan : `%s': %s\n"
+
+#: g10/keydb.c:698
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "gagal membuat kembali cache keyring: %s\n"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[pembatalan]"
 
-#: g10/keyedit.c:255
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[self-signature]"
 
-#: g10/keyedit.c:333 g10/keylist.c:405
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 signature yang buruk\n"
 
-#: g10/keyedit.c:335 g10/keylist.c:407
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d signature yang buruk\n"
 
-#: g10/keyedit.c:337 g10/keylist.c:409
+#: g10/keyedit.c:344 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signature tidak diperiksa karena tidak ada kunci\n"
 
-#: g10/keyedit.c:339 g10/keylist.c:411
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, 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:341 g10/keylist.c:413
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signature tidak diperiksa karena kesalahan\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:415
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signature tidak diperiksa karena ada kesalahan\n"
 
-#: g10/keyedit.c:345
+#: g10/keyedit.c:352
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "terdeteksi 1 ID user tanpa self-signature yang valid\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:354
 #, 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:403 g10/pkclist.c:262
+#: g10/keyedit.c:410 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2512,53 +2558,63 @@ msgstr ""
 "memeriksa fingerprint dari berbagai sumber...)?\n"
 "\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:274
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Saya cukup percaya\n"
 
-#: g10/keyedit.c:408 g10/pkclist.c:276
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Saya sangat percaya\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:434
 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:443
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
-#: g10/keyedit.c:858 g10/keyedit.c:1642
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1728
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Apakah anda yakin masih ingin menandainya? (y/N) "
 
-#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
-#: g10/keyedit.c:1648
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
+#: g10/keyedit.c:1734
 msgid "  Unable to sign.\n"
 msgstr "..Tidak dapat menandai.\n"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "User ID \"%s\" kadaluwarsa."
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:650
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "User ID \"%s\" bukan self-signed."
 
-#: g10/keyedit.c:676
+#: g10/keyedit.c:678
+#, fuzzy, c-format
+msgid "User ID \"%s\" is signable.  "
+msgstr "User ID \"%s\" bukan self-signed."
+
+#: g10/keyedit.c:680
+#, fuzzy
+msgid "Sign it? (y/N) "
+msgstr "Ditandai? "
+
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2567,11 +2623,11 @@ msgstr ""
 "Self-signature pada \"%s\"\n"
 "adalah signature bergaya PGP 2.x.\n"
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:711
 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:699
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2580,13 +2636,13 @@ msgstr ""
 "Signature anda saat ini pada \"%s\"\n"
 "telah habis berlaku.\n"
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:729
 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:724
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2595,43 +2651,43 @@ msgstr ""
 "Signature anda saat ini pada \"%s\"\n"
 "adalah signature.lokal \n"
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:754
 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:749
+#: g10/keyedit.c:775
 #, 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:752
+#: g10/keyedit.c:778
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" Sudah ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:783
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Apakah anda ingin menandainya lagi? (y/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:805
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Tidak ada yang ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "Kunci ini telah berakhir!"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:844
 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:851
+#: g10/keyedit.c:882
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2639,11 +2695,11 @@ msgstr ""
 "Anda tidak boleh membuat signature OpenPGP pada sebuah kunci PGP 2.x saat "
 "dalam mode --pgp2\n"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:884
 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:878
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2653,32 +2709,32 @@ msgstr ""
 "menandai benar benar milik\n"
 "orang tersebut?  Jika anda tidak tahu jawabannya. masukkan \"0\".\n"
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Saya tidak akan menjawab.%s\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Saya belum memeriksanya.%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Saya telah melakukan pemeriksaan biasa.%s\n"
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:920
 #, 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:895
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Pilihan Anda? (berikan '?' untuk informasi lebih lanjut):"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:950
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2687,100 +2743,100 @@ msgstr ""
 "Apakah anda yakin untuk menandai kunci ini \n"
 "dengan kunci anda: "
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Ini akan jadi self-signature.\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:963
 #, 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:940
+#: g10/keyedit.c:971
 #, 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:950
+#: g10/keyedit.c:981
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Signature akan ditandai sebagai tidak dapat diekspor.\n"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:988
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:995
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Saya belum memeriksa kunci ini sama sekali.\n"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1000
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Saya telah memeriksa kunci ini.\n"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1005
 #, 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:984
+#: g10/keyedit.c:1015
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:1029 g10/keyedit.c:4132 g10/keyedit.c:4223 g10/keyedit.c:4287
-#: g10/keyedit.c:4348 g10/sign.c:369
+#: g10/keyedit.c:1060 g10/keyedit.c:4350 g10/keyedit.c:4441 g10/keyedit.c:4505
+#: g10/keyedit.c:4566 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "gagal menandai: %s\n"
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1105 g10/keygen.c:3057
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "Kunci ini tidak diproteksi.\n"
 
-#: g10/keyedit.c:1109 g10/keygen.c:3045
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/keyedit.c:1113 g10/keygen.c:3060
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/keyedit.c:1117 g10/keygen.c:3064
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "Kunci diproteksi.\n"
 
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Tidak dapat mengedit kunci ini: %s\n"
 
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2788,11 +2844,11 @@ msgstr ""
 "Masukkan passphrase baru untuk kunci rahasia ini.\n"
 "\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:1825
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase tidak diulang dengan benar; coba lagi"
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2800,193 +2856,193 @@ msgstr ""
 "Anda tidak ingin passphrase - bukan ide yang baik!\n"
 "\n"
 
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1195
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Apakah anda ingin melakukan hal ini? "
 
-#: g10/keyedit.c:1235
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "memindahkan signature kunci ke tempat yang tepat\n"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "simpan dan berhenti"
 
-#: g10/keyedit.c:1322
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/keyedit.c:1323
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "tampilkan kunci dan ID user"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "pilih ID user N"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "pilih ID user N"
 
-#: g10/keyedit.c:1327
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "batalkan signature"
 
-#: g10/keyedit.c:1330
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1335
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/keyedit.c:1337
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1343
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "tambah sebuah ID user"
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "tambah sebuah photo ID"
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "hapus ID user"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "hapus kunci sekunder"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr "tambah kunci pembatalan"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1402
 #, 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:1372
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "tandai ID user sebagai primer"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "ubah tampilan kunci rahasia dan publik"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "tampilkan preferensi (ahli)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "tampilkan preferensi (verbose)"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1418
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "ubah passphrase"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "ubah ownertrust"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1426
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Benar-benar hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "batalkan sebuah ID user"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "batalkan kunci sekunder"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "enable key"
 msgstr "aktifkan kunci"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "disable key"
 msgstr "tiadakan kunci"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1436
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "tampilkan photo ID"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1556
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "kesalahan membaca keyblock rahasia `%s': %s\n"
 
-#: g10/keyedit.c:1494
+#: g10/keyedit.c:1574
 msgid "Secret key is available.\n"
 msgstr "Kunci rahasia tersedia.\n"
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1655
 msgid "Need the secret key to do this.\n"
 msgstr "Perlu kunci rahasia untuk melakukan hal ini.\n"
 
-#: g10/keyedit.c:1579
+#: g10/keyedit.c:1663
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Silakan gunakan dulu perintah \"toogle\".\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1682
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -2994,236 +3050,241 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1722
 msgid "Key is revoked."
 msgstr "Kunci dibatalkan"
 
-#: g10/keyedit.c:1657
+#: g10/keyedit.c:1741
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Tandai ID seluruh user? "
 
-#: g10/keyedit.c:1660
-msgid "Hint: Select the user IDs to sign\n"
-msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
-
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1748
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "kelas signature tidak dikenal"
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1771
 #, 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:1713 g10/keyedit.c:1733 g10/keyedit.c:1899
+#: g10/keyedit.c:1793 g10/keyedit.c:1813 g10/keyedit.c:1979
 msgid "You must select at least one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:1715
+#: g10/keyedit.c:1795
 msgid "You can't delete the last user ID!\n"
 msgstr "Anda tidak dapat menghapus ID user terakhir!\n"
 
-#: g10/keyedit.c:1717
+#: g10/keyedit.c:1797
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:1718
+#: g10/keyedit.c:1798
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Hapus ID user ini? "
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1848
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Hapus ID user ini? "
 
-#: g10/keyedit.c:1780
+#: g10/keyedit.c:1860
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Anda harus memilih minimum satu kunci.\n"
 
-#: g10/keyedit.c:1808
+#: g10/keyedit.c:1888
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1822
+#: g10/keyedit.c:1902
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1919
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/keyedit.c:1863
+#: g10/keyedit.c:1943
 msgid "You must select at least one key.\n"
 msgstr "Anda harus memilih minimum satu kunci.\n"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1946
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Anda ingin menghapus kunci terpilih ini? "
 
-#: g10/keyedit.c:1867
+#: g10/keyedit.c:1947
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Anda ingin menghapus kunci ini? "
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1982
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Benar-benar hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1983
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Benar-benar hapus ID user ini? "
 
-#: g10/keyedit.c:1921
+#: g10/keyedit.c:2001
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Anda ingin membatalkan kunci ini? "
 
-#: g10/keyedit.c:1932
+#: g10/keyedit.c:2012
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Anda ingin membatalkan kunci terpilih ini? "
 
-#: g10/keyedit.c:1934
+#: g10/keyedit.c:2014
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Anda ingin membatalkan kunci ini? "
 
-#: g10/keyedit.c:1975
+#: g10/keyedit.c:2055
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2007
+#: g10/keyedit.c:2087
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "set daftar preferensi"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2093
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2095
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Update preferensi?"
 
-#: g10/keyedit.c:2065
+#: g10/keyedit.c:2157
+#, fuzzy, c-format
+msgid "Unable to clean `%s'\n"
+msgstr "tidak dapat mengeksekusi %s \"%s\": %s\n"
+
+#: g10/keyedit.c:2160
+msgid "Please specify item to clean: `sigs', `uids', or `all'\n"
+msgstr ""
+
+#: g10/keyedit.c:2171
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Simpan perubahan? "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2174
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Berhenti tanpa menyimpan? "
 
-#: g10/keyedit.c:2078
+#: g10/keyedit.c:2184
 #, c-format
 msgid "update failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2191
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: g10/keyedit.c:2092
+#: g10/keyedit.c:2198
 msgid "Key not changed so no update needed.\n"
 msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
 
-#: g10/keyedit.c:2164
+#: g10/keyedit.c:2271
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2323
 msgid "Features: "
 msgstr "Fitur: "
 
-#: g10/keyedit.c:2227
+#: g10/keyedit.c:2334
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2242 g10/keylist.c:307
+#: g10/keyedit.c:2349 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2473
+#: g10/keyedit.c:2580
 #, 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:2494
+#: g10/keyedit.c:2601
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
 
-#: g10/keyedit.c:2500
+#: g10/keyedit.c:2607
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensitive)"
 
-#: g10/keyedit.c:2516 g10/keyedit.c:2572 g10/keyedit.c:2684 g10/keyedit.c:2699
-#: g10/keylist.c:193 g10/keyserver.c:422
+#: g10/keyedit.c:2623 g10/keyedit.c:2679 g10/keyedit.c:2792 g10/keyedit.c:2807
+#: g10/keylist.c:194 g10/keyserver.c:421
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keyedit.c:2519 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:931
+#: g10/keyedit.c:2626 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:948
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revoked] "
 
-#: g10/keyedit.c:2521 g10/keylist.c:757 g10/keylist.c:886
+#: g10/keyedit.c:2628 g10/keylist.c:758 g10/keylist.c:887
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [berakhir: %s]"
 
-#: g10/keyedit.c:2523 g10/keyedit.c:2574 g10/keyedit.c:2686 g10/keyedit.c:2701
-#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
-#: g10/keylist.c:913 g10/keyserver.c:428 g10/mainproc.c:937
+#: g10/keyedit.c:2630 g10/keyedit.c:2681 g10/keyedit.c:2794 g10/keyedit.c:2809
+#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
+#: g10/keylist.c:914 g10/keyserver.c:427 g10/mainproc.c:954
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [berakhir: %s]"
 
-#: g10/keyedit.c:2525
+#: g10/keyedit.c:2632
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:2540
+#: g10/keyedit.c:2647
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2651
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2658
 msgid "This key has been disabled"
 msgstr "Kunci ini telah ditiadakan"
 
-#: g10/keyedit.c:2579 g10/keylist.c:199
+#: g10/keyedit.c:2686 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2754
 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:2654
+#: g10/keyedit.c:2762
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3231,19 +3292,19 @@ msgstr ""
 "Perhatikan bahwa validitas kunci yang ditampilkan belum tentu benar\n"
 "kecuali anda memulai kembali program.\n"
 
-#: g10/keyedit.c:2718 g10/keyserver.c:432 g10/mainproc.c:1577
-#: g10/trustdb.c:1178
+#: g10/keyedit.c:2826 g10/keyedit.c:3201 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1690
 #, fuzzy
 msgid "revoked"
 msgstr "[revoked] "
 
-#: g10/keyedit.c:2720 g10/keyserver.c:436 g10/mainproc.c:1579
-#: g10/trustdb.c:531
+#: g10/keyedit.c:2828 g10/keyedit.c:3203 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1692
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2893
 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"
@@ -3251,7 +3312,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:2845
+#: g10/keyedit.c:2953
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3261,45 +3322,75 @@ msgstr ""
 "dapat menyebabkan beberapa versi\n"
 "          PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:2850 g10/keyedit.c:3128
+#: g10/keyedit.c:2958 g10/keyedit.c:3307
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Anda tetap ingin menambahkannya? (y/n) "
 
-#: g10/keyedit.c:2856
+#: g10/keyedit.c:2964
 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:2996
+#: g10/keyedit.c:3104
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Hapus signature baik ini? (y/T/q)"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3114
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Hapus signature tidak valid ini? (y/T/q)"
 
-#: g10/keyedit.c:3010
+#: g10/keyedit.c:3118
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
 
-#: g10/keyedit.c:3016
+#: g10/keyedit.c:3124
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
 
-#: g10/keyedit.c:3030
+#: g10/keyedit.c:3138
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3139
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:3034
+#: g10/keyedit.c:3142
 msgid "Nothing deleted.\n"
 msgstr "Tidak ada yang dihapus.\n"
 
-#: g10/keyedit.c:3123
+#: g10/keyedit.c:3167
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed.\n"
+msgstr "User ID \"%s\" dibatalkan."
+
+#: g10/keyedit.c:3168
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed.\n"
+msgstr "User ID \"%s\" dibatalkan."
+
+#: g10/keyedit.c:3173
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean.\n"
+msgstr "User ID \"%s\" telah dibatalkan\n"
+
+#: g10/keyedit.c:3205 g10/trustdb.c:1694
+#, fuzzy
+msgid "invalid"
+msgstr "armor tidak valid"
+
+#: g10/keyedit.c:3207
+#, fuzzy, c-format
+msgid "User ID \"%s\" removed: %s\n"
+msgstr "User ID \"%s\" dibatalkan."
+
+#: g10/keyedit.c:3214
+#, fuzzy
+msgid "No user IDs are removable.\n"
+msgstr "User ID \"%s\" telah dibatalkan\n"
+
+#: g10/keyedit.c:3302
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3309,345 +3400,350 @@ msgstr ""
 "designated dapat\n"
 "............menyebabkan beberapa versi PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:3134
+#: g10/keyedit.c:3313
 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:3154
+#: g10/keyedit.c:3333
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Masukkan user ID pihak yang ingin dibatalkan: "
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3356
 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:3192
+#: g10/keyedit.c:3371
 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:3214
+#: g10/keyedit.c:3393
 #, 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:3233
+#: g10/keyedit.c:3412
 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:3239
+#: g10/keyedit.c:3418
 #, 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:3300
+#: g10/keyedit.c:3479
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Silakan hapus pilihan dari kunci rahasia.\n"
 
-#: g10/keyedit.c:3306
+#: g10/keyedit.c:3485
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Silakan pilih maksimum satu kunci sekunder.\n"
 
-#: g10/keyedit.c:3310
+#: g10/keyedit.c:3489
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Merubah batas waktu untuk kunci sekunder.\n"
 
-#: g10/keyedit.c:3313
+#: g10/keyedit.c:3492
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Merubah batas waktu untuk kunci primer.\n"
 
-#: g10/keyedit.c:3359
+#: g10/keyedit.c:3538
 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:3375
+#: g10/keyedit.c:3554
 msgid "No corresponding signature in secret ring\n"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/keyedit.c:3455
+#: g10/keyedit.c:3634
 msgid "Please select exactly one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:3494 g10/keyedit.c:3604 g10/keyedit.c:3724
+#: g10/keyedit.c:3673 g10/keyedit.c:3783 g10/keyedit.c:3903
 #, 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:3665
+#: g10/keyedit.c:3844
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3745
+#: g10/keyedit.c:3924
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:3746
+#: g10/keyedit.c:3925
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3987
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:3854
+#: g10/keyedit.c:4045
+#, fuzzy, c-format
+msgid "No user ID with hash %s\n"
+msgstr "Tidak ada ID user dengan index %d\n"
+
+#: g10/keyedit.c:4072
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:3971
+#: g10/keyedit.c:4189
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID user: "
 
-#: g10/keyedit.c:3974 g10/keyedit.c:4038 g10/keyedit.c:4081
+#: g10/keyedit.c:4192 g10/keyedit.c:4256 g10/keyedit.c:4299
 #, 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:3976 g10/keyedit.c:4040 g10/keyedit.c:4083
+#: g10/keyedit.c:4194 g10/keyedit.c:4258 g10/keyedit.c:4301
 msgid " (non-exportable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:3980
+#: g10/keyedit.c:4198
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:3984
+#: g10/keyedit.c:4202
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Anda tetap ingin membatalkannya? (y/n) "
 
-#: g10/keyedit.c:3988
+#: g10/keyedit.c:4206
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)"
 
-#: g10/keyedit.c:4015
+#: g10/keyedit.c:4233
 #, 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:4041
+#: g10/keyedit.c:4259
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:4048
+#: g10/keyedit.c:4266
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   dibatalkan oleh %08lX pada %s\n"
 
-#: g10/keyedit.c:4070
+#: g10/keyedit.c:4288
 msgid "You are about to revoke these signatures:\n"
 msgstr "Anda akan membatalkan signature ini:\n"
 
-#: g10/keyedit.c:4090
+#: g10/keyedit.c:4308
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
 
-#: g10/keyedit.c:4120
+#: g10/keyedit.c:4338
 msgid "no secret key\n"
 msgstr "tidak ada kunci rahasia\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4408
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4425
 #, 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:4271
+#: g10/keyedit.c:4489
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:4333
+#: g10/keyedit.c:4551
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4646
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Menampilkan photo ID %s berukuran %ld untuk kunci 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:293
+#: g10/keygen.c:258
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "preferensi %c%lu ganda \n"
 
-#: g10/keygen.c:300
+#: g10/keygen.c:265
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "terlalu banyak preferensi `%c'\n"
 
-#: g10/keygen.c:302
+#: g10/keygen.c:267
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "terlalu banyak preferensi `%c'\n"
 
-#: g10/keygen.c:304
+#: g10/keygen.c:269
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "terlalu banyak preferensi `%c'\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:394
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/keygen.c:829
+#: g10/keygen.c:822
 msgid "writing direct signature\n"
 msgstr "menulis signature direct\n"
 
-#: g10/keygen.c:868
+#: g10/keygen.c:861
 msgid "writing self signature\n"
 msgstr "menulis self signature\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing key binding signature\n"
 msgstr "menulis key binding signature\n"
 
-#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2632
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "keysize tidak valid; menggunakan %u bit\n"
 
-#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2638
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "keysize dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1239
 #, fuzzy
 msgid "Sign"
 msgstr "tandai"
 
-#: g10/keygen.c:1252
+#: g10/keygen.c:1242
 #, fuzzy
 msgid "Encrypt"
 msgstr "enkripsi data"
 
-#: g10/keygen.c:1255
+#: g10/keygen.c:1245
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1263
+#: g10/keygen.c:1253
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1268
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1282
+#: g10/keygen.c:1272
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1287
+#: g10/keygen.c:1277
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1290
+#: g10/keygen.c:1280
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "  (%d) ElGamal (hanya enkripsi)\n"
 
-#: g10/keygen.c:1293
+#: g10/keygen.c:1283
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1296
+#: g10/keygen.c:1286
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1340
 msgid "Please select what kind of key you want:\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1342
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "  (%d) DSA dan ElGamal (baku)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1343
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "  (%d) DSA (hanya menandai)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1345
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:1357
+#: g10/keygen.c:1347
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "  (%d) ElGamal (hanya enkripsi)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1348
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "  (%d) RSA (hanya menandai)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1350
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:1362
+#: g10/keygen.c:1352
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:1431 g10/keygen.c:2509
+#: g10/keygen.c:1421 g10/keygen.c:2506
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "Keypair DSA akan memiliki 1024 bit.\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1431
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1438
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Keysize yang anda inginkan? (1024) "
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1452
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1468
+#: g10/keygen.c:1458
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Keysize yang diminta adalah %u bit\n"
 
-#: g10/keygen.c:1473 g10/keygen.c:1478
+#: g10/keygen.c:1463 g10/keygen.c:1468
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1515
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3663,7 +3759,7 @@ msgstr ""
 "     <n>m = kunci berakhir dalam n bulan\n"
 "     <n>y = kunci berakhir dalam n tahun\n"
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1526
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3679,39 +3775,40 @@ msgstr ""
 "     <n>m = signature berakhir dalam n bulan\n"
 "     <n>y = signature berakhir dalam n tahun\n"
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1549
 msgid "Key is valid for? (0) "
 msgstr "Kunci valid untuk? (0) "
 
-#: g10/keygen.c:1563
-msgid "Signature is valid for? (0) "
+#: g10/keygen.c:1554
+#, fuzzy, c-format
+msgid "Signature is valid for? (%s) "
 msgstr "Signature valid untuk? (0) "
 
-#: g10/keygen.c:1568
+#: g10/keygen.c:1572
 msgid "invalid value\n"
 msgstr "nilai yang tidak valid\n"
 
-#: g10/keygen.c:1575
+#: g10/keygen.c:1579
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s tidak pernah berakhir\n"
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1580
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s tidak pernah berakhir\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1585
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s berakhir pada %s\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1586
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signature kadaluarsa pada %s \n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1592
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3719,12 +3816,12 @@ msgstr ""
 "Sistem anda tidak dapat menampilkan tanggal melebihi 2038.\n"
 "Namun, ia dapat menanganinya secara benar hingga 2106.\n"
 
-#: g10/keygen.c:1595
+#: g10/keygen.c:1597
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Benar (y/t)? "
 
-#: g10/keygen.c:1638
+#: g10/keygen.c:1641
 #, fuzzy
 msgid ""
 "\n"
@@ -3740,44 +3837,44 @@ msgstr ""
 "user-id dari Nama sebenarnya, Komentar dan Alamat email dalam bentuk:\n"
 "  \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 
-#: g10/keygen.c:1651
+#: g10/keygen.c:1654
 msgid "Real name: "
 msgstr "Nama sebenarnya: "
 
-#: g10/keygen.c:1659
+#: g10/keygen.c:1662
 msgid "Invalid character in name\n"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1664
 msgid "Name may not start with a digit\n"
 msgstr "Nama tidak boleh dimulai dengan digit\n"
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1666
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nama harus berukuran minimum 5 karakter\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1674
 msgid "Email address: "
 msgstr "Alamat email: "
 
-#: g10/keygen.c:1682
+#: g10/keygen.c:1685
 msgid "Not a valid email address\n"
 msgstr "Bukan alamat email yang valid\n"
 
-#: g10/keygen.c:1690
+#: g10/keygen.c:1693
 msgid "Comment: "
 msgstr "Komentar: "
 
-#: g10/keygen.c:1696
+#: g10/keygen.c:1699
 msgid "Invalid character in comment\n"
 msgstr "Karakter tidak valid dalam komentar\n"
 
-#: g10/keygen.c:1719
+#: g10/keygen.c:1722
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Anda menggunakan set karakter `%s'.\n"
 
-#: g10/keygen.c:1725
+#: g10/keygen.c:1728
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3787,7 +3884,7 @@ msgstr ""
 "Anda memilih USER-ID ini:\n"
 "   \"%s\"\n"
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1733
 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"
 
@@ -3802,23 +3899,23 @@ msgstr "Jangan menaruh alamat email ke dalam nama sebenarnya atau komentar\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1746
+#: g10/keygen.c:1749
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoQq"
 
-#: g10/keygen.c:1756
+#: g10/keygen.c:1759
 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:1757
+#: g10/keygen.c:1760
 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:1776
+#: g10/keygen.c:1779
 msgid "Please correct the error first\n"
 msgstr "Silakan perbaiki kesalahan ini dulu\n"
 
-#: g10/keygen.c:1816
+#: g10/keygen.c:1819
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3826,12 +3923,12 @@ msgstr ""
 "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
 "\n"
 
-#: g10/keygen.c:1826 g10/passphrase.c:1105
+#: g10/keygen.c:1829 g10/passphrase.c:786
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1832
+#: g10/keygen.c:1835
 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"
@@ -3844,7 +3941,7 @@ msgstr ""
 "menggunakan program ini dengan pilihan \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1857
 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"
@@ -3856,50 +3953,50 @@ msgstr ""
 "selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
 "yang baik untuk memperoleh entropi.\n"
 
-#: g10/keygen.c:2578
+#: g10/keygen.c:2575
 msgid "Key generation canceled.\n"
 msgstr "Pembuatan kunci dibatalkan.\n"
 
-#: g10/keygen.c:2766 g10/keygen.c:2910
+#: g10/keygen.c:2774 g10/keygen.c:2918
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "menulis kunci publik ke `%s'\n"
 
-#: g10/keygen.c:2768 g10/keygen.c:2913
+#: g10/keygen.c:2776 g10/keygen.c:2921
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/keygen.c:2771 g10/keygen.c:2916
+#: g10/keygen.c:2779 g10/keygen.c:2924
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2907
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "tidak ditemukan keyring publik yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:2905
+#: g10/keygen.c:2913
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "tidak ditemukan keyring rahasia yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2931
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring publik `%s': %s\n"
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2938
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: g10/keygen.c:2953
+#: g10/keygen.c:2961
 msgid "public and secret key created and signed.\n"
 msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
 
-#: g10/keygen.c:2964
+#: g10/keygen.c:2972
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -3909,388 +4006,369 @@ msgstr ""
 "mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
 "untuk tujuan ini.\n"
 
-#: g10/keygen.c:2976 g10/keygen.c:3105 g10/keygen.c:3220
+#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3156 g10/sign.c:290
+#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
 #, 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:3030 g10/keygen.c:3158 g10/sign.c:292
+#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
 #, 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:3039 g10/keygen.c:3169
+#: g10/keygen.c:3047 g10/keygen.c:3177
 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:3078 g10/keygen.c:3202
+#: g10/keygen.c:3086 g10/keygen.c:3210
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Ingin diciptakan? "
 
-#: g10/keygen.c:3355
+#: g10/keygen.c:3363
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: g10/keygen.c:3402
+#: g10/keygen.c:3410
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keygen.c:3428
+#: g10/keygen.c:3436
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "CATATAN: kunci pribadi %08lX berakhir pada %s\n"
 
-#: g10/keygen.c:3508
-#, c-format
-msgid "length of RSA modulus is not %d\n"
-msgstr ""
-
-#: g10/keygen.c:3514
-msgid "public exponent too large (more than 32 bits)\n"
-msgstr ""
-
-#: g10/keygen.c:3520 g10/keygen.c:3526
-#, c-format
-msgid "length of an RSA prime is not %d\n"
-msgstr ""
-
-#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
+#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
 msgid "never     "
 msgstr "tidak pernah..."
 
-#: g10/keylist.c:264
+#: g10/keylist.c:265
 msgid "Critical signature policy: "
 msgstr "Kebijakan signature kritis: "
 
-#: g10/keylist.c:266
+#: g10/keylist.c:267
 msgid "Signature policy: "
 msgstr "Kebijakan signature: "
 
-#: g10/keylist.c:305
+#: g10/keylist.c:306
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:354 g10/keylist.c:398
+#: 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:372
+#: g10/keylist.c:373
 msgid "Critical signature notation: "
 msgstr "Notasi signature kritis: "
 
-#: g10/keylist.c:374
+#: g10/keylist.c:375
 msgid "Signature notation: "
 msgstr "Notasi signature: "
 
-#: g10/keylist.c:385
+#: g10/keylist.c:386
 msgid "not human readable"
 msgstr "tidak dapat dibaca manusia"
 
-#: g10/keylist.c:486
+#: g10/keylist.c:487
 msgid "Keyring"
 msgstr "Keyring"
 
-#: g10/keylist.c:792
+#: g10/keylist.c:793
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr " [berakhir: %s]"
 
-#: g10/keylist.c:1488
+#: g10/keylist.c:1489
 msgid "Primary key fingerprint:"
 msgstr "Fingerprint kunci primer:"
 
-#: g10/keylist.c:1490
+#: g10/keylist.c:1491
 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:1497
+#: g10/keylist.c:1498
 msgid " Primary key fingerprint:"
 msgstr "     Fingerprint kunci primer ="
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1500
 msgid "      Subkey fingerprint:"
 msgstr "     Fingerprint subkunci ="
 
-#: g10/keylist.c:1503 g10/keylist.c:1507
+#: g10/keylist.c:1504 g10/keylist.c:1508
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Fingerprint kunci ="
 
-#: g10/keylist.c:1574
+#: g10/keylist.c:1575
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1245
+#: g10/keyring.c:1246
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1252
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "PERINGATAN: terdapat 2 file dengan informasi penting.\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s adalah yang tidak berubah\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1255
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s adalah yang baru\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1256
 msgid "Please fix this possible security flaw\n"
 msgstr "Silakan perbaiki kemungkinan lubang keamanan ini\n"
 
-#: g10/keyring.c:1375
+#: g10/keyring.c:1376
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "memeriksa keyring `%s'\n"
 
-#: g10/keyring.c:1421
+#: g10/keyring.c:1422
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu kunci telah diperiksa (%lu signature)\n"
 
-#: g10/keyring.c:1433
+#: g10/keyring.c:1434
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu kunci telah diperiksa (%lu signature)\n"
 
-#: g10/keyring.c:1504
+#: g10/keyring.c:1505
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: keyring tercipta\n"
 
-#: g10/keyserver.c:107
+#: g10/keyserver.c:105
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "PERINGATAN: opsi dalam `%s' belum aktif selama pelaksanaan ini\n"
 
-#: g10/keyserver.c:434
+#: g10/keyserver.c:433
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:635
+#: g10/keyserver.c:634
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:718 g10/keyserver.c:1238
+#: g10/keyserver.c:717 g10/keyserver.c:1267
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/keyserver.c:808
+#: g10/keyserver.c:815
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/keyserver.c:810
+#: g10/keyserver.c:817
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/keyserver.c:985
+#: g10/keyserver.c:1014
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:989
+#: g10/keyserver.c:1018
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1141
+#: g10/keyserver.c:1170
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "ditandai dengan kunci anda %08lX pada %s\n"
 
-#: g10/keyserver.c:1188
+#: g10/keyserver.c:1217
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1191
+#: g10/keyserver.c:1220
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1198 g10/keyserver.c:1293
+#: g10/keyserver.c:1227 g10/keyserver.c:1322
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1275
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1255
+#: g10/keyserver.c:1284
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1314
+#: g10/keyserver.c:1343
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1320
+#: g10/keyserver.c:1349
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1361
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1366
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1374
 #, c-format
-msgid "gpgkeys_%s does not support handler version %d\n"
+msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1351
+#: g10/keyserver.c:1381
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "kesalahan keyserver"
 
-#: g10/keyserver.c:1356
+#: g10/keyserver.c:1386
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "kesalahan keyserver"
 
-#: g10/keyserver.c:1365
+#: g10/keyserver.c:1395
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/keyserver.c:1390 g10/keyserver.c:1424
+#: g10/keyserver.c:1420 g10/keyserver.c:1454
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1681
+#: g10/keyserver.c:1711
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1703
+#: g10/keyserver.c:1733
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1705
+#: g10/keyserver.c:1735
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:249
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "ukuran aneh untuk kunci sesi terenkripsi (%d)\n"
 
-#: g10/mainproc.c:262
-#, c-format
-msgid "bad passphrase or unknown cipher algorithm (%d)\n"
-msgstr "passphrase jelek atau algoritma cipher (%d) tidak dikenal\n"
-
-#: g10/mainproc.c:299
+#: g10/mainproc.c:300
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s kunci sesi enkripsi\n"
 
-#: g10/mainproc.c:309
+#: g10/mainproc.c:310
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
 
-#: g10/mainproc.c:375
+#: g10/mainproc.c:376
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "kunci publik adalah %08lX\n"
 
-#: g10/mainproc.c:430
+#: g10/mainproc.c:431
 msgid "public key encrypted data: good DEK\n"
 msgstr "data terenkripsi dengan kunci publik: DEK baik\n"
 
-#: g10/mainproc.c:463
+#: g10/mainproc.c:464
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "dienkripsi dengan %u-bit kunci %s, ID %08lX, tercipta %s\n"
 
-#: g10/mainproc.c:467 g10/pkclist.c:218
+#: g10/mainproc.c:468 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:472
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "dienkripsi dengan kunci %s, ID %08lX\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "gagal dekripsi kunci publik: %s\n"
 
-#: g10/mainproc.c:499
+#: g10/mainproc.c:500
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "dienkripsi dengan passphrase %lu\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:502
 msgid "encrypted with 1 passphrase\n"
 msgstr "dienkripsi dengan 1 passphrase\n"
 
-#: g10/mainproc.c:529 g10/mainproc.c:551
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "asumsikan %s data terenkripsi\n"
 
-#: g10/mainproc.c:537
+#: g10/mainproc.c:538
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "Cipher IDEA tidak tersedia, secara optimis berusaha menggunakan %s\n"
 
-#: g10/mainproc.c:569
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr "dekripsi lancar\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:574
 msgid "WARNING: message was not integrity protected\n"
 msgstr "PERINGATAN: integritas pesan tidak terlindungi\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "PERINGATAN: pesan terenkripsi telah dimanipulasi!\n"
 
-#: g10/mainproc.c:592
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
@@ -4304,302 +4382,291 @@ msgstr "CATATAN: pengirim meminta \"for-your-eyes-only\"\n"
 msgid "original file name='%.*s'\n"
 msgstr "original file name='%.*s'\n"
 
-#: g10/mainproc.c:786
+#: g10/mainproc.c:803
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "pembatalan mandiri - gunakan \"gpg --import\" untuk mengaplikasikan\n"
 
-#: g10/mainproc.c:1290
+#: g10/mainproc.c:1307
 msgid "signature verification suppressed\n"
 msgstr "verifikasi signature tidak diabaikan\n"
 
-#: g10/mainproc.c:1332 g10/mainproc.c:1342
+#: g10/mainproc.c:1349 g10/mainproc.c:1359
 msgid "can't handle these multiple signatures\n"
 msgstr "tidak dapat menangani banyak signature ini\n"
 
-#: g10/mainproc.c:1352
+#: g10/mainproc.c:1369
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/mainproc.c:1353
+#: g10/mainproc.c:1370
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:1357
+#: g10/mainproc.c:1374
 #, 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:1377
+#: g10/mainproc.c:1394
 msgid "Key available at: "
 msgstr "Kunci tersedia di:"
 
-#: g10/mainproc.c:1482 g10/mainproc.c:1530
+#: g10/mainproc.c:1499 g10/mainproc.c:1547
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "signature BURUK dari \""
 
-#: g10/mainproc.c:1484 g10/mainproc.c:1532
+#: g10/mainproc.c:1501 g10/mainproc.c:1549
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signature kadaluarsa dari \""
 
-#: g10/mainproc.c:1486 g10/mainproc.c:1534
+#: g10/mainproc.c:1503 g10/mainproc.c:1551
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1538
+#: g10/mainproc.c:1555
 msgid "[uncertain]"
 msgstr "[uncertain]"
 
-#: g10/mainproc.c:1570
+#: g10/mainproc.c:1587
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1664
+#: g10/mainproc.c:1681
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/mainproc.c:1669
+#: g10/mainproc.c:1686
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signature kadaluarsa pada %s \n"
 
-#: g10/mainproc.c:1672
+#: g10/mainproc.c:1689
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: g10/mainproc.c:1673
+#: g10/mainproc.c:1690
 msgid "binary"
 msgstr "biner"
 
-#: g10/mainproc.c:1674
+#: g10/mainproc.c:1691
 msgid "textmode"
 msgstr "modeteks"
 
-#: g10/mainproc.c:1674 g10/trustdb.c:530
+#: g10/mainproc.c:1691 g10/trustdb.c:531
 msgid "unknown"
 msgstr "tidak dikenal"
 
-#: g10/mainproc.c:1694
+#: g10/mainproc.c:1711
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Tidak dapat memeriksa signature: %s\n"
 
-#: g10/mainproc.c:1762 g10/mainproc.c:1778 g10/mainproc.c:1864
+#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
 msgid "not a detached signature\n"
 msgstr "bukan detached signature\n"
 
-#: g10/mainproc.c:1805
+#: g10/mainproc.c:1822
 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:1813
+#: g10/mainproc.c:1830
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "kelas signature mandiri 0x%02x\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1887
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature model lama (PGP 2.X)\n"
 
-#: g10/mainproc.c:1880
+#: g10/mainproc.c:1897
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "terdeteksi root paket tidak valid dalam proc_tree()\n"
 
-#: g10/misc.c:121
+#: g10/misc.c:122
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "tidak dapat meniadakan core dump: %s\n"
 
-#: g10/misc.c:141 g10/misc.c:169 g10/misc.c:241
+#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "tidak dapat membuka file: %s\n"
 
-#: g10/misc.c:206
+#: g10/misc.c:207
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/misc.c:315
+#: g10/misc.c:316
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "tidak dapat menangani algoritma kunci publik %d\n"
 
-#: g10/misc.c:330
+#: g10/misc.c:331
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algoritma cipher belum diimplementasikan"
 
-#: g10/misc.c:345
+#: g10/misc.c:346
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:351
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n"
 
-#: g10/misc.c:446
+#: g10/misc.c:447
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "plugin cipher IDEA tidak tersedia\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:448
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 "silakan lihat http://www.gnupg.org/why-not-idea.html untuk informasi lebih "
 "lanjut\n"
 
-#: g10/misc.c:680
+#: g10/misc.c:681
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opsi tidak digunakan lagi \"%s\"\n"
 
-#: g10/misc.c:684
+#: g10/misc.c:685
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 
-#: g10/misc.c:686
+#: g10/misc.c:687
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "silakan gunakan \"%s%s\"\n"
 
-#: g10/misc.c:697
+#: g10/misc.c:694
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
+msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
+
+#: g10/misc.c:707
 msgid "Uncompressed"
 msgstr "Tidak dikompresi"
 
-#: g10/misc.c:722
+#: g10/misc.c:732
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Tidak dikompresi"
 
-#: g10/misc.c:832
+#: g10/misc.c:842
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "pesan ini mungkin tidak dapat digunakan oleh %s\n"
 
-#: g10/misc.c:989
+#: g10/misc.c:999
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/misc.c:1014
+#: g10/misc.c:1024
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: g10/openfile.c:84
+#: g10/openfile.c:86
 #, c-format
 msgid "File `%s' exists. "
 msgstr "File `%s' ada. "
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Ditimpa (y/T)? "
 
-#: g10/openfile.c:119
+#: g10/openfile.c:121
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: suffix tidak dikenal\n"
 
-#: g10/openfile.c:141
+#: g10/openfile.c:143
 msgid "Enter new filename"
 msgstr "Masukkan nama file baru"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:188
 msgid "writing to stdout\n"
 msgstr "menulis ke stdout\n"
 
-#: g10/openfile.c:296
+#: g10/openfile.c:300
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "mengasumsikan data bertanda dalam `%s'\n"
 
-#: g10/openfile.c:375
+#: g10/openfile.c:379
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "file konfigurasi baru `%s' tercipta\n"
 
-#: g10/openfile.c:377
+#: g10/openfile.c:381
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "PERINGATAN: opsi dalam `%s' belum aktif selama pelaksanaan ini\n"
 
-#: g10/openfile.c:409
+#: g10/openfile.c:413
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: direktori tercipta\n"
 
-#: g10/parse-packet.c:137
+#: g10/parse-packet.c:138
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "tidak dapat menangani algoritma kunci publik %d\n"
 
-#: g10/parse-packet.c:707
+#: g10/parse-packet.c:708
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "PERINGATAN: kunci sesi mungkin dienkripsi simetris secara tidak aman\n"
 
-#: g10/parse-packet.c:1132
+#: g10/parse-packet.c:1145
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaket tipe %d memiliki bit kritis terset\n"
 
-#: g10/passphrase.c:478 g10/passphrase.c:525
+#: g10/passphrase.c:305
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
-#: g10/passphrase.c:486
-msgid "can't set client pid for the agent\n"
-msgstr "tidak dapat menset pid client untuk agen\n"
-
-#: g10/passphrase.c:494
-msgid "can't get server read FD for the agent\n"
-msgstr "tidak dapat membuat server membaca FD untuk agen\n"
-
-#: g10/passphrase.c:501
-msgid "can't get server write FD for the agent\n"
-msgstr "tidak dapat membuat server menulis FD untuk agen\n"
-
-#: g10/passphrase.c:534
+#: g10/passphrase.c:317
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabel lingkungan GPG_AGENT_INFO salah bentuk\n"
 
-#: g10/passphrase.c:547
+#: g10/passphrase.c:332
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "protokol gpg-agent versi %d tidak didukung\n"
 
-#: g10/passphrase.c:568
+#: g10/passphrase.c:345
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "tidak dapat terkoneksi ke `%s': %s\n"
 
-#: g10/passphrase.c:590
-msgid "communication problem with gpg-agent\n"
-msgstr "masalah komunikasi dengan gpg-agent\n"
-
-#: g10/passphrase.c:597 g10/passphrase.c:937 g10/passphrase.c:1049
+#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
 msgid "problem with the agent - disabling agent use\n"
 msgstr "masalah dengan agen - tiadakan penggunaan agen\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1209
+#: g10/passphrase.c:511 g10/passphrase.c:890
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID kunci utama %08lX)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:525
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4610,41 +4677,28 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s key, ID %08lX, tercipta %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:550
 msgid "Repeat passphrase\n"
 msgstr "Ulangi passphrase\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:552
 msgid "Enter passphrase\n"
 msgstr "Masukkan passphrase\n"
 
-#: g10/passphrase.c:781
-msgid "passphrase too long\n"
-msgstr "passphrase terlalu panjang\n"
-
-#: g10/passphrase.c:794
-msgid "invalid response from agent\n"
-msgstr "respon tidak valid dari agen\n"
-
-#: g10/passphrase.c:810 g10/passphrase.c:931
+#: g10/passphrase.c:628
 msgid "cancelled by user\n"
 msgstr "dibatalkan oleh user\n"
 
-#: g10/passphrase.c:815 g10/passphrase.c:1020
-#, c-format
-msgid "problem with the agent: agent returns 0x%lx\n"
-msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
-
-#: g10/passphrase.c:1100 g10/passphrase.c:1263
+#: g10/passphrase.c:781 g10/passphrase.c:944
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "tidak dapat meminta password dalam mode batch\n"
 
-#: g10/passphrase.c:1107 g10/passphrase.c:1268
+#: g10/passphrase.c:788 g10/passphrase.c:949
 msgid "Enter passphrase: "
 msgstr "Masukkan passphrase: "
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:871
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4654,21 +4708,21 @@ msgstr ""
 "Anda perlu passphrase untuk membuka kunci rahasia untuk\n"
 "pemakai: \""
 
-#: g10/passphrase.c:1196
+#: g10/passphrase.c:877
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bit kunci %s, ID %08lX, tercipta %s"
 
-#: g10/passphrase.c:1205
+#: g10/passphrase.c:886
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1272
+#: g10/passphrase.c:953
 msgid "Repeat passphrase: "
 msgstr "Ulangi passphrase: "
 
-#: g10/photoid.c:66
+#: g10/photoid.c:67
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4684,160 +4738,160 @@ msgstr ""
 "gambar yang sangat besar, kunci anda akan menjadi semakin besar pula!\n"
 "Jagalah agar gambar mendekati ukuran 240x288.\n"
 
-#: g10/photoid.c:80
+#: g10/photoid.c:81
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Masukkan nama file JPEG sebagai ID foto: "
 
-#: g10/photoid.c:94
+#: g10/photoid.c:95
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "tidak dapat membuka file: %s\n"
 
-#: g10/photoid.c:102
+#: g10/photoid.c:103
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:104
+#: g10/photoid.c:105
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/photoid.c:119
+#: g10/photoid.c:120
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\" bukan sebuah file JPEG\n"
 
-#: g10/photoid.c:136
+#: g10/photoid.c:137
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Apakah foto ini benar (y/N/q)? "
 
-#: g10/photoid.c:338
+#: g10/photoid.c:339
 msgid "unable to display photo ID!\n"
 msgstr "tidak dapat menampilkan photo ID!\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:580
+#: g10/pkclist.c:62 g10/revoke.c:581
 msgid "No reason specified"
 msgstr "Tidak ada alasan diberikan"
 
-#: g10/pkclist.c:63 g10/revoke.c:582
+#: g10/pkclist.c:64 g10/revoke.c:583
 msgid "Key is superseded"
 msgstr "Kunci dilampaui"
 
-#: g10/pkclist.c:65 g10/revoke.c:581
+#: g10/pkclist.c:66 g10/revoke.c:582
 msgid "Key has been compromised"
 msgstr "Kunci ini telah dikompromikan"
 
-#: g10/pkclist.c:67 g10/revoke.c:583
+#: g10/pkclist.c:68 g10/revoke.c:584
 msgid "Key is no longer used"
 msgstr "Kunci tidak lagi digunakan"
 
-#: g10/pkclist.c:69 g10/revoke.c:584
+#: g10/pkclist.c:70 g10/revoke.c:585
 msgid "User ID is no longer valid"
 msgstr "ID User tidak lagi valid"
 
-#: g10/pkclist.c:73
+#: g10/pkclist.c:74
 msgid "reason for revocation: "
 msgstr "Alasan pembatalan:"
 
-#: g10/pkclist.c:90
+#: g10/pkclist.c:91
 msgid "revocation comment: "
 msgstr "Komentar pembatalan:"
 
-#: g10/pkclist.c:205
+#: g10/pkclist.c:206
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:213
+#: g10/pkclist.c:214
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "Tidak ada nilai trust untuk:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:245
+#: g10/pkclist.c:246
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "              alias \""
 
-#: g10/pkclist.c:255
+#: g10/pkclist.c:256
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Kunci ini mungkin milik pemiliknya\n"
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:271
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = Tidak tahu\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d: Saya TIDAK percaya\n"
 
-#: g10/pkclist.c:278
+#: g10/pkclist.c:279
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Saya sangat percaya sekali\n"
 
-#: g10/pkclist.c:284
+#: g10/pkclist.c:285
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = kembali ke menu utama\n"
 
-#: g10/pkclist.c:287
+#: g10/pkclist.c:288
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " s = lewati kunci ini\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " q = berhenti\n"
 
-#: g10/pkclist.c:292
+#: g10/pkclist.c:293
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:298 g10/revoke.c:609
+#: g10/pkclist.c:299 g10/revoke.c:610
 msgid "Your decision? "
 msgstr "Keputusan anda? "
 
-#: g10/pkclist.c:319
+#: g10/pkclist.c:320
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Anda ingin menset kunci ini menjadi sangat percaya sekali?"
 
-#: g10/pkclist.c:333
+#: g10/pkclist.c:334
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Sertifikat mengarahkan ke kunci terpercaya:\n"
 
-#: g10/pkclist.c:418
+#: g10/pkclist.c:419
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Tidak ada indikasi bahwa kunci ini benar-benar milik pemiliknya\n"
 
-#: g10/pkclist.c:423
+#: g10/pkclist.c:424
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Tidak ada indikasi bahwa kunci ini benar-benar milik pemiliknya\n"
 
-#: g10/pkclist.c:429
+#: g10/pkclist.c:430
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Kunci ini mungkin milik pemiliknya\n"
 
-#: g10/pkclist.c:434
+#: g10/pkclist.c:435
 msgid "This key belongs to us\n"
 msgstr "Kunci ini milik kita\n"
 
-#: g10/pkclist.c:460
+#: g10/pkclist.c:461
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -4849,92 +4903,92 @@ msgstr ""
 "pertanyaan berikut dengan ya\n"
 "\n"
 
-#: g10/pkclist.c:467
+#: g10/pkclist.c:468
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Tetap gunakan kunci ini? "
 
-#: g10/pkclist.c:501
+#: g10/pkclist.c:502
 msgid "WARNING: Using untrusted key!\n"
 msgstr "PERINGATAN: Menggunakan kunci tidak dipercaya!\n"
 
-#: g10/pkclist.c:508
+#: g10/pkclist.c:509
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "Peringatan: kunci ini mungkin dibatalkan:(kunci pembatalan tidak ada)\n"
 
-#: g10/pkclist.c:517
+#: g10/pkclist.c:518
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pihak yang berwenang\n"
 
-#: g10/pkclist.c:520
+#: g10/pkclist.c:521
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pemiliknya!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "        Hal ini dapat berarti bahwa signature adalah palsu.\n"
 
-#: g10/pkclist.c:527
+#: g10/pkclist.c:528
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "PERINGATAN: Subkey ini telah dibatalkan oleh pemiliknya!\n"
 
-#: g10/pkclist.c:532
+#: g10/pkclist.c:533
 msgid "Note: This key has been disabled.\n"
 msgstr "Catatan: Kunci ini telah ditiadakan\n"
 
-#: g10/pkclist.c:537
+#: g10/pkclist.c:538
 msgid "Note: This key has expired!\n"
 msgstr "Catatan: Kunci ini telah berakhir!\n"
 
-#: g10/pkclist.c:548
+#: g10/pkclist.c:549
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "PERINGATAN: Kunci ini tidak disertifikasi dengan sig yang terpercaya!\n"
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:551
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "  Tidak ada indikasi signature milik pemilik.\n"
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:559
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "PERINGATAN: Kita tidak percaya kunci ini!\n"
 
-#: g10/pkclist.c:559
+#: g10/pkclist.c:560
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "        Signature mungkin palsu.\n"
 
-#: g10/pkclist.c:567
+#: g10/pkclist.c:568
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "PERINGATAN: Kunci tdk disertifikasi dg signature terpercaya yg cukup!\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:570
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "        Tidak pasti signature milik pemilik.\n"
 
-#: g10/pkclist.c:734 g10/pkclist.c:767 g10/pkclist.c:936 g10/pkclist.c:996
+#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: dilewati: %s\n"
 
-#: g10/pkclist.c:744 g10/pkclist.c:968
+#: g10/pkclist.c:745 g10/pkclist.c:969
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: dilewati: kunci publik telah ada\n"
 
-#: g10/pkclist.c:786
+#: g10/pkclist.c:787
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Anda tidak menspesifikasikan ID user. (anda dapat gunakan \"-r\")\n"
 
-#: g10/pkclist.c:802
+#: g10/pkclist.c:803
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:828
+#: g10/pkclist.c:829
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -4942,168 +4996,168 @@ msgstr ""
 "\n"
 "Masukkan user ID.  Akhiri dengan baris kosong: "
 
-#: g10/pkclist.c:844
+#: g10/pkclist.c:845
 msgid "No such user ID.\n"
 msgstr "Tidak ada ID user tersebut.\n"
 
-#: g10/pkclist.c:849 g10/pkclist.c:911
+#: g10/pkclist.c:850 g10/pkclist.c:912
 msgid "skipped: public key already set as default recipient\n"
 msgstr "dilewati: kunci publik telah diset sebagai penerima baku\n"
 
-#: g10/pkclist.c:867
+#: g10/pkclist.c:868
 msgid "Public key is disabled.\n"
 msgstr "Kunci publik dimatikan.\n"
 
-#: g10/pkclist.c:874
+#: g10/pkclist.c:875
 msgid "skipped: public key already set\n"
 msgstr "dilewati: kunci publik telah diset\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:904
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: g10/pkclist.c:948
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: dilewati: kunci publik dimatikan\n"
 
-#: g10/pkclist.c:1003
+#: g10/pkclist.c:1004
 msgid "no valid addressees\n"
 msgstr "tidak ada alamat yang valid\n"
 
-#: g10/plaintext.c:90
+#: g10/plaintext.c:91
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "data tidak disimpan; gunakan pilihan \"--output\" untuk menyimpannya\n"
 
-#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
+#: g10/plaintext.c:136 g10/plaintext.c:141 g10/plaintext.c:159
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "kesalahan penciptaan : `%s': %s\n"
 
-#: g10/plaintext.c:446
+#: g10/plaintext.c:447
 msgid "Detached signature.\n"
 msgstr "Menghapus signature.\n"
 
-#: g10/plaintext.c:450
+#: g10/plaintext.c:452
 msgid "Please enter name of data file: "
 msgstr "Silakan masukkan nama file data: "
 
-#: g10/plaintext.c:478
+#: g10/plaintext.c:481
 msgid "reading stdin ...\n"
 msgstr "membaca stdin ...\n"
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:515
 msgid "no signed data\n"
 msgstr "tidak ada data tertandai\n"
 
-#: g10/plaintext.c:526
+#: g10/plaintext.c:529
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "tidak dapat membuka data tertandai `%s'\n"
 
-#: g10/pubkey-enc.c:103
+#: g10/pubkey-enc.c:104
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "penerima anonim; mencoba kunci rahasia %08lX ...\n"
 
-#: g10/pubkey-enc.c:119
+#: g10/pubkey-enc.c:120
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "baik, kita adalah penerima anonim.\n"
 
-#: g10/pubkey-enc.c:207
+#: g10/pubkey-enc.c:208
 msgid "old encoding of the DEK is not supported\n"
 msgstr "encoding lama DEK tidak didukung\n"
 
-#: g10/pubkey-enc.c:228
+#: g10/pubkey-enc.c:229
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "algoritma cipher %d%s tidak dikenal atau ditiadakan\n"
 
-#: g10/pubkey-enc.c:266
+#: g10/pubkey-enc.c:267
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "CATATAN: algoritma cipher %d tidak ditemukan dalam preferensi\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:287
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "CATATAN: kunci pribadi %08lX berakhir pada %s\n"
 
-#: g10/pubkey-enc.c:292
+#: g10/pubkey-enc.c:293
 msgid "NOTE: key has been revoked"
 msgstr "CATATAN: kunci telah dibatalkan"
 
-#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:545
+#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
+#: g10/revoke.c:188 g10/revoke.c:546
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet gagal: %s\n"
 
-#: g10/revoke.c:146
+#: g10/revoke.c:147
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
 
-#: g10/revoke.c:272
+#: g10/revoke.c:273
 msgid "To be revoked by:\n"
 msgstr "Akan dibatalkan oleh:\n"
 
-#: g10/revoke.c:276
+#: g10/revoke.c:277
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Ini adalah kunci pembatalan sensitif)\n"
 
-#: g10/revoke.c:280
+#: g10/revoke.c:281
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Buat sertifikat pembatalan untuk kunci ini?"
 
-#: g10/revoke.c:293 g10/revoke.c:511
+#: g10/revoke.c:294 g10/revoke.c:512
 msgid "ASCII armored output forced.\n"
 msgstr "Pemaksaan output mode ASCII.\n"
 
-#: g10/revoke.c:307 g10/revoke.c:525
+#: g10/revoke.c:308 g10/revoke.c:526
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "gagal make_keysig_packet: %s\n"
 
-#: g10/revoke.c:370
+#: g10/revoke.c:371
 msgid "Revocation certificate created.\n"
 msgstr "Sertifikat pembatalan tercipta.\n"
 
-#: g10/revoke.c:376
+#: g10/revoke.c:377
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "tidak ditemukan kunci pembatalan untuk `%s'\n"
 
-#: g10/revoke.c:432
+#: g10/revoke.c:433
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "kunci rahasia `%s' tidak ditemukan: %s\n"
 
-#: g10/revoke.c:461
+#: g10/revoke.c:462
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "tidak ada kunci publik yang sesuai: %s\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:473
 msgid "public key does not match secret key!\n"
 msgstr "kunci publik tidak cocok dengan kunci rahasia!\n"
 
-#: g10/revoke.c:479
+#: g10/revoke.c:480
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Buat sertifikat pembatalan untuk kunci ini?"
 
-#: g10/revoke.c:496
+#: g10/revoke.c:497
 msgid "unknown protection algorithm\n"
 msgstr "algoritma proteksi tidak dikenal\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 msgid "NOTE: This key is not protected!\n"
 msgstr "CATATAN: Kunci ini tidak diproteksi!\n"
 
-#: g10/revoke.c:551
+#: g10/revoke.c:552
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5123,171 +5177,171 @@ msgstr ""
 "pencetakan\n"
 "mesin anda mungkin menyimpan data dan menyediakannya untuk yang lain!\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid "Please select the reason for the revocation:\n"
 msgstr "Silakan pilih alasan untuk pembatalan:\n"
 
-#: g10/revoke.c:602
+#: g10/revoke.c:603
 msgid "Cancel"
 msgstr "Batal"
 
-#: g10/revoke.c:604
+#: g10/revoke.c:605
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Mungkin anda ingin memilih %d di sini)\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:646
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "Masukkan sebuah deskripsi opsional; akhiri dengan sebuah baris kosong:\n"
 
-#: g10/revoke.c:673
+#: g10/revoke.c:674
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Alasan pembatalan: %s\n"
 
-#: g10/revoke.c:675
+#: g10/revoke.c:676
 msgid "(No description given)\n"
 msgstr "(Tidak diberikan deskripsi)\n"
 
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Ini oke? "
 
-#: g10/seckey-cert.c:54
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "bagian kunci rahasia tidak tersedia\n"
 
-#: g10/seckey-cert.c:60
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "algoritma proteksi %d%s tidak didukung\n"
 
-#: g10/seckey-cert.c:71
+#: g10/seckey-cert.c:72
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "algoritma proteksi %d%s tidak didukung\n"
 
-#: g10/seckey-cert.c:265
+#: g10/seckey-cert.c:266
 msgid "Invalid passphrase; please try again"
 msgstr "Passphrase tidak valid; silakan coba lagi"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:267
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:326
+#: g10/seckey-cert.c:327
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "PERINGATAN: terdeteksi kunci lemah - silakan ubah passphrase lagi.\n"
 
-#: g10/seckey-cert.c:364
+#: g10/seckey-cert.c:365
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr "membuat checksum 16-bit terdepresiasi untuk proteksi kunci rahasia\n"
 
-#: g10/seskey.c:52
+#: g10/seskey.c:53
 msgid "weak key created - retrying\n"
 msgstr "kunci lemah tercipta - mengulang\n"
 
-#: g10/seskey.c:57
+#: g10/seskey.c:58
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "tidak dapat menghindari kunci lemah untuk cipher simetrik; mencoba %d kali!\n"
 
-#: g10/seskey.c:213
+#: g10/seskey.c:214
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA butuh penggunaan algoritma hash 160 bit\n"
 
-#: g10/sig-check.c:75
+#: g10/sig-check.c:76
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "Peringatan: konflik digest signature dalam pesan\n"
 
-#: g10/sig-check.c:99
+#: g10/sig-check.c:100
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "PERINGATAN: subkey penandatangan %08lX tidak tersertifikasi silang\n"
 
-#: g10/sig-check.c:102
+#: g10/sig-check.c:103
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "PERINGATAN: subkey penanda tangan %08lX memiliki sertifikasi silang yang "
 "tidak valid\n"
 
-#: g10/sig-check.c:168
+#: g10/sig-check.c:169
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "kunci publik %08lX adalah %lu detik lebih baru daripada signature\n"
 
-#: g10/sig-check.c:169
+#: g10/sig-check.c:170
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "kunci publik %08lX adalah %lu detik lebih baru daripada signature\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:181
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
 "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:183
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr ""
 "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:193
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "CATATAN: kunci signature %08lX berakhir %s\n"
 
-#: g10/sig-check.c:275
+#: g10/sig-check.c:276
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "mengasumsikan signature buruk dari kunci %08lX karena ada bit kritik tidak "
 "dikenal\n"
 
-#: g10/sig-check.c:532
+#: g10/sig-check.c:533
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "kunci %08lX: tidak ada subkey untuk pembatalan paket\n"
 
-#: g10/sig-check.c:558
+#: g10/sig-check.c:559
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "kunci %08lX: tidak ada subkey untuk key binding signature\n"
 
-#: g10/sign.c:85
+#: g10/sign.c:86
 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:93
+#: g10/sign.c:94
 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:112
+#: g10/sign.c:113
 #, 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:138
+#: g10/sign.c:139
 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:146
+#: g10/sign.c:147
 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:159
+#: g10/sign.c:160
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5295,7 +5349,7 @@ msgstr ""
 "PERINGATAN: tidak dapat melakukan %%-expand policy url (terlalu besar).  "
 "Menggunakan yang tidak expand.\n"
 
-#: g10/sign.c:187
+#: g10/sign.c:188
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5304,76 +5358,76 @@ msgstr ""
 "PERINGATAN: tidak dapat melakukan %%-expand policy url (terlalu besar).  "
 "Menggunakan yang tidak expand.\n"
 
-#: g10/sign.c:364
+#: g10/sign.c:365
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: g10/sign.c:373
+#: g10/sign.c:374
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s signature dari: \"%s\"\n"
 
-#: g10/sign.c:741
+#: g10/sign.c:761
 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:808
+#: g10/sign.c:830
 #, 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:900
+#: g10/sign.c:922
 msgid "signing:"
 msgstr "menandai:"
 
-#: g10/sign.c:1007
+#: g10/sign.c:1034
 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:1180
+#: g10/sign.c:1212
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s enkripsi akan digunakan\n"
 
-#: g10/skclist.c:126 g10/skclist.c:190
+#: g10/skclist.c:127 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "kunci tidak dianggap sebagai tidak aman - tidak dapat digunakan dengan RNG "
 "palsu!\n"
 
-#: g10/skclist.c:157
+#: g10/skclist.c:158
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "lewati `%s': terduplikasi\n"
 
-#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "melewati `%s': %s\n"
 
-#: g10/skclist.c:170
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/skclist.c:185
+#: g10/skclist.c:186
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "melewati `%s': ini adalah kunci ElGamal yang dihasilkan PGP yang tidak aman "
 "untuk signature!\n"
 
-#: g10/tdbdump.c:59 g10/trustdb.c:365
+#: g10/tdbdump.c:60 g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "trust record %lu, tipe %d: gagal menulis: %s\n"
 
-#: g10/tdbdump.c:104
+#: g10/tdbdump.c:105
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5382,347 +5436,347 @@ msgstr ""
 "# List of assigned trustvalues, created %s\n"
 "# (Use \"gpg --import-ownertrust\" to restore them)\n"
 
-#: g10/tdbdump.c:159 g10/tdbdump.c:167 g10/tdbdump.c:172 g10/tdbdump.c:177
+#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: g10/tdbdump.c:159
+#: g10/tdbdump.c:160
 #, fuzzy
 msgid "line too long"
 msgstr "baris terlalu panjang\n"
 
-#: g10/tdbdump.c:167
+#: g10/tdbdump.c:168
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:173
+#: g10/tdbdump.c:174
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/tdbdump.c:178
+#: g10/tdbdump.c:179
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr "impor nilai ownertrust"
 
-#: g10/tdbdump.c:214
+#: g10/tdbdump.c:215
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "kesalahan: gagal menemukan catatan trust: %s\n"
 
-#: g10/tdbdump.c:218
+#: g10/tdbdump.c:219
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "kesalahan pembacaan: %s\n"
 
-#: g10/tdbdump.c:227 g10/trustdb.c:380
+#: g10/tdbdump.c:228 g10/trustdb.c:381
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: gagal sync: %s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1440
+#: g10/tdbio.c:129 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek gagal: %s\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1447
+#: g10/tdbio.c:135 g10/tdbio.c:1448
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
 
-#: g10/tdbio.c:244
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "transaksi trustdb terlalu besar\n"
 
-#: g10/tdbio.c:497
+#: g10/tdbio.c:498
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "tidak dapat menutup `%s': %s\n"
 
-#: g10/tdbio.c:512
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: direktori tidak ada!\n"
 
-#: g10/tdbio.c:522 g10/tdbio.c:545 g10/tdbio.c:588
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/tdbio.c:524 g10/tdbio.c:591
+#: g10/tdbio.c:525 g10/tdbio.c:592
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
 
-#: g10/tdbio.c:550
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: gagal membuat catatan versi: %s"
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: tercipta trustdb tidak valid\n"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: tercipta trustdb\n"
 
-#: g10/tdbio.c:597
+#: g10/tdbio.c:598
 msgid "NOTE: trustdb not writable\n"
 msgstr "CATATAN: trustdb tidak dapat ditulisi\n"
 
-#: g10/tdbio.c:614
+#: g10/tdbio.c:615
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: trustdb tidak valid\n"
 
-#: g10/tdbio.c:646
+#: g10/tdbio.c:647
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: gagal membuat hashtable: %s\n"
 
-#: g10/tdbio.c:654
+#: g10/tdbio.c:655
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: kesalahan memperbaharui catatan versi: %s\n"
 
-#: g10/tdbio.c:671 g10/tdbio.c:691 g10/tdbio.c:707 g10/tdbio.c:721
-#: g10/tdbio.c:751 g10/tdbio.c:1373 g10/tdbio.c:1400
+#: g10/tdbio.c:672 g10/tdbio.c:692 g10/tdbio.c:708 g10/tdbio.c:722
+#: g10/tdbio.c:752 g10/tdbio.c:1374 g10/tdbio.c:1401
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: kesalahan membaca catatan versi: %s\n"
 
-#: g10/tdbio.c:730
+#: g10/tdbio.c:731
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: kesalahan menulis catatan versi: %s\n"
 
-#: g10/tdbio.c:1169
+#: g10/tdbio.c:1170
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek gagal: %s\n"
 
-#: g10/tdbio.c:1177
+#: g10/tdbio.c:1178
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/tdbio.c:1198
+#: g10/tdbio.c:1199
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: bukan file trustdb\n"
 
-#: g10/tdbio.c:1216
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: catatan versi dengan recnum %lu\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1222
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versi file %d tidak valid\n"
 
-#: g10/tdbio.c:1406
+#: g10/tdbio.c:1407
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: kesalahan membaca record bebas: %s\n"
 
-#: g10/tdbio.c:1414
+#: g10/tdbio.c:1415
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: kesalahan menulis dir record: %s\n"
 
-#: g10/tdbio.c:1424
+#: g10/tdbio.c:1425
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: gagal mengosongkan record: %s\n"
 
-#: g10/tdbio.c:1454
+#: g10/tdbio.c:1455
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: gagal menambahkan record: %s\n"
 
-#: g10/tdbio.c:1499
+#: g10/tdbio.c:1500
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "trustdb terkorupsi; silakan jalankan \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:147
+#: g10/textfilter.c:148
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "tidak dapat menangani baris teks lebih dari %d karakter\n"
 
-#: g10/textfilter.c:244
+#: g10/textfilter.c:245
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "baris input lebih dari %d karakter\n"
 
-#: g10/trustdb.c:226
+#: g10/trustdb.c:227
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "'%s' bukanlah keyID panjang yang valid\n"
 
-#: g10/trustdb.c:257
+#: g10/trustdb.c:258
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "kunci %08lX: diterima sebagai kunci terpercaya.\n"
 
-#: g10/trustdb.c:295
+#: g10/trustdb.c:296
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "kunci %08lX muncul lebih dari satu kali dalam trustdb\n"
 
-#: g10/trustdb.c:310
+#: g10/trustdb.c:311
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "kunci %08lX: tidak ada kunci publik untuk trusted key- dilewati\n"
 
-#: g10/trustdb.c:320
+#: g10/trustdb.c:321
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "kunci ditandai sebagai sangat dipercaya.\n"
 
-#: g10/trustdb.c:344
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "trust record %lu, req tipe %d: gagal baca: %s\n"
 
-#: g10/trustdb.c:350
+#: g10/trustdb.c:351
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "trust record %lu tidak dalam jenis yang diminta %d\n"
 
-#: g10/trustdb.c:446
+#: g10/trustdb.c:447
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:452
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:506
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[revoked] "
 
-#: g10/trustdb.c:508 g10/trustdb.c:513
+#: g10/trustdb.c:509 g10/trustdb.c:514
 #, fuzzy
 msgid "[ expired]"
 msgstr "[expired] "
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 #, fuzzy
 msgid "[ unknown]"
 msgstr "tidak dikenal"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 #, fuzzy
 msgid "never"
 msgstr "tidak pernah..."
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:536
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:576
+#: g10/trustdb.c:577
 msgid "no need for a trustdb check\n"
 msgstr "tidak perlu memeriksa trustdb\n"
 
-#: g10/trustdb.c:582 g10/trustdb.c:2157
+#: g10/trustdb.c:583 g10/trustdb.c:2309
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "pemeriksaan trustdb berikutnya pada %s\n"
 
-#: g10/trustdb.c:591
+#: 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:606
+#: 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:838 g10/trustdb.c:1276
+#: 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:1033
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr "lakukanlah --check-trustdb\n"
 
-#: g10/trustdb.c:1037
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "memeriksa trustdb\n"
 
-#: g10/trustdb.c:1901
+#: g10/trustdb.c:2053
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d kunci diproses (%d hitungan validitas dihapus)\n"
 
-#: g10/trustdb.c:1965
+#: g10/trustdb.c:2117
 msgid "no ultimately trusted keys found\n"
 msgstr "tidak ditemukan kunci yang benar-benar terpercaya\n"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:2131
 #, 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:2002
+#: g10/trustdb.c:2154
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2240
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2163
+#: g10/trustdb.c:2315
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "trust record %lu, tipe %d: gagal menulis: %s\n"
 
-#: g10/verify.c:116
+#: g10/verify.c:117
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -5732,305 +5786,336 @@ msgstr ""
 "Tolong ingat bahwa file signature (.sig atau .asc)\n"
 "haruslah file pertama yang diberikan pada perintah baris.\n"
 
-#: g10/verify.c:189
+#: g10/verify.c:190
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "baris input %u terlalu panjang atau hilang LF\n"
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "Kesalahan umum"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "tipe paket tidak dikenal"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "versi tidak dikenal"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "algoritma pubkey tidak dikenal"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "algoritma digest tidak dikenal"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "kunci publik yang buruk"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "kunci rahasia yang buruk"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "signature yang buruk"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "kesalahan checksum"
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "passphrase yang buruk"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "kunci publik tidak ditemukan"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "algoritma cipher tidak dikenal"
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "tidak dapat membuka keyring"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "paket tidak valid"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "armor tidak valid"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "tidak ada user id tsb"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "kunci rahasia tidak tersedia"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "digunakan kunci rahasia yang salah"
 
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "tidak didukung"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "kunci yang buruk"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "kesalahan baca file"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "kesalahan tulis file"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "algoritma kompresi tidak dikenal"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "kesalahan buka file"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "kesalahan buat file"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "passphrase tidak valid"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "algoritma pubkey belum diimplementasikan"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "algoritma cipher belum diimplementasikan"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "kelas signature tidak dikenal"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "kesalahan database trust"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "MPI yang buruk"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "batasan sumber daya"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "keyring tidak valid"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "sertifikat yang buruk"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "user id yang tidak benar"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "kesalahan tutup file"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "kesalahan ganti nama file"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "kesalahan hapus file"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "data tidak terduga"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "konflik timestamp"
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "algoritma pubkey tidak dapat digunakan"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "file ada"
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "kunci lemah"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "argumen tidak valid"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "URI yang buruk"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "URI tidak didukung"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "kesalahan jaringan"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "tidak dienkripsi"
 
-#: util/errors.c:103
+#: util/errors.c:104
 msgid "not processed"
 msgstr "tidak diproses"
 
-#: util/errors.c:105
+#: util/errors.c:106
 msgid "unusable public key"
 msgstr "kunci publik tidak dapat dipakai"
 
-#: util/errors.c:106
+#: util/errors.c:107
 msgid "unusable secret key"
 msgstr "kunci rahasia tidak dapat dipakai"
 
-#: util/errors.c:107
+#: util/errors.c:108
 msgid "keyserver error"
 msgstr "kesalahan keyserver"
 
-#: util/errors.c:108
+#: util/errors.c:109
 #, fuzzy
 msgid "canceled"
 msgstr "Batal"
 
-#: util/errors.c:109
+#: util/errors.c:110
 #, fuzzy
 msgid "no card"
 msgstr "tidak dienkripsi"
 
-#: util/logger.c:157
+#: util/logger.c:158
 msgid "ERROR: "
 msgstr ""
 
-#: util/logger.c:160
+#: util/logger.c:161
 msgid "WARNING: "
 msgstr ""
 
-#: util/logger.c:223
+#: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... kesalahan (%s:%d:%s)\n"
 
-#: util/logger.c:229
+#: util/logger.c:230
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "anda menemukan kesalahan ...(%s:%d)\n"
 
-#: util/miscutil.c:336 util/miscutil.c:373
+#: util/miscutil.c:330 util/miscutil.c:367
 msgid "yes"
 msgstr "y|ya"
 
-#: util/miscutil.c:337 util/miscutil.c:378
+#: util/miscutil.c:331 util/miscutil.c:372
 msgid "yY"
 msgstr "yY"
 
-#: util/miscutil.c:339 util/miscutil.c:375
+#: util/miscutil.c:333 util/miscutil.c:369
 msgid "no"
 msgstr "n|t|tidak"
 
-#: util/miscutil.c:340 util/miscutil.c:379
+#: util/miscutil.c:334 util/miscutil.c:373
 msgid "nN"
 msgstr "tT"
 
-#: util/miscutil.c:377
+#: util/miscutil.c:371
 msgid "quit"
 msgstr "q|k|keluar"
 
-#: util/miscutil.c:380
+#: util/miscutil.c:374
 msgid "qQ"
 msgstr "kK"
 
-#: util/miscutil.c:413
+#: util/miscutil.c:407
 msgid "okay|okay"
 msgstr ""
 
-#: util/miscutil.c:415
+#: util/miscutil.c:409
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:416
+#: util/miscutil.c:410
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:417
+#: util/miscutil.c:411
 #, fuzzy
 msgid "cC"
 msgstr "c"
 
-#: util/secmem.c:90
+#: util/secmem.c:91
 msgid "WARNING: using insecure memory!\n"
 msgstr "Peringatan: menggunakan memori yang tidak aman!\n"
 
-#: util/secmem.c:91
+#: util/secmem.c:92
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr ""
 "silakan lihat http://www.gnupg.org/faq.html untuk informasi lebih lanjut\n"
 
-#: util/secmem.c:343
+#: util/secmem.c:344
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operasi tidak mungkin tanpa menginisialisasi memori yang aman\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:345
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(anda mungkin menggunakan program yang salah untuk tugas ini)\n"
 
+#, fuzzy
+#~ msgid "error getting serial number: %s\n"
+#~ msgstr "kesalahan penciptaan passphrase: %s\n"
+
+#~ msgid "Hint: Select the user IDs to sign\n"
+#~ msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
+
+#~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+#~ msgstr "passphrase jelek atau algoritma cipher (%d) tidak dikenal\n"
+
+#~ msgid "can't set client pid for the agent\n"
+#~ msgstr "tidak dapat menset pid client untuk agen\n"
+
+#~ msgid "can't get server read FD for the agent\n"
+#~ msgstr "tidak dapat membuat server membaca FD untuk agen\n"
+
+#~ msgid "can't get server write FD for the agent\n"
+#~ msgstr "tidak dapat membuat server menulis FD untuk agen\n"
+
+#~ msgid "communication problem with gpg-agent\n"
+#~ msgstr "masalah komunikasi dengan gpg-agent\n"
+
+#~ msgid "passphrase too long\n"
+#~ msgstr "passphrase terlalu panjang\n"
+
+#~ msgid "invalid response from agent\n"
+#~ msgstr "respon tidak valid dari agen\n"
+
+#~ msgid "problem with the agent: agent returns 0x%lx\n"
+#~ msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
+
 #~ msgid "select secondary key N"
 #~ msgstr "pilih kunci sekunder N"
 
diff --git a/po/it.po b/po/it.po
index e605c9ef9..b43c0804e 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: 2005-03-15 16:35+0100\n"
+"POT-Creation-Date: 2005-05-31 10:05+0200\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"
@@ -14,82 +14,82 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:120
+#: cipher/primegen.c:121
 #, fuzzy, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr "impossibile generare un numero primo di meno di %d bit\n"
 
-#: cipher/primegen.c:311
+#: cipher/primegen.c:312
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "impossibile generare un numero primo di meno di %d bit\n"
 
-#: cipher/random.c:163
+#: cipher/random.c:164
 msgid "no entropy gathering module detected\n"
 msgstr "non � stato trovato il modulo per raccogliere l'entropia\n"
 
-#: cipher/random.c:387 g10/card-util.c:656 g10/card-util.c:725
-#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2255
-#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
-#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
-#: g10/tdbio.c:600
+#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
+#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
+#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
+#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
+#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/tdbio.c:601
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: cipher/random.c:391
+#: cipher/random.c:392
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "impossibile eseguire stat su `%s': %s\n"
 
-#: cipher/random.c:396
+#: cipher/random.c:397
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' non � un file regolare - ignorato\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:402
 msgid "note: random_seed file is empty\n"
 msgstr "nota: il file random_seed � vuoto\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:408
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "ATTENZIONE: le dimensioni del file random_seed non sono valide - non usato\n"
 
-#: cipher/random.c:415
+#: cipher/random.c:416
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "impossibile leggere `%s': %s\n"
 
-#: cipher/random.c:453
+#: cipher/random.c:454
 msgid "note: random_seed file not updated\n"
 msgstr "nota: il file random_seed non � stato aggiornato\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2723
-#: g10/keygen.c:2753 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
-#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossibile creare `%s': %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:481
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "impossibile scrivere su `%s': %s\n"
 
-#: cipher/random.c:483
+#: cipher/random.c:484
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "impossibile chiudere `%s': %s\n"
 
-#: cipher/random.c:728
+#: cipher/random.c:729
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "ATTENZIONE: si sta usando un generatore di numeri casuali non sicuro!!\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:730
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -103,7 +103,7 @@ msgstr ""
 "NON USARE ALCUN DATO GENERATO DA QUESTO PROGRAMMA!\n"
 "\n"
 
-#: cipher/rndegd.c:204
+#: cipher/rndegd.c:205
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -113,7 +113,7 @@ msgstr ""
 "po',\n"
 "visto che questo migliorer� la qualit� dell'entropia.\n"
 
-#: cipher/rndlinux.c:134
+#: cipher/rndlinux.c:135
 #, c-format
 msgid ""
 "\n"
@@ -125,45 +125,62 @@ msgstr ""
 "altra cosa per dare all'OS la possibilit� di raccogliere altra entropia!\n"
 "(Servono altri %d byte)\n"
 
-#: g10/app-openpgp.c:547
+#: g10/app-openpgp.c:596
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/app-openpgp.c:560
+#: g10/app-openpgp.c:609
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "rebuild della cache del portachiavi fallito: %s\n"
 
-#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
+#: g10/app-openpgp.c:977
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "cancellazione del keyblock fallita: %s\n"
+
+#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+msgid "response does not contain the public key data\n"
+msgstr ""
+
+#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
-#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
+#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
+#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
 
-#: g10/app-openpgp.c:836
+#: g10/app-openpgp.c:1310
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:857
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:862
+#: g10/app-openpgp.c:1336
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -171,355 +188,360 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:869
+#: g10/app-openpgp.c:1343
 msgid "|A|Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1018
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:1492
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1018
+#: g10/app-openpgp.c:1492
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1022
+#: g10/app-openpgp.c:1496
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
+#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "errore leggendo il keyblock: %s\n"
 
-#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
+#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: errore durante la lettura del record libero: %s\n"
 
-#: g10/app-openpgp.c:1104
+#: g10/app-openpgp.c:1562
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' � gi� compresso\n"
 
-#: g10/app-openpgp.c:1108
+#: g10/app-openpgp.c:1566
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1110
+#: g10/app-openpgp.c:1568
 #, fuzzy
 msgid "generating new key\n"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/app-openpgp.c:1120
+#: g10/app-openpgp.c:1735
+msgid "creation timestamp missing\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1742
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1749
+#, c-format
+msgid "RSA public exponent missing or largerr than %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1827
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "inizializzazione del trustdb fallita: %s\n"
+
+#: g10/app-openpgp.c:1886
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1135
+#: g10/app-openpgp.c:1901
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1904
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
-msgid "response does not contain the public key data\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
-msgid "response does not contain the RSA modulus\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
-msgid "response does not contain the RSA public exponent\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1195
+#: g10/app-openpgp.c:1961
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1356
+#: g10/app-openpgp.c:2130
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1364
+#: g10/app-openpgp.c:2138
 #, c-format
-msgid "PIN [sigs done: %lu]"
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
+#: g10/app-openpgp.c:2399
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
 
-#: g10/app-openpgp.c:1731
-#, fuzzy, c-format
-msgid "error getting serial number: %s\n"
-msgstr "errore nella creazione della passhprase: %s\n"
-
-#: g10/app-openpgp.c:1826
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "inizializzazione del trustdb fallita: %s\n"
-
-#: g10/app-openpgp.c:1868
-#, fuzzy
-msgid "reading the key failed\n"
-msgstr "cancellazione del keyblock fallita: %s\n"
-
-#: g10/armor.c:317
+#: g10/armor.c:318
 #, c-format
 msgid "armor: %s\n"
 msgstr "armatura: %s\n"
 
-#: g10/armor.c:346
+#: g10/armor.c:347
 msgid "invalid armor header: "
 msgstr "header dell'armatura non valido: "
 
-#: g10/armor.c:353
+#: g10/armor.c:354
 msgid "armor header: "
 msgstr "header dell'armatura: "
 
-#: g10/armor.c:364
+#: g10/armor.c:365
 msgid "invalid clearsig header\n"
 msgstr "header della firma in chiaro non valido\n"
 
-#: g10/armor.c:416
+#: g10/armor.c:417
 msgid "nested clear text signatures\n"
 msgstr "firme in chiaro annidate\n"
 
-#: g10/armor.c:551
+#: g10/armor.c:552
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "armatura inaspettata:"
 
-#: g10/armor.c:563
+#: g10/armor.c:564
 msgid "invalid dash escaped line: "
 msgstr "riga protetta con il trattino non valida: "
 
-#: g10/armor.c:715 g10/armor.c:1322
+#: g10/armor.c:716 g10/armor.c:1323
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "Carattere radix64 non valido %02x saltato\n"
 
-#: g10/armor.c:758
+#: g10/armor.c:759
 msgid "premature eof (no CRC)\n"
 msgstr "eof prematura (nessun CRC)\n"
 
-#: g10/armor.c:792
+#: g10/armor.c:793
 msgid "premature eof (in CRC)\n"
 msgstr "eof prematura (nel CRC)\n"
 
-#: g10/armor.c:800
+#: g10/armor.c:801
 msgid "malformed CRC\n"
 msgstr "CRC malformato\n"
 
-#: g10/armor.c:804 g10/armor.c:1359
+#: g10/armor.c:805 g10/armor.c:1360
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "errore nel CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:824
+#: g10/armor.c:825
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "eof prematura (nella coda)\n"
 
-#: g10/armor.c:828
+#: g10/armor.c:829
 msgid "error in trailer line\n"
 msgstr "errore nella riga della coda\n"
 
-#: g10/armor.c:1137
+#: g10/armor.c:1138
 msgid "no valid OpenPGP data found.\n"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
 
-#: g10/armor.c:1142
+#: g10/armor.c:1143
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armatura non valida: linea pi� lunga di %d caratteri\n"
 
-#: g10/armor.c:1146
+#: g10/armor.c:1147
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "carattere quoted printable nell'armatura - probabilmente � stato usato\n"
 "un MTA buggato\n"
 
-#: g10/card-util.c:58 g10/card-util.c:295
+#: g10/card-util.c:63 g10/card-util.c:303
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "la chiave segreta non � disponibile"
 
-#: g10/card-util.c:63
+#: g10/card-util.c:68
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1329 g10/delkey.c:127 g10/keyedit.c:1430
-#: g10/keygen.c:2439 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1510
+#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "impossibile fare questo in modo batch\n"
 
-#: g10/card-util.c:97 g10/card-util.c:1108 g10/card-util.c:1191
-#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
-#: g10/keygen.c:1365
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
+#: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "Cosa scegli? "
 
-#: g10/card-util.c:206 g10/card-util.c:256
+#: g10/card-util.c:213 g10/card-util.c:263
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:391
+#: g10/card-util.c:410
 #, fuzzy
 msgid "male"
 msgstr "abilita"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 #, fuzzy
 msgid "female"
 msgstr "abilita"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 #, fuzzy
 msgid "unspecified"
 msgstr "Nessuna ragione specificata"
 
 # ??? (Md)
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 #, fuzzy
 msgid "not forced"
 msgstr "non esaminato"
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:497
+#: g10/card-util.c:516
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:499
+#: g10/card-util.c:518
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:501
+#: g10/card-util.c:520
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:518
+#: g10/card-util.c:537
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:539
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:538
+#: g10/card-util.c:557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:559
+#: g10/card-util.c:578
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "non c'� una chiave pubblica corrispondente: %s\n"
 
-#: g10/card-util.c:567
+#: g10/card-util.c:586
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:665 g10/card-util.c:734 g10/import.c:261
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:692
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:683
+#: g10/card-util.c:702
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:742
+#: g10/card-util.c:761
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:752
+#: g10/card-util.c:771
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:772
+#: g10/card-util.c:791
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferenze aggiornate"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:799
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "carattere non valido nella stringa delle preferenze\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:808
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "carattere non valido nella stringa delle preferenze\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:829
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:824
+#: g10/card-util.c:843
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "errore: impronta digitale non valida\n"
 
-#: g10/card-util.c:845
+#: g10/card-util.c:864
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "mostra le impronte digitali"
 
-#: g10/card-util.c:868
+#: g10/card-util.c:887
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "errore: impronta digitale non valida\n"
 
-#: g10/card-util.c:916
+#: g10/card-util.c:935
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/card-util.c:917
+#: g10/card-util.c:936
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
 
-#: g10/card-util.c:926
+#: g10/card-util.c:945
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1030
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1030 g10/card-util.c:1039
+#: g10/card-util.c:1051 g10/card-util.c:1060
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1051
+#: g10/card-util.c:1072
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1060
+#: g10/card-util.c:1081
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -527,279 +549,283 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1099
+#: g10/card-util.c:1120
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Per favore scegli che tipo di chiave vuoi:\n"
 
-#: g10/card-util.c:1101 g10/card-util.c:1182
+#: g10/card-util.c:1122 g10/card-util.c:1203
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Firma scaduta il %s\n"
 
-#: g10/card-util.c:1102 g10/card-util.c:1184
+#: g10/card-util.c:1123 g10/card-util.c:1205
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/card-util.c:1103 g10/card-util.c:1186
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1119 g10/card-util.c:1202 g10/keyedit.c:908
-#: g10/keygen.c:1404 g10/revoke.c:642
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
+#: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "Scelta non valida.\n"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1200
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Per favore scegli il motivo della revoca:\n"
 
-#: g10/card-util.c:1214
+#: g10/card-util.c:1235
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo di protezione sconosciuto\n"
 
-#: g10/card-util.c:1219
+#: g10/card-util.c:1240
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/card-util.c:1224
+#: g10/card-util.c:1245
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
 
-#: g10/card-util.c:1294 g10/keyedit.c:1317
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "abbandona questo men�"
 
-#: g10/card-util.c:1296
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1297 g10/keyedit.c:1320
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "mostra questo aiuto"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "list all available data"
 msgstr "Chiave disponibile presso: "
 
-#: g10/card-util.c:1302
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1303
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1304
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1305
+#: g10/card-util.c:1327
 #, fuzzy
 msgid "change the login name"
 msgstr "cambia la data di scadenza"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the language preferences"
 msgstr "cambia il valore di fiducia"
 
-#: g10/card-util.c:1307
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1308
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra le impronte digitali"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1310
+#: g10/card-util.c:1332
 #, fuzzy
 msgid "generate new keys"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1377 g10/keyedit.c:1526
+#: g10/card-util.c:1334
+msgid "verify the PIN and list all data"
+msgstr ""
+
+#: g10/card-util.c:1454 g10/keyedit.c:1609
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1412
+#: g10/card-util.c:1492
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1430
+#: g10/card-util.c:1525
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/card-util.c:1499 g10/keyedit.c:2104
+#: g10/card-util.c:1599 g10/keyedit.c:2210
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando non valido  (prova \"help\")\n"
 
-#: g10/cardglue.c:287
+#: g10/cardglue.c:396
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:519
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:380
+#: g10/cardglue.c:527
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:852
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:853
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:854
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:691
+#: g10/cardglue.c:855
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:705
+#: g10/cardglue.c:872
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Ripeti la passphrase: "
 
-#: g10/cardglue.c:719
+#: g10/cardglue.c:886
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "passphrase non ripetuta correttamente; prova ancora"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
-#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
 
-#: g10/decrypt.c:104 g10/encode.c:859
+#: g10/decrypt.c:105 g10/encode.c:846
 msgid "--output doesn't work for this command\n"
 msgstr "--output non funziona con questo comando\n"
 
-#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3167 g10/keyserver.c:1511
-#: g10/revoke.c:226
+#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3346 g10/keyserver.c:1541
+#: g10/revoke.c:227
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2300 g10/keyserver.c:1525
-#: g10/revoke.c:232 g10/revoke.c:439
+#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "errore leggendo il keyblock: %s\n"
 
-#: g10/delkey.c:128 g10/delkey.c:135
+#: g10/delkey.c:129 g10/delkey.c:136
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(a meno che la chiave sia specificata con il fingerprint)\n"
 
-#: g10/delkey.c:134
+#: g10/delkey.c:135
 #, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "impossibile fare questo in modo batch senza \"--yes\"\n"
 
-#: g10/delkey.c:146
+#: g10/delkey.c:147
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Vuoi cancellare questa chiave dal portachiavi? "
 
-#: g10/delkey.c:154
+#: g10/delkey.c:155
 #, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "� una chiave segreta! - Vuoi cancellarla davvero? "
 
-#: g10/delkey.c:164
+#: g10/delkey.c:165
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: g10/delkey.c:174
+#: g10/delkey.c:175
 msgid "ownertrust information cleared\n"
 msgstr "informazioni di fiducia del possessore cancellate\n"
 
-#: g10/delkey.c:205
+#: g10/delkey.c:206
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "c'� una chiave segreta per la chiave pubblica \"%s\"!\n"
 
-#: g10/delkey.c:207
+#: g10/delkey.c:208
 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:210 g10/sign.c:1186
+#: g10/encode.c:211 g10/sign.c:1218
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: g10/encode.c:215
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 "impossibile usare un pacchetto ESK simmetrico a causa della modalit� S2K\n"
 
-#: g10/encode.c:228
+#: g10/encode.c:229
 #, c-format
 msgid "using cipher %s\n"
 msgstr "uso il cifrario %s\n"
 
-#: g10/encode.c:238 g10/encode.c:558
+#: g10/encode.c:239 g10/encode.c:545
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' � gi� compresso\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
+#: g10/encode.c:302 g10/encode.c:591 g10/sign.c:566
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATTENZIONE: `%s' � un file vuoto\n"
 
-#: g10/encode.c:472
+#: g10/encode.c:466
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "in modalit� --pgp2 puoi cifrare solo per chiavi RSA non pi� lunghe di 2048 "
 "bit\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:488
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lettura da `%s'\n"
 
-#: g10/encode.c:530
+#: g10/encode.c:517
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "impossibile usare il cifrario IDEA con tutti i tipi di chiavi per cui\n"
 "stai cifrando.\n"
 
-#: g10/encode.c:540
+#: g10/encode.c:527
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -807,7 +833,7 @@ msgstr ""
 "forzare il cifrario simmetrico %s (%d) viola le preferenze\n"
 "del destinatario\n"
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:635 g10/sign.c:899
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -816,130 +842,130 @@ msgstr ""
 "forzare l'algoritmo di compressione %s (%d) viola le preferenze\n"
 "del destinatario\n"
 
-#: g10/encode.c:735
+#: g10/encode.c:722
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forzare il cifrario simmetrico %s (%d) viola le preferenze\n"
 "del destinatario\n"
 
-#: g10/encode.c:805 g10/pkclist.c:721 g10/pkclist.c:757
+#: g10/encode.c:792 g10/pkclist.c:722 g10/pkclist.c:758
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "non � possibile usare %s in modalit� %s\n"
 
-#: g10/encode.c:832
+#: g10/encode.c:819
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrato per: \"%s\"\n"
 
-#: g10/encr-data.c:66 g10/mainproc.c:301
+#: g10/encr-data.c:67 g10/mainproc.c:302
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dati cifrati con %s\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:305
+#: g10/encr-data.c:69 g10/mainproc.c:306
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrato con l'algoritmo sconosciuto %d\n"
 
-#: g10/encr-data.c:92
+#: g10/encr-data.c:93
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ATTENZIONE: il messaggio era stato cifrato usando una chiave debole\n"
 "per il cifrario simmetrico\n"
 
-#: g10/encr-data.c:103
+#: g10/encr-data.c:104
 msgid "problem handling encrypted packet\n"
 msgstr "problema nella gestione del pacchetto cifrato\n"
 
-#: g10/exec.c:48
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "l'esecuzione remota dei programmi non � gestita\n"
 
-#: g10/exec.c:184 g10/openfile.c:406
+#: g10/exec.c:173 g10/openfile.c:410
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "impossibile creare la directory `%s': %s\n"
 
-#: g10/exec.c:325
+#: g10/exec.c:314
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "le chiamate a programmi esterni sono disattivate a causa dei permessi non\n"
 "sicuri del file delle opzioni\n"
 
-#: g10/exec.c:355
+#: g10/exec.c:344
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "questa piattaforma richiede file temporanei quando si chiamano programmi "
 "esterni\n"
 
-#: g10/exec.c:433
+#: g10/exec.c:422
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "impossibile eseguire %s \"%s\": %s\n"
 
-#: g10/exec.c:436
+#: g10/exec.c:425
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "impossibile eseguire %s \"%s\": %s\n"
 
-#: g10/exec.c:521
+#: g10/exec.c:510
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "errore di sistema chiamando il programma esterno: %s\n"
 
-#: g10/exec.c:532 g10/exec.c:598
+#: g10/exec.c:521 g10/exec.c:587
 msgid "unnatural exit of external program\n"
 msgstr "uscita anormale del programma esterno\n"
 
-#: g10/exec.c:547
+#: g10/exec.c:536
 msgid "unable to execute external program\n"
 msgstr "impossibile eseguire il programma esterno\n"
 
-#: g10/exec.c:563
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "impossibile leggere la risposta del programma esterno: %s\n"
 
-#: g10/exec.c:609 g10/exec.c:616
+#: g10/exec.c:598 g10/exec.c:605
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
 
-#: g10/exec.c:621
+#: g10/exec.c:610
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "ATTENZIONE: impossibile rimuovere la directory temporanea `%s': %s\n"
 
-#: g10/export.c:183
+#: g10/export.c:184
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/export.c:212
+#: g10/export.c:213
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "chiave %08lX: non protetta - saltata\n"
 
-#: g10/export.c:220
+#: g10/export.c:221
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "chiave %08lX: chiave in stile PGP 2.x - saltata\n"
 
-#: g10/export.c:395
+#: g10/export.c:398
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "ATTENZIONE: la chiave segreta %08lX non ha un checksum SK semplice\n"
 
-#: g10/export.c:427
+#: g10/export.c:430
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENZIONE: non � stato esportato nulla\n"
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid ""
 "@Commands:\n"
 " "
@@ -947,128 +973,128 @@ msgstr ""
 "@Comandi:\n"
 " "
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "|[file]|make a signature"
 msgstr "|[file]|fai una firma"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "make a detached signature"
 msgstr "fai una firma separata"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encrypt data"
 msgstr "cifra dati"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "encryption only with symmetric cipher"
 msgstr "cifra solo con un cifrario simmetrico"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "decrypt data (default)"
 msgstr "decifra dati (predefinito)"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys"
 msgstr "elenca le chiavi"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and signatures"
 msgstr "elenca le chiavi e le firme"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "controlla le firme delle chiavi"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "list keys and fingerprints"
 msgstr "elenca le chiavi e le impronte digitali"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "list secret keys"
 msgstr "elenca le chiavi segrete"
 
-#: g10/g10.c:379
+#: g10/g10.c:381
 msgid "generate a new key pair"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the public keyring"
 msgstr "rimuove le chiavi dal portachiavi pubblico"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "remove keys from the secret keyring"
 msgstr "rimuove le chiavi dal portachiavi privato"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign a key"
 msgstr "firma una chiave"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "sign a key locally"
 msgstr "firma una chiave localmente"
 
-#: g10/g10.c:385
+#: g10/g10.c:387
 msgid "sign or edit a key"
 msgstr "firma o modifica una chiave"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "generate a revocation certificate"
 msgstr "genera un certificato di revoca"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/g10.c:389
+#: g10/g10.c:391
 msgid "export keys to a key server"
 msgstr "esporta le chiavi a un key server"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "import keys from a key server"
 msgstr "importa le chiavi da un key server"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "search for keys on a key server"
 msgstr "cerca delle chiavi su un key server"
 
-#: g10/g10.c:394
+#: g10/g10.c:396
 msgid "update all keys from a keyserver"
 msgstr "aggiorna tutte le chiavi da un key server"
 
-#: g10/g10.c:397
+#: g10/g10.c:399
 msgid "import/merge keys"
 msgstr "importa/aggiungi delle chiavi"
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "print the card status"
 msgstr ""
 
-#: g10/g10.c:401
+#: g10/g10.c:403
 msgid "change data on a card"
 msgstr ""
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/g10.c:410
+#: g10/g10.c:412
 msgid "update the trust database"
 msgstr "aggiorna il database della fiducia"
 
-#: g10/g10.c:417
+#: g10/g10.c:419
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|stampa tutti i message digests"
 
-#: g10/g10.c:421 g10/gpgv.c:66
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1078,51 +1104,51 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/g10.c:425
+#: g10/g10.c:427
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifra per NOME"
 
-#: g10/g10.c:436
+#: g10/g10.c:438
 msgid "use this user-id to sign or decrypt"
 msgstr "usa questo user-id per firmare o decifrare"
 
-#: g10/g10.c:437
+#: g10/g10.c:439
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|imposta il livello di compressione (0 disab.)"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/g10.c:452
+#: g10/g10.c:458
 msgid "use as output file"
 msgstr "usa come file di output"
 
-#: g10/g10.c:454 g10/gpgv.c:68
+#: g10/g10.c:460 g10/gpgv.c:73
 msgid "verbose"
 msgstr "prolisso"
 
-#: g10/g10.c:465
+#: g10/g10.c:471
 msgid "do not make any changes"
 msgstr "non fa cambiamenti"
 
-#: g10/g10.c:466
+#: g10/g10.c:472
 msgid "prompt before overwriting"
 msgstr "chiede prima di sovrascrivere"
 
-#: g10/g10.c:507
+#: g10/g10.c:513
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:508
+#: g10/g10.c:514
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:536
+#: g10/g10.c:542
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1130,7 +1156,7 @@ msgstr ""
 "@\n"
 "(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
 
-#: g10/g10.c:539
+#: g10/g10.c:545
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1150,15 +1176,15 @@ msgstr ""
 " --list-keys [nomi]         mostra le chiavi\n"
 " --fingerprint [nomi]       mostra le impronte digitali\n"
 
-#: g10/g10.c:720 g10/gpgv.c:93
+#: g10/g10.c:724 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Per favore segnala i bug a <[email protected]>.\n"
 
-#: g10/g10.c:737
+#: g10/g10.c:741
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: g10/g10.c:740
+#: g10/g10.c:744
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1168,7 +1194,7 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/g10.c:751
+#: g10/g10.c:755
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1176,464 +1202,474 @@ msgstr ""
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/g10.c:754
+#: g10/g10.c:758
 msgid "Pubkey: "
 msgstr "A chiave pubblica: "
 
-#: g10/g10.c:760 g10/keyedit.c:2141
+#: g10/g10.c:764 g10/keyedit.c:2248
 msgid "Cipher: "
 msgstr "Cifrari: "
 
-#: g10/g10.c:766
+#: g10/g10.c:770
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:772 g10/keyedit.c:2187
+#: g10/g10.c:776 g10/keyedit.c:2294
 msgid "Compression: "
 msgstr "Compressione: "
 
-#: g10/g10.c:855
+#: g10/g10.c:859
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: g10/g10.c:1003
+#: g10/g10.c:1007
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/g10.c:1021
+#: g10/g10.c:1025
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "non � stato trovato il segno = nella definizione del gruppo \"%s\"\n"
 
-#: g10/g10.c:1218
+#: g10/g10.c:1222
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/g10.c:1221
+#: g10/g10.c:1225
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/g10.c:1224
+#: g10/g10.c:1228
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/g10.c:1230
+#: g10/g10.c:1234
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/g10.c:1233
+#: g10/g10.c:1237
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1240
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/g10.c:1242
+#: g10/g10.c:1246
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/g10.c:1245
+#: g10/g10.c:1249
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/g10.c:1248
+#: g10/g10.c:1252
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1258
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/g10.c:1257
+#: g10/g10.c:1261
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/g10.c:1260
+#: g10/g10.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/g10.c:1401
+#: g10/g10.c:1405
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "elemento della configurazione sconosciuto \"%s\"\n"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1802
 #, 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/g10.c:1838
+#: g10/g10.c:1844
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
 
-#: g10/g10.c:1842
+#: g10/g10.c:1848
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: g10/g10.c:1849
+#: g10/g10.c:1855
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s normalmente non deve essere usato!\n"
 
-#: g10/g10.c:2076
+#: g10/g10.c:2082
 #, 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/g10.c:2293
+#: g10/g10.c:2236 g10/g10.c:2248
+#, fuzzy, c-format
+msgid "`%s' is not a valid signature expiration\n"
+msgstr "%s non � un set di caratteri valido\n"
+
+#: g10/g10.c:2321
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3683
+#: g10/g10.c:2340 g10/keyedit.c:3862
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2346
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2349
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2356
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2359
 msgid "invalid import options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2366
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2369
 msgid "invalid export options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2376
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2379
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2401
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2404
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2411
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossibile impostare exec-path a %s\n"
 
-#: g10/g10.c:2573
+#: g10/g10.c:2602
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2606
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2615
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non � permesso usare %s con %s!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2618
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/g10.c:2603
+#: g10/g10.c:2625
+#, fuzzy, c-format
+msgid "NOTE: %s is not available in this version\n"
+msgstr "gpg-agent non � disponibile in questa sessione\n"
+
+#: g10/g10.c:2640
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/g10.c:2617
+#: g10/g10.c:2654
 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/g10.c:2623
+#: g10/g10.c:2660
 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/g10.c:2629
+#: g10/g10.c:2666
 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/g10.c:2642
+#: g10/g10.c:2679
 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/g10.c:2712 g10/g10.c:2736
+#: g10/g10.c:2746 g10/g10.c:2770
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/g10.c:2718 g10/g10.c:2742
+#: g10/g10.c:2752 g10/g10.c:2776
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/g10.c:2724
+#: g10/g10.c:2758
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2764
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/g10.c:2745
+#: g10/g10.c:2779
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/g10.c:2747
+#: g10/g10.c:2781
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2783
 #, 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/g10.c:2751
+#: g10/g10.c:2785
 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/g10.c:2753
+#: g10/g10.c:2787
 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/g10.c:2756
+#: g10/g10.c:2790
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: l'uso del modo S2K semplice (0) � fortemente scoraggiato\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2794
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non valido; deve essere 0, 1 o 3\n"
 
-#: g10/g10.c:2767
+#: g10/g10.c:2801
 msgid "invalid default preferences\n"
 msgstr "preferenze predefinite non valide\n"
 
-#: g10/g10.c:2776
+#: g10/g10.c:2810
 msgid "invalid personal cipher preferences\n"
 msgstr "preferenze personali del cifrario non valide\n"
 
-#: g10/g10.c:2780
+#: g10/g10.c:2814
 msgid "invalid personal digest preferences\n"
 msgstr "preferenze personali del digest non valide\n"
 
-#: g10/g10.c:2784
+#: g10/g10.c:2818
 msgid "invalid personal compress preferences\n"
 msgstr "preferenze personali di compressione non valide\n"
 
-#: g10/g10.c:2817
+#: g10/g10.c:2851
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s non funziona ancora con %s\n"
 
-#: g10/g10.c:2864
+#: g10/g10.c:2898
 #, 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/g10.c:2869
+#: g10/g10.c:2903
 #, 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/g10.c:2874
+#: g10/g10.c:2908
 #, 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/g10.c:2970
+#: g10/g10.c:3004
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/g10.c:2981
+#: g10/g10.c:3015
 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/g10.c:2992
+#: g10/g10.c:3026
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/g10.c:2999
+#: g10/g10.c:3033
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3035
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/g10.c:3011
+#: g10/g10.c:3045
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/g10.c:3024
+#: g10/g10.c:3058
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3060
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3029
+#: g10/g10.c:3063
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "non � possibile usare %s in modalit� %s\n"
 
-#: g10/g10.c:3047
+#: g10/g10.c:3081
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3094
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/g10.c:3075
+#: g10/g10.c:3109
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/g10.c:3077
+#: g10/g10.c:3111
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3080
+#: g10/g10.c:3114
 #, 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/g10.c:3100
+#: g10/g10.c:3134
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nomefile]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3143
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3168
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/g10.c:3142
+#: g10/g10.c:3176
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:3146
+#: g10/g10.c:3180
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:3167
+#: g10/g10.c:3201
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/g10.c:3238
+#: g10/g10.c:3272
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [portachiavi]"
 
-#: g10/g10.c:3275
+#: g10/g10.c:3309
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
 
-#: g10/g10.c:3277
+#: g10/g10.c:3311
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3313
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "esportazione della chiave fallita: %s\n"
 
-#: g10/g10.c:3290
+#: g10/g10.c:3324
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ricerca nel keyserver fallita: %s\n"
 
-#: g10/g10.c:3300
+#: g10/g10.c:3334
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aggiornamento del keyserver fallito: %s\n"
 
-#: g10/g10.c:3341
+#: g10/g10.c:3375
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:3349
+#: g10/g10.c:3383
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:3436
+#: g10/g10.c:3470
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/g10.c:3559
+#: g10/g10.c:3593
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3597
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/g10.c:3853
+#: g10/g10.c:3887
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1641,78 +1677,83 @@ msgstr ""
 "il nome di una nota deve essere formato solo da caratteri stampabili o\n"
 "spazi e terminare con un '='\n"
 
-#: g10/g10.c:3861
+#: g10/g10.c:3895
 msgid "a user notation name must contain the '@' character\n"
 msgstr "il valore di una nota dell'utente deve contenere il carattere '@'\n"
 
-#: g10/g10.c:3871
+#: g10/g10.c:3900
+#, 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/g10.c:3911
 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/g10.c:3905
+#: g10/g10.c:3945
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL della politica di certificazione indicato non � valido\n"
 
-#: g10/g10.c:3907
+#: g10/g10.c:3947
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/g10.c:3940
+#: g10/g10.c:3980
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "troppe voci nella pk cache - disabilitata\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2750
+#: g10/getkey.c:187 g10/getkey.c:2757
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[User ID non trovato]"
 
-#: g10/getkey.c:1677
+#: g10/getkey.c:1684
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Chiave %08lX non valida resa valida da --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2228
+#: g10/getkey.c:2235
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "manca una subchiave segreta per la subchiave pubblica %08lX - ignorata\n"
 
-#: g10/getkey.c:2459
+#: g10/getkey.c:2466
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n"
 
-#: g10/getkey.c:2506
+#: g10/getkey.c:2513
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:74
 msgid "be somewhat more quiet"
 msgstr "meno prolisso"
 
-#: g10/gpgv.c:70
+#: g10/gpgv.c:75
 msgid "take the keys from this keyring"
 msgstr "prende le chiavi da questo portachiavi"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:77
 msgid "make timestamp conflicts only a warning"
 msgstr "segnala i conflitti di data solo con un avvertimento"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:78
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrivi le informazioni di stato sul FD"
 
-#: g10/gpgv.c:97
+#: g10/gpgv.c:102
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpgv [opzioni] [file] (-h per l'aiuto)"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:105
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1720,7 +1761,7 @@ msgstr ""
 "Sintassi: gpg [opzioni] [file]\n"
 "Controlla le firme con le chiavi affidabili note\n"
 
-#: g10/helptext.c:48
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1730,7 +1771,7 @@ msgstr ""
 "terzi. Ci serve per implementare il web-of-trust; non ha nulla a che fare\n"
 "con il web-of-certificates (creato implicitamente)."
 
-#: g10/helptext.c:54
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1743,16 +1784,16 @@ msgstr ""
 "segreta.\n"
 "Rispondi \"s�\" per impostare questa chiave come definitivamente affidabile\n"
 
-#: g10/helptext.c:61
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "Se vuoi usare comunque questa chiave non fidata, rispondi \"si\"."
 
-#: g10/helptext.c:65
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Inserisci l'user ID del destinatario a cui vuoi mandare il messaggio."
 
-#: g10/helptext.c:69
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1766,7 +1807,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:83
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -1777,16 +1818,16 @@ msgstr ""
 "campi.\n"
 "Per favore consulta prima il tuo esperto di sicurezza."
 
-#: g10/helptext.c:90
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "Inserisci le dimensioni della chiave"
 
-#: g10/helptext.c:94 g10/helptext.c:99 g10/helptext.c:111 g10/helptext.c:143
-#: g10/helptext.c:171 g10/helptext.c:176 g10/helptext.c:181
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "Rispondi \"si\" o \"no\""
 
-#: g10/helptext.c:104
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1798,19 +1839,19 @@ msgstr ""
 "messaggio di errore corretto: il sistema cerca di interpretare il valore\n"
 "dato come un intervallo."
 
-#: g10/helptext.c:116
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "Inserisci il nome del proprietario della chiave"
 
-#: g10/helptext.c:121
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr "Inserisci un indirizzo di email opzionale (ma fortemente suggerito)"
 
-#: g10/helptext.c:125
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "Inserisci un commento opzionale"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1824,11 +1865,11 @@ msgstr ""
 "O  per continuare con la generazione della chiave.\n"
 "Q  per abbandonare il processo di generazione della chiave."
 
-#: g10/helptext.c:139
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Rispondi \"si\" (o \"y\") se va bene generare la subchiave."
 
-#: g10/helptext.c:147
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -1907,12 +1948,12 @@ msgstr ""
 "\n"
 "Se non sai cosa rispondere, rispondi \"0\"."
 
-#: g10/helptext.c:185
+#: g10/helptext.c:186
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Rispondi \"si\" se vuoi firmare TUTTI gli user ID"
 
-#: g10/helptext.c:189
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -1920,11 +1961,11 @@ msgstr ""
 "Rispondi \"si\" se vuoi davvero cancellare questo user ID.\n"
 "Tutti i certificati saranno persi!"
 
-#: g10/helptext.c:194
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Rispondi \"si\" se va bene cancellare la subchiave"
 
-#: g10/helptext.c:199
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -1935,7 +1976,7 @@ msgstr ""
 "questa firma perch� pu� essere importante per stabilire una connessione di\n"
 "fiducia alla chiave o a un'altra chiave certificata da questa chiave."
 
-#: g10/helptext.c:204
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -1949,13 +1990,13 @@ msgstr ""
 "usata perch� questa chiave potrebbe stabilire una connessione di fiducia\n"
 "attraverso una chiave gi� certificata."
 
-#: g10/helptext.c:210
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "La firma non � valida. Ha senso rimuoverla dal tuo portachiavi."
 
-#: g10/helptext.c:214
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -1970,7 +2011,7 @@ msgstr ""
 "non\n"
 "� valida per qualche ragione e ne � disponibile un'altra."
 
-#: g10/helptext.c:222
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -1981,23 +2022,23 @@ msgstr ""
 "la lista di preferenze corrente. L'orario di tutte le autofirme coinvolte\n"
 "sar� aumentato di un secondo.\n"
 
-#: g10/helptext.c:229
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Inserisci la passphrase, cio� una frase segreta \n"
 
-#: g10/helptext.c:235
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Ripeti l'ultima passphrase per essere sicuro di cosa hai scritto."
 
-#: g10/helptext.c:239
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "Inserisci il nome del file a cui si riferisce la firma."
 
-#: g10/helptext.c:244
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Rispondi \"si\" se va bene sovrascrivere il file."
 
-#: g10/helptext.c:249
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2005,7 +2046,7 @@ msgstr ""
 "Inserisci il nuovo nome del file. Se premi INVIO sar� usato il nome\n"
 "predefinito (quello indicato tra parentesi)."
 
-#: g10/helptext.c:255
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2034,7 +2075,7 @@ msgstr ""
 "      Usa questo per affermare che l'user ID non dovrebbe pi� essere usato;\n"
 "      solitamente � usato per indicare un indirizzo di email non valido.\n"
 
-#: g10/helptext.c:271
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2044,475 +2085,480 @@ msgstr ""
 "questo certificato di revoca. Per favore sii conciso.\n"
 "Una riga vuota termina il testo.\n"
 
-#: g10/helptext.c:286
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "Non � disponibile un aiuto"
 
-#: g10/helptext.c:294
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Non � disponibile un aiuto per `%s'"
 
-#: g10/import.c:247
+#: g10/import.c:248
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "salto un blocco di tipo %d\n"
 
-#: g10/import.c:256
+#: g10/import.c:257
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "Per ora sono state esaminate %lu chiavi\n"
 
-#: g10/import.c:273
+#: g10/import.c:274
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Numero totale esaminato: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "  nuove chiavi saltate: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:279
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         senza user ID: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "              imported: %lu"
 msgstr "             importate: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:287
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "        non modificate: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         nuovi user ID: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "       nuove subchiavi: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "           nuove firme: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "nuove revoche di chiavi: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "  chiavi segrete lette: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "chiavi segrete importate: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chiavi segrete non cambiate: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "             importate: %lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:544
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:545
+#: g10/import.c:546
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/import.c:582
+#: g10/import.c:583
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:594
+#: g10/import.c:595
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "Firma %s, algoritmo di digest %s\n"
 
-#: g10/import.c:606
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:620
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:646
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:694 g10/import.c:1048
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chiave %08lX: nessun user ID\n"
 
-#: g10/import.c:713
+#: g10/import.c:714
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "chiave %08lX: riparati i danni di HKP alla subchiave\n"
 
-#: g10/import.c:728
+#: g10/import.c:729
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "chiave %08lX: accettato l'user ID non autofirmato '%s'\n"
 
-#: g10/import.c:734
+#: g10/import.c:735
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chiave %08lX: nessun user ID valido\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 msgid "this may be caused by a missing self-signature\n"
 msgstr "questo pu� essere causato da una autofirma mancante\n"
 
-#: g10/import.c:746 g10/import.c:1168
+#: g10/import.c:747 g10/import.c:1169
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
 
-#: g10/import.c:752
+#: g10/import.c:753
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chiave %08lX: nuova chiave - saltata\n"
 
-#: g10/import.c:761
+#: g10/import.c:762
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi scrivibile: %s\n"
 
-#: g10/import.c:766 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scrittura in `%s'\n"
 
-#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
-#: g10/import.c:2314 g10/import.c:2336
+#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
+#: g10/import.c:2315 g10/import.c:2337
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi `%s': %s\n"
 
-#: g10/import.c:791
+#: g10/import.c:792
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chiave %08lX: importata la chiave pubblica \"%s\"\n"
 
-#: g10/import.c:815
+#: g10/import.c:816
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chiave %08lX: non corrisponde alla nostra copia\n"
 
-#: g10/import.c:832 g10/import.c:1186
+#: g10/import.c:833 g10/import.c:1187
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "chiave %08lX: impossibile individuare il keyblock originale: %s\n"
 
-#: g10/import.c:840 g10/import.c:1193
+#: g10/import.c:841 g10/import.c:1194
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "chiave %08lX: impossibile leggere il keyblock originale: %s\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chiave %08lX: \"%s\" 1 nuovo user ID\n"
 
-#: g10/import.c:875
+#: g10/import.c:876
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
 
-#: g10/import.c:878
+#: g10/import.c:879
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chiave %08lX: \"%s\" una nuova firma\n"
 
-#: g10/import.c:881
+#: g10/import.c:882
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
 
-#: g10/import.c:884
+#: g10/import.c:885
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chiave %08lX: \"%s\" una nuova subchiave\n"
 
-#: g10/import.c:887
+#: g10/import.c:888
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chiave %08lX: \"%s\" %d nuove subchiavi\n"
 
-#: g10/import.c:908
+#: g10/import.c:909
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chiave %08lX: \"%s\" non cambiata\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1054
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "chiave %08lX: chiave segreta con cifrario %d non valido - saltata\n"
 
-#: g10/import.c:1064
+#: g10/import.c:1065
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/import.c:1081 g10/import.c:2329
+#: g10/import.c:1082 g10/import.c:2330
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nessun portachiavi segreto predefinito: %s\n"
 
-#: g10/import.c:1092
+#: g10/import.c:1093
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chiave %08lX: chiave segreta importata\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1122
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chiave %08lX: gi� nel portachiavi segreto\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1132
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "chiave %08lX: chiave segreta non trovata: %s\n"
 
-#: g10/import.c:1161
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chiave %08lX: manca la chiave pubblica - impossibile applicare il\n"
 "certificato di revoca\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1205
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "chiave %08lX: certificato di revoca non valido: %s - rifiutato\n"
 
-#: g10/import.c:1236
+#: g10/import.c:1237
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chiave %08lX: \"%s\" certificato di revoca importato\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1302
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "chiave %08lX: nessun user ID per la firma\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1317
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "chiave %08lX: algoritmo a chiave pubblica non gestito sull'user ID \"%s\"\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "chiave %08lX: autofirma non valida sull'user ID \"%s\"\n"
 
-#: g10/import.c:1336
+#: g10/import.c:1337
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "chiave %08lX: non ci sono subchiavi per il legame con la chiave\n"
 
-#: g10/import.c:1347 g10/import.c:1397
+#: g10/import.c:1348 g10/import.c:1398
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
 
-#: g10/import.c:1349
+#: g10/import.c:1350
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chiave %08lX: legame con la subchiave non valido:\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1365
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chiave %08lX: rimossi i legami con subochiavi multiple\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "chiave %08lX: non ci sono subchiavi per la revoca della chiave\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chiave %08lX: revoca della subchiave non valida\n"
 
-#: g10/import.c:1414
+#: g10/import.c:1415
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chiave %08lX: rimosse le revoche di subchiavi multiple\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1457
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chiave %08lX: saltato l'user ID '"
 
-#: g10/import.c:1477
+#: g10/import.c:1478
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chiave %08lX: saltata la subchiave\n"
 
-#: g10/import.c:1504
+#: g10/import.c:1505
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "chiave %08lX: firma non esportabile (classe %02x) - saltata\n"
 
-#: g10/import.c:1514
+#: g10/import.c:1515
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "chiave %08lX: certificato di revoca nel posto sbagliato - saltata\n"
 
-#: g10/import.c:1531
+#: g10/import.c:1532
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "chiave %08lX: certificato di revoca non valido: %s - saltata\n"
 
-#: g10/import.c:1545
+#: g10/import.c:1546
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "chiave %08lX: firma della subchiave nel posto sbagliato - saltata\n"
 
-#: g10/import.c:1553
+#: g10/import.c:1554
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chiave %08lX: classe della firma inaspettata (0x%02x) - saltata\n"
 
-#: g10/import.c:1574
+#: g10/import.c:1575
 #, fuzzy, c-format
 msgid "key %s: expired signature from key %s - skipped\n"
 msgstr "chiave %08lX: classe della firma inaspettata (0x%02x) - saltata\n"
 
-#: g10/import.c:1677
+#: g10/import.c:1678
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chiave %08lX: trovato un user ID duplicato - unito\n"
 
-#: g10/import.c:1739
+#: g10/import.c:1740
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "ATTENZIONE: la chiave %08lX pu� essere stata revocata: scarico la chiave\n"
 "di revoca %08lX.\n"
 
-#: g10/import.c:1753
+#: g10/import.c:1754
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "ATTENZIONE: la chiave %08lX pu� essere stata revocata: la chiave di\n"
 "revoca %08lX non � presente.\n"
 
-#: g10/import.c:1812
+#: g10/import.c:1813
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chiave %08lX: certificato di revoca \"%s\" aggiunto\n"
 
-#: g10/import.c:1846
+#: g10/import.c:1847
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chiave %08lX: aggiunta una firma alla chiave diretta\n"
 
-#: g10/import.c:2235
+#: g10/import.c:2236
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "la chiave pubblica non corrisponde alla chiave segreta!\n"
 
-#: g10/import.c:2243
+#: g10/import.c:2244
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
 
-#: g10/import.c:2245
+#: g10/import.c:2246
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
 
-#: g10/keydb.c:167
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "errore creando il portachiavi `%s': %s\n"
 
-#: g10/keydb.c:174
+#: g10/keydb.c:175
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "portachiavi `%s' creato\n"
 
-#: g10/keydb.c:685
+#: g10/keydb.c:316 g10/keydb.c:319
+#, fuzzy, c-format
+msgid "keyblock resource `%s': %s\n"
+msgstr "errore creando `%s': %s\n"
+
+#: g10/keydb.c:698
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "rebuild della cache del portachiavi fallito: %s\n"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[revoca]"
 
-#: g10/keyedit.c:255
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[autofirma]"
 
-#: g10/keyedit.c:333 g10/keylist.c:405
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "una firma non corretta\n"
 
-#: g10/keyedit.c:335 g10/keylist.c:407
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d firme non corrette\n"
 
-#: g10/keyedit.c:337 g10/keylist.c:409
+#: g10/keyedit.c:344 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "una firma non controllata per mancanza della chiave\n"
 
-#: g10/keyedit.c:339 g10/keylist.c:411
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, 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:341 g10/keylist.c:413
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "una firma non controllata a causa di un errore\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:415
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d firme non controllate a causa di errori\n"
 
-#: g10/keyedit.c:345
+#: g10/keyedit.c:352
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Trovato un user ID senza autofirma valida\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:354
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "Trovati %d user ID senza autofirme valide\n"
 
-#: g10/keyedit.c:403 g10/pkclist.c:262
+#: g10/keyedit.c:410 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2525,53 +2571,63 @@ msgstr ""
 "impronte digitali da diverse fonti...)?\n"
 "\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:274
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Mi fido marginalmente\n"
 
-#: g10/keyedit.c:408 g10/pkclist.c:276
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Mi fido completamente\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:434
 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:443
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "L'user ID \"%s\" � stato revocato."
 
-#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
-#: g10/keyedit.c:858 g10/keyedit.c:1642
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1728
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Sei ancora sicuro di volerla firmare? (s/N) "
 
-#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
-#: g10/keyedit.c:1648
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
+#: g10/keyedit.c:1734
 msgid "  Unable to sign.\n"
 msgstr "  Impossibile firmarla.\n"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "L'user ID \"%s\" � scaduto."
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:650
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "L'user ID \"%s\" non � autofirmato."
 
-#: g10/keyedit.c:676
+#: g10/keyedit.c:678
+#, fuzzy, c-format
+msgid "User ID \"%s\" is signable.  "
+msgstr "L'user ID \"%s\" non � autofirmato."
+
+#: g10/keyedit.c:680
+#, fuzzy
+msgid "Sign it? (y/N) "
+msgstr "Firmo davvero? "
+
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2580,11 +2636,11 @@ msgstr ""
 "L'autofirma su \"%s\"\n"
 "� una firma in stile PGP 2.x.\n"
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:711
 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:699
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2593,11 +2649,11 @@ msgstr ""
 "La tua firma attuale su \"%s\"\n"
 "� scaduta\n"
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:729
 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:724
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2606,43 +2662,43 @@ msgstr ""
 "La tua firma attuale su \"%s\"\n"
 "� una firma locale.\n"
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:754
 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:749
+#: g10/keyedit.c:775
 #, 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:752
+#: g10/keyedit.c:778
 #, 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:757
+#: g10/keyedit.c:783
 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:779
+#: g10/keyedit.c:805
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Niente da firmare con la chiave %08lX\n"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "Questa chiave � scaduta!"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Questa chiave scadr� il %s.\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:844
 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:851
+#: g10/keyedit.c:882
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2650,11 +2706,11 @@ msgstr ""
 "In modalit� -pgp2 non � possibile fare firme OpenPGP su chiavi in stile PGP "
 "2.x.\n"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:884
 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:878
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2664,32 +2720,32 @@ msgstr ""
 "appartiene veramente alla persona indicata sopra?\n"
 "Se non sai cosa rispondere digita \"0\".\n"
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Preferisco non rispondere.%s\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:916
 #, 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:887
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) L'ho controllata superficialmente.%s\n"
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) L'ho controllata molto attentamente.%s\n"
 
-#: g10/keyedit.c:895
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Cosa scegli? (inserisci '?' per ulteriori informazioni): "
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:950
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2698,100 +2754,100 @@ msgstr ""
 "Sei davvero sicuro di volere firmare questa chiave\n"
 "con la tua chiave: \""
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Questa sar� una autofirma.\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:963
 #, 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:940
+#: g10/keyedit.c:971
 #, 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:950
+#: g10/keyedit.c:981
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "La firma sar� marcata come non esportabile.\n"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:988
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "La firma sar� marcata come irrevocabile.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:995
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Non ho controllato per niente questa chiave.\n"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1000
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Ho controllato questa chiave superficialmente.\n"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1005
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Ho controllato questa chiave molto attentamente.\n"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1015
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Firmo davvero? "
 
-#: g10/keyedit.c:1029 g10/keyedit.c:4132 g10/keyedit.c:4223 g10/keyedit.c:4287
-#: g10/keyedit.c:4348 g10/sign.c:369
+#: g10/keyedit.c:1060 g10/keyedit.c:4350 g10/keyedit.c:4441 g10/keyedit.c:4505
+#: g10/keyedit.c:4566 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallita: %s\n"
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1105 g10/keygen.c:3057
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "Questa chiave non � protetta.\n"
 
-#: g10/keyedit.c:1109 g10/keygen.c:3045
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/keyedit.c:1113 g10/keygen.c:3060
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/keyedit.c:1117 g10/keygen.c:3064
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "La chiave � protetta.\n"
 
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossibile modificare questa chiave: %s\n"
 
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2799,11 +2855,11 @@ msgstr ""
 "Inserisci la nuova passphrase per questa chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:1825
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase non ripetuta correttamente; prova ancora"
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2811,193 +2867,193 @@ msgstr ""
 "Non vuoi una passphrase - questa � probabilmente una *cattiva* idea!\n"
 "\n"
 
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1195
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Vuoi veramente farlo?"
 
-#: g10/keyedit.c:1235
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "spostamento della firma di una chiave nel posto corretto\n"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "salva ed esci"
 
-#: g10/keyedit.c:1322
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra le impronte digitali"
 
-#: g10/keyedit.c:1323
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "elenca le chiavi e gli user ID"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "scegli l'user ID N"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "scegli l'user ID N"
 
-#: g10/keyedit.c:1327
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "revoca firme"
 
-#: g10/keyedit.c:1330
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1335
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "firma la chiave localmente"
 
-#: g10/keyedit.c:1337
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Suggerimento: seleziona gli user ID da firmare\n"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1343
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "aggiungi un user ID"
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "aggiungi un ID fotografico"
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "cancella un user ID"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "cancella una chiave secondaria"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr "aggiungi una chiave di revoca"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1402
 #, 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:1372
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "imposta l'user ID come primario"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "cambia tra visualizzare la chiave segreta e la chiave pubblica"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "elenca le preferenze (per esperti)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "elenca le preferenze (prolisso)"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1418
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "cambia la passphrase"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "cambia il valore di fiducia"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1426
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Revoco davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revoca un user ID"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoca una chiave secondaria"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "enable key"
 msgstr "abilita una chiave"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "disable key"
 msgstr "disabilita una chiave"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1436
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "mostra l'ID fotografico"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1556
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "errore leggendo il keyblock segreto `%s': %s\n"
 
-#: g10/keyedit.c:1494
+#: g10/keyedit.c:1574
 msgid "Secret key is available.\n"
 msgstr "� disponibile una chiave segreta.\n"
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1655
 msgid "Need the secret key to do this.\n"
 msgstr "Per fare questo serve la chiave segreta.\n"
 
-#: g10/keyedit.c:1579
+#: g10/keyedit.c:1663
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Per favore usa prima il comando \"toggle\".\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1682
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3005,236 +3061,241 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1722
 msgid "Key is revoked."
 msgstr "La chiave � stata revocata."
 
-#: g10/keyedit.c:1657
+#: g10/keyedit.c:1741
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Firmo davvero tutti gli user ID? "
 
-#: g10/keyedit.c:1660
-msgid "Hint: Select the user IDs to sign\n"
-msgstr "Suggerimento: seleziona gli user ID da firmare\n"
-
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1748
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "classe della firma sconosciuta"
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1771
 #, 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:1713 g10/keyedit.c:1733 g10/keyedit.c:1899
+#: g10/keyedit.c:1793 g10/keyedit.c:1813 g10/keyedit.c:1979
 msgid "You must select at least one user ID.\n"
 msgstr "Devi selezionare almeno un user ID.\n"
 
-#: g10/keyedit.c:1715
+#: g10/keyedit.c:1795
 msgid "You can't delete the last user ID!\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:1717
+#: g10/keyedit.c:1797
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Tolgo davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:1718
+#: g10/keyedit.c:1798
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Tolgo davvero questo user ID? "
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1848
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Tolgo davvero questo user ID? "
 
-#: g10/keyedit.c:1780
+#: g10/keyedit.c:1860
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Devi selezionare almeno una chiave.\n"
 
-#: g10/keyedit.c:1808
+#: g10/keyedit.c:1888
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1822
+#: g10/keyedit.c:1902
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1919
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "errore creando il portachiavi `%s': %s\n"
 
-#: g10/keyedit.c:1863
+#: g10/keyedit.c:1943
 msgid "You must select at least one key.\n"
 msgstr "Devi selezionare almeno una chiave.\n"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1946
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Vuoi davvero cancellare le chiavi selezionate? "
 
-#: g10/keyedit.c:1867
+#: g10/keyedit.c:1947
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vuoi davvero cancellare questa chiave? "
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1982
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Revoco davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1983
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Revoco davvero questo user ID? "
 
-#: g10/keyedit.c:1921
+#: g10/keyedit.c:2001
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Vuoi davvero revocare questa chiave? "
 
-#: g10/keyedit.c:1932
+#: g10/keyedit.c:2012
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Vuoi davvero revocare le chiavi selezionate? "
 
-#: g10/keyedit.c:1934
+#: g10/keyedit.c:2014
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Vuoi davvero revocare questa chiave? "
 
-#: g10/keyedit.c:1975
+#: g10/keyedit.c:2055
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2007
+#: g10/keyedit.c:2087
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "imposta la lista di preferenze"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2093
 #, 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:2015
+#: g10/keyedit.c:2095
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Aggiorno davvero le preferenze? "
 
-#: g10/keyedit.c:2065
+#: g10/keyedit.c:2157
+#, fuzzy, c-format
+msgid "Unable to clean `%s'\n"
+msgstr "impossibile eseguire %s \"%s\": %s\n"
+
+#: g10/keyedit.c:2160
+msgid "Please specify item to clean: `sigs', `uids', or `all'\n"
+msgstr ""
+
+#: g10/keyedit.c:2171
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvo i cambiamenti? "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2174
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Esco senza salvare? "
 
-#: g10/keyedit.c:2078
+#: g10/keyedit.c:2184
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2191
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: g10/keyedit.c:2092
+#: g10/keyedit.c:2198
 msgid "Key not changed so no update needed.\n"
 msgstr "La chiave non � cambiata quindi non sono necessari aggiornamenti.\n"
 
-#: g10/keyedit.c:2164
+#: g10/keyedit.c:2271
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2323
 msgid "Features: "
 msgstr "Caratteristiche: "
 
-#: g10/keyedit.c:2227
+#: g10/keyedit.c:2334
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2242 g10/keylist.c:307
+#: g10/keyedit.c:2349 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2473
+#: g10/keyedit.c:2580
 #, 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:2494
+#: g10/keyedit.c:2601
 #, 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:2500
+#: g10/keyedit.c:2607
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensibile)"
 
-#: g10/keyedit.c:2516 g10/keyedit.c:2572 g10/keyedit.c:2684 g10/keyedit.c:2699
-#: g10/keylist.c:193 g10/keyserver.c:422
+#: g10/keyedit.c:2623 g10/keyedit.c:2679 g10/keyedit.c:2792 g10/keyedit.c:2807
+#: g10/keylist.c:194 g10/keyserver.c:421
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "impossibile creare %s: %s\n"
 
-#: g10/keyedit.c:2519 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:931
+#: g10/keyedit.c:2626 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:948
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocata]"
 
-#: g10/keyedit.c:2521 g10/keylist.c:757 g10/keylist.c:886
+#: g10/keyedit.c:2628 g10/keylist.c:758 g10/keylist.c:887
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[scadenza: %s]"
 
-#: g10/keyedit.c:2523 g10/keyedit.c:2574 g10/keyedit.c:2686 g10/keyedit.c:2701
-#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
-#: g10/keylist.c:913 g10/keyserver.c:428 g10/mainproc.c:937
+#: g10/keyedit.c:2630 g10/keyedit.c:2681 g10/keyedit.c:2794 g10/keyedit.c:2809
+#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
+#: g10/keylist.c:914 g10/keyserver.c:427 g10/mainproc.c:954
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[scadenza: %s]"
 
-#: g10/keyedit.c:2525
+#: g10/keyedit.c:2632
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " fiducia: %c/%c"
 
-#: g10/keyedit.c:2540
+#: g10/keyedit.c:2647
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " fiducia: %c/%c"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2651
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2658
 msgid "This key has been disabled"
 msgstr "Questa chiave � stata disabilitata"
 
-#: g10/keyedit.c:2579 g10/keylist.c:199
+#: g10/keyedit.c:2686 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2754
 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:2654
+#: g10/keyedit.c:2762
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3243,19 +3304,19 @@ msgstr ""
 "corretta\n"
 "finch� non eseguirai di nuovo il programma.\n"
 
-#: g10/keyedit.c:2718 g10/keyserver.c:432 g10/mainproc.c:1577
-#: g10/trustdb.c:1178
+#: g10/keyedit.c:2826 g10/keyedit.c:3201 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1690
 #, fuzzy
 msgid "revoked"
 msgstr "[revocata]"
 
-#: g10/keyedit.c:2720 g10/keyserver.c:436 g10/mainproc.c:1579
-#: g10/trustdb.c:531
+#: g10/keyedit.c:2828 g10/keyedit.c:3203 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1692
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2893
 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"
@@ -3264,7 +3325,7 @@ msgstr ""
 "            potrebbe fare diventare un altro user ID il primario "
 "predefinito.\n"
 
-#: g10/keyedit.c:2845
+#: g10/keyedit.c:2953
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3273,46 +3334,76 @@ msgstr ""
 "ATTENZIONE: Questa � una chiave in stile PGP2. Aggiungere un ID fotografico\n"
 "            pu� causarne il rifiuto da parte di alcune versioni di PGP.\n"
 
-#: g10/keyedit.c:2850 g10/keyedit.c:3128
+#: g10/keyedit.c:2958 g10/keyedit.c:3307
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:2856
+#: g10/keyedit.c:2964
 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:2996
+#: g10/keyedit.c:3104
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Cancellare questa firma corretta? (s/N/q)"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3114
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Cancellare questa firma non valida? (s/N/q)"
 
-#: g10/keyedit.c:3010
+#: g10/keyedit.c:3118
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
 
-#: g10/keyedit.c:3016
+#: g10/keyedit.c:3124
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Cancellare davvero questa autofirma? (s/N)"
 
-#: g10/keyedit.c:3030
+#: g10/keyedit.c:3138
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Cancellata %d firma.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3139
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Cancellate %d firme.\n"
 
-#: g10/keyedit.c:3034
+#: g10/keyedit.c:3142
 msgid "Nothing deleted.\n"
 msgstr "Non � stato cancellato nulla.\n"
 
-#: g10/keyedit.c:3123
+#: g10/keyedit.c:3167
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed.\n"
+msgstr "L'user ID \"%s\" � stato revocato."
+
+#: g10/keyedit.c:3168
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed.\n"
+msgstr "L'user ID \"%s\" � stato revocato."
+
+#: g10/keyedit.c:3173
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean.\n"
+msgstr "l'user ID \"%s\" � gi� stato revocato\n"
+
+#: g10/keyedit.c:3205 g10/trustdb.c:1694
+#, fuzzy
+msgid "invalid"
+msgstr "armatura non valida"
+
+#: g10/keyedit.c:3207
+#, fuzzy, c-format
+msgid "User ID \"%s\" removed: %s\n"
+msgstr "L'user ID \"%s\" � stato revocato."
+
+#: g10/keyedit.c:3214
+#, fuzzy
+msgid "No user IDs are removable.\n"
+msgstr "l'user ID \"%s\" � gi� stato revocato\n"
+
+#: g10/keyedit.c:3302
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3322,349 +3413,354 @@ msgstr ""
 "            designato pu� causarne il rifiuto da parte di alcune versioni\n"
 "            di PGP.\n"
 
-#: g10/keyedit.c:3134
+#: g10/keyedit.c:3313
 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:3154
+#: g10/keyedit.c:3333
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Inserisci l'user ID del revocatore designato: "
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3356
 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:3192
+#: g10/keyedit.c:3371
 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:3214
+#: g10/keyedit.c:3393
 #, 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:3233
+#: g10/keyedit.c:3412
 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:3239
+#: g10/keyedit.c:3418
 #, 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:3300
+#: g10/keyedit.c:3479
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Togli le selezioni dalle chiavi segrete.\n"
 
-#: g10/keyedit.c:3306
+#: g10/keyedit.c:3485
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Seleziona al massimo una chiave secondaria.\n"
 
-#: g10/keyedit.c:3310
+#: g10/keyedit.c:3489
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
 
-#: g10/keyedit.c:3313
+#: g10/keyedit.c:3492
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambio la data di scadenza per la chiave primaria.\n"
 
-#: g10/keyedit.c:3359
+#: g10/keyedit.c:3538
 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:3375
+#: g10/keyedit.c:3554
 msgid "No corresponding signature in secret ring\n"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/keyedit.c:3455
+#: g10/keyedit.c:3634
 msgid "Please select exactly one user ID.\n"
 msgstr "Devi selezionare esattamente un user ID.\n"
 
-#: g10/keyedit.c:3494 g10/keyedit.c:3604 g10/keyedit.c:3724
+#: g10/keyedit.c:3673 g10/keyedit.c:3783 g10/keyedit.c:3903
 #, 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:3665
+#: g10/keyedit.c:3844
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3745
+#: g10/keyedit.c:3924
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Sei sicuro di volerla usare? (s/N) "
 
-#: g10/keyedit.c:3746
+#: g10/keyedit.c:3925
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Sei sicuro di volerla usare? (s/N) "
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3987
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:3854
+#: g10/keyedit.c:4045
+#, fuzzy, c-format
+msgid "No user ID with hash %s\n"
+msgstr "Nessun user ID con l'indice %d\n"
+
+#: g10/keyedit.c:4072
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:3971
+#: g10/keyedit.c:4189
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: \""
 
-#: g10/keyedit.c:3974 g10/keyedit.c:4038 g10/keyedit.c:4081
+#: g10/keyedit.c:4192 g10/keyedit.c:4256 g10/keyedit.c:4299
 #, 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:3976 g10/keyedit.c:4040 g10/keyedit.c:4083
+#: g10/keyedit.c:4194 g10/keyedit.c:4258 g10/keyedit.c:4301
 msgid " (non-exportable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:3980
+#: g10/keyedit.c:4198
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Questa chiave � scaduta il %s.\n"
 
-#: g10/keyedit.c:3984
+#: g10/keyedit.c:4202
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:3988
+#: g10/keyedit.c:4206
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Creare un certificato di revoca per questa firma? (s/N) "
 
-#: g10/keyedit.c:4015
+#: g10/keyedit.c:4233
 #, 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:4041
+#: g10/keyedit.c:4259
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:4048
+#: g10/keyedit.c:4266
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocata da %08lX il %s\n"
 
-#: g10/keyedit.c:4070
+#: g10/keyedit.c:4288
 msgid "You are about to revoke these signatures:\n"
 msgstr "Stai per revocare queste firme:\n"
 
-#: g10/keyedit.c:4090
+#: g10/keyedit.c:4308
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Creare davvero i certificati di revoca? (s/N) "
 
-#: g10/keyedit.c:4120
+#: g10/keyedit.c:4338
 msgid "no secret key\n"
 msgstr "manca la chiave segreta\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4408
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4425
 #, 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:4271
+#: g10/keyedit.c:4489
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:4333
+#: g10/keyedit.c:4551
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4646
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Mostro %s ID fotografici di dimensioni %ld per la chaive 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:293
+#: g10/keygen.c:258
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "la preferenza %c%lu � doppia\n"
 
-#: g10/keygen.c:300
+#: g10/keygen.c:265
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "ci sono troppe preferenze `%c'\n"
 
-#: g10/keygen.c:302
+#: g10/keygen.c:267
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "ci sono troppe preferenze `%c'\n"
 
-#: g10/keygen.c:304
+#: g10/keygen.c:269
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "ci sono troppe preferenze `%c'\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:394
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "carattere non valido nella stringa delle preferenze\n"
 
-#: g10/keygen.c:829
+#: g10/keygen.c:822
 msgid "writing direct signature\n"
 msgstr "scrittura della firma diretta\n"
 
-#: g10/keygen.c:868
+#: g10/keygen.c:861
 msgid "writing self signature\n"
 msgstr "scrittura della autofirma\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing key binding signature\n"
 msgstr "scrittura della firma di collegamento alla chiave\n"
 
-#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2632
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "dimensione della chiave non valida; uso %u bit\n"
 
-#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2638
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "dimensioni della chiave arrotondate a %u bit\n"
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1239
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1252
+#: g10/keygen.c:1242
 #, fuzzy
 msgid "Encrypt"
 msgstr "cifra dati"
 
-#: g10/keygen.c:1255
+#: g10/keygen.c:1245
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1263
+#: g10/keygen.c:1253
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1268
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1282
+#: g10/keygen.c:1272
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1287
+#: g10/keygen.c:1277
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1290
+#: g10/keygen.c:1280
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (cifra solo)\n"
 
-#: g10/keygen.c:1293
+#: g10/keygen.c:1283
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1296
+#: g10/keygen.c:1286
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1340
 msgid "Please select what kind of key you want:\n"
 msgstr "Per favore scegli che tipo di chiave vuoi:\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1342
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (default)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1343
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (firma solo)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1345
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/keygen.c:1357
+#: g10/keygen.c:1347
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (cifra solo)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1348
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (firma solo)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1350
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/keygen.c:1362
+#: g10/keygen.c:1352
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/keygen.c:1431 g10/keygen.c:2509
+#: g10/keygen.c:1421 g10/keygen.c:2506
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "La coppia DSA avr� 1024 bit.\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1431
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1438
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Di che dimensioni vuoi la chiave? (1024) "
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1452
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1468
+#: g10/keygen.c:1458
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La dimensione richiesta della chiave � %u bit\n"
 
-#: g10/keygen.c:1473 g10/keygen.c:1478
+#: g10/keygen.c:1463 g10/keygen.c:1468
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrotondate a %u bit\n"
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1515
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3680,7 +3776,7 @@ msgstr ""
 "      <n>m = la chiave scadr� dopo n mesi\n"
 "      <n>y = la chiave scadr� dopo n anni\n"
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1526
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3696,39 +3792,40 @@ msgstr ""
 "      <n>m = la chiave scadr� dopo n mesi\n"
 "      <n>y = la chiave scadr� dopo n anni\n"
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1549
 msgid "Key is valid for? (0) "
 msgstr "Chiave valida per? (0) "
 
-#: g10/keygen.c:1563
-msgid "Signature is valid for? (0) "
+#: g10/keygen.c:1554
+#, fuzzy, c-format
+msgid "Signature is valid for? (%s) "
 msgstr "Firma valida per? (0) "
 
-#: g10/keygen.c:1568
+#: g10/keygen.c:1572
 msgid "invalid value\n"
 msgstr "valore non valido\n"
 
-#: g10/keygen.c:1575
+#: g10/keygen.c:1579
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s non ha scadenza\n"
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1580
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s non ha scadenza\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1585
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s scadr� il %s\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1586
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Questa firma scadr� il %s\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1592
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3736,12 +3833,12 @@ msgstr ""
 "Il tuo sistema non pu� mostrare date oltre il 2038.\n"
 "Comunque, sar� gestita correttamente fino al 2106.\n"
 
-#: g10/keygen.c:1595
+#: g10/keygen.c:1597
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "� giusto (s/n)? "
 
-#: g10/keygen.c:1638
+#: g10/keygen.c:1641
 #, fuzzy
 msgid ""
 "\n"
@@ -3758,44 +3855,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1651
+#: g10/keygen.c:1654
 msgid "Real name: "
 msgstr "Nome e Cognome: "
 
-#: g10/keygen.c:1659
+#: g10/keygen.c:1662
 msgid "Invalid character in name\n"
 msgstr "Carattere non valido nel nome\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1664
 msgid "Name may not start with a digit\n"
 msgstr "Il nome non pu� iniziare con una cifra\n"
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1666
 msgid "Name must be at least 5 characters long\n"
 msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1674
 msgid "Email address: "
 msgstr "Indirizzo di Email: "
 
-#: g10/keygen.c:1682
+#: g10/keygen.c:1685
 msgid "Not a valid email address\n"
 msgstr "L'indirizzo di email non � valido\n"
 
-#: g10/keygen.c:1690
+#: g10/keygen.c:1693
 msgid "Comment: "
 msgstr "Commento: "
 
-#: g10/keygen.c:1696
+#: g10/keygen.c:1699
 msgid "Invalid character in comment\n"
 msgstr "Carattere non valido nel commento\n"
 
-#: g10/keygen.c:1719
+#: g10/keygen.c:1722
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Stai usando il set di caratteri `%s'.\n"
 
-#: g10/keygen.c:1725
+#: g10/keygen.c:1728
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3806,7 +3903,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1733
 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"
 
@@ -3821,23 +3918,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:1746
+#: g10/keygen.c:1749
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1756
+#: g10/keygen.c:1759
 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:1757
+#: g10/keygen.c:1760
 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:1776
+#: g10/keygen.c:1779
 msgid "Please correct the error first\n"
 msgstr "Per favore correggi prima l'errore\n"
 
-#: g10/keygen.c:1816
+#: g10/keygen.c:1819
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3845,12 +3942,12 @@ msgstr ""
 "Ti serve una passphrase per proteggere la tua chiave segreta.\n"
 "\n"
 
-#: g10/keygen.c:1826 g10/passphrase.c:1105
+#: g10/keygen.c:1829 g10/passphrase.c:786
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1832
+#: g10/keygen.c:1835
 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"
@@ -3862,7 +3959,7 @@ msgstr ""
 "programma con l'opzione \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1857
 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"
@@ -3874,50 +3971,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:2578
+#: g10/keygen.c:2575
 msgid "Key generation canceled.\n"
 msgstr "Generazione della chiave annullata.\n"
 
-#: g10/keygen.c:2766 g10/keygen.c:2910
+#: g10/keygen.c:2774 g10/keygen.c:2918
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "scrittura della chiave pubblica in `%s'\n"
 
-#: g10/keygen.c:2768 g10/keygen.c:2913
+#: g10/keygen.c:2776 g10/keygen.c:2921
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/keygen.c:2771 g10/keygen.c:2916
+#: g10/keygen.c:2779 g10/keygen.c:2924
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2907
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi pubblico scrivibile: %s\n"
 
-#: g10/keygen.c:2905
+#: g10/keygen.c:2913
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi segreto scrivibile: %s\n"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2931
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi pubblico `%s': %s\n"
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2938
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 
-#: g10/keygen.c:2953
+#: g10/keygen.c:2961
 msgid "public and secret key created and signed.\n"
 msgstr "chiavi pubbliche e segrete create e firmate.\n"
 
-#: g10/keygen.c:2964
+#: g10/keygen.c:2972
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -3927,12 +4024,12 @@ msgstr ""
 "il comando \"--edit-key\" per generare una chiave secondaria per questo "
 "scopo.\n"
 
-#: g10/keygen.c:2976 g10/keygen.c:3105 g10/keygen.c:3220
+#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3156 g10/sign.c:290
+#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -3940,7 +4037,7 @@ msgstr ""
 "la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:3030 g10/keygen.c:3158 g10/sign.c:292
+#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -3948,202 +4045,188 @@ msgstr ""
 "la chiave � stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:3039 g10/keygen.c:3169
+#: g10/keygen.c:3047 g10/keygen.c:3177
 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:3078 g10/keygen.c:3202
+#: g10/keygen.c:3086 g10/keygen.c:3210
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Crea davvero? "
 
-#: g10/keygen.c:3355
+#: g10/keygen.c:3363
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: g10/keygen.c:3402
+#: g10/keygen.c:3410
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "impossibile creare `%s': %s\n"
 
-#: g10/keygen.c:3428
+#: g10/keygen.c:3436
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chiave %08lX scaduta il %s\n"
 
-#: g10/keygen.c:3508
-#, c-format
-msgid "length of RSA modulus is not %d\n"
-msgstr ""
-
-#: g10/keygen.c:3514
-msgid "public exponent too large (more than 32 bits)\n"
-msgstr ""
-
-#: g10/keygen.c:3520 g10/keygen.c:3526
-#, c-format
-msgid "length of an RSA prime is not %d\n"
-msgstr ""
-
-#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
+#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
 msgid "never     "
 msgstr "mai       "
 
-#: g10/keylist.c:264
+#: g10/keylist.c:265
 msgid "Critical signature policy: "
 msgstr "Politica critica di firma: "
 
-#: g10/keylist.c:266
+#: g10/keylist.c:267
 msgid "Signature policy: "
 msgstr "Politica di firma: "
 
-#: g10/keylist.c:305
+#: g10/keylist.c:306
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:354 g10/keylist.c:398
+#: 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:372
+#: g10/keylist.c:373
 msgid "Critical signature notation: "
 msgstr "Annotazione critica della firma: "
 
-#: g10/keylist.c:374
+#: g10/keylist.c:375
 msgid "Signature notation: "
 msgstr "Annotazione della firma: "
 
-#: g10/keylist.c:385
+#: g10/keylist.c:386
 msgid "not human readable"
 msgstr "non leggibile"
 
-#: g10/keylist.c:486
+#: g10/keylist.c:487
 msgid "Keyring"
 msgstr "Portachiavi"
 
-#: g10/keylist.c:792
+#: g10/keylist.c:793
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr "[scadenza: %s]"
 
-#: g10/keylist.c:1488
+#: g10/keylist.c:1489
 msgid "Primary key fingerprint:"
 msgstr "Impronta digitale della chiave primaria:"
 
-#: g10/keylist.c:1490
+#: g10/keylist.c:1491
 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:1497
+#: g10/keylist.c:1498
 msgid " Primary key fingerprint:"
 msgstr " Impronta digitale della chiave primaria:"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1500
 msgid "      Subkey fingerprint:"
 msgstr "     Impronta digitale della subchiave:"
 
-#: g10/keylist.c:1503 g10/keylist.c:1507
+#: g10/keylist.c:1504 g10/keylist.c:1508
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Impronta digitale ="
 
-#: g10/keylist.c:1574
+#: g10/keylist.c:1575
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1245
+#: g10/keyring.c:1246
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1252
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ATTENZIONE: esistono due file con informazioni confidenziali.\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � quello non modificato\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1255
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � quello nuovo\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1256
 msgid "Please fix this possible security flaw\n"
 msgstr "Per favore risolvete questo possibile problema di sicurezza\n"
 
-#: g10/keyring.c:1375
+#: g10/keyring.c:1376
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "controllo il portachiavi `%s'\n"
 
-#: g10/keyring.c:1421
+#: g10/keyring.c:1422
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "Sono state controllate %lu chiavi (%lu firme)\n"
 
-#: g10/keyring.c:1433
+#: g10/keyring.c:1434
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "Sono state controllate %lu chiavi (%lu firme)\n"
 
-#: g10/keyring.c:1504
+#: g10/keyring.c:1505
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: portachiavi creato\n"
 
-#: g10/keyserver.c:107
+#: g10/keyserver.c:105
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "ATTENZIONE: le opzioni in `%s' non sono ancora attive durante questa\n"
 "esecuzione del programma\n"
 
-#: g10/keyserver.c:434
+#: g10/keyserver.c:433
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:635
+#: g10/keyserver.c:634
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:718 g10/keyserver.c:1238
+#: g10/keyserver.c:717 g10/keyserver.c:1267
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/keyserver.c:808
+#: g10/keyserver.c:815
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: g10/keyserver.c:810
+#: g10/keyserver.c:817
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: g10/keyserver.c:985
+#: g10/keyserver.c:1014
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/keyserver.c:989
+#: g10/keyserver.c:1018
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/keyserver.c:1141
+#: g10/keyserver.c:1170
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
@@ -4151,169 +4234,164 @@ msgstr ""
 "firmata con la tua chiave %08lX il %s\n"
 "\n"
 
-#: g10/keyserver.c:1188
+#: g10/keyserver.c:1217
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1191
+#: g10/keyserver.c:1220
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1198 g10/keyserver.c:1293
+#: g10/keyserver.c:1227 g10/keyserver.c:1322
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1275
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1255
+#: g10/keyserver.c:1284
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1314
+#: g10/keyserver.c:1343
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1320
+#: g10/keyserver.c:1349
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1361
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1366
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1374
 #, c-format
-msgid "gpgkeys_%s does not support handler version %d\n"
+msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1351
+#: g10/keyserver.c:1381
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "errore del keyserver"
 
-#: g10/keyserver.c:1356
+#: g10/keyserver.c:1386
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "errore del keyserver"
 
-#: g10/keyserver.c:1365
+#: g10/keyserver.c:1395
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/keyserver.c:1390 g10/keyserver.c:1424
+#: g10/keyserver.c:1420 g10/keyserver.c:1454
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1681
+#: g10/keyserver.c:1711
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1703
+#: g10/keyserver.c:1733
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/keyserver.c:1705
+#: g10/keyserver.c:1735
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:249
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "la chiave di sessione cifrata ha dimensioni strane (%d)\n"
 
-#: g10/mainproc.c:262
-#, c-format
-msgid "bad passphrase or unknown cipher algorithm (%d)\n"
-msgstr "passphrase errata o algoritmo di cifratura sconosciuto (%d)\n"
-
-#: g10/mainproc.c:299
+#: g10/mainproc.c:300
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "chiave di sessione cifrata con %s\n"
 
-#: g10/mainproc.c:309
+#: g10/mainproc.c:310
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "cifrato con l'algoritmo sconosciuto %d\n"
 
-#: g10/mainproc.c:375
+#: g10/mainproc.c:376
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "la chiave pubblica � %08lX\n"
 
-#: g10/mainproc.c:430
+#: g10/mainproc.c:431
 msgid "public key encrypted data: good DEK\n"
 msgstr "dati cifrati con la chiave pubblica: DEK corretto\n"
 
-#: g10/mainproc.c:463
+#: g10/mainproc.c:464
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "cifrato con la chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s\n"
 
-#: g10/mainproc.c:467 g10/pkclist.c:218
+#: g10/mainproc.c:468 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                alias \""
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:472
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Cifrato con la chiave %s con ID %08lX\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifratura della chiave pubblica fallita: %s\n"
 
-#: g10/mainproc.c:499
+#: g10/mainproc.c:500
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifratto con %lu passphrase\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:502
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifratto con 1 passphrase\n"
 
-#: g10/mainproc.c:529 g10/mainproc.c:551
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "suppongo che i dati siano cifrati con %s\n"
 
-#: g10/mainproc.c:537
+#: g10/mainproc.c:538
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "Cifrario IDEA non disponibile, ottimisticamente cerco di usare %s\n"
 
-#: g10/mainproc.c:569
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr "decifratura corretta\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:574
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ATTENZIONE: l'integrit� del messaggio non era protetta\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENZIONE: il messaggio cifrato � stato manipolato!\n"
 
-#: g10/mainproc.c:592
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifratura fallita: %s\n"
@@ -4327,306 +4405,295 @@ 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:786
+#: g10/mainproc.c:803
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca solitaria - usa \"gpg --import\" per applicarla\n"
 
-#: g10/mainproc.c:1290
+#: g10/mainproc.c:1307
 msgid "signature verification suppressed\n"
 msgstr "verifica della firma soppressa\n"
 
-#: g10/mainproc.c:1332 g10/mainproc.c:1342
+#: g10/mainproc.c:1349 g10/mainproc.c:1359
 msgid "can't handle these multiple signatures\n"
 msgstr "impossibile gestire queste firme multiple\n"
 
-#: g10/mainproc.c:1352
+#: g10/mainproc.c:1369
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Firma scaduta il %s\n"
 
-#: g10/mainproc.c:1353
+#: g10/mainproc.c:1370
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                alias \""
 
-#: g10/mainproc.c:1357
+#: g10/mainproc.c:1374
 #, 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:1377
+#: g10/mainproc.c:1394
 msgid "Key available at: "
 msgstr "Chiave disponibile presso: "
 
-#: g10/mainproc.c:1482 g10/mainproc.c:1530
+#: g10/mainproc.c:1499 g10/mainproc.c:1547
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Firma NON corretta da \""
 
-#: g10/mainproc.c:1484 g10/mainproc.c:1532
+#: g10/mainproc.c:1501 g10/mainproc.c:1549
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Firma scaduta da \""
 
-#: g10/mainproc.c:1486 g10/mainproc.c:1534
+#: g10/mainproc.c:1503 g10/mainproc.c:1551
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Firma valida da \""
 
-#: g10/mainproc.c:1538
+#: g10/mainproc.c:1555
 msgid "[uncertain]"
 msgstr "[incerta]"
 
-#: g10/mainproc.c:1570
+#: g10/mainproc.c:1587
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \""
 
-#: g10/mainproc.c:1664
+#: g10/mainproc.c:1681
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Firma scaduta il %s\n"
 
-#: g10/mainproc.c:1669
+#: g10/mainproc.c:1686
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Questa firma scadr� il %s\n"
 
-#: g10/mainproc.c:1672
+#: g10/mainproc.c:1689
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "Firma %s, algoritmo di digest %s\n"
 
-#: g10/mainproc.c:1673
+#: g10/mainproc.c:1690
 msgid "binary"
 msgstr "binario"
 
-#: g10/mainproc.c:1674
+#: g10/mainproc.c:1691
 msgid "textmode"
 msgstr "modo testo"
 
-#: g10/mainproc.c:1674 g10/trustdb.c:530
+#: g10/mainproc.c:1691 g10/trustdb.c:531
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: g10/mainproc.c:1694
+#: g10/mainproc.c:1711
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossibile controllare la firma: %s\n"
 
-#: g10/mainproc.c:1762 g10/mainproc.c:1778 g10/mainproc.c:1864
+#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
 msgid "not a detached signature\n"
 msgstr "non � una firma separata\n"
 
-#: g10/mainproc.c:1805
+#: g10/mainproc.c:1822
 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:1813
+#: g10/mainproc.c:1830
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma solitaria di classe 0x%02x\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1887
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma vecchio stile (PGP 2.x)\n"
 
-#: g10/mainproc.c:1880
+#: g10/mainproc.c:1897
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "individuato un pacchetto radice non valido in proc_tree()\n"
 
-#: g10/misc.c:121
+#: g10/misc.c:122
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "impossibile disabilitare i core dump: %s\n"
 
-#: g10/misc.c:141 g10/misc.c:169 g10/misc.c:241
+#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "impossibile aprire il file: %s\n"
 
-#: g10/misc.c:206
+#: g10/misc.c:207
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: read fallita (n=%d): %s\n"
 
-#: g10/misc.c:315
+#: g10/misc.c:316
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n"
 
-#: g10/misc.c:330
+#: g10/misc.c:331
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algoritmo di cifratura non implementato"
 
-#: g10/misc.c:345
+#: g10/misc.c:346
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "Firma %s, algoritmo di digest %s\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:351
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "forzare l'algoritmo di digest %s (%d) viola le preferenze del destinatario\n"
 
-#: g10/misc.c:446
+#: g10/misc.c:447
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "il plugin per il cifrario IDEA non � presente\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:448
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 "per ulteriori informazioni si veda http://www.gnupg.org/it/why-not-idea."
 "html\n"
 
-#: g10/misc.c:680
+#: g10/misc.c:681
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d \"%s\" � una opzione deprecata\n"
 
-#: g10/misc.c:684
+#: g10/misc.c:685
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
 
-#: g10/misc.c:686
+#: g10/misc.c:687
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "usa al suo posto \"%s%s\"\n"
 
-#: g10/misc.c:697
+#: g10/misc.c:694
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
+msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
+
+#: g10/misc.c:707
 msgid "Uncompressed"
 msgstr "Non compresso"
 
-#: g10/misc.c:722
+#: g10/misc.c:732
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Non compresso"
 
-#: g10/misc.c:832
+#: g10/misc.c:842
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "questo messaggio pu� non essere utilizzabile da %s\n"
 
-#: g10/misc.c:989
+#: g10/misc.c:999
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/misc.c:1014
+#: g10/misc.c:1024
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinatario predefinito `%s' sconosciuto\n"
 
-#: g10/openfile.c:84
+#: g10/openfile.c:86
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Il file `%s' esiste. "
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Sovrascrivo (s/N)? "
 
-#: g10/openfile.c:119
+#: g10/openfile.c:121
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: suffisso sconosciuto\n"
 
-#: g10/openfile.c:141
+#: g10/openfile.c:143
 msgid "Enter new filename"
 msgstr "Inserire il nuovo nome del file"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:188
 msgid "writing to stdout\n"
 msgstr "scrivo su stdout\n"
 
-#: g10/openfile.c:296
+#: g10/openfile.c:300
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "suppongo che i dati firmati siano in `%s'\n"
 
-#: g10/openfile.c:375
+#: g10/openfile.c:379
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "creato un nuovo file di configurazione `%s'\n"
 
-#: g10/openfile.c:377
+#: g10/openfile.c:381
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 "ATTENZIONE: le opzioni in `%s' non sono ancora attive durante questa\n"
 "esecuzione del programma\n"
 
-#: g10/openfile.c:409
+#: g10/openfile.c:413
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: directory creata\n"
 
-#: g10/parse-packet.c:137
+#: g10/parse-packet.c:138
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n"
 
-#: g10/parse-packet.c:707
+#: g10/parse-packet.c:708
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "ATTENZIONE: la chiave di sessione cifrata simmetricamente � potenzialmente\n"
 "non sicura\n"
 
-#: g10/parse-packet.c:1132
+#: g10/parse-packet.c:1145
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
 
-#: g10/passphrase.c:478 g10/passphrase.c:525
+#: g10/passphrase.c:305
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent non � disponibile in questa sessione\n"
 
-#: g10/passphrase.c:486
-msgid "can't set client pid for the agent\n"
-msgstr "impossibile impostare il pid del client dell'agent\n"
-
-#: g10/passphrase.c:494
-msgid "can't get server read FD for the agent\n"
-msgstr "impossibile ottenere il FD di lettura dell'agent\n"
-
-#: g10/passphrase.c:501
-msgid "can't get server write FD for the agent\n"
-msgstr "impossibile ottenere il FD di scrittura dell'agent\n"
-
-#: g10/passphrase.c:534
+#: g10/passphrase.c:317
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n"
 
-#: g10/passphrase.c:547
+#: g10/passphrase.c:332
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "la versione %d del protocollo di gpg-agent non � gestita\n"
 
-#: g10/passphrase.c:568
+#: g10/passphrase.c:345
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "impossibile connettersi a `%s': %s\n"
 
-#: g10/passphrase.c:590
-msgid "communication problem with gpg-agent\n"
-msgstr "problema di comunicazione con gpg-agent\n"
-
-#: g10/passphrase.c:597 g10/passphrase.c:937 g10/passphrase.c:1049
+#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema con l'agent - uso dell'agent disattivato\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1209
+#: g10/passphrase.c:511 g10/passphrase.c:890
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (key ID principale %08lX)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:525
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4637,41 +4704,28 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s key, ID %08lX, created %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:550
 msgid "Repeat passphrase\n"
 msgstr "Ripeti la passphrase\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:552
 msgid "Enter passphrase\n"
 msgstr "Inserisci la passphrase\n"
 
-#: g10/passphrase.c:781
-msgid "passphrase too long\n"
-msgstr "passphrase troppo lunga\n"
-
-#: g10/passphrase.c:794
-msgid "invalid response from agent\n"
-msgstr "risposta non valida dall'agent\n"
-
-#: g10/passphrase.c:810 g10/passphrase.c:931
+#: g10/passphrase.c:628
 msgid "cancelled by user\n"
 msgstr "interrotto dall'utente\n"
 
-#: g10/passphrase.c:815 g10/passphrase.c:1020
-#, c-format
-msgid "problem with the agent: agent returns 0x%lx\n"
-msgstr "problema con l'agent: ha restituito 0x%lx\n"
-
-#: g10/passphrase.c:1100 g10/passphrase.c:1263
+#: g10/passphrase.c:781 g10/passphrase.c:944
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "impossibile chiedere la password in modo batch\n"
 
-#: g10/passphrase.c:1107 g10/passphrase.c:1268
+#: g10/passphrase.c:788 g10/passphrase.c:949
 msgid "Enter passphrase: "
 msgstr "Inserisci la passphrase: "
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:871
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4681,21 +4735,21 @@ msgstr ""
 "Ti serve una passphrase per sbloccare la chiave segreta\n"
 "dell'utente: \""
 
-#: g10/passphrase.c:1196
+#: g10/passphrase.c:877
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s"
 
-#: g10/passphrase.c:1205
+#: g10/passphrase.c:886
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1272
+#: g10/passphrase.c:953
 msgid "Repeat passphrase: "
 msgstr "Ripeti la passphrase: "
 
-#: g10/photoid.c:66
+#: g10/photoid.c:67
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4712,160 +4766,160 @@ msgstr ""
 "molto\n"
 "grande! Dimensioni vicine a 240x288 sono una buona scelta.\n"
 
-#: g10/photoid.c:80
+#: g10/photoid.c:81
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Inserisci il nome del file JPEG per l'ID fotografico: "
 
-#: g10/photoid.c:94
+#: g10/photoid.c:95
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "impossibile aprire il file: %s\n"
 
-#: g10/photoid.c:102
+#: g10/photoid.c:103
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:104
+#: g10/photoid.c:105
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Sei sicuro di volerla usare? (s/N) "
 
-#: g10/photoid.c:119
+#: g10/photoid.c:120
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\": non � un file JPEG\n"
 
-#: g10/photoid.c:136
+#: g10/photoid.c:137
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Questa foto � giusta? (s/N/q) "
 
-#: g10/photoid.c:338
+#: g10/photoid.c:339
 msgid "unable to display photo ID!\n"
 msgstr "impossibile mostrare l'ID fotografico\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:580
+#: g10/pkclist.c:62 g10/revoke.c:581
 msgid "No reason specified"
 msgstr "Nessuna ragione specificata"
 
-#: g10/pkclist.c:63 g10/revoke.c:582
+#: g10/pkclist.c:64 g10/revoke.c:583
 msgid "Key is superseded"
 msgstr "Questa chiave � stata sostituita"
 
-#: g10/pkclist.c:65 g10/revoke.c:581
+#: g10/pkclist.c:66 g10/revoke.c:582
 msgid "Key has been compromised"
 msgstr "Questa chiave � stata compromessa"
 
-#: g10/pkclist.c:67 g10/revoke.c:583
+#: g10/pkclist.c:68 g10/revoke.c:584
 msgid "Key is no longer used"
 msgstr "La chiave non � pi� usata"
 
-#: g10/pkclist.c:69 g10/revoke.c:584
+#: g10/pkclist.c:70 g10/revoke.c:585
 msgid "User ID is no longer valid"
 msgstr "L'user ID non � pi� valido"
 
-#: g10/pkclist.c:73
+#: g10/pkclist.c:74
 msgid "reason for revocation: "
 msgstr "ragione della revoca: "
 
-#: g10/pkclist.c:90
+#: g10/pkclist.c:91
 msgid "revocation comment: "
 msgstr "commento alla revoca: "
 
-#: g10/pkclist.c:205
+#: g10/pkclist.c:206
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:213
+#: g10/pkclist.c:214
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "Nessun valore di fiducia assegnato a:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:245
+#: g10/pkclist.c:246
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "                alias \""
 
-#: g10/pkclist.c:255
+#: g10/pkclist.c:256
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Questa chiave probabilmente appartiene al proprietario\n"
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:271
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = Non lo so\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = NON mi fido\n"
 
-#: g10/pkclist.c:278
+#: g10/pkclist.c:279
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Mi fido definitivamente\n"
 
-#: g10/pkclist.c:284
+#: g10/pkclist.c:285
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = torna al men� principale\n"
 
-#: g10/pkclist.c:287
+#: g10/pkclist.c:288
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " s = salta questa chiave\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " q = abbandona\n"
 
-#: g10/pkclist.c:292
+#: g10/pkclist.c:293
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:298 g10/revoke.c:609
+#: g10/pkclist.c:299 g10/revoke.c:610
 msgid "Your decision? "
 msgstr "Cosa hai deciso? "
 
-#: g10/pkclist.c:319
+#: g10/pkclist.c:320
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Vuoi davvero assegnare fiducia definitiva a questa chiave? "
 
-#: g10/pkclist.c:333
+#: g10/pkclist.c:334
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificati che portano a chiavi definitivamente affidabili:\n"
 
-#: g10/pkclist.c:418
+#: g10/pkclist.c:419
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Non ci sono indicazioni che la chiave appartenga al proprietario\n"
 
-#: g10/pkclist.c:423
+#: g10/pkclist.c:424
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Non ci sono indicazioni che la chiave appartenga al proprietario\n"
 
-#: g10/pkclist.c:429
+#: g10/pkclist.c:430
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Questa chiave probabilmente appartiene al proprietario\n"
 
-#: g10/pkclist.c:434
+#: g10/pkclist.c:435
 msgid "This key belongs to us\n"
 msgstr "Questa chiave ci appartiene\n"
 
-#: g10/pkclist.c:460
+#: g10/pkclist.c:461
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -4877,94 +4931,94 @@ msgstr ""
 "rispondere s� alla prossima domanda.\n"
 "\n"
 
-#: g10/pkclist.c:467
+#: g10/pkclist.c:468
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Uso lo stesso questa chiave? "
 
-#: g10/pkclist.c:501
+#: g10/pkclist.c:502
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ATTENZIONE: uso di una chiave non fidata!\n"
 
-#: g10/pkclist.c:508
+#: g10/pkclist.c:509
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "ATTENZIONE: questa chiave pu� essere stata revocata (la chiave di revoca\n"
 "non � presente).\n"
 
-#: g10/pkclist.c:517
+#: g10/pkclist.c:518
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr ""
 "ATTENZIONE: questa chiave � stata revocata dal suo revocatore designato!\n"
 
-#: g10/pkclist.c:520
+#: g10/pkclist.c:521
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ATTENZIONE: questa chiave � stata revocata dal suo proprietario!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Questo pu� significare che la firma � stata falsificata.\n"
 
-#: g10/pkclist.c:527
+#: g10/pkclist.c:528
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ATTENZIONE: questa subchiave � stata revocata dal proprietario!\n"
 
-#: g10/pkclist.c:532
+#: g10/pkclist.c:533
 msgid "Note: This key has been disabled.\n"
 msgstr "Nota: questa chiave � stata disabilitata.\n"
 
-#: g10/pkclist.c:537
+#: g10/pkclist.c:538
 msgid "Note: This key has expired!\n"
 msgstr "Nota: questa chiave � scaduta!\n"
 
-#: g10/pkclist.c:548
+#: g10/pkclist.c:549
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "ATTENZIONE: questa chiave non � certificata con una firma fidata!\n"
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:551
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Non ci sono indicazioni che la firma appartenga al proprietario.\n"
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:559
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATTENZIONE: NON ci fidiamo di questa chiave!\n"
 
-#: g10/pkclist.c:559
+#: g10/pkclist.c:560
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "          La firma � probabilmente un FALSO.\n"
 
-#: g10/pkclist.c:567
+#: g10/pkclist.c:568
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ATTENZIONE: questa chiave non � certificata con firme abbastanza fidate!\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:570
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Non � sicuro che la firma appartenga al proprietario.\n"
 
-#: g10/pkclist.c:734 g10/pkclist.c:767 g10/pkclist.c:936 g10/pkclist.c:996
+#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: saltata: %s\n"
 
-#: g10/pkclist.c:744 g10/pkclist.c:968
+#: g10/pkclist.c:745 g10/pkclist.c:969
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: saltata: chiave pubblica gi� presente\n"
 
-#: g10/pkclist.c:786
+#: g10/pkclist.c:787
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Non hai specificato un user ID. (puoi usare \"-r\")\n"
 
-#: g10/pkclist.c:802
+#: g10/pkclist.c:803
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:828
+#: g10/pkclist.c:829
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -4972,170 +5026,170 @@ msgstr ""
 "\n"
 "Inserisci l'user ID. Termina con una riga vuota: "
 
-#: g10/pkclist.c:844
+#: g10/pkclist.c:845
 msgid "No such user ID.\n"
 msgstr "User ID inesistente.\n"
 
-#: g10/pkclist.c:849 g10/pkclist.c:911
+#: g10/pkclist.c:850 g10/pkclist.c:912
 msgid "skipped: public key already set as default recipient\n"
 msgstr "saltata: chiave pubblica gi� impostata come destinatario predefinito\n"
 
-#: g10/pkclist.c:867
+#: g10/pkclist.c:868
 msgid "Public key is disabled.\n"
 msgstr "La chiave pubblica � disabilitata.\n"
 
-#: g10/pkclist.c:874
+#: g10/pkclist.c:875
 msgid "skipped: public key already set\n"
 msgstr "saltata: chiave pubblica gi� impostata\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:904
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "destinatario predefinito `%s' sconosciuto\n"
 
-#: g10/pkclist.c:948
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: saltata: chiave pubblica disabilitata\n"
 
-#: g10/pkclist.c:1003
+#: g10/pkclist.c:1004
 msgid "no valid addressees\n"
 msgstr "nessun indirizzo valido\n"
 
-#: g10/plaintext.c:90
+#: g10/plaintext.c:91
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "i dati non sono stati salvati; usa l'opzione \"--output\" per salvarli\n"
 
-#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
+#: g10/plaintext.c:136 g10/plaintext.c:141 g10/plaintext.c:159
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "errore creando `%s': %s\n"
 
-#: g10/plaintext.c:446
+#: g10/plaintext.c:447
 msgid "Detached signature.\n"
 msgstr "Firma separata.\n"
 
-#: g10/plaintext.c:450
+#: g10/plaintext.c:452
 msgid "Please enter name of data file: "
 msgstr "Inserisci il nome del file di dati: "
 
-#: g10/plaintext.c:478
+#: g10/plaintext.c:481
 msgid "reading stdin ...\n"
 msgstr "viene letto stdin...\n"
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:515
 msgid "no signed data\n"
 msgstr "non ci sono dati firmati\n"
 
-#: g10/plaintext.c:526
+#: g10/plaintext.c:529
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "impossibile aprire i dati firmati `%s'\n"
 
-#: g10/pubkey-enc.c:103
+#: g10/pubkey-enc.c:104
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "destinatario anonimo; provo la chiave segreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:119
+#: g10/pubkey-enc.c:120
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "bene, siamo il destinatario anonimo.\n"
 
-#: g10/pubkey-enc.c:207
+#: g10/pubkey-enc.c:208
 msgid "old encoding of the DEK is not supported\n"
 msgstr "la vecchia codifica del DEK non � gestita\n"
 
-#: g10/pubkey-enc.c:228
+#: g10/pubkey-enc.c:229
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "l'algoritmo di cifratura %d%s � sconosciuto o disattivato\n"
 
-#: g10/pubkey-enc.c:266
+#: g10/pubkey-enc.c:267
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 "NOTA: l'algoritmo di cifratura %d non � stato trovato tra le preferenze\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:287
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTA: chiave %08lX scaduta il %s\n"
 
-#: g10/pubkey-enc.c:292
+#: g10/pubkey-enc.c:293
 msgid "NOTE: key has been revoked"
 msgstr "NOTA: la chiave � stata revocata"
 
-#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:545
+#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
+#: g10/revoke.c:188 g10/revoke.c:546
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet fallito: %s\n"
 
-#: g10/revoke.c:146
+#: g10/revoke.c:147
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "chiave %08lX: nessun user ID\n"
 
-#: g10/revoke.c:272
+#: g10/revoke.c:273
 msgid "To be revoked by:\n"
 msgstr "Revocabile da:\n"
 
-#: g10/revoke.c:276
+#: g10/revoke.c:277
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Questa � una chiave di revoca sensibile)\n"
 
-#: g10/revoke.c:280
+#: g10/revoke.c:281
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Creare un certificato di revoca per questa chiave? "
 
-#: g10/revoke.c:293 g10/revoke.c:511
+#: g10/revoke.c:294 g10/revoke.c:512
 msgid "ASCII armored output forced.\n"
 msgstr "Forzato l'output con armatura ASCII.\n"
 
-#: g10/revoke.c:307 g10/revoke.c:525
+#: g10/revoke.c:308 g10/revoke.c:526
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet fallito: %s\n"
 
-#: g10/revoke.c:370
+#: g10/revoke.c:371
 msgid "Revocation certificate created.\n"
 msgstr "Certificato di revoca creato.\n"
 
-#: g10/revoke.c:376
+#: g10/revoke.c:377
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "non sono state trovate chiavi di revoca per `%s'\n"
 
-#: g10/revoke.c:432
+#: g10/revoke.c:433
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "chiave segreta `%s' non trovata: %s\n"
 
-#: g10/revoke.c:461
+#: g10/revoke.c:462
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "non c'� una chiave pubblica corrispondente: %s\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:473
 msgid "public key does not match secret key!\n"
 msgstr "la chiave pubblica non corrisponde alla chiave segreta!\n"
 
-#: g10/revoke.c:479
+#: g10/revoke.c:480
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Creare un certificato di revoca per questa chiave? "
 
-#: g10/revoke.c:496
+#: g10/revoke.c:497
 msgid "unknown protection algorithm\n"
 msgstr "algoritmo di protezione sconosciuto\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOTA: Questa chiave non � protetta!\n"
 
-#: g10/revoke.c:551
+#: g10/revoke.c:552
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5155,116 +5209,116 @@ msgstr ""
 "disponibili\n"
 "ad altri!\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid "Please select the reason for the revocation:\n"
 msgstr "Per favore scegli il motivo della revoca:\n"
 
-#: g10/revoke.c:602
+#: g10/revoke.c:603
 msgid "Cancel"
 msgstr "Cancella"
 
-#: g10/revoke.c:604
+#: g10/revoke.c:605
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Probabilmente volevi scegliere %d)\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:646
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Inserisci una descrizione opzionale; terminala con una riga vuota:\n"
 
-#: g10/revoke.c:673
+#: g10/revoke.c:674
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Motivo della revoca: %s\n"
 
-#: g10/revoke.c:675
+#: g10/revoke.c:676
 msgid "(No description given)\n"
 msgstr "(Non � stata data una descrizione)\n"
 
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Va bene cos�? "
 
-#: g10/seckey-cert.c:54
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "parti della chiave segreta non sono disponibili\n"
 
-#: g10/seckey-cert.c:60
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "l'algoritmo di protezione %d%s non � gestito\n"
 
-#: g10/seckey-cert.c:71
+#: g10/seckey-cert.c:72
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "l'algoritmo di protezione %d%s non � gestito\n"
 
-#: g10/seckey-cert.c:265
+#: g10/seckey-cert.c:266
 msgid "Invalid passphrase; please try again"
 msgstr "Passphrase non valida; riprova"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:267
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:326
+#: g10/seckey-cert.c:327
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "ATTENZIONE: Individuata una chiave debole - per favore cambia ancora la\n"
 "passphrase.\n"
 
-#: g10/seckey-cert.c:364
+#: g10/seckey-cert.c:365
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "genero il checksum a 16 bit deprecato per la protezione della chiave "
 "segreta\n"
 
-#: g10/seskey.c:52
+#: g10/seskey.c:53
 msgid "weak key created - retrying\n"
 msgstr "creata una chiave debole - riprovo\n"
 
-#: g10/seskey.c:57
+#: g10/seskey.c:58
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "Impossibile evitare una chiave debole per il cifrario simmetrico;\n"
 "ho provato %d volte!\n"
 
-#: g10/seskey.c:213
+#: g10/seskey.c:214
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA richiede l'uso di un algoritmo di hashing con almeno 160 bit\n"
 
-#: g10/sig-check.c:75
+#: g10/sig-check.c:76
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "ATTENZIONE: conflitto del digest delle firme nel messaggio\n"
 
-#: g10/sig-check.c:99
+#: g10/sig-check.c:100
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 "ATTENZIONE: la sottochiave per firme %08lX non ha una certificature "
 "incrociata\n"
 
-#: g10/sig-check.c:102
+#: g10/sig-check.c:103
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "ATTENZIONE: la sottochiave per firme %08lX ha una certificature incrociata\n"
 "non valida\n"
 
-#: g10/sig-check.c:168
+#: g10/sig-check.c:169
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "la chiave pubblica %08lX � pi� recente della firma di %lu secondo\n"
 
-#: g10/sig-check.c:169
+#: g10/sig-check.c:170
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "la chiave pubblica %08lX � pi� recente della firma di %lu secondi\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:181
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5272,7 +5326,7 @@ msgstr ""
 "la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:183
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5280,60 +5334,60 @@ msgstr ""
 "la chiave � stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:193
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTA: chiave per firmare %08lX scaduta il %s\n"
 
-#: g10/sig-check.c:275
+#: g10/sig-check.c:276
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "si suppone una firma non valida della chiave %08lX a causa di un\n"
 "bit critico sconosciuto\n"
 
-#: g10/sig-check.c:532
+#: g10/sig-check.c:533
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
 "chiave %08lX: non c'� una subchiave per il pacchetto di revoca della "
 "subchiave\n"
 
-#: g10/sig-check.c:558
+#: g10/sig-check.c:559
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
 "chiave %08lX: non c'� una subchiave per la firma di collegamento della "
 "subchiave\n"
 
-#: g10/sign.c:85
+#: g10/sign.c:86
 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:93
+#: g10/sign.c:94
 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:112
+#: g10/sign.c:113
 #, 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:138
+#: g10/sign.c:139
 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:146
+#: g10/sign.c:147
 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:159
+#: g10/sign.c:160
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5342,7 +5396,7 @@ msgstr ""
 "lunga).\n"
 "Usata inespansa.\n"
 
-#: g10/sign.c:187
+#: g10/sign.c:188
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5352,76 +5406,76 @@ msgstr ""
 "lunga).\n"
 "Usata inespansa.\n"
 
-#: g10/sign.c:364
+#: g10/sign.c:365
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "controllo della firma creata fallito: %s\n"
 
-#: g10/sign.c:373
+#: g10/sign.c:374
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "Firma %s da: \"%s\"\n"
 
-#: g10/sign.c:741
+#: g10/sign.c:761
 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:808
+#: g10/sign.c:830
 #, 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:900
+#: g10/sign.c:922
 msgid "signing:"
 msgstr "firma:"
 
-#: g10/sign.c:1007
+#: g10/sign.c:1034
 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:1180
+#: g10/sign.c:1212
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "sar� usato il cifrario %s\n"
 
-#: g10/skclist.c:126 g10/skclist.c:190
+#: g10/skclist.c:127 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "la chiave non � indicata come insicura - impossibile usarla con il RNG "
 "finto!\n"
 
-#: g10/skclist.c:157
+#: g10/skclist.c:158
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "saltata `%s': doppia\n"
 
-#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "saltata `%s': %s\n"
 
-#: g10/skclist.c:170
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
 
-#: g10/skclist.c:185
+#: g10/skclist.c:186
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "saltata %s: questa � una chiave ElGamal generata da PGP che NON � sicura per "
 "le firme!\n"
 
-#: g10/tdbdump.c:59 g10/trustdb.c:365
+#: g10/tdbdump.c:60 g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "trust record %lu, req type %d: write fallita: %s\n"
 
-#: g10/tdbdump.c:104
+#: g10/tdbdump.c:105
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5430,348 +5484,348 @@ msgstr ""
 "# Lista dei valori della fiducia assegnati, creata il %s\n"
 "# (Usa \"gpg --import-ownertrust\" per ripristinarli)\n"
 
-#: g10/tdbdump.c:159 g10/tdbdump.c:167 g10/tdbdump.c:172 g10/tdbdump.c:177
+#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: g10/tdbdump.c:159
+#: g10/tdbdump.c:160
 #, fuzzy
 msgid "line too long"
 msgstr "riga troppo lunga\n"
 
-#: g10/tdbdump.c:167
+#: g10/tdbdump.c:168
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:173
+#: g10/tdbdump.c:174
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "errore: impronta digitale non valida\n"
 
-#: g10/tdbdump.c:178
+#: g10/tdbdump.c:179
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr "importa i valori di fiducia"
 
-#: g10/tdbdump.c:214
+#: g10/tdbdump.c:215
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "errore cercando il record della fiducia: %s\n"
 
-#: g10/tdbdump.c:218
+#: g10/tdbdump.c:219
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "errore di lettura: %s\n"
 
-#: g10/tdbdump.c:227 g10/trustdb.c:380
+#: g10/tdbdump.c:228 g10/trustdb.c:381
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync fallita: %s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1440
+#: g10/tdbio.c:129 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek fallita: %s\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1447
+#: g10/tdbio.c:135 g10/tdbio.c:1448
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: scrittura fallita (n=%d): %s\n"
 
-#: g10/tdbio.c:244
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "transazione del trustdb troppo grande\n"
 
-#: g10/tdbio.c:497
+#: g10/tdbio.c:498
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "impossibile chiudere `%s': %s\n"
 
-#: g10/tdbio.c:512
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: la directory non esiste!\n"
 
-#: g10/tdbio.c:522 g10/tdbio.c:545 g10/tdbio.c:588
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "impossibile creare `%s': %s\n"
 
-#: g10/tdbio.c:524 g10/tdbio.c:591
+#: g10/tdbio.c:525 g10/tdbio.c:592
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "impossibile aprire `%s'\n"
 
-#: g10/tdbio.c:550
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: creazione del record della versione fallita: %s"
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: � stato creato un trustdb non valido\n"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: creato il trustdb\n"
 
-#: g10/tdbio.c:597
+#: g10/tdbio.c:598
 msgid "NOTE: trustdb not writable\n"
 msgstr "NOTA: il trustdb non � scrivibile\n"
 
-#: g10/tdbio.c:614
+#: g10/tdbio.c:615
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: trustdb non valido\n"
 
-#: g10/tdbio.c:646
+#: g10/tdbio.c:647
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: creazione della tabella hash fallita: %s\n"
 
-#: g10/tdbio.c:654
+#: g10/tdbio.c:655
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: errore durante l'aggiornamento del record di versione: %s\n"
 
-#: g10/tdbio.c:671 g10/tdbio.c:691 g10/tdbio.c:707 g10/tdbio.c:721
-#: g10/tdbio.c:751 g10/tdbio.c:1373 g10/tdbio.c:1400
+#: g10/tdbio.c:672 g10/tdbio.c:692 g10/tdbio.c:708 g10/tdbio.c:722
+#: g10/tdbio.c:752 g10/tdbio.c:1374 g10/tdbio.c:1401
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: errore durante la lettura del record di versione: %s\n"
 
-#: g10/tdbio.c:730
+#: g10/tdbio.c:731
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: errore durante la scrittura del record di versione: %s\n"
 
-#: g10/tdbio.c:1169
+#: g10/tdbio.c:1170
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek fallita: %s\n"
 
-#: g10/tdbio.c:1177
+#: g10/tdbio.c:1178
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read fallita (n=%d): %s\n"
 
-#: g10/tdbio.c:1198
+#: g10/tdbio.c:1199
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: non � un file di trustdb\n"
 
-#: g10/tdbio.c:1216
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: record di versione con recnum %lu\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1222
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versione %d del file non valida\n"
 
-#: g10/tdbio.c:1406
+#: g10/tdbio.c:1407
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: errore durante la lettura del record libero: %s\n"
 
-#: g10/tdbio.c:1414
+#: g10/tdbio.c:1415
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: errore durante la scrittura del dir record: %s\n"
 
-#: g10/tdbio.c:1424
+#: g10/tdbio.c:1425
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: azzeramento di un record fallito: %s\n"
 
-#: g10/tdbio.c:1454
+#: g10/tdbio.c:1455
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: accodatura a un record fallita: %s\n"
 
-#: g10/tdbio.c:1499
+#: g10/tdbio.c:1500
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "Il trustdb � danneggiato; eseguire \"gpg --fix-trust-db\".\n"
 
-#: g10/textfilter.c:147
+#: g10/textfilter.c:148
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "impossibile gestire linee di testo pi� lunghe di %d caratteri\n"
 
-#: g10/textfilter.c:244
+#: g10/textfilter.c:245
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "linea di input pi� lunga di %d caratteri\n"
 
-#: g10/trustdb.c:226
+#: g10/trustdb.c:227
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' non � un key ID lungo valido\n"
 
-#: g10/trustdb.c:257
+#: g10/trustdb.c:258
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "chiave %08lX: accettata come chiave affidabile\n"
 
-#: g10/trustdb.c:295
+#: g10/trustdb.c:296
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "chiave %08lX: appare nel trustdb pi� di una volta\n"
 
-#: g10/trustdb.c:310
+#: g10/trustdb.c:311
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "chiave %08lX: manca la chiave pubblica della chiave fidata - ignorata\n"
 
-#: g10/trustdb.c:320
+#: g10/trustdb.c:321
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "chiavi marcate definitivamente affidabili.\n"
 
-#: g10/trustdb.c:344
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "trust record %lu, tipo %d: read fallita: %s\n"
 
-#: g10/trustdb.c:350
+#: g10/trustdb.c:351
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "il trust record %lu non � del tipo richiesto %d\n"
 
-#: g10/trustdb.c:446
+#: g10/trustdb.c:447
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:452
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:506
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[revocata]"
 
-#: g10/trustdb.c:508 g10/trustdb.c:513
+#: g10/trustdb.c:509 g10/trustdb.c:514
 #, fuzzy
 msgid "[ expired]"
 msgstr "[scaduta]"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 #, fuzzy
 msgid "[ unknown]"
 msgstr "sconosciuto"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 #, fuzzy
 msgid "never"
 msgstr "mai       "
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:536
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:576
+#: g10/trustdb.c:577
 msgid "no need for a trustdb check\n"
 msgstr "non � necessario un controllo del trustdb\n"
 
-#: g10/trustdb.c:582 g10/trustdb.c:2157
+#: g10/trustdb.c:583 g10/trustdb.c:2309
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "il prossimoi controllo del trustdb sar� fatto il %s\n"
 
-#: g10/trustdb.c:591
+#: 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:606
+#: 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:838 g10/trustdb.c:1276
+#: 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:1033
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr "per favore usa --check-trustdb\n"
 
-#: g10/trustdb.c:1037
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "controllo il trustdb\n"
 
-#: g10/trustdb.c:1901
+#: g10/trustdb.c:2053
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d chiavi processate (%d conteggi di validit� azzerati)\n"
 
-#: g10/trustdb.c:1965
+#: g10/trustdb.c:2117
 msgid "no ultimately trusted keys found\n"
 msgstr "non � stata trovata alcuna chiave definitivamente affidabile\n"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:2131
 #, 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:2002
+#: g10/trustdb.c:2154
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2240
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2163
+#: g10/trustdb.c:2315
 #, 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"
 
-#: g10/verify.c:116
+#: g10/verify.c:117
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -5781,305 +5835,336 @@ msgstr ""
 "Ricorda che il file con la firma (.sig or .asc) deve\n"
 "essere il primo file indicato sulla riga di comando.\n"
 
-#: g10/verify.c:189
+#: g10/verify.c:190
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "linea di input %u troppo lunga o LF mancante\n"
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "errore generale"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "pacchetto di tipo sconosciuto"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "versione sconosciuta"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "algoritmo della chiave pubblica sconosciuto"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "algoritmo del digest sconosciuto"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "chiave pubblica errata"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "chiave segreta errata"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "firma errata"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "codice di controllo errato"
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "passphrase errata"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "chiave pubblica non trovata"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "algoritmo di cifratura sconosciuto"
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "impossibile aprire il portachiavi"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "pacchetto non valido"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "armatura non valida"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "l'user id non esiste"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "la chiave segreta non � disponibile"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "� stata usata la chiave segreta sbagliata"
 
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "non gestito"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "chiave sbagliata"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "errore durante la lettura del file"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "errore durante la scrittura del file"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "algoritmo di compressione sconosciuto"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "errore durante l'apertura del file"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "errore durante la creazione del file"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "passphrase non valida"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "algoritmo della chiave pubblica non implementato"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "algoritmo di cifratura non implementato"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "classe della firma sconosciuta"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "errore nel database della fiducia"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "MPI danneggiato"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "limite della risorsa"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "portachiavi non valido"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "certificato danneggiato"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "user id malformato"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "errore durante la chiusura del file"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "errore durante la rinominazione del file"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "errore durante la cancellazione del file"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "dati inattesi"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "date in conflitto"
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "algoritmo della chiave pubblica non utilizzabile"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "il file esiste"
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "chiave debole"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "argomento non valido"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "URI non valida"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "URI non gestito"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "errore di rete"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "non cifrato"
 
 # ??? (Md)
-#: util/errors.c:103
+#: util/errors.c:104
 msgid "not processed"
 msgstr "non esaminato"
 
-#: util/errors.c:105
+#: util/errors.c:106
 msgid "unusable public key"
 msgstr "chiave pubblica inutilizzabile"
 
-#: util/errors.c:106
+#: util/errors.c:107
 msgid "unusable secret key"
 msgstr "chiave segreta inutilizzabile"
 
-#: util/errors.c:107
+#: util/errors.c:108
 msgid "keyserver error"
 msgstr "errore del keyserver"
 
-#: util/errors.c:108
+#: util/errors.c:109
 #, fuzzy
 msgid "canceled"
 msgstr "Cancella"
 
-#: util/errors.c:109
+#: util/errors.c:110
 #, fuzzy
 msgid "no card"
 msgstr "non cifrato"
 
-#: util/logger.c:157
+#: util/logger.c:158
 msgid "ERROR: "
 msgstr ""
 
-#: util/logger.c:160
+#: util/logger.c:161
 msgid "WARNING: "
 msgstr ""
 
-#: util/logger.c:223
+#: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... questo � un bug (%s:%d:%s)\n"
 
-#: util/logger.c:229
+#: util/logger.c:230
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "hai trovato un bug... (%s:%d)\n"
 
-#: util/miscutil.c:336 util/miscutil.c:373
+#: util/miscutil.c:330 util/miscutil.c:367
 msgid "yes"
 msgstr "si|s�"
 
-#: util/miscutil.c:337 util/miscutil.c:378
+#: util/miscutil.c:331 util/miscutil.c:372
 msgid "yY"
 msgstr "sS"
 
-#: util/miscutil.c:339 util/miscutil.c:375
+#: util/miscutil.c:333 util/miscutil.c:369
 msgid "no"
 msgstr "no"
 
-#: util/miscutil.c:340 util/miscutil.c:379
+#: util/miscutil.c:334 util/miscutil.c:373
 msgid "nN"
 msgstr "nN"
 
-#: util/miscutil.c:377
+#: util/miscutil.c:371
 msgid "quit"
 msgstr "quit"
 
-#: util/miscutil.c:380
+#: util/miscutil.c:374
 msgid "qQ"
 msgstr "qQ"
 
-#: util/miscutil.c:413
+#: util/miscutil.c:407
 msgid "okay|okay"
 msgstr ""
 
-#: util/miscutil.c:415
+#: util/miscutil.c:409
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:416
+#: util/miscutil.c:410
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:417
+#: util/miscutil.c:411
 #, fuzzy
 msgid "cC"
 msgstr "c"
 
-#: util/secmem.c:90
+#: util/secmem.c:91
 msgid "WARNING: using insecure memory!\n"
 msgstr "ATTENZIONE: si sta usando memoria insicura!\n"
 
-#: util/secmem.c:91
+#: util/secmem.c:92
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "visitare http://www.gnupg.org/faq.html per ulteriori informazioni\n"
 
-#: util/secmem.c:343
+#: util/secmem.c:344
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "l'operazione non � possibile senza memoria sicura inizializzata\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:345
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n"
 
+#, fuzzy
+#~ msgid "error getting serial number: %s\n"
+#~ msgstr "errore nella creazione della passhprase: %s\n"
+
+#~ msgid "Hint: Select the user IDs to sign\n"
+#~ msgstr "Suggerimento: seleziona gli user ID da firmare\n"
+
+#~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+#~ msgstr "passphrase errata o algoritmo di cifratura sconosciuto (%d)\n"
+
+#~ msgid "can't set client pid for the agent\n"
+#~ msgstr "impossibile impostare il pid del client dell'agent\n"
+
+#~ msgid "can't get server read FD for the agent\n"
+#~ msgstr "impossibile ottenere il FD di lettura dell'agent\n"
+
+#~ msgid "can't get server write FD for the agent\n"
+#~ msgstr "impossibile ottenere il FD di scrittura dell'agent\n"
+
+#~ msgid "communication problem with gpg-agent\n"
+#~ msgstr "problema di comunicazione con gpg-agent\n"
+
+#~ msgid "passphrase too long\n"
+#~ msgstr "passphrase troppo lunga\n"
+
+#~ msgid "invalid response from agent\n"
+#~ msgstr "risposta non valida dall'agent\n"
+
+#~ msgid "problem with the agent: agent returns 0x%lx\n"
+#~ msgstr "problema con l'agent: ha restituito 0x%lx\n"
+
 #~ msgid "select secondary key N"
 #~ msgstr "scegli la chiave secondaria N"
 
diff --git a/po/ja.po b/po/ja.po
index 84f6e17d5..a428d20a4 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: 2005-03-15 16:35+0100\n"
+"POT-Creation-Date: 2005-05-31 10:05+0200\n"
 "PO-Revision-Date: 2004-11-23 11:14+0900\n"
 "Last-Translator: IIDA Yosiaki <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
@@ -17,80 +17,80 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:120
+#: cipher/primegen.c:121
 #, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr "pbits=%u qbits=%u���ǿ��������Ǥ��ޤ���\n"
 
-#: cipher/primegen.c:311
+#: cipher/primegen.c:312
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "%d �ӥå�̤�����ǿ��������Ǥ��ޤ���\n"
 
-#: cipher/random.c:163
+#: cipher/random.c:164
 msgid "no entropy gathering module detected\n"
 msgstr "����ȥ��ԡ������⥸�塼�뤬�����Ф���Ƥ��ޤ���\n"
 
-#: cipher/random.c:387 g10/card-util.c:656 g10/card-util.c:725
-#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2255
-#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
-#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
-#: g10/tdbio.c:600
+#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
+#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
+#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
+#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
+#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/tdbio.c:601
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "��%s�פ������ޤ���: %s\n"
 
-#: cipher/random.c:391
+#: cipher/random.c:392
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "��%s�פ�Ĵ�٤뤳�Ȥ��Ǥ��ޤ���: %s\n"
 
-#: cipher/random.c:396
+#: cipher/random.c:397
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "��%s�פ����̤Υե�����ǤϤ���ޤ��� - ̵��\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:402
 msgid "note: random_seed file is empty\n"
 msgstr "����: random_seed �ե�����϶��Ǥ�\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:408
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "�ٹ�: ̵����Ĺ���� random_seed �ե����� - �Ȥ��ޤ���\n"
 
-#: cipher/random.c:415
+#: cipher/random.c:416
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "��%s�פ��ɤ�ޤ���: %s\n"
 
-#: cipher/random.c:453
+#: cipher/random.c:454
 msgid "note: random_seed file not updated\n"
 msgstr "����: random_seed �ե�����ι����򤷤ޤ���\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2723
-#: g10/keygen.c:2753 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
-#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:481
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "��%s�פ˽񤭹���ޤ���: %s\n"
 
-#: cipher/random.c:483
+#: cipher/random.c:484
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "��%s�פ��Ĥ����ޤ���: %s\n"
 
-#: cipher/random.c:728
+#: cipher/random.c:729
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "�ٹ�: ���ݤ���������Ҥ��Ȥ��Ƥ��ޤ�!!\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:730
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -104,7 +104,7 @@ msgstr ""
 "���Υץ����������������ǡ�������ڻȤäƤϤ����ޤ���!!\n"
 "\n"
 
-#: cipher/rndegd.c:204
+#: cipher/rndegd.c:205
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -113,7 +113,7 @@ msgstr ""
 "�𻨤���������Ƥ��ޤ��Τǡ����Ԥ������������𻨤��μ�������\n"
 "���ޤ��Τǡ��⤷˰�����鲿����Ȥ��Ƥ���������\n"
 
-#: cipher/rndlinux.c:134
+#: cipher/rndlinux.c:135
 #, c-format
 msgid ""
 "\n"
@@ -124,45 +124,62 @@ msgstr ""
 "��ʬ��Ĺ��������������ޤ���OS����ä��𻨤������\n"
 "�Ǥ���褦���������Ƥ�������! (����%d�Х��Ȥ���ޤ�)\n"
 
-#: g10/app-openpgp.c:547
+#: g10/app-openpgp.c:596
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "������ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/app-openpgp.c:560
+#: g10/app-openpgp.c:609
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "���������ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
+#: g10/app-openpgp.c:977
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "�����ɽФ��˼��Ԥ��ޤ���: %s\n"
+
+#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+msgid "response does not contain the public key data\n"
+msgstr "�����˸������ǡ������ޤޤ�Ƥ��ޤ���\n"
+
+#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+msgid "response does not contain the RSA modulus\n"
+msgstr "������RSA��ˡ(modulus)���ޤޤ�Ƥ��ޤ���\n"
+
+#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+msgid "response does not contain the RSA public exponent\n"
+msgstr "������RSA�����ؿ����ޤޤ�Ƥ��ޤ���\n"
+
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN������Хå������顼���ᤷ�ޤ���: %s\n"
 
-#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "CHV%d��PIN��û�����ޤ�����û��%d\n"
 
-#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
-#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
+#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
+#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "CHV%d�θ��ڤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/app-openpgp.c:836
+#: g10/app-openpgp.c:1310
 msgid "access to admin commands is not configured\n"
 msgstr "�������ޥ�ɤؤΥ���������������ꤵ��Ƥ��ޤ���\n"
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
 msgid "error retrieving CHV status from card\n"
 msgstr "�����ɤ����CHV���֤θ����ǥ��顼\n"
 
-#: g10/app-openpgp.c:857
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
 msgid "card is permanently locked!\n"
 msgstr "�����ɤ��ʵפ˥��å�����ޤ�!\n"
 
-#: g10/app-openpgp.c:862
+#: g10/app-openpgp.c:1336
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "�����ɤαʵץ��å�����%d��Admin PIN�����Ƥ��ޤ�\n"
@@ -170,335 +187,341 @@ msgstr "�����ɤαʵץ��å�����%d��Admin PIN�����Ƥ��ޤ�\n"
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:869
+#: g10/app-openpgp.c:1343
 msgid "|A|Admin PIN"
 msgstr "|A|Admin PIN"
 
-#: g10/app-openpgp.c:1018
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:1492
 #, fuzzy
 msgid "|AN|New Admin PIN"
 msgstr "|A|������Admin PIN"
 
-#: g10/app-openpgp.c:1018
+#: g10/app-openpgp.c:1492
 #, fuzzy
 msgid "|N|New PIN"
 msgstr "������PIN"
 
-#: g10/app-openpgp.c:1022
+#: g10/app-openpgp.c:1496
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "������PIN�μ������顼: %s\n"
 
-#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
+#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
 msgid "error reading application data\n"
 msgstr "���ץꥱ������󡦥ǡ������ɽФ����顼\n"
 
-#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
+#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
 msgid "error reading fingerprint DO\n"
 msgstr "����ǡ��������֥������Ȥ��ɽФ����顼\n"
 
-#: g10/app-openpgp.c:1104
+#: g10/app-openpgp.c:1562
 msgid "key already exists\n"
 msgstr "���Ϥ⤦����ޤ�\n"
 
-#: g10/app-openpgp.c:1108
+#: g10/app-openpgp.c:1566
 msgid "existing key will be replaced\n"
 msgstr "��¸�θ��ϸ򴹤���ޤ�\n"
 
-#: g10/app-openpgp.c:1110
+#: g10/app-openpgp.c:1568
 msgid "generating new key\n"
 msgstr "��������������\n"
 
-#: g10/app-openpgp.c:1120
+#: g10/app-openpgp.c:1735
+msgid "creation timestamp missing\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1742
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1749
+#, fuzzy, c-format
+msgid "RSA public exponent missing or largerr than %d bits\n"
+msgstr "�����ؿ����礭�����ޤ� (32�ӥåȤ����)\n"
+
+#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1827
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "�����ݴɤ˼��Ԥ��ޤ���: %s\n"
+
+#: g10/app-openpgp.c:1886
 msgid "please wait while key is being generated ...\n"
 msgstr "�������δ֡����Ԥ��������� ...\n"
 
-#: g10/app-openpgp.c:1135
+#: g10/app-openpgp.c:1901
 msgid "generating key failed\n"
 msgstr "���������˼��Ԥ��ޤ���\n"
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1904
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "������������λ���ޤ��� (%d��)\n"
 
-#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
-msgid "response does not contain the public key data\n"
-msgstr "�����˸������ǡ������ޤޤ�Ƥ��ޤ���\n"
-
-#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
-msgid "response does not contain the RSA modulus\n"
-msgstr "������RSA��ˡ(modulus)���ޤޤ�Ƥ��ޤ���\n"
-
-#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
-msgid "response does not contain the RSA public exponent\n"
-msgstr "������RSA�����ؿ����ޤޤ�Ƥ��ޤ���\n"
-
-#: g10/app-openpgp.c:1195
+#: g10/app-openpgp.c:1961
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "OpenPGP�����ɤ�̵���ʹ�¤ (�ǡ��������֥������� 0x93)\n"
 
-#: g10/app-openpgp.c:1356
+#: g10/app-openpgp.c:2130
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "����ޤǤ˺������줿��̾: %lu\n"
 
-#: g10/app-openpgp.c:1364
-#, c-format
-msgid "PIN [sigs done: %lu]"
+#: g10/app-openpgp.c:2138
+#, fuzzy, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "PIN [��̾��: %lu]"
 
-#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
+#: g10/app-openpgp.c:2399
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "%s�˥��������Ǥ��ޤ��� - ̵����OpenPGP������?\n"
 
-#: g10/app-openpgp.c:1731
-#, c-format
-msgid "error getting serial number: %s\n"
-msgstr "���֤μ������顼: %s\n"
-
-#: g10/app-openpgp.c:1826
-#, c-format
-msgid "failed to store the key: %s\n"
-msgstr "�����ݴɤ˼��Ԥ��ޤ���: %s\n"
-
-#: g10/app-openpgp.c:1868
-msgid "reading the key failed\n"
-msgstr "�����ɽФ��˼��Ԥ��ޤ���: %s\n"
-
-#: g10/armor.c:317
+#: g10/armor.c:318
 #, c-format
 msgid "armor: %s\n"
 msgstr "����: %s\n"
 
-#: g10/armor.c:346
+#: g10/armor.c:347
 msgid "invalid armor header: "
 msgstr "̵���������إå���: "
 
-#: g10/armor.c:353
+#: g10/armor.c:354
 msgid "armor header: "
 msgstr "�����إå���: "
 
-#: g10/armor.c:364
+#: g10/armor.c:365
 msgid "invalid clearsig header\n"
 msgstr "̵���ʥ��ꥢ��̾�إå���\n"
 
-#: g10/armor.c:416
+#: g10/armor.c:417
 msgid "nested clear text signatures\n"
 msgstr "����ҤΥ��ꥢ��̾\n"
 
-#: g10/armor.c:551
+#: g10/armor.c:552
 msgid "unexpected armor: "
 msgstr "ͽ����������: "
 
-#: g10/armor.c:563
+#: g10/armor.c:564
 msgid "invalid dash escaped line: "
 msgstr "̵���ʥ��å���ǥ��������פ��줿��: "
 
-#: g10/armor.c:715 g10/armor.c:1322
+#: g10/armor.c:716 g10/armor.c:1323
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "̵����64��ʸ��%02X��ȤФ��ޤ���\n"
 
-#: g10/armor.c:758
+#: g10/armor.c:759
 msgid "premature eof (no CRC)\n"
 msgstr "�ե������������᤹���ޤ� (CRC������ޤ���)\n"
 
-#: g10/armor.c:792
+#: g10/armor.c:793
 msgid "premature eof (in CRC)\n"
 msgstr "�ե������������᤹���ޤ� (CRC������)\n"
 
-#: g10/armor.c:800
+#: g10/armor.c:801
 msgid "malformed CRC\n"
 msgstr "CRC�ν񼰤�����������ޤ���\n"
 
-#: g10/armor.c:804 g10/armor.c:1359
+#: g10/armor.c:805 g10/armor.c:1360
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC���顼��%06lX - %06lX\n"
 
-#: g10/armor.c:824
+#: g10/armor.c:825
 msgid "premature eof (in trailer)\n"
 msgstr "�ե������������᤹���ޤ� (����������ˤ���ޤ�)\n"
 
-#: g10/armor.c:828
+#: g10/armor.c:829
 msgid "error in trailer line\n"
 msgstr "�����ιԤ˥��顼������ޤ�\n"
 
-#: g10/armor.c:1137
+#: g10/armor.c:1138
 msgid "no valid OpenPGP data found.\n"
 msgstr "ͭ����OpenPGP�ǡ��������Ĥ���ޤ���\n"
 
-#: g10/armor.c:1142
+#: g10/armor.c:1143
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "̵��������: �Ԥ�Ĺ����%dʸ����Ķ���Ƥ��ޤ�\n"
 
-#: g10/armor.c:1146
+#: g10/armor.c:1147
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "���������quoted printableʸ��������ޤ��������餯�Х��Τ���\n"
 "MTA��Ȥä��ΤǤ��礦\n"
 
-#: g10/card-util.c:58 g10/card-util.c:295
+#: g10/card-util.c:63 g10/card-util.c:303
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP�����ɤ�̵���Ǥ�: %s\n"
 
-#: g10/card-util.c:63
+#: g10/card-util.c:68
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP������no. %s�򸡽�\n"
 
-#: g10/card-util.c:70 g10/card-util.c:1329 g10/delkey.c:127 g10/keyedit.c:1430
-#: g10/keygen.c:2439 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1510
+#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
 msgid "can't do this in batch mode\n"
 msgstr "����ϥХå����⡼�ɤǤϤǤ��ޤ���\n"
 
-#: g10/card-util.c:97 g10/card-util.c:1108 g10/card-util.c:1191
-#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
-#: g10/keygen.c:1365
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
+#: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "�����? "
 
-#: g10/card-util.c:206 g10/card-util.c:256
+#: g10/card-util.c:213 g10/card-util.c:263
 msgid "[not set]"
 msgstr "[̤����]"
 
-#: g10/card-util.c:391
+#: g10/card-util.c:410
 msgid "male"
 msgstr "��"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 msgid "female"
 msgstr "��"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 msgid "unspecified"
 msgstr "̵����"
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 msgid "not forced"
 msgstr "̤����"
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 msgid "forced"
 msgstr "����"
 
-#: g10/card-util.c:497
+#: g10/card-util.c:516
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "���顼�� �Τ٤����ASCII�������������Ĥ���Ƥ��ޤ���\n"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:518
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "���顼: ��<��ʸ���ϻȤ��ޤ���\n"
 
-#: g10/card-util.c:501
+#: g10/card-util.c:520
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "���顼: ��Ťζ���϶ػߤǤ���\n"
 
-#: g10/card-util.c:518
+#: g10/card-util.c:537
 msgid "Cardholder's surname: "
 msgstr "�����ɽ�ͭ�Ԥ��� (surname): "
 
-#: g10/card-util.c:520
+#: g10/card-util.c:539
 msgid "Cardholder's given name: "
 msgstr "�����ɽ�ͭ�Ԥ�̾ (given name): "
 
-#: g10/card-util.c:538
+#: g10/card-util.c:557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "���顼: �Ĥʤ���̾����Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:559
+#: g10/card-util.c:578
 msgid "URL to retrieve public key: "
 msgstr "��������õ������URL: "
 
-#: g10/card-util.c:567
+#: g10/card-util.c:586
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "���顼: URL��Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:665 g10/card-util.c:734 g10/import.c:261
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:692
 msgid "Login data (account name): "
 msgstr "�������󡦥ǡ��� (���������̾): "
 
-#: g10/card-util.c:683
+#: g10/card-util.c:702
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "���顼: �������󡦥ǡ�����Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:742
+#: g10/card-util.c:761
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:752
+#: g10/card-util.c:771
 #, fuzzy, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "���顼: URL��Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:772
+#: g10/card-util.c:791
 msgid "Language preferences: "
 msgstr "���������: "
 
-#: g10/card-util.c:780
+#: g10/card-util.c:799
 msgid "Error: invalid length of preference string.\n"
 msgstr "���顼: ����ʸ�����Ĺ����̵���Ǥ���\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:808
 msgid "Error: invalid characters in preference string.\n"
 msgstr "���顼: ����ʸ�����̵����ʸ��������ޤ���\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:829
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "���� ((M)�ˡ�(F)��������): "
 
-#: g10/card-util.c:824
+#: g10/card-util.c:843
 msgid "Error: invalid response.\n"
 msgstr "���顼: ̵���ʱ�����\n"
 
-#: g10/card-util.c:845
+#: g10/card-util.c:864
 msgid "CA fingerprint: "
 msgstr "CA���: "
 
-#: g10/card-util.c:868
+#: g10/card-util.c:887
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "���顼: ̵���ʷ����λ��档\n"
 
-#: g10/card-util.c:916
+#: g10/card-util.c:935
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "�������Ǥ��ޤ���: %s\n"
 
-#: g10/card-util.c:917
+#: g10/card-util.c:936
 msgid "not an OpenPGP card"
 msgstr "OpenPGP�����ɤǤ���ޤ���"
 
-#: g10/card-util.c:926
+#: g10/card-util.c:945
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "���Ը�����μ������顼: %s\n"
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1030
 msgid "Replace existing key? (y/N) "
 msgstr "��¸�θ���򴹤��ޤ���? (y/N) "
 
-#: g10/card-util.c:1030 g10/card-util.c:1039
+#: g10/card-util.c:1051 g10/card-util.c:1060
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "�Ź渰�򥫡��ɳ��˥Хå����åפ��ޤ���? (Y/n) "
 
-#: g10/card-util.c:1051
+#: g10/card-util.c:1072
 msgid "Replace existing keys? (y/N) "
 msgstr "��¸�θ�����򴹤��ޤ���? (y/N) "
 
-#: g10/card-util.c:1060
+#: g10/card-util.c:1081
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -509,124 +532,128 @@ msgstr ""
 "   PIN = `%s'     Admin PIN = `%s'\n"
 "���Υ��ޥ�ɤ�Ȥä��ѹ����٤��Ǥ� --change-pin\n"
 
-#: g10/card-util.c:1099
+#: g10/card-util.c:1120
 msgid "Please select the type of key to generate:\n"
 msgstr "�������븰�η������򤷤Ƥ�������:\n"
 
-#: g10/card-util.c:1101 g10/card-util.c:1182
+#: g10/card-util.c:1122 g10/card-util.c:1203
 msgid "   (1) Signature key\n"
 msgstr "   (1) ��̾��\n"
 
-#: g10/card-util.c:1102 g10/card-util.c:1184
+#: g10/card-util.c:1123 g10/card-util.c:1205
 msgid "   (2) Encryption key\n"
 msgstr "   (2) �Ź沽��\n"
 
-#: g10/card-util.c:1103 g10/card-util.c:1186
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr "   (3) ǧ�ڸ�\n"
 
-#: g10/card-util.c:1119 g10/card-util.c:1202 g10/keyedit.c:908
-#: g10/keygen.c:1404 g10/revoke.c:642
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
+#: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "̵��������Ǥ���\n"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1200
 msgid "Please select where to store the key:\n"
 msgstr "�����ݴɾ������򤷤Ƥ�������:\n"
 
-#: g10/card-util.c:1214
+#: g10/card-util.c:1235
 msgid "unknown key protection algorithm\n"
 msgstr "̤�Τθ��ݸ�르�ꥺ��Ǥ�\n"
 
-#: g10/card-util.c:1219
+#: g10/card-util.c:1240
 msgid "secret parts of key are not available\n"
 msgstr "������̩��ʬ��̵���Ǥ�\n"
 
-#: g10/card-util.c:1224
+#: g10/card-util.c:1245
 msgid "secret key already stored on a card\n"
 msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
 
-#: g10/card-util.c:1294 g10/keyedit.c:1317
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "���Υ�˥塼��λ"
 
-#: g10/card-util.c:1296
+#: g10/card-util.c:1318
 msgid "show admin commands"
 msgstr "�������ޥ�ɤ�ɽ��"
 
-#: g10/card-util.c:1297 g10/keyedit.c:1320
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "���Υإ�פ�ɽ��"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1321
 msgid "list all available data"
 msgstr "��ͭ���ǡ�����ɽ��"
 
-#: g10/card-util.c:1302
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr "�����ɽ�ͭ�Ԥ�̾�����ѹ�"
 
-#: g10/card-util.c:1303
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr "����õ������URL���ѹ�"
 
-#: g10/card-util.c:1304
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr "������URL�ǻ��ꤵ�줿���ΰ����Ф�"
 
-#: g10/card-util.c:1305
+#: g10/card-util.c:1327
 msgid "change the login name"
 msgstr "��������̾���ѹ�"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1328
 msgid "change the language preferences"
 msgstr "�����������ѹ�"
 
-#: g10/card-util.c:1307
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr "�����ɽ�ͭ�Ԥ����̤��ѹ�"
 
-#: g10/card-util.c:1308
+#: g10/card-util.c:1330
 msgid "change a CA fingerprint"
 msgstr "CA������ѹ�"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr "��̾����PIN�ե饰��ȿž"
 
-#: g10/card-util.c:1310
+#: g10/card-util.c:1332
 msgid "generate new keys"
 msgstr "����������������"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr "PIN�֥��å��β�����ѹ��Υ�˥塼"
 
-#: g10/card-util.c:1377 g10/keyedit.c:1526
+#: g10/card-util.c:1334
+msgid "verify the PIN and list all data"
+msgstr ""
+
+#: g10/card-util.c:1454 g10/keyedit.c:1609
 msgid "Command> "
 msgstr "���ޥ��> "
 
-#: g10/card-util.c:1412
+#: g10/card-util.c:1492
 msgid "Admin-only command\n"
 msgstr "�������ѥ��ޥ��\n"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1523
 msgid "Admin commands are allowed\n"
 msgstr "�������ޥ�ɤ����Ĥ���Ƥ��ޤ�\n"
 
-#: g10/card-util.c:1430
+#: g10/card-util.c:1525
 msgid "Admin commands are not allowed\n"
 msgstr "�������ޥ�ɤ϶ػߤ���Ƥ��ޤ�\n"
 
-#: g10/card-util.c:1499 g10/keyedit.c:2104
+#: g10/card-util.c:1599 g10/keyedit.c:2210
 msgid "Invalid command  (try \"help\")\n"
 msgstr "̵���ʥ��ޥ�� (��help�ɤ򻲾�)\n"
 
-#: g10/cardglue.c:287
+#: g10/cardglue.c:396
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr "�����ɤ�������return���ǤĤ���'c'�Ǽ�ä�: "
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:519
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -635,260 +662,260 @@ msgstr ""
 "���Υ����ɤ�ȴ�����������֤Τ��������Ƥ�������:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:380
+#: g10/cardglue.c:527
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "�Ѱդ���return���ǤĤ���'c'�Ǽ�ä�: "
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:852
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Admin PIN������: "
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:853
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "PIN������: "
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:854
 msgid "Enter Admin PIN: "
 msgstr "Admin PIN������: "
 
-#: g10/cardglue.c:691
+#: g10/cardglue.c:855
 msgid "Enter PIN: "
 msgstr "PIN������: "
 
-#: g10/cardglue.c:705
+#: g10/cardglue.c:872
 msgid "Repeat this PIN: "
 msgstr "PIN�������: "
 
-#: g10/cardglue.c:719
+#: g10/cardglue.c:886
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN������ȷ����֤��Ƥ��ޤ��󡣺����Ϥ��Ƥ�������"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
-#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "��%s�פ������ޤ���\n"
 
-#: g10/decrypt.c:104 g10/encode.c:859
+#: g10/decrypt.c:105 g10/encode.c:846
 msgid "--output doesn't work for this command\n"
 msgstr "���Υ��ޥ�ɤ�--output�ϵ�ǽ���ޤ���\n"
 
-#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3167 g10/keyserver.c:1511
-#: g10/revoke.c:226
+#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3346 g10/keyserver.c:1541
+#: g10/revoke.c:227
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "����%s�ɤ����Ĥ���ޤ���: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2300 g10/keyserver.c:1525
-#: g10/revoke.c:232 g10/revoke.c:439
+#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "���֥��å����ɽФ����顼: %s\n"
 
-#: g10/delkey.c:128 g10/delkey.c:135
+#: g10/delkey.c:129 g10/delkey.c:136
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(���뤤�ϡ�����Ǹ������)\n"
 
-#: g10/delkey.c:134
+#: g10/delkey.c:135
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "��--yes�ɤΤʤ��Хå����⡼�ɤǤϤǤ��ޤ���\n"
 
-#: g10/delkey.c:146
+#: g10/delkey.c:147
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "���θ����ؤ��������ޤ���? (y/N) "
 
-#: g10/delkey.c:154
+#: g10/delkey.c:155
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "�������̩���Ǥ�! �����˺�����ޤ���? (y/N) "
 
-#: g10/delkey.c:164
+#: g10/delkey.c:165
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "���֥��å��κ���˼��Ԥ��ޤ���: %s\n"
 
-#: g10/delkey.c:174
+#: g10/delkey.c:175
 msgid "ownertrust information cleared\n"
 msgstr "��ͭ�Կ��Ѿ���򥯥ꥢ���ޤ���\n"
 
-#: g10/delkey.c:205
+#: g10/delkey.c:206
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "���θ������ˤ���������̩����%s�ɤ�����ޤ�!\n"
 
-#: g10/delkey.c:207
+#: g10/delkey.c:208
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "�ޤ���--delete-secret-keys�ɥ��ץ����Ǥ���������Ƥ���������\n"
 
-#: g10/encode.c:210 g10/sign.c:1186
+#: g10/encode.c:211 g10/sign.c:1218
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
 
-#: g10/encode.c:215
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "S2K�⡼�ɤΤ��ᡢ�о�ESK�ѥ��åȤ�Ȥ��ޤ���\n"
 
-#: g10/encode.c:228
+#: g10/encode.c:229
 #, c-format
 msgid "using cipher %s\n"
 msgstr "%s�Ź�ˡ��Ȥ��ޤ�\n"
 
-#: g10/encode.c:238 g10/encode.c:558
+#: g10/encode.c:239 g10/encode.c:545
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "��%s�פϤ⤦���̺ѤߤǤ�\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
+#: g10/encode.c:302 g10/encode.c:591 g10/sign.c:566
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "�ٹ�: ��%s�פ϶��Υե�����Ǥ�\n"
 
-#: g10/encode.c:472
+#: g10/encode.c:466
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�2048�ӥåȰʲ���RSA���ǰŹ沽�����Ǥ��ޤ���\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:488
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "��%s�פ����ɤ߽Ф��ޤ�\n"
 
-#: g10/encode.c:530
+#: g10/encode.c:517
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "�Ź沽���褦�Ȥ��Ƥ��븰������IDEA�Ź��Ȥ��ޤ���\n"
 
-#: g10/encode.c:540
+#: g10/encode.c:527
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "�ٹ�: �оΰŹ�ˡ %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:635 g10/sign.c:899
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "�ٹ�: ���̥��르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/encode.c:735
+#: g10/encode.c:722
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "�оΰŹ�ˡ %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/encode.c:805 g10/pkclist.c:721 g10/pkclist.c:757
+#: g10/encode.c:792 g10/pkclist.c:722 g10/pkclist.c:758
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "%s��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/encode.c:832
+#: g10/encode.c:819
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s�Ź沽 ������:��%s��\n"
 
-#: g10/encr-data.c:66 g10/mainproc.c:301
+#: g10/encr-data.c:67 g10/mainproc.c:302
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s�Ź沽�Ѥߥǡ���\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:305
+#: g10/encr-data.c:69 g10/mainproc.c:306
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "̤�ΤΥ��르�ꥺ��%d�ˤ��Ź沽\n"
 
-#: g10/encr-data.c:92
+#: g10/encr-data.c:93
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "�ٹ�: ��å��������оΰŹ�ˡ�μ夤���ǰŹ沽����Ƥ��ޤ���\n"
 
-#: g10/encr-data.c:103
+#: g10/encr-data.c:104
 msgid "problem handling encrypted packet\n"
 msgstr "�Ź沽�ѥ��åȤμ谷���Ǿ㳲\n"
 
-#: g10/exec.c:48
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "��֥ץ������μ¹Ԥϡ����ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/exec.c:184 g10/openfile.c:406
+#: g10/exec.c:173 g10/openfile.c:410
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: g10/exec.c:325
+#: g10/exec.c:314
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "���ץ���󡦥ե�����ε��ĥ⡼�ɤ��������ǤϤʤ��Τǡ�\n"
 "�����ץ������θƽФ��ϡ����ѶػߤǤ���\n"
 
-#: g10/exec.c:355
+#: g10/exec.c:344
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "���Υץ�åȥۡ�����ȡ������ץ������θƽФ��ˤϡ�����ե����뤬ɬ�פǤ�\n"
 
-#: g10/exec.c:433
+#: g10/exec.c:422
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "��%s�פ�¹ԤǤ��ޤ���: %s\n"
 
-#: g10/exec.c:436
+#: g10/exec.c:425
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "�������%s�פ�¹ԤǤ��ޤ���: %s\n"
 
-#: g10/exec.c:521
+#: g10/exec.c:510
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "�����ץ������θƽФ��ǥ����ƥࡦ���顼: %s\n"
 
-#: g10/exec.c:532 g10/exec.c:598
+#: g10/exec.c:521 g10/exec.c:587
 msgid "unnatural exit of external program\n"
 msgstr "�����ץ�����ब���Լ����˽�λ\n"
 
-#: g10/exec.c:547
+#: g10/exec.c:536
 msgid "unable to execute external program\n"
 msgstr "�����ץ�������¹ԤǤ��ޤ���\n"
 
-#: g10/exec.c:563
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "�����ץ������α������ɤ߽Ф��ޤ���: %s\n"
 
-#: g10/exec.c:609 g10/exec.c:616
+#: g10/exec.c:598 g10/exec.c:605
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "�ٹ�: ����ե���������Ǥ��ޤ��� (%s) ��%s��: %s\n"
 
-#: g10/exec.c:621
+#: g10/exec.c:610
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "�ٹ�: ����ǥ��쥯�ȥ꡼��%s�פ����Ǥ��ޤ���: %s\n"
 
-#: g10/export.c:183
+#: g10/export.c:184
 msgid "exporting secret keys not allowed\n"
 msgstr "��̩���ν�Ф��϶ػߤǤ�\n"
 
-#: g10/export.c:212
+#: g10/export.c:213
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "��%s: �ݸ��Ƥ��ޤ��� - �ȤФ��ޤ�\n"
 
-#: g10/export.c:220
+#: g10/export.c:221
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "��%s: PGP 2.x�����θ��Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/export.c:395
+#: g10/export.c:398
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "�ٹ�: ��̩��%s�ˤϡ�ñ���SK�����å����ब����ޤ���\n"
 
-#: g10/export.c:427
+#: g10/export.c:430
 msgid "WARNING: nothing exported\n"
 msgstr "�ٹ�: ����񤭽Ф��Ƥ��ޤ���\n"
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid ""
 "@Commands:\n"
 " "
@@ -896,127 +923,127 @@ msgstr ""
 "@���ޥ��:\n"
 " "
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "|[file]|make a signature"
 msgstr "|[�ե�����]|��̾�����"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "|[file]|make a clear text signature"
 msgstr "|[�ե�����]|���ꥢ��̾�����"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "make a detached signature"
 msgstr "ʬΥ��̾�����"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encrypt data"
 msgstr "�ǡ�����Ź沽"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "encryption only with symmetric cipher"
 msgstr "�Ź沽�ˤ��оΰŹ�ˡ�Τߤ����"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "decrypt data (default)"
 msgstr "�ǡ��������� (����)"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "verify a signature"
 msgstr "��̾�򸡾�"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys"
 msgstr "�����"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and signatures"
 msgstr "���Ƚ�̾�ΰ���"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 msgid "list and check key signatures"
 msgstr "����̾�θ����Ȱ���"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "list keys and fingerprints"
 msgstr "���Ȼ���ΰ���"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "list secret keys"
 msgstr "��̩���ΰ���"
 
-#: g10/g10.c:379
+#: g10/g10.c:381
 msgid "generate a new key pair"
 msgstr "��������������"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the public keyring"
 msgstr "�������ؤ��鸰������"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "remove keys from the secret keyring"
 msgstr "��̩���ؤ��鸰������"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign a key"
 msgstr "���˽�̾"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "sign a key locally"
 msgstr "��������Ū�˽�̾"
 
-#: g10/g10.c:385
+#: g10/g10.c:387
 msgid "sign or edit a key"
 msgstr "���ؤν�̾���Խ�"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "generate a revocation certificate"
 msgstr "���������������"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "export keys"
 msgstr "����񤭽Ф�"
 
-#: g10/g10.c:389
+#: g10/g10.c:391
 msgid "export keys to a key server"
 msgstr "�������С��˸���񤭽Ф�"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "import keys from a key server"
 msgstr "�������С����鸰���ɤ߹���"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "search for keys on a key server"
 msgstr "�������С��θ��򸡺�����"
 
-#: g10/g10.c:394
+#: g10/g10.c:396
 msgid "update all keys from a keyserver"
 msgstr "�������С����鸰��������������"
 
-#: g10/g10.c:397
+#: g10/g10.c:399
 msgid "import/merge keys"
 msgstr "�����ɹ���/ʻ��"
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "print the card status"
 msgstr "�����ɾ��֤�ɽ��"
 
-#: g10/g10.c:401
+#: g10/g10.c:403
 msgid "change data on a card"
 msgstr "�����ɤΥǡ������ѹ�"
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "change a card's PIN"
 msgstr "�����ɤ�PIN���ѹ�"
 
-#: g10/g10.c:410
+#: g10/g10.c:412
 msgid "update the trust database"
 msgstr "���ѥǡ����١����򹹿�"
 
-#: g10/g10.c:417
+#: g10/g10.c:419
 msgid "|algo [files]|print message digests"
 msgstr "|���르�ꥺ�� [�ե�����]|��å����������ɽ��"
 
-#: g10/g10.c:421 g10/gpgv.c:66
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1026,55 +1053,55 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "create ascii armored output"
 msgstr "ASCII���������������"
 
-#: g10/g10.c:425
+#: g10/g10.c:427
 msgid "|NAME|encrypt for NAME"
 msgstr "|̾��|��̾�����Ѥ˰Ź沽"
 
-#: g10/g10.c:436
+#: g10/g10.c:438
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "��̾������ˤ��Υ桼����id\n"
 "�����"
 
-#: g10/g10.c:437
+#: g10/g10.c:439
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|���̥�٥��N������\n"
 "(0���󰵽�)"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "use canonical text mode"
 msgstr "����ƥ����ȡ��⡼�ɤ����"
 
-#: g10/g10.c:452
+#: g10/g10.c:458
 msgid "use as output file"
 msgstr "���ϥե�����Ȥ��ƻ���"
 
-#: g10/g10.c:454 g10/gpgv.c:68
+#: g10/g10.c:460 g10/gpgv.c:73
 msgid "verbose"
 msgstr "��Ĺ"
 
-#: g10/g10.c:465
+#: g10/g10.c:471
 msgid "do not make any changes"
 msgstr "̵�ѹ�"
 
-#: g10/g10.c:466
+#: g10/g10.c:472
 msgid "prompt before overwriting"
 msgstr "������˳�ǧ"
 
-#: g10/g10.c:507
+#: g10/g10.c:513
 msgid "use strict OpenPGP behavior"
 msgstr "��̩��OpenPGP�ο�������"
 
-#: g10/g10.c:508
+#: g10/g10.c:514
 msgid "generate PGP 2.x compatible messages"
 msgstr "PGP 2.x�ߴ��Υ�å�����������"
 
-#: g10/g10.c:536
+#: g10/g10.c:542
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1083,7 +1110,7 @@ msgstr ""
 "(���ޥ�ɤȥ��ץ���������ΰ����ϡ�\n"
 "�ޥ˥奢�롦�ڡ���������������)\n"
 
-#: g10/g10.c:539
+#: g10/g10.c:545
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1103,15 +1130,15 @@ msgstr ""
 " --list-keys [̾��]         ����ɽ��\n"
 " --fingerprint [̾��]       �����ɽ��\n"
 
-#: g10/g10.c:720 g10/gpgv.c:93
+#: g10/g10.c:724 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "�Х��򸫤Ĥ����� <[email protected]> �ޤǤ���𤯤�������\n"
 
-#: g10/g10.c:737
+#: g10/g10.c:741
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: g10/g10.c:740
+#: g10/g10.c:744
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1121,7 +1148,7 @@ msgstr ""
 "��̾���������Ź沽������\n"
 "��������ϡ����ϥǡ����˰�¸\n"
 
-#: g10/g10.c:751
+#: g10/g10.c:755
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1129,525 +1156,540 @@ msgstr ""
 "\n"
 "���ݡ��Ȥ��Ƥ��륢�르�ꥺ��:\n"
 
-#: g10/g10.c:754
+#: g10/g10.c:758
 msgid "Pubkey: "
 msgstr "������: "
 
-#: g10/g10.c:760 g10/keyedit.c:2141
+#: g10/g10.c:764 g10/keyedit.c:2248
 msgid "Cipher: "
 msgstr "�Ź�ˡ: "
 
-#: g10/g10.c:766
+#: g10/g10.c:770
 msgid "Hash: "
 msgstr "�ϥå���: "
 
-#: g10/g10.c:772 g10/keyedit.c:2187
+#: g10/g10.c:776 g10/keyedit.c:2294
 msgid "Compression: "
 msgstr "����: "
 
-#: g10/g10.c:855
+#: g10/g10.c:859
 msgid "usage: gpg [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: g10/g10.c:1003
+#: g10/g10.c:1007
 msgid "conflicting commands\n"
 msgstr "��Ω���륳�ޥ��\n"
 
-#: g10/g10.c:1021
+#: g10/g10.c:1025
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "=���椬�����롼�������%s����˸��Ĥ���ޤ���\n"
 
-#: g10/g10.c:1218
+#: g10/g10.c:1222
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/g10.c:1221
+#: g10/g10.c:1225
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/g10.c:1224
+#: g10/g10.c:1228
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/g10.c:1230
+#: g10/g10.c:1234
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ�����\n"
 
-#: g10/g10.c:1233
+#: g10/g10.c:1237
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ�����\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1240
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ�����\n"
 
-#: g10/g10.c:1242
+#: g10/g10.c:1246
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/g10.c:1245
+#: g10/g10.c:1249
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/g10.c:1248
+#: g10/g10.c:1252
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1258
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/g10.c:1257
+#: g10/g10.c:1261
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/g10.c:1260
+#: g10/g10.c:1264
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/g10.c:1401
+#: g10/g10.c:1405
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "̤�Τι������ܡ�%s��\n"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1802
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "����: �Ρ�������ä����ץ���󡦥ե������%s�פϡ�̵�뤵��ޤ�\n"
 
-#: g10/g10.c:1838
+#: g10/g10.c:1844
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "����: ����Υ��ץ���󡦥ե������%s�פ�����ޤ���\n"
 
-#: g10/g10.c:1842
+#: g10/g10.c:1848
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���ץ���󡦥ե������%s��: %s\n"
 
-#: g10/g10.c:1849
+#: g10/g10.c:1855
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "����: ����%s�ϻȤ��ޤ���!\n"
 
-#: g10/g10.c:2076
+#: g10/g10.c:2082
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "�����Ǥʤ����ĤΤ��ᡢ�Ź�ˡ��ĥ��%s�פ�����ɤ��ޤ���\n"
 
-#: g10/g10.c:2293
+#: g10/g10.c:2236 g10/g10.c:2248
+#, fuzzy, c-format
+msgid "`%s' is not a valid signature expiration\n"
+msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
+
+#: g10/g10.c:2321
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3683
+#: g10/g10.c:2340 g10/keyedit.c:3862
 msgid "could not parse keyserver URL\n"
 msgstr "�������С���URL�������ǽ\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2346
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2349
 msgid "invalid keyserver options\n"
 msgstr "̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2356
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2359
 msgid "invalid import options\n"
 msgstr "̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2366
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2369
 msgid "invalid export options\n"
 msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2376
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2379
 msgid "invalid list options\n"
 msgstr "̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2401
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2404
 msgid "invalid verify options\n"
 msgstr "̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2411
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path��%s��������ǽ\n"
 
-#: g10/g10.c:2573
+#: g10/g10.c:2602
 msgid "WARNING: program may create a core file!\n"
 msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2606
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�ٹ�: %s��%s���ͥ��\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2615
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s��%s�ȤȤ�˻Ȥ����ȤϤǤ��ޤ���!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2618
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s��%s�ȤȤ�˻ȤäƤ�̵��̣�Ǥ�!\n"
 
-#: g10/g10.c:2603
+#: g10/g10.c:2625
+#, fuzzy, c-format
+msgid "NOTE: %s is not available in this version\n"
+msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
+
+#: g10/g10.c:2640
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "��%s�פ���̩�������֤�񤭹��ߤޤ�\n"
 
-#: g10/g10.c:2617
+#: g10/g10.c:2654
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�ʬΥ��̾�����ꥢ��̾���������Ǥ��ޤ���\n"
 
-#: g10/g10.c:2623
+#: g10/g10.c:2660
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤϽ�̾�ȰŹ沽��Ʊ���ˤǤ��ޤ���\n"
 
-#: g10/g10.c:2629
+#: g10/g10.c:2666
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2����ꤷ���顢(�ѥ��פǤʤ�) �ե��������ꤻ�ͤФʤ�ޤ���\n"
 
-#: g10/g10.c:2642
+#: g10/g10.c:2679
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2�⡼�ɤΥ�å������Ź沽�Ǥϡ�IDEA�Ź�ˡ��ɬ�פǤ�\n"
 
-#: g10/g10.c:2712 g10/g10.c:2736
+#: g10/g10.c:2746 g10/g10.c:2770
 msgid "selected cipher algorithm is invalid\n"
 msgstr "���򤵤줿�Ź楢�르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/g10.c:2718 g10/g10.c:2742
+#: g10/g10.c:2752 g10/g10.c:2776
 msgid "selected digest algorithm is invalid\n"
 msgstr "���򤵤줿���󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/g10.c:2724
+#: g10/g10.c:2758
 msgid "selected compression algorithm is invalid\n"
 msgstr "���򤵤줿���̥��르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2764
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "���򤵤줿���������󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/g10.c:2745
+#: g10/g10.c:2779
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed�������ͤ�ɬ�פǤ�\n"
 
-#: g10/g10.c:2747
+#: g10/g10.c:2781
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed��1����礭���ͤ�ɬ�פǤ�\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2783
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth��1����255���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:2751
+#: g10/g10.c:2785
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "̵����default-cert-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:2753
+#: g10/g10.c:2787
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "̵����min-cert-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:2756
+#: g10/g10.c:2790
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "����: ñ���S2K�⡼��(0)�λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2794
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:2767
+#: g10/g10.c:2801
 msgid "invalid default preferences\n"
 msgstr "̵���ʴ��������\n"
 
-#: g10/g10.c:2776
+#: g10/g10.c:2810
 msgid "invalid personal cipher preferences\n"
 msgstr "̵���ʸĿ��ѰŹ�ˡ������\n"
 
-#: g10/g10.c:2780
+#: g10/g10.c:2814
 msgid "invalid personal digest preferences\n"
 msgstr "̵���ʸĿ������������\n"
 
-#: g10/g10.c:2784
+#: g10/g10.c:2818
 msgid "invalid personal compress preferences\n"
 msgstr "̵���ʸĿ��Ѱ��̤�����\n"
 
-#: g10/g10.c:2817
+#: g10/g10.c:2851
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s��%s�ǵ�ǽ���ޤ���\n"
 
-#: g10/g10.c:2864
+#: g10/g10.c:2898
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "�Ź楢�르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/g10.c:2869
+#: g10/g10.c:2903
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "���󥢥르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/g10.c:2874
+#: g10/g10.c:2908
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "���̥��르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/g10.c:2970
+#: g10/g10.c:3004
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:2981
+#: g10/g10.c:3015
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "�ٹ�: �������Ź��Ȥ鷺�ˡ������ (-r) ����ꤷ�Ƥ��ޤ�\n"
 
-#: g10/g10.c:2992
+#: g10/g10.c:3026
 msgid "--store [filename]"
 msgstr "--store [�ե�����̾]"
 
-#: g10/g10.c:2999
+#: g10/g10.c:3033
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ե�����̾]"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3035
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "��%s�פ��оΰŹ�˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:3011
+#: g10/g10.c:3045
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ե�����̾]"
 
-#: g10/g10.c:3024
+#: g10/g10.c:3058
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [�ե�����̾]"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3060
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/g10.c:3029
+#: g10/g10.c:3063
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "--symmetric --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/g10.c:3047
+#: g10/g10.c:3081
 msgid "--sign [filename]"
 msgstr "--sign [�ե�����̾]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3094
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ե�����̾]"
 
-#: g10/g10.c:3075
+#: g10/g10.c:3109
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [�ե�����̾]"
 
-#: g10/g10.c:3077
+#: g10/g10.c:3111
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --sign --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/g10.c:3080
+#: g10/g10.c:3114
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "--symmetric --sign --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/g10.c:3100
+#: g10/g10.c:3134
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [�ե�����̾]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3143
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ե�����̾]"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3168
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ե�����̾]"
 
-#: g10/g10.c:3142
+#: g10/g10.c:3176
 msgid "--sign-key user-id"
 msgstr "--sign-key �桼����id"
 
-#: g10/g10.c:3146
+#: g10/g10.c:3180
 msgid "--lsign-key user-id"
 msgstr "--lsign-key �桼����id"
 
-#: g10/g10.c:3167
+#: g10/g10.c:3201
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key �桼����id [���ޥ��]"
 
-#: g10/g10.c:3238
+#: g10/g10.c:3272
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [�桼����id] [����]"
 
-#: g10/g10.c:3275
+#: g10/g10.c:3309
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "�������С��ؤ������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:3277
+#: g10/g10.c:3311
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "�������С�����μ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3313
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "���ν�Ф��˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:3290
+#: g10/g10.c:3324
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "�������С��θ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:3300
+#: g10/g10.c:3334
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "�������С��β����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:3341
+#: g10/g10.c:3375
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "��������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:3349
+#: g10/g10.c:3383
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:3436
+#: g10/g10.c:3470
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "̵���ʥϥå��塦���르�ꥺ���%s�פǤ�\n"
 
-#: g10/g10.c:3559
+#: g10/g10.c:3593
 msgid "[filename]"
 msgstr "[�ե�����̾]"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3597
 msgid "Go ahead and type your message ...\n"
 msgstr "���Ϥ��ޤ�����å��������ǤäƤ������� ...\n"
 
-#: g10/g10.c:3853
+#: g10/g10.c:3887
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
 "����̾�ˤϰ�����ǽ��ʸ��������Τߤ�Ȥ���'='�ǽ����ʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:3861
+#: g10/g10.c:3895
 msgid "a user notation name must contain the '@' character\n"
 msgstr "�桼��������̾�ϡ�'@'ʸ����ޤޤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:3871
+#: g10/g10.c:3900
+#, fuzzy
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr "�桼��������̾�ϡ�'@'ʸ����ޤޤʤ���Фʤ�ޤ���\n"
+
+#: g10/g10.c:3911
 msgid "a notation value must not use any control characters\n"
 msgstr "����̾���ͤ�����ʸ����ȤäƤϤ����ޤ���\n"
 
-#: g10/g10.c:3905
+#: g10/g10.c:3945
 msgid "the given certification policy URL is invalid\n"
 msgstr "��������줿������ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/g10.c:3907
+#: g10/g10.c:3947
 msgid "the given signature policy URL is invalid\n"
 msgstr "��������줿��̾�ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/g10.c:3940
+#: g10/g10.c:3980
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk����å���Υ���ȥ꡼��¿�����ޤ� - ���Ѷػ�\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2750
+#: g10/getkey.c:187 g10/getkey.c:2757
 msgid "[User ID not found]"
 msgstr "[�桼����ID�����Ĥ���ޤ���]"
 
-#: g10/getkey.c:1677
+#: g10/getkey.c:1684
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uid��ͭ���ˤ��줿̵���ʸ�%s�Ǥ�\n"
 
-#: g10/getkey.c:2228
+#: g10/getkey.c:2235
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "��������%s�ˤ���������̩����������ޤ��� - ̵��\n"
 
-#: g10/getkey.c:2459
+#: g10/getkey.c:2466
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "����%s��縰%s�����Ѥ��ޤ�\n"
 
-#: g10/getkey.c:2506
+#: g10/getkey.c:2513
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "��%s: �������Τʤ���̩���Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:74
 msgid "be somewhat more quiet"
 msgstr "����Ť�"
 
-#: g10/gpgv.c:70
+#: g10/gpgv.c:75
 msgid "take the keys from this keyring"
 msgstr "���θ����ؤ��������ޤ�"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:77
 msgid "make timestamp conflicts only a warning"
 msgstr "������̷���ٹ�����ˤ��ޤ�"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:78
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|�ե����뵭�һ�|���Υե����뵭�һҤ˾��֤�\n"
 "�񤭹���"
 
-#: g10/gpgv.c:97
+#: g10/gpgv.c:102
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpgv [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:105
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1655,7 +1697,7 @@ msgstr ""
 "��ʸ: gpg [���ץ����] [�ե�����]\n"
 "���Το��Ѥ������ǽ�̾�򸡺�\n"
 
-#: g10/helptext.c:48
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1665,7 +1707,7 @@ msgstr ""
 "���󶡤���ޤ��󡣤���ϡ�web-of-trust �μ�����ɬ�פǡ�\n"
 "(����Ū�ˤǤ���) web-of-certificates �Ȥ�̵�ط��Ǥ���"
 
-#: g10/helptext.c:54
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1677,16 +1719,16 @@ msgstr ""
 "�븰�Τ��ȤǤ������θ�������Ū�˿��Ѥ��뤳�Ȥˤ���ʤ顢\n"
 "��yes�ɤ������Ƥ���������\n"
 
-#: g10/helptext.c:61
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "���ο��ѤǤ��ʤ�����Ȥ������ʤ���С���no�ɤ������Ƥ���������"
 
-#: g10/helptext.c:65
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "���ʤ��������å���������Υ桼����ID�����Ϥ��Ƥ���������"
 
-#: g10/helptext.c:69
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1709,7 +1751,7 @@ msgstr ""
 "\n"
 "�ǽ�θ�(�縰)�ϡ���̾�˻��ѤǤ��븰�Ǥʤ���Фʤ�ޤ���"
 
-#: g10/helptext.c:83
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -1719,16 +1761,16 @@ msgstr ""
 "���Υ��르�ꥺ��ϡ�������ϰ�������ǻȤ���٤��Ǥ���\n"
 "�ޤ����������ƥ���������Ȥˤ����̤���������"
 
-#: g10/helptext.c:90
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "����Ĺ�������Ϥ��Ƥ�������"
 
-#: g10/helptext.c:94 g10/helptext.c:99 g10/helptext.c:111 g10/helptext.c:143
-#: g10/helptext.c:171 g10/helptext.c:176 g10/helptext.c:181
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "��yes�ɤ���no�ɤ������Ƥ�������"
 
-#: g10/helptext.c:104
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1740,19 +1782,19 @@ msgstr ""
 "ɽ������ʤ��Ǥ��礦���������ꡢ�����ƥ�������ͤ���֤��Ѵ�\n"
 "����褦�˻�ߤޤ���"
 
-#: g10/helptext.c:116
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "����ͭ�Ԥ�̾�������Ϥ��Ƥ�������"
 
-#: g10/helptext.c:121
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr "���ץ����Ǥ������Żҥ᡼��Υ��ɥ쥹�����Ϥ��뤳�Ȥ򶯤��侩���ޤ�"
 
-#: g10/helptext.c:125
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "���ץ����Υ����Ȥ����Ϥ��Ƥ�������"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1766,11 +1808,11 @@ msgstr ""
 "O  ��������³�ԡ�\n"
 "Q  �������ν�λ��"
 
-#: g10/helptext.c:139
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "�������������Ƥ褱��С���yes��(�ޤ��ϡ�ñ�ˡ�y��) �������Ƥ���������"
 
-#: g10/helptext.c:147
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -1839,11 +1881,11 @@ msgstr ""
 "\n"
 "���������Τ狼��ʤ����ϡ���0�פ������Ƥ���������"
 
-#: g10/helptext.c:185
+#: g10/helptext.c:186
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "���Ƥ� �桼����ID�˽�̾��������С���yes�ɤ������Ƥ�������"
 
-#: g10/helptext.c:189
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -1851,11 +1893,11 @@ msgstr ""
 "���Υ桼����ID�������˺����������С���yes�ɤ������Ƥ���������\n"
 "�����������Ʊ���˾õ�ޤ�!"
 
-#: g10/helptext.c:194
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "���������������Ƥ褱��С���yes�ɤ������Ƥ�������"
 
-#: g10/helptext.c:199
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -1865,7 +1907,7 @@ msgstr ""
 "�Ϥʤ��Ǥ��礦���ʤ��ʤ顢���ν�̾�ϡ����ؤο��Ѥ��ؤκ����䡢\n"
 "���θ��ˤ������ˤȤäƽ��פ�����Ǥ���"
 
-#: g10/helptext.c:204
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -1877,7 +1919,7 @@ msgstr ""
 "�ʤ��ʤ顢���ν�̾�θ��ϡ��⤦�������줿¾�θ��ǿ��Ѥ��ؤ��������\n"
 "���⤷��ʤ�����Ǥ���"
 
-#: g10/helptext.c:210
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -1885,7 +1927,7 @@ msgstr ""
 "���ν�̾��ͭ���ǤϤ���ޤ��󡣤��Τ��Ȥϡ����ʤ��θ��ؤ��������٤���\n"
 "�Ȥ�����̣�Ǥ���"
 
-#: g10/helptext.c:214
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -1898,7 +1940,7 @@ msgstr ""
 "����ޤ��󡣤�äơ����μ��ʽ�̾�����餫����ͳ�ˤ��ͭ���ǤϤʤ��ơ�\n"
 "���ؤȤʤ븰��������ˤΤߡ������¹Ԥ��Ƥ���������"
 
-#: g10/helptext.c:222
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -1907,23 +1949,23 @@ msgstr ""
 "���� (�ޤ������򤷤�) �桼����ID�������򡢺��������������ѹ�\n"
 "���ޤ����ط����뼫�ʽ�̾�������ϡ�1�ä����ߤޤ���\n"
 
-#: g10/helptext.c:229
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#: g10/helptext.c:235
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "���Ϥ����ѥ��ե졼���γ�ǧ�Τ��ᡢ�����Ϥ��Ƥ���������"
 
-#: g10/helptext.c:239
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "��̾��Ԥ��ե������̾������ꤷ�Ƥ�������"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "��񤭤��Ƥ褱��С���yes�ɤ������Ƥ�������"
 
-#: g10/helptext.c:249
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -1931,7 +1973,7 @@ msgstr ""
 "�������ե�����̾�����Ϥ��Ƥ���������ñ��RETURN���ǤĤȡ�\n"
 "(��̤Ǽ�����) ����Υե�����̾����Ѥ��ޤ���"
 
-#: g10/helptext.c:255
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -1960,7 +2002,7 @@ msgstr ""
 "      �ޤ�����������̡��Żҥ᡼��Υ��ɥ쥹��̵���ˤʤä���\n"
 "      ���˻Ȥ��ޤ���\n"
 
-#: g10/helptext.c:271
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -1970,467 +2012,472 @@ msgstr ""
 "ʸ�Ϥ����Ϥ��뤳�Ȥ��Ǥ��ޤ���ʸ�Ϥϴʷ�ˤ��Ƥ���������\n"
 "���Ԥǽ����ˤʤ�ޤ���\n"
 
-#: g10/helptext.c:286
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "�إ�פϤ���ޤ���"
 
-#: g10/helptext.c:294
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "��%s�פΥإ�פϤ���ޤ���"
 
-#: g10/import.c:247
+#: g10/import.c:248
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "��%d�Υ֥��å���ȤФ��ޤ�\n"
 
-#: g10/import.c:256
+#: g10/import.c:257
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu���ޤǽ���\n"
 
-#: g10/import.c:273
+#: g10/import.c:274
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "    ��������: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "�ȤФ�����������: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:279
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "  �桼����ID�ʤ�: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "              imported: %lu"
 msgstr "          �ɹ���: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:287
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "        �ѹ��ʤ�: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "�������桼����ID: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "      ����������: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "      ��������̾: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  �����������: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "  ��̩�����ɽФ�: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  ��̩�����ɹ���: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "  ̵�ѹ�����̩��: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "        ̤�ɹ���: %lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:544
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr "�ٹ�: ��%s�ˤϡ������ԲĤȤ�������������ޤ�\n"
 
-#: g10/import.c:545
+#: g10/import.c:546
 msgid "algorithms on these user IDs:\n"
 msgstr "�����Υ桼����ID�Υ��르�ꥺ��:\n"
 
-#: g10/import.c:582
+#: g10/import.c:583
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": �Ź楢�르�ꥺ������� %s\n"
 
-#: g10/import.c:594
+#: g10/import.c:595
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": ���󥢥르�ꥺ������� %s\n"
 
-#: g10/import.c:606
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": ���̥��르�ꥺ������� %s\n"
 
-#: g10/import.c:619
+#: g10/import.c:620
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "it is strongly suggested that you update your preferences and\n"
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "����Ū�ʥ��르�ꥺ���԰���������򤱤뤿�ᡢ���θ�������ۤ��Ƥ�������\n"
 
-#: g10/import.c:645
+#: g10/import.c:646
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "�ʲ��ǡ������������Ǥ��ޤ�: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:694 g10/import.c:1048
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "��%s: �桼����ID������ޤ���\n"
 
-#: g10/import.c:713
+#: g10/import.c:714
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "��%s: PKS��������¤����\n"
 
-#: g10/import.c:728
+#: g10/import.c:729
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "��%s: ��������̤���ʽ�̾�Υ桼����ID��%s��\n"
 
-#: g10/import.c:734
+#: g10/import.c:735
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "��%s: ͭ���ʥ桼����ID������ޤ���\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 msgid "this may be caused by a missing self-signature\n"
 msgstr "���ʽ�̾�Τʤ������Ǥ��礦\n"
 
-#: g10/import.c:746 g10/import.c:1168
+#: g10/import.c:747 g10/import.c:1169
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "��%s: �����������Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:752
+#: g10/import.c:753
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "��%s: ���������Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:761
+#: g10/import.c:762
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "����߲�ǽ�ʸ��ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:766 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "��%s�פؤν����\n"
 
-#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
-#: g10/import.c:2314 g10/import.c:2336
+#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
+#: g10/import.c:2315 g10/import.c:2337
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "���ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/import.c:791
+#: g10/import.c:792
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "��%s: ��������%s�ɤ��ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:815
+#: g10/import.c:816
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "��%s: �������ʣ���ȹ礤�ޤ���\n"
 
-#: g10/import.c:832 g10/import.c:1186
+#: g10/import.c:833 g10/import.c:1187
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "��%s: ���θ��֥��å��˰��֤Ť��Ǥ��ޤ���: %s\n"
 
-#: g10/import.c:840 g10/import.c:1193
+#: g10/import.c:841 g10/import.c:1194
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "��%s: ���θ��֥��å����ɤ߽Ф��ޤ���: %s\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "��%s:��%s�ɿ������桼����ID��1��\n"
 
-#: g10/import.c:875
+#: g10/import.c:876
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "��%s:��%s�ɿ������桼����ID��%d��\n"
 
-#: g10/import.c:878
+#: g10/import.c:879
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "��%s:��%s�ɿ�������̾��1��\n"
 
-#: g10/import.c:881
+#: g10/import.c:882
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "��%s:��%s�ɿ�������̾��%d��\n"
 
-#: g10/import.c:884
+#: g10/import.c:885
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "��%s:��%s�ɿ�����������1��\n"
 
-#: g10/import.c:887
+#: g10/import.c:888
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "��%s:��%s�ɿ�����������%d��\n"
 
-#: g10/import.c:908
+#: g10/import.c:909
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "��%s:��%s���ѹ��ʤ�\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1054
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "��%s: ̵���ʰŹ�ˡ%d����̩���Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1064
+#: g10/import.c:1065
 msgid "importing secret keys not allowed\n"
 msgstr "��̩�����ɹ��ߤ϶ػߤǤ�\n"
 
-#: g10/import.c:1081 g10/import.c:2329
+#: g10/import.c:1082 g10/import.c:2330
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "�������̩���ؤ�����ޤ���: %s\n"
 
-#: g10/import.c:1092
+#: g10/import.c:1093
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "��%s: ��̩�����ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1122
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "��%s: �⤦��̩���ؤˤ���ޤ�\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1132
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "��%s: ��̩�������Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:1161
+#: g10/import.c:1162
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "��%s: ������������ޤ��� - �����������Ŭ�ѤǤ��ޤ���\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1205
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "��%s: ̵���ʼ���������: %s - ����\n"
 
-#: g10/import.c:1236
+#: g10/import.c:1237
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "��%s:��%s�ɼ�����������ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1302
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "��%s: ��̾���б�����桼����ID������ޤ���\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1317
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "��%s: �桼����ID��%s�ɤΥ��ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "��%s: �桼����ID��%s�ɤμ��ʽ�̾����̵���Ǥ�\n"
 
-#: g10/import.c:1336
+#: g10/import.c:1337
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "��%s: �����б���������������ޤ���\n"
 
-#: g10/import.c:1347 g10/import.c:1397
+#: g10/import.c:1348 g10/import.c:1398
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "��%s: ���ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
 
-#: g10/import.c:1349
+#: g10/import.c:1350
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "��%s: ̵�����������б��Ǥ�\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1365
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "��%s: ¿���������б��������ޤ�\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "��%s: �������ˤ�����������������ޤ���\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "��%s: ̵�������������Ǥ�\n"
 
-#: g10/import.c:1414
+#: g10/import.c:1415
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "��%s: ̵����������¿�ż����������ޤ�\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1457
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "��%s: �ȤФ����桼����ID��%s��\n"
 
-#: g10/import.c:1477
+#: g10/import.c:1478
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "��%s: �ȤФ�������\n"
 
-#: g10/import.c:1504
+#: g10/import.c:1505
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "��%s: ��Ф��ԲĤʽ�̾ (���饹%02X) - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1514
+#: g10/import.c:1515
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "��%s: ���������񤬸��ä����ꤵ��Ƥ��ޤ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1531
+#: g10/import.c:1532
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "��%s: ̵���ʼ���������: %s - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1545
+#: g10/import.c:1546
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "��%s: ������̾�ξ�꤬�����äƤ��ޤ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1553
+#: g10/import.c:1554
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "��%s: ͽ�����̽�̾���饹 (0x%02X) - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1574
+#: g10/import.c:1575
 #, fuzzy, c-format
 msgid "key %s: expired signature from key %s - skipped\n"
 msgstr "��%s: ͽ�����̽�̾���饹 (0x%02X) - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1677
+#: g10/import.c:1678
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "��%s: ��ʣ�����桼����ID�θ��� - ʻ��\n"
 
-#: g10/import.c:1739
+#: g10/import.c:1740
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "�ٹ�: ��%s�ϼ������줿�褦�Ǥ�: ������%s�ΰ����Ф�\n"
 
-#: g10/import.c:1753
+#: g10/import.c:1754
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "�ٹ�: ��%s�ϼ������줿�褦�Ǥ�: ������%s���Ժߡ�\n"
 
-#: g10/import.c:1812
+#: g10/import.c:1813
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "��%s:��%s�ɼ�����������ɲ�\n"
 
-#: g10/import.c:1846
+#: g10/import.c:1847
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "��%s: ľ�ܸ���̾���ɲ�\n"
 
-#: g10/import.c:2235
+#: g10/import.c:2236
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "����������̩�����ȹ礷�ޤ���!\n"
 
-#: g10/import.c:2243
+#: g10/import.c:2244
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
 
-#: g10/import.c:2245
+#: g10/import.c:2246
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
 
-#: g10/keydb.c:167
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "���ء�%s�פκ������顼: %s\n"
 
-#: g10/keydb.c:174
+#: g10/keydb.c:175
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "���ء�%s�פ��Ǥ��ޤ���\n"
 
-#: g10/keydb.c:685
+#: g10/keydb.c:316 g10/keydb.c:319
+#, fuzzy, c-format
+msgid "keyblock resource `%s': %s\n"
+msgstr "��%s�פκ������顼: %s\n"
+
+#: g10/keydb.c:698
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "���إ���å���κƹ��ۤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[����]"
 
-#: g10/keyedit.c:255
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[���ʽ�̾]"
 
-#: g10/keyedit.c:333 g10/keylist.c:405
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "�����ʽ�̾1��\n"
 
-#: g10/keyedit.c:335 g10/keylist.c:407
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "�����ʽ�̾%d��\n"
 
-#: g10/keyedit.c:337 g10/keylist.c:409
+#: g10/keyedit.c:344 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "�����ʤ�����1�Ĥν�̾�򸡺����ޤ���\n"
 
-#: g10/keyedit.c:339 g10/keylist.c:411
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "�����ʤ�����%d�Ĥν�̾�򸡺����ޤ���\n"
 
-#: g10/keyedit.c:341 g10/keylist.c:413
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "���顼�Τ���1�Ĥν�̾�򸡺����ޤ���\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:415
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "���顼�Τ���%d�Ĥν�̾�򸡺����ޤ���\n"
 
-#: g10/keyedit.c:345
+#: g10/keyedit.c:352
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "ͭ���ʼ��ʽ�̾�Τʤ��桼����ID��1�ĸ���\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:354
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "ͭ���ʼ��ʽ�̾�Τʤ��桼����ID��%d�ĸ���\n"
 
-#: g10/keyedit.c:403 g10/pkclist.c:262
+#: g10/keyedit.c:410 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2441,17 +2488,17 @@ msgstr ""
 "��\n"
 "(�ѥ��ݡ��Ȥ򸫤��Ƥ��ä��ꡢ¾������������򸡺������ꡢ�ʤɤʤ�)\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:274
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = �������ٿ��Ѥ���\n"
 
-#: g10/keyedit.c:408 g10/pkclist.c:276
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = �����˿��Ѥ���\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:434
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2460,36 +2507,46 @@ msgstr ""
 "���ѽ�̾�ο��������Ϥ��Ƥ���������\n"
 "������1����礭���ȡ���̾���褦�Ȥ��Ƥ��븰�ǿ��ѽ�̾����ޤ���\n"
 
-#: g10/keyedit.c:443
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "��̾�����¤���ɥ᡼�󤫡�����Τʤ�����enter�����Ϥ��Ƥ���������\n"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
-#: g10/keyedit.c:858 g10/keyedit.c:1642
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1728
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "����Ǥ⤳�θ��˽�̾�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
-#: g10/keyedit.c:1648
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
+#: g10/keyedit.c:1734
 msgid "  Unable to sign.\n"
 msgstr "  ��̾��ǽ��\n"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "�桼����ID��%s�ɤϡ���λ�Ǥ���"
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:650
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "�桼����ID��%s�ɤϡ����ʽ�̾����Ƥ��ޤ���"
 
-#: g10/keyedit.c:676
+#: g10/keyedit.c:678
+#, fuzzy, c-format
+msgid "User ID \"%s\" is signable.  "
+msgstr "�桼����ID��%s�ɤϡ����ʽ�̾����Ƥ��ޤ���"
+
+#: g10/keyedit.c:680
+#, fuzzy
+msgid "Sign it? (y/N) "
+msgstr "�����˽�̾���ޤ���? (y/N) "
+
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2498,11 +2555,11 @@ msgstr ""
 "��%s�ɤˤ������뼫�ʽ�̾�ϡ�\n"
 "PGP 2.x�����ν�̾�Ǥ���\n"
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:711
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "OpenPGP�μ��ʽ�̾�˳ʾ夲�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:699
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2511,11 +2568,11 @@ msgstr ""
 "��%s�ɤˤ������뤢�ʤ��κ��ν�̾\n"
 "����λ�Ǥ���\n"
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:729
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "��������̾��ȯ�Ԥ��������ڤ��̾�ȸ򴹤������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:724
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2524,53 +2581,53 @@ msgstr ""
 "��%s�ɤˤ������뤢�ʤ��κ��ν�̾\n"
 "��������̾�Ǥ���\n"
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:754
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "��Ф���ǽ�ʽ�̾�˳ʾ夲�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:749
+#: g10/keyedit.c:775
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "��%s�ɤϸ�%s�Ǥ⤦������̾���Ƥ���ޤ�\n"
 
-#: g10/keyedit.c:752
+#: g10/keyedit.c:778
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "��%s�ɤϸ�%s�Ǥ⤦��̾���Ƥ���ޤ�\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:783
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "����Ǥ�ƽ�̾�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:805
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "��%s�ǽ�̾���٤���ΤϤ���ޤ���\n"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "���θ�����λ�Ǥ�!"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "���θ���%s����λ���ޤ���\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:844
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Ʊ���˽�̾����λ�ˤ������Ǥ���? (Y/n) "
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:882
 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:853
+#: g10/keyedit.c:884
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "���θ���PGP 2.x�ǻ��ѤǤ��ʤ��ʤ�ޤ���\n"
 
-#: g10/keyedit.c:878
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2579,32 +2636,32 @@ msgstr ""
 "��̾���褦�Ȥ��Ƥ��븰���ºݤ˾嵭��̾���οͤΤ�Τ��ɤ������ɤ�����\n"
 "���դ��Ƹ��ڤ��ޤ�����? �����狼��ʤ���С���0�ɤ����Ϥ��Ƥ���������\n"
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) �����ޤ���%s\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) �������������Ƥ��ޤ���%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) ������������ޤ�����%s\n"
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) ���ʤ����դ��Ƹ������ޤ�����%s\n"
 
-#: g10/keyedit.c:895
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "�����? (�ܺ٤� '?' ��): "
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:950
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2613,75 +2670,75 @@ msgstr ""
 "�����ˤ��θ��ˤ��ʤ��θ���%s�ɤǽ�̾���Ƥ褤�Ǥ���\n"
 "(%s)\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:957
 msgid "This will be a self-signature.\n"
 msgstr "���ʽ�̾�ˤʤ�Ǥ��礦��\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:963
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "�ٹ�: ��̾�ϡ���Ф��ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:971
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "�ٹ�: ��̾�ϡ������ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:981
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "��̾�ϡ���Ф��ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:988
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "��̾�ϡ������ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:995
 msgid "I have not checked this key at all.\n"
 msgstr "���θ����������������Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1000
 msgid "I have checked this key casually.\n"
 msgstr "���θ��ϰ�����������ޤ�����\n"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1005
 msgid "I have checked this key very carefully.\n"
 msgstr "���θ��ϡ����ʤ����դ��Ƹ������ޤ�����\n"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1015
 msgid "Really sign? (y/N) "
 msgstr "�����˽�̾���ޤ���? (y/N) "
 
-#: g10/keyedit.c:1029 g10/keyedit.c:4132 g10/keyedit.c:4223 g10/keyedit.c:4287
-#: g10/keyedit.c:4348 g10/sign.c:369
+#: g10/keyedit.c:1060 g10/keyedit.c:4350 g10/keyedit.c:4441 g10/keyedit.c:4505
+#: g10/keyedit.c:4566 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1105 g10/keygen.c:3057
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "���θ����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:1109 g10/keygen.c:3045
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 msgid "Secret parts of primary key are not available.\n"
 msgstr "�縰����̩��ʬ�������ޤ���\n"
 
-#: g10/keyedit.c:1113 g10/keygen.c:3060
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "�縰����̩��ʬ�������ޤ���\n"
 
-#: g10/keyedit.c:1117 g10/keygen.c:3064
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "�����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "���θ����Խ��Ǥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2689,11 +2746,11 @@ msgstr ""
 "������̩���ο������ѥ��ե졼�������Ϥ��Ƥ���������\n"
 "\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:1825
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "�ѥ��ե졼��������ȷ����֤��Ƥ��ޤ��󡣺����Ϥ��Ƥ�������"
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2702,193 +2759,193 @@ msgstr ""
 "�����餯����ϡ������Ǥ�ʤ����ͤ��Ǥ�!\n"
 "\n"
 
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1195
 msgid "Do you really want to do this? (y/N) "
 msgstr "�����˼¹Ԥ��ޤ���? (y/N) "
 
-#: g10/keyedit.c:1235
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "���ν�̾�����������˰�ư���ޤ�\n"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "��¸���ƽ�λ"
 
-#: g10/keyedit.c:1322
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "�����ɽ��"
 
-#: g10/keyedit.c:1323
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "���ȥ桼����ID�ΰ���"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "�桼����ID N������"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "�桼����ID N������"
 
-#: g10/keyedit.c:1327
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "��̾�μ���"
 
-#: g10/keyedit.c:1330
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1335
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "��������Ū�˽�̾"
 
-#: g10/keyedit.c:1337
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "����: �ޤ���̾����桼����ID�����򤷤ޤ�\n"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1343
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "�桼����ID���ɲ�"
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "�ե���ID���ɲ�"
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "�桼����ID�κ��"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr "���ޡ��ȥ����ɤظ����ɲ�"
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr "���ޡ��ȥ����ɤθ��ؤΰ�ư"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1392
 #, fuzzy
 msgid "move a backup key to a smartcard"
 msgstr "���ޡ��ȥ����ɤθ��ؤΰ�ư"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "������"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr "���������ɲ�"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "�桼����ID���ˤ���"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "��̩���ȸ������ΰ�����ȿž"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "�����ΰ��� (�������ѡ���)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "�����ΰ��� (��Ĺ)"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1418
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "��������������URI������"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "��ͭ�Կ��Ѥ��ѹ�"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1426
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "���򤷤����桼����ID�������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "�桼����ID�μ���"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "�������"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "enable key"
 msgstr "���λ��Ѥ���Ĥ���"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "disable key"
 msgstr "���λ��Ѥ�ػߤ���"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1436
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "�ե���ID��ɽ��"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1556
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "��̩���֥��å���%s�ɤ��ɽФ����顼: %s\n"
 
-#: g10/keyedit.c:1494
+#: g10/keyedit.c:1574
 msgid "Secret key is available.\n"
 msgstr "��̩�������ѤǤ��ޤ���\n"
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1655
 msgid "Need the secret key to do this.\n"
 msgstr "���μ¹Ԥˤ���̩��������ޤ���\n"
 
-#: g10/keyedit.c:1579
+#: g10/keyedit.c:1663
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "�ޤ���toggle�ɥ��ޥ�ɤ�ȤäƤ���������\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1682
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -2896,223 +2953,228 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1722
 msgid "Key is revoked."
 msgstr "���ϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:1657
+#: g10/keyedit.c:1741
 msgid "Really sign all user IDs? (y/N) "
 msgstr "���������桼����ID�˽�̾���ޤ���? (y/N) "
 
-#: g10/keyedit.c:1660
-msgid "Hint: Select the user IDs to sign\n"
-msgstr "����: �ޤ���̾����桼����ID�����򤷤ޤ�\n"
-
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1748
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "̤�Τν�̾���饹�Ǥ�"
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1771
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%s�⡼�ɤǤ��Υ��ޥ�ɤ϶ػߤǤ���\n"
 
-#: g10/keyedit.c:1713 g10/keyedit.c:1733 g10/keyedit.c:1899
+#: g10/keyedit.c:1793 g10/keyedit.c:1813 g10/keyedit.c:1979
 msgid "You must select at least one user ID.\n"
 msgstr "�桼����ID�򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1715
+#: g10/keyedit.c:1795
 msgid "You can't delete the last user ID!\n"
 msgstr "�Ǹ�Υ桼����ID�Ϻ���Ǥ��ޤ���!\n"
 
-#: g10/keyedit.c:1717
+#: g10/keyedit.c:1797
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "���򤷤����桼����ID�������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:1718
+#: g10/keyedit.c:1798
 msgid "Really remove this user ID? (y/N) "
 msgstr "���Υ桼����ID�������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1848
 msgid "Really move the primary key? (y/N) "
 msgstr "���μ縰�������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:1780
+#: g10/keyedit.c:1860
 msgid "You must select exactly one key.\n"
 msgstr "���򤭤ä���1�����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1808
+#: g10/keyedit.c:1888
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1822
+#: g10/keyedit.c:1902
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "��%s�פ������ޤ���: %s\n"
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1919
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "���ء�%s�פκ������顼: %s\n"
 
-#: g10/keyedit.c:1863
+#: g10/keyedit.c:1943
 msgid "You must select at least one key.\n"
 msgstr "���򾯤ʤ��Ȥ�1�����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1946
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "���򤷤����������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:1867
+#: g10/keyedit.c:1947
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "���θ��������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1982
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "���򤷤����桼����ID�������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1983
 msgid "Really revoke this user ID? (y/N) "
 msgstr "���Υ桼����ID�������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1921
+#: g10/keyedit.c:2001
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "���θ��������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1932
+#: g10/keyedit.c:2012
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "���򤷤����������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1934
+#: g10/keyedit.c:2014
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "���θ��������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1975
+#: g10/keyedit.c:2055
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "���ѼԻ��꿮�ѥǡ����١����������桢��ͭ�Կ��Ѥ����ꤵ��ʤ����Ȥ⤢���"
 "����\n"
 
-#: g10/keyedit.c:2007
+#: g10/keyedit.c:2087
 msgid "Set preference list to:\n"
 msgstr "�������������:\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2093
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2095
 msgid "Really update the preferences? (y/N) "
 msgstr "�����������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2065
+#: g10/keyedit.c:2157
+#, fuzzy, c-format
+msgid "Unable to clean `%s'\n"
+msgstr "��%s�פ�¹ԤǤ��ޤ���: %s\n"
+
+#: g10/keyedit.c:2160
+msgid "Please specify item to clean: `sigs', `uids', or `all'\n"
+msgstr ""
+
+#: g10/keyedit.c:2171
 msgid "Save changes? (y/N) "
 msgstr "�ѹ�����¸���ޤ���? (y/N) "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2174
 msgid "Quit without saving? (y/N) "
 msgstr "��¸�����˽�λ���ޤ���? (y/N) "
 
-#: g10/keyedit.c:2078
+#: g10/keyedit.c:2184
 #, c-format
 msgid "update failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2191
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "��̩�ι����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:2092
+#: g10/keyedit.c:2198
 msgid "Key not changed so no update needed.\n"
 msgstr "����̵�ѹ��ʤΤǹ��������פǤ���\n"
 
-#: g10/keyedit.c:2164
+#: g10/keyedit.c:2271
 msgid "Digest: "
 msgstr "����: "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2323
 msgid "Features: "
 msgstr "��ǽ: "
 
-#: g10/keyedit.c:2227
+#: g10/keyedit.c:2334
 msgid "Keyserver no-modify"
 msgstr "̵�����������С�"
 
-#: g10/keyedit.c:2242 g10/keylist.c:307
+#: g10/keyedit.c:2349 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "������������: "
 
-#: g10/keyedit.c:2473
+#: g10/keyedit.c:2580
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "���θ��ϡ�%s��%s�ˤ�äƼ������줿�褦�Ǥ�"
 
-#: g10/keyedit.c:2494
+#: g10/keyedit.c:2601
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "���θ��ϡ�%s��%s�ˤ�äƼ������줿�褦�Ǥ�"
 
-#: g10/keyedit.c:2500
+#: g10/keyedit.c:2607
 msgid "(sensitive)"
 msgstr "(�ǥꥱ����)"
 
-#: g10/keyedit.c:2516 g10/keyedit.c:2572 g10/keyedit.c:2684 g10/keyedit.c:2699
-#: g10/keylist.c:193 g10/keyserver.c:422
+#: g10/keyedit.c:2623 g10/keyedit.c:2679 g10/keyedit.c:2792 g10/keyedit.c:2807
+#: g10/keylist.c:194 g10/keyserver.c:421
 #, c-format
 msgid "created: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2519 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:931
+#: g10/keyedit.c:2626 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:948
 #, c-format
 msgid "revoked: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2521 g10/keylist.c:757 g10/keylist.c:886
+#: g10/keyedit.c:2628 g10/keylist.c:758 g10/keylist.c:887
 #, c-format
 msgid "expired: %s"
 msgstr "��λ: %s"
 
-#: g10/keyedit.c:2523 g10/keyedit.c:2574 g10/keyedit.c:2686 g10/keyedit.c:2701
-#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
-#: g10/keylist.c:913 g10/keyserver.c:428 g10/mainproc.c:937
+#: g10/keyedit.c:2630 g10/keyedit.c:2681 g10/keyedit.c:2794 g10/keyedit.c:2809
+#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
+#: g10/keylist.c:914 g10/keyserver.c:427 g10/mainproc.c:954
 #, c-format
 msgid "expires: %s"
 msgstr "��λ: %s"
 
-#: g10/keyedit.c:2525
+#: g10/keyedit.c:2632
 #, c-format
 msgid "usage: %s"
 msgstr "����ˡ: %s"
 
-#: g10/keyedit.c:2540
+#: g10/keyedit.c:2647
 #, c-format
 msgid "trust: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2651
 #, c-format
 msgid "validity: %s"
 msgstr "ͭ����: %s"
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2658
 msgid "This key has been disabled"
 msgstr "���θ��ϻ��Ѷػߤ����ꤵ��Ƥ��ޤ�"
 
-#: g10/keyedit.c:2579 g10/keylist.c:199
+#: g10/keyedit.c:2686 g10/keylist.c:200
 msgid "card-no: "
 msgstr "�������ֹ�: "
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2754
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x�����桼����ID��������������ޤ���\n"
 
-#: g10/keyedit.c:2654
+#: g10/keyedit.c:2762
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3120,17 +3182,17 @@ msgstr ""
 "�ץ�������Ƶ�ư����ޤǡ�ɽ�����줿����ͭ�������������ʤ����⤷��ʤ���\n"
 "�Ȥ������Ȥ�ǰƬ�ˤ����Ƥ���������\n"
 
-#: g10/keyedit.c:2718 g10/keyserver.c:432 g10/mainproc.c:1577
-#: g10/trustdb.c:1178
+#: g10/keyedit.c:2826 g10/keyedit.c:3201 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1690
 msgid "revoked"
 msgstr "����"
 
-#: g10/keyedit.c:2720 g10/keyserver.c:436 g10/mainproc.c:1579
-#: g10/trustdb.c:531
+#: g10/keyedit.c:2828 g10/keyedit.c:3203 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1692
 msgid "expired"
 msgstr "��λ"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2893
 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"
@@ -3138,7 +3200,7 @@ msgstr ""
 "�ٹ�: �礿��桼����ID������ޤ��󡣤��Υ��ޥ�ɤϡ��̤�\n"
 "              �桼����ID����ˤʤ�Ȳ��ꤹ���礬����ޤ���\n"
 
-#: g10/keyedit.c:2845
+#: g10/keyedit.c:2953
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3147,45 +3209,75 @@ msgstr ""
 "�ٹ�: �����PGP2�����θ��Ǥ����ե���ID���ɲäǡ��������Ǥ�PGP�ϡ�\n"
 "      ���θ�����ݤ��뤫�⤷��ޤ���\n"
 
-#: g10/keyedit.c:2850 g10/keyedit.c:3128
+#: g10/keyedit.c:2958 g10/keyedit.c:3307
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "����Ǥ��ɲä������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:2856
+#: g10/keyedit.c:2964
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "PGP2�����θ��ˤϥե���ID���ɲäǤ��ޤ���\n"
 
-#: g10/keyedit.c:2996
+#: g10/keyedit.c:3104
 msgid "Delete this good signature? (y/N/q)"
 msgstr "������������̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3114
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "����̵���ʽ�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:3010
+#: g10/keyedit.c:3118
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "����̤�Τν�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:3016
+#: g10/keyedit.c:3124
 msgid "Really delete this self-signature? (y/N)"
 msgstr "���μ��ʽ�̾�������˺�����ޤ���? (y/N)"
 
-#: g10/keyedit.c:3030
+#: g10/keyedit.c:3138
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3139
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:3034
+#: g10/keyedit.c:3142
 msgid "Nothing deleted.\n"
 msgstr "���������Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:3123
+#: g10/keyedit.c:3167
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed.\n"
+msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
+
+#: g10/keyedit.c:3168
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed.\n"
+msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
+
+#: g10/keyedit.c:3173
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean.\n"
+msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
+
+#: g10/keyedit.c:3205 g10/trustdb.c:1694
+#, fuzzy
+msgid "invalid"
+msgstr "̵���������Ǥ�"
+
+#: g10/keyedit.c:3207
+#, fuzzy, c-format
+msgid "User ID \"%s\" removed: %s\n"
+msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
+
+#: g10/keyedit.c:3214
+#, fuzzy
+msgid "No user IDs are removable.\n"
+msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
+
+#: g10/keyedit.c:3302
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3194,329 +3286,334 @@ msgstr ""
 "�ٹ�: �����PGP 2.x�����θ��Ǥ�����̾�����Ԥ��ɲäǡ��������Ǥ�PGP�ϡ�\n"
 "      ���θ�����ݤ��뤫�⤷��ޤ���\n"
 
-#: g10/keyedit.c:3134
+#: g10/keyedit.c:3313
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "PGP 2.x�����θ��ˤϻ�̾�����Ԥ��ɲäǤ��ޤ���\n"
 
-#: g10/keyedit.c:3154
+#: g10/keyedit.c:3333
 msgid "Enter the user ID of the designated revoker: "
 msgstr "��̾�����ԤΥ桼����ID�����Ϥ��Ƥ�������: "
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3356
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x�����θ��ϡ���̾�����Ԥ�Ǥ̿�Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3371
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "��̾�����Ԥˤϡ����θ����Τ�Ǥ̿�Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3214
+#: g10/keyedit.c:3393
 msgid "this key has already been designated as a revoker\n"
 msgstr "���θ��ϼ����ԤȤ��Ƥ⤦��̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3233
+#: g10/keyedit.c:3412
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "�ٹ�: ���븰���̾�����Ԥ����ꤹ��ȡ������᤻�ޤ���!\n"
 
-#: g10/keyedit.c:3239
+#: g10/keyedit.c:3418
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "�����ˤ��θ����̾�����Ԥ�Ǥ̿���ޤ���? (y/N) "
 
-#: g10/keyedit.c:3300
+#: g10/keyedit.c:3479
 msgid "Please remove selections from the secret keys.\n"
 msgstr "��̩���������Ȥ��Ƥ���������\n"
 
-#: g10/keyedit.c:3306
+#: g10/keyedit.c:3485
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "�⡹1�Ĥ����������򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:3310
+#: g10/keyedit.c:3489
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "������ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:3313
+#: g10/keyedit.c:3492
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�縰��ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:3359
+#: g10/keyedit.c:3538
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3554
 msgid "No corresponding signature in secret ring\n"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/keyedit.c:3455
+#: g10/keyedit.c:3634
 msgid "Please select exactly one user ID.\n"
 msgstr "�桼����ID�򤭤ä���ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:3494 g10/keyedit.c:3604 g10/keyedit.c:3724
+#: g10/keyedit.c:3673 g10/keyedit.c:3783 g10/keyedit.c:3903
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "�桼����ID��%s�ɤ�v3���ʽ�̾��ȤФ��ޤ�\n"
 
-#: g10/keyedit.c:3665
+#: g10/keyedit.c:3844
 msgid "Enter your preferred keyserver URL: "
 msgstr "�����������С�URL�����Ϥ��Ƥ�������: "
 
-#: g10/keyedit.c:3745
+#: g10/keyedit.c:3924
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�����˸򴹤������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:3746
+#: g10/keyedit.c:3925
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�����˺���������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3987
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:3854
+#: g10/keyedit.c:4045
+#, fuzzy, c-format
+msgid "No user ID with hash %s\n"
+msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
+
+#: g10/keyedit.c:4072
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:3971
+#: g10/keyedit.c:4189
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "�桼����ID:��%s��\n"
 
-#: g10/keyedit.c:3974 g10/keyedit.c:4038 g10/keyedit.c:4081
+#: g10/keyedit.c:4192 g10/keyedit.c:4256 g10/keyedit.c:4299
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "%s��%s%s%s�˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3976 g10/keyedit.c:4040 g10/keyedit.c:4083
+#: g10/keyedit.c:4194 g10/keyedit.c:4258 g10/keyedit.c:4301
 msgid " (non-exportable)"
 msgstr " (��Ф��Բ�)"
 
-#: g10/keyedit.c:3980
+#: g10/keyedit.c:4198
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "���ν�̾��%s����λ�Ǥ���\n"
 
-#: g10/keyedit.c:3984
+#: g10/keyedit.c:4202
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "����Ǥ������˼����������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:3988
+#: g10/keyedit.c:4206
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "���ν�̾�ˤ������뼺���������������ޤ���? (y/N) "
 
-#: g10/keyedit.c:4015
+#: g10/keyedit.c:4233
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "�����Υ桼����ID�˸�%s�ǽ�̾���ޤ���:\n"
 
-#: g10/keyedit.c:4041
+#: g10/keyedit.c:4259
 msgid " (non-revocable)"
 msgstr " (�����Բ�)"
 
-#: g10/keyedit.c:4048
+#: g10/keyedit.c:4266
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "���ʤ��θ�%s��%s�˼�������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4070
+#: g10/keyedit.c:4288
 msgid "You are about to revoke these signatures:\n"
 msgstr "�����ν�̾�򼺸����褦�Ȥ��Ƥ��ޤ�:\n"
 
-#: g10/keyedit.c:4090
+#: g10/keyedit.c:4308
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "����������������˺������ޤ���? (y/N) "
 
-#: g10/keyedit.c:4120
+#: g10/keyedit.c:4338
 msgid "no secret key\n"
 msgstr "��̩��������ޤ���\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4408
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4425
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "�ٹ�: �桼����ID��̾����%d��̤��Ǥ�\n"
 
-#: g10/keyedit.c:4271
+#: g10/keyedit.c:4489
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4333
+#: g10/keyedit.c:4551
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4646
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "%s (�礭��%ld) �θ�%s (uid %d) �Υե���ID�Ȥ���ɽ��\n"
 
-#: g10/keygen.c:293
+#: g10/keygen.c:258
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "������%s�פν�ʣ\n"
 
-#: g10/keygen.c:300
+#: g10/keygen.c:265
 msgid "too many cipher preferences\n"
 msgstr "¿������Ź�ˡ����\n"
 
-#: g10/keygen.c:302
+#: g10/keygen.c:267
 msgid "too many digest preferences\n"
 msgstr "¿��������������\n"
 
-#: g10/keygen.c:304
+#: g10/keygen.c:269
 msgid "too many compression preferences\n"
 msgstr "¿�����밵������\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:394
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "����ʸ�����̵���ʹ��ܡ�%s�פ�����ޤ�\n"
 
-#: g10/keygen.c:829
+#: g10/keygen.c:822
 msgid "writing direct signature\n"
 msgstr "ľ�ܽ�̾��񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:868
+#: g10/keygen.c:861
 msgid "writing self signature\n"
 msgstr "���ʽ�̾��񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing key binding signature\n"
 msgstr "���б��ؤν�̾��񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2632
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "̵���ʸ�Ĺ��%u�ӥåȤˤ��ޤ�\n"
 
-#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2638
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "��Ĺ��%u�ӥåȤ˴ݤ�ޤ�\n"
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1239
 msgid "Sign"
 msgstr "Sign"
 
-#: g10/keygen.c:1252
+#: g10/keygen.c:1242
 msgid "Encrypt"
 msgstr "Encrypt"
 
-#: g10/keygen.c:1255
+#: g10/keygen.c:1245
 msgid "Authenticate"
 msgstr "Authenticate"
 
-#: g10/keygen.c:1263
+#: g10/keygen.c:1253
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1268
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "��%s�˲�ǽ�����: "
 
-#: g10/keygen.c:1282
+#: g10/keygen.c:1272
 msgid "Current allowed actions: "
 msgstr "������ǽ�����: "
 
-#: g10/keygen.c:1287
+#: g10/keygen.c:1277
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) ��̾�Ϥ�ȿž\n"
 
-#: g10/keygen.c:1290
+#: g10/keygen.c:1280
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) �Ź��Ϥ�ȿž\n"
 
-#: g10/keygen.c:1293
+#: g10/keygen.c:1283
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) ǧ���Ϥ�ȿž\n"
 
-#: g10/keygen.c:1296
+#: g10/keygen.c:1286
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) ��λ\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1340
 msgid "Please select what kind of key you want:\n"
 msgstr "����˾�θ��μ�������򤷤Ƥ�������:\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1342
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA��Elgamal (����)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1343
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (��̾�Τ�)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1345
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (�ȼ�ǽ�Ϥ�����)\n"
 
-#: g10/keygen.c:1357
+#: g10/keygen.c:1347
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (�Ź沽�Τ�)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1348
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (��̾�Τ�)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1350
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (�Ź沽�Τ�)\n"
 
-#: g10/keygen.c:1362
+#: g10/keygen.c:1352
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (�ȼ�ǽ�Ϥ�����)\n"
 
-#: g10/keygen.c:1431 g10/keygen.c:2509
+#: g10/keygen.c:1421 g10/keygen.c:2506
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA���Ф�1024�ӥåȤˤʤ�ޤ���\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1431
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1438
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "�ɤθ�Ĺ�ˤ��ޤ���? (1024) "
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1452
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1468
+#: g10/keygen.c:1458
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�׵ᤵ�줿��Ĺ��%u�ӥå�\n"
 
-#: g10/keygen.c:1473 g10/keygen.c:1478
+#: g10/keygen.c:1463 g10/keygen.c:1468
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%u�ӥåȤ˴ݤ�ޤ�\n"
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1515
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3532,7 +3629,7 @@ msgstr ""
 "      <n>m = ���� n ����֤���λ\n"
 "      <n>y = ���� n ǯ�֤���λ\n"
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1526
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3548,39 +3645,40 @@ msgstr ""
 "      <n>m = ��̾�� n ����֤���λ\n"
 "      <n>y = ��̾�� n ǯ�֤���λ\n"
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1549
 msgid "Key is valid for? (0) "
 msgstr "����ͭ�����֤�? (0)"
 
-#: g10/keygen.c:1563
-msgid "Signature is valid for? (0) "
+#: g10/keygen.c:1554
+#, fuzzy, c-format
+msgid "Signature is valid for? (%s) "
 msgstr "��̾��ͭ�����֤�? (0)"
 
-#: g10/keygen.c:1568
+#: g10/keygen.c:1572
 msgid "invalid value\n"
 msgstr "̵������\n"
 
-#: g10/keygen.c:1575
+#: g10/keygen.c:1579
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s��̵���¤Ǥ�\n"
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1580
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s��̵���¤Ǥ�\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1585
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s��%s����λ���ޤ�\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1586
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "���ν�̾��%s����λ�Ǥ�\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1592
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3588,11 +3686,11 @@ msgstr ""
 "���Υ����ƥ�Ǥϡ�2038ǯ�ʹߤ����դ�ɽ���Ǥ��ޤ��󤬡�\n"
 "2106ǯ�ޤǤʤ���������갷���ޤ���\n"
 
-#: g10/keygen.c:1595
+#: g10/keygen.c:1597
 msgid "Is this correct? (y/N) "
 msgstr "������������Ǥ���? (y/N) "
 
-#: g10/keygen.c:1638
+#: g10/keygen.c:1641
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3608,44 +3706,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1651
+#: g10/keygen.c:1654
 msgid "Real name: "
 msgstr "��̾: "
 
-#: g10/keygen.c:1659
+#: g10/keygen.c:1662
 msgid "Invalid character in name\n"
 msgstr "̾����̵����ʸ��������ޤ�\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1664
 msgid "Name may not start with a digit\n"
 msgstr "̾��������ǻϤ�ƤϤ����ޤ���\n"
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1666
 msgid "Name must be at least 5 characters long\n"
 msgstr "̾����5ʸ���ʾ�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1674
 msgid "Email address: "
 msgstr "�Żҥ᡼�롦���ɥ쥹: "
 
-#: g10/keygen.c:1682
+#: g10/keygen.c:1685
 msgid "Not a valid email address\n"
 msgstr "ͭ�����Żҥ᡼�롦���ɥ쥹�ǤϤ���ޤ���\n"
 
-#: g10/keygen.c:1690
+#: g10/keygen.c:1693
 msgid "Comment: "
 msgstr "������: "
 
-#: g10/keygen.c:1696
+#: g10/keygen.c:1699
 msgid "Invalid character in comment\n"
 msgstr "�����Ȥ�̵����ʸ��������ޤ�\n"
 
-#: g10/keygen.c:1719
+#: g10/keygen.c:1722
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "���ʤ���ʸ�������%s�פ�ȤäƤ��ޤ���\n"
 
-#: g10/keygen.c:1725
+#: g10/keygen.c:1728
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3656,7 +3754,7 @@ msgstr ""
 "    ��%s��\n"
 "\n"
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1733
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�Żҥ᡼��Υ��ɥ쥹����̾�䥳���Ȥ�����ʤ��褦��\n"
 
@@ -3671,23 +3769,23 @@ msgstr "�Żҥ᡼��Υ��ɥ쥹����̾�䥳���Ȥ�����ʤ��褦��\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1746
+#: g10/keygen.c:1749
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1756
+#: g10/keygen.c:1759
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ��Ͻ�λ(Q)? "
 
-#: g10/keygen.c:1757
+#: g10/keygen.c:1760
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ���OK(O)����λ(Q)? "
 
-#: g10/keygen.c:1776
+#: g10/keygen.c:1779
 msgid "Please correct the error first\n"
 msgstr "�ޤ����顼�������Ƥ�������\n"
 
-#: g10/keygen.c:1816
+#: g10/keygen.c:1819
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3695,12 +3793,12 @@ msgstr ""
 "��̩�����ݸ�뤿��˥ѥ��ե졼��������ޤ���\n"
 "\n"
 
-#: g10/keygen.c:1826 g10/passphrase.c:1105
+#: g10/keygen.c:1829 g10/passphrase.c:786
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1832
+#: g10/keygen.c:1835
 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"
@@ -3712,7 +3810,7 @@ msgstr ""
 "�Ρ�--edit-key�ɥ��ץ����Ǥ��ĤǤ��ѹ��Ǥ��ޤ���\n"
 "\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1857
 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"
@@ -3723,50 +3821,50 @@ msgstr ""
 "�Ȥ����ǥ������˥�����������Ȥ���¾�Τ��Ȥ򤹤�ȡ���������Ҥ�\n"
 "�𻨤����礭�ʤ���������������䤹���ʤ�Τǡ������ᤤ�����ޤ���\n"
 
-#: g10/keygen.c:2578
+#: g10/keygen.c:2575
 msgid "Key generation canceled.\n"
 msgstr "�������������ä���ޤ�����\n"
 
-#: g10/keygen.c:2766 g10/keygen.c:2910
+#: g10/keygen.c:2774 g10/keygen.c:2918
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "��%s�פظ�������񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:2768 g10/keygen.c:2913
+#: g10/keygen.c:2776 g10/keygen.c:2921
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "��%s�פ���̩�������֤�񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:2771 g10/keygen.c:2916
+#: g10/keygen.c:2779 g10/keygen.c:2924
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2907
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "����߲�ǽ�ʸ������ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/keygen.c:2905
+#: g10/keygen.c:2913
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "����߲�ǽ����̩���ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2931
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "�������ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2938
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "��̩���ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/keygen.c:2953
+#: g10/keygen.c:2961
 msgid "public and secret key created and signed.\n"
 msgstr "����������̩�������������̾���ޤ�����\n"
 
-#: g10/keygen.c:2964
+#: g10/keygen.c:2972
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -3775,378 +3873,359 @@ msgstr ""
 "���θ��ϰŹ沽�ˤϻ��ѤǤ��ʤ����Ȥ����դ��Ƥ����������Ź沽��Ԥ��ˤϡ�\n"
 "��--edit-key�ɥ��ޥ�ɤ�Ȥä��������������Ƥ���������\n"
 
-#: g10/keygen.c:2976 g10/keygen.c:3105 g10/keygen.c:3220
+#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "���������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3156 g10/sign.c:290
+#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פξ㳲�Ǥ��礦)\n"
 
-#: g10/keygen.c:3030 g10/keygen.c:3158 g10/sign.c:292
+#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פξ㳲�Ǥ��礦)\n"
 
-#: g10/keygen.c:3039 g10/keygen.c:3169
+#: g10/keygen.c:3047 g10/keygen.c:3177
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "����: v3���������κ����ϡ�OpenPGP��Ŭ�礷�ޤ���\n"
 
-#: g10/keygen.c:3078 g10/keygen.c:3202
+#: g10/keygen.c:3086 g10/keygen.c:3210
 msgid "Really create? (y/N) "
 msgstr "�����˺������ޤ���? (y/N) "
 
-#: g10/keygen.c:3355
+#: g10/keygen.c:3363
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "�����ɤؤθ����ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keygen.c:3402
+#: g10/keygen.c:3410
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "�Хå����åס��ե������%s�פ������Ǥ��ޤ���: %s\n"
 
-#: g10/keygen.c:3428
+#: g10/keygen.c:3436
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "����: �����ɸ��ΥХå����åפ���%s�פ���¸����ޤ�\n"
 
-#: g10/keygen.c:3508
-#, c-format
-msgid "length of RSA modulus is not %d\n"
-msgstr "RSA��ˡ(modulus)��Ĺ����%d�Ǥ���ޤ���\n"
-
-#: g10/keygen.c:3514
-msgid "public exponent too large (more than 32 bits)\n"
-msgstr "�����ؿ����礭�����ޤ� (32�ӥåȤ����)\n"
-
-#: g10/keygen.c:3520 g10/keygen.c:3526
-#, c-format
-msgid "length of an RSA prime is not %d\n"
-msgstr "RSA���ǿ���%d�Ǥ���ޤ���\n"
-
-#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
+#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
 msgid "never     "
 msgstr "̵����    "
 
-#: g10/keylist.c:264
+#: g10/keylist.c:265
 msgid "Critical signature policy: "
 msgstr "����ƥ�����ʽ�̾�ݥꥷ��: "
 
-#: g10/keylist.c:266
+#: g10/keylist.c:267
 msgid "Signature policy: "
 msgstr "��̾�ݥꥷ��: "
 
-#: g10/keylist.c:305
+#: g10/keylist.c:306
 msgid "Critical preferred keyserver: "
 msgstr "����������������: "
 
-#: g10/keylist.c:354 g10/keylist.c:398
+#: g10/keylist.c:355 g10/keylist.c:399
 msgid "WARNING: invalid notation data found\n"
 msgstr "�ٹ�: ̵��������ǡ�����ȯ��\n"
 
-#: g10/keylist.c:372
+#: g10/keylist.c:373
 msgid "Critical signature notation: "
 msgstr "����ƥ�����ʽ�̾����: "
 
-#: g10/keylist.c:374
+#: g10/keylist.c:375
 msgid "Signature notation: "
 msgstr "��̾����: "
 
-#: g10/keylist.c:385
+#: g10/keylist.c:386
 msgid "not human readable"
 msgstr "�ͤˤ��ɤ�ޤ���"
 
-#: g10/keylist.c:486
+#: g10/keylist.c:487
 msgid "Keyring"
 msgstr "����"
 
-#: g10/keylist.c:792
+#: g10/keylist.c:793
 #, c-format
 msgid "expired: %s)"
 msgstr "��λ: %s)"
 
-#: g10/keylist.c:1488
+#: g10/keylist.c:1489
 msgid "Primary key fingerprint:"
 msgstr "�縰�λ���:"
 
-#: g10/keylist.c:1490
+#: g10/keylist.c:1491
 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:1497
+#: g10/keylist.c:1498
 msgid " Primary key fingerprint:"
 msgstr " �縰�λ���:"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1500
 msgid "      Subkey fingerprint:"
 msgstr " �������:"
 
-#: g10/keylist.c:1503 g10/keylist.c:1507
+#: g10/keylist.c:1504 g10/keylist.c:1508
 msgid "      Key fingerprint ="
 msgstr "                 ���� ="
 
-#: g10/keylist.c:1574
+#: g10/keylist.c:1575
 msgid "      Card serial no. ="
 msgstr "         �����ɤ����� ="
 
-#: g10/keyring.c:1245
+#: g10/keyring.c:1246
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "��%s�פ����%s�פؤΰ�ư�˼���: %s\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1252
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "�ٹ�: ���Ѿ�����ä�2�ĤΥե����뤬¸�ߤ��ޤ���\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s���ѹ��Τʤ����Ǥ�\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1255
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s�Ͽ��������Ǥ�\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1256
 msgid "Please fix this possible security flaw\n"
 msgstr "��������Ū�ʰ�����η�٤������Ƥ�������\n"
 
-#: g10/keyring.c:1375
+#: g10/keyring.c:1376
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "���ء�%s�פ򥭥�å��夷�ޤ�\n"
 
-#: g10/keyring.c:1421
+#: g10/keyring.c:1422
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu�Ĥθ��ޤǥ���å���� (%lu�Ĥν�̾)\n"
 
-#: g10/keyring.c:1433
+#: g10/keyring.c:1434
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu�Ĥθ��򥭥�å���� (%lu�Ĥν�̾)\n"
 
-#: g10/keyring.c:1504
+#: g10/keyring.c:1505
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: ���ؤ��Ǥ��ޤ���\n"
 
-#: g10/keyserver.c:107
+#: g10/keyserver.c:105
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "�ٹ�: �������С��Υ��ץ�����%s�פϡ����Υץ�åȥۡ���ǤϻȤ��ޤ���\n"
 
-#: g10/keyserver.c:434
+#: g10/keyserver.c:433
 msgid "disabled"
 msgstr "disabled"
 
-#: g10/keyserver.c:635
+#: g10/keyserver.c:634
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "�ֹ�(s)��N)�����ޤ���Q)��ߤ����Ϥ��Ƥ������� >"
 
-#: g10/keyserver.c:718 g10/keyserver.c:1238
+#: g10/keyserver.c:717 g10/keyserver.c:1267
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "̵���ʸ������С����ץ��ȥ���Ǥ� (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:808
+#: g10/keyserver.c:815
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "����%s�ɤ��������С��˸��Ĥ���ޤ���\n"
 
-#: g10/keyserver.c:810
+#: g10/keyserver.c:817
 msgid "key not found on keyserver\n"
 msgstr "�����������С��˸��Ĥ���ޤ���\n"
 
-#: g10/keyserver.c:985
+#: g10/keyserver.c:1014
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "��%s��%s���饵���С�%s���׵�\n"
 
-#: g10/keyserver.c:989
+#: g10/keyserver.c:1018
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "��%s��%s���׵�\n"
 
-#: g10/keyserver.c:1141
+#: g10/keyserver.c:1170
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "��%s��%s������%s������\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1174
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "��%s��%s������\n"
 
-#: g10/keyserver.c:1188
+#: g10/keyserver.c:1217
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "��%s�ɤ�%s�����С�%s���鸡��\n"
 
-#: g10/keyserver.c:1191
+#: g10/keyserver.c:1220
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "��%s�ɤ򥵡��С�%s���鸡��\n"
 
-#: g10/keyserver.c:1198 g10/keyserver.c:1293
+#: g10/keyserver.c:1227 g10/keyserver.c:1322
 msgid "no keyserver action!\n"
 msgstr "�������С�����������󤬤���ޤ���!\n"
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1275
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "�ٹ�: ���� (%s) ��GnuPG�θ������С����ϥ�ɥ�\n"
 
-#: g10/keyserver.c:1255
+#: g10/keyserver.c:1284
 msgid "keyserver did not send VERSION\n"
 msgstr "�������С���VERSION���������ޤ���Ǥ���\n"
 
-#: g10/keyserver.c:1314
+#: g10/keyserver.c:1343
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "���Τθ������С�������ޤ��� (���ץ����--keyserver��Ȥ��ޤ��礦)\n"
 
-#: g10/keyserver.c:1320
+#: g10/keyserver.c:1349
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "���ι��ۤǤϡ������������С��θƽФ��ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1361
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "�������С������������%s���ѤΥϥ�ɥ餬����ޤ���\n"
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1366
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "����%s�פϡ��������С������������%s�פǥ��ݡ��Ȥ���Ƥ��ޤ���\n"
 
-#: g10/keyserver.c:1345
-#, c-format
-msgid "gpgkeys_%s does not support handler version %d\n"
+#: g10/keyserver.c:1374
+#, fuzzy, c-format
+msgid "%s does not support handler version %d\n"
 msgstr "gpgkeys_%s�ϡ��ϥ�ɥ�%d�Ǥ򥵥ݡ��Ȥ��ޤ���\n"
 
-#: g10/keyserver.c:1351
+#: g10/keyserver.c:1381
 msgid "keyserver timed out\n"
 msgstr "�������С��Υ����ॢ����\n"
 
-#: g10/keyserver.c:1356
+#: g10/keyserver.c:1386
 msgid "keyserver internal error\n"
 msgstr "�������С����������顼\n"
 
-#: g10/keyserver.c:1365
+#: g10/keyserver.c:1395
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "�������С��̿����顼: %s\n"
 
-#: g10/keyserver.c:1390 g10/keyserver.c:1424
+#: g10/keyserver.c:1420 g10/keyserver.c:1454
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "��%s�ɸ�ID�ǤϤ���ޤ���: �ȤФ��ޤ�\n"
 
-#: g10/keyserver.c:1681
+#: g10/keyserver.c:1711
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "�ٹ�: ��%s��%s��ͳ�Dz����Ǥ��ޤ���: %s\n"
 
-#: g10/keyserver.c:1703
+#: g10/keyserver.c:1733
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "1�ܤθ���%s�������\n"
 
-#: g10/keyserver.c:1705
+#: g10/keyserver.c:1735
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "%d�ܤθ���%s�������\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:249
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "�Ѥ�Ĺ���ΰŹ沽�Ѥߥ��å���� (%d)\n"
 
-#: g10/mainproc.c:262
-#, c-format
-msgid "bad passphrase or unknown cipher algorithm (%d)\n"
-msgstr "�����ʥѥ��ե졼���ޤ���̤�ΤΰŹ楢�르�ꥺ��Ǥ�(%d)\n"
-
-#: g10/mainproc.c:299
+#: g10/mainproc.c:300
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s �Ź沽�Ѥߥ��å����\n"
 
-#: g10/mainproc.c:309
+#: g10/mainproc.c:310
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "̤�Τ����󥢥르�ꥺ����������줿�ѥ��ե졼�� %d\n"
 
-#: g10/mainproc.c:375
+#: g10/mainproc.c:376
 #, c-format
 msgid "public key is %s\n"
 msgstr "��������%s�Ǥ�\n"
 
-#: g10/mainproc.c:430
+#: g10/mainproc.c:431
 msgid "public key encrypted data: good DEK\n"
 msgstr "�������ˤ��Ź沽�Ѥߥǡ���: ������DEK�Ǥ�\n"
 
-#: g10/mainproc.c:463
+#: g10/mainproc.c:464
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "%u-�ӥå�%s��, ID %s, ����%s�˰Ź沽����ޤ���\n"
 
-#: g10/mainproc.c:467 g10/pkclist.c:218
+#: g10/mainproc.c:468 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      ��%s��\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:472
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "%s��, ID %s�ǰŹ沽����ޤ���\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "������������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:499
+#: g10/mainproc.c:500
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu �ĤΥѥ��ե졼���ǰŹ沽\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:502
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 �ĤΥѥ��ե졼���ǰŹ沽\n"
 
-#: g10/mainproc.c:529 g10/mainproc.c:551
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s�Ź沽�Ѥߥǡ�������\n"
 
-#: g10/mainproc.c:537
+#: g10/mainproc.c:538
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA�Ź�ˡ��������ǽ�ʤΤǡ���ŷŪ�Ǥ���%s�����Ѥ��褦�Ȥ��Ƥ��ޤ�\n"
 
-#: g10/mainproc.c:569
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr "���������\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:574
 msgid "WARNING: message was not integrity protected\n"
 msgstr "�ٹ�: ��å������δ��������ݸ��Ƥ��ޤ���\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "�ٹ�: �Ź沽���줿��å������ϲ��⤵��Ƥ��ޤ�!\n"
 
-#: g10/mainproc.c:592
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "����˼��Ԥ��ޤ���: %s\n"
@@ -4160,297 +4239,286 @@ msgstr "����: �����Ԥϡ����ˤ���ɤ褦�˵��Ƥ��ޤ�\n"
 msgid "original file name='%.*s'\n"
 msgstr "���Υե�����̾='%.*s'\n"
 
-#: g10/mainproc.c:786
+#: g10/mainproc.c:803
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "��Ω��������gpg --import�ɤ�Ȥä�Ŭ�Ѥ��Ƥ�������\n"
 
-#: g10/mainproc.c:1290
+#: g10/mainproc.c:1307
 msgid "signature verification suppressed\n"
 msgstr "��̾�θ��ڤ��ά\n"
 
-#: g10/mainproc.c:1332 g10/mainproc.c:1342
+#: g10/mainproc.c:1349 g10/mainproc.c:1359
 msgid "can't handle these multiple signatures\n"
 msgstr "����¿�Ž�̾�ϼ�갷���ޤ���\n"
 
-#: g10/mainproc.c:1352
+#: g10/mainproc.c:1369
 #, c-format
 msgid "Signature made %s\n"
 msgstr "%s�˻ܤ��줿��̾\n"
 
-#: g10/mainproc.c:1353
+#: g10/mainproc.c:1370
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               %s��%s�����\n"
 
-#: g10/mainproc.c:1357
+#: g10/mainproc.c:1374
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "%s��%s��ID %s�ǻܤ��줿��̾\n"
 
-#: g10/mainproc.c:1377
+#: g10/mainproc.c:1394
 msgid "Key available at: "
 msgstr "�ʲ��˸�������ޤ�: "
 
-#: g10/mainproc.c:1482 g10/mainproc.c:1530
+#: g10/mainproc.c:1499 g10/mainproc.c:1547
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "��%s�ɤ���� ������ ��̾"
 
-#: g10/mainproc.c:1484 g10/mainproc.c:1532
+#: g10/mainproc.c:1501 g10/mainproc.c:1549
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "��%s�ɤ���δ����ڤ�ν�̾"
 
-#: g10/mainproc.c:1486 g10/mainproc.c:1534
+#: g10/mainproc.c:1503 g10/mainproc.c:1551
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "��%s�ɤ������������̾"
 
-#: g10/mainproc.c:1538
+#: g10/mainproc.c:1555
 msgid "[uncertain]"
 msgstr "[�Գ���]"
 
-#: g10/mainproc.c:1570
+#: g10/mainproc.c:1587
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                ��̾��%s��"
 
-#: g10/mainproc.c:1664
+#: g10/mainproc.c:1681
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "�����ڤ�ν�̾ %s\n"
 
-#: g10/mainproc.c:1669
+#: g10/mainproc.c:1686
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "���ν�̾��%s����λ�Ǥ�\n"
 
-#: g10/mainproc.c:1672
+#: g10/mainproc.c:1689
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 
-#: g10/mainproc.c:1673
+#: g10/mainproc.c:1690
 msgid "binary"
 msgstr "�Х��ʥ꡼"
 
-#: g10/mainproc.c:1674
+#: g10/mainproc.c:1691
 msgid "textmode"
 msgstr "�ƥ����ȥ⡼��"
 
-#: g10/mainproc.c:1674 g10/trustdb.c:530
+#: g10/mainproc.c:1691 g10/trustdb.c:531
 msgid "unknown"
 msgstr "̤�Τ�"
 
-#: g10/mainproc.c:1694
+#: g10/mainproc.c:1711
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "��̾�򸡺��Ǥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:1762 g10/mainproc.c:1778 g10/mainproc.c:1864
+#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
 msgid "not a detached signature\n"
 msgstr "ʬΥ��̾�Ǥ���ޤ���\n"
 
-#: g10/mainproc.c:1805
+#: g10/mainproc.c:1822
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "�ٹ�: ¿�Ž�̾�θ��С��ǽ�Τ�Τ����������ޤ���\n"
 
-#: g10/mainproc.c:1813
+#: g10/mainproc.c:1830
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "���饹0x%02x����Ω��̾\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1887
 msgid "old style (PGP 2.x) signature\n"
 msgstr "�Ť����� (PGP 2.x) �ν�̾\n"
 
-#: g10/mainproc.c:1880
+#: g10/mainproc.c:1897
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() �����̵���ʥ롼�ȡ��ѥ��åȤ򸡽Ф��ޤ���\n"
 
-#: g10/misc.c:121
+#: g10/misc.c:122
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "����������פ���ѶػߤˤǤ��ޤ���: %s\n"
 
-#: g10/misc.c:141 g10/misc.c:169 g10/misc.c:241
+#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "��%s�פ�fstat��%s�Ǽ��Ԥ��ޤ���: %s\n"
 
-#: g10/misc.c:206
+#: g10/misc.c:207
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d)��%s�Ǽ��Ԥ��ޤ���: %s\n"
 
-#: g10/misc.c:315
+#: g10/misc.c:316
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "�������Υ��르�ꥺ��%d�ϡ���갷���ޤ���\n"
 
-#: g10/misc.c:330
+#: g10/misc.c:331
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "̤�����ΰŹ楢�르�ꥺ��Ǥ�"
 
-#: g10/misc.c:345
+#: g10/misc.c:346
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:351
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "�ٹ�: ���󥢥르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/misc.c:446
+#: g10/misc.c:447
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA�Ź�ˡ�Υץ饰���󤬤���ޤ���\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:448
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr "�ܺ٤ϡ�http://www.gnupg.org/why-not-idea.html������������\n"
 
-#: g10/misc.c:680
+#: g10/misc.c:681
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: ����뤵��Ƥ��륪�ץ�����%s��\n"
 
-#: g10/misc.c:684
+#: g10/misc.c:685
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "�ٹ�:��%s�ɤϡ�����뤵��Ƥ��륪�ץ����Ǥ�\n"
 
-#: g10/misc.c:686
+#: g10/misc.c:687
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "��%s%s�ɤ�����˻ȤäƤ�������\n"
 
-#: g10/misc.c:697
+#: g10/misc.c:694
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
+msgstr "�ٹ�:��%s�ɤϡ�����뤵��Ƥ��륪�ץ����Ǥ�\n"
+
+#: g10/misc.c:707
 msgid "Uncompressed"
 msgstr "̵����"
 
-#: g10/misc.c:722
+#: g10/misc.c:732
 msgid "uncompressed|none"
 msgstr "̵����|�ʤ�"
 
-#: g10/misc.c:832
+#: g10/misc.c:842
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "���Υ�å������ϡ�%s�Ǥϻ��ѤǤ��ޤ���\n"
 
-#: g10/misc.c:989
+#: g10/misc.c:999
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "�����ޤ��ʥ��ץ�����%s��\n"
 
-#: g10/misc.c:1014
+#: g10/misc.c:1024
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "̤�ΤΥ��ץ�����%s��\n"
 
-#: g10/openfile.c:84
+#: g10/openfile.c:86
 #, c-format
 msgid "File `%s' exists. "
 msgstr "�ե������%s�פϴ���¸�ߤ��ޤ���"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 msgid "Overwrite? (y/N) "
 msgstr "��񤭤��ޤ���? (y/N) "
 
-#: g10/openfile.c:119
+#: g10/openfile.c:121
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: ̤�Τγ�ĥ��\n"
 
-#: g10/openfile.c:141
+#: g10/openfile.c:143
 msgid "Enter new filename"
 msgstr "�������ե�����̾�����Ϥ��Ƥ�������"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:188
 msgid "writing to stdout\n"
 msgstr "ɸ����Ϥ˽񤭹��ߤޤ�\n"
 
-#: g10/openfile.c:296
+#: g10/openfile.c:300
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "��̾���줿�ǡ�������%s�פˤ�������ꤷ�ޤ�\n"
 
-#: g10/openfile.c:375
+#: g10/openfile.c:379
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "�����������ե������%s�פ��Ǥ��ޤ���\n"
 
-#: g10/openfile.c:377
+#: g10/openfile.c:381
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "�ٹ�: ��%s�פΥ��ץ����ϵ�ư���Ƥ���֡�ͭ���ˤʤ�ޤ���\n"
 
-#: g10/openfile.c:409
+#: g10/openfile.c:413
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ��Ǥ��ޤ���\n"
 
-#: g10/parse-packet.c:137
+#: g10/parse-packet.c:138
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "�������Υ��르�ꥺ��%d�ϡ���갷���ޤ���\n"
 
-#: g10/parse-packet.c:707
+#: g10/parse-packet.c:708
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "�ٹ�: ����Ū�˷��ݤ��оΰŹ沽���å���󸰤Ǥ�\n"
 
-#: g10/parse-packet.c:1132
+#: g10/parse-packet.c:1145
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "��%d�β��̥ѥ��åȤ˥���ƥ����롦�ӥåȤ�ȯ��\n"
 
-#: g10/passphrase.c:478 g10/passphrase.c:525
+#: g10/passphrase.c:305
 msgid "gpg-agent is not available in this session\n"
 msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
 
-#: g10/passphrase.c:486
-msgid "can't set client pid for the agent\n"
-msgstr "����������ȤΥ��饤�����pid������Ǥ��ޤ���\n"
-
-#: g10/passphrase.c:494
-msgid "can't get server read FD for the agent\n"
-msgstr "������������ѤΥ����С��ɽФ�FD������Ǥ��ޤ���\n"
-
-#: g10/passphrase.c:501
-msgid "can't get server write FD for the agent\n"
-msgstr "������������ѤΥ����С������FD������Ǥ��ޤ���\n"
-
-#: g10/passphrase.c:534
+#: g10/passphrase.c:317
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO�Ķ��ѿ��ν񼰤�����������ޤ���\n"
 
-#: g10/passphrase.c:547
+#: g10/passphrase.c:332
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent�ץ��ȥ��롦�С������%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/passphrase.c:568
+#: g10/passphrase.c:345
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "��%s�פ���³�Ǥ��ޤ���: %s\n"
 
-#: g10/passphrase.c:590
-msgid "communication problem with gpg-agent\n"
-msgstr "gpg-agent�Ȥ��̿��㳲\n"
-
-#: g10/passphrase.c:597 g10/passphrase.c:937 g10/passphrase.c:1049
+#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
 msgid "problem with the agent - disabling agent use\n"
 msgstr "����������Ȥ˾㳲: ��������������Ѷػ�\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1209
+#: g10/passphrase.c:511 g10/passphrase.c:890
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (�縰ID %s)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:525
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4461,40 +4529,27 @@ msgstr ""
 "\"%.*s\"\n"
 "%u�ӥå�%s��, ID %s�������դ�%s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:550
 msgid "Repeat passphrase\n"
 msgstr "�ѥ��ե졼���������\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:552
 msgid "Enter passphrase\n"
 msgstr "�ѥ��ե졼��������\n"
 
-#: g10/passphrase.c:781
-msgid "passphrase too long\n"
-msgstr "�ѥ��ե졼����Ĺ�����ޤ�\n"
-
-#: g10/passphrase.c:794
-msgid "invalid response from agent\n"
-msgstr "����������Ȥ����̵���ʱ���\n"
-
-#: g10/passphrase.c:810 g10/passphrase.c:931
+#: g10/passphrase.c:628
 msgid "cancelled by user\n"
 msgstr "�桼�����ˤ���ä�\n"
 
-#: g10/passphrase.c:815 g10/passphrase.c:1020
-#, c-format
-msgid "problem with the agent: agent returns 0x%lx\n"
-msgstr "����������Ȥ˾㳲: ����������Ȥ�0x%lx���ֵ�\n"
-
-#: g10/passphrase.c:1100 g10/passphrase.c:1263
+#: g10/passphrase.c:781 g10/passphrase.c:944
 msgid "can't query passphrase in batch mode\n"
 msgstr "�Хå����⡼�ɤǥѥ��ե졼������礻�Ǥ��ޤ���\n"
 
-#: g10/passphrase.c:1107 g10/passphrase.c:1268
+#: g10/passphrase.c:788 g10/passphrase.c:949
 msgid "Enter passphrase: "
 msgstr "�ѥ��ե졼��������: "
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:871
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4503,21 +4558,21 @@ msgstr ""
 "���Υ桼��������̩���Υ��å���������ˤ�\n"
 "�ѥ��ե졼��������ޤ�:��%s��\n"
 
-#: g10/passphrase.c:1196
+#: g10/passphrase.c:877
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u�ӥå�%s��, ID %s�������դ�%s"
 
-#: g10/passphrase.c:1205
+#: g10/passphrase.c:886
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (�縰ID %s ������)"
 
-#: g10/passphrase.c:1272
+#: g10/passphrase.c:953
 msgid "Repeat passphrase: "
 msgstr "�ѥ��ե졼���������: "
 
-#: g10/photoid.c:66
+#: g10/photoid.c:67
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4531,149 +4586,149 @@ msgstr ""
 "���Ƥ����ޤ��礦���⤷�礭�ʼ̿���Ȥ��ȡ����ʤ��θ���Ʊ�ͤ��礭���ʤ�\n"
 "�ޤ�! 240x288���餤�ˤ����ޤ��礭���β����ϡ��Ȥ��褤�Ǥ��礦��\n"
 
-#: g10/photoid.c:80
+#: g10/photoid.c:81
 msgid "Enter JPEG filename for photo ID: "
 msgstr "�ե���ID�Ѥ�JPEG�ե�����̾�����Ϥ��Ƥ�������: "
 
-#: g10/photoid.c:94
+#: g10/photoid.c:95
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "JPEG�ե������%s�פ������ޤ���: %s\n"
 
-#: g10/photoid.c:102
+#: g10/photoid.c:103
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "����JPEG�ϡ��������礭�� (%d�Х���) !\n"
 
-#: g10/photoid.c:104
+#: g10/photoid.c:105
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "�����˻Ȥ������Ǥ���? (y/N) "
 
-#: g10/photoid.c:119
+#: g10/photoid.c:120
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "��%s�פϡ�JPEG�ե�����ǤϤ���ޤ���\n"
 
-#: g10/photoid.c:136
+#: g10/photoid.c:137
 msgid "Is this photo correct (y/N/q)? "
 msgstr "���μ̿����������Ǥ��� (y/N/q)? "
 
-#: g10/photoid.c:338
+#: g10/photoid.c:339
 msgid "unable to display photo ID!\n"
 msgstr "�ե���ID��ɽ����ǽ!\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:580
+#: g10/pkclist.c:62 g10/revoke.c:581
 msgid "No reason specified"
 msgstr "��ͳ�ϻ��ꤵ��Ƥ��ޤ���"
 
-#: g10/pkclist.c:63 g10/revoke.c:582
+#: g10/pkclist.c:64 g10/revoke.c:583
 msgid "Key is superseded"
 msgstr "�����Ȥ꤫��äƤ��ޤ�"
 
-#: g10/pkclist.c:65 g10/revoke.c:581
+#: g10/pkclist.c:66 g10/revoke.c:582
 msgid "Key has been compromised"
 msgstr "�����ѥ����ޤ���"
 
-#: g10/pkclist.c:67 g10/revoke.c:583
+#: g10/pkclist.c:68 g10/revoke.c:584
 msgid "Key is no longer used"
 msgstr "���Ϥ⤦���ѤǤ�"
 
-#: g10/pkclist.c:69 g10/revoke.c:584
+#: g10/pkclist.c:70 g10/revoke.c:585
 msgid "User ID is no longer valid"
 msgstr "�桼����ID���⤦ͭ���Ǥ���ޤ���"
 
-#: g10/pkclist.c:73
+#: g10/pkclist.c:74
 msgid "reason for revocation: "
 msgstr "������ͳ: "
 
-#: g10/pkclist.c:90
+#: g10/pkclist.c:91
 msgid "revocation comment: "
 msgstr "����������: "
 
-#: g10/pkclist.c:205
+#: g10/pkclist.c:206
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:213
+#: g10/pkclist.c:214
 msgid "No trust value assigned to:\n"
 msgstr "�����٤����ꤵ��Ƥ��ޤ���:\n"
 
-#: g10/pkclist.c:245
+#: g10/pkclist.c:246
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "  ��̾��%s��\n"
 
-#: g10/pkclist.c:255
+#: g10/pkclist.c:256
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr ""
 "���θ������Υ桼������ʤΤ��ܿͤΤ�Τ��ɤ������ɤ줯�餤���ѤǤ��ޤ���?\n"
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:271
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr "  %d = �Τ�ʤ����ޤ��ϲ��Ȥ�����ʤ�\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr "  %d = ���Ѥ� �ʤ�\n"
 
-#: g10/pkclist.c:278
+#: g10/pkclist.c:279
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr "  %d = ����Ū�˿��Ѥ���\n"
 
-#: g10/pkclist.c:284
+#: g10/pkclist.c:285
 msgid "  m = back to the main menu\n"
 msgstr "  m = �᡼�󡦥�˥塼�����\n"
 
-#: g10/pkclist.c:287
+#: g10/pkclist.c:288
 msgid "  s = skip this key\n"
 msgstr "  s = ���θ��ϤȤФ�\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 msgid "  q = quit\n"
 msgstr "  q = ��λ\n"
 
-#: g10/pkclist.c:292
+#: g10/pkclist.c:293
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr "���θ��κǾ����ѥ�٥�: %s\n"
 
-#: g10/pkclist.c:298 g10/revoke.c:609
+#: g10/pkclist.c:299 g10/revoke.c:610
 msgid "Your decision? "
 msgstr "���ʤ��η����? "
 
-#: g10/pkclist.c:319
+#: g10/pkclist.c:320
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "�����ˤ��θ�������Ū�˿��Ѥ��ޤ���? (y/N) "
 
-#: g10/pkclist.c:333
+#: g10/pkclist.c:334
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "����Ū�˿��Ѥ������ؤξ�����:\n"
 
-#: g10/pkclist.c:418
+#: g10/pkclist.c:419
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr "%s: ���θ����������ܿͤΤ�ΤǤ��롢�Ȥ���������������ޤ���\n"
 
-#: g10/pkclist.c:423
+#: g10/pkclist.c:424
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr "%s: ���θ����������ܿͤΤ�ΤǤ��롢�Ȥ�����������������������ޤ���\n"
 
-#: g10/pkclist.c:429
+#: g10/pkclist.c:430
 msgid "This key probably belongs to the named user\n"
 msgstr "���θ��Ϥ��֤��ܿͤΤ�ΤǤ�\n"
 
-#: g10/pkclist.c:434
+#: g10/pkclist.c:435
 msgid "This key belongs to us\n"
 msgstr "���θ��ϼ�ʬ�Τ�ΤǤ�\n"
 
-#: g10/pkclist.c:460
+#: g10/pkclist.c:461
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -4683,87 +4738,87 @@ msgstr ""
 "�ޤ��󡣺�����Ԥ����Ȥ�������ˡ����򤷤Ƥ��ʤ����ˤϡ�\n"
 "���μ���ˤ�no�������Ƥ���������\n"
 
-#: g10/pkclist.c:467
+#: g10/pkclist.c:468
 msgid "Use this key anyway? (y/N) "
 msgstr "����Ǥ⤳�θ���Ȥ��ޤ���? (y/N) "
 
-#: g10/pkclist.c:501
+#: g10/pkclist.c:502
 msgid "WARNING: Using untrusted key!\n"
 msgstr "�ٹ�: ���ѤǤ��ʤ�����ȤäƤ��ޤ�!\n"
 
-#: g10/pkclist.c:508
+#: g10/pkclist.c:509
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "�ٹ�: ���θ��ϼ������줿�褦�Ǥ� (���������Ժ�)\n"
 
-#: g10/pkclist.c:517
+#: g10/pkclist.c:518
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "�ٹ�: ���θ��ϻ�̾�����Ԥˤ�äƼ�������Ƥ��ޤ�!\n"
 
-#: g10/pkclist.c:520
+#: g10/pkclist.c:521
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "�ٹ�: ���θ��Ͻ�ͭ�Ԥˤ�äƼ�������Ƥ��ޤ�!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 msgid "         This could mean that the signature is forged.\n"
 msgstr "      ��̾����ʪ�ʤ��Ȥ⤢�롢�Ȥ������ȤǤ���\n"
 
-#: g10/pkclist.c:527
+#: g10/pkclist.c:528
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "�ٹ�: ���������Ͻ�ͭ�Ԥˤ�äƼ�������Ƥ��ޤ�!\n"
 
-#: g10/pkclist.c:532
+#: g10/pkclist.c:533
 msgid "Note: This key has been disabled.\n"
 msgstr "����: ���θ��ϻ��Ѷػߤ����ꤵ��Ƥ��ޤ���\n"
 
-#: g10/pkclist.c:537
+#: g10/pkclist.c:538
 msgid "Note: This key has expired!\n"
 msgstr "����: ���θ�����λ�Ǥ�!\n"
 
-#: g10/pkclist.c:548
+#: g10/pkclist.c:549
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "�ٹ�: ���θ��Ͽ��ѤǤ����̾�Ǿ�������Ƥ��ޤ���!\n"
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:551
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "      ���ν�̾����ͭ�ԤΤ�Τ��ɤ����θ��ڼ��ʤ�����ޤ���\n"
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:559
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "�ٹ�: ���θ��Ͽ��ѤǤ��� ����!\n"
 
-#: g10/pkclist.c:559
+#: g10/pkclist.c:560
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "      ���ν�̾�Ϥ����餯 ��ʪ �Ǥ���\n"
 
-#: g10/pkclist.c:567
+#: g10/pkclist.c:568
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "�ٹ�: ���θ��Ͻ�ʬ�˿��ѤǤ����̾�Ǿ�������Ƥ��ޤ���!\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:570
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "      ���ν�̾����ͭ�ԤΤ�Τ��ɤ����ο��Ǥ��ޤ���\n"
 
-#: g10/pkclist.c:734 g10/pkclist.c:767 g10/pkclist.c:936 g10/pkclist.c:996
+#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: �����å�: %s\n"
 
-#: g10/pkclist.c:744 g10/pkclist.c:968
+#: g10/pkclist.c:745 g10/pkclist.c:969
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: �����å�: �������Ϥ⤦����ޤ�\n"
 
-#: g10/pkclist.c:786
+#: g10/pkclist.c:787
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "�桼����ID����ꤷ�Ƥ��ޤ��� (��-r�ɤ�Ȥ��ޤ��礦) ��\n"
 
-#: g10/pkclist.c:802
+#: g10/pkclist.c:803
 msgid "Current recipients:\n"
 msgstr "������:\n"
 
-#: g10/pkclist.c:828
+#: g10/pkclist.c:829
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -4771,168 +4826,168 @@ msgstr ""
 "\n"
 "�桼����ID�����ϡ����Ԥǽ�λ: "
 
-#: g10/pkclist.c:844
+#: g10/pkclist.c:845
 msgid "No such user ID.\n"
 msgstr "���Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/pkclist.c:849 g10/pkclist.c:911
+#: g10/pkclist.c:850 g10/pkclist.c:912
 msgid "skipped: public key already set as default recipient\n"
 msgstr "�����å�: �������ϴ���μ���ͤȤ��Ƥ⤦����ѤߤǤ�\n"
 
-#: g10/pkclist.c:867
+#: g10/pkclist.c:868
 msgid "Public key is disabled.\n"
 msgstr "�������ϻ��ѶػߤǤ���\n"
 
-#: g10/pkclist.c:874
+#: g10/pkclist.c:875
 msgid "skipped: public key already set\n"
 msgstr "�����å�: �������Ϥ⤦����ѤߤǤ�\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:904
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "����μ���͡�%s�ɤ����Ĥ���ޤ���\n"
 
-#: g10/pkclist.c:948
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: �����å�: �������ϻ��ѶػߤǤ�\n"
 
-#: g10/pkclist.c:1003
+#: g10/pkclist.c:1004
 msgid "no valid addressees\n"
 msgstr "ͭ���ʰ��褬����ޤ���\n"
 
-#: g10/plaintext.c:90
+#: g10/plaintext.c:91
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "�ǡ�������¸����Ƥ��ޤ���\n"
 "��¸����ˤϡ�--output�ɥ��ץ�����ȤäƤ�������\n"
 
-#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
+#: g10/plaintext.c:136 g10/plaintext.c:141 g10/plaintext.c:159
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "��%s�פκ������顼: %s\n"
 
-#: g10/plaintext.c:446
+#: g10/plaintext.c:447
 msgid "Detached signature.\n"
 msgstr "ʬΥ��̾��\n"
 
-#: g10/plaintext.c:450
+#: g10/plaintext.c:452
 msgid "Please enter name of data file: "
 msgstr "�ǡ������ե������̾��������: "
 
-#: g10/plaintext.c:478
+#: g10/plaintext.c:481
 msgid "reading stdin ...\n"
 msgstr "ɸ�����Ϥ���ɽФ��� ...\n"
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:515
 msgid "no signed data\n"
 msgstr "��̾���줿�ǡ���������ޤ���\n"
 
-#: g10/plaintext.c:526
+#: g10/plaintext.c:529
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "��̾���줿�ǡ�����%s�פ������ޤ���\n"
 
-#: g10/pubkey-enc.c:103
+#: g10/pubkey-enc.c:104
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "ƿ̾�μ�����ѤǤ�����̩��%s���ޤ� ...\n"
 
-#: g10/pubkey-enc.c:119
+#: g10/pubkey-enc.c:120
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "��λ��ƿ̾�μ�����ѤǤ���\n"
 
-#: g10/pubkey-enc.c:207
+#: g10/pubkey-enc.c:208
 msgid "old encoding of the DEK is not supported\n"
 msgstr "�켰��DEK���ϡ����ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/pubkey-enc.c:228
+#: g10/pubkey-enc.c:229
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "�Ź楢�르�ꥺ��%d%s��̤�Τ����ѶػߤǤ�\n"
 
-#: g10/pubkey-enc.c:266
+#: g10/pubkey-enc.c:267
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "�ٹ�: �Ź楢�르�ꥺ��%s�ϼ���ͤ����������äƤ��ޤ���\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:287
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "����: ��̩��%s��%s����λ�Ǥ�\n"
 
-#: g10/pubkey-enc.c:292
+#: g10/pubkey-enc.c:293
 msgid "NOTE: key has been revoked"
 msgstr "����: ���ϼ����ѤߤǤ�"
 
-#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:545
+#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
+#: g10/revoke.c:188 g10/revoke.c:546
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet �˼��Ԥ��ޤ���: %s\n"
 
-#: g10/revoke.c:146
+#: g10/revoke.c:147
 #, c-format
 msgid "key %s has no user IDs\n"
 msgstr "��%s�ˤϥ桼����ID������ޤ���\n"
 
-#: g10/revoke.c:272
+#: g10/revoke.c:273
 msgid "To be revoked by:\n"
 msgstr "������:\n"
 
-#: g10/revoke.c:276
+#: g10/revoke.c:277
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(����ϡ��ǥꥱ���Ȥʼ������Ǥ�)\n"
 
-#: g10/revoke.c:280
+#: g10/revoke.c:281
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "���θ��ˤ��������̾�����������������ޤ���? (y/N) "
 
-#: g10/revoke.c:293 g10/revoke.c:511
+#: g10/revoke.c:294 g10/revoke.c:512
 msgid "ASCII armored output forced.\n"
 msgstr "ASCII�������Ϥ������ޤ���\n"
 
-#: g10/revoke.c:307 g10/revoke.c:525
+#: g10/revoke.c:308 g10/revoke.c:526
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet �˼��Ԥ��ޤ���: %s\n"
 
-#: g10/revoke.c:370
+#: g10/revoke.c:371
 msgid "Revocation certificate created.\n"
 msgstr "����������������\n"
 
-#: g10/revoke.c:376
+#: g10/revoke.c:377
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "��%s���Ѥμ����������Ĥ���ޤ���\n"
 
-#: g10/revoke.c:432
+#: g10/revoke.c:433
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "��̩����%s�ɤ����Ĥ���ޤ���: %s\n"
 
-#: g10/revoke.c:461
+#: g10/revoke.c:462
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "�б����������������ޤ���: %s\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:473
 msgid "public key does not match secret key!\n"
 msgstr "����������̩�����ȹ礷�ޤ���!\n"
 
-#: g10/revoke.c:479
+#: g10/revoke.c:480
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "���θ��ˤ������뼺���������������ޤ���? (y/N) "
 
-#: g10/revoke.c:496
+#: g10/revoke.c:497
 msgid "unknown protection algorithm\n"
 msgstr "̤�Τ��ݸ�르�ꥺ��Ǥ�\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 msgid "NOTE: This key is not protected!\n"
 msgstr "����: ���θ����ݸ��Ƥ��ޤ���!\n"
 
-#: g10/revoke.c:551
+#: g10/revoke.c:552
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -4950,233 +5005,233 @@ msgstr ""
 "�������Ǥ����������������դ������������ʤ��Υޥ���ΰ��������ƥ�ϡ�\n"
 "����Ǥ⸫������˥ǡ����򤪤����Ȥ�����ޤ�!\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid "Please select the reason for the revocation:\n"
 msgstr "��������ͳ�����򤷤Ƥ�������:\n"
 
-#: g10/revoke.c:602
+#: g10/revoke.c:603
 msgid "Cancel"
 msgstr "����󥻥�"
 
-#: g10/revoke.c:604
+#: g10/revoke.c:605
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(�����ǤϤ��֤�%d�����Ӥޤ�)\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:646
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "ͽ�������������ϡ����Ԥǽ�λ:\n"
 
-#: g10/revoke.c:673
+#: g10/revoke.c:674
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "������ͳ: %s\n"
 
-#: g10/revoke.c:675
+#: g10/revoke.c:676
 msgid "(No description given)\n"
 msgstr "(�����Ϥ���ޤ���)\n"
 
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 msgid "Is this okay? (y/N) "
 msgstr "��������Ǥ���? (y/N) "
 
-#: g10/seckey-cert.c:54
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "��̩��ʬ�������ޤ���\n"
 
-#: g10/seckey-cert.c:60
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "�ݸ�르�ꥺ��%d%s�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/seckey-cert.c:71
+#: g10/seckey-cert.c:72
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "�ݸ�����%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/seckey-cert.c:265
+#: g10/seckey-cert.c:266
 msgid "Invalid passphrase; please try again"
 msgstr "̵���ʥѥ��ե졼���Ǥ��������Ϥ��Ƥ�������"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:267
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:326
+#: g10/seckey-cert.c:327
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "�ٹ�: �夤���򸡽Ф��ޤ������ѥ��ե졼�����ѹ����Ƥ���������\n"
 
-#: g10/seckey-cert.c:364
+#: g10/seckey-cert.c:365
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr "����뤵�줿16�ӥåȤΥ����å��������̩�����ݸ������\n"
 
-#: g10/seskey.c:52
+#: g10/seskey.c:53
 msgid "weak key created - retrying\n"
 msgstr "�夤�����Ǥ��ޤ��� - �Ƽ¹�\n"
 
-#: g10/seskey.c:57
+#: g10/seskey.c:58
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr "�оΰŹ�ˡ�μ夤������򤹤뤳�Ȥ��Ǥ��ޤ���%d���ߤޤ���!\n"
 
-#: g10/seskey.c:213
+#: g10/seskey.c:214
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA�Ǥ�160�ӥåȤΥϥå��塦���르�ꥺ��λ��Ѥ�ɬ�פǤ�\n"
 
-#: g10/sig-check.c:75
+#: g10/sig-check.c:76
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "�ٹ�: ��̾�����󤬡���å�������̷�⤷�ޤ�\n"
 
-#: g10/sig-check.c:99
+#: g10/sig-check.c:100
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "�ٹ�: ��̾����%s�ϡ���߾����Ǥ���ޤ���\n"
 
-#: g10/sig-check.c:102
+#: g10/sig-check.c:103
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "�ٹ�: ̵������߾���������̾����%s�ˤ���ޤ�\n"
 
-#: g10/sig-check.c:168
+#: g10/sig-check.c:169
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "������%s�ϡ���̾��%lu�����Ǥ�\n"
 
-#: g10/sig-check.c:169
+#: g10/sig-check.c:170
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "������%s�ϡ���̾��%lu�����Ǥ�\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:181
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr "��%s��%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פξ㳲�Ǥ��礦)\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:183
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr "��%s��%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פξ㳲�Ǥ��礦)\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:193
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "����: ��̾��%s��%s����λ�Ǥ�\n"
 
-#: g10/sig-check.c:275
+#: g10/sig-check.c:276
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "̤�ΤΥ���ƥ����롦�ӥåȤˤ�ꡢ��%s�ν�̾�������Ȥߤʤ��ޤ�\n"
 
-#: g10/sig-check.c:532
+#: g10/sig-check.c:533
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "��%s: ����������̾�ˤ�����������������ޤ���\n"
 
-#: g10/sig-check.c:558
+#: g10/sig-check.c:559
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "��%s: �����б��ؤν�̾�ˤ�����������������ޤ���\n"
 
-#: g10/sign.c:85
+#: g10/sign.c:86
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr "����ǡ����ϡ�(PGP 2.x������) v3��̾�ˤ�����ޤ���\n"
 
-#: g10/sign.c:93
+#: g10/sign.c:94
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr "����ǡ����ϡ�(PGP 2.x������) v3����̾�ˤ�����ޤ���\n"
 
-#: g10/sign.c:112
+#: g10/sign.c:113
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr "�ٹ�: ɽ����%%��ĥ��ǽ (�礭����)�����ĥ����ѡ�\n"
 
-#: g10/sign.c:138
+#: g10/sign.c:139
 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:146
+#: g10/sign.c:147
 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:159
+#: g10/sign.c:160
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr "�ٹ�: �ݥꥷ��URL��%%��ĥ��ǽ (�礭����)�����ĥ����ѡ�\n"
 
-#: g10/sign.c:187
+#: g10/sign.c:188
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr "�ٹ�: �����������С�URL��%%��ĥ��ǽ (�礭����)�����ĥ����ѡ�\n"
 
-#: g10/sign.c:364
+#: g10/sign.c:365
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "�������줿��̾�θ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/sign.c:373
+#: g10/sign.c:374
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s��̾����̾��:��%s��\n"
 
-#: g10/sign.c:741
+#: g10/sign.c:761
 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:808
+#: g10/sign.c:830
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "�ٹ�: ���󥢥르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/sign.c:900
+#: g10/sign.c:922
 msgid "signing:"
 msgstr "��̾:"
 
-#: g10/sign.c:1007
+#: g10/sign.c:1034
 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:1180
+#: g10/sign.c:1212
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s�Ź沽����Ѥ��ޤ�\n"
 
-#: g10/skclist.c:126 g10/skclist.c:190
+#: g10/skclist.c:127 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "���ݤǤ���Ȥ����ե饰�����ˤ����ꤵ��Ƥ��ޤ���\n"
 "��ʪ��������ҤȤϤ��ä���˻Ȥ��ޤ���!\n"
 
-#: g10/skclist.c:157
+#: g10/skclist.c:158
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "��%s�ɤ�ȤФ��ޤ�: ��ʣ\n"
 
-#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "��%s�ɤ�ȤФ��ޤ�: %s\n"
 
-#: g10/skclist.c:170
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "�����å�: ��̩���Ϥ⤦����ޤ�\n"
 
-#: g10/skclist.c:185
+#: g10/skclist.c:186
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr "�����PGP����������Elgamal���ǡ���̾�Ѥˤϰ����ǤϤ���ޤ���!"
 
-#: g10/tdbdump.c:59 g10/trustdb.c:365
+#: g10/tdbdump.c:60 g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "���ѥ쥳����%lu, ��%d: ����ߤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbdump.c:104
+#: g10/tdbdump.c:105
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5185,348 +5240,348 @@ msgstr ""
 "# Sitei sareta sin'youdo itiran %s\n"
 "# (\"gpg --import-ownertrust\" wo tukatte hukkyuu dekimasu)\n"
 
-#: g10/tdbdump.c:159 g10/tdbdump.c:167 g10/tdbdump.c:172 g10/tdbdump.c:177
+#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
 #, c-format
 msgid "error in `%s': %s\n"
 msgstr "��%s�פǥ��顼: %s\n"
 
-#: g10/tdbdump.c:159
+#: g10/tdbdump.c:160
 msgid "line too long"
 msgstr "�Ԥ�Ĺ�����ޤ�"
 
-#: g10/tdbdump.c:167
+#: g10/tdbdump.c:168
 msgid "colon missing"
 msgstr "�����󤬤���ޤ���"
 
-#: g10/tdbdump.c:173
+#: g10/tdbdump.c:174
 msgid "invalid fingerprint"
 msgstr "̵���ʻ���"
 
-#: g10/tdbdump.c:178
+#: g10/tdbdump.c:179
 msgid "ownertrust value missing"
 msgstr "��ͭ�Կ����٤�����ޤ���"
 
-#: g10/tdbdump.c:214
+#: g10/tdbdump.c:215
 #, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "��%s�פǿ��ѥ쥳���ɤθ������顼: %s\n"
 
-#: g10/tdbdump.c:218
+#: g10/tdbdump.c:219
 #, c-format
 msgid "read error in `%s': %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: g10/tdbdump.c:227 g10/trustdb.c:380
+#: g10/tdbdump.c:228 g10/trustdb.c:381
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "���ѥǡ����١���: Ʊ���˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1440
+#: g10/tdbio.c:129 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "���ѥǡ����١��� �쥳����%lu: �������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1447
+#: g10/tdbio.c:135 g10/tdbio.c:1448
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "���ѥǡ����١��� �쥳����%lu: ����ߤ˼��Ԥ��ޤ��� (n=%d): %s\n"
 
-#: g10/tdbio.c:244
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "���ѥǡ����١����Υȥ�󥶥�������礭�����ޤ�\n"
 
-#: g10/tdbio.c:497
+#: g10/tdbio.c:498
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "��%s�פ˥��������Ǥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:512
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: �ǥ��쥯�ȥ꡼������ޤ���!\n"
 
-#: g10/tdbio.c:522 g10/tdbio.c:545 g10/tdbio.c:588
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "��%s�פΥ��å�������Ǥ��ޤ���\n"
 
-#: g10/tdbio.c:524 g10/tdbio.c:591
+#: g10/tdbio.c:525 g10/tdbio.c:592
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "��%s�פ����å��Ǥ��ޤ���\n"
 
-#: g10/tdbio.c:550
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: �С�����󡦥쥳���ɤκ����˼��Ԥ��ޤ���: %s"
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: ̵���ʿ��ѥǡ����١��������\n"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: ���ѥǡ����١������Ǥ��ޤ���\n"
 
-#: g10/tdbio.c:597
+#: g10/tdbio.c:598
 msgid "NOTE: trustdb not writable\n"
 msgstr "����: ���ѥǡ����١��������������ǽ�Ǥ�\n"
 
-#: g10/tdbio.c:614
+#: g10/tdbio.c:615
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: ̵���ʿ��ѥǡ����١���\n"
 
-#: g10/tdbio.c:646
+#: g10/tdbio.c:647
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: �ϥå���ɽ�κ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:654
+#: g10/tdbio.c:655
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: �С�����󡦥쥳���ɤι������顼: %s\n"
 
-#: g10/tdbio.c:671 g10/tdbio.c:691 g10/tdbio.c:707 g10/tdbio.c:721
-#: g10/tdbio.c:751 g10/tdbio.c:1373 g10/tdbio.c:1400
+#: g10/tdbio.c:672 g10/tdbio.c:692 g10/tdbio.c:708 g10/tdbio.c:722
+#: g10/tdbio.c:752 g10/tdbio.c:1374 g10/tdbio.c:1401
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: �С�����󡦥쥳���ɤ��ɽФ����顼: %s\n"
 
-#: g10/tdbio.c:730
+#: g10/tdbio.c:731
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: �С�����󡦥쥳���ɤν���ߥ��顼: %s\n"
 
-#: g10/tdbio.c:1169
+#: g10/tdbio.c:1170
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "���ѥǡ����١���: �������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:1177
+#: g10/tdbio.c:1178
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "���ѥǡ����١���: �ɽФ��˼��Ԥ��ޤ��� (n=%d): %s\n"
 
-#: g10/tdbio.c:1198
+#: g10/tdbio.c:1199
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ���ѥǡ����١������ե�����ǤϤ���ޤ���\n"
 
-#: g10/tdbio.c:1216
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: �쥳�����ֹ�%lu�֤ΥС�����󡦥쥳����\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1222
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: ̵���ʥե����롦�С������%d\n"
 
-#: g10/tdbio.c:1406
+#: g10/tdbio.c:1407
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: �����쥳���ɤ��ɽФ����顼: %s\n"
 
-#: g10/tdbio.c:1414
+#: g10/tdbio.c:1415
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: �ǥ��쥯�ȥ꡼���쥳���ɤν���ߥ��顼: %s\n"
 
-#: g10/tdbio.c:1424
+#: g10/tdbio.c:1425
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: �쥳���ɤν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:1454
+#: g10/tdbio.c:1455
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: �쥳���ɤ��ɲä˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:1499
+#: g10/tdbio.c:1500
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "���ѥǡ����١���������Ƥ��ޤ�����gpg --fix-trustdb�ɤ�¹Ԥ��Ƥ���������\n"
 
-#: g10/textfilter.c:147
+#: g10/textfilter.c:148
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "%dʸ���ʾ��Ĺ���Υƥ����ȹԤϡ���갷���ޤ���\n"
 
-#: g10/textfilter.c:244
+#: g10/textfilter.c:245
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "���ϹԤ�Ĺ����%dʸ����Ķ���Ƥ��ޤ�\n"
 
-#: g10/trustdb.c:226
+#: g10/trustdb.c:227
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "��%s�פϡ�ͭ�����緿��ID�Ǥ���ޤ���\n"
 
-#: g10/trustdb.c:257
+#: g10/trustdb.c:258
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "��%s: ���Ѥ��븰�Ȥ��Ƽ������ޤ���\n"
 
-#: g10/trustdb.c:295
+#: g10/trustdb.c:296
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "��%s�����ѥǡ����١�����ʣ������ޤ�\n"
 
-#: g10/trustdb.c:310
+#: g10/trustdb.c:311
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "��%s: ���Ѥ���븰�θ�����������ޤ��� - �ȤФ��ޤ�\n"
 
-#: g10/trustdb.c:320
+#: g10/trustdb.c:321
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "��%s������Ū�˿��Ѥ���褦��Ͽ���ޤ���\n"
 
-#: g10/trustdb.c:344
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "���ѥ쥳����%lu, �ꥯ�����ȷ�%d: �ɽФ��˼��Ԥ��ޤ���: %s\n"
 
-#: g10/trustdb.c:350
+#: g10/trustdb.c:351
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "���ѥ쥳����%lu���׵ᤵ�줿��%d�ǤϤ���ޤ���\n"
 
-#: g10/trustdb.c:446
+#: g10/trustdb.c:447
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr "̤�Το��ѥ�ǥ� (%d) �ϻȤ��ޤ��� - %s���ѥ�ǥ����\n"
 
-#: g10/trustdb.c:452
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr "%s���ѥ�ǥ�����\n"
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:506
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ revoked]"
 msgstr "����"
 
-#: g10/trustdb.c:508 g10/trustdb.c:513
+#: g10/trustdb.c:509 g10/trustdb.c:514
 #, fuzzy
 msgid "[ expired]"
 msgstr "��λ"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 #, fuzzy
 msgid "[ unknown]"
 msgstr "̤�Τ�"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 #, fuzzy
 msgid "[marginal]"
 msgstr "��������"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:518
 #, fuzzy
 msgid "[ultimate]"
 msgstr "����Ū"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr "̤���"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 msgid "never"
 msgstr "̵����"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr "��������"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:536
 msgid "full"
 msgstr "����"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr "����Ū"
 
-#: g10/trustdb.c:576
+#: g10/trustdb.c:577
 msgid "no need for a trustdb check\n"
 msgstr "���ѥǡ����١����θ����ϡ����פǤ�\n"
 
-#: g10/trustdb.c:582 g10/trustdb.c:2157
+#: g10/trustdb.c:583 g10/trustdb.c:2309
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "����ο��ѥǡ����١��������ϡ�%s�Ǥ�\n"
 
-#: g10/trustdb.c:591
+#: g10/trustdb.c:592
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "���ѥ�ǥ��%s�פǿ��ѥǡ����١����θ����ϡ����פǤ�\n"
 
-#: g10/trustdb.c:606
+#: g10/trustdb.c:607
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "���ѥ�ǥ��%s�פǿ��ѥǡ����١����ι����ϡ����פǤ�\n"
 
-#: g10/trustdb.c:838 g10/trustdb.c:1276
+#: 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:1033
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr "--check-trustdb��¹Ԥ��Ƥ�������\n"
 
-#: g10/trustdb.c:1037
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "���ѥǡ����١����θ���\n"
 
-#: g10/trustdb.c:1901
+#: g10/trustdb.c:2053
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d�ܤθ������ (����%d�ܤ�ͭ�������򥯥ꥢ)\n"
 
-#: g10/trustdb.c:1965
+#: g10/trustdb.c:2117
 msgid "no ultimately trusted keys found\n"
 msgstr "����Ū�˿��Ѥ��븰�����Ĥ���ޤ���\n"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:2131
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "����Ū�˿��Ѥ��븰%s�θ����������Ĥ���ޤ���\n"
 
-#: g10/trustdb.c:2002
+#: g10/trustdb.c:2154
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "�Ǿ��Ρ֤������٤ο��ѡ�%d���Ǿ��Ρ�����Ū���ѡ�%d��%s���ѥ�ǥ�\n"
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2240
 #, 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:2163
+#: g10/trustdb.c:2315
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 "���ѥǡ����١����ΥС�����󡦥쥳���ɤ������Ǥ��ޤ���: ����ߤ˼��Ԥ��ޤ�"
 "��: %s\n"
 
-#: g10/verify.c:116
+#: g10/verify.c:117
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -5536,301 +5591,337 @@ msgstr ""
 "(.sig��.asc)�����ޥ�ɹԤκǽ�Ǥʤ����\n"
 "�ʤ�ʤ����Ȥ�ǰƬ�ˤ����Ƥ���������\n"
 
-#: g10/verify.c:189
+#: g10/verify.c:190
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "���Ϥ�%u���ܤ�Ĺ�����뤫��LF���ʤ��褦�Ǥ�\n"
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "����Ū�ʥ��顼"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "̤�ΤΥѥ��åȷ��Ǥ�"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "̤�ΤΥС������Ǥ�"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "̤�Τθ��������르�ꥺ��Ǥ�"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "̤�Τ����󥢥르�ꥺ��Ǥ�"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "�������������Ǥ�"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "��̩���������Ǥ�"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "��̾�������Ǥ�"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "�����å����ࡦ���顼"
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "�ѥ��ե졼���������Ǥ�"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "�����������Ĥ���ޤ���"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "̤�ΤΰŹ楢�르�ꥺ��Ǥ�"
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "���ؤ������ޤ���"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "̵���ʥѥ��åȤǤ�"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "̵���������Ǥ�"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "���Υ桼����ID�Ϥ���ޤ���"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "��̩���������ޤ���"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "���ä���̩�����Ȥ��Ƥ��ޤ�"
 
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "���ݡ��Ȥ��Ƥ��ޤ���"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "���������Ǥ�"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "�ե�������ɽФ����顼"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "�ե�����ν���ߥ��顼"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "̤�Τΰ��̥��르�ꥺ��Ǥ�"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "�ե�����Υ����ץ󡦥��顼"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "�ե�����κ������顼"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "�ѥ��ե졼����̵���Ǥ�"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "̤�����θ��������르�ꥺ��Ǥ�"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "̤�����ΰŹ楢�르�ꥺ��Ǥ�"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "̤�Τν�̾���饹�Ǥ�"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "���ѥǡ����١����Υ��顼�Ǥ�"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "������MPI�Ǥ�"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "�꥽�������³��Ǥ�"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "̵���ʸ��ؤǤ�"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "�����ʾ�����Ǥ�"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "�桼����ID�ν񼰤�����������ޤ���"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "�ե�����Υ������������顼"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "�ե�����̾���ѹ����顼"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "�ե�����κ�����顼"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "ͽ�����̥ǡ����Ǥ�"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "������̷�⤷�Ƥ��ޤ�"
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "���ѤǤ��ʤ����������르�ꥺ��Ǥ�"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "�ե����뤬¸�ߤ��Ƥ��ޤ�"
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "�夤���Ǥ�"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "̵���ʻ���Ǥ�"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "URI�������Ǥ�"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "����URI�ϥ��ݡ��Ȥ��Ƥ��ޤ���"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "�ͥåȥ�������顼"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "�Ź沽����Ƥ��ޤ���"
 
-#: util/errors.c:103
+#: util/errors.c:104
 msgid "not processed"
 msgstr "̤����"
 
-#: util/errors.c:105
+#: util/errors.c:106
 msgid "unusable public key"
 msgstr "���ѤǤ��ʤ��������Ǥ�"
 
-#: util/errors.c:106
+#: util/errors.c:107
 msgid "unusable secret key"
 msgstr "���ѤǤ��ʤ���̩���Ǥ�"
 
-#: util/errors.c:107
+#: util/errors.c:108
 msgid "keyserver error"
 msgstr "�������С��Υ��顼"
 
-#: util/errors.c:108
+#: util/errors.c:109
 msgid "canceled"
 msgstr "����󥻥�"
 
-#: util/errors.c:109
+#: util/errors.c:110
 msgid "no card"
 msgstr "�����ɤ�����ޤ���"
 
-#: util/logger.c:157
+#: util/logger.c:158
 msgid "ERROR: "
 msgstr "���顼: "
 
-#: util/logger.c:160
+#: util/logger.c:161
 msgid "WARNING: "
 msgstr "�ٹ�: "
 
-#: util/logger.c:223
+#: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... �Х��Ǥ� (%s:%d:%s)\n"
 
-#: util/logger.c:229
+#: util/logger.c:230
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "�Х���ȯ�� ... (%s:%d)\n"
 
-#: util/miscutil.c:336 util/miscutil.c:373
+#: util/miscutil.c:330 util/miscutil.c:367
 msgid "yes"
 msgstr "yes"
 
-#: util/miscutil.c:337 util/miscutil.c:378
+#: util/miscutil.c:331 util/miscutil.c:372
 msgid "yY"
 msgstr "yY"
 
-#: util/miscutil.c:339 util/miscutil.c:375
+#: util/miscutil.c:333 util/miscutil.c:369
 msgid "no"
 msgstr "no"
 
-#: util/miscutil.c:340 util/miscutil.c:379
+#: util/miscutil.c:334 util/miscutil.c:373
 msgid "nN"
 msgstr "nN"
 
-#: util/miscutil.c:377
+#: util/miscutil.c:371
 msgid "quit"
 msgstr "quit"
 
-#: util/miscutil.c:380
+#: util/miscutil.c:374
 msgid "qQ"
 msgstr "qQ"
 
-#: util/miscutil.c:413
+#: util/miscutil.c:407
 msgid "okay|okay"
 msgstr "okay|okay"
 
-#: util/miscutil.c:415
+#: util/miscutil.c:409
 msgid "cancel|cancel"
 msgstr "cancel|cancel"
 
-#: util/miscutil.c:416
+#: util/miscutil.c:410
 msgid "oO"
 msgstr "oO"
 
-#: util/miscutil.c:417
+#: util/miscutil.c:411
 msgid "cC"
 msgstr "cC"
 
-#: util/secmem.c:90
+#: util/secmem.c:91
 msgid "WARNING: using insecure memory!\n"
 msgstr "�ٹ�: ���ݤʥ��꡼����Ѥ��Ƥ��ޤ�!\n"
 
-#: util/secmem.c:91
+#: util/secmem.c:92
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "�ܺ٤�http://www.gnupg.org/faq.html������������\n"
 
-#: util/secmem.c:343
+#: util/secmem.c:344
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "������Ѥߤΰ����ʥ��꡼���ʤ����ˤ����Ǥ��ޤ���\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:345
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(������Ū�ˤϸ��ä��ץ�������Ȥä��ΤǤ��礦)\n"
 
+#~ msgid "error getting serial number: %s\n"
+#~ msgstr "���֤μ������顼: %s\n"
+
+#~ msgid "Hint: Select the user IDs to sign\n"
+#~ msgstr "����: �ޤ���̾����桼����ID�����򤷤ޤ�\n"
+
+#~ msgid "length of RSA modulus is not %d\n"
+#~ msgstr "RSA��ˡ(modulus)��Ĺ����%d�Ǥ���ޤ���\n"
+
+#~ msgid "length of an RSA prime is not %d\n"
+#~ msgstr "RSA���ǿ���%d�Ǥ���ޤ���\n"
+
+#~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+#~ msgstr "�����ʥѥ��ե졼���ޤ���̤�ΤΰŹ楢�르�ꥺ��Ǥ�(%d)\n"
+
+#~ msgid "can't set client pid for the agent\n"
+#~ msgstr "����������ȤΥ��饤�����pid������Ǥ��ޤ���\n"
+
+#~ msgid "can't get server read FD for the agent\n"
+#~ msgstr "������������ѤΥ����С��ɽФ�FD������Ǥ��ޤ���\n"
+
+#~ msgid "can't get server write FD for the agent\n"
+#~ msgstr "������������ѤΥ����С������FD������Ǥ��ޤ���\n"
+
+#~ msgid "communication problem with gpg-agent\n"
+#~ msgstr "gpg-agent�Ȥ��̿��㳲\n"
+
+#~ msgid "passphrase too long\n"
+#~ msgstr "�ѥ��ե졼����Ĺ�����ޤ�\n"
+
+#~ msgid "invalid response from agent\n"
+#~ msgstr "����������Ȥ����̵���ʱ���\n"
+
+#~ msgid "problem with the agent: agent returns 0x%lx\n"
+#~ msgstr "����������Ȥ˾㳲: ����������Ȥ�0x%lx���ֵ�\n"
+
 #~ msgid "select secondary key N"
 #~ msgstr "����N������"
 
diff --git a/po/pl.po b/po/pl.po
index c8c942fd5..df63d9239 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: 2005-03-15 16:35+0100\n"
+"POT-Creation-Date: 2005-05-31 10:05+0200\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"
@@ -24,83 +24,83 @@ msgstr ""
 "sig-check.c g10/sign.c g10/trustdb.c g10/verify.c g10/status.c g10/pubkey-"
 "enc.c\n"
 
-#: cipher/primegen.c:120
+#: cipher/primegen.c:121
 #, fuzzy, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr "nie mo�na wygenerowa� liczby pierwszej kr�tszej od %d bit�w\n"
 
-#: cipher/primegen.c:311
+#: cipher/primegen.c:312
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "nie mo�na wygenerowa� liczby pierwszej kr�tszej od %d bit�w\n"
 
-#: cipher/random.c:163
+#: cipher/random.c:164
 msgid "no entropy gathering module detected\n"
 msgstr "modu� gromadzenia entropii nie zosta� wykryty\n"
 
-#: cipher/random.c:387 g10/card-util.c:656 g10/card-util.c:725
-#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2255
-#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
-#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
-#: g10/tdbio.c:600
+#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
+#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
+#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
+#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
+#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/tdbio.c:601
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nie mo�na otworzy� ,,%s'': %s\n"
 
-#: cipher/random.c:391
+#: cipher/random.c:392
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "nie mo�na sprawdzi� ,,%s'': %s\n"
 
-#: cipher/random.c:396
+#: cipher/random.c:397
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ",,%s'' nie jest zwyk�ym plikiem - zostaje pomini�ty\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:402
 msgid "note: random_seed file is empty\n"
 msgstr "uwaga: plik random_seed jest pusty\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:408
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "OSTRZE�ENIE: niew�a�ciwy rozmiar pliku random_seed - nie zostanie u�yty\n"
 
-#: cipher/random.c:415
+#: cipher/random.c:416
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "nie mo�na odczyta� ,,%s'': %s\n"
 
-#: cipher/random.c:453
+#: cipher/random.c:454
 msgid "note: random_seed file not updated\n"
 msgstr "uwaga: plik random_seed nie jest uaktualniony\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2723
-#: g10/keygen.c:2753 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
-#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nie mo�na utworzy� ,,%s'': %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:481
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "nie mo�na zapisa� ,,%s'': %s\n"
 
-#: cipher/random.c:483
+#: cipher/random.c:484
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "nie mo�na zamkn�� ,,%s'': %s\n"
 
-#: cipher/random.c:728
+#: cipher/random.c:729
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "OSTRZE�ENIE: u�ywany generator liczb losowych\n"
 "nie jest kryptograficznie bezpieczny!!\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:730
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -114,7 +114,7 @@ msgstr ""
 "JAKIEKOLWIEK DANE GENEROWANE PRZEZ TEN PROGRAM NIE NADAJ� SI� DO \n"
 "NORMALNEGO U�YTKU I NIE ZAPEWNIAJ� BEZPIECZE�STWA!!\n"
 
-#: cipher/rndegd.c:204
+#: cipher/rndegd.c:205
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -127,7 +127,7 @@ msgstr ""
 "tworzenia liczb losowych.\n"
 "\n"
 
-#: cipher/rndlinux.c:134
+#: cipher/rndlinux.c:135
 #, c-format
 msgid ""
 "\n"
@@ -139,45 +139,62 @@ msgstr ""
 "Prosz� kontynuowa� inne dzia�ania aby system m�g� zebra� odpowiedni�\n"
 "ilo�� entropii do ich wygenerowania (brakuje %d bajt�w).\n"
 
-#: g10/app-openpgp.c:547
+#: g10/app-openpgp.c:596
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/app-openpgp.c:560
+#: g10/app-openpgp.c:609
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "nie powiod�a si� odbudowa bufora bazy: %s\n"
 
-#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
+#: g10/app-openpgp.c:977
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
+
+#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+msgid "response does not contain the public key data\n"
+msgstr ""
+
+#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
-#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
+#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
+#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
 
-#: g10/app-openpgp.c:836
+#: g10/app-openpgp.c:1310
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:857
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:862
+#: g10/app-openpgp.c:1336
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -185,356 +202,361 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:869
+#: g10/app-openpgp.c:1343
 msgid "|A|Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1018
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:1492
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1018
+#: g10/app-openpgp.c:1492
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1022
+#: g10/app-openpgp.c:1496
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
+#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "b��d odczytu bloku kluczy: %s\n"
 
-#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
+#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: b��d odczytu pustego wpisu: %s\n"
 
-#: g10/app-openpgp.c:1104
+#: g10/app-openpgp.c:1562
 #, fuzzy
 msgid "key already exists\n"
 msgstr ",,%s'' ju� jest skompresowany\n"
 
-#: g10/app-openpgp.c:1108
+#: g10/app-openpgp.c:1566
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1110
+#: g10/app-openpgp.c:1568
 #, fuzzy
 msgid "generating new key\n"
 msgstr "generacja nowej pary kluczy"
 
-#: g10/app-openpgp.c:1120
+#: g10/app-openpgp.c:1735
+msgid "creation timestamp missing\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1742
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1749
+#, c-format
+msgid "RSA public exponent missing or largerr than %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1827
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
+
+#: g10/app-openpgp.c:1886
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1135
+#: g10/app-openpgp.c:1901
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1904
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Generacja klucza nie powiod�a si�: %s\n"
 
-#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
-msgid "response does not contain the public key data\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
-msgid "response does not contain the RSA modulus\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
-msgid "response does not contain the RSA public exponent\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1195
+#: g10/app-openpgp.c:1961
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1356
+#: g10/app-openpgp.c:2130
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1364
+#: g10/app-openpgp.c:2138
 #, c-format
-msgid "PIN [sigs done: %lu]"
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
+#: g10/app-openpgp.c:2399
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
 
-#: g10/app-openpgp.c:1731
-#, fuzzy, c-format
-msgid "error getting serial number: %s\n"
-msgstr "b��d podczas tworzenia has�a: %s\n"
-
-#: g10/app-openpgp.c:1826
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
-
-#: g10/app-openpgp.c:1868
-#, fuzzy
-msgid "reading the key failed\n"
-msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
-
-#: g10/armor.c:317
+#: g10/armor.c:318
 #, c-format
 msgid "armor: %s\n"
 msgstr "opakowanie: %s\n"
 
-#: g10/armor.c:346
+#: g10/armor.c:347
 msgid "invalid armor header: "
 msgstr "niepoprawny nag��wek opakowania: "
 
-#: g10/armor.c:353
+#: g10/armor.c:354
 msgid "armor header: "
 msgstr "nag��wek opakowania: "
 
-#: g10/armor.c:364
+#: g10/armor.c:365
 msgid "invalid clearsig header\n"
 msgstr "niew�a�ciwy nag��wek dokumentu z podpisem na ko�cu\n"
 
-#: g10/armor.c:416
+#: g10/armor.c:417
 msgid "nested clear text signatures\n"
 msgstr "zagnie�d�one podpisy na ko�cu dokumentu\n"
 
-#: g10/armor.c:551
+#: g10/armor.c:552
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "nieoczekiwane opakowanie:"
 
-#: g10/armor.c:563
+#: g10/armor.c:564
 msgid "invalid dash escaped line: "
 msgstr "niepoprawne oznaczenie linii minusami: "
 
-#: g10/armor.c:715 g10/armor.c:1322
+#: g10/armor.c:716 g10/armor.c:1323
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "niew�a�ciwy znak formatu radix64: ,,%02x'', zosta� pomini�ty\n"
 
-#: g10/armor.c:758
+#: g10/armor.c:759
 msgid "premature eof (no CRC)\n"
 msgstr "przewczesny koniec pliku (brak CRC)\n"
 
-#: g10/armor.c:792
+#: g10/armor.c:793
 msgid "premature eof (in CRC)\n"
 msgstr "przedwczesny koniec pliku (w CRC)\n"
 
-#: g10/armor.c:800
+#: g10/armor.c:801
 msgid "malformed CRC\n"
 msgstr "b��d formatu CRC\n"
 
-#: g10/armor.c:804 g10/armor.c:1359
+#: g10/armor.c:805 g10/armor.c:1360
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "B��d sumy CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:824
+#: g10/armor.c:825
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "przedwczesny koniec pliku (w linii ko�cz�cej)\n"
 
-#: g10/armor.c:828
+#: g10/armor.c:829
 msgid "error in trailer line\n"
 msgstr "b��d w linii ko�cz�cej\n"
 
-#: g10/armor.c:1137
+#: g10/armor.c:1138
 msgid "no valid OpenPGP data found.\n"
 msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
 
-#: g10/armor.c:1142
+#: g10/armor.c:1143
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "b��d opakowania: linia d�u�sza ni� %d znak�w\n"
 
-#: g10/armor.c:1146
+#: g10/armor.c:1147
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "znak kodowania quoted-printable w opakowaniu ASCII - prawdopodobnie\n"
 "przek�amanie wprowadzone przez serwer pocztowy\n"
 
-#: g10/card-util.c:58 g10/card-util.c:295
+#: g10/card-util.c:63 g10/card-util.c:303
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "brak klucza prywatnego"
 
-#: g10/card-util.c:63
+#: g10/card-util.c:68
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1329 g10/delkey.c:127 g10/keyedit.c:1430
-#: g10/keygen.c:2439 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1510
+#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "nie dzia�a w trybie wsadowym\n"
 
-#: g10/card-util.c:97 g10/card-util.c:1108 g10/card-util.c:1191
-#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
-#: g10/keygen.c:1365
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
+#: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "Tw�j wyb�r? "
 
-#: g10/card-util.c:206 g10/card-util.c:256
+#: g10/card-util.c:213 g10/card-util.c:263
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:391
+#: g10/card-util.c:410
 #, fuzzy
 msgid "male"
 msgstr "w�kl"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 #, fuzzy
 msgid "female"
 msgstr "w�kl"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 #, fuzzy
 msgid "unspecified"
 msgstr "nie podano przyczyny"
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 #, fuzzy
 msgid "not forced"
 msgstr "nie zosta� przetworzony"
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:497
+#: g10/card-util.c:516
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:499
+#: g10/card-util.c:518
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:501
+#: g10/card-util.c:520
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:518
+#: g10/card-util.c:537
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:539
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:538
+#: g10/card-util.c:557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:559
+#: g10/card-util.c:578
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "brak odpowiadaj�cego klucza publicznego: %s\n"
 
-#: g10/card-util.c:567
+#: g10/card-util.c:586
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:665 g10/card-util.c:734 g10/import.c:261
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:692
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:683
+#: g10/card-util.c:702
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:742
+#: g10/card-util.c:761
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:752
+#: g10/card-util.c:771
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:772
+#: g10/card-util.c:791
 #, fuzzy
 msgid "Language preferences: "
 msgstr "aktualizacja ustawie� klucza"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:799
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "niew�a�ciwy znak w tek�cie ustawie�\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:808
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "niew�a�ciwy znak w tek�cie ustawie�\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:829
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:824
+#: g10/card-util.c:843
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "b��d: niew�a�ciwy odcisk klucza\n"
 
-#: g10/card-util.c:845
+#: g10/card-util.c:864
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Odcisk klucza:"
 
-#: g10/card-util.c:868
+#: g10/card-util.c:887
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "b��d: niew�a�ciwy odcisk klucza\n"
 
-#: g10/card-util.c:916
+#: g10/card-util.c:935
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Generacja klucza nie powiod�a si�: %s\n"
 
-#: g10/card-util.c:917
+#: g10/card-util.c:936
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
 
-#: g10/card-util.c:926
+#: g10/card-util.c:945
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1030
 #, fuzzy
 msgid "Replace existing key? (y/N) "
 msgstr "Czy na pewno podpisa�? (t/N) "
 
-#: g10/card-util.c:1030 g10/card-util.c:1039
+#: g10/card-util.c:1051 g10/card-util.c:1060
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1051
+#: g10/card-util.c:1072
 #, fuzzy
 msgid "Replace existing keys? (y/N) "
 msgstr "Czy na pewno podpisa�? (t/N) "
 
-#: g10/card-util.c:1060
+#: g10/card-util.c:1081
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -542,412 +564,416 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1099
+#: g10/card-util.c:1120
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Prosz� wybra� rodzaj klucza:\n"
 
-#: g10/card-util.c:1101 g10/card-util.c:1182
+#: g10/card-util.c:1122 g10/card-util.c:1203
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Wa�no�� podpisu wygas�a %s.\n"
 
-#: g10/card-util.c:1102 g10/card-util.c:1184
+#: g10/card-util.c:1123 g10/card-util.c:1205
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 
-#: g10/card-util.c:1103 g10/card-util.c:1186
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1119 g10/card-util.c:1202 g10/keyedit.c:908
-#: g10/keygen.c:1404 g10/revoke.c:642
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
+#: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "Niew�a�ciwy wyb�r.\n"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1200
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Prosz� wybra� pow�d uniewa�nienia:\n"
 
-#: g10/card-util.c:1214
+#: g10/card-util.c:1235
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "nieznany algorytm ochrony\n"
 
-#: g10/card-util.c:1219
+#: g10/card-util.c:1240
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
 
-#: g10/card-util.c:1224
+#: g10/card-util.c:1245
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
 
-#: g10/card-util.c:1294 g10/keyedit.c:1317
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "wyj�cie z tego menu"
 
-#: g10/card-util.c:1296
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "show admin commands"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/card-util.c:1297 g10/keyedit.c:1320
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "ten tekst pomocy"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "list all available data"
 msgstr "Klucz dost�pny w: "
 
-#: g10/card-util.c:1302
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1303
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1304
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1305
+#: g10/card-util.c:1327
 #, fuzzy
 msgid "change the login name"
 msgstr "zmiana daty wa�no�ci klucza"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the language preferences"
 msgstr "zmiana zaufania w�a�ciciela"
 
-#: g10/card-util.c:1307
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1308
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "okazanie odcisku klucza"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1310
+#: g10/card-util.c:1332
 #, fuzzy
 msgid "generate new keys"
 msgstr "generacja nowej pary kluczy"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1377 g10/keyedit.c:1526
+#: g10/card-util.c:1334
+msgid "verify the PIN and list all data"
+msgstr ""
+
+#: g10/card-util.c:1454 g10/keyedit.c:1609
 msgid "Command> "
 msgstr "Polecenie> "
 
-#: g10/card-util.c:1412
+#: g10/card-util.c:1492
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/card-util.c:1430
+#: g10/card-util.c:1525
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/card-util.c:1499 g10/keyedit.c:2104
+#: g10/card-util.c:1599 g10/keyedit.c:2210
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Niepoprawna komenda  (spr�buj \"help\")\n"
 
-#: g10/cardglue.c:287
+#: g10/cardglue.c:396
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:519
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:380
+#: g10/cardglue.c:527
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:852
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Podaj identyfikator u�ytkownika (user ID): "
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:853
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "Podaj identyfikator u�ytkownika (user ID): "
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:854
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:691
+#: g10/cardglue.c:855
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Podaj identyfikator u�ytkownika (user ID): "
 
-#: g10/cardglue.c:705
+#: g10/cardglue.c:872
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Powt�rz has�o: "
 
-#: g10/cardglue.c:719
+#: g10/cardglue.c:886
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "has�o nie zosta�o poprawnie powt�rzone; jeszcze jedna pr�ba"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
-#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nie mo�na otworzy� ,,%s''\n"
 
-#: g10/decrypt.c:104 g10/encode.c:859
+#: g10/decrypt.c:105 g10/encode.c:846
 msgid "--output doesn't work for this command\n"
 msgstr "opcja --output nie dzia�a z tym poleceniem\n"
 
-#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3167 g10/keyserver.c:1511
-#: g10/revoke.c:226
+#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3346 g10/keyserver.c:1541
+#: g10/revoke.c:227
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2300 g10/keyserver.c:1525
-#: g10/revoke.c:232 g10/revoke.c:439
+#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "b��d odczytu bloku kluczy: %s\n"
 
-#: g10/delkey.c:128 g10/delkey.c:135
+#: g10/delkey.c:129 g10/delkey.c:136
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(chyba, �e klucz zostaje wybrany przez podanie odcisku)\n"
 
-#: g10/delkey.c:134
+#: g10/delkey.c:135
 #, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "bez opcji \"--yes\" nie dzia�a w trybie wsadowym\n"
 
-#: g10/delkey.c:146
+#: g10/delkey.c:147
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Usun�� ten klucz ze zbioru? "
 
-#: g10/delkey.c:154
+#: g10/delkey.c:155
 #, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "To jest klucz tajny! - czy na pewno go usun��? "
 
-#: g10/delkey.c:164
+#: g10/delkey.c:165
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
 
-#: g10/delkey.c:174
+#: g10/delkey.c:175
 msgid "ownertrust information cleared\n"
 msgstr "informacja o zaufaniu dla w�a�ciciela klucza zosta�a wymazana\n"
 
-#: g10/delkey.c:205
+#: g10/delkey.c:206
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "dla klucza publicznego ,,%s'' istnieje klucz prywatny!\n"
 
-#: g10/delkey.c:207
+#: g10/delkey.c:208
 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:210 g10/sign.c:1186
+#: g10/encode.c:211 g10/sign.c:1218
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: g10/encode.c:215
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 "ustawiony tryb S2K nie pozwala u�y� pakietu ESK dla szyfru symetrycznego\n"
 
-#: g10/encode.c:228
+#: g10/encode.c:229
 #, c-format
 msgid "using cipher %s\n"
 msgstr "szyfrem %s\n"
 
-#: g10/encode.c:238 g10/encode.c:558
+#: g10/encode.c:239 g10/encode.c:545
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr ",,%s'' ju� jest skompresowany\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
+#: g10/encode.c:302 g10/encode.c:591 g10/sign.c:566
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "OSTRZE�ENIE: plik ,,%s'' jest pusty\n"
 
-#: g10/encode.c:472
+#: g10/encode.c:466
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "w trybie --pgp2 mo�na szyfrowa� dla kluczy RSA kr�tszych od 2048 bit�w\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:488
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "odczyt z '%s'\n"
 
-#: g10/encode.c:530
+#: g10/encode.c:517
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "nie mo�na u�y� szyfru IDEA z wszystkimi kluczami dla kt�rych szyfrujesz.\n"
 
-#: g10/encode.c:540
+#: g10/encode.c:527
 #, fuzzy, c-format
 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:648 g10/sign.c:877
+#: g10/encode.c:635 g10/sign.c:899
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "wymuszone u�ycie kompresji %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/encode.c:735
+#: g10/encode.c:722
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "wymuszone u�ycie szyfru %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/encode.c:805 g10/pkclist.c:721 g10/pkclist.c:757
+#: g10/encode.c:792 g10/pkclist.c:722 g10/pkclist.c:758
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "%s nie jest dost�pne w trybie %s\n"
 
-#: g10/encode.c:832
+#: g10/encode.c:819
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s zaszyfrowany dla: ,,%s''\n"
 
-#: g10/encr-data.c:66 g10/mainproc.c:301
+#: g10/encr-data.c:67 g10/mainproc.c:302
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dane zaszyfrowano za pomoc� %s\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:305
+#: g10/encr-data.c:69 g10/mainproc.c:306
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "dane zaszyfrowano nieznanym algorytmem numer %d\n"
 
-#: g10/encr-data.c:92
+#: g10/encr-data.c:93
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "OSTRZE�ENIE: wiadomo�� by�a szyfrowana kluczem s�abym szyfru symetrycznego.\n"
 
-#: g10/encr-data.c:103
+#: g10/encr-data.c:104
 msgid "problem handling encrypted packet\n"
 msgstr "problem podczas obr�bki pakietu szyfrowego\n"
 
-#: g10/exec.c:48
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "odwo�ania do zewn�trznych program�w s� wy��czone\n"
 
-#: g10/exec.c:184 g10/openfile.c:406
+#: g10/exec.c:173 g10/openfile.c:410
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nie mo�na utworzy� katalogu ,,%s'': %s\n"
 
-#: g10/exec.c:325
+#: g10/exec.c:314
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "nieszczelne uprawnienia ustawie� - wo�anie zewn�trznych program�w wy��czone\n"
 
-#: g10/exec.c:355
+#: g10/exec.c:344
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "platforma wymaga u�ycia plik�w tymczasowych do wo�ania zewn�trznych "
 "program�w\n"
 
-#: g10/exec.c:433
+#: g10/exec.c:422
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "nie mo�na wykona� %s ,,%s'': %s\n"
 
-#: g10/exec.c:436
+#: g10/exec.c:425
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "nie mo�na wykona� %s ,,%s'': %s\n"
 
-#: g10/exec.c:521
+#: g10/exec.c:510
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "b��d systemu podczas wo�ania programu zewn�trznego: %s\n"
 
-#: g10/exec.c:532 g10/exec.c:598
+#: g10/exec.c:521 g10/exec.c:587
 msgid "unnatural exit of external program\n"
 msgstr "nienaturalne zako�czenie pracy zewn�trznego programu\n"
 
-#: g10/exec.c:547
+#: g10/exec.c:536
 msgid "unable to execute external program\n"
 msgstr "nie mo�na uruchomi� zewn�trznego programu\n"
 
-#: g10/exec.c:563
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "nie mo�na odczyta� odpowiedzi programu zewn�trznego: %s\n"
 
-#: g10/exec.c:609 g10/exec.c:616
+#: g10/exec.c:598 g10/exec.c:605
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "OSTRZE�ENIE: nie mo�na skasowa� pliku tymczasowego (%s) ,,%s'': %s.\n"
 
-#: g10/exec.c:621
+#: g10/exec.c:610
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "OSTRZE�ENIE: nie mo�na skasowa� tymczasowego katalogu ,,%s'': %s.\n"
 
-#: g10/export.c:183
+#: g10/export.c:184
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/export.c:212
+#: g10/export.c:213
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "klucz %08lX: nie jest chroniony - pomini�ty\n"
 
-#: g10/export.c:220
+#: g10/export.c:221
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "klucz %08lX: klucz PGP 2.x - pomini�ty\n"
 
-#: g10/export.c:395
+#: g10/export.c:398
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "OSTRZE�ENIE: klucz prywatny %08lX nie ma prostej sumy kontrolnej SK.\n"
 
-#: g10/export.c:427
+#: g10/export.c:430
 msgid "WARNING: nothing exported\n"
 msgstr "OSTRZE�ENIE: nic nie zosta�o wyeksportowane!\n"
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid ""
 "@Commands:\n"
 " "
@@ -955,128 +981,128 @@ msgstr ""
 "@Polecenia:\n"
 " "
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "|[file]|make a signature"
 msgstr "|[plik]|z�o�enie podpisu"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "|[file]|make a clear text signature"
 msgstr "|[plik]|z�o�enie podpisu pod dokumentem"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "make a detached signature"
 msgstr "z�o�enie podpisu oddzielonego od dokumentu"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encrypt data"
 msgstr "szyfrowanie danych"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "encryption only with symmetric cipher"
 msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "decrypt data (default)"
 msgstr "odszyfrowywanie danych (domy�lne)"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "verify a signature"
 msgstr "sprawdzenie podpisu"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys"
 msgstr "lista kluczy"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and signatures"
 msgstr "lista kluczy i podpis�w"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "sprawdzenie podpis�w kluczy"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "list keys and fingerprints"
 msgstr "lista kluczy i ich odcisk�w"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "list secret keys"
 msgstr "lista kluczy prywatnych"
 
-#: g10/g10.c:379
+#: g10/g10.c:381
 msgid "generate a new key pair"
 msgstr "generacja nowej pary kluczy"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the public keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "remove keys from the secret keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy prywatnych"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign a key"
 msgstr "z�o�enie podpisu na kluczu"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "sign a key locally"
 msgstr "z�o�enie prywatnego podpisu na kluczu"
 
-#: g10/g10.c:385
+#: g10/g10.c:387
 msgid "sign or edit a key"
 msgstr "podpisanie lub modyfikacja klucza"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "generate a revocation certificate"
 msgstr "tworzenie certyfikatu uniewa�nienia klucza"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/g10.c:389
+#: g10/g10.c:391
 msgid "export keys to a key server"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "import keys from a key server"
 msgstr "import kluczy z serwera kluczy"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "search for keys on a key server"
 msgstr "szukanie kluczy na serwerze"
 
-#: g10/g10.c:394
+#: g10/g10.c:396
 msgid "update all keys from a keyserver"
 msgstr "od�wie�enie wszystkich kluczy z serwera"
 
-#: g10/g10.c:397
+#: g10/g10.c:399
 msgid "import/merge keys"
 msgstr "import/do��czenie kluczy"
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "print the card status"
 msgstr ""
 
-#: g10/g10.c:401
+#: g10/g10.c:403
 msgid "change data on a card"
 msgstr ""
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/g10.c:410
+#: g10/g10.c:412
 msgid "update the trust database"
 msgstr "uaktualnienie bazy zaufania"
 
-#: g10/g10.c:417
+#: g10/g10.c:419
 msgid "|algo [files]|print message digests"
 msgstr "|algo [pliki]|skr�ty wiadomo�ci"
 
-#: g10/g10.c:421 g10/gpgv.c:66
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1086,51 +1112,51 @@ msgstr ""
 "Opcje:\n"
 " "
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "create ascii armored output"
 msgstr "opakowanie ASCII pliku wynikowego"
 
-#: g10/g10.c:425
+#: g10/g10.c:427
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
 
-#: g10/g10.c:436
+#: g10/g10.c:438
 msgid "use this user-id to sign or decrypt"
 msgstr "identyfikator do podpisania lub odszyfrowania"
 
-#: g10/g10.c:437
+#: g10/g10.c:439
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|poziom kompresji N (0 - bez)"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/g10.c:452
+#: g10/g10.c:458
 msgid "use as output file"
 msgstr "plik wyj�ciowy"
 
-#: g10/g10.c:454 g10/gpgv.c:68
+#: g10/g10.c:460 g10/gpgv.c:73
 msgid "verbose"
 msgstr "z dodatkowymi informacjami"
 
-#: g10/g10.c:465
+#: g10/g10.c:471
 msgid "do not make any changes"
 msgstr "pozostawienie bez zmian"
 
-#: g10/g10.c:466
+#: g10/g10.c:472
 msgid "prompt before overwriting"
 msgstr "pytanie przed nadpisaniem plik�w"
 
-#: g10/g10.c:507
+#: g10/g10.c:513
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:508
+#: g10/g10.c:514
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:536
+#: g10/g10.c:542
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1138,7 +1164,7 @@ msgstr ""
 "@\n"
 "(Pe�n� list� polece� i opcji mo�na znale�� w podr�czniku systemowym.)\n"
 
-#: g10/g10.c:539
+#: g10/g10.c:545
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1159,15 +1185,15 @@ msgstr ""
 " --list-keys [nazwy]        pokazuje klucze\n"
 " --fingerprint [nazwy]      pokazuje odciski kluczy\n"
 
-#: g10/g10.c:720 g10/gpgv.c:93
+#: g10/g10.c:724 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "B��dy prosimy zg�asza� na adres <[email protected]>.\n"
 
-#: g10/g10.c:737
+#: g10/g10.c:741
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/g10.c:740
+#: g10/g10.c:744
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1177,7 +1203,7 @@ msgstr ""
 "podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: g10/g10.c:751
+#: g10/g10.c:755
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1185,73 +1211,73 @@ msgstr ""
 "\n"
 "Obs�ugiwane algorytmy:\n"
 
-#: g10/g10.c:754
+#: g10/g10.c:758
 msgid "Pubkey: "
 msgstr "Asymetryczne: "
 
-#: g10/g10.c:760 g10/keyedit.c:2141
+#: g10/g10.c:764 g10/keyedit.c:2248
 msgid "Cipher: "
 msgstr "Symetryczne: "
 
-#: g10/g10.c:766
+#: g10/g10.c:770
 msgid "Hash: "
 msgstr "Skr�t�w: "
 
-#: g10/g10.c:772 g10/keyedit.c:2187
+#: g10/g10.c:776 g10/keyedit.c:2294
 msgid "Compression: "
 msgstr "Kompresji: "
 
-#: g10/g10.c:855
+#: g10/g10.c:859
 msgid "usage: gpg [options] "
 msgstr "wywo�anie: gpg [opcje]"
 
-#: g10/g10.c:1003
+#: g10/g10.c:1007
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/g10.c:1021
+#: g10/g10.c:1025
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "w definicji grupy ,,%s'' brak znaku ,,=''\n"
 
-#: g10/g10.c:1218
+#: g10/g10.c:1222
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
 
-#: g10/g10.c:1221
+#: g10/g10.c:1225
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
 
-#: g10/g10.c:1224
+#: g10/g10.c:1228
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
 
-#: g10/g10.c:1230
+#: g10/g10.c:1234
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
 
-#: g10/g10.c:1233
+#: g10/g10.c:1237
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1240
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
 
-#: g10/g10.c:1242
+#: g10/g10.c:1246
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu\n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/g10.c:1245
+#: g10/g10.c:1249
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1259,21 +1285,21 @@ msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu\n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/g10.c:1248
+#: g10/g10.c:1252
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu\n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1258
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu \n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/g10.c:1257
+#: g10/g10.c:1261
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1281,378 +1307,388 @@ msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu \n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/g10.c:1260
+#: g10/g10.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu \n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/g10.c:1401
+#: g10/g10.c:1405
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nieznana opcja ,,%s''\n"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1802
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "UWAGA: stary domy�lny plik opcji ,,%s'' zosta� zignorowany\n"
 
-#: g10/g10.c:1838
+#: g10/g10.c:1844
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy�lnego pliku opcji ,,%s''\n"
 
-#: g10/g10.c:1842
+#: g10/g10.c:1848
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji ,,%s'': %s\n"
 
-#: g10/g10.c:1849
+#: g10/g10.c:1855
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
 
-#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
 
-#: g10/g10.c:2076
+#: g10/g10.c:2082
 #, 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/g10.c:2293
+#: g10/g10.c:2236 g10/g10.c:2248
+#, fuzzy, c-format
+msgid "`%s' is not a valid signature expiration\n"
+msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
+
+#: g10/g10.c:2321
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3683
+#: g10/g10.c:2340 g10/keyedit.c:3862
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "niezrozuma�y URI serwera kluczy\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2346
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2349
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2356
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2359
 msgid "invalid import options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2366
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2369
 msgid "invalid export options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2376
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2379
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2401
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2404
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2411
 #, 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/g10.c:2573
+#: g10/g10.c:2602
 msgid "WARNING: program may create a core file!\n"
 msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2606
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "OSTRZE�ENIE: %s powoduje obej�cie %s\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2615
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie wolno u�ywa� %s z %s!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2618
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu w po��czeniu z %s!\n"
 
-#: g10/g10.c:2603
+#: g10/g10.c:2625
+#, 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/g10.c:2640
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/g10.c:2617
+#: g10/g10.c:2654
 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/g10.c:2623
+#: g10/g10.c:2660
 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/g10.c:2629
+#: g10/g10.c:2666
 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/g10.c:2642
+#: g10/g10.c:2679
 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/g10.c:2712 g10/g10.c:2736
+#: g10/g10.c:2746 g10/g10.c:2770
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/g10.c:2718 g10/g10.c:2742
+#: g10/g10.c:2752 g10/g10.c:2776
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w wiadomo�ci jest niepoprawny\n"
 
-#: g10/g10.c:2724
+#: g10/g10.c:2758
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2764
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w po�wiadcze� jest niepoprawny\n"
 
-#: g10/g10.c:2745
+#: g10/g10.c:2779
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
 
-#: g10/g10.c:2747
+#: g10/g10.c:2781
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2783
 #, 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/g10.c:2751
+#: g10/g10.c:2785
 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/g10.c:2753
+#: g10/g10.c:2787
 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/g10.c:2756
+#: g10/g10.c:2790
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2794
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "niepoprawny tryb S2K; musi mie� warto�� 0, 1 lub 3\n"
 
-#: g10/g10.c:2767
+#: g10/g10.c:2801
 msgid "invalid default preferences\n"
 msgstr "niew�a�ciwe domy�lne ustawienia\n"
 
-#: g10/g10.c:2776
+#: g10/g10.c:2810
 msgid "invalid personal cipher preferences\n"
 msgstr "niew�a�ciwe ustawienia szyfr�w\n"
 
-#: g10/g10.c:2780
+#: g10/g10.c:2814
 msgid "invalid personal digest preferences\n"
 msgstr "niew�a�ciwe ustawienia skr�t�w\n"
 
-#: g10/g10.c:2784
+#: g10/g10.c:2818
 msgid "invalid personal compress preferences\n"
 msgstr "niew�a�ciwe ustawienia algorytm�w kompresji\n"
 
-#: g10/g10.c:2817
+#: g10/g10.c:2851
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s jeszcze nie dzia�a z %s!\n"
 
-#: g10/g10.c:2864
+#: g10/g10.c:2898
 #, 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/g10.c:2869
+#: g10/g10.c:2903
 #, 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/g10.c:2874
+#: g10/g10.c:2908
 #, 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/g10.c:2970
+#: g10/g10.c:3004
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/g10.c:2981
+#: g10/g10.c:3015
 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/g10.c:2992
+#: g10/g10.c:3026
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/g10.c:2999
+#: g10/g10.c:3033
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3035
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "b��d odszyfrowywania: %s\n"
 
-#: g10/g10.c:3011
+#: g10/g10.c:3045
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/g10.c:3024
+#: g10/g10.c:3058
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3060
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3029
+#: g10/g10.c:3063
 #, 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/g10.c:3047
+#: g10/g10.c:3081
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3094
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/g10.c:3075
+#: g10/g10.c:3109
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/g10.c:3077
+#: g10/g10.c:3111
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3080
+#: g10/g10.c:3114
 #, 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/g10.c:3100
+#: g10/g10.c:3134
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [plik]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3143
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]\""
 
-#: g10/g10.c:3134
+#: g10/g10.c:3168
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/g10.c:3142
+#: g10/g10.c:3176
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa u�ytkownika"
 
-#: g10/g10.c:3146
+#: g10/g10.c:3180
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa u�ytkownika"
 
-#: g10/g10.c:3167
+#: g10/g10.c:3201
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u�ytkownika [polecenia]"
 
-#: g10/g10.c:3238
+#: g10/g10.c:3272
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [identyfikator] [zbi�r kluczy]"
 
-#: g10/g10.c:3275
+#: g10/g10.c:3309
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
 
-#: g10/g10.c:3277
+#: g10/g10.c:3311
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3313
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "eksport kluczy nie powi�d� si�: %s\n"
 
-#: g10/g10.c:3290
+#: g10/g10.c:3324
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "szukanie w serwerze kluczy nie powiod�o si�: %s\n"
 
-#: g10/g10.c:3300
+#: g10/g10.c:3334
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "od�wie�enie kluczy z serwera nie powiod�o si�: %s\n"
 
-#: g10/g10.c:3341
+#: g10/g10.c:3375
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:3349
+#: g10/g10.c:3383
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:3436
+#: g10/g10.c:3470
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew�a�ciwy algorytm skr�tu ,%s'\n"
 
-#: g10/g10.c:3559
+#: g10/g10.c:3593
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3597
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
 
-#: g10/g10.c:3853
+#: g10/g10.c:3887
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1660,78 +1696,83 @@ msgstr ""
 "nazwa adnotacji mo�e zawiera� tylko litery, cyfry, kropki i podkre�lenia, \n"
 "i musi ko�czy� si� ,,=''\n"
 
-#: g10/g10.c:3861
+#: g10/g10.c:3895
 msgid "a user notation name must contain the '@' character\n"
 msgstr "adnotacja u�ytkownika musi zawiera� znak '@'\n"
 
-#: g10/g10.c:3871
+#: g10/g10.c:3900
+#, fuzzy
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr "adnotacja u�ytkownika musi zawiera� znak '@'\n"
+
+#: g10/g10.c:3911
 msgid "a notation value must not use any control characters\n"
 msgstr "tre�� adnotacji nie mo�e zawiera� znak�w steruj�cych\n"
 
-#: g10/g10.c:3905
+#: g10/g10.c:3945
 msgid "the given certification policy URL is invalid\n"
 msgstr "podany URL regulaminu po�wiadczania jest niepoprawny\n"
 
-#: g10/g10.c:3907
+#: g10/g10.c:3947
 msgid "the given signature policy URL is invalid\n"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/g10.c:3940
+#: g10/g10.c:3980
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "zbyt wiele wpis�w w buforze kluczy publicznych - wy��czony\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2750
+#: g10/getkey.c:187 g10/getkey.c:2757
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[brak identyfikatora u�ytkownika]"
 
-#: g10/getkey.c:1677
+#: g10/getkey.c:1684
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Opcja --allow-non-selfsigned-uid wymusi�a uznanie za poprawny klucza %08lX.\n"
 
-#: g10/getkey.c:2228
+#: g10/getkey.c:2235
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "brak prywatnego odpowiednika podklucza publicznego %08lX - pomini�ty\n"
 
-#: g10/getkey.c:2459
+#: g10/getkey.c:2466
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "u�ywany jest podklucz %08lX zamiast klucza g��wnego %08lX\n"
 
-#: g10/getkey.c:2506
+#: g10/getkey.c:2513
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "klucz %08lX: klucz tajny bez klucza jawnego - pomini�ty\n"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:74
 msgid "be somewhat more quiet"
 msgstr "mniej komunikat�ww"
 
-#: g10/gpgv.c:70
+#: g10/gpgv.c:75
 msgid "take the keys from this keyring"
 msgstr "pobieranie kluczy z tego zbioru"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:77
 msgid "make timestamp conflicts only a warning"
 msgstr "nie traktowa� konfliktu datownik�w jako b��du"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:78
 msgid "|FD|write status info to this FD"
 msgstr "|FD|pisanie opisu stanu do deskryptora FD"
 
-#: g10/gpgv.c:97
+#: g10/gpgv.c:102
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpgv [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:105
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1739,7 +1780,7 @@ msgstr ""
 "Sk�adnia: gpgm [opcje] [pliki]\n"
 "Sprawdzanie podpis�w ze znanych zaufanych kluczy\n"
 
-#: g10/helptext.c:48
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1750,7 +1791,7 @@ msgstr ""
 "zaufania, i nie ma to nic wsp�lnego z tworzon� automatycznie sieci�\n"
 "certyfikat�w."
 
-#: g10/helptext.c:54
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1762,18 +1803,18 @@ msgstr ""
 "tajne. Odpowiedz ,,tak'', je�li chcesz okre�li� ten klucz jako klucz\n"
 "do kt�rego masz absolutne zaufanie.\n"
 
-#: g10/helptext.c:61
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Je�li mimo wszystko chcesz u�y� tego klucza, klucza, co do kt�rego nie ma\n"
 "�adnej pewno�ci do kogo nale�y, odpowiedz ,,tak''."
 
-#: g10/helptext.c:65
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Podaj adresat�w tej wiadomo�ci."
 
-#: g10/helptext.c:69
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1787,7 +1828,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:83
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -1798,16 +1839,16 @@ msgstr ""
 "si�\n"
 "najpierw skonsultowa� z ekspertem od bezpiecze�stwa. "
 
-#: g10/helptext.c:90
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "Wprowad� rozmiar klucza"
 
-#: g10/helptext.c:94 g10/helptext.c:99 g10/helptext.c:111 g10/helptext.c:143
-#: g10/helptext.c:171 g10/helptext.c:176 g10/helptext.c:181
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "Odpowied� \"tak\" lub \"nie\"."
 
-#: g10/helptext.c:104
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1819,20 +1860,20 @@ msgstr ""
 "w�a�ciwej obs�ugi b��d�w - system pr�buje interpretowa� podan� warto��\n"
 "jako okres."
 
-#: g10/helptext.c:116
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "Nazwa w�a�ciciela klucza."
 
-#: g10/helptext.c:121
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr "prosz� wprowadzi� opcjonalny ale wysoce doradzany adres e-mail"
 
-#: g10/helptext.c:125
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "Prosz� wprowadzi� opcjonalny komentarz"
 
 # OSTRZE�ENIE: nic nie zosta�o wyeksportowane!
-#: g10/helptext.c:130
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1846,11 +1887,11 @@ msgstr ""
 "O aby kontynuowa� tworzenie klucza.\n"
 "Q aby zrezygnowa� z tworzenia klucza."
 
-#: g10/helptext.c:139
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Je�li ma zosta� wygenerowany podklucz, nale�y odpowiedzie� \"tak\"."
 
-#: g10/helptext.c:147
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -1921,12 +1962,12 @@ msgstr ""
 "\n"
 "Je�li nie wiesz co odpowiedzie�, podaj \"0\"."
 
-#: g10/helptext.c:185
+#: g10/helptext.c:186
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Odpowiedz \"tak\", aby podpisa� WSZYSTKIE identyfikatory u�ytkownika."
 
-#: g10/helptext.c:189
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -1934,11 +1975,11 @@ msgstr ""
 "Aby skasowa� ten identyfikator u�ytkownika (co wi��e si� ze utrat�\n"
 "wszystkich jego po�wiadcze�!) nale�y odpowiedzie� ,,tak''."
 
-#: g10/helptext.c:194
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Aby skasowa� podklucz nale�y odpowiedzie� \"tak\"."
 
-#: g10/helptext.c:199
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -1948,7 +1989,7 @@ msgstr ""
 "poniewa� mo�e by� wa�ny dla zestawienia po�aczenia zaufania do klucza\n"
 "kt�rym go z�o�ono lub do innego klucza nim po�wiadczonego."
 
-#: g10/helptext.c:204
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -1961,13 +2002,13 @@ msgstr ""
 "w momencie uzyskania tego klucza mo�e pojawi� si� �cie�ka zaufania\n"
 "pomi�dzy tym a innym, ju� po�wiadczonym kluczem."
 
-#: g10/helptext.c:210
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "Ten podpis jest niepoprawny. Mo�na usuni�� go ze zbioru kluczy."
 
-#: g10/helptext.c:214
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -1981,7 +2022,7 @@ msgstr ""
 "klucza nim samym z jakich� przyczyn nie jest poprawny, i klucz jest\n"
 "drugi raz podpisany w ten sam spos�b."
 
-#: g10/helptext.c:222
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -1991,30 +2032,30 @@ msgstr ""
 "ustawienia. Data na odpowiednich podpisach zostane przesuni�ta do przodu o\n"
 "jedn� sekund�. \n"
 
-#: g10/helptext.c:229
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Podaj d�ugie, skomplikowane has�o, np. ca�e zdanie.\n"
 
-#: g10/helptext.c:235
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Prosz� powr�trzy� has�o, aby upewni� si� �e nie by�o pomy�ki."
 
-#: g10/helptext.c:239
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "Podaj nazw� pliku kt�rego dotyczy ten podpis"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Je�li mo�na nadpisa� ten plik, nale�y odpowiedzie� ,,tak''"
 
-#: g10/helptext.c:249
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
 msgstr ""
 "Nazwa pliku. Naci�ni�cie ENTER potwierdzi nazw� domy�ln� (w nawiasach)."
 
-#: g10/helptext.c:255
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2041,7 +2082,7 @@ msgstr ""
 "      Identyfikator u�ytkownika (najcz�ciej adres e-mail przesta� by� \n"
 "      poprawny.\n"
 
-#: g10/helptext.c:271
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2051,477 +2092,482 @@ msgstr ""
 "uniewa�nienia. Opis powinien byc zwi�z�y. \n"
 "Pusta linia ko�czy wprowadzanie tekstu.\n"
 
-#: g10/helptext.c:286
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "Pomoc niedost�pna"
 
-#: g10/helptext.c:294
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Brak pomocy o ,,%s''"
 
-#: g10/import.c:247
+#: g10/import.c:248
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d zostaje pomini�ty\n"
 
-#: g10/import.c:256
+#: g10/import.c:257
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu kluczy przetworzonych do tej chwili\n"
 
-#: g10/import.c:273
+#: g10/import.c:274
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Og�em przetworzonych kluczy: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "   pomini�tych nowych kluczy: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:279
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          bez identyfikatora: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "              imported: %lu"
 msgstr "         do��czono do zbioru: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:287
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                   bez zmian: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      nowych identyfikator�w: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "            nowych podkluczy: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "             nowych podpis�w: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   nowych uniewa�nie� kluczy: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   tajnych kluczy wczytanych: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "     tajnych kluczy dodanych: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "    tajnych kluczy bez zmian: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "      nie w��czono do zbioru: %lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:544
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:545
+#: g10/import.c:546
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Te identyfikatory s� podpisane przez Ciebie:\n"
 
-#: g10/import.c:582
+#: g10/import.c:583
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:594
+#: g10/import.c:595
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "podpis %s, skr�t %s\n"
 
-#: g10/import.c:606
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:620
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:646
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:694 g10/import.c:1048
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "klucz %08lX: brak identyfikatora u�ytkownika\n"
 
-#: g10/import.c:713
+#: g10/import.c:714
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "klucz %08lX: podklucz uszkodzony przez serwer zosta� naprawiony\n"
 
-#: g10/import.c:728
+#: g10/import.c:729
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "klucz %08lX: przyj�to identyfikator nie podpisany nim samym ,,%s''\n"
 
-#: g10/import.c:734
+#: g10/import.c:735
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "klucz %08lX: brak poprawnych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 msgid "this may be caused by a missing self-signature\n"
 msgstr "to mo�e by� spowodowane brakiem podpisu klucza nim samym\n"
 
-#: g10/import.c:746 g10/import.c:1168
+#: g10/import.c:747 g10/import.c:1169
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "klucz %08lX: brak klucza publicznego: %s\n"
 
-#: g10/import.c:752
+#: g10/import.c:753
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "klucz %08lX: nowy klucz - pomini�ty\n"
 
-#: g10/import.c:761
+#: g10/import.c:762
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy: %s\n"
 
-#: g10/import.c:766 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapis do '%s'\n"
 
-#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
-#: g10/import.c:2314 g10/import.c:2336
+#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
+#: g10/import.c:2315 g10/import.c:2337
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "b��d zapisu zbioru kluczy '%s': %s\n"
 
-#: g10/import.c:791
+#: g10/import.c:792
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "klucz %08lX: klucz publiczny ,,%s'' wczytano do zbioru\n"
 
-#: g10/import.c:815
+#: g10/import.c:816
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "klucz %08lX: nie zgadza si� z lokaln� kopi�\n"
 
-#: g10/import.c:832 g10/import.c:1186
+#: g10/import.c:833 g10/import.c:1187
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "klucz %08lX: brak oryginalnego bloku klucza; %s\n"
 
-#: g10/import.c:840 g10/import.c:1193
+#: g10/import.c:841 g10/import.c:1194
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "klucz %08lX: nie mo�na odczyta� oryginalnego bloku klucza; %s\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "klucz %08lX: ,,%s'' 1 nowy identyfikator u�ytkownika\n"
 
-#: g10/import.c:875
+#: g10/import.c:876
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:878
+#: g10/import.c:879
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "klucz %08lX: ,,%s'' 1 nowy podpis\n"
 
-#: g10/import.c:881
+#: g10/import.c:882
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych podpis�w\n"
 
-#: g10/import.c:884
+#: g10/import.c:885
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "klucz %08lX: ,,%s'' 1 nowy podklucz\n"
 
-#: g10/import.c:887
+#: g10/import.c:888
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych podkluczy\n"
 
-#: g10/import.c:908
+#: g10/import.c:909
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "klucz %08lX: ,,%s'' bez zmian\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1054
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "klucz %08lX: klucz tajny z ustawionym szyfrem %d - pomini�ty\n"
 
-#: g10/import.c:1064
+#: g10/import.c:1065
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/import.c:1081 g10/import.c:2329
+#: g10/import.c:1082 g10/import.c:2330
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "brak domy�lego zbioru kluczy tajnych: %s\n"
 
-#: g10/import.c:1092
+#: g10/import.c:1093
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "Klucz %08lX: klucz tajny wczytany do zbioru\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1122
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "Klucz %08lX: ten klucz ju� znajduje si� w zbiorze\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1132
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "klucz %08lX: brak klucza tajnego: %s\n"
 
-#: g10/import.c:1161
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "klucz %08lX: brak klucza publicznego kt�rego dotyczy wczytany certyfikat\n"
 "              uniwa�nienia\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1205
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "klucz %08lX: niepoprawny certyfikat uniewa�nienia: %s - odrzucony\n"
 
-#: g10/import.c:1236
+#: g10/import.c:1237
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "klucz %08lX: ,,%s'' certyfikat uniewa�nienia zosta� ju� wczytany\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1302
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "klucz %08lX: brak identyfikatora u�ytkownika do podpisu\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1317
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "klucz %08lX: algorytm asymetryczny \"%s\" nie jest obs�ugiwany\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "klucz %08lX: niepoprawny podpis na identyfikatorze \"%s\"\n"
 
-#: g10/import.c:1336
+#: g10/import.c:1337
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "klucz %08lX: brak podklucza do dowi�zania\n"
 
-#: g10/import.c:1347 g10/import.c:1397
+#: g10/import.c:1348 g10/import.c:1398
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "klucz %08lX: nie obs�ugiwany algorytm asymetryczny\n"
 
-#: g10/import.c:1349
+#: g10/import.c:1350
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "klucz %08lX: niepoprawne dowi�zanie podklucza\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1365
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "klucz %08lX: usuni�to wielokrotne dowi�zanie podklucza\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "klucz %08lX: brak podklucza, kt�rego dotyczy uniewa�nienie\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "klucz %08lX: nieoprawne uniewa�nienie podklucza\n"
 
-#: g10/import.c:1414
+#: g10/import.c:1415
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "klucz %08lX: usuni�to wielokrotne uniewa�nienie podklucza\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1457
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "klucz %08lX: pomini�to identyfikator u�ytkownika '"
 
-#: g10/import.c:1477
+#: g10/import.c:1478
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "klucz %08lX: podklucz pomini�ty\n"
 
-#: g10/import.c:1504
+#: g10/import.c:1505
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "klucz %08lX: podpis nieeksportowalny (klasy %02x) - pomini�ty\n"
 
-#: g10/import.c:1514
+#: g10/import.c:1515
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "klucz %08lX: pomini�to certyfikat uniewa�nienia umieszczony \n"
 "              w niew�a�ciwym miejscu\n"
 
-#: g10/import.c:1531
+#: g10/import.c:1532
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "klucz %08lX: pomini�to -  niepoprawny certyfikat uniewa�nienia: %s\n"
 
-#: g10/import.c:1545
+#: g10/import.c:1546
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "klucz %08lX: pomini�to - podpis na podkluczu w niew�a�ciwym miejscu\n"
 
-#: g10/import.c:1553
+#: g10/import.c:1554
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "klucz %08lX: pomini�to - nieoczekiwana klasa podpisu (%02x)\n"
 
-#: g10/import.c:1574
+#: g10/import.c:1575
 #, fuzzy, c-format
 msgid "key %s: expired signature from key %s - skipped\n"
 msgstr "klucz %08lX: pomini�to - nieoczekiwana klasa podpisu (%02x)\n"
 
-#: g10/import.c:1677
+#: g10/import.c:1678
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "key %08lX: do��czono powt�rzony identyfikator u�ytkownika\n"
 
-#: g10/import.c:1739
+#: g10/import.c:1740
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "OSTRZE�ENIE: klucz %08lX m�g� zosta� uniewazniony:\n"
 "             zapytanie o uniewa�niaj�cy klucz %08lX w serwerze kluczy\n"
 
-#: g10/import.c:1753
+#: g10/import.c:1754
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "OSTRZE�ENIE: klucz %08lX m�g� zosta� uniewa�niony:\n"
 "             brak uniewa�niaj�cego klucza %08lX.\n"
 
-#: g10/import.c:1812
+#: g10/import.c:1813
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "klucz %08lX: ,,%s'' dodany certyfikat uniewa�nienia\n"
 
-#: g10/import.c:1846
+#: g10/import.c:1847
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "klucz %08lX: dodano bezpo�redni podpis\n"
 
-#: g10/import.c:2235
+#: g10/import.c:2236
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "klucz publiczny nie pasuje do klucza prywatngeo!\n"
 
-#: g10/import.c:2243
+#: g10/import.c:2244
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
 
-#: g10/import.c:2245
+#: g10/import.c:2246
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
 
-#: g10/keydb.c:167
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "b��d tworzenia zbioru kluczy `%s': %s\n"
 
-#: g10/keydb.c:174
+#: g10/keydb.c:175
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "zbi�r kluczy ,,%s'' zosta� utworzony\n"
 
-#: g10/keydb.c:685
+#: g10/keydb.c:316 g10/keydb.c:319
+#, fuzzy, c-format
+msgid "keyblock resource `%s': %s\n"
+msgstr "b��d tworzenia `%s': %s\n"
+
+#: g10/keydb.c:698
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "nie powiod�a si� odbudowa bufora bazy: %s\n"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[uniewa�nienie]"
 
-#: g10/keyedit.c:255
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[podpis klucza nim samym]"
 
-#: g10/keyedit.c:333 g10/keylist.c:405
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 niepoprawny podpis\n"
 
-#: g10/keyedit.c:335 g10/keylist.c:407
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d niepoprawnych podpis�w\n"
 
-#: g10/keyedit.c:337 g10/keylist.c:409
+#: g10/keyedit.c:344 g10/keylist.c:410
 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:339 g10/keylist.c:411
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, 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:341 g10/keylist.c:413
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 podpis nie zosta� sprawdzony z powodu b��du\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:415
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, 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:345
+#: g10/keyedit.c:352
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "wykryto 1 identyfikator u�ytkownika niepodpisany tym samym kluczem\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:354
 #, 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:403 g10/pkclist.c:262
+#: g10/keyedit.c:410 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2534,53 +2580,63 @@ msgstr ""
 "z r�nych �r�de�, dokumenty potwierdzaj�ce to�samo��, itd.).\n"
 "\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:274
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = mam ograniczone zaufanie\n"
 
-#: g10/keyedit.c:408 g10/pkclist.c:276
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = mam pe�ne zaufanie\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:434
 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:443
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Identyfikator u�ytkownika ,,%s'' zosta� uniewa�niony."
 
-#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
-#: g10/keyedit.c:858 g10/keyedit.c:1642
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1728
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Czy na pewno chcesz podpisa�? (t/N) "
 
-#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
-#: g10/keyedit.c:1648
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
+#: g10/keyedit.c:1734
 msgid "  Unable to sign.\n"
 msgstr " Nie da si� z�o�y� podpisu.\n"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Identyfikator u�ytkownika ,,%s'' przekroczy� sw�j termin wa�no�ci."
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:650
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Identyfikator ,,%s'' nie jest podpisany swoim kluczem."
 
-#: g10/keyedit.c:676
+#: g10/keyedit.c:678
+#, fuzzy, c-format
+msgid "User ID \"%s\" is signable.  "
+msgstr "Identyfikator ,,%s'' nie jest podpisany swoim kluczem."
+
+#: g10/keyedit.c:680
+#, fuzzy
+msgid "Sign it? (y/N) "
+msgstr "Czy na pewno podpisa�? (t/N) "
+
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2589,11 +2645,11 @@ msgstr ""
 "Podpis klucza nim samym na ,,%s''\n"
 "jest podpisem z�o�onym przez PGP 2.x.\n"
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:711
 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:699
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2602,11 +2658,11 @@ msgstr ""
 "Tw�j podpis na \"%s\"\n"
 "przekroczy� dat� wa�no�ci.\n"
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:729
 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:724
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2615,56 +2671,56 @@ msgstr ""
 "Tw�j podpis na \"%s\"\n"
 "jest podpisem prywatnym (lokalnym).\n"
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:754
 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:749
+#: g10/keyedit.c:775
 #, 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:752
+#: g10/keyedit.c:778
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" jest ju� podpisany kluczem %08lX\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:783
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Czy na pewno chcesz to podpisa�? (t/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:805
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nie ma nic do podpisania kluczem %08lX.\n"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "Data wa�no�ci tego klucza up�yn�a!"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Wa�no�� tego klucza wygasa %s.\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:844
 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:851
+#: g10/keyedit.c:882
 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:853
+#: g10/keyedit.c:884
 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:878
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2673,32 +2729,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:883
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Nie odpowiem na to pytanie. %s\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) W og�le nie.%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Pobie�nie.%s\n"
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Bardzo dok�adnie.%s\n"
 
-#: g10/keyedit.c:895
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Tw�j wyb�r (,,?'' podaje wi�cej informacji): "
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:950
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2707,99 +2763,99 @@ msgstr ""
 "Czy jeste� naprawd� pewien �e chcesz podpisa� ten klucz \n"
 "swoim kluczem: \""
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "To b�dzie podpis klucza nim samym.\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:963
 #, 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:940
+#: g10/keyedit.c:971
 #, 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:950
+#: g10/keyedit.c:981
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Podpis zostanie oznaczony jako prywatny (nieeksportowalny).\n"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:988
 #, 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:964
+#: g10/keyedit.c:995
 #, 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:969
+#: g10/keyedit.c:1000
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "To�samo�� u�ytkownika zosta�a sprawdzona pobie�nie.\n"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1005
 #, 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:984
+#: g10/keyedit.c:1015
 msgid "Really sign? (y/N) "
 msgstr "Czy na pewno podpisa�? (t/N) "
 
-#: g10/keyedit.c:1029 g10/keyedit.c:4132 g10/keyedit.c:4223 g10/keyedit.c:4287
-#: g10/keyedit.c:4348 g10/sign.c:369
+#: g10/keyedit.c:1060 g10/keyedit.c:4350 g10/keyedit.c:4441 g10/keyedit.c:4505
+#: g10/keyedit.c:4566 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "z�o�enie podpisu nie powiod�o si�: %s\n"
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1105 g10/keygen.c:3057
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "Ten klucz nie jest chroniony.\n"
 
-#: g10/keyedit.c:1109 g10/keygen.c:3045
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
 
-#: g10/keyedit.c:1113 g10/keygen.c:3060
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 #, 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:1117 g10/keygen.c:3064
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "Klucz jest chroniony.\n"
 
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Tego klucza nie mo�na edytowa�: %s.\n"
 
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2807,11 +2863,11 @@ msgstr ""
 "Wprowad� nowe d�ugie, skomplikowane has�o dla tego klucza tajnego.\n"
 "\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:1825
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "has�o nie zosta�o poprawnie powt�rzone; jeszcze jedna pr�ba"
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2819,195 +2875,195 @@ msgstr ""
 "Nie chcesz has�a - to *z�y* pomys�!\n"
 "\n"
 
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1195
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Czy na pewno chcesz to zrobi�? "
 
-#: g10/keyedit.c:1235
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "przenosz� podpis klucza na w�a�ciwe miejsce\n"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "zapis zmian i wyj�cie"
 
-#: g10/keyedit.c:1322
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "okazanie odcisku klucza"
 
-#: g10/keyedit.c:1323
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "lista kluczy i identyfikator�w u�ytkownik�w"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "wyb�r identyfikatora u�ytkownika N"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "wyb�r identyfikatora u�ytkownika N"
 
-#: g10/keyedit.c:1327
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "uniewa�nienie podpisu"
 
-#: g10/keyedit.c:1330
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1335
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "z�o�enie prywatnego (lokalnego) podpisu na kluczu"
 
-#: g10/keyedit.c:1337
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "lid %lu: niepodpisany identyfikator u�ytkownika\n"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1343
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "dodanie nowego identyfikatora u�ytkownika do klucza"
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "dodanie zdj�cia u�ytkownika do klucza"
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "usuni�cie identyfikatora u�ytkownika z klucza"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "add a subkey"
 msgstr "dodkl"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "usuni�cie podklucza"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr "wyznaczenie klucza uniewa�niaj�cego"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1402
 #, 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:1372
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "oznaczenie identyfikatora u�ytkownika jako g��wnego"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "prze��czenie pomi�dzy list� kluczy publicznych i prywatnych"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "ustawienia (zaawansowane)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "rozbudowana lista ustawie�"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1418
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "niezrozuma�y URI serwera kluczy\n"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "zmiana has�a klucza"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "zmiana zaufania w�a�ciciela"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1426
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Czy na pewno uniewa�ni� wszystkie wybrane identyfikatory u�ytkownika? "
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "uniewa�nienie identyfikatora u�ytkownika"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "uniewa�nienie podklucza"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "enable key"
 msgstr "w��czy� klucz do u�ycia"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "disable key"
 msgstr "wy��czy� klucz z u�ycia"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1436
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "okazanie identyfikatora - zdj�cia"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1556
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "b��d odczytu bloku klucza tajnego '%s': %s\n"
 
-#: g10/keyedit.c:1494
+#: g10/keyedit.c:1574
 msgid "Secret key is available.\n"
 msgstr "Dost�pny jest klucz tajny.\n"
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1655
 msgid "Need the secret key to do this.\n"
 msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n"
 
-#: g10/keyedit.c:1579
+#: g10/keyedit.c:1663
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Najpierw trzeba u�y� polecenia \"prze�\".\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1682
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3015,237 +3071,242 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1722
 msgid "Key is revoked."
 msgstr "Klucz uniewa�niony."
 
-#: g10/keyedit.c:1657
+#: g10/keyedit.c:1741
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Podpisa� wszystkie identyfikatory u�ytkownika na tym kluczu? "
 
-#: g10/keyedit.c:1660
-msgid "Hint: Select the user IDs to sign\n"
-msgstr "Podpowied�: wybierz identyfikatory u�ytkownika do podpisania.\n"
-
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1748
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "nieznana klasa podpisu"
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1771
 #, 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:1713 g10/keyedit.c:1733 g10/keyedit.c:1899
+#: g10/keyedit.c:1793 g10/keyedit.c:1813 g10/keyedit.c:1979
 msgid "You must select at least one user ID.\n"
 msgstr "Musisz wybra� co najmniej jeden identyfikator u�ytkownika.\n"
 
-#: g10/keyedit.c:1715
+#: g10/keyedit.c:1795
 msgid "You can't delete the last user ID!\n"
 msgstr "Nie mo�esz usun�� ostatniego identyfikatora u�ytkownika!\n"
 
-#: g10/keyedit.c:1717
+#: g10/keyedit.c:1797
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Czy na pewno usun�� wszystkie wybrane identyfikatory u�ytkownika? "
 
-#: g10/keyedit.c:1718
+#: g10/keyedit.c:1798
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Czy na pewno usun�� ten identyfikator u�ytkownika? "
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1848
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Czy na pewno usun�� ten identyfikator u�ytkownika? "
 
-#: g10/keyedit.c:1780
+#: g10/keyedit.c:1860
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Musisz wybra� co najmniej jeden klucz.\n"
 
-#: g10/keyedit.c:1808
+#: g10/keyedit.c:1888
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1822
+#: g10/keyedit.c:1902
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "nie mo�na otworzy� ,,%s'': %s\n"
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1919
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "b��d tworzenia zbioru kluczy `%s': %s\n"
 
-#: g10/keyedit.c:1863
+#: g10/keyedit.c:1943
 msgid "You must select at least one key.\n"
 msgstr "Musisz wybra� co najmniej jeden klucz.\n"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1946
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Czy na pewno chcesz usun�� wybrane klucze? "
 
-#: g10/keyedit.c:1867
+#: g10/keyedit.c:1947
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Czy na pewno chcesz usun�� ten klucz? "
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1982
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Czy na pewno uniewa�ni� wszystkie wybrane identyfikatory u�ytkownika? "
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1983
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Czy na pewno uniewa�ni� ten identyfikator u�ytkownika? "
 
-#: g10/keyedit.c:1921
+#: g10/keyedit.c:2001
 #, 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:1932
+#: g10/keyedit.c:2012
 #, 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:1934
+#: g10/keyedit.c:2014
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Czy na pewno chcesz uniewa�ni� ten klucz? "
 
-#: g10/keyedit.c:1975
+#: g10/keyedit.c:2055
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2007
+#: g10/keyedit.c:2087
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "ustawienie opcji klucza"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2093
 #, 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:2015
+#: g10/keyedit.c:2095
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Czy na pewno usaktualni� ustawienia? "
 
-#: g10/keyedit.c:2065
+#: g10/keyedit.c:2157
+#, fuzzy, c-format
+msgid "Unable to clean `%s'\n"
+msgstr "nie mo�na wykona� %s ,,%s'': %s\n"
+
+#: g10/keyedit.c:2160
+msgid "Please specify item to clean: `sigs', `uids', or `all'\n"
+msgstr ""
+
+#: g10/keyedit.c:2171
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Zapisa� zmiany? "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2174
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Wyj�� bez zapisania zmian? "
 
-#: g10/keyedit.c:2078
+#: g10/keyedit.c:2184
 #, c-format
 msgid "update failed: %s\n"
 msgstr "zapis zmian nie powi�d� si�: %s\n"
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2191
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "zapis zmian na kluczu prywatnym nie powi�d� si�: %s\n"
 
-#: g10/keyedit.c:2092
+#: g10/keyedit.c:2198
 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:2164
+#: g10/keyedit.c:2271
 msgid "Digest: "
 msgstr "Skr�t: "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2323
 msgid "Features: "
 msgstr "Ustawienia: "
 
-#: g10/keyedit.c:2227
+#: g10/keyedit.c:2334
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2242 g10/keylist.c:307
+#: g10/keyedit.c:2349 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2473
+#: g10/keyedit.c:2580
 #, 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:2494
+#: g10/keyedit.c:2601
 #, 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:2500
+#: g10/keyedit.c:2607
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (poufne)"
 
-#: g10/keyedit.c:2516 g10/keyedit.c:2572 g10/keyedit.c:2684 g10/keyedit.c:2699
-#: g10/keylist.c:193 g10/keyserver.c:422
+#: g10/keyedit.c:2623 g10/keyedit.c:2679 g10/keyedit.c:2792 g10/keyedit.c:2807
+#: g10/keylist.c:194 g10/keyserver.c:421
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "nie mo�na utworzy� %s: %s\n"
 
-#: g10/keyedit.c:2519 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:931
+#: g10/keyedit.c:2626 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:948
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[uniewa�niony]"
 
-#: g10/keyedit.c:2521 g10/keylist.c:757 g10/keylist.c:886
+#: g10/keyedit.c:2628 g10/keylist.c:758 g10/keylist.c:887
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [wygasa :%s]"
 
-#: g10/keyedit.c:2523 g10/keyedit.c:2574 g10/keyedit.c:2686 g10/keyedit.c:2701
-#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
-#: g10/keylist.c:913 g10/keyserver.c:428 g10/mainproc.c:937
+#: g10/keyedit.c:2630 g10/keyedit.c:2681 g10/keyedit.c:2794 g10/keyedit.c:2809
+#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
+#: g10/keylist.c:914 g10/keyserver.c:427 g10/mainproc.c:954
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [wygasa :%s]"
 
-#: g10/keyedit.c:2525
+#: g10/keyedit.c:2632
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " zaufanie: %c/%c"
 
-#: g10/keyedit.c:2540
+#: g10/keyedit.c:2647
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " zaufanie: %c/%c"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2651
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2658
 msgid "This key has been disabled"
 msgstr "Ten klucz zosta� wy��czony z u�ytku"
 
-#: g10/keyedit.c:2579 g10/keylist.c:199
+#: g10/keyedit.c:2686 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2754
 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:2654
+#: g10/keyedit.c:2762
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3253,19 +3314,19 @@ msgstr ""
 "Pokazana warto�� wiarygodno�ci klucza mo�e by� niepoprawna,\n"
 "dop�ki program nie zostanie uruchomiony ponownie.\n"
 
-#: g10/keyedit.c:2718 g10/keyserver.c:432 g10/mainproc.c:1577
-#: g10/trustdb.c:1178
+#: g10/keyedit.c:2826 g10/keyedit.c:3201 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1690
 #, fuzzy
 msgid "revoked"
 msgstr "[uniewa�niony]"
 
-#: g10/keyedit.c:2720 g10/keyserver.c:436 g10/mainproc.c:1579
-#: g10/trustdb.c:531
+#: g10/keyedit.c:2828 g10/keyedit.c:3203 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1692
 #, fuzzy
 msgid "expired"
 msgstr "data"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2893
 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"
@@ -3274,7 +3335,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:2845
+#: g10/keyedit.c:2953
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3283,45 +3344,74 @@ msgstr ""
 "OSTRZE�ENIE: To jest klucz PGP wersji 2. Dodanie zdj�cia spowoduje, �e\n"
 "             niekt�re wersje przestan� go rozumie�.\n"
 
-#: g10/keyedit.c:2850 g10/keyedit.c:3128
+#: g10/keyedit.c:2958 g10/keyedit.c:3307
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Czy dalej chcesz je doda�? (t/N) "
 
-#: g10/keyedit.c:2856
+#: g10/keyedit.c:2964
 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:2996
+#: g10/keyedit.c:3104
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Usun�� ten poprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3114
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Usun�� ten niepoprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:3010
+#: g10/keyedit.c:3118
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Usun�� ten nieznany podpis? (t/N/w) "
 
-#: g10/keyedit.c:3016
+#: g10/keyedit.c:3124
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Na pewno usun�� ten podpis klucza nim samym? (t/N) "
 
-#: g10/keyedit.c:3030
+#: g10/keyedit.c:3138
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d podpis usuni�ty.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3139
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d podpis�w usuni�tych.\n"
 
-#: g10/keyedit.c:3034
+#: g10/keyedit.c:3142
 msgid "Nothing deleted.\n"
 msgstr "Nic nie zosta�o usuni�te.\n"
 
-#: g10/keyedit.c:3123
+#: g10/keyedit.c:3167
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed.\n"
+msgstr "Identyfikator u�ytkownika ,,%s'' zosta� uniewa�niony."
+
+#: g10/keyedit.c:3168
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed.\n"
+msgstr "Identyfikator u�ytkownika ,,%s'' zosta� uniewa�niony."
+
+#: g10/keyedit.c:3173
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean.\n"
+msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
+
+#: g10/keyedit.c:3205 g10/trustdb.c:1694
+msgid "invalid"
+msgstr "niepoprawny"
+
+#: g10/keyedit.c:3207
+#, fuzzy, c-format
+msgid "User ID \"%s\" removed: %s\n"
+msgstr "Identyfikator u�ytkownika ,,%s'' zosta� uniewa�niony."
+
+#: g10/keyedit.c:3214
+#, fuzzy
+msgid "No user IDs are removable.\n"
+msgstr "Brak identyfikatora u�ytkownika dla klucza.\n"
+
+#: g10/keyedit.c:3302
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3331,342 +3421,347 @@ msgstr ""
 "             uniewa�niaj�cego, spowoduje, �e niekt�re wersje PGP przestan�\n"
 "             go rozumie�.\n"
 
-#: g10/keyedit.c:3134
+#: g10/keyedit.c:3313
 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:3154
+#: g10/keyedit.c:3333
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Podaj identyfikator klucza uniewa�niaj�cego: "
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3356
 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:3192
+#: g10/keyedit.c:3371
 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:3214
+#: g10/keyedit.c:3393
 #, 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:3233
+#: g10/keyedit.c:3412
 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:3239
+#: g10/keyedit.c:3418
 #, 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:3300
+#: g10/keyedit.c:3479
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Prosz� usun�� znacznik wyboru z kluczy prywatnych.\n"
 
-#: g10/keyedit.c:3306
+#: g10/keyedit.c:3485
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Prosz� wybra� tylko jeden podklucz.\n"
 
-#: g10/keyedit.c:3310
+#: g10/keyedit.c:3489
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Zmiana daty wa�no�ci podklucza.\n"
 
-#: g10/keyedit.c:3313
+#: g10/keyedit.c:3492
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Zmiana daty wa�no�ci g��wnego klucza.\n"
 
-#: g10/keyedit.c:3359
+#: g10/keyedit.c:3538
 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:3375
+#: g10/keyedit.c:3554
 msgid "No corresponding signature in secret ring\n"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy prywatnych\n"
 
-#: g10/keyedit.c:3455
+#: g10/keyedit.c:3634
 msgid "Please select exactly one user ID.\n"
 msgstr "Prosz� wybra� dok�adnie jeden identyfikator u�ytkownika.\n"
 
-#: g10/keyedit.c:3494 g10/keyedit.c:3604 g10/keyedit.c:3724
+#: g10/keyedit.c:3673 g10/keyedit.c:3783 g10/keyedit.c:3903
 #, 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:3665
+#: g10/keyedit.c:3844
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3745
+#: g10/keyedit.c:3924
 #, 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:3746
+#: g10/keyedit.c:3925
 #, 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:3808
+#: g10/keyedit.c:3987
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:3854
+#: g10/keyedit.c:4045
+#, fuzzy, c-format
+msgid "No user ID with hash %s\n"
+msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
+
+#: g10/keyedit.c:4072
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:3971
+#: g10/keyedit.c:4189
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Identyfikator u�ytkownika: "
 
-#: g10/keyedit.c:3974 g10/keyedit.c:4038 g10/keyedit.c:4081
+#: g10/keyedit.c:4192 g10/keyedit.c:4256 g10/keyedit.c:4299
 #, 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:3976 g10/keyedit.c:4040 g10/keyedit.c:4083
+#: g10/keyedit.c:4194 g10/keyedit.c:4258 g10/keyedit.c:4301
 msgid " (non-exportable)"
 msgstr " (podpis nieeksportowalny) "
 
-#: g10/keyedit.c:3980
+#: g10/keyedit.c:4198
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Wa�no�� tego klucza wygas�a %s.\n"
 
-#: g10/keyedit.c:3984
+#: g10/keyedit.c:4202
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Czy dalej chcesz go uniewa�ni�? (t/N) "
 
-#: g10/keyedit.c:3988
+#: g10/keyedit.c:4206
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Stworzy� certyfikat uniewa�nienia tego podpisu? (t/N) "
 
-#: g10/keyedit.c:4015
+#: g10/keyedit.c:4233
 #, 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:4041
+#: g10/keyedit.c:4259
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (podpis nieeksportowalny) "
 
-#: g10/keyedit.c:4048
+#: g10/keyedit.c:4266
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "uniewa�niony przez %08lX w %s\n"
 
-#: g10/keyedit.c:4070
+#: g10/keyedit.c:4288
 msgid "You are about to revoke these signatures:\n"
 msgstr "Czy na pewno chcesz uniewa�ni� te podpisy:\n"
 
-#: g10/keyedit.c:4090
+#: g10/keyedit.c:4308
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Na pewno utworzy� certyfikaty uniewa�nienia ? (t/N) "
 
-#: g10/keyedit.c:4120
+#: g10/keyedit.c:4338
 msgid "no secret key\n"
 msgstr "brak klucza tajnego\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4408
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4425
 #, 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:4271
+#: g10/keyedit.c:4489
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:4333
+#: g10/keyedit.c:4551
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4646
 #, 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"
 
-#: g10/keygen.c:293
+#: g10/keygen.c:258
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "ustawienie %c%lu powtarza si�\n"
 
-#: g10/keygen.c:300
+#: g10/keygen.c:265
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "zbyt wiele `%c' ustawie�\n"
 
-#: g10/keygen.c:302
+#: g10/keygen.c:267
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "zbyt wiele `%c' ustawie�\n"
 
-#: g10/keygen.c:304
+#: g10/keygen.c:269
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "zbyt wiele `%c' ustawie�\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:394
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "niew�a�ciwy znak w tek�cie ustawie�\n"
 
-#: g10/keygen.c:829
+#: g10/keygen.c:822
 msgid "writing direct signature\n"
 msgstr "zapis podpisu bezpo�redniego\n"
 
-#: g10/keygen.c:868
+#: g10/keygen.c:861
 msgid "writing self signature\n"
 msgstr "zapis podpisu klucza nim samym\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing key binding signature\n"
 msgstr "zapis podpisu wi���cego klucz\n"
 
-#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2632
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "niew�a�ciwa d�ugo�� klucza; wykorzystano %u bit�w\n"
 
-#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2638
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "rozmair klucza zaokr�glony do %u bit�w\n"
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1239
 #, fuzzy
 msgid "Sign"
 msgstr "podpis"
 
-#: g10/keygen.c:1252
+#: g10/keygen.c:1242
 #, fuzzy
 msgid "Encrypt"
 msgstr "szyfrowanie danych"
 
-#: g10/keygen.c:1255
+#: g10/keygen.c:1245
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1263
+#: g10/keygen.c:1253
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1268
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1282
+#: g10/keygen.c:1272
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1287
+#: g10/keygen.c:1277
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1290
+#: g10/keygen.c:1280
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) Klucz dla algorytmu ElGamala (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1293
+#: g10/keygen.c:1283
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1296
+#: g10/keygen.c:1286
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1340
 msgid "Please select what kind of key you want:\n"
 msgstr "Prosz� wybra� rodzaj klucza:\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1342
 #, 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:1353
+#: g10/keygen.c:1343
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (tylko do podpisywania)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1345
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1357
+#: g10/keygen.c:1347
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Klucz dla algorytmu ElGamala (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1348
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (tylko do podpisywania)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1350
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1362
+#: g10/keygen.c:1352
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1431 g10/keygen.c:2509
+#: g10/keygen.c:1421 g10/keygen.c:2506
 #, 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:1441
+#: g10/keygen.c:1431
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1438
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Jakiej d�ugo�ci klucz wygenerowa�? (1024) "
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1452
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1468
+#: g10/keygen.c:1458
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "��dana d�ugo�� klucza to %u bit�w.\n"
 
-#: g10/keygen.c:1473 g10/keygen.c:1478
+#: g10/keygen.c:1463 g10/keygen.c:1468
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokr�glono do %u bit�w\n"
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1515
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3682,7 +3777,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:1539
+#: g10/keygen.c:1526
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3698,39 +3793,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:1561
+#: g10/keygen.c:1549
 msgid "Key is valid for? (0) "
 msgstr "Okres wa�no�ci klucza ? (0) "
 
-#: g10/keygen.c:1563
-msgid "Signature is valid for? (0) "
+#: g10/keygen.c:1554
+#, fuzzy, c-format
+msgid "Signature is valid for? (%s) "
 msgstr "Okres wa�no�ci podpisu? (0) "
 
-#: g10/keygen.c:1568
+#: g10/keygen.c:1572
 msgid "invalid value\n"
 msgstr "niepoprawna warto��\n"
 
-#: g10/keygen.c:1575
+#: g10/keygen.c:1579
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s nie ma daty wa�no�ci\n"
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1580
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s nie ma daty wa�no�ci\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1585
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s traci wa�no��: %s\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1586
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Wa�no�� podpisu wygasa %s.\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1592
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3738,12 +3834,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:1595
+#: g10/keygen.c:1597
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Czy wszystko si� zgadza (t/n)? "
 
-#: g10/keygen.c:1638
+#: g10/keygen.c:1641
 #, fuzzy
 msgid ""
 "\n"
@@ -3760,44 +3856,44 @@ msgstr ""
 "    \"Tadeusz �ele�ski (Boy) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1651
+#: g10/keygen.c:1654
 msgid "Real name: "
 msgstr "Imi� i nazwisko: "
 
-#: g10/keygen.c:1659
+#: g10/keygen.c:1662
 msgid "Invalid character in name\n"
 msgstr "Niew�a�ciwy znak w imieniu lub nazwisku\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1664
 msgid "Name may not start with a digit\n"
 msgstr "Imi� lub nazwisko nie mo�e zaczyna� si� od cyfry\n"
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1666
 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:1671
+#: g10/keygen.c:1674
 msgid "Email address: "
 msgstr "Adres poczty elektronicznej: "
 
-#: g10/keygen.c:1682
+#: g10/keygen.c:1685
 msgid "Not a valid email address\n"
 msgstr "To nie jest poprawny adres poczty elektronicznej\n"
 
-#: g10/keygen.c:1690
+#: g10/keygen.c:1693
 msgid "Comment: "
 msgstr "Komentarz: "
 
-#: g10/keygen.c:1696
+#: g10/keygen.c:1699
 msgid "Invalid character in comment\n"
 msgstr "Niew�a�ciwy znak w komentarzu\n"
 
-#: g10/keygen.c:1719
+#: g10/keygen.c:1722
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "U�ywasz zestawu znak�w %s.\n"
 
-#: g10/keygen.c:1725
+#: g10/keygen.c:1728
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3808,7 +3904,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1733
 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"
@@ -3825,37 +3921,37 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1746
+#: g10/keygen.c:1749
 msgid "NnCcEeOoQq"
 msgstr "IiKkEeDdWw"
 
-#: g10/keygen.c:1756
+#: g10/keygen.c:1759
 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:1757
+#: g10/keygen.c:1760
 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:1776
+#: g10/keygen.c:1779
 msgid "Please correct the error first\n"
 msgstr "Najpierw trzeba poprawi� ten b��d\n"
 
-#: g10/keygen.c:1816
+#: g10/keygen.c:1819
 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:1826 g10/passphrase.c:1105
+#: g10/keygen.c:1829 g10/passphrase.c:786
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1832
+#: g10/keygen.c:1835
 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"
@@ -3867,7 +3963,7 @@ msgstr ""
 "\"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1857
 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"
@@ -3883,50 +3979,50 @@ msgstr ""
 "ilo�ci\n"
 "entropii.\n"
 
-#: g10/keygen.c:2578
+#: g10/keygen.c:2575
 msgid "Key generation canceled.\n"
 msgstr "Procedura generacji klucza zosta�a anulowana.\n"
 
-#: g10/keygen.c:2766 g10/keygen.c:2910
+#: g10/keygen.c:2774 g10/keygen.c:2918
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisuj� klucz publiczny w '%s'\n"
 
-#: g10/keygen.c:2768 g10/keygen.c:2913
+#: g10/keygen.c:2776 g10/keygen.c:2921
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/keygen.c:2771 g10/keygen.c:2916
+#: g10/keygen.c:2779 g10/keygen.c:2924
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2907
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy publicznych: %s\n"
 
-#: g10/keygen.c:2905
+#: g10/keygen.c:2913
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy tajnych: %s\n"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2931
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy publicznych ,,%s'': %s\n"
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2938
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
 
-#: g10/keygen.c:2953
+#: g10/keygen.c:2961
 msgid "public and secret key created and signed.\n"
 msgstr "klucz publiczny i prywatny (tajny) zosta�y utworzone i podpisane.\n"
 
-#: g10/keygen.c:2964
+#: g10/keygen.c:2972
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -3935,12 +4031,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:2976 g10/keygen.c:3105 g10/keygen.c:3220
+#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generacja klucza nie powiod�a si�: %s\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3156 g10/sign.c:290
+#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -3948,7 +4044,7 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:3030 g10/keygen.c:3158 g10/sign.c:292
+#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -3956,370 +4052,351 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:3039 g10/keygen.c:3169
+#: g10/keygen.c:3047 g10/keygen.c:3177
 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:3078 g10/keygen.c:3202
+#: g10/keygen.c:3086 g10/keygen.c:3210
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Czy na pewno utworzy�? "
 
-#: g10/keygen.c:3355
+#: g10/keygen.c:3363
 #, 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:3402
+#: g10/keygen.c:3410
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nie mo�na utworzy� ,,%s'': %s\n"
 
-#: g10/keygen.c:3428
+#: g10/keygen.c:3436
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "UWAGA: wa�no�� klucza tajnego %08lX wygas�a %s\n"
 
-#: g10/keygen.c:3508
-#, c-format
-msgid "length of RSA modulus is not %d\n"
-msgstr ""
-
-#: g10/keygen.c:3514
-msgid "public exponent too large (more than 32 bits)\n"
-msgstr ""
-
-#: g10/keygen.c:3520 g10/keygen.c:3526
-#, c-format
-msgid "length of an RSA prime is not %d\n"
-msgstr ""
-
-#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
+#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
 msgid "never     "
 msgstr "nigdy     "
 
-#: g10/keylist.c:264
+#: g10/keylist.c:265
 msgid "Critical signature policy: "
 msgstr "Krytyczny regulamin podpisu: "
 
-#: g10/keylist.c:266
+#: g10/keylist.c:267
 msgid "Signature policy: "
 msgstr "Regulamin podpisu: "
 
-#: g10/keylist.c:305
+#: g10/keylist.c:306
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:354 g10/keylist.c:398
+#: 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:372
+#: g10/keylist.c:373
 msgid "Critical signature notation: "
 msgstr "Krytyczne adnotacje podpisu: "
 
-#: g10/keylist.c:374
+#: g10/keylist.c:375
 msgid "Signature notation: "
 msgstr "Adnotacje podpisu: "
 
-#: g10/keylist.c:385
+#: g10/keylist.c:386
 msgid "not human readable"
 msgstr "nieczytelne dla cz�owieka"
 
-#: g10/keylist.c:486
+#: g10/keylist.c:487
 msgid "Keyring"
 msgstr "Zbi�r kluczy"
 
-#: g10/keylist.c:792
+#: g10/keylist.c:793
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr " [wygasa :%s]"
 
-#: g10/keylist.c:1488
+#: g10/keylist.c:1489
 msgid "Primary key fingerprint:"
 msgstr "Odcisk klucza g��wnego:"
 
-#: g10/keylist.c:1490
+#: g10/keylist.c:1491
 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:1497
+#: g10/keylist.c:1498
 msgid " Primary key fingerprint:"
 msgstr " Odcisk klucza g��wnego:"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1500
 msgid "      Subkey fingerprint:"
 msgstr "       Odcisk podklucza:"
 
-#: g10/keylist.c:1503 g10/keylist.c:1507
+#: g10/keylist.c:1504 g10/keylist.c:1508
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Odcisk klucza ="
 
-#: g10/keylist.c:1574
+#: g10/keylist.c:1575
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1245
+#: g10/keyring.c:1246
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1252
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "OSTRZE�ENIE: Istniej� dwa pliki z poufnymi informacjami.\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s pozosta� bez zmian\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1255
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s zosta� utworzony\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1256
 msgid "Please fix this possible security flaw\n"
 msgstr "Prosz� usun�� to naruszenie zasad bezpiecze�stwa\n"
 
-#: g10/keyring.c:1375
+#: g10/keyring.c:1376
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "sprawdzanie zbioru kluczy ,,%s''\n"
 
-#: g10/keyring.c:1421
+#: g10/keyring.c:1422
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu kluczy (%lu podpis�w)\n"
 
-#: g10/keyring.c:1433
+#: g10/keyring.c:1434
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu kluczy (%lu podpis�w)\n"
 
-#: g10/keyring.c:1504
+#: g10/keyring.c:1505
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: zbi�r kluczy utworzony\n"
 
-#: g10/keyserver.c:107
+#: g10/keyserver.c:105
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "OSTRZE�ENIE: opcje w ,,%s'' nie s� jeszcze uwzgl�dnione.\n"
 
-#: g10/keyserver.c:434
+#: g10/keyserver.c:433
 #, fuzzy
 msgid "disabled"
 msgstr "wy�kl"
 
-#: g10/keyserver.c:635
+#: g10/keyserver.c:634
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:718 g10/keyserver.c:1238
+#: g10/keyserver.c:717 g10/keyserver.c:1267
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/keyserver.c:808
+#: g10/keyserver.c:815
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
 
-#: g10/keyserver.c:810
+#: g10/keyserver.c:817
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
 
-#: g10/keyserver.c:985
+#: g10/keyserver.c:1014
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "zapytanie o klucz %08lX w %s\n"
 
-#: g10/keyserver.c:989
+#: g10/keyserver.c:1018
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "zapytanie o klucz %08lX w %s\n"
 
-#: g10/keyserver.c:1141
+#: g10/keyserver.c:1170
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "podpisano Twoim kluczem %08lX w %s\n"
 
-#: g10/keyserver.c:1188
+#: g10/keyserver.c:1217
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
 
-#: g10/keyserver.c:1191
+#: g10/keyserver.c:1220
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
 
-#: g10/keyserver.c:1198 g10/keyserver.c:1293
+#: g10/keyserver.c:1227 g10/keyserver.c:1322
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1275
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1255
+#: g10/keyserver.c:1284
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1314
+#: g10/keyserver.c:1343
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "brak znanyk serwer�w kluczy (u�yj opcji --keyserver)\n"
 
-#: g10/keyserver.c:1320
+#: g10/keyserver.c:1349
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1361
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1366
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1374
 #, c-format
-msgid "gpgkeys_%s does not support handler version %d\n"
+msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1351
+#: g10/keyserver.c:1381
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "b��d serwera kluczy"
 
-#: g10/keyserver.c:1356
+#: g10/keyserver.c:1386
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "b��d serwera kluczy"
 
-#: g10/keyserver.c:1365
+#: g10/keyserver.c:1395
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
 
-#: g10/keyserver.c:1390 g10/keyserver.c:1424
+#: g10/keyserver.c:1420 g10/keyserver.c:1454
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: nie jest poprawnym identyfikatorem klucza\n"
 
-#: g10/keyserver.c:1681
+#: g10/keyserver.c:1711
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "OSTRZE�ENIE: nie mo�na skasowa� pliku tymczasowego (%s) ,,%s'': %s.\n"
 
-#: g10/keyserver.c:1703
+#: g10/keyserver.c:1733
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "zapytanie o klucz %08lX w %s\n"
 
-#: g10/keyserver.c:1705
+#: g10/keyserver.c:1735
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "zapytanie o klucz %08lX w %s\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:249
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "%d - dziwny rozmiar jak na zaszyfrowany klucz sesyjny\n"
 
-#: g10/mainproc.c:262
-#, c-format
-msgid "bad passphrase or unknown cipher algorithm (%d)\n"
-msgstr "niepoprawne has�o, lub nieznany algorytm szyfruj�cy (%d)\n"
-
-#: g10/mainproc.c:299
+#: g10/mainproc.c:300
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "klucz sesyjny zaszyfrowany %s\n"
 
-#: g10/mainproc.c:309
+#: g10/mainproc.c:310
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "dane zaszyfrowano nieznanym algorytmem numer %d\n"
 
-#: g10/mainproc.c:375
+#: g10/mainproc.c:376
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "klucz publiczny %08lX\n"
 
-#: g10/mainproc.c:430
+#: g10/mainproc.c:431
 msgid "public key encrypted data: good DEK\n"
 msgstr "dane zaszyfrowane kluczem publicznym: poprawny klucz sesyjny\n"
 
-#: g10/mainproc.c:463
+#: g10/mainproc.c:464
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "zaszyfrowano %u-bitowym kluczem %s, numer %08lX, stworzonym %s\n"
 
-#: g10/mainproc.c:467 g10/pkclist.c:218
+#: g10/mainproc.c:468 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                        alias \""
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:472
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "zaszyfrowano kluczem %s, o numerze %08lX\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "b��d odszyfrowywania kluczem publicznym: %s\n"
 
-#: g10/mainproc.c:499
+#: g10/mainproc.c:500
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "zaszyfrowane za pomoc� %lu hase�\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:502
 msgid "encrypted with 1 passphrase\n"
 msgstr "zaszyfrowane jednym has�em\n"
 
-#: g10/mainproc.c:529 g10/mainproc.c:551
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "przyjmuj�c �e dane zosta�y zaszyfrowane za pomoc� %s\n"
 
-#: g10/mainproc.c:537
+#: g10/mainproc.c:538
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "szyfr IDEA nie jest dost�pny, pr�ba u�ycia %s zamiast\n"
 
-#: g10/mainproc.c:569
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr "odszyfrowanie poprawne\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:574
 msgid "WARNING: message was not integrity protected\n"
 msgstr "OSTRZE�ENIE: wiadomo�� nie by�a zabezpieczona przed manipulacj�\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "OSTRZE�ENIE: zaszyfrowana wiadomo�� by�a manipulowana!\n"
 
-#: g10/mainproc.c:592
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "b��d odszyfrowywania: %s\n"
@@ -4333,303 +4410,292 @@ 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:786
+#: g10/mainproc.c:803
 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:1290
+#: g10/mainproc.c:1307
 msgid "signature verification suppressed\n"
 msgstr "wymuszono pomini�cie sprawdzenia podpisu\n"
 
-#: g10/mainproc.c:1332 g10/mainproc.c:1342
+#: g10/mainproc.c:1349 g10/mainproc.c:1359
 msgid "can't handle these multiple signatures\n"
 msgstr "nie mo�na obs�uzy� tych wielokrotnych podpis�w\n"
 
-#: g10/mainproc.c:1352
+#: g10/mainproc.c:1369
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Wa�no�� podpisu wygas�a %s.\n"
 
-#: g10/mainproc.c:1353
+#: g10/mainproc.c:1370
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                        alias \""
 
-#: g10/mainproc.c:1357
+#: g10/mainproc.c:1374
 #, 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:1377
+#: g10/mainproc.c:1394
 msgid "Key available at: "
 msgstr "Klucz dost�pny w: "
 
-#: g10/mainproc.c:1482 g10/mainproc.c:1530
+#: g10/mainproc.c:1499 g10/mainproc.c:1547
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "NIEPOPRAWNY podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1484 g10/mainproc.c:1532
+#: g10/mainproc.c:1501 g10/mainproc.c:1549
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Przeterminowany podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1486 g10/mainproc.c:1534
+#: g10/mainproc.c:1503 g10/mainproc.c:1551
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Poprawny podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1538
+#: g10/mainproc.c:1555
 msgid "[uncertain]"
 msgstr "[niepewne]"
 
-#: g10/mainproc.c:1570
+#: g10/mainproc.c:1587
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                        alias \""
 
-#: g10/mainproc.c:1664
+#: g10/mainproc.c:1681
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Wa�no�� podpisu wygas�a %s.\n"
 
-#: g10/mainproc.c:1669
+#: g10/mainproc.c:1686
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Wa�no�� podpisu wygasa %s.\n"
 
-#: g10/mainproc.c:1672
+#: g10/mainproc.c:1689
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "podpis %s, skr�t %s\n"
 
-#: g10/mainproc.c:1673
+#: g10/mainproc.c:1690
 msgid "binary"
 msgstr "binarny"
 
-#: g10/mainproc.c:1674
+#: g10/mainproc.c:1691
 msgid "textmode"
 msgstr "tekstowy"
 
-#: g10/mainproc.c:1674 g10/trustdb.c:530
+#: g10/mainproc.c:1691 g10/trustdb.c:531
 msgid "unknown"
 msgstr "nieznany"
 
-#: g10/mainproc.c:1694
+#: g10/mainproc.c:1711
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nie mo�na sprawdzi� podpisu: %s\n"
 
-#: g10/mainproc.c:1762 g10/mainproc.c:1778 g10/mainproc.c:1864
+#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
 msgid "not a detached signature\n"
 msgstr "nie jest oddzielonym podpisem.\n"
 
-#: g10/mainproc.c:1805
+#: g10/mainproc.c:1822
 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:1813
+#: g10/mainproc.c:1830
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "oddzielony podpis klasy 0x%02x.\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1887
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starego typu (PGP 2.x).\n"
 
-#: g10/mainproc.c:1880
+#: g10/mainproc.c:1897
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n"
 
-#: g10/misc.c:121
+#: g10/misc.c:122
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "nie mo�na wy��czy� zrzut�w pami�ci: %s\n"
 
-#: g10/misc.c:141 g10/misc.c:169 g10/misc.c:241
+#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "naniesienie poprawek bazy zaufania nie powiod�o si�: %s\n"
 
-#: g10/misc.c:206
+#: g10/misc.c:207
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "baza zaufania: funkcja read() (n=%d) zawiod�a: %s\n"
 
-#: g10/misc.c:315
+#: g10/misc.c:316
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "nie mo�na obs�u�y� tego algorytmu klucza publicznego: %d\n"
 
-#: g10/misc.c:330
+#: g10/misc.c:331
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algorytm szyfruj�cy nie jest zaimplementowany"
 
-#: g10/misc.c:345
+#: g10/misc.c:346
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "podpis %s, skr�t %s\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:351
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "wymuszone u�ycie skr�tu %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/misc.c:446
+#: g10/misc.c:447
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "modu� szyfru IDEA nie jest dost�pny\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:448
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr "wi�cej informacji jest tutaj: http://www.gnupg.org/why-not-idea.html\n"
 
-#: g10/misc.c:680
+#: g10/misc.c:681
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d jest przestarza�� opcj� ,,%s''\n"
 
-#: g10/misc.c:684
+#: g10/misc.c:685
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "OSTRZE�ENIE: ,,%s'' jest przestarza�� opcj�.\n"
 
-#: g10/misc.c:686
+#: g10/misc.c:687
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "w jej miejsce nale�y u�y� ,,%s%s''\"\n"
 
-#: g10/misc.c:697
+#: g10/misc.c:694
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
+msgstr "OSTRZE�ENIE: ,,%s'' jest przestarza�� opcj�.\n"
+
+#: g10/misc.c:707
 msgid "Uncompressed"
 msgstr "Nieskompresowany"
 
-#: g10/misc.c:722
+#: g10/misc.c:732
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Nieskompresowany"
 
-#: g10/misc.c:832
+#: g10/misc.c:842
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "ta wiadomo�� mo�e nie da� si� odczyta� za pomoc� %s\n"
 
-#: g10/misc.c:989
+#: g10/misc.c:999
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
 
-#: g10/misc.c:1014
+#: g10/misc.c:1024
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "nieznany domy�lny adresat ,,%s''\n"
 
-#: g10/openfile.c:84
+#: g10/openfile.c:86
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Plik ,,%s'' ju� istnieje. "
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Nadpisa� (t/N)? "
 
-#: g10/openfile.c:119
+#: g10/openfile.c:121
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: nieznana ko�c�wka nazwy\n"
 
-#: g10/openfile.c:141
+#: g10/openfile.c:143
 msgid "Enter new filename"
 msgstr "Nazwa pliku"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:188
 msgid "writing to stdout\n"
 msgstr "zapisywanie na wyj�cie standardowe\n"
 
-#: g10/openfile.c:296
+#: g10/openfile.c:300
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "przyj�to obecno�� podpisanych danych w '%s'\n"
 
-#: g10/openfile.c:375
+#: g10/openfile.c:379
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "nowy plik ustawie� ,,%s'' zosta� utworzony\n"
 
-#: g10/openfile.c:377
+#: g10/openfile.c:381
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "OSTRZE�ENIE: opcje w ,,%s'' nie s� jeszcze uwzgl�dnione.\n"
 
-#: g10/openfile.c:409
+#: g10/openfile.c:413
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: katalog utworzony\n"
 
-#: g10/parse-packet.c:137
+#: g10/parse-packet.c:138
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "nie mo�na obs�u�y� tego algorytmu klucza publicznego: %d\n"
 
-#: g10/parse-packet.c:707
+#: g10/parse-packet.c:708
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "OSTRZE�ENIE: symetrycznie zaszyfrowany klucz sesyjny mo�e nie by� "
 "bezpieczny\n"
 
-#: g10/parse-packet.c:1132
+#: g10/parse-packet.c:1145
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
 
-#: g10/passphrase.c:478 g10/passphrase.c:525
+#: g10/passphrase.c:305
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nie jest dost�pny w tej sesji\n"
 
-#: g10/passphrase.c:486
-msgid "can't set client pid for the agent\n"
-msgstr "nie mo�na ustawi� numeru procesu klienckiego agenta\n"
-
-#: g10/passphrase.c:494
-msgid "can't get server read FD for the agent\n"
-msgstr "serwer nie chce czyta� deskryptora dla agenta\n"
-
-#: g10/passphrase.c:501
-msgid "can't get server write FD for the agent\n"
-msgstr "serwer nie chce pisa� deskryptora dla agenta\n"
-
-#: g10/passphrase.c:534
+#: g10/passphrase.c:317
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "z�y format zmiennej �rodowiskowej GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:547
+#: g10/passphrase.c:332
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "wersja %d protoko�u agenta nie jest obs�ugiwana\n"
 
-#: g10/passphrase.c:568
+#: g10/passphrase.c:345
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nie mo�na si� po��czy� z ,,%s'': %s\n"
 
-#: g10/passphrase.c:590
-msgid "communication problem with gpg-agent\n"
-msgstr "problem z porozumiewaniem si� z agentem\n"
-
-#: g10/passphrase.c:597 g10/passphrase.c:937 g10/passphrase.c:1049
+#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problem z agentem - zostaje wy��czony\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1209
+#: g10/passphrase.c:511 g10/passphrase.c:890
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (podklucz %08lX)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:525
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4640,41 +4706,28 @@ msgstr ""
 "\"%.*s\".\n"
 "Klucz o d�ugo�ci %u bit�w, typ %s, numer %08lX, stworzony %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:550
 msgid "Repeat passphrase\n"
 msgstr "Powt�rzone has�o\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:552
 msgid "Enter passphrase\n"
 msgstr "Has�o\n"
 
-#: g10/passphrase.c:781
-msgid "passphrase too long\n"
-msgstr "has�o zbyt d�ugie\n"
-
-#: g10/passphrase.c:794
-msgid "invalid response from agent\n"
-msgstr "b��dna odpowied� agenta\n"
-
-#: g10/passphrase.c:810 g10/passphrase.c:931
+#: g10/passphrase.c:628
 msgid "cancelled by user\n"
 msgstr "anulowano przez u�ytkownika\n"
 
-#: g10/passphrase.c:815 g10/passphrase.c:1020
-#, c-format
-msgid "problem with the agent: agent returns 0x%lx\n"
-msgstr "problem agenta: zwr�ci� 0x%lx\n"
-
-#: g10/passphrase.c:1100 g10/passphrase.c:1263
+#: g10/passphrase.c:781 g10/passphrase.c:944
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "pytanie o has�o nie dzia�a w trybie wsadowym\n"
 
-#: g10/passphrase.c:1107 g10/passphrase.c:1268
+#: g10/passphrase.c:788 g10/passphrase.c:949
 msgid "Enter passphrase: "
 msgstr "Podaj has�o: "
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:871
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4684,21 +4737,21 @@ msgstr ""
 "Musisz poda� has�o aby odbezpieczy� klucz prywatny u�ytkownika:\n"
 "\""
 
-#: g10/passphrase.c:1196
+#: g10/passphrase.c:877
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "d�ugo�� %u bit�w, typ %s, numer %08lX, stworzony %s"
 
-#: g10/passphrase.c:1205
+#: g10/passphrase.c:886
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1272
+#: g10/passphrase.c:953
 msgid "Repeat passphrase: "
 msgstr "Powt�rz has�o: "
 
-#: g10/photoid.c:66
+#: g10/photoid.c:67
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4712,158 +4765,158 @@ msgstr ""
 "publicznym. Je�li b�dzie du�y, powi�kszy to tak�e rozmiar Twojego klucza!\n"
 "Dobry rozmiar to oko�o 240 na 288 pikseli.\n"
 
-#: g10/photoid.c:80
+#: g10/photoid.c:81
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Nazwa pliku ze zdj�ciem w formacie JPEG: "
 
-#: g10/photoid.c:94
+#: g10/photoid.c:95
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "nie mo�na otworzy� pliku: %s\n"
 
-#: g10/photoid.c:102
+#: g10/photoid.c:103
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:104
+#: g10/photoid.c:105
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Czy na pewno chcesz tego u�y�? (t/N) "
 
-#: g10/photoid.c:119
+#: g10/photoid.c:120
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr ",,%s'' nie jest plikiem JPEG\n"
 
-#: g10/photoid.c:136
+#: g10/photoid.c:137
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Czy zdj�cie jest w porz�dku? (t/N/w) "
 
-#: g10/photoid.c:338
+#: g10/photoid.c:339
 msgid "unable to display photo ID!\n"
 msgstr "nie mo�na wy�wietli� zdj�cia!\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:580
+#: g10/pkclist.c:62 g10/revoke.c:581
 msgid "No reason specified"
 msgstr "nie podano przyczyny"
 
-#: g10/pkclist.c:63 g10/revoke.c:582
+#: g10/pkclist.c:64 g10/revoke.c:583
 msgid "Key is superseded"
 msgstr "klucz zosta� zast�piony"
 
-#: g10/pkclist.c:65 g10/revoke.c:581
+#: g10/pkclist.c:66 g10/revoke.c:582
 msgid "Key has been compromised"
 msgstr "klucz zosta� skompromitowany"
 
-#: g10/pkclist.c:67 g10/revoke.c:583
+#: g10/pkclist.c:68 g10/revoke.c:584
 msgid "Key is no longer used"
 msgstr "klucz nie jest ju� u�ywany"
 
-#: g10/pkclist.c:69 g10/revoke.c:584
+#: g10/pkclist.c:70 g10/revoke.c:585
 msgid "User ID is no longer valid"
 msgstr "identyfikator u�ytkownika przesta� by� poprawny"
 
-#: g10/pkclist.c:73
+#: g10/pkclist.c:74
 msgid "reason for revocation: "
 msgstr "pow�d uniewa�nienia: "
 
-#: g10/pkclist.c:90
+#: g10/pkclist.c:91
 msgid "revocation comment: "
 msgstr "komentarz do uniewa�nienia: "
 
-#: g10/pkclist.c:205
+#: g10/pkclist.c:206
 msgid "iImMqQsS"
 msgstr "iImMwWpP"
 
-#: g10/pkclist.c:213
+#: g10/pkclist.c:214
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "Brak warto�ci zaufania dla:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:245
+#: g10/pkclist.c:246
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "                        alias \""
 
-#: g10/pkclist.c:255
+#: g10/pkclist.c:256
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Ten klucz prawdopodobnie nale�y do tej osoby.\n"
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:271
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = nie wiem\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = NIE ufam mu\n"
 
-#: g10/pkclist.c:278
+#: g10/pkclist.c:279
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = ufam absolutnie\n"
 
-#: g10/pkclist.c:284
+#: g10/pkclist.c:285
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = powr�t do g��wnego menu\n"
 
-#: g10/pkclist.c:287
+#: g10/pkclist.c:288
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " p = pomini�cie klucza\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " w = wyj�cie\n"
 
-#: g10/pkclist.c:292
+#: g10/pkclist.c:293
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:298 g10/revoke.c:609
+#: g10/pkclist.c:299 g10/revoke.c:610
 msgid "Your decision? "
 msgstr "Twoja decyzja? "
 
-#: g10/pkclist.c:319
+#: g10/pkclist.c:320
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Czy na pewno chcesz przypisa� absolutne zaufanie temu kluczowi? "
 
-#: g10/pkclist.c:333
+#: g10/pkclist.c:334
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certyfikaty prowadz�ce do ostatecznie zaufanego klucza:\n"
 
-#: g10/pkclist.c:418
+#: g10/pkclist.c:419
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr "%08lX: Nie ma pewno�ci co do to�samo�ci w�a�ciciela klucza.\n"
 
-#: g10/pkclist.c:423
+#: g10/pkclist.c:424
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr "%08lX: Nie ma pewno�ci co do to�samo�ci w�a�ciciela klucza.\n"
 
-#: g10/pkclist.c:429
+#: g10/pkclist.c:430
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Ten klucz prawdopodobnie nale�y do tej osoby.\n"
 
-#: g10/pkclist.c:434
+#: g10/pkclist.c:435
 msgid "This key belongs to us\n"
 msgstr "Ten klucz nale�y do nas\n"
 
-#: g10/pkclist.c:460
+#: g10/pkclist.c:461
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -4875,95 +4928,95 @@ msgstr ""
 "mo�esz odpowiedzie� ,,tak'' na nast�pne pytanie.\n"
 "\n"
 
-#: g10/pkclist.c:467
+#: g10/pkclist.c:468
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "U�y� tego klucza pomimo to? "
 
-#: g10/pkclist.c:501
+#: g10/pkclist.c:502
 msgid "WARNING: Using untrusted key!\n"
 msgstr "OSTRZE�ENIE: u�ywany jest klucz nie obdarzony zaufaniem!\n"
 
-#: g10/pkclist.c:508
+#: g10/pkclist.c:509
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "OSTRZE�ENIE: klucz %08lX m�g� zosta� uniewa�niony\n"
 "             (brak klucza uniewa�niaj�cego aby to sprawdzi�)\n"
 
-#: g10/pkclist.c:517
+#: g10/pkclist.c:518
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "OSTRZE�ENIE: Ten klucz zosta� uniewa�niony kluczem uniewa�niaj�cym!\n"
 
-#: g10/pkclist.c:520
+#: g10/pkclist.c:521
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "OSTRZE�ENIE: Ten klucz zosta� uniewa�niony przez w�a�ciciela!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "             To mo�e oznacza� �e podpis jest fa�szerstwem.\n"
 
-#: g10/pkclist.c:527
+#: g10/pkclist.c:528
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "OSTRZE�ENIE: Ten podklucz zosta� uniewa�niony przez w�a�ciciela!\n"
 
-#: g10/pkclist.c:532
+#: g10/pkclist.c:533
 msgid "Note: This key has been disabled.\n"
 msgstr "Uwaga: Ten klucz zosta� wy��czony z u�ytku\n"
 
-#: g10/pkclist.c:537
+#: g10/pkclist.c:538
 msgid "Note: This key has expired!\n"
 msgstr "Uwaga: Data wa�no�ci tego klucza up�yn�a!\n"
 
-#: g10/pkclist.c:548
+#: g10/pkclist.c:549
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "OSTRZE�ENIE: Ten klucz nie jest po�wiadczony zaufanym podpisem!\n"
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:551
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "             Nie ma pewno�ci co do to�samo�ci osoby kt�ra z�o�y�a podpis.\n"
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:559
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "OSTRZE�ENIE: NIE UFAMY temu kluczowi!\n"
 
-#: g10/pkclist.c:559
+#: g10/pkclist.c:560
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "             Ten podpis prawdopodobnie jest FA�SZYWY.\n"
 
-#: g10/pkclist.c:567
+#: g10/pkclist.c:568
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "OSTRZE�ENIE: Tego klucza nie po�wiadczaj� wystarczaj�co zaufane podpisy!\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:570
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 "             Nie ma pewno�ci co do to�samo�ci osoby kt�ra z�o�y�a ten "
 "podpis.\n"
 
-#: g10/pkclist.c:734 g10/pkclist.c:767 g10/pkclist.c:936 g10/pkclist.c:996
+#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: pomini�ty: %s\n"
 
-#: g10/pkclist.c:744 g10/pkclist.c:968
+#: g10/pkclist.c:745 g10/pkclist.c:969
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: pomini�ty: zosta� ju� wybrany w innej opcji\n"
 
-#: g10/pkclist.c:786
+#: g10/pkclist.c:787
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Nie zosta� podany identyfikatora u�ytkownika (np za pomoc� ,,-r'')\n"
 
-#: g10/pkclist.c:802
+#: g10/pkclist.c:803
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:828
+#: g10/pkclist.c:829
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -4971,169 +5024,169 @@ msgstr ""
 "\n"
 "Identyfikator u�ytkownika (pusta linia oznacza koniec): "
 
-#: g10/pkclist.c:844
+#: g10/pkclist.c:845
 msgid "No such user ID.\n"
 msgstr "Brak takiego identyfikatora u�ytkownika.\n"
 
-#: g10/pkclist.c:849 g10/pkclist.c:911
+#: g10/pkclist.c:850 g10/pkclist.c:912
 msgid "skipped: public key already set as default recipient\n"
 msgstr "pomini�ty: klucz publiczny ju� jest domy�lnym adresatem\n"
 
-#: g10/pkclist.c:867
+#: g10/pkclist.c:868
 msgid "Public key is disabled.\n"
 msgstr "Klucz publiczny wy��czony z u�ycia.\n"
 
-#: g10/pkclist.c:874
+#: g10/pkclist.c:875
 msgid "skipped: public key already set\n"
 msgstr "pomini�ty: zosta� ju� wybrany w innej opcji\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:904
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "nieznany domy�lny adresat ,,%s''\n"
 
-#: g10/pkclist.c:948
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: pomini�ty: klucz publiczny wy��czony z u�ytku\n"
 
-#: g10/pkclist.c:1003
+#: g10/pkclist.c:1004
 msgid "no valid addressees\n"
 msgstr "brak poprawnych adresat�w\n"
 
-#: g10/plaintext.c:90
+#: g10/plaintext.c:91
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "dane nie zosta�y zapisane; aby to zrobi�, nale�y u�y� opcji \"--output\"\n"
 
-#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
+#: g10/plaintext.c:136 g10/plaintext.c:141 g10/plaintext.c:159
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "b��d tworzenia `%s': %s\n"
 
-#: g10/plaintext.c:446
+#: g10/plaintext.c:447
 msgid "Detached signature.\n"
 msgstr "Podpis oddzielony od danych.\n"
 
-#: g10/plaintext.c:450
+#: g10/plaintext.c:452
 msgid "Please enter name of data file: "
 msgstr "Nazwa pliku danych: "
 
-#: g10/plaintext.c:478
+#: g10/plaintext.c:481
 msgid "reading stdin ...\n"
 msgstr "czytam strumie� standardowego wej�cia\n"
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:515
 msgid "no signed data\n"
 msgstr "brak podpisanych danych\n"
 
-#: g10/plaintext.c:526
+#: g10/plaintext.c:529
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nie mo�na otworzy� podpisanego pliku ,,%s''\n"
 
-#: g10/pubkey-enc.c:103
+#: g10/pubkey-enc.c:104
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "adresat anonimowy; sprawdzanie %08lX ...\n"
 
-#: g10/pubkey-enc.c:119
+#: g10/pubkey-enc.c:120
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "OK, to my jeste�my adresatem anonimowym.\n"
 
-#: g10/pubkey-enc.c:207
+#: g10/pubkey-enc.c:208
 msgid "old encoding of the DEK is not supported\n"
 msgstr "stary, nie obs�ugiwany algorytm szyfrowania klucza sesyjnego\n"
 
-#: g10/pubkey-enc.c:228
+#: g10/pubkey-enc.c:229
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "algorytm szyfruj�cy %d%s jest nieznany, lub zosta� wy��czony\n"
 
-#: g10/pubkey-enc.c:266
+#: g10/pubkey-enc.c:267
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "UWAGA: brak algorytmu szyfruj�cego %d w ustawieniach\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:287
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "UWAGA: wa�no�� klucza tajnego %08lX wygas�a %s\n"
 
-#: g10/pubkey-enc.c:292
+#: g10/pubkey-enc.c:293
 msgid "NOTE: key has been revoked"
 msgstr "UWAGA: klucz zosta� uniewa�niony"
 
-#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:545
+#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
+#: g10/revoke.c:188 g10/revoke.c:546
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "wywo�anie funkcji build_packet nie powiod�o si�: %s\n"
 
-#: g10/revoke.c:146
+#: g10/revoke.c:147
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "klucz %08lX: brak identyfikatora u�ytkownika\n"
 
-#: g10/revoke.c:272
+#: g10/revoke.c:273
 msgid "To be revoked by:\n"
 msgstr "Zostanie uniewa�niony przez:\n"
 
-#: g10/revoke.c:276
+#: g10/revoke.c:277
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(to jest czu�y klucz uniewazniaj�cy)\n"
 
-#: g10/revoke.c:280
+#: g10/revoke.c:281
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Stworzy� certyfikat uniewa�nienia tego klucza? (t/N) "
 
-#: g10/revoke.c:293 g10/revoke.c:511
+#: g10/revoke.c:294 g10/revoke.c:512
 msgid "ASCII armored output forced.\n"
 msgstr "wymuszono opakowanie ASCII wyniku.\n"
 
-#: g10/revoke.c:307 g10/revoke.c:525
+#: g10/revoke.c:308 g10/revoke.c:526
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "wywo�anie funkcji make_keysig_packet nie powiod�o si�: %s\n"
 
-#: g10/revoke.c:370
+#: g10/revoke.c:371
 msgid "Revocation certificate created.\n"
 msgstr "Certyfikat uniewa�nienia zosta� utworzony.\n"
 
-#: g10/revoke.c:376
+#: g10/revoke.c:377
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "brak kluczy uniewa�niaj�cych dla ,,%s''\n"
 
-#: g10/revoke.c:432
+#: g10/revoke.c:433
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "klucz prywatny ,,%s'' nie zosta� odnaleziony: %s\n"
 
-#: g10/revoke.c:461
+#: g10/revoke.c:462
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "brak odpowiadaj�cego klucza publicznego: %s\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:473
 msgid "public key does not match secret key!\n"
 msgstr "klucz publiczny nie pasuje do klucza prywatngeo!\n"
 
-#: g10/revoke.c:479
+#: g10/revoke.c:480
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Stworzy� certyfikat uniewa�nienia tego klucza? (t/N) "
 
-#: g10/revoke.c:496
+#: g10/revoke.c:497
 msgid "unknown protection algorithm\n"
 msgstr "nieznany algorytm ochrony\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 msgid "NOTE: This key is not protected!\n"
 msgstr "UWAGA: Ten klucz nie jest chroniony!\n"
 
-#: g10/revoke.c:551
+#: g10/revoke.c:552
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5157,113 +5210,113 @@ msgstr ""
 "komputer�w mog� zachowa� tre�� wydruku i udost�pni� j� osobom "
 "nieupowa�nionym.\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid "Please select the reason for the revocation:\n"
 msgstr "Prosz� wybra� pow�d uniewa�nienia:\n"
 
-#: g10/revoke.c:602
+#: g10/revoke.c:603
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: g10/revoke.c:604
+#: g10/revoke.c:605
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Prawdopodobnie chcesz tu wybra� %d)\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:646
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Wprowad� opis (nieobowi�zkowy) i zako�cz go pust� lini�:\n"
 
-#: g10/revoke.c:673
+#: g10/revoke.c:674
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Pow�d uniewa�nienia: %s\n"
 
-#: g10/revoke.c:675
+#: g10/revoke.c:676
 msgid "(No description given)\n"
 msgstr "(nie podano)\n"
 
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Informacje poprawne? "
 
-#: g10/seckey-cert.c:54
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "tajne cz�ci klucza s� niedost�pne\n"
 
-#: g10/seckey-cert.c:60
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "algorytm ochrony %d%s nie jest obs�ugiwany\n"
 
-#: g10/seckey-cert.c:71
+#: g10/seckey-cert.c:72
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "algorytm ochrony %d%s nie jest obs�ugiwany\n"
 
-#: g10/seckey-cert.c:265
+#: g10/seckey-cert.c:266
 msgid "Invalid passphrase; please try again"
 msgstr "Niepoprawne has�o; prosz� spr�bowa� ponownie"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:267
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:326
+#: g10/seckey-cert.c:327
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "OSTRZE�ENIE: Wykryto klucz s�aby algorytmu - nale�y ponownie zmieni� has�o.\n"
 
-#: g10/seckey-cert.c:364
+#: g10/seckey-cert.c:365
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "tworzenie przestarza�ej 16-bitowej sumy kontrolnej dla ochrony klucza\n"
 
-#: g10/seskey.c:52
+#: g10/seskey.c:53
 msgid "weak key created - retrying\n"
 msgstr "wygenerowano s�aby klucz - operacja zostaje powt�rzona\n"
 
-#: g10/seskey.c:57
+#: g10/seskey.c:58
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "brak mo�liwo�ci generacji dobrego klucza dla szyfru symetrycznego;\n"
 "operacja by�a powtarzana %d razy!\n"
 
-#: g10/seskey.c:213
+#: g10/seskey.c:214
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr ""
 "Algorytm DSA wymaga u�ycia algorytmu skr�tu daj�cego 160-bitowy wynik.\n"
 
-#: g10/sig-check.c:75
+#: g10/sig-check.c:76
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "OSTRZE�ENIE: konflikt skr�t�w podpis�w w wiadomo�ci\n"
 
-#: g10/sig-check.c:99
+#: g10/sig-check.c:100
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "OSTRZE�ENIE: podklucz podpisuj�cy %08lX nie jest skro�nie podpisany\n"
 
-#: g10/sig-check.c:102
+#: g10/sig-check.c:103
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "OSTRZE�ENIE: podklucz podpisuj�cy %08lX jest niepoprawnie skro�nie "
 "podpisany\n"
 
-#: g10/sig-check.c:168
+#: g10/sig-check.c:169
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "klucz publiczny %08lX jest o %lu sekund� m�odszy od podpisu\n"
 
-#: g10/sig-check.c:169
+#: g10/sig-check.c:170
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "klucz publiczny %08lX jest o %lu sekund(y) m�odszy od podpisu\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:181
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5271,7 +5324,7 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:183
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5279,55 +5332,55 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:193
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "UWAGA: klucz podpisuj�cy %08lX przekroczy� dat� wa�no�ci %s\n"
 
-#: g10/sig-check.c:275
+#: g10/sig-check.c:276
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "podpis z�o�ony kluczem %08lX uznany za niewa�ny z powodu nieznanego bitu "
 "krytycznego\n"
 
-#: g10/sig-check.c:532
+#: g10/sig-check.c:533
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "klucz %08lX: brak podklucza, kt�rego dotyczy uniewa�nienie\n"
 
-#: g10/sig-check.c:558
+#: g10/sig-check.c:559
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "klucz %08lX: brak podklucza dowi�zywanego podpisem\n"
 
-#: g10/sign.c:85
+#: g10/sign.c:86
 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:93
+#: g10/sign.c:94
 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:112
+#: g10/sign.c:113
 #, 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:138
+#: g10/sign.c:139
 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:146
+#: g10/sign.c:147
 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:159
+#: g10/sign.c:160
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5335,7 +5388,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:187
+#: g10/sign.c:188
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5344,74 +5397,74 @@ 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:364
+#: g10/sign.c:365
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "sprawdzenie z�o�onego podpisu nie powiod�o si�: %s\n"
 
-#: g10/sign.c:373
+#: g10/sign.c:374
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s podpis z�o�ony przez: ,,%s''\n"
 
-#: g10/sign.c:741
+#: g10/sign.c:761
 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:808
+#: g10/sign.c:830
 #, 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:900
+#: g10/sign.c:922
 msgid "signing:"
 msgstr "podpis:"
 
-#: g10/sign.c:1007
+#: g10/sign.c:1034
 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:1180
+#: g10/sign.c:1212
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "zostanie u�yty szyfr %s\n"
 
-#: g10/skclist.c:126 g10/skclist.c:190
+#: g10/skclist.c:127 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "klucz nie jest oznaczony jako niepewny - nie mo�na go u�y� z atrap� \n"
 "generatora liczb losowych!\n"
 
-#: g10/skclist.c:157
+#: g10/skclist.c:158
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "pomini�ty ,,%s'': duplikat\n"
 
-#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "pomini�ty ,,%s'': %s\n"
 
-#: g10/skclist.c:170
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
 
-#: g10/skclist.c:185
+#: g10/skclist.c:186
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "pomini�ty ,,%s'': wygenerowany przez PGP klucz dla algorytmu ElGamala,\n"
 "podpisy sk�adane tym kluczem nie zapewniaj� bezpiecze�stwa!\n"
 
-#: g10/tdbdump.c:59 g10/trustdb.c:365
+#: g10/tdbdump.c:60 g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "wpis zaufania %lu, typ zapytania %d: zapis nie powi�d� si�: %s\n"
 
-#: g10/tdbdump.c:104
+#: g10/tdbdump.c:105
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5420,349 +5473,349 @@ msgstr ""
 "# Lista przypisanych warto�ci zaufania, stworzona %s\n"
 "# (u�yj \"gpg --import-ownertrust\" aby j� wczyta�)\n"
 
-#: g10/tdbdump.c:159 g10/tdbdump.c:167 g10/tdbdump.c:172 g10/tdbdump.c:177
+#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
 
-#: g10/tdbdump.c:159
+#: g10/tdbdump.c:160
 #, fuzzy
 msgid "line too long"
 msgstr "linia zbyt d�uga\n"
 
-#: g10/tdbdump.c:167
+#: g10/tdbdump.c:168
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:173
+#: g10/tdbdump.c:174
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "b��d: niew�a�ciwy odcisk klucza\n"
 
-#: g10/tdbdump.c:178
+#: g10/tdbdump.c:179
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr "wczytanie warto��i zaufania"
 
-#: g10/tdbdump.c:214
+#: g10/tdbdump.c:215
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "b��d podczas odczytu zapisu warto�ci zaufania: %s\n"
 
-#: g10/tdbdump.c:218
+#: g10/tdbdump.c:219
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "b��d odczytu: %s\n"
 
-#: g10/tdbdump.c:227 g10/trustdb.c:380
+#: g10/tdbdump.c:228 g10/trustdb.c:381
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "baza zaufania: synchronizacja nie powiod�a si� %s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1440
+#: g10/tdbio.c:129 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "baza zaufania, wpis %lu: funkcja lseek() nie powiod�a si�: %s\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1447
+#: g10/tdbio.c:135 g10/tdbio.c:1448
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "baza zaufania, wpis %lu: zapis nie powi�d� si� (n=%d): %s\n"
 
-#: g10/tdbio.c:244
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "zbyt du�e zlecenie dla bazy zaufania\n"
 
-#: g10/tdbio.c:497
+#: g10/tdbio.c:498
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "nie mo�na zamkn�� ,,%s'': %s\n"
 
-#: g10/tdbio.c:512
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: katalog nie istnieje!\n"
 
-#: g10/tdbio.c:522 g10/tdbio.c:545 g10/tdbio.c:588
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "nie mo�na utworzy� ,,%s'': %s\n"
 
-#: g10/tdbio.c:524 g10/tdbio.c:591
+#: g10/tdbio.c:525 g10/tdbio.c:592
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "nie mo�na otworzy� ,,%s''\n"
 
-#: g10/tdbio.c:550
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: stworzenie zapisu o wersji nie powiod�o si�: %s"
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: stworzony niepoprawny plik bazy zaufania\n"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: baza zaufania utworzona\n"
 
-#: g10/tdbio.c:597
+#: g10/tdbio.c:598
 msgid "NOTE: trustdb not writable\n"
 msgstr "UWAGA: nie mo�na zapisywa� bazy zaufania\n"
 
-#: g10/tdbio.c:614
+#: g10/tdbio.c:615
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: niepoprawny plik bazy zaufania\n"
 
-#: g10/tdbio.c:646
+#: g10/tdbio.c:647
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: tworzenie tablicy skr�t�w nie powiod�o si�: %s\n"
 
-#: g10/tdbio.c:654
+#: g10/tdbio.c:655
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: b��d przy uaktualnianiu numeru wersji: %s\n"
 
-#: g10/tdbio.c:671 g10/tdbio.c:691 g10/tdbio.c:707 g10/tdbio.c:721
-#: g10/tdbio.c:751 g10/tdbio.c:1373 g10/tdbio.c:1400
+#: g10/tdbio.c:672 g10/tdbio.c:692 g10/tdbio.c:708 g10/tdbio.c:722
+#: g10/tdbio.c:752 g10/tdbio.c:1374 g10/tdbio.c:1401
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: b��d odczytu numeru wersji: %s\n"
 
-#: g10/tdbio.c:730
+#: g10/tdbio.c:731
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: b��d zapisu numeru wersji: %s\n"
 
-#: g10/tdbio.c:1169
+#: g10/tdbio.c:1170
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "baza zaufania: funkcja lseek() zawiod�a: %s\n"
 
-#: g10/tdbio.c:1177
+#: g10/tdbio.c:1178
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "baza zaufania: funkcja read() (n=%d) zawiod�a: %s\n"
 
-#: g10/tdbio.c:1198
+#: g10/tdbio.c:1199
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: to nie jest plik bazy zaufania\n"
 
-#: g10/tdbio.c:1216
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: wpis wersji z numerem %lu\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1222
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: niew�a�ciwa wersja pliku %d\n"
 
-#: g10/tdbio.c:1406
+#: g10/tdbio.c:1407
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: b��d odczytu pustego wpisu: %s\n"
 
-#: g10/tdbio.c:1414
+#: g10/tdbio.c:1415
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: b��d zapisu wpisu katalogowego: %s\n"
 
-#: g10/tdbio.c:1424
+#: g10/tdbio.c:1425
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: zerowanie rekordu nie powiod�o si�: %s\n"
 
-#: g10/tdbio.c:1454
+#: g10/tdbio.c:1455
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: dopisanie rekordu nie powiod�o si�: %s\n"
 
-#: g10/tdbio.c:1499
+#: g10/tdbio.c:1500
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "Baza zaufania jest uszkodzona; prosz� uruchomi� ,,gpg --fix-trustdb''.\n"
 
-#: g10/textfilter.c:147
+#: g10/textfilter.c:148
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "nie mo�na obs�u�y� linii tekstu d�u�szej ni� %d znak�w\n"
 
-#: g10/textfilter.c:244
+#: g10/textfilter.c:245
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "linia d�u�sza ni� %d znak�w\n"
 
-#: g10/trustdb.c:226
+#: g10/trustdb.c:227
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr ",,%s'' nie jest poprawnym d�ugim numerem klucza\n"
 
-#: g10/trustdb.c:257
+#: g10/trustdb.c:258
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "klucz %08lX: zaakceptowany jako klucz zaufany\n"
 
-#: g10/trustdb.c:295
+#: g10/trustdb.c:296
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "klucz %08lX jest wpisany wi�cej ni� raz w bazie zaufania\n"
 
-#: g10/trustdb.c:310
+#: g10/trustdb.c:311
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "klucz %08lX: brak klucza publicznego dla zaufanego klucza - pomini�ty\n"
 
-#: g10/trustdb.c:320
+#: g10/trustdb.c:321
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "klucz zosta� oznaczony jako obdarzony absolutnym zaufaniem.\n"
 
-#: g10/trustdb.c:344
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "wpis zaufania %lu, typ zapytania %d: odczyt nie powi�d� si�: %s\n"
 
-#: g10/trustdb.c:350
+#: g10/trustdb.c:351
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "wpis zaufania %lu jest typu innego ni� poszukiwany %d\n"
 
-#: g10/trustdb.c:446
+#: g10/trustdb.c:447
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:452
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:506
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[uniewa�niony]"
 
-#: g10/trustdb.c:508 g10/trustdb.c:513
+#: g10/trustdb.c:509 g10/trustdb.c:514
 #, fuzzy
 msgid "[ expired]"
 msgstr "[przeterminowany]"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 #, fuzzy
 msgid "[ unknown]"
 msgstr "nieznany"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 #, fuzzy
 msgid "never"
 msgstr "nigdy     "
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:536
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:576
+#: g10/trustdb.c:577
 msgid "no need for a trustdb check\n"
 msgstr "sprawdzanie bazy jest niepotrzebne\n"
 
-#: g10/trustdb.c:582 g10/trustdb.c:2157
+#: g10/trustdb.c:583 g10/trustdb.c:2309
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "nast�pne sprawdzanie bazy odb�dzie si� %s\n"
 
-#: g10/trustdb.c:591
+#: 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:606
+#: 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:838 g10/trustdb.c:1276
+#: 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:1033
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr "nale�y uruchomi� gpg z opcj� ,,--check-trustdb''\n"
 
-#: g10/trustdb.c:1037
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "sprawdzanie bazy zaufania\n"
 
-#: g10/trustdb.c:1901
+#: g10/trustdb.c:2053
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "przetworzono %d kluczy (rozwi�zano %d przelicze� zaufania)\n"
 
-#: g10/trustdb.c:1965
+#: g10/trustdb.c:2117
 msgid "no ultimately trusted keys found\n"
 msgstr "brak absolutnie zaufanych kluczy\n"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:2131
 #, 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:2002
+#: g10/trustdb.c:2154
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2240
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2163
+#: g10/trustdb.c:2315
 #, 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"
 
-#: g10/verify.c:116
+#: g10/verify.c:117
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -5772,304 +5825,335 @@ msgstr ""
 "Nale�y pami�ta� o podawaniu pliku podpisu (.sig lub .asc) jako pierwszego\n"
 "argumentu linii polece�.\n"
 
-#: g10/verify.c:189
+#: g10/verify.c:190
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "linia wej�cia %u zbyt d�uga lub brak znaku LF\n"
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "b��d og�lny"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "nieznany typ pakietu"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "nieznana wersja"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "nieznany algorytm asymetryczny"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "nieznany algorytm skr�tu"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "niepoprawny klucz publiczny"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "niepoprawny klucz prywatny"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "niepoprawny podpis"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "b��d sumy kontrolnej"
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "niepoprawne has�o"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "brak klucza publicznego"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "nieznany algorytm szyfruj�cy"
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "otwarcie zbioru kluczy jest niemo�liwe"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "niepoprawny pakiet"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "b��d w opakowaniu ASCII"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "brak takiego identyfikatora u�ytkownika."
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "brak klucza prywatnego"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "zosta� u�yty niew�a�ciwy klucz prywatny"
 
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "nie jest obs�ugiwany"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "niepoprawny klucz"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "b��d przy odczycie pliku"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "b��d przy zapisie pliku"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "nieznany algorytm kompresji"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "b��d przy otwieraniu pliku."
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "b��d przy tworzeniu pliku"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "niepoprawne d�ugie has�o"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "algorytm szyfrowania z kluczem publicznym nie jest zaimplementowany"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "algorytm szyfruj�cy nie jest zaimplementowany"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "nieznana klasa podpisu"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "b��d w bazie zaufania"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "b��d MPI"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "ograniczenie zasob�w"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "b��d w zbiorze kluczy"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "niepoprawny certyfikat"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "b��d formatu identyfikatora u�ytkownika"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "b��d przy zamykaniu pliku"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "b��d przy zmianie nazwy pliku"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "b��d przy usuwaniu pliku"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "nieoczekiowane dane"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "konflikt datownik�w"
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "nieu�yteczny algorytm asymetryczny"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "plik ju� istnieje"
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "klucz s�aby"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "b��dny argument"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "niepoprawny URI"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "URI nie jest obs�ugiwany"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "b��d sieci"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "nie zaszyfrowany"
 
-#: util/errors.c:103
+#: util/errors.c:104
 msgid "not processed"
 msgstr "nie zosta� przetworzony"
 
-#: util/errors.c:105
+#: util/errors.c:106
 msgid "unusable public key"
 msgstr "bezu�yteczny klucz publiczny"
 
-#: util/errors.c:106
+#: util/errors.c:107
 msgid "unusable secret key"
 msgstr "bezu�yteczny klucz prywatny"
 
-#: util/errors.c:107
+#: util/errors.c:108
 msgid "keyserver error"
 msgstr "b��d serwera kluczy"
 
-#: util/errors.c:108
+#: util/errors.c:109
 #, fuzzy
 msgid "canceled"
 msgstr "Anuluj"
 
-#: util/errors.c:109
+#: util/errors.c:110
 #, fuzzy
 msgid "no card"
 msgstr "nie zaszyfrowany"
 
-#: util/logger.c:157
+#: util/logger.c:158
 msgid "ERROR: "
 msgstr ""
 
-#: util/logger.c:160
+#: util/logger.c:161
 msgid "WARNING: "
 msgstr ""
 
-#: util/logger.c:223
+#: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... to jest b��d programu (%s:%d:%s)\n"
 
-#: util/logger.c:229
+#: util/logger.c:230
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "znalaz�e�(a�) b��d w programie ... (%s:%d)\n"
 
-#: util/miscutil.c:336 util/miscutil.c:373
+#: util/miscutil.c:330 util/miscutil.c:367
 msgid "yes"
 msgstr "tak"
 
-#: util/miscutil.c:337 util/miscutil.c:378
+#: util/miscutil.c:331 util/miscutil.c:372
 msgid "yY"
 msgstr "tT"
 
-#: util/miscutil.c:339 util/miscutil.c:375
+#: util/miscutil.c:333 util/miscutil.c:369
 msgid "no"
 msgstr "nie"
 
-#: util/miscutil.c:340 util/miscutil.c:379
+#: util/miscutil.c:334 util/miscutil.c:373
 msgid "nN"
 msgstr "nN"
 
-#: util/miscutil.c:377
+#: util/miscutil.c:371
 msgid "quit"
 msgstr "wyj�cie"
 
-#: util/miscutil.c:380
+#: util/miscutil.c:374
 msgid "qQ"
 msgstr "wW"
 
-#: util/miscutil.c:413
+#: util/miscutil.c:407
 msgid "okay|okay"
 msgstr ""
 
-#: util/miscutil.c:415
+#: util/miscutil.c:409
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:416
+#: util/miscutil.c:410
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:417
+#: util/miscutil.c:411
 #, fuzzy
 msgid "cC"
 msgstr "l"
 
-#: util/secmem.c:90
+#: util/secmem.c:91
 msgid "WARNING: using insecure memory!\n"
 msgstr "OSTRZE�ENIE: nie mo�na zabezpieczy� u�ywanej pami�ci!\n"
 
-#: util/secmem.c:91
+#: util/secmem.c:92
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "obja�nienie mo�na przeczyta� tutaj: http://www.gnupg.org/faq.html\n"
 
-#: util/secmem.c:343
+#: util/secmem.c:344
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "bez zabezpieczenia pami�ci nie mo�na wykona� tej operacji\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:345
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\n"
 
+#, fuzzy
+#~ msgid "error getting serial number: %s\n"
+#~ msgstr "b��d podczas tworzenia has�a: %s\n"
+
+#~ msgid "Hint: Select the user IDs to sign\n"
+#~ msgstr "Podpowied�: wybierz identyfikatory u�ytkownika do podpisania.\n"
+
+#~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+#~ msgstr "niepoprawne has�o, lub nieznany algorytm szyfruj�cy (%d)\n"
+
+#~ msgid "can't set client pid for the agent\n"
+#~ msgstr "nie mo�na ustawi� numeru procesu klienckiego agenta\n"
+
+#~ msgid "can't get server read FD for the agent\n"
+#~ msgstr "serwer nie chce czyta� deskryptora dla agenta\n"
+
+#~ msgid "can't get server write FD for the agent\n"
+#~ msgstr "serwer nie chce pisa� deskryptora dla agenta\n"
+
+#~ msgid "communication problem with gpg-agent\n"
+#~ msgstr "problem z porozumiewaniem si� z agentem\n"
+
+#~ msgid "passphrase too long\n"
+#~ msgstr "has�o zbyt d�ugie\n"
+
+#~ msgid "invalid response from agent\n"
+#~ msgstr "b��dna odpowied� agenta\n"
+
+#~ msgid "problem with the agent: agent returns 0x%lx\n"
+#~ msgstr "problem agenta: zwr�ci� 0x%lx\n"
+
 #~ msgid "select secondary key N"
 #~ msgstr "wyb�r podklucza N"
 
@@ -7103,12 +7187,6 @@ msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\n"
 #~ msgid "No key for user ID\n"
 #~ msgstr "Brak klucza z takim identyfikatorem u�ytkownika.\n"
 
-#~ msgid "No user ID for key\n"
-#~ msgstr "Brak identyfikatora u�ytkownika dla klucza.\n"
-
-#~ msgid "invalid"
-#~ msgstr "niepoprawny"
-
 #~ msgid "no secret key for decryption available\n"
 #~ msgstr "odszyfrowuj�cy klucz tajny do jest niedost�pny\n"
 
diff --git a/po/pt.po b/po/pt.po
index f4bcc8224..216b77058 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: 2005-03-15 16:35+0100\n"
+"POT-Creation-Date: 2005-05-31 10:05+0200\n"
 "PO-Revision-Date: 2002-09-13 18:26+0100\n"
 "Last-Translator: Pedro Morais <[email protected]>\n"
 "Language-Team: pt <[email protected]>\n"
@@ -17,81 +17,81 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:120
+#: cipher/primegen.c:121
 #, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr ""
 
-#: cipher/primegen.c:311
+#: cipher/primegen.c:312
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr ""
 
-#: cipher/random.c:163
+#: cipher/random.c:164
 msgid "no entropy gathering module detected\n"
 msgstr "nenhum m�dulo de recolha de entropia detectado\n"
 
-#: cipher/random.c:387 g10/card-util.c:656 g10/card-util.c:725
-#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2255
-#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
-#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
-#: g10/tdbio.c:600
+#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
+#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
+#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
+#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
+#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/tdbio.c:601
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:391
+#: cipher/random.c:392
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "imposs�vel 'stat' a `%s': %s\n"
 
-#: cipher/random.c:396
+#: cipher/random.c:397
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' n�o � um ficheiro normal - ignorado\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:402
 msgid "note: random_seed file is empty\n"
 msgstr "nota: random_seed est� vazia\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:408
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "AVISO: o ficheiro random_seed tem um tamanho inv�lido - n�o utilizado\n"
 
-#: cipher/random.c:415
+#: cipher/random.c:416
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "imposs�vel ler `%s': %s\n"
 
-#: cipher/random.c:453
+#: cipher/random.c:454
 msgid "note: random_seed file not updated\n"
 msgstr "nota: ficheiro random_seed n�o actualizado\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2723
-#: g10/keygen.c:2753 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
-#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "imposs�vel criar `%s': %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:481
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "imposs�vel escrever `%s': %s\n"
 
-#: cipher/random.c:483
+#: cipher/random.c:484
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "imposs�vel fechar `%s': %s\n"
 
-#: cipher/random.c:728
+#: cipher/random.c:729
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVISO: a utilizar gerador de n�meros aleat�rios inseguro!\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:730
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -105,14 +105,14 @@ msgstr ""
 "N�O USE NENHUM DADO GERADO POR ESTE PROGRAMA!\n"
 "\n"
 
-#: cipher/rndegd.c:204
+#: cipher/rndegd.c:205
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
 "of the entropy.\n"
 msgstr ""
 
-#: cipher/rndlinux.c:134
+#: cipher/rndlinux.c:135
 #, c-format
 msgid ""
 "\n"
@@ -123,45 +123,62 @@ msgstr ""
 "N�o h� bytes aleat�rios suficientes. Por favor, fa�a outro trabalho para\n"
 "que o sistema possa recolher mais entropia! (S�o necess�rios mais %d bytes)\n"
 
-#: g10/app-openpgp.c:547
+#: g10/app-openpgp.c:596
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: g10/app-openpgp.c:560
+#: g10/app-openpgp.c:609
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
 
-#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
+#: g10/app-openpgp.c:977
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "remo��o do bloco de chave falhou: %s\n"
+
+#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+msgid "response does not contain the public key data\n"
+msgstr ""
+
+#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
-#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
+#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
+#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/app-openpgp.c:836
+#: g10/app-openpgp.c:1310
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:857
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:862
+#: g10/app-openpgp.c:1336
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -169,354 +186,359 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:869
+#: g10/app-openpgp.c:1343
 msgid "|A|Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1018
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:1492
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1018
+#: g10/app-openpgp.c:1492
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1022
+#: g10/app-openpgp.c:1496
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
+#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "erro na leitura do bloco de chave: %s\n"
 
-#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
+#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: erro ao ler registo livre: %s\n"
 
-#: g10/app-openpgp.c:1104
+#: g10/app-openpgp.c:1562
 #, fuzzy
 msgid "key already exists\n"
 msgstr "%s' j� comprimido\n"
 
-#: g10/app-openpgp.c:1108
+#: g10/app-openpgp.c:1566
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1110
+#: g10/app-openpgp.c:1568
 #, fuzzy
 msgid "generating new key\n"
 msgstr "gerar um novo par de chaves"
 
-#: g10/app-openpgp.c:1120
+#: g10/app-openpgp.c:1735
+msgid "creation timestamp missing\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1742
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1749
+#, c-format
+msgid "RSA public exponent missing or largerr than %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1827
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
+
+#: g10/app-openpgp.c:1886
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1135
+#: g10/app-openpgp.c:1901
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1904
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
-msgid "response does not contain the public key data\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
-msgid "response does not contain the RSA modulus\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
-msgid "response does not contain the RSA public exponent\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1195
+#: g10/app-openpgp.c:1961
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1356
+#: g10/app-openpgp.c:2130
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1364
+#: g10/app-openpgp.c:2138
 #, c-format
-msgid "PIN [sigs done: %lu]"
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
+#: g10/app-openpgp.c:2399
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/app-openpgp.c:1731
-#, fuzzy, c-format
-msgid "error getting serial number: %s\n"
-msgstr "erro na cria��o da frase secreta: %s\n"
-
-#: g10/app-openpgp.c:1826
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
-
-#: g10/app-openpgp.c:1868
-#, fuzzy
-msgid "reading the key failed\n"
-msgstr "remo��o do bloco de chave falhou: %s\n"
-
-#: g10/armor.c:317
+#: g10/armor.c:318
 #, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:346
+#: g10/armor.c:347
 msgid "invalid armor header: "
 msgstr "cabe�alho de armadura inv�lido: "
 
-#: g10/armor.c:353
+#: g10/armor.c:354
 msgid "armor header: "
 msgstr "cabe�alho de armadura: "
 
-#: g10/armor.c:364
+#: g10/armor.c:365
 msgid "invalid clearsig header\n"
 msgstr "cabe�alho de assinatura em texto puro inv�lido\n"
 
-#: g10/armor.c:416
+#: g10/armor.c:417
 msgid "nested clear text signatures\n"
 msgstr "assinaturas em texto puro aninhadas\n"
 
-#: g10/armor.c:551
+#: g10/armor.c:552
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "armadura inesperada:"
 
-#: g10/armor.c:563
+#: g10/armor.c:564
 msgid "invalid dash escaped line: "
 msgstr "linha com h�fen inv�lida: "
 
-#: g10/armor.c:715 g10/armor.c:1322
+#: g10/armor.c:716 g10/armor.c:1323
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "caracter radix64 inv�lido %02x ignorado\n"
 
-#: g10/armor.c:758
+#: g10/armor.c:759
 msgid "premature eof (no CRC)\n"
 msgstr "fim de ficheiro prematuro (sem CRC)\n"
 
-#: g10/armor.c:792
+#: g10/armor.c:793
 msgid "premature eof (in CRC)\n"
 msgstr "fim de ficheiro prematuro (no CRC)\n"
 
-#: g10/armor.c:800
+#: g10/armor.c:801
 msgid "malformed CRC\n"
 msgstr "CRC malformado\n"
 
-#: g10/armor.c:804 g10/armor.c:1359
+#: g10/armor.c:805 g10/armor.c:1360
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "erro de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:824
+#: g10/armor.c:825
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "fim de ficheiro prematuro (no \"Trailer\")\n"
 
-#: g10/armor.c:828
+#: g10/armor.c:829
 msgid "error in trailer line\n"
 msgstr "erro na �ltima linha\n"
 
-#: g10/armor.c:1137
+#: g10/armor.c:1138
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/armor.c:1142
+#: g10/armor.c:1143
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura inv�lida: linha maior que %d caracteres\n"
 
-#: g10/armor.c:1146
+#: g10/armor.c:1147
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "caracter \"quoted printable\" na armadura - provavelmente um MTA com bugs "
 "foi usado\n"
 
-#: g10/card-util.c:58 g10/card-util.c:295
+#: g10/card-util.c:63 g10/card-util.c:303
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/card-util.c:63
+#: g10/card-util.c:68
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1329 g10/delkey.c:127 g10/keyedit.c:1430
-#: g10/keygen.c:2439 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1510
+#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
 #, 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:97 g10/card-util.c:1108 g10/card-util.c:1191
-#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
-#: g10/keygen.c:1365
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
+#: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "Op��o? "
 
-#: g10/card-util.c:206 g10/card-util.c:256
+#: g10/card-util.c:213 g10/card-util.c:263
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:391
+#: g10/card-util.c:410
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 #, fuzzy
 msgid "unspecified"
 msgstr "Nenhum motivo especificado"
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 #, fuzzy
 msgid "not forced"
 msgstr "n�o processado"
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:497
+#: g10/card-util.c:516
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:499
+#: g10/card-util.c:518
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:501
+#: g10/card-util.c:520
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:518
+#: g10/card-util.c:537
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:539
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:538
+#: g10/card-util.c:557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:559
+#: g10/card-util.c:578
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "a escrever chave p�blica para `%s'\n"
 
-#: g10/card-util.c:567
+#: g10/card-util.c:586
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:665 g10/card-util.c:734 g10/import.c:261
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:692
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:683
+#: g10/card-util.c:702
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:742
+#: g10/card-util.c:761
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:752
+#: g10/card-util.c:771
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:772
+#: g10/card-util.c:791
 #, fuzzy
 msgid "Language preferences: "
 msgstr "prefer�ncias actualizadas"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:799
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "caracter inv�lido na cadeia de caract�res da prefer�ncia\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:808
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "caracter inv�lido na cadeia de caract�res da prefer�ncia\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:829
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:824
+#: g10/card-util.c:843
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: g10/card-util.c:845
+#: g10/card-util.c:864
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "mostra impress�o digital"
 
-#: g10/card-util.c:868
+#: g10/card-util.c:887
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: g10/card-util.c:916
+#: g10/card-util.c:935
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/card-util.c:917
+#: g10/card-util.c:936
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/card-util.c:926
+#: g10/card-util.c:945
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1030
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1030 g10/card-util.c:1039
+#: g10/card-util.c:1051 g10/card-util.c:1060
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1051
+#: g10/card-util.c:1072
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1060
+#: g10/card-util.c:1081
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -524,283 +546,287 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1099
+#: g10/card-util.c:1120
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/card-util.c:1101 g10/card-util.c:1182
+#: g10/card-util.c:1122 g10/card-util.c:1203
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/card-util.c:1102 g10/card-util.c:1184
+#: g10/card-util.c:1123 g10/card-util.c:1205
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/card-util.c:1103 g10/card-util.c:1186
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1119 g10/card-util.c:1202 g10/keyedit.c:908
-#: g10/keygen.c:1404 g10/revoke.c:642
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
+#: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1200
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "motivo da revoca��o: "
 
-#: g10/card-util.c:1214
+#: g10/card-util.c:1235
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de compress�o desconhecido"
 
-#: g10/card-util.c:1219
+#: g10/card-util.c:1240
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Componentes secretas da chave prim�ria n�o dispon�veis.\n"
 
-#: g10/card-util.c:1224
+#: g10/card-util.c:1245
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/card-util.c:1294 g10/keyedit.c:1317
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/card-util.c:1296
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1297 g10/keyedit.c:1320
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/card-util.c:1302
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1303
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1304
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1305
+#: g10/card-util.c:1327
 #, fuzzy
 msgid "change the login name"
 msgstr "muda a data de validade"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muda os valores de confian�a"
 
-#: g10/card-util.c:1307
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1308
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1310
+#: g10/card-util.c:1332
 #, fuzzy
 msgid "generate new keys"
 msgstr "gerar um novo par de chaves"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1377 g10/keyedit.c:1526
+#: g10/card-util.c:1334
+msgid "verify the PIN and list all data"
+msgstr ""
+
+#: g10/card-util.c:1454 g10/keyedit.c:1609
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1412
+#: g10/card-util.c:1492
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1430
+#: g10/card-util.c:1525
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/card-util.c:1499 g10/keyedit.c:2104
+#: g10/card-util.c:1599 g10/keyedit.c:2210
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
-#: g10/cardglue.c:287
+#: g10/cardglue.c:396
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:519
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:380
+#: g10/cardglue.c:527
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:852
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:853
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:854
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:691
+#: g10/cardglue.c:855
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:705
+#: g10/cardglue.c:872
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Repita a frase secreta: "
 
-#: g10/cardglue.c:719
+#: g10/cardglue.c:886
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
-#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/decrypt.c:104 g10/encode.c:859
+#: g10/decrypt.c:105 g10/encode.c:846
 msgid "--output doesn't work for this command\n"
 msgstr "--output n�o funciona para este comando\n"
 
-#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3167 g10/keyserver.c:1511
-#: g10/revoke.c:226
+#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3346 g10/keyserver.c:1541
+#: g10/revoke.c:227
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2300 g10/keyserver.c:1525
-#: g10/revoke.c:232 g10/revoke.c:439
+#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erro na leitura do bloco de chave: %s\n"
 
-#: g10/delkey.c:128 g10/delkey.c:135
+#: g10/delkey.c:129 g10/delkey.c:136
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(a n�o ser que escolha a chave pela sua impress�o digital)\n"
 
-#: g10/delkey.c:134
+#: g10/delkey.c:135
 #, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "imposs�vel fazer isso em modo n�o-interactivo sem utilizar \"--yes\"\n"
 
-#: g10/delkey.c:146
+#: g10/delkey.c:147
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Remover esta chave do porta-chaves?"
 
-#: g10/delkey.c:154
+#: g10/delkey.c:155
 #, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Esta chave � secreta! - apagar de qualquer modo? "
 
-#: g10/delkey.c:164
+#: g10/delkey.c:165
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: g10/delkey.c:174
+#: g10/delkey.c:175
 msgid "ownertrust information cleared\n"
 msgstr "informa��es de 'ownertrust' limpas\n"
 
-#: g10/delkey.c:205
+#: g10/delkey.c:206
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "h� uma chave secreta para a chave p�blica \"%s\"!\n"
 
-#: g10/delkey.c:207
+#: g10/delkey.c:208
 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:210 g10/sign.c:1186
+#: g10/encode.c:211 g10/sign.c:1218
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: g10/encode.c:215
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "n�o � poss�vel utilizar o pacote ESK sim�trico devido ao modo S2K\n"
 
-#: g10/encode.c:228
+#: g10/encode.c:229
 #, fuzzy, c-format
 msgid "using cipher %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/encode.c:238 g10/encode.c:558
+#: g10/encode.c:239 g10/encode.c:545
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "%s' j� comprimido\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
+#: g10/encode.c:302 g10/encode.c:591 g10/sign.c:566
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � um ficheiro vazio\n"
 
-#: g10/encode.c:472
+#: g10/encode.c:466
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "no modo --pgp2 s� pode cifrar com chaves RSA de 2048 bits ou menos\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:488
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encode.c:530
+#: g10/encode.c:517
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "imposs�vel utilizar a cifra IDEA para todas as chaves para que est� a "
 "cifrar.\n"
 
-#: g10/encode.c:540
+#: g10/encode.c:527
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "ao for�ar a cifra sim�trica %s (%d) viola as prefer�ncias do destinat�rio\n"
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:635 g10/sign.c:899
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -809,125 +835,125 @@ msgstr ""
 "ao for�ar o algoritmo de compress�o %s (%d) viola as prefer�ncias do "
 "destinat�rio\n"
 
-#: g10/encode.c:735
+#: g10/encode.c:722
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "ao for�ar a cifra sim�trica %s (%d) viola as prefer�ncias do destinat�rio\n"
 
-#: g10/encode.c:805 g10/pkclist.c:721 g10/pkclist.c:757
+#: g10/encode.c:792 g10/pkclist.c:722 g10/pkclist.c:758
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/encode.c:832
+#: g10/encode.c:819
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
 
-#: g10/encr-data.c:66 g10/mainproc.c:301
+#: g10/encr-data.c:67 g10/mainproc.c:302
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dados cifrados com %s\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:305
+#: g10/encr-data.c:69 g10/mainproc.c:306
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado com algoritmo desconhecido %d\n"
 
-#: g10/encr-data.c:92
+#: g10/encr-data.c:93
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "AVISO: A mensagem foi cifrada com uma chave fraca na cifragem sim�trica.\n"
 
-#: g10/encr-data.c:103
+#: g10/encr-data.c:104
 msgid "problem handling encrypted packet\n"
 msgstr "problema ao tratar pacote cifrado\n"
 
-#: g10/exec.c:48
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr ""
 
-#: g10/exec.c:184 g10/openfile.c:406
+#: g10/exec.c:173 g10/openfile.c:410
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: imposs�vel criar directoria: %s\n"
 
-#: g10/exec.c:325
+#: g10/exec.c:314
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 
-#: g10/exec.c:355
+#: g10/exec.c:344
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr "%s: erro ao ler registo de vers�o: %s\n"
 
-#: g10/exec.c:433
+#: g10/exec.c:422
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
 
-#: g10/exec.c:436
+#: g10/exec.c:425
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
 
-#: g10/exec.c:521
+#: g10/exec.c:510
 #, fuzzy, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "%s: erro ao ler registo de vers�o: %s\n"
 
-#: g10/exec.c:532 g10/exec.c:598
+#: g10/exec.c:521 g10/exec.c:587
 msgid "unnatural exit of external program\n"
 msgstr ""
 
-#: g10/exec.c:547
+#: g10/exec.c:536
 #, fuzzy
 msgid "unable to execute external program\n"
 msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
 
-#: g10/exec.c:563
+#: g10/exec.c:552
 #, fuzzy, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
 
-#: g10/exec.c:609 g10/exec.c:616
+#: g10/exec.c:598 g10/exec.c:605
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr ""
 
-#: g10/exec.c:621
+#: g10/exec.c:610
 #, fuzzy, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/export.c:183
+#: g10/export.c:184
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/export.c:212
+#: g10/export.c:213
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "chave %08lX: n�o est� protegida - ignorada\n"
 
-#: g10/export.c:220
+#: g10/export.c:221
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "chave %08lX: tipo PGP 2.x - ignorada\n"
 
-#: g10/export.c:395
+#: g10/export.c:398
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:427
+#: g10/export.c:430
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid ""
 "@Commands:\n"
 " "
@@ -935,128 +961,128 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|fazer uma assinatura"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encrypt data"
 msgstr "cifrar dados"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar apenas com cifra sim�trica"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "decrypt data (default)"
 msgstr "decifrar dados (ac��o por omiss�o)"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/g10.c:379
+#: g10/g10.c:381
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the public keyring"
 msgstr "remover chaves do porta-chaves p�blico"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "remove keys from the secret keyring"
 msgstr "remover chaves do porta-chaves secreto"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:385
+#: g10/g10.c:387
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:389
+#: g10/g10.c:391
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor de chaves"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor de chaves"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "search for keys on a key server"
 msgstr "procurar chaves num servidor de chaves"
 
-#: g10/g10.c:394
+#: g10/g10.c:396
 msgid "update all keys from a keyserver"
 msgstr "actualizar todas as chaves a partir de um servidor de chaves"
 
-#: g10/g10.c:397
+#: g10/g10.c:399
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "print the card status"
 msgstr ""
 
-#: g10/g10.c:401
+#: g10/g10.c:403
 msgid "change data on a card"
 msgstr ""
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/g10.c:410
+#: g10/g10.c:412
 msgid "update the trust database"
 msgstr "actualizar a base de dados de confian�a"
 
-#: g10/g10.c:417
+#: g10/g10.c:419
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
-#: g10/g10.c:421 g10/gpgv.c:66
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1066,55 +1092,55 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/g10.c:425
+#: g10/g10.c:427
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/g10.c:436
+#: g10/g10.c:438
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de utilizador para\n"
 "assinar ou decifrar"
 
-#: g10/g10.c:437
+#: g10/g10.c:439
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desactiva)"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/g10.c:452
+#: g10/g10.c:458
 msgid "use as output file"
 msgstr "usar como ficheiro de sa�da"
 
-#: g10/g10.c:454 g10/gpgv.c:68
+#: g10/g10.c:460 g10/gpgv.c:73
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/g10.c:465
+#: g10/g10.c:471
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
-#: g10/g10.c:466
+#: g10/g10.c:472
 msgid "prompt before overwriting"
 msgstr "perguntar antes de sobrep�r"
 
-#: g10/g10.c:507
+#: g10/g10.c:513
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:508
+#: g10/g10.c:514
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:536
+#: g10/g10.c:542
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1122,7 +1148,7 @@ msgstr ""
 "@\n"
 "(Veja a p�gina man para uma lista completa de comandos e op��es)\n"
 
-#: g10/g10.c:539
+#: g10/g10.c:545
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1142,15 +1168,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/g10.c:720 g10/gpgv.c:93
+#: g10/g10.c:724 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/g10.c:737
+#: g10/g10.c:741
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: g10/g10.c:740
+#: g10/g10.c:744
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1160,7 +1186,7 @@ msgstr ""
 "assina, verifica, cifra ou decifra\n"
 "a opera��o por omiss�o depende dos dados de entrada\n"
 
-#: g10/g10.c:751
+#: g10/g10.c:755
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1168,462 +1194,472 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:754
+#: g10/g10.c:758
 msgid "Pubkey: "
 msgstr "Chave p�blica: "
 
-#: g10/g10.c:760 g10/keyedit.c:2141
+#: g10/g10.c:764 g10/keyedit.c:2248
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/g10.c:766
+#: g10/g10.c:770
 msgid "Hash: "
 msgstr "Dispers�o: "
 
-#: g10/g10.c:772 g10/keyedit.c:2187
+#: g10/g10.c:776 g10/keyedit.c:2294
 msgid "Compression: "
 msgstr "Compress�o: "
 
-#: g10/g10.c:855
+#: g10/g10.c:859
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/g10.c:1003
+#: g10/g10.c:1007
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
-#: g10/g10.c:1021
+#: g10/g10.c:1025
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "nenhum sinal = encontrada na defini��o de grupo \"%s\"\n"
 
-#: g10/g10.c:1218
+#: g10/g10.c:1222
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/g10.c:1221
+#: g10/g10.c:1225
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/g10.c:1224
+#: g10/g10.c:1228
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/g10.c:1230
+#: g10/g10.c:1234
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/g10.c:1233
+#: g10/g10.c:1237
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1240
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/g10.c:1242
+#: g10/g10.c:1246
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/g10.c:1245
+#: g10/g10.c:1249
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/g10.c:1248
+#: g10/g10.c:1252
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1258
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/g10.c:1257
+#: g10/g10.c:1261
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/g10.c:1260
+#: g10/g10.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/g10.c:1401
+#: g10/g10.c:1405
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "criado um novo ficheiro de configura��o `%s'\n"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1802
 #, 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/g10.c:1838
+#: g10/g10.c:1844
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: ficheiro de op��es por omiss�o `%s' inexistente\n"
 
-#: g10/g10.c:1842
+#: g10/g10.c:1848
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de op��es `%s': %s\n"
 
-#: g10/g10.c:1849
+#: g10/g10.c:1855
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/g10.c:2076
+#: g10/g10.c:2082
 #, 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/g10.c:2293
+#: g10/g10.c:2236 g10/g10.c:2248
+#, fuzzy, c-format
+msgid "`%s' is not a valid signature expiration\n"
+msgstr "%s n�o � um conjunto de caracteres v�lido\n"
+
+#: g10/g10.c:2321
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3683
+#: g10/g10.c:2340 g10/keyedit.c:3862
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2346
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2349
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2356
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2359
 msgid "invalid import options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2366
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2369
 msgid "invalid export options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2376
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2379
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2401
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2404
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2411
 #, 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/g10.c:2573
+#: g10/g10.c:2602
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2606
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sobrep�e %s\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2615
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2618
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:2603
+#: g10/g10.c:2625
+#, 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/g10.c:2640
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/g10.c:2617
+#: g10/g10.c:2654
 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/g10.c:2623
+#: g10/g10.c:2660
 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/g10.c:2629
+#: g10/g10.c:2666
 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/g10.c:2642
+#: g10/g10.c:2679
 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/g10.c:2712 g10/g10.c:2736
+#: g10/g10.c:2746 g10/g10.c:2770
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/g10.c:2718 g10/g10.c:2742
+#: g10/g10.c:2752 g10/g10.c:2776
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado � inv�lido\n"
 
-#: g10/g10.c:2724
+#: g10/g10.c:2758
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2764
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" de certifica��o selecionado � inv�lido\n"
 
-#: g10/g10.c:2745
+#: g10/g10.c:2779
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:2747
+#: g10/g10.c:2781
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2783
 #, 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/g10.c:2751
+#: g10/g10.c:2785
 #, 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/g10.c:2753
+#: g10/g10.c:2787
 #, 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/g10.c:2756
+#: g10/g10.c:2790
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2794
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/g10.c:2767
+#: g10/g10.c:2801
 msgid "invalid default preferences\n"
 msgstr "prefer�ncias por omiss�o inv�lidas\n"
 
-#: g10/g10.c:2776
+#: g10/g10.c:2810
 msgid "invalid personal cipher preferences\n"
 msgstr "prefer�ncias pessoais de cifra inv�lidas\n"
 
-#: g10/g10.c:2780
+#: g10/g10.c:2814
 msgid "invalid personal digest preferences\n"
 msgstr "prefer�ncias pessoais de 'digest' inv�lidas\n"
 
-#: g10/g10.c:2784
+#: g10/g10.c:2818
 msgid "invalid personal compress preferences\n"
 msgstr "prefer�ncias pessoais de compress�o inv�lidas\n"
 
-#: g10/g10.c:2817
+#: g10/g10.c:2851
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:2864
+#: g10/g10.c:2898
 #, 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/g10.c:2869
+#: g10/g10.c:2903
 #, 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/g10.c:2874
+#: g10/g10.c:2908
 #, 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/g10.c:2970
+#: g10/g10.c:3004
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: g10/g10.c:2981
+#: g10/g10.c:3015
 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/g10.c:2992
+#: g10/g10.c:3026
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
-#: g10/g10.c:2999
+#: g10/g10.c:3033
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3035
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/g10.c:3011
+#: g10/g10.c:3045
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:3024
+#: g10/g10.c:3058
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3060
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3029
+#: g10/g10.c:3063
 #, 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/g10.c:3047
+#: g10/g10.c:3081
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3094
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:3075
+#: g10/g10.c:3109
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:3077
+#: g10/g10.c:3111
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3080
+#: g10/g10.c:3114
 #, 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/g10.c:3100
+#: g10/g10.c:3134
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nome_do_ficheiro]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3143
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3168
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:3142
+#: g10/g10.c:3176
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/g10.c:3146
+#: g10/g10.c:3180
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/g10.c:3167
+#: g10/g10.c:3201
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: g10/g10.c:3238
+#: g10/g10.c:3272
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizador] [porta-chaves]"
 
-#: g10/g10.c:3275
+#: g10/g10.c:3309
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/g10.c:3277
+#: g10/g10.c:3311
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3313
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/g10.c:3290
+#: g10/g10.c:3324
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/g10.c:3300
+#: g10/g10.c:3334
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/g10.c:3341
+#: g10/g10.c:3375
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:3349
+#: g10/g10.c:3383
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/g10.c:3436
+#: g10/g10.c:3470
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de dispers�o inv�lido `%s'\n"
 
-#: g10/g10.c:3559
+#: g10/g10.c:3593
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3597
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/g10.c:3853
+#: g10/g10.c:3887
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1631,88 +1667,93 @@ msgstr ""
 "um nome de nota��o deve ter apenas caracteres imprim�veis ou espa�os, e "
 "terminar com um '='\n"
 
-#: g10/g10.c:3861
+#: g10/g10.c:3895
 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/g10.c:3871
+#: g10/g10.c:3900
+#, 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/g10.c:3911
 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/g10.c:3905
+#: g10/g10.c:3945
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica de certifica��o dada � inv�lida\n"
 
-#: g10/g10.c:3907
+#: g10/g10.c:3947
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/g10.c:3940
+#: g10/g10.c:3980
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "entradas demais no cache pk - desactivado\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2750
+#: g10/getkey.c:187 g10/getkey.c:2757
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Utilizador n�o encontrado]"
 
-#: g10/getkey.c:1677
+#: g10/getkey.c:1684
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Chave inv�lida %08lX tornada v�lida por --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2228
+#: g10/getkey.c:2235
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "h� uma chave secreta para a chave p�blica \"%s\"!\n"
 
-#: g10/getkey.c:2459
+#: g10/getkey.c:2466
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
 
-#: g10/getkey.c:2506
+#: g10/getkey.c:2513
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:74
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/gpgv.c:70
+#: g10/gpgv.c:75
 #, fuzzy
 msgid "take the keys from this keyring"
 msgstr "Remover esta chave do porta-chaves?"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:77
 #, fuzzy
 msgid "make timestamp conflicts only a warning"
 msgstr "conflito de \"timestamp\""
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:78
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|DF|escrever informa��es de estado para o\n"
 "descritor de ficheiro DF"
 
-#: g10/gpgv.c:97
+#: g10/gpgv.c:102
 #, fuzzy
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:105
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
 
-#: g10/helptext.c:48
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1722,7 +1763,7 @@ msgstr ""
 "terceiros. Precisamos dele implementar a rede de confian�a, que n�o tem\n"
 "nada a ver com a rede de certificados (implicitamente criada)."
 
-#: g10/helptext.c:54
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1735,20 +1776,20 @@ msgstr ""
 "para\n"
 "que esta chave seja de confian�a absoluta.\n"
 
-#: g10/helptext.c:61
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Se voc� quiser usar esta chave, n�o de confian�a, assim mesmo, responda \"sim"
 "\"."
 
-#: g10/helptext.c:65
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr ""
 "Digite o ID de utilizador do destinat�rio para quem quer enviar a\n"
 "mensagem."
 
-#: g10/helptext.c:69
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1762,7 +1803,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:83
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -1772,16 +1813,16 @@ msgstr ""
 "cifrar.  Este algoritmo s� deve ser utilizado em alguns dom�nios.\n"
 "Por favor consulte primeiro o seu perito em seguran�a."
 
-#: g10/helptext.c:90
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "Insira o tamanho da chave"
 
-#: g10/helptext.c:94 g10/helptext.c:99 g10/helptext.c:111 g10/helptext.c:143
-#: g10/helptext.c:171 g10/helptext.c:176 g10/helptext.c:181
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "Responda \"sim\" ou \"n�o\""
 
-#: g10/helptext.c:104
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1793,19 +1834,19 @@ msgstr ""
 "reac��o a erros - o sistema tentar� interpretar o valor dado como um "
 "intervalo."
 
-#: g10/helptext.c:116
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "Digite o nome do possuidor da chave"
 
-#: g10/helptext.c:121
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr "por favor digite um endere�o de email (opcional mas recomendado)"
 
-#: g10/helptext.c:125
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "Por favor digite um coment�rio (opcional)"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1819,11 +1860,11 @@ msgstr ""
 "O  para continuar a gera��o da chave.\n"
 "S  para interromper a gera��o da chave."
 
-#: g10/helptext.c:139
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Responda \"sim\" (ou apenas \"s\") se quiser gerar a subchave."
 
-#: g10/helptext.c:147
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -1895,12 +1936,12 @@ msgstr ""
 "\n"
 "Se n�o sabe qual � a resposta correcta, responda \"0\"."
 
-#: g10/helptext.c:185
+#: g10/helptext.c:186
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Responda \"sim\" se quiser assinar TODOS os IDs de utilizador"
 
-#: g10/helptext.c:189
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -1908,11 +1949,11 @@ msgstr ""
 "Responda \"sim\" se quiser realmente remover este ID de utilizador.\n"
 "Todos os certificados tamb�m ser�o perdidos!"
 
-#: g10/helptext.c:194
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Responda \"sim\" se quiser remover a subchave"
 
-#: g10/helptext.c:199
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -1922,7 +1963,7 @@ msgstr ""
 "remover esta assinatura porque ela pode ser importante para estabelecer\n"
 "uma conex�o de confian�a � chave ou a outra chave certificada por esta."
 
-#: g10/helptext.c:204
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -1934,13 +1975,13 @@ msgstr ""
 "porque a chave desta assinatura pode estabelecer uma conex�o de confian�a\n"
 "atrav�s de outra chave j� certificada."
 
-#: g10/helptext.c:210
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "A assinatura n�o � v�lida. Faz sentido remov�-la do seu porta-chaves."
 
-#: g10/helptext.c:214
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -1953,7 +1994,7 @@ msgstr ""
 "n�o consiga mais usar esta chave. Fa�a isto apenas se por alguma\n"
 "raz�o esta auto-assinatura n�o for v�lida e h� uma segunda dispon�vel."
 
-#: g10/helptext.c:222
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -1964,23 +2005,23 @@ msgstr ""
 "O 'timestamp' de todas as auto-assinaturas afectuadas ser� avan�ado\n"
 "em um segundo.\n"
 
-#: g10/helptext.c:229
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Por favor digite a frase secreta \n"
 
-#: g10/helptext.c:235
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Por favor repita a frase secreta, para ter certeza do que digitou."
 
-#: g10/helptext.c:239
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "D� o nome para o ficheiro ao qual a assinatura se aplica"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Responda \"sim\" se quiser escrever por cima do ficheiro"
 
-#: g10/helptext.c:249
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -1989,7 +2030,7 @@ msgstr ""
 "RETURN\n"
 "o ficheiro por omiss�o (que � mostrado entre par�nteses) ser� utilizado."
 
-#: g10/helptext.c:255
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2018,7 +2059,7 @@ msgstr ""
 "     n�o deve ser mais utilizado; normalmente utilizada para indicar\n"
 "     que um endere�o de email � inv�lido.\n"
 
-#: g10/helptext.c:271
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2028,474 +2069,479 @@ msgstr ""
 "este certificado de revoga��o. Por favor mantenha este texto conciso.\n"
 "Uma linha vazia termina o texto.\n"
 
-#: g10/helptext.c:286
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/helptext.c:294
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Nenhuma ajuda dispon�vel para `%s'"
 
-#: g10/import.c:247
+#: g10/import.c:248
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloco do tipo %d\n"
 
-#: g10/import.c:256
+#: g10/import.c:257
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu chaves processadas at� agora\n"
 
-#: g10/import.c:273
+#: g10/import.c:274
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "N�mero total processado: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      ignorei novas chaves: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:279
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sem IDs de utilizadores: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importados: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:287
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             n�o modificados: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          novos IDs de utilizadores: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        novas assinaturas: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   novas revoga��es de chaves: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chaves secretas importadas: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " chaves secretas n�o modificadas: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "        n�o importadas: %lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:544
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:545
+#: g10/import.c:546
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Assinou estes identificadores de utilizadores:\n"
 
-#: g10/import.c:582
+#: g10/import.c:583
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:594
+#: g10/import.c:595
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/import.c:606
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:620
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:646
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:694 g10/import.c:1048
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
 
-#: g10/import.c:713
+#: g10/import.c:714
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "chave %08lX: subchave HKP corrompida foi reparada\n"
 
-#: g10/import.c:728
+#: g10/import.c:729
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "chave %08lX: aceite ID de utilizador sem auto-assinatura '%s'\n"
 
-#: g10/import.c:734
+#: g10/import.c:735
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chave %08lX: sem IDs de utilizadores v�lidos\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
 
-#: g10/import.c:746 g10/import.c:1168
+#: g10/import.c:747 g10/import.c:1169
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
 
-#: g10/import.c:752
+#: g10/import.c:753
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chave %08lX: chave nova - ignorada\n"
 
-#: g10/import.c:761
+#: g10/import.c:762
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "n�o foi encontrada nenhum porta-chaves onde escrever: %s\n"
 
-#: g10/import.c:766 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "a escrever para `%s'\n"
 
-#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
-#: g10/import.c:2314 g10/import.c:2336
+#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
+#: g10/import.c:2315 g10/import.c:2337
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
-#: g10/import.c:791
+#: g10/import.c:792
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave p�blica \"%s\" importada\n"
 
-#: g10/import.c:815
+#: g10/import.c:816
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chave %08lX: n�o corresponde � nossa c�pia\n"
 
-#: g10/import.c:832 g10/import.c:1186
+#: g10/import.c:833 g10/import.c:1187
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel localizar bloco de chaves original: %s\n"
 
-#: g10/import.c:840 g10/import.c:1193
+#: g10/import.c:841 g10/import.c:1194
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel ler bloco de chaves original: %s\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chave %8lX: \"%s\" 1 novo ID de utilizador\n"
 
-#: g10/import.c:875
+#: g10/import.c:876
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
 
-#: g10/import.c:878
+#: g10/import.c:879
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: \"%s\" 1 nova assinatura\n"
 
-#: g10/import.c:881
+#: g10/import.c:882
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
 
-#: g10/import.c:884
+#: g10/import.c:885
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: \"%s\" 1 nova subchave\n"
 
-#: g10/import.c:887
+#: g10/import.c:888
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: \"%s\" %d novas subchaves\n"
 
-#: g10/import.c:908
+#: g10/import.c:909
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chave %08lX: \"%s\" n�o modificada\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1054
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "chave %08lX: chave secreta com cifra inv�lida %d - ignorada\n"
 
-#: g10/import.c:1064
+#: g10/import.c:1065
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/import.c:1081 g10/import.c:2329
+#: g10/import.c:1082 g10/import.c:2330
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "sem porta-chaves p�blico por omiss�o: %s\n"
 
-#: g10/import.c:1092
+#: g10/import.c:1093
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1122
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chave %08lX: j� est� no porta-chaves secreto\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1132
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta n�o encontrada: %s\n"
 
-#: g10/import.c:1161
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chave %08lX: sem chave p�blica - imposs�vel aplicar certificado\n"
 "de revoga��o\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1205
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - rejeitado\n"
 
-#: g10/import.c:1236
+#: g10/import.c:1237
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: \"%s\" certificado de revoga��o importado\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1302
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "chave %08lX: nenhum ID de utilizador para assinatura\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1317
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "chave %08lX: algoritmo de chave p�blica n�o suportado no utilizador \"%s\"\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inv�lida do utilizador \"%s\"\n"
 
-#: g10/import.c:1336
+#: g10/import.c:1337
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/import.c:1347 g10/import.c:1397
+#: g10/import.c:1348 g10/import.c:1398
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
 
-#: g10/import.c:1349
+#: g10/import.c:1350
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1365
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chave %08lX: apagada liga��o m�ltipla de subchave \n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "chave %08lX: sem subchave para revoca��o de chave\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chave %08lX: revoca��o de subchave inv�lida\n"
 
-#: g10/import.c:1414
+#: g10/import.c:1415
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chave %08lX: removida revoga��o m�ltiplace de subchaves\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1457
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chave %08lX: ignorado ID de utilizador '"
 
-#: g10/import.c:1477
+#: g10/import.c:1478
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
 
-#: g10/import.c:1504
+#: g10/import.c:1505
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
 
-#: g10/import.c:1514
+#: g10/import.c:1515
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o no local errado - ignorado\n"
 
-#: g10/import.c:1531
+#: g10/import.c:1532
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - ignorado\n"
 
-#: g10/import.c:1545
+#: g10/import.c:1546
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "chave %08lX: assintura da subchave no local errado - ignorado\n"
 
-#: g10/import.c:1553
+#: g10/import.c:1554
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chave %08lX: classe de assinatura inesperada (%02x) - ignorada\n"
 
-#: g10/import.c:1574
+#: g10/import.c:1575
 #, fuzzy, c-format
 msgid "key %s: expired signature from key %s - skipped\n"
 msgstr "chave %08lX: classe de assinatura inesperada (%02x) - ignorada\n"
 
-#: g10/import.c:1677
+#: g10/import.c:1678
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: detectado ID de utilizador duplicado - fundido\n"
 
-#: g10/import.c:1739
+#: g10/import.c:1740
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: a transferir a chave de revoca��o %"
 "08lX\n"
 
-#: g10/import.c:1753
+#: g10/import.c:1754
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: chave de revoca��o %08lX n�o "
 "presente.\n"
 
-#: g10/import.c:1812
+#: g10/import.c:1813
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
 
-#: g10/import.c:1846
+#: g10/import.c:1847
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: assinatura directa de chave adicionada\n"
 
-#: g10/import.c:2235
+#: g10/import.c:2236
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2243
+#: g10/import.c:2244
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/import.c:2245
+#: g10/import.c:2246
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/keydb.c:167
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "erro ao criar porta-chaves `%s': %s\n"
 
-#: g10/keydb.c:174
+#: g10/keydb.c:175
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "porta-chaves `%s' criado\n"
 
-#: g10/keydb.c:685
+#: g10/keydb.c:316 g10/keydb.c:319
+#, fuzzy, c-format
+msgid "keyblock resource `%s': %s\n"
+msgstr "erro ao criar `%s': %s\n"
+
+#: g10/keydb.c:698
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[revoga��o]"
 
-#: g10/keyedit.c:255
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[auto-assinatura]"
 
-#: g10/keyedit.c:333 g10/keylist.c:405
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 assinatura incorrecta\n"
 
-#: g10/keyedit.c:335 g10/keylist.c:407
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d assinaturas incorrectas\n"
 
-#: g10/keyedit.c:337 g10/keylist.c:409
+#: g10/keyedit.c:344 g10/keylist.c:410
 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:339 g10/keylist.c:411
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, 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:341 g10/keylist.c:413
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 assinatura n�o verificada devido a um erro\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:415
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d assinaturas n�o verificadas devido a erros\n"
 
-#: g10/keyedit.c:345
+#: g10/keyedit.c:352
 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:347
+#: g10/keyedit.c:354
 #, 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:403 g10/pkclist.c:262
+#: g10/keyedit.c:410 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2508,53 +2554,63 @@ msgstr ""
 "(vendo passaportes, verificando impress�es digitais...)?\n"
 "\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:274
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Confio moderadamente\n"
 
-#: g10/keyedit.c:408 g10/pkclist.c:276
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Confio plenamente\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:434
 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:443
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
-#: g10/keyedit.c:858 g10/keyedit.c:1642
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1728
 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:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
-#: g10/keyedit.c:1648
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
+#: g10/keyedit.c:1734
 msgid "  Unable to sign.\n"
 msgstr "  N�o foi poss�vel assinar.\n"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:622
 #, fuzzy, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:650
 #, 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:676
+#: g10/keyedit.c:678
+#, fuzzy, c-format
+msgid "User ID \"%s\" is signable.  "
+msgstr "AVISO: o ID do utilizador \"%s\" n�o � auto-assinado.\n"
+
+#: g10/keyedit.c:680
+#, fuzzy
+msgid "Sign it? (y/N) "
+msgstr "Realmente assinar? "
+
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2563,11 +2619,11 @@ msgstr ""
 "A sua auto-assinatura em \"%s\"\n"
 "� uma assinatura do tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:711
 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:699
+#: g10/keyedit.c:725
 #, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2576,12 +2632,12 @@ msgstr ""
 "A sua assinatura actual em \"%s\"\n"
 "� uma assinatura local.\n"
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:729
 #, 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:724
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2590,55 +2646,55 @@ msgstr ""
 "A sua assinatura actual em \"%s\"\n"
 "� uma assinatura local.\n"
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:754
 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:749
+#: g10/keyedit.c:775
 #, 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:752
+#: g10/keyedit.c:778
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" j� foi assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:783
 #, 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:779
+#: g10/keyedit.c:805
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "Esta chave expirou!"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave vai expirar em %s.\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:844
 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:851
+#: g10/keyedit.c:882
 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:853
+#: g10/keyedit.c:884
 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:878
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2648,31 +2704,31 @@ msgstr ""
 "pertence\n"
 "� pessoa correcta? Se n�o sabe o que responder, escolha \"0\".\n"
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) N�o vou responder.%s\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) N�o verifiquei.%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Verifiquei por alto.%s\n"
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Verifiquei com bastante cuidado.%s\n"
 
-#: g10/keyedit.c:895
+#: g10/keyedit.c:926
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:950
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2681,100 +2737,100 @@ msgstr ""
 "Voc� tem certeza de que quer assinar esta chave com\n"
 "a sua chave: \""
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Isto ser� uma auto-assinatura.\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:963
 #, 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:940
+#: g10/keyedit.c:971
 #, 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:950
+#: g10/keyedit.c:981
 #, 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:957
+#: g10/keyedit.c:988
 #, 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:964
+#: g10/keyedit.c:995
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "N�o verifiquei esta chave.\n"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1000
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Verifiquei por alto esta chave.\n"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1005
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Verifiquei esta chave com muito cuidado.\n"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1015
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:1029 g10/keyedit.c:4132 g10/keyedit.c:4223 g10/keyedit.c:4287
-#: g10/keyedit.c:4348 g10/sign.c:369
+#: g10/keyedit.c:1060 g10/keyedit.c:4350 g10/keyedit.c:4441 g10/keyedit.c:4505
+#: g10/keyedit.c:4566 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1105 g10/keygen.c:3057
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:1109 g10/keygen.c:3045
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 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:1113 g10/keygen.c:3060
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 #, 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:1117 g10/keygen.c:3064
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Imposs�vel editar esta chave: %s\n"
 
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2782,11 +2838,11 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:1825
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez"
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2794,195 +2850,195 @@ msgstr ""
 "Voc� n�o quer uma frase secreta - provavelmente isto � uma *m�* id�ia!\n"
 "\n"
 
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1195
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Voc� quer realmente fazer isso? "
 
-#: g10/keyedit.c:1235
+#: g10/keyedit.c:1266
 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:1319
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:1322
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/keyedit.c:1323
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de utilizadores"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "seleciona ID de utilizador N"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "seleciona ID de utilizador N"
 
-#: g10/keyedit.c:1327
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:1330
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1335
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:1337
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Sugest�o: Selecione os IDs de utilizador para assinar\n"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1343
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "adiciona um novo ID de utilizador"
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "adiciona um identificador fotogr�fico"
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "remove ID de utilizador"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "remove uma chave secund�ria"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr "adiciona uma chave de revoca��o"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1402
 #, 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:1372
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "seleccionar o identificador do utilizador como prim�rio"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "lista prefer�ncias (perito)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "lista prefer�ncias (detalhadamente)"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1418
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "muda os valores de confian�a"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1426
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Realmente revocar todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revocar um ID de utilizador"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoga uma chave secund�ria"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "enable key"
 msgstr "activa uma chave"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "disable key"
 msgstr "desactiva uma chave"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1436
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "mostrar identificador fotogr�fico"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1556
 #, 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:1494
+#: g10/keyedit.c:1574
 msgid "Secret key is available.\n"
 msgstr "Chave secreta dispon�vel.\n"
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1655
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta � necess�ria para fazer isto.\n"
 
-#: g10/keyedit.c:1579
+#: g10/keyedit.c:1663
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor utilize o comando \"toggle\" primeiro.\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1682
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -2990,237 +3046,242 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1722
 msgid "Key is revoked."
 msgstr "A chave est� revogada."
 
-#: g10/keyedit.c:1657
+#: g10/keyedit.c:1741
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Realmente assinar todos os IDs de utilizador? "
 
-#: g10/keyedit.c:1660
-msgid "Hint: Select the user IDs to sign\n"
-msgstr "Sugest�o: Selecione os IDs de utilizador para assinar\n"
-
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1748
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "classe de assinatura desconhecida"
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1771
 #, 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:1713 g10/keyedit.c:1733 g10/keyedit.c:1899
+#: g10/keyedit.c:1793 g10/keyedit.c:1813 g10/keyedit.c:1979
 msgid "You must select at least one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de utilizador.\n"
 
-#: g10/keyedit.c:1715
+#: g10/keyedit.c:1795
 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:1717
+#: g10/keyedit.c:1797
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:1718
+#: g10/keyedit.c:1798
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Realmente remover este ID de utilizador? "
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1848
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Realmente remover este ID de utilizador? "
 
-#: g10/keyedit.c:1780
+#: g10/keyedit.c:1860
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1808
+#: g10/keyedit.c:1888
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1822
+#: g10/keyedit.c:1902
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1919
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "erro ao criar porta-chaves `%s': %s\n"
 
-#: g10/keyedit.c:1863
+#: g10/keyedit.c:1943
 msgid "You must select at least one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1946
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Voc� quer realmente remover as chaves selecionadas? "
 
-#: g10/keyedit.c:1867
+#: g10/keyedit.c:1947
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Voc� quer realmente remover esta chave? "
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1982
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Realmente revocar todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1983
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Realmente revocar este ID de utilizador? "
 
-#: g10/keyedit.c:1921
+#: g10/keyedit.c:2001
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Voc� quer realmente revogar esta chave? "
 
-#: g10/keyedit.c:1932
+#: g10/keyedit.c:2012
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Voc� quer realmente revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:1934
+#: g10/keyedit.c:2014
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Voc� quer realmente revogar esta chave? "
 
-#: g10/keyedit.c:1975
+#: g10/keyedit.c:2055
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2007
+#: g10/keyedit.c:2087
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "configurar lista de prefer�ncias"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2093
 #, 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:2015
+#: g10/keyedit.c:2095
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Realmente actualizar as prefer�ncias?"
 
-#: g10/keyedit.c:2065
+#: g10/keyedit.c:2157
+#, fuzzy, c-format
+msgid "Unable to clean `%s'\n"
+msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
+
+#: g10/keyedit.c:2160
+msgid "Please specify item to clean: `sigs', `uids', or `all'\n"
+msgstr ""
+
+#: g10/keyedit.c:2171
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Gravar altera��es? "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2174
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Sair sem gravar? "
 
-#: g10/keyedit.c:2078
+#: g10/keyedit.c:2184
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2191
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:2092
+#: g10/keyedit.c:2198
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave n�o alterada, nenhuma actualiza��o � necess�ria.\n"
 
-#: g10/keyedit.c:2164
+#: g10/keyedit.c:2271
 msgid "Digest: "
 msgstr "'Digest': "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2323
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:2227
+#: g10/keyedit.c:2334
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2242 g10/keylist.c:307
+#: g10/keyedit.c:2349 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2473
+#: g10/keyedit.c:2580
 #, 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:2494
+#: g10/keyedit.c:2601
 #, 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:2500
+#: g10/keyedit.c:2607
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sens�vel)"
 
-#: g10/keyedit.c:2516 g10/keyedit.c:2572 g10/keyedit.c:2684 g10/keyedit.c:2699
-#: g10/keylist.c:193 g10/keyserver.c:422
+#: g10/keyedit.c:2623 g10/keyedit.c:2679 g10/keyedit.c:2792 g10/keyedit.c:2807
+#: g10/keylist.c:194 g10/keyserver.c:421
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keyedit.c:2519 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:931
+#: g10/keyedit.c:2626 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:948
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revkey"
 
-#: g10/keyedit.c:2521 g10/keylist.c:757 g10/keylist.c:886
+#: g10/keyedit.c:2628 g10/keylist.c:758 g10/keylist.c:887
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[expira: %s]"
 
-#: g10/keyedit.c:2523 g10/keyedit.c:2574 g10/keyedit.c:2686 g10/keyedit.c:2701
-#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
-#: g10/keylist.c:913 g10/keyserver.c:428 g10/mainproc.c:937
+#: g10/keyedit.c:2630 g10/keyedit.c:2681 g10/keyedit.c:2794 g10/keyedit.c:2809
+#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
+#: g10/keylist.c:914 g10/keyserver.c:427 g10/mainproc.c:954
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[expira: %s]"
 
-#: g10/keyedit.c:2525
+#: g10/keyedit.c:2632
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:2540
+#: g10/keyedit.c:2647
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2651
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2658
 msgid "This key has been disabled"
 msgstr "Esta chave foi desactivada"
 
-#: g10/keyedit.c:2579 g10/keylist.c:199
+#: g10/keyedit.c:2686 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2754
 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:2654
+#: g10/keyedit.c:2762
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3228,25 +3289,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:2718 g10/keyserver.c:432 g10/mainproc.c:1577
-#: g10/trustdb.c:1178
+#: g10/keyedit.c:2826 g10/keyedit.c:3201 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1690
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
-#: g10/keyedit.c:2720 g10/keyserver.c:436 g10/mainproc.c:1579
-#: g10/trustdb.c:531
+#: g10/keyedit.c:2828 g10/keyedit.c:3203 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1692
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2893
 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:2845
+#: g10/keyedit.c:2953
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3255,46 +3316,76 @@ msgstr ""
 "AVISO: Esta chave � do tipo PGP2. Se adicionar um identificador fotogr�fico\n"
 "       algumas vers�o do PGP podem rejeit�-la.\n"
 
-#: g10/keyedit.c:2850 g10/keyedit.c:3128
+#: g10/keyedit.c:2958 g10/keyedit.c:3307
 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:2856
+#: g10/keyedit.c:2964
 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:2996
+#: g10/keyedit.c:3104
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Apagar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3114
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Apagar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:3010
+#: g10/keyedit.c:3118
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Apagar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:3016
+#: g10/keyedit.c:3124
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:3030
+#: g10/keyedit.c:3138
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3139
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:3034
+#: g10/keyedit.c:3142
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:3123
+#: g10/keyedit.c:3167
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed.\n"
+msgstr "Utilizador \"%s\" est� revocado."
+
+#: g10/keyedit.c:3168
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed.\n"
+msgstr "Utilizador \"%s\" est� revocado."
+
+#: g10/keyedit.c:3173
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean.\n"
+msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
+
+#: g10/keyedit.c:3205 g10/trustdb.c:1694
+#, fuzzy
+msgid "invalid"
+msgstr "armadura inv�lida"
+
+#: g10/keyedit.c:3207
+#, fuzzy, c-format
+msgid "User ID \"%s\" removed: %s\n"
+msgstr "Utilizador \"%s\" est� revocado."
+
+#: g10/keyedit.c:3214
+#, fuzzy
+msgid "No user IDs are removable.\n"
+msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
+
+#: g10/keyedit.c:3302
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3303,342 +3394,347 @@ 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:3134
+#: g10/keyedit.c:3313
 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:3154
+#: g10/keyedit.c:3333
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Insira o ID de utilizador do revogador escolhido: "
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3356
 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:3192
+#: g10/keyedit.c:3371
 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:3214
+#: g10/keyedit.c:3393
 #, 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:3233
+#: g10/keyedit.c:3412
 #, 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:3239
+#: g10/keyedit.c:3418
 #, 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:3300
+#: g10/keyedit.c:3479
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as selec��es das chaves secretas.\n"
 
-#: g10/keyedit.c:3306
+#: g10/keyedit.c:3485
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor seleccione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3310
+#: g10/keyedit.c:3489
 #, 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:3313
+#: g10/keyedit.c:3492
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificar a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:3359
+#: g10/keyedit.c:3538
 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:3375
+#: g10/keyedit.c:3554
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/keyedit.c:3455
+#: g10/keyedit.c:3634
 msgid "Please select exactly one user ID.\n"
 msgstr "Seleccione exactamente um identificador de utilizador.\n"
 
-#: g10/keyedit.c:3494 g10/keyedit.c:3604 g10/keyedit.c:3724
+#: g10/keyedit.c:3673 g10/keyedit.c:3783 g10/keyedit.c:3903
 #, 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:3665
+#: g10/keyedit.c:3844
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3745
+#: g10/keyedit.c:3924
 #, 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:3746
+#: g10/keyedit.c:3925
 #, 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:3808
+#: g10/keyedit.c:3987
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:3854
+#: g10/keyedit.c:4045
+#, fuzzy, c-format
+msgid "No user ID with hash %s\n"
+msgstr "Nenhum ID de utilizador com �ndice %d\n"
+
+#: g10/keyedit.c:4072
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:3971
+#: g10/keyedit.c:4189
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de utilizador: \""
 
-#: g10/keyedit.c:3974 g10/keyedit.c:4038 g10/keyedit.c:4081
+#: g10/keyedit.c:4192 g10/keyedit.c:4256 g10/keyedit.c:4299
 #, 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:3976 g10/keyedit.c:4040 g10/keyedit.c:4083
+#: g10/keyedit.c:4194 g10/keyedit.c:4258 g10/keyedit.c:4301
 msgid " (non-exportable)"
 msgstr "  (n�o-export�vel)"
 
-#: g10/keyedit.c:3980
+#: g10/keyedit.c:4198
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/keyedit.c:3984
+#: g10/keyedit.c:4202
 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:3988
+#: g10/keyedit.c:4206
 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:4015
+#: g10/keyedit.c:4233
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Assinou estes identificadores de utilizadores:\n"
 
-#: g10/keyedit.c:4041
+#: g10/keyedit.c:4259
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "  (n�o-export�vel)"
 
-#: g10/keyedit.c:4048
+#: g10/keyedit.c:4266
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:4070
+#: g10/keyedit.c:4288
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:4090
+#: g10/keyedit.c:4308
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente criar os certificados de revoga��o? (s/N) "
 
-#: g10/keyedit.c:4120
+#: g10/keyedit.c:4338
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4408
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4425
 #, 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:4271
+#: g10/keyedit.c:4489
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:4333
+#: g10/keyedit.c:4551
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4646
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "A mostrar a fotografia %s com o tamanho %ld da chave 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:293
+#: g10/keygen.c:258
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "prefer�ncia %c%lu duplicada\n"
 
-#: g10/keygen.c:300
+#: g10/keygen.c:265
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "demasiadas prefer�ncias `%c'\n"
 
-#: g10/keygen.c:302
+#: g10/keygen.c:267
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "demasiadas prefer�ncias `%c'\n"
 
-#: g10/keygen.c:304
+#: g10/keygen.c:269
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "demasiadas prefer�ncias `%c'\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:394
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "caracter inv�lido na cadeia de caract�res da prefer�ncia\n"
 
-#: g10/keygen.c:829
+#: g10/keygen.c:822
 msgid "writing direct signature\n"
 msgstr "a escrever a assinatura directa\n"
 
-#: g10/keygen.c:868
+#: g10/keygen.c:861
 msgid "writing self signature\n"
 msgstr "a escrever a auto-assinatura\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing key binding signature\n"
 msgstr "a escrever a assinatura ligada a uma chave\n"
 
-#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2632
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tamanho de chave inv�lido; a utilizar %u bits\n"
 
-#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2638
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tamanho da chave arredondado para %u bits\n"
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1239
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1252
+#: g10/keygen.c:1242
 #, fuzzy
 msgid "Encrypt"
 msgstr "cifrar dados"
 
-#: g10/keygen.c:1255
+#: g10/keygen.c:1245
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1263
+#: g10/keygen.c:1253
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1268
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1282
+#: g10/keygen.c:1272
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1287
+#: g10/keygen.c:1277
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1290
+#: g10/keygen.c:1280
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (apenas cifragem)\n"
 
-#: g10/keygen.c:1293
+#: g10/keygen.c:1283
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1296
+#: g10/keygen.c:1286
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1340
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1342
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (por omiss�o)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1343
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1345
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:1357
+#: g10/keygen.c:1347
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas cifragem)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1348
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1350
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:1362
+#: g10/keygen.c:1352
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:1431 g10/keygen.c:2509
+#: g10/keygen.c:1421 g10/keygen.c:2506
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "O par de chaves DSA ter� 1024 bits.\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1431
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1438
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Qual o tamanho de chave desejado? (1024) "
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1452
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1468
+#: g10/keygen.c:1458
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:1473 g10/keygen.c:1478
+#: g10/keygen.c:1463 g10/keygen.c:1468
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1515
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3654,7 +3750,7 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1526
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3670,39 +3766,40 @@ msgstr ""
 "      <n>m = assinatura expira em n meses\n"
 "      <n>y = assinatura expira em n anos\n"
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1549
 msgid "Key is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:1563
-msgid "Signature is valid for? (0) "
+#: g10/keygen.c:1554
+#, fuzzy, c-format
+msgid "Signature is valid for? (%s) "
 msgstr "A assinatura � valida por? (0) "
 
-#: g10/keygen.c:1568
+#: g10/keygen.c:1572
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:1575
+#: g10/keygen.c:1579
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "A %s n�o expira nunca\n"
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1580
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "A %s n�o expira nunca\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1585
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s expira em %s\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1586
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1592
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3710,12 +3807,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:1595
+#: g10/keygen.c:1597
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Est� correto (s/n)? "
 
-#: g10/keygen.c:1638
+#: g10/keygen.c:1641
 #, fuzzy
 msgid ""
 "\n"
@@ -3733,44 +3830,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1651
+#: g10/keygen.c:1654
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:1659
+#: g10/keygen.c:1662
 msgid "Invalid character in name\n"
 msgstr "Caracter inv�lido no nome\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1664
 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:1663
+#: g10/keygen.c:1666
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1674
 msgid "Email address: "
 msgstr "Endere�o de correio eletr�nico: "
 
-#: g10/keygen.c:1682
+#: g10/keygen.c:1685
 msgid "Not a valid email address\n"
 msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: g10/keygen.c:1690
+#: g10/keygen.c:1693
 msgid "Comment: "
 msgstr "Coment�rio: "
 
-#: g10/keygen.c:1696
+#: g10/keygen.c:1699
 msgid "Invalid character in comment\n"
 msgstr "Caracter inv�lido no coment�rio\n"
 
-#: g10/keygen.c:1719
+#: g10/keygen.c:1722
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:1725
+#: g10/keygen.c:1728
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3781,7 +3878,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1733
 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 "
@@ -3798,23 +3895,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1746
+#: g10/keygen.c:1749
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:1756
+#: g10/keygen.c:1759
 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:1757
+#: g10/keygen.c:1760
 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:1776
+#: g10/keygen.c:1779
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primeiro o erro\n"
 
-#: g10/keygen.c:1816
+#: g10/keygen.c:1819
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3822,12 +3919,12 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger a sua chave.\n"
 "\n"
 
-#: g10/keygen.c:1826 g10/passphrase.c:1105
+#: g10/keygen.c:1829 g10/passphrase.c:786
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1832
+#: g10/keygen.c:1835
 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"
@@ -3839,7 +3936,7 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1857
 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"
@@ -3851,50 +3948,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:2578
+#: g10/keygen.c:2575
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:2766 g10/keygen.c:2910
+#: g10/keygen.c:2774 g10/keygen.c:2918
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "a escrever chave p�blica para `%s'\n"
 
-#: g10/keygen.c:2768 g10/keygen.c:2913
+#: g10/keygen.c:2776 g10/keygen.c:2921
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/keygen.c:2771 g10/keygen.c:2916
+#: g10/keygen.c:2779 g10/keygen.c:2924
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2907
 #, 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:2905
+#: g10/keygen.c:2913
 #, 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:2923
+#: g10/keygen.c:2931
 #, 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:2930
+#: g10/keygen.c:2938
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: g10/keygen.c:2953
+#: g10/keygen.c:2961
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:2964
+#: g10/keygen.c:2972
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -3903,12 +4000,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:2976 g10/keygen.c:3105 g10/keygen.c:3220
+#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3156 g10/sign.c:290
+#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -3916,7 +4013,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3030 g10/keygen.c:3158 g10/sign.c:292
+#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -3924,370 +4021,351 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3039 g10/keygen.c:3169
+#: g10/keygen.c:3047 g10/keygen.c:3177
 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:3078 g10/keygen.c:3202
+#: g10/keygen.c:3086 g10/keygen.c:3210
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Realmente criar? "
 
-#: g10/keygen.c:3355
+#: g10/keygen.c:3363
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: g10/keygen.c:3402
+#: g10/keygen.c:3410
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "imposs�vel criar `%s': %s\n"
 
-#: g10/keygen.c:3428
+#: g10/keygen.c:3436
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chave secreta %08lX expirou em %s\n"
 
-#: g10/keygen.c:3508
-#, c-format
-msgid "length of RSA modulus is not %d\n"
-msgstr ""
-
-#: g10/keygen.c:3514
-msgid "public exponent too large (more than 32 bits)\n"
-msgstr ""
-
-#: g10/keygen.c:3520 g10/keygen.c:3526
-#, c-format
-msgid "length of an RSA prime is not %d\n"
-msgstr ""
-
-#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
+#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
 msgid "never     "
 msgstr ""
 
-#: g10/keylist.c:264
+#: g10/keylist.c:265
 msgid "Critical signature policy: "
 msgstr "Politica de assinatura cr�tica: "
 
-#: g10/keylist.c:266
+#: g10/keylist.c:267
 msgid "Signature policy: "
 msgstr "Politica de assinatura: "
 
-#: g10/keylist.c:305
+#: g10/keylist.c:306
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:354 g10/keylist.c:398
+#: 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:372
+#: g10/keylist.c:373
 msgid "Critical signature notation: "
 msgstr "Nota��o de assinatura cr�tica: "
 
-#: g10/keylist.c:374
+#: g10/keylist.c:375
 msgid "Signature notation: "
 msgstr "Nota��o de assinatura: "
 
-#: g10/keylist.c:385
+#: g10/keylist.c:386
 msgid "not human readable"
 msgstr "n�o leg�vel por humanos"
 
-#: g10/keylist.c:486
+#: g10/keylist.c:487
 msgid "Keyring"
 msgstr "Porta-chaves"
 
-#: g10/keylist.c:792
+#: g10/keylist.c:793
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr "[expira: %s]"
 
-#: g10/keylist.c:1488
+#: g10/keylist.c:1489
 msgid "Primary key fingerprint:"
 msgstr "Impress�o da chave prim�ria:"
 
-#: g10/keylist.c:1490
+#: g10/keylist.c:1491
 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:1497
+#: g10/keylist.c:1498
 msgid " Primary key fingerprint:"
 msgstr "Impress�o da chave prim�ria:"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1500
 msgid "      Subkey fingerprint:"
 msgstr "      Impress�o da subchave:"
 
-#: g10/keylist.c:1503 g10/keylist.c:1507
+#: g10/keylist.c:1504 g10/keylist.c:1508
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "  Impress�o da chave ="
 
-#: g10/keylist.c:1574
+#: g10/keylist.c:1575
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1245
+#: g10/keyring.c:1246
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1252
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVISO: existem 2 ficheiros com informa��es confidenciais.\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � o n�o modificado\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1255
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � o novo\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1256
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor conserte esta poss�vel falha de seguran�a\n"
 
-#: g10/keyring.c:1375
+#: g10/keyring.c:1376
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "a verificar o porta chaves `%s'\n"
 
-#: g10/keyring.c:1421
+#: g10/keyring.c:1422
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu chave verificadas (%lu assinaturas)\n"
 
-#: g10/keyring.c:1433
+#: g10/keyring.c:1434
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu chave verificadas (%lu assinaturas)\n"
 
-#: g10/keyring.c:1504
+#: g10/keyring.c:1505
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: porta-chaves criado\n"
 
-#: g10/keyserver.c:107
+#: g10/keyserver.c:105
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "AVISO: op��es em `%s' ainda n�o est�o activas nesta execu��o\n"
 
-#: g10/keyserver.c:434
+#: g10/keyserver.c:433
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:635
+#: g10/keyserver.c:634
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:718 g10/keyserver.c:1238
+#: g10/keyserver.c:717 g10/keyserver.c:1267
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/keyserver.c:808
+#: g10/keyserver.c:815
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/keyserver.c:810
+#: g10/keyserver.c:817
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/keyserver.c:985
+#: g10/keyserver.c:1014
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:989
+#: g10/keyserver.c:1018
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1141
+#: g10/keyserver.c:1170
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "assinado com a sua chave %08lX em %s\n"
 
-#: g10/keyserver.c:1188
+#: g10/keyserver.c:1217
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1191
+#: g10/keyserver.c:1220
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1198 g10/keyserver.c:1293
+#: g10/keyserver.c:1227 g10/keyserver.c:1322
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1275
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1255
+#: g10/keyserver.c:1284
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1314
+#: g10/keyserver.c:1343
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1320
+#: g10/keyserver.c:1349
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1361
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1366
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1374
 #, c-format
-msgid "gpgkeys_%s does not support handler version %d\n"
+msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1351
+#: g10/keyserver.c:1381
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1356
+#: g10/keyserver.c:1386
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1365
+#: g10/keyserver.c:1395
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keyserver.c:1390 g10/keyserver.c:1424
+#: g10/keyserver.c:1420 g10/keyserver.c:1454
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1681
+#: g10/keyserver.c:1711
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/keyserver.c:1703
+#: g10/keyserver.c:1733
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1705
+#: g10/keyserver.c:1735
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:249
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "tamanho estranho para uma chave de sess�o cifrada (%d)\n"
 
-#: g10/mainproc.c:262
-#, fuzzy, c-format
-msgid "bad passphrase or unknown cipher algorithm (%d)\n"
-msgstr "algoritmo de criptografia desconhecido"
-
-#: g10/mainproc.c:299
+#: g10/mainproc.c:300
 #, fuzzy, c-format
 msgid "%s encrypted session key\n"
 msgstr "tamanho estranho para uma chave de sess�o cifrada (%d)\n"
 
-#: g10/mainproc.c:309
+#: g10/mainproc.c:310
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "cifrado com algoritmo desconhecido %d\n"
 
-#: g10/mainproc.c:375
+#: g10/mainproc.c:376
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "a chave p�blica � %08lX\n"
 
-#: g10/mainproc.c:430
+#: g10/mainproc.c:431
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados cifrados com chave p�blica: DEK v�lido\n"
 
-#: g10/mainproc.c:463
+#: g10/mainproc.c:464
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "cifrado com chave %u-bit %s, ID %08lX, criada em %s\n"
 
-#: g10/mainproc.c:467 g10/pkclist.c:218
+#: g10/mainproc.c:468 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:472
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifragem de chave p�blica falhou: %s\n"
 
-#: g10/mainproc.c:499
+#: g10/mainproc.c:500
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Repita a frase secreta\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:502
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Repita a frase secreta\n"
 
-#: g10/mainproc.c:529 g10/mainproc.c:551
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "a assumir dados cifrados %s\n"
 
-#: g10/mainproc.c:537
+#: g10/mainproc.c:538
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "Cifra IDEO n�o dispon�vel, a tentar utilizar %s em substitui��o\n"
 
-#: g10/mainproc.c:569
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr "decifragem correcta\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:574
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVISO: a mensagem n�o tinha a sua integridade protegida\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem cifrada foi manipulada!\n"
 
-#: g10/mainproc.c:592
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifragem falhou: %s\n"
@@ -4301,306 +4379,295 @@ 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:786
+#: g10/mainproc.c:803
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca��o solit�ria - utilize \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:1290
+#: g10/mainproc.c:1307
 msgid "signature verification suppressed\n"
 msgstr "verifica��o de assinatura suprimida\n"
 
-#: g10/mainproc.c:1332 g10/mainproc.c:1342
+#: g10/mainproc.c:1349 g10/mainproc.c:1359
 msgid "can't handle these multiple signatures\n"
 msgstr "n�o consigo tratar estas assinaturas m�ltiplas\n"
 
-#: g10/mainproc.c:1352
+#: g10/mainproc.c:1369
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:1353
+#: g10/mainproc.c:1370
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1357
+#: g10/mainproc.c:1374
 #, 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:1377
+#: g10/mainproc.c:1394
 #, fuzzy
 msgid "Key available at: "
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/mainproc.c:1482 g10/mainproc.c:1530
+#: g10/mainproc.c:1499 g10/mainproc.c:1547
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Assinatura INCORRECTA de \""
 
-#: g10/mainproc.c:1484 g10/mainproc.c:1532
+#: g10/mainproc.c:1501 g10/mainproc.c:1549
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Assinatura expirada de \""
 
-#: g10/mainproc.c:1486 g10/mainproc.c:1534
+#: g10/mainproc.c:1503 g10/mainproc.c:1551
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Assinatura correcta de \""
 
-#: g10/mainproc.c:1538
+#: g10/mainproc.c:1555
 msgid "[uncertain]"
 msgstr "[incerto]"
 
-#: g10/mainproc.c:1570
+#: g10/mainproc.c:1587
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1664
+#: g10/mainproc.c:1681
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:1669
+#: g10/mainproc.c:1686
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:1672
+#: g10/mainproc.c:1689
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/mainproc.c:1673
+#: g10/mainproc.c:1690
 #, fuzzy
 msgid "binary"
 msgstr "primary"
 
-#: g10/mainproc.c:1674
+#: g10/mainproc.c:1691
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1674 g10/trustdb.c:530
+#: g10/mainproc.c:1691 g10/trustdb.c:531
 #, fuzzy
 msgid "unknown"
 msgstr "vers�o desconhecida"
 
-#: g10/mainproc.c:1694
+#: g10/mainproc.c:1711
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1762 g10/mainproc.c:1778 g10/mainproc.c:1864
+#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
 msgid "not a detached signature\n"
 msgstr "n�o � uma assinatura separada\n"
 
-#: g10/mainproc.c:1805
+#: g10/mainproc.c:1822
 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:1813
+#: g10/mainproc.c:1830
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura de classe 0x%02x\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1887
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:1880
+#: g10/mainproc.c:1897
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
-#: g10/misc.c:121
+#: g10/misc.c:122
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "imposs�vel desactivar core dumps: %s\n"
 
-#: g10/misc.c:141 g10/misc.c:169 g10/misc.c:241
+#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/misc.c:206
+#: g10/misc.c:207
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "base de dados de confian�a: leitura falhou (n=%d): %s\n"
 
-#: g10/misc.c:315
+#: g10/misc.c:316
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 
-#: g10/misc.c:330
+#: g10/misc.c:331
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algoritmo de criptografia n�o implementado"
 
-#: g10/misc.c:345
+#: g10/misc.c:346
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:351
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "for�ar o algoritmo de 'digest' %s (%d) viola as prefer�ncias do "
 "destinat�rio\n"
 
-#: g10/misc.c:446
+#: g10/misc.c:447
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "o 'plugin' com a cifra IDEA n�o est� presente\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:448
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr "veja http://www.gnupg.org/why-not-idea.html para mais informa��es\n"
 
-#: g10/misc.c:680
+#: g10/misc.c:681
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: op��o depreciada \"%s\"\n"
 
-#: g10/misc.c:684
+#: g10/misc.c:685
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
 
-#: g10/misc.c:686
+#: g10/misc.c:687
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "por favor utilize \"%s%s\" em vez dela\n"
 
-#: g10/misc.c:697
+#: g10/misc.c:694
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
+msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
+
+#: g10/misc.c:707
 #, fuzzy
 msgid "Uncompressed"
 msgstr "n�o processado"
 
-#: g10/misc.c:722
+#: g10/misc.c:732
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "n�o processado"
 
-#: g10/misc.c:832
+#: g10/misc.c:842
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "esta mensagem poder� n�o ser utiliz�vel pelo %s\n"
 
-#: g10/misc.c:989
+#: g10/misc.c:999
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: g10/misc.c:1014
+#: g10/misc.c:1024
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
 
-#: g10/openfile.c:84
+#: g10/openfile.c:86
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Arquivo `%s' j� existe. "
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Escrever por cima (s/N)? "
 
-#: g10/openfile.c:119
+#: g10/openfile.c:121
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: sufixo desconhecido\n"
 
-#: g10/openfile.c:141
+#: g10/openfile.c:143
 msgid "Enter new filename"
 msgstr "Digite novo nome de ficheiro"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:188
 msgid "writing to stdout\n"
 msgstr "a escrever em \"stdout\"\n"
 
-#: g10/openfile.c:296
+#: g10/openfile.c:300
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "a assumir dados assinados em `%s'\n"
 
-#: g10/openfile.c:375
+#: g10/openfile.c:379
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "criado um novo ficheiro de configura��o `%s'\n"
 
-#: g10/openfile.c:377
+#: g10/openfile.c:381
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "AVISO: op��es em `%s' ainda n�o est�o activas nesta execu��o\n"
 
-#: g10/openfile.c:409
+#: g10/openfile.c:413
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: directoria criada\n"
 
-#: g10/parse-packet.c:137
+#: g10/parse-packet.c:138
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 
-#: g10/parse-packet.c:707
+#: g10/parse-packet.c:708
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1132
+#: g10/parse-packet.c:1145
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
 
-#: g10/passphrase.c:478 g10/passphrase.c:525
+#: g10/passphrase.c:305
 msgid "gpg-agent is not available in this session\n"
 msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
 
-#: g10/passphrase.c:486
-msgid "can't set client pid for the agent\n"
-msgstr "n�o consegui colocar o pid do cliente no agente\n"
-
-#: g10/passphrase.c:494
-msgid "can't get server read FD for the agent\n"
-msgstr "n�o consigo obter FD de leitura no servidor para o agente\n"
-
-#: g10/passphrase.c:501
-msgid "can't get server write FD for the agent\n"
-msgstr "n�o consigo obter FD de escrita no servidor para o agente\n"
-
-#: g10/passphrase.c:534
+#: g10/passphrase.c:317
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "vari�vel de ambiente GPG_AGENT_INFO inv�lida\n"
 
-#: g10/passphrase.c:547
+#: g10/passphrase.c:332
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "a vers�o %d do protocolo gpg-agent n�o � suportada\n"
 
-#: g10/passphrase.c:568
+#: g10/passphrase.c:345
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "imposs�vel ligar a `%s': %s\n"
 
-#: g10/passphrase.c:590
-msgid "communication problem with gpg-agent\n"
-msgstr "problemas na comunica��o com o gpg-agent\n"
-
-#: g10/passphrase.c:597 g10/passphrase.c:937 g10/passphrase.c:1049
+#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema com o agente - a desactivar a utiliza��o deste\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1209
+#: g10/passphrase.c:511 g10/passphrase.c:890
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:525
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4613,41 +4680,28 @@ msgstr ""
 "\"%.*s\"\n"
 "chave %u bits %s, ID %08lx, criada %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:550
 msgid "Repeat passphrase\n"
 msgstr "Repita a frase secreta\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:552
 msgid "Enter passphrase\n"
 msgstr "Insira a frase secreta\n"
 
-#: g10/passphrase.c:781
-msgid "passphrase too long\n"
-msgstr "frase secreta demasiado longa\n"
-
-#: g10/passphrase.c:794
-msgid "invalid response from agent\n"
-msgstr "resposta do agente inv�lida\n"
-
-#: g10/passphrase.c:810 g10/passphrase.c:931
+#: g10/passphrase.c:628
 msgid "cancelled by user\n"
 msgstr "cancelado pelo utilizador\n"
 
-#: g10/passphrase.c:815 g10/passphrase.c:1020
-#, c-format
-msgid "problem with the agent: agent returns 0x%lx\n"
-msgstr "problema com o agente: o agente returnou 0x%lx\n"
-
-#: g10/passphrase.c:1100 g10/passphrase.c:1263
+#: g10/passphrase.c:781 g10/passphrase.c:944
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "imposs�vel pedir senha em modo n�o-interactivo\n"
 
-#: g10/passphrase.c:1107 g10/passphrase.c:1268
+#: g10/passphrase.c:788 g10/passphrase.c:949
 msgid "Enter passphrase: "
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:871
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4657,21 +4711,21 @@ msgstr ""
 "Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "utilizador: \""
 
-#: g10/passphrase.c:1196
+#: g10/passphrase.c:877
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
 
-#: g10/passphrase.c:1205
+#: g10/passphrase.c:886
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1272
+#: g10/passphrase.c:953
 msgid "Repeat passphrase: "
 msgstr "Repita a frase secreta: "
 
-#: g10/photoid.c:66
+#: g10/photoid.c:67
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4680,162 +4734,162 @@ msgid ""
 "Keeping the image close to 240x288 is a good size to use.\n"
 msgstr ""
 
-#: g10/photoid.c:80
+#: g10/photoid.c:81
 msgid "Enter JPEG filename for photo ID: "
 msgstr ""
 
-#: g10/photoid.c:94
+#: g10/photoid.c:95
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/photoid.c:102
+#: g10/photoid.c:103
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:104
+#: g10/photoid.c:105
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/photoid.c:119
+#: g10/photoid.c:120
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "%s: n�o � um base de dados de confian�a\n"
 
-#: g10/photoid.c:136
+#: g10/photoid.c:137
 #, fuzzy
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Est� correto (s/n)? "
 
-#: g10/photoid.c:338
+#: g10/photoid.c:339
 #, fuzzy
 msgid "unable to display photo ID!\n"
 msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:580
+#: g10/pkclist.c:62 g10/revoke.c:581
 msgid "No reason specified"
 msgstr "Nenhum motivo especificado"
 
-#: g10/pkclist.c:63 g10/revoke.c:582
+#: g10/pkclist.c:64 g10/revoke.c:583
 msgid "Key is superseded"
 msgstr "A chave foi substitu�da"
 
-#: g10/pkclist.c:65 g10/revoke.c:581
+#: g10/pkclist.c:66 g10/revoke.c:582
 msgid "Key has been compromised"
 msgstr "A chave foi comprometida"
 
-#: g10/pkclist.c:67 g10/revoke.c:583
+#: g10/pkclist.c:68 g10/revoke.c:584
 msgid "Key is no longer used"
 msgstr "A chave j� n�o � utilizada"
 
-#: g10/pkclist.c:69 g10/revoke.c:584
+#: g10/pkclist.c:70 g10/revoke.c:585
 msgid "User ID is no longer valid"
 msgstr "O identificador do utilizador j� n�o � v�lido"
 
-#: g10/pkclist.c:73
+#: g10/pkclist.c:74
 msgid "reason for revocation: "
 msgstr "motivo da revoca��o: "
 
-#: g10/pkclist.c:90
+#: g10/pkclist.c:91
 msgid "revocation comment: "
 msgstr "coment�rio da revoca��o: "
 
-#: g10/pkclist.c:205
+#: g10/pkclist.c:206
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:213
+#: g10/pkclist.c:214
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "Nenhum valor de confian�a designado para:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:245
+#: g10/pkclist.c:246
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "                   ou \""
 
-#: g10/pkclist.c:255
+#: g10/pkclist.c:256
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Esta chave provavelmente pertence ao dono\n"
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:271
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = N�o sei\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = Eu N�O confio\n"
 
-#: g10/pkclist.c:278
+#: g10/pkclist.c:279
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Confio de forma total\n"
 
-#: g10/pkclist.c:284
+#: g10/pkclist.c:285
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = voltar ao menu principal\n"
 
-#: g10/pkclist.c:287
+#: g10/pkclist.c:288
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " s = saltar esta chave\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " q = sair\n"
 
-#: g10/pkclist.c:292
+#: g10/pkclist.c:293
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:298 g10/revoke.c:609
+#: g10/pkclist.c:299 g10/revoke.c:610
 msgid "Your decision? "
 msgstr "Decis�o? "
 
-#: g10/pkclist.c:319
+#: g10/pkclist.c:320
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Tem a certeza que quer confiar totalmente nesta chave?"
 
-#: g10/pkclist.c:333
+#: g10/pkclist.c:334
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/pkclist.c:418
+#: g10/pkclist.c:419
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lx: N�o h� indica��o de que a assinatura pertence realmente ao dono.\n"
 
-#: g10/pkclist.c:423
+#: g10/pkclist.c:424
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lx: N�o h� indica��o de que a assinatura pertence realmente ao dono.\n"
 
-#: g10/pkclist.c:429
+#: g10/pkclist.c:430
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Esta chave provavelmente pertence ao dono\n"
 
-#: g10/pkclist.c:434
+#: g10/pkclist.c:435
 msgid "This key belongs to us\n"
 msgstr "Esta chave pertence-nos\n"
 
-#: g10/pkclist.c:460
+#: g10/pkclist.c:461
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -4847,95 +4901,95 @@ msgstr ""
 "sim � pr�xima pergunta\n"
 "\n"
 
-#: g10/pkclist.c:467
+#: g10/pkclist.c:468
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Usar esta chave de qualquer modo? "
 
-#: g10/pkclist.c:501
+#: g10/pkclist.c:502
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVISO: A utilizar uma chave que n�o � de confian�a!\n"
 
-#: g10/pkclist.c:508
+#: g10/pkclist.c:509
 #, fuzzy
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: chave de revoca��o %08lX n�o "
 "presente.\n"
 
-#: g10/pkclist.c:517
+#: g10/pkclist.c:518
 #, fuzzy
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:520
+#: g10/pkclist.c:521
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Isto pode significar que a assinatura � falsificada.\n"
 
-#: g10/pkclist.c:527
+#: g10/pkclist.c:528
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVISO: Esta subchave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:532
+#: g10/pkclist.c:533
 msgid "Note: This key has been disabled.\n"
 msgstr "Nota: Esta chave foi desactivada.\n"
 
-#: g10/pkclist.c:537
+#: g10/pkclist.c:538
 msgid "Note: This key has expired!\n"
 msgstr "Nota: Esta chave expirou!\n"
 
-#: g10/pkclist.c:548
+#: g10/pkclist.c:549
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVISO: Esta chave n�o est� certificada com uma assinatura confi�vel!\n"
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:551
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         N�o h� indica��o de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:559
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVISO: N�s N�O confiamos nesta chave!\n"
 
-#: g10/pkclist.c:559
+#: g10/pkclist.c:560
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         A assinatura � provavelmente uma FALSIFICA��O.\n"
 
-#: g10/pkclist.c:567
+#: g10/pkclist.c:568
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVISO: Esta chave n�o est� certificada com assinaturas suficientemente\n"
 "       confi�veis!\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:570
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         N�o se tem certeza de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:734 g10/pkclist.c:767 g10/pkclist.c:936 g10/pkclist.c:996
+#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:744 g10/pkclist.c:968
+#: g10/pkclist.c:745 g10/pkclist.c:969
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorado: a chave p�blica j� est� presente\n"
 
-#: g10/pkclist.c:786
+#: g10/pkclist.c:787
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "N�o especificou um identificador de utilizador. (pode usar \"-r\")\n"
 
-#: g10/pkclist.c:802
+#: g10/pkclist.c:803
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:828
+#: g10/pkclist.c:829
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -4943,171 +4997,171 @@ msgstr ""
 "\n"
 "Insira o identificador do utilizador. Termine com uma linha vazia: "
 
-#: g10/pkclist.c:844
+#: g10/pkclist.c:845
 msgid "No such user ID.\n"
 msgstr "Identificador de utilizador inexistente.\n"
 
-#: g10/pkclist.c:849 g10/pkclist.c:911
+#: g10/pkclist.c:850 g10/pkclist.c:912
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorado: chave p�blica j� colocada como destinat�rio por omiss�o\n"
 
-#: g10/pkclist.c:867
+#: g10/pkclist.c:868
 msgid "Public key is disabled.\n"
 msgstr "A chave p�blica est� desativada.\n"
 
-#: g10/pkclist.c:874
+#: g10/pkclist.c:875
 msgid "skipped: public key already set\n"
 msgstr "ignorado: a chave p�blica j� est� presente\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:904
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
 
-#: g10/pkclist.c:948
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorado: a chave p�blica est� desactivada\n"
 
-#: g10/pkclist.c:1003
+#: g10/pkclist.c:1004
 msgid "no valid addressees\n"
 msgstr "nenhum endere�o v�lido\n"
 
-#: g10/plaintext.c:90
+#: g10/plaintext.c:91
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "dados n�o gravados; use a op��o \"--output\" para grav�-los\n"
 
-#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
+#: g10/plaintext.c:136 g10/plaintext.c:141 g10/plaintext.c:159
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erro ao criar `%s': %s\n"
 
-#: g10/plaintext.c:446
+#: g10/plaintext.c:447
 msgid "Detached signature.\n"
 msgstr "Assinatura separada.\n"
 
-#: g10/plaintext.c:450
+#: g10/plaintext.c:452
 msgid "Please enter name of data file: "
 msgstr "Por favor digite o nome do ficheiro de dados: "
 
-#: g10/plaintext.c:478
+#: g10/plaintext.c:481
 msgid "reading stdin ...\n"
 msgstr "lendo do \"stdin\" ...\n"
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:515
 msgid "no signed data\n"
 msgstr "n�o h� dados assinados\n"
 
-#: g10/plaintext.c:526
+#: g10/plaintext.c:529
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposs�vel abrir dados assinados `%s'\n"
 
-#: g10/pubkey-enc.c:103
+#: g10/pubkey-enc.c:104
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "destinat�rio an�nimo; a tentar chave secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:119
+#: g10/pubkey-enc.c:120
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "certo, n�s somos o destinat�rio an�nimo.\n"
 
-#: g10/pubkey-enc.c:207
+#: g10/pubkey-enc.c:208
 msgid "old encoding of the DEK is not supported\n"
 msgstr "codifica��o antiga do DEK n�o suportada\n"
 
-#: g10/pubkey-enc.c:228
+#: g10/pubkey-enc.c:229
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "algoritmo de cifra %d%s � desconhecido ou foi desactivado\n"
 
-#: g10/pubkey-enc.c:266
+#: g10/pubkey-enc.c:267
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "NOTA: algoritmo de cifragem %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:287
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTA: chave secreta %08lX expirou em %s\n"
 
-#: g10/pubkey-enc.c:292
+#: g10/pubkey-enc.c:293
 msgid "NOTE: key has been revoked"
 msgstr "NOTA: a chave foi revogada"
 
-#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:545
+#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
+#: g10/revoke.c:188 g10/revoke.c:546
 #, fuzzy, c-format
 msgid "build_packet failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: g10/revoke.c:146
+#: g10/revoke.c:147
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
 
-#: g10/revoke.c:272
+#: g10/revoke.c:273
 msgid "To be revoked by:\n"
 msgstr ""
 
-#: g10/revoke.c:276
+#: g10/revoke.c:277
 msgid "(This is a sensitive revocation key)\n"
 msgstr ""
 
-#: g10/revoke.c:280
+#: g10/revoke.c:281
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/revoke.c:293 g10/revoke.c:511
+#: g10/revoke.c:294 g10/revoke.c:512
 msgid "ASCII armored output forced.\n"
 msgstr ""
 
-#: g10/revoke.c:307 g10/revoke.c:525
+#: g10/revoke.c:308 g10/revoke.c:526
 #, fuzzy, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/revoke.c:370
+#: g10/revoke.c:371
 #, fuzzy
 msgid "Revocation certificate created.\n"
 msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
 
-#: g10/revoke.c:376
+#: g10/revoke.c:377
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr ""
 
-#: g10/revoke.c:432
+#: g10/revoke.c:433
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/revoke.c:461
+#: g10/revoke.c:462
 #, fuzzy, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "a escrever chave p�blica para `%s'\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:473
 msgid "public key does not match secret key!\n"
 msgstr ""
 
-#: g10/revoke.c:479
+#: g10/revoke.c:480
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/revoke.c:496
+#: g10/revoke.c:497
 #, fuzzy
 msgid "unknown protection algorithm\n"
 msgstr "algoritmo de compress�o desconhecido"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 #, fuzzy
 msgid "NOTE: This key is not protected!\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/revoke.c:551
+#: g10/revoke.c:552
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5118,114 +5172,114 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "motivo da revoca��o: "
 
-#: g10/revoke.c:602
+#: g10/revoke.c:603
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:604
+#: g10/revoke.c:605
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:645
+#: g10/revoke.c:646
 #, fuzzy
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "\n"
 "Insira o identificador do utilizador. Termine com uma linha vazia: "
 
-#: g10/revoke.c:673
+#: g10/revoke.c:674
 #, fuzzy, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "motivo da revoca��o: "
 
-#: g10/revoke.c:675
+#: g10/revoke.c:676
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Usar esta chave de qualquer modo? "
 
-#: g10/seckey-cert.c:54
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "partes da chave secreta n�o dispon�veis\n"
 
-#: g10/seckey-cert.c:60
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
 
-#: g10/seckey-cert.c:71
+#: g10/seckey-cert.c:72
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
 
-#: g10/seckey-cert.c:265
+#: g10/seckey-cert.c:266
 msgid "Invalid passphrase; please try again"
 msgstr "Frase secreta inv�lida; por favor tente novamente"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:267
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:326
+#: g10/seckey-cert.c:327
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVISO: Chave fraca detectada - por favor mude a frase secreta novamente.\n"
 
-#: g10/seckey-cert.c:364
+#: g10/seckey-cert.c:365
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "a gerar a 'checksum' (depreciada) de 16-bit para protec��o da chave secreta\n"
 
-#: g10/seskey.c:52
+#: g10/seskey.c:53
 msgid "weak key created - retrying\n"
 msgstr "chave fraca criada - tentando novamente\n"
 
-#: g10/seskey.c:57
+#: g10/seskey.c:58
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "imposs�vel evitar chave fraca para criptografia sim�trica;\n"
 "tentei %d vezes!\n"
 
-#: g10/seskey.c:213
+#: g10/seskey.c:214
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA necessita de utiliza��o de uma algoritmo de dispers�o de 160 bit\n"
 
-#: g10/sig-check.c:75
+#: g10/sig-check.c:76
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "AVISO: conflito no 'digest' de assinatura da mensagem\n"
 
-#: g10/sig-check.c:99
+#: g10/sig-check.c:100
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 
-#: g10/sig-check.c:102
+#: g10/sig-check.c:103
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/sig-check.c:168
+#: g10/sig-check.c:169
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "a chave p�blica %08lX � %lu segundo mais nova que a assinatura\n"
 
-#: g10/sig-check.c:169
+#: g10/sig-check.c:170
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "a chave p�blica %08lX � %lu segundos mais nova que a assinatura\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:181
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5233,7 +5287,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:183
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5241,55 +5295,55 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:193
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTA: chave de assinatura %08lx expirou %s\n"
 
-#: g10/sig-check.c:275
+#: g10/sig-check.c:276
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "assumindo assinatura incorrecta na chave %08lX devido a um bit cr�tico "
 "desconhecido\n"
 
-#: g10/sig-check.c:532
+#: g10/sig-check.c:533
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "chave %08lX: sem subchave para o pacote revoca��o de subchave\n"
 
-#: g10/sig-check.c:558
+#: g10/sig-check.c:559
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/sign.c:85
+#: g10/sign.c:86
 #, 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:93
+#: g10/sign.c:94
 #, 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:112
+#: g10/sign.c:113
 #, 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:138
+#: g10/sign.c:139
 #, 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:146
+#: g10/sign.c:147
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:159
+#: g10/sign.c:160
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5297,7 +5351,7 @@ msgstr ""
 "AVISO: imposs�vel expandir-%% a url de pol�tica (demasiado grande).\n"
 "A utilizar n�o expandida.\n"
 
-#: g10/sign.c:187
+#: g10/sign.c:188
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5306,21 +5360,21 @@ msgstr ""
 "AVISO: imposs�vel expandir-%% a url de pol�tica (demasiado grande).\n"
 "A utilizar n�o expandida.\n"
 
-#: g10/sign.c:364
+#: g10/sign.c:365
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "verifica��o da assinatura criada falhou: %s\n"
 
-#: g10/sign.c:373
+#: g10/sign.c:374
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/sign.c:741
+#: g10/sign.c:761
 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:808
+#: g10/sign.c:830
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5328,404 +5382,404 @@ msgstr ""
 "for�ar o algoritmo de 'digest' %s (%d) viola as prefer�ncias do "
 "destinat�rio\n"
 
-#: g10/sign.c:900
+#: g10/sign.c:922
 msgid "signing:"
 msgstr "a assinar:"
 
-#: g10/sign.c:1007
+#: g10/sign.c:1034
 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:1180
+#: g10/sign.c:1212
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "ser� utilizada a cifragem %s\n"
 
-#: g10/skclist.c:126 g10/skclist.c:190
+#: g10/skclist.c:127 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "a chave n�o est� marcada insegura - imposs�vel us�-la com o RNG falso!\n"
 
-#: g10/skclist.c:157
+#: g10/skclist.c:158
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "ignorado `%s': duplicada\n"
 
-#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "ignorado `%s': %s\n"
 
-#: g10/skclist.c:170
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/skclist.c:185
+#: g10/skclist.c:186
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "ignorado `%s': esta � uma chave ElGamal gerada pelo PGP que n�o � segura "
 "para assinaturas!\n"
 
-#: g10/tdbdump.c:59 g10/trustdb.c:365
+#: g10/tdbdump.c:60 g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "registo de confian�a %lu, tipo %d: escrita falhou: %s\n"
 
-#: g10/tdbdump.c:104
+#: g10/tdbdump.c:105
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
 "# (Use \"gpg --import-ownertrust\" to restore them)\n"
 msgstr ""
 
-#: g10/tdbdump.c:159 g10/tdbdump.c:167 g10/tdbdump.c:172 g10/tdbdump.c:177
+#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/tdbdump.c:159
+#: g10/tdbdump.c:160
 #, fuzzy
 msgid "line too long"
 msgstr "frase secreta demasiado longa\n"
 
-#: g10/tdbdump.c:167
+#: g10/tdbdump.c:168
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:173
+#: g10/tdbdump.c:174
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: g10/tdbdump.c:178
+#: g10/tdbdump.c:179
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr "importar os valores de confian�a"
 
-#: g10/tdbdump.c:214
+#: g10/tdbdump.c:215
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "%s: erro ao escrever registo de diret�rio: %s\n"
 
-#: g10/tdbdump.c:218
+#: g10/tdbdump.c:219
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/tdbdump.c:227 g10/trustdb.c:380
+#: g10/tdbdump.c:228 g10/trustdb.c:381
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de dados de confian�a: sincroniza��o falhou: %s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1440
+#: g10/tdbio.c:129 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "base de dados de confian�a rec %lu: lseek falhou: %s\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1447
+#: g10/tdbio.c:135 g10/tdbio.c:1448
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "base de dados de confian�a rec %lu: escrita falhou (n=%d): %s\n"
 
-#: g10/tdbio.c:244
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "transa��o de base de dados de confian�a muito grande\n"
 
-#: g10/tdbio.c:497
+#: g10/tdbio.c:498
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "imposs�vel fechar `%s': %s\n"
 
-#: g10/tdbio.c:512
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: diretoria inexistente!\n"
 
-#: g10/tdbio.c:522 g10/tdbio.c:545 g10/tdbio.c:588
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "imposs�vel criar `%s': %s\n"
 
-#: g10/tdbio.c:524 g10/tdbio.c:591
+#: g10/tdbio.c:525 g10/tdbio.c:592
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/tdbio.c:550
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: falha ao criar registo de vers�o: %s"
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: base de dados de confian�a inv�lida criada\n"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: base de dados de confian�a criada\n"
 
-#: g10/tdbio.c:597
+#: g10/tdbio.c:598
 msgid "NOTE: trustdb not writable\n"
 msgstr "NOTA: n�o � poss�vel escrever na trustdb\n"
 
-#: g10/tdbio.c:614
+#: g10/tdbio.c:615
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de dados de confian�a inv�lida\n"
 
-#: g10/tdbio.c:646
+#: g10/tdbio.c:647
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: falha ao criar tabela de dispers�o: %s\n"
 
-#: g10/tdbio.c:654
+#: g10/tdbio.c:655
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: erro a actualizar registo de vers�o: %s\n"
 
-#: g10/tdbio.c:671 g10/tdbio.c:691 g10/tdbio.c:707 g10/tdbio.c:721
-#: g10/tdbio.c:751 g10/tdbio.c:1373 g10/tdbio.c:1400
+#: g10/tdbio.c:672 g10/tdbio.c:692 g10/tdbio.c:708 g10/tdbio.c:722
+#: g10/tdbio.c:752 g10/tdbio.c:1374 g10/tdbio.c:1401
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: erro ao ler registo de vers�o: %s\n"
 
-#: g10/tdbio.c:730
+#: g10/tdbio.c:731
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: erro ao escrever registo de vers�o: %s\n"
 
-#: g10/tdbio.c:1169
+#: g10/tdbio.c:1170
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de dados de confian�a: lseek falhou: %s\n"
 
-#: g10/tdbio.c:1177
+#: g10/tdbio.c:1178
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de dados de confian�a: leitura falhou (n=%d): %s\n"
 
-#: g10/tdbio.c:1198
+#: g10/tdbio.c:1199
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: n�o � um base de dados de confian�a\n"
 
-#: g10/tdbio.c:1216
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registo de vers�o com recnum %lu\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1222
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: g10/tdbio.c:1406
+#: g10/tdbio.c:1407
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: erro ao ler registo livre: %s\n"
 
-#: g10/tdbio.c:1414
+#: g10/tdbio.c:1415
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: erro ao escrever registo de diret�rio: %s\n"
 
-#: g10/tdbio.c:1424
+#: g10/tdbio.c:1425
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: falha ao zerar um registo: %s\n"
 
-#: g10/tdbio.c:1454
+#: g10/tdbio.c:1455
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: falha ao anexar um registo: %s\n"
 
-#: g10/tdbio.c:1499
+#: g10/tdbio.c:1500
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "A base de dados de confian�a est� danificada; por favor execute\n"
 "\"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:147
+#: g10/textfilter.c:148
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "imposs�vel manipular linhas de texto maiores que %d caracteres\n"
 
-#: g10/textfilter.c:244
+#: g10/textfilter.c:245
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "linha de entrada maior que %d caracteres\n"
 
-#: g10/trustdb.c:226
+#: g10/trustdb.c:227
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' n�o � um identificador longo de chave v�lido\n"
 
-#: g10/trustdb.c:257
+#: g10/trustdb.c:258
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "chave %08lX: aceite como chave de confian�a\n"
 
-#: g10/trustdb.c:295
+#: g10/trustdb.c:296
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "chave %08lX ocrreu mais do que uma vez na base de dados de confian�a\n"
 
-#: g10/trustdb.c:310
+#: g10/trustdb.c:311
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "chave %08lX: nenhuma chave p�blica para chave de confian�a - ignorada\n"
 "\n"
 
-#: g10/trustdb.c:320
+#: g10/trustdb.c:321
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "chave marcada como de confian�a absoluta\n"
 
-#: g10/trustdb.c:344
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "registo de confian�a %lu, tipo req %d: falha na leitura: %s\n"
 
-#: g10/trustdb.c:350
+#: g10/trustdb.c:351
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "registo de confian�a %lu n�o � do tipo pedido %d\n"
 
-#: g10/trustdb.c:446
+#: g10/trustdb.c:447
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:452
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:506
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ revoked]"
 msgstr "revkey"
 
-#: g10/trustdb.c:508 g10/trustdb.c:513
+#: g10/trustdb.c:509 g10/trustdb.c:514
 #, fuzzy
 msgid "[ expired]"
 msgstr "expire"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 #, fuzzy
 msgid "[ unknown]"
 msgstr "vers�o desconhecida"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:536
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:576
+#: 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:582 g10/trustdb.c:2157
+#: g10/trustdb.c:583 g10/trustdb.c:2309
 #, 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:591
+#: 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:606
+#: 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:838 g10/trustdb.c:1276
+#: 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:1033
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1037
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "a verificar a base de dados de confian�a\n"
 
-#: g10/trustdb.c:1901
+#: g10/trustdb.c:2053
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:1965
+#: g10/trustdb.c:2117
 #, 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:1979
+#: g10/trustdb.c:2131
 #, 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:2002
+#: g10/trustdb.c:2154
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2240
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2163
+#: g10/trustdb.c:2315
 #, 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"
 
-#: g10/verify.c:116
+#: g10/verify.c:117
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -5735,305 +5789,337 @@ msgstr ""
 "N�o se esque�a que o ficheiro com a assinatura (.sig ou .asc)\n"
 "deve ser o primeiro a ser dado na linha de comando.\n"
 
-#: g10/verify.c:189
+#: g10/verify.c:190
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "linha de entrada %u demasiado longa ou falta o LF\n"
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "erro geral"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "formato de pacote desconhecido"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "vers�o desconhecida"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "algoritmo de chave p�blica desconhecido"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "algoritmo de \"digest\" desconhecido"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "chave p�blica incorrecta"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "chave secreta incorrecta"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "assinatura incorrecta"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "erro de \"checksum\""
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "frase secreta incorrecta"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "chave p�blica n�o encontrada"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "algoritmo de criptografia desconhecido"
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "n�o � poss�vel abrir o porta-chaves"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "pacote inv�lido"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "armadura inv�lida"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "identificador de utilizador inexistente"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "chave secreta n�o dispon�vel"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "chave secreta incorrecta"
 
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "n�o suportado"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "chave incorrecta"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "erro de leitura"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "erro de escrita"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "algoritmo de compress�o desconhecido"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "erro na abertura do ficheiro"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "erro na cria��o do ficheiro"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "frase-secreta inv�lida"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "algoritmo de chave p�blica n�o implementado"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "algoritmo de criptografia n�o implementado"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "classe de assinatura desconhecida"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "erro na base de dados de confian�a"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "MPI incorreto"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "limite de recursos"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "porta-chaves inv�lido"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "certificado incorrecto"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "identificador de utilizador malformado"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "erro ao fechar ficheiro"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "erro na renomea��o do ficheiro"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "erro na remo��o do ficheiro"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "dados inesperados"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "conflito de \"timestamp\""
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "algoritmo de chave p�blica inutiliz�vel"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "o ficheiro j� existe"
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "chave fraca"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "argumento inv�lido"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "URI incorrecto"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "URI n�o suportado"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "erro na rede"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "n�o cifrado"
 
-#: util/errors.c:103
+#: util/errors.c:104
 msgid "not processed"
 msgstr "n�o processado"
 
-#: util/errors.c:105
+#: util/errors.c:106
 msgid "unusable public key"
 msgstr "chave p�blica n�o utiliz�vel"
 
-#: util/errors.c:106
+#: util/errors.c:107
 msgid "unusable secret key"
 msgstr "chave secreta n�o utiliz�vel"
 
-#: util/errors.c:107
+#: util/errors.c:108
 msgid "keyserver error"
 msgstr "erro do servidor de chaves"
 
-#: util/errors.c:108
+#: util/errors.c:109
 #, fuzzy
 msgid "canceled"
 msgstr "cancelado pelo utilizador\n"
 
-#: util/errors.c:109
+#: util/errors.c:110
 #, fuzzy
 msgid "no card"
 msgstr "n�o cifrado"
 
-#: util/logger.c:157
+#: util/logger.c:158
 msgid "ERROR: "
 msgstr ""
 
-#: util/logger.c:160
+#: util/logger.c:161
 msgid "WARNING: "
 msgstr ""
 
-#: util/logger.c:223
+#: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... isto � um bug (%s:%d:%s)\n"
 
-#: util/logger.c:229
+#: util/logger.c:230
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "voc� encontrou um bug ... (%s:%d)\n"
 
-#: util/miscutil.c:336 util/miscutil.c:373
+#: util/miscutil.c:330 util/miscutil.c:367
 #, fuzzy
 msgid "yes"
 msgstr "sim"
 
-#: util/miscutil.c:337 util/miscutil.c:378
+#: util/miscutil.c:331 util/miscutil.c:372
 msgid "yY"
 msgstr "sS"
 
-#: util/miscutil.c:339 util/miscutil.c:375
+#: util/miscutil.c:333 util/miscutil.c:369
 msgid "no"
 msgstr "n�o"
 
-#: util/miscutil.c:340 util/miscutil.c:379
+#: util/miscutil.c:334 util/miscutil.c:373
 msgid "nN"
 msgstr "nN"
 
-#: util/miscutil.c:377
+#: util/miscutil.c:371
 msgid "quit"
 msgstr "sair"
 
-#: util/miscutil.c:380
+#: util/miscutil.c:374
 msgid "qQ"
 msgstr "qQ"
 
-#: util/miscutil.c:413
+#: util/miscutil.c:407
 msgid "okay|okay"
 msgstr ""
 
-#: util/miscutil.c:415
+#: util/miscutil.c:409
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:416
+#: util/miscutil.c:410
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:417
+#: util/miscutil.c:411
 #, fuzzy
 msgid "cC"
 msgstr "c"
 
-#: util/secmem.c:90
+#: util/secmem.c:91
 msgid "WARNING: using insecure memory!\n"
 msgstr "AVISO: a utilizar mem�ria insegura!\n"
 
-#: util/secmem.c:91
+#: util/secmem.c:92
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "por favor veja http://www.gnupg.org/faq.html para mais informa��es\n"
 
-#: util/secmem.c:343
+#: util/secmem.c:344
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "a opera��o n�o � poss�vel sem mem�ria segura inicializada\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:345
 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 "error getting serial number: %s\n"
+#~ msgstr "erro na cria��o da frase secreta: %s\n"
+
+#~ msgid "Hint: Select the user IDs to sign\n"
+#~ msgstr "Sugest�o: Selecione os IDs de utilizador para assinar\n"
+
+#, fuzzy
+#~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+#~ msgstr "algoritmo de criptografia desconhecido"
+
+#~ msgid "can't set client pid for the agent\n"
+#~ msgstr "n�o consegui colocar o pid do cliente no agente\n"
+
+#~ msgid "can't get server read FD for the agent\n"
+#~ msgstr "n�o consigo obter FD de leitura no servidor para o agente\n"
+
+#~ msgid "can't get server write FD for the agent\n"
+#~ msgstr "n�o consigo obter FD de escrita no servidor para o agente\n"
+
+#~ msgid "communication problem with gpg-agent\n"
+#~ msgstr "problemas na comunica��o com o gpg-agent\n"
+
+#~ msgid "passphrase too long\n"
+#~ msgstr "frase secreta demasiado longa\n"
+
+#~ msgid "invalid response from agent\n"
+#~ msgstr "resposta do agente inv�lida\n"
+
+#~ msgid "problem with the agent: agent returns 0x%lx\n"
+#~ msgstr "problema com o agente: o agente returnou 0x%lx\n"
+
 #~ msgid "select secondary key N"
 #~ msgstr "seleciona chave secund�ria N"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 2d6fbfd12..58dda5da2 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: 2005-03-15 16:35+0100\n"
+"POT-Creation-Date: 2005-05-31 10:05+0200\n"
 "PO-Revision-Date: 1998-11-20 23:46:36-0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
@@ -21,81 +21,81 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:120
+#: cipher/primegen.c:121
 #, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr ""
 
-#: cipher/primegen.c:311
+#: cipher/primegen.c:312
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr ""
 
-#: cipher/random.c:163
+#: cipher/random.c:164
 msgid "no entropy gathering module detected\n"
 msgstr ""
 
-#: cipher/random.c:387 g10/card-util.c:656 g10/card-util.c:725
-#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2255
-#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
-#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
-#: g10/tdbio.c:600
+#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
+#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
+#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
+#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
+#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/tdbio.c:601
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:391
+#: cipher/random.c:392
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:396
+#: cipher/random.c:397
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:401
+#: cipher/random.c:402
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:407
+#: cipher/random.c:408
 #, fuzzy
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
 
-#: cipher/random.c:415
+#: cipher/random.c:416
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:453
+#: cipher/random.c:454
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2723
-#: g10/keygen.c:2753 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
-#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:481
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:483
+#: cipher/random.c:484
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:728
+#: cipher/random.c:729
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVISO: usando gerador de n�meros aleat�rios inseguro!\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:730
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -109,14 +109,14 @@ msgstr ""
 "N�O USE NENHUM DADO GERADO POR ESTE PROGRAMA!\n"
 "\n"
 
-#: cipher/rndegd.c:204
+#: cipher/rndegd.c:205
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
 "of the entropy.\n"
 msgstr ""
 
-#: cipher/rndlinux.c:134
+#: cipher/rndlinux.c:135
 #, c-format
 msgid ""
 "\n"
@@ -128,45 +128,62 @@ msgstr ""
 "para que o sistema possa coletar mais entropia!\n"
 "(S�o necess�rios mais %d bytes)\n"
 
-#: g10/app-openpgp.c:547
+#: g10/app-openpgp.c:596
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: g10/app-openpgp.c:560
+#: g10/app-openpgp.c:609
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
 
-#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
+#: g10/app-openpgp.c:977
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "enumera��o de blocos de chaves falhou: %s\n"
+
+#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+msgid "response does not contain the public key data\n"
+msgstr ""
+
+#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
-#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
+#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
+#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/app-openpgp.c:836
+#: g10/app-openpgp.c:1310
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:857
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:862
+#: g10/app-openpgp.c:1336
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -174,355 +191,360 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:869
+#: g10/app-openpgp.c:1343
 msgid "|A|Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1018
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:1492
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1018
+#: g10/app-openpgp.c:1492
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1022
+#: g10/app-openpgp.c:1496
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
+#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
+#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: erro lendo registro livre: %s\n"
 
-#: g10/app-openpgp.c:1104
+#: g10/app-openpgp.c:1562
 #, fuzzy
 msgid "key already exists\n"
 msgstr "%lu chaves processadas\n"
 
-#: g10/app-openpgp.c:1108
+#: g10/app-openpgp.c:1566
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1110
+#: g10/app-openpgp.c:1568
 #, fuzzy
 msgid "generating new key\n"
 msgstr "gerar um novo par de chaves"
 
-#: g10/app-openpgp.c:1120
+#: g10/app-openpgp.c:1735
+msgid "creation timestamp missing\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1742
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1749
+#, c-format
+msgid "RSA public exponent missing or largerr than %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1827
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
+
+#: g10/app-openpgp.c:1886
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1135
+#: g10/app-openpgp.c:1901
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1904
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
-msgid "response does not contain the public key data\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
-msgid "response does not contain the RSA modulus\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
-msgid "response does not contain the RSA public exponent\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1195
+#: g10/app-openpgp.c:1961
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1356
+#: g10/app-openpgp.c:2130
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1364
+#: g10/app-openpgp.c:2138
 #, c-format
-msgid "PIN [sigs done: %lu]"
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
+#: g10/app-openpgp.c:2399
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/app-openpgp.c:1731
-#, fuzzy, c-format
-msgid "error getting serial number: %s\n"
-msgstr "erro na cria��o da frase secreta: %s\n"
-
-#: g10/app-openpgp.c:1826
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
-
-#: g10/app-openpgp.c:1868
-#, fuzzy
-msgid "reading the key failed\n"
-msgstr "enumera��o de blocos de chaves falhou: %s\n"
-
-#: g10/armor.c:317
+#: g10/armor.c:318
 #, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:346
+#: g10/armor.c:347
 msgid "invalid armor header: "
 msgstr "cabe�alho de armadura inv�lido: "
 
-#: g10/armor.c:353
+#: g10/armor.c:354
 msgid "armor header: "
 msgstr "cabe�alho de armadura: "
 
-#: g10/armor.c:364
+#: g10/armor.c:365
 msgid "invalid clearsig header\n"
 msgstr "cabe�alho de assinatura em texto puro inv�lido\n"
 
-#: g10/armor.c:416
+#: g10/armor.c:417
 msgid "nested clear text signatures\n"
 msgstr "assinaturas em texto puro aninhadas\n"
 
-#: g10/armor.c:551
+#: g10/armor.c:552
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "armadura inesperada:"
 
-#: g10/armor.c:563
+#: g10/armor.c:564
 msgid "invalid dash escaped line: "
 msgstr "linha com h�fen inv�lida: "
 
-#: g10/armor.c:715 g10/armor.c:1322
+#: g10/armor.c:716 g10/armor.c:1323
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "caractere radix64 inv�lido %02x ignorado\n"
 
-#: g10/armor.c:758
+#: g10/armor.c:759
 msgid "premature eof (no CRC)\n"
 msgstr "fim de arquivo prematuro (sem CRC)\n"
 
-#: g10/armor.c:792
+#: g10/armor.c:793
 msgid "premature eof (in CRC)\n"
 msgstr "fim de arquivo prematuro (no CRC)\n"
 
-#: g10/armor.c:800
+#: g10/armor.c:801
 msgid "malformed CRC\n"
 msgstr "CRC malformado\n"
 
-#: g10/armor.c:804 g10/armor.c:1359
+#: g10/armor.c:805 g10/armor.c:1360
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "erro de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:824
+#: g10/armor.c:825
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "fim de arquivo prematuro (no \"Trailer\")\n"
 
-#: g10/armor.c:828
+#: g10/armor.c:829
 msgid "error in trailer line\n"
 msgstr "erro na linha \"trailer\"\n"
 
-#: g10/armor.c:1137
+#: g10/armor.c:1138
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/armor.c:1142
+#: g10/armor.c:1143
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura inv�lida: linha maior que %d caracteres\n"
 
-#: g10/armor.c:1146
+#: g10/armor.c:1147
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "caractere \"quoted printable\" na armadura  - provavelmente um MTA com bugs "
 "foi usado\n"
 
-#: g10/card-util.c:58 g10/card-util.c:295
+#: g10/card-util.c:63 g10/card-util.c:303
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/card-util.c:63
+#: g10/card-util.c:68
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1329 g10/delkey.c:127 g10/keyedit.c:1430
-#: g10/keygen.c:2439 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1510
+#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
 #, 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:97 g10/card-util.c:1108 g10/card-util.c:1191
-#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
-#: g10/keygen.c:1365
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
+#: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "Sua op��o? "
 
-#: g10/card-util.c:206 g10/card-util.c:256
+#: g10/card-util.c:213 g10/card-util.c:263
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:391
+#: g10/card-util.c:410
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 msgid "unspecified"
 msgstr ""
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 #, fuzzy
 msgid "not forced"
 msgstr "n�o processado(s)"
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:497
+#: g10/card-util.c:516
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:499
+#: g10/card-util.c:518
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:501
+#: g10/card-util.c:520
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:518
+#: g10/card-util.c:537
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:539
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:538
+#: g10/card-util.c:557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:559
+#: g10/card-util.c:578
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/card-util.c:567
+#: g10/card-util.c:586
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:665 g10/card-util.c:734 g10/import.c:261
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:692
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:683
+#: g10/card-util.c:702
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:742
+#: g10/card-util.c:761
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:752
+#: g10/card-util.c:771
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:772
+#: g10/card-util.c:791
 #, fuzzy
 msgid "Language preferences: "
 msgstr "lista prefer�ncias"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:799
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:808
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:829
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:824
+#: g10/card-util.c:843
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "erro: impress�o digital inv�lida\n"
 
-#: g10/card-util.c:845
+#: g10/card-util.c:864
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Impress�o digital:"
 
-#: g10/card-util.c:868
+#: g10/card-util.c:887
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "erro: impress�o digital inv�lida\n"
 
-#: g10/card-util.c:916
+#: g10/card-util.c:935
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/card-util.c:917
+#: g10/card-util.c:936
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/card-util.c:926
+#: g10/card-util.c:945
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1030
 #, fuzzy
 msgid "Replace existing key? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/card-util.c:1030 g10/card-util.c:1039
+#: g10/card-util.c:1051 g10/card-util.c:1060
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1051
+#: g10/card-util.c:1072
 #, fuzzy
 msgid "Replace existing keys? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/card-util.c:1060
+#: g10/card-util.c:1081
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -530,410 +552,414 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1099
+#: g10/card-util.c:1120
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/card-util.c:1101 g10/card-util.c:1182
+#: g10/card-util.c:1122 g10/card-util.c:1203
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/card-util.c:1102 g10/card-util.c:1184
+#: g10/card-util.c:1123 g10/card-util.c:1205
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/card-util.c:1103 g10/card-util.c:1186
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1119 g10/card-util.c:1202 g10/keyedit.c:908
-#: g10/keygen.c:1404 g10/revoke.c:642
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
+#: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1200
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/card-util.c:1214
+#: g10/card-util.c:1235
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de compress�o desconhecido"
 
-#: g10/card-util.c:1219
+#: g10/card-util.c:1240
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/card-util.c:1224
+#: g10/card-util.c:1245
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/card-util.c:1294 g10/keyedit.c:1317
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/card-util.c:1296
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos conflitantes\n"
 
-#: g10/card-util.c:1297 g10/keyedit.c:1320
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/card-util.c:1302
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1303
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1304
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1305
+#: g10/card-util.c:1327
 #, fuzzy
 msgid "change the login name"
 msgstr "muda a data de validade"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muda os valores de confian�a"
 
-#: g10/card-util.c:1307
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1308
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1310
+#: g10/card-util.c:1332
 #, fuzzy
 msgid "generate new keys"
 msgstr "gerar um novo par de chaves"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1377 g10/keyedit.c:1526
+#: g10/card-util.c:1334
+msgid "verify the PIN and list all data"
+msgstr ""
+
+#: g10/card-util.c:1454 g10/keyedit.c:1609
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1412
+#: g10/card-util.c:1492
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/card-util.c:1430
+#: g10/card-util.c:1525
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
 # help ou ajuda ???
-#: g10/card-util.c:1499 g10/keyedit.c:2104
+#: g10/card-util.c:1599 g10/keyedit.c:2210
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
-#: g10/cardglue.c:287
+#: g10/cardglue.c:396
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:519
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:380
+#: g10/cardglue.c:527
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:852
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Digite o identificador de usu�rio: "
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:853
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "Digite o identificador de usu�rio: "
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:854
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:691
+#: g10/cardglue.c:855
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Digite o identificador de usu�rio: "
 
-#: g10/cardglue.c:705
+#: g10/cardglue.c:872
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Repita a frase secreta: "
 
-#: g10/cardglue.c:719
+#: g10/cardglue.c:886
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
-#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/decrypt.c:104 g10/encode.c:859
+#: g10/decrypt.c:105 g10/encode.c:846
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3167 g10/keyserver.c:1511
-#: g10/revoke.c:226
+#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3346 g10/keyserver.c:1541
+#: g10/revoke.c:227
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2300 g10/keyserver.c:1525
-#: g10/revoke.c:232 g10/revoke.c:439
+#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/revoke.c:233 g10/revoke.c:440
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/delkey.c:128 g10/delkey.c:135
+#: g10/delkey.c:129 g10/delkey.c:136
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr ""
 
-#: g10/delkey.c:134
+#: g10/delkey.c:135
 #, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo sem \"--yes\"\n"
 
-#: g10/delkey.c:146
+#: g10/delkey.c:147
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Deletar esta chave do chaveiro? "
 
-#: g10/delkey.c:154
+#: g10/delkey.c:155
 #, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Esta � uma chave secreta! - realmente deletar? "
 
-#: g10/delkey.c:164
+#: g10/delkey.c:165
 #, fuzzy, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: g10/delkey.c:174
+#: g10/delkey.c:175
 msgid "ownertrust information cleared\n"
 msgstr ""
 
-#: g10/delkey.c:205
+#: g10/delkey.c:206
 #, fuzzy, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "h� uma chave secreta para esta chave p�blica!\n"
 
-#: g10/delkey.c:207
+#: g10/delkey.c:208
 #, fuzzy
 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:210 g10/sign.c:1186
+#: g10/encode.c:211 g10/sign.c:1218
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: g10/encode.c:215
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 
-#: g10/encode.c:228
+#: g10/encode.c:229
 #, fuzzy, c-format
 msgid "using cipher %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/encode.c:238 g10/encode.c:558
+#: g10/encode.c:239 g10/encode.c:545
 #, fuzzy, c-format
 msgid "`%s' already compressed\n"
 msgstr "%lu chaves processadas\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
+#: g10/encode.c:302 g10/encode.c:591 g10/sign.c:566
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/encode.c:472
+#: g10/encode.c:466
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 
-#: g10/encode.c:494
+#: g10/encode.c:488
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encode.c:530
+#: g10/encode.c:517
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 
-#: g10/encode.c:540
+#: g10/encode.c:527
 #, fuzzy, c-format
 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:648 g10/sign.c:877
+#: g10/encode.c:635 g10/sign.c:899
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/encode.c:735
+#: g10/encode.c:722
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:805 g10/pkclist.c:721 g10/pkclist.c:757
+#: g10/encode.c:792 g10/pkclist.c:722 g10/pkclist.c:758
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr ""
 
-#: g10/encode.c:832
+#: g10/encode.c:819
 #, fuzzy, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s criptografado para: %s\n"
 
-#: g10/encr-data.c:66 g10/mainproc.c:301
+#: g10/encr-data.c:67 g10/mainproc.c:302
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dados criptografados com %s\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:305
+#: g10/encr-data.c:69 g10/mainproc.c:306
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "criptografado com algoritmo desconhecido %d\n"
 
-#: g10/encr-data.c:92
+#: g10/encr-data.c:93
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "AVISO: A mensagem foi criptografada com uma chave fraca na criptografia\n"
 "sim�trica.\n"
 
-#: g10/encr-data.c:103
+#: g10/encr-data.c:104
 #, fuzzy
 msgid "problem handling encrypted packet\n"
 msgstr "eliminar o campo keyid dos pacotes criptografados\n"
 
-#: g10/exec.c:48
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr ""
 
-#: g10/exec.c:184 g10/openfile.c:406
+#: g10/exec.c:173 g10/openfile.c:410
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: imposs�vel criar diret�rio: %s\n"
 
-#: g10/exec.c:325
+#: g10/exec.c:314
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 
-#: g10/exec.c:355
+#: g10/exec.c:344
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr "%s: erro lendo registro de vers�o: %s\n"
 
-#: g10/exec.c:433
+#: g10/exec.c:422
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/exec.c:436
+#: g10/exec.c:425
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/exec.c:521
+#: g10/exec.c:510
 #, fuzzy, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "%s: erro lendo registro de vers�o: %s\n"
 
-#: g10/exec.c:532 g10/exec.c:598
+#: g10/exec.c:521 g10/exec.c:587
 msgid "unnatural exit of external program\n"
 msgstr ""
 
-#: g10/exec.c:547
+#: g10/exec.c:536
 msgid "unable to execute external program\n"
 msgstr ""
 
-#: g10/exec.c:563
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr ""
 
-#: g10/exec.c:609 g10/exec.c:616
+#: g10/exec.c:598 g10/exec.c:605
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr ""
 
-#: g10/exec.c:621
+#: g10/exec.c:610
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr ""
 
-#: g10/export.c:183
+#: g10/export.c:184
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/export.c:212
+#: g10/export.c:213
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/export.c:220
+#: g10/export.c:221
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/export.c:395
+#: g10/export.c:398
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:427
+#: g10/export.c:430
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid ""
 "@Commands:\n"
 " "
@@ -941,134 +967,134 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "|[file]|make a signature"
 msgstr "|[arquivo]|fazer uma assinatura"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "|[file]|make a clear text signature"
 msgstr "|[arquivo]|fazer uma assinatura em texto puro"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encrypt data"
 msgstr "criptografar dados"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "encryption only with symmetric cipher"
 msgstr ""
 "criptografar apenas com criptografia\n"
 "sim�trica"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "decrypt data (default)"
 msgstr "descriptografar dados (padr�o)"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/g10.c:379
+#: g10/g10.c:381
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "remover a chave do chaveiro p�blico"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "remover a chave do chaveiro secreto"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:385
+#: g10/g10.c:387
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:389
+#: g10/g10.c:391
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/g10.c:394
+#: g10/g10.c:396
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "importar chaves de um servidor"
 
-#: g10/g10.c:397
+#: g10/g10.c:399
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "print the card status"
 msgstr ""
 
-#: g10/g10.c:401
+#: g10/g10.c:403
 msgid "change data on a card"
 msgstr ""
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/g10.c:410
+#: g10/g10.c:412
 msgid "update the trust database"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: g10/g10.c:417
+#: g10/g10.c:419
 msgid "|algo [files]|print message digests"
 msgstr "|algo [arquivos]|imprimir \"digests\" de mensagens"
 
-#: g10/g10.c:421 g10/gpgv.c:66
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1078,61 +1104,61 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/g10.c:425
+#: g10/g10.c:427
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|criptografar para NOME"
 
-#: g10/g10.c:436
+#: g10/g10.c:438
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de usu�rio para\n"
 "assinar ou descriptografar"
 
-#: g10/g10.c:437
+#: g10/g10.c:439
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desabilita)"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/g10.c:452
+#: g10/g10.c:458
 msgid "use as output file"
 msgstr "usar como arquivo de sa�da"
 
-#: g10/g10.c:454 g10/gpgv.c:68
+#: g10/g10.c:460 g10/gpgv.c:73
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/g10.c:465
+#: g10/g10.c:471
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
-#: g10/g10.c:466
+#: g10/g10.c:472
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/g10.c:507
+#: g10/g10.c:513
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:508
+#: g10/g10.c:514
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:536
+#: g10/g10.c:542
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:539
+#: g10/g10.c:545
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1152,15 +1178,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/g10.c:720 g10/gpgv.c:93
+#: g10/g10.c:724 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/g10.c:737
+#: g10/g10.c:741
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: g10/g10.c:740
+#: g10/g10.c:744
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1170,7 +1196,7 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: g10/g10.c:751
+#: g10/g10.c:755
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1178,468 +1204,478 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:754
+#: g10/g10.c:758
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/g10.c:760 g10/keyedit.c:2141
+#: g10/g10.c:764 g10/keyedit.c:2248
 msgid "Cipher: "
 msgstr ""
 
-#: g10/g10.c:766
+#: g10/g10.c:770
 msgid "Hash: "
 msgstr ""
 
-#: g10/g10.c:772 g10/keyedit.c:2187
+#: g10/g10.c:776 g10/keyedit.c:2294
 #, fuzzy
 msgid "Compression: "
 msgstr "Coment�rio: "
 
-#: g10/g10.c:855
+#: g10/g10.c:859
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/g10.c:1003
+#: g10/g10.c:1007
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/g10.c:1021
+#: g10/g10.c:1025
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1218
+#: g10/g10.c:1222
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1221
+#: g10/g10.c:1225
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1224
+#: g10/g10.c:1228
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1230
+#: g10/g10.c:1234
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1233
+#: g10/g10.c:1237
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1240
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1242
+#: g10/g10.c:1246
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1245
+#: g10/g10.c:1249
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1248
+#: g10/g10.c:1252
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1258
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1257
+#: g10/g10.c:1261
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1260
+#: g10/g10.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1401
+#: g10/g10.c:1405
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1802
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/g10.c:1838
+#: g10/g10.c:1844
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/g10.c:1842
+#: g10/g10.c:1848
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de op��es `%s': %s\n"
 
-#: g10/g10.c:1849
+#: g10/g10.c:1855
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/g10.c:2076
+#: g10/g10.c:2082
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/g10.c:2293
+#: g10/g10.c:2236 g10/g10.c:2248
+#, fuzzy, c-format
+msgid "`%s' is not a valid signature expiration\n"
+msgstr "%s n�o � um conjunto de caracteres v�lido\n"
+
+#: g10/g10.c:2321
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3683
+#: g10/g10.c:2340 g10/keyedit.c:3862
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2346
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2349
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2356
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2359
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "armadura inv�lida"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2366
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2369
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2376
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2379
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "armadura inv�lida"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2401
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2404
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2411
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:2573
+#: g10/g10.c:2602
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um arquivo core!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2606
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:2586
+#: g10/g10.c:2615
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2618
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:2603
+#: g10/g10.c:2625
+#, 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/g10.c:2640
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/g10.c:2617
+#: g10/g10.c:2654
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:2623
+#: g10/g10.c:2660
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:2629
+#: g10/g10.c:2666
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:2642
+#: g10/g10.c:2679
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/g10.c:2712 g10/g10.c:2736
+#: g10/g10.c:2746 g10/g10.c:2770
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/g10.c:2718 g10/g10.c:2742
+#: g10/g10.c:2752 g10/g10.c:2776
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/g10.c:2724
+#: g10/g10.c:2758
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2764
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/g10.c:2745
+#: g10/g10.c:2779
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:2747
+#: g10/g10.c:2781
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2783
 #, 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/g10.c:2751
+#: g10/g10.c:2785
 #, 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/g10.c:2753
+#: g10/g10.c:2787
 #, 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/g10.c:2756
+#: g10/g10.c:2790
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2794
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/g10.c:2767
+#: g10/g10.c:2801
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/g10.c:2776
+#: g10/g10.c:2810
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/g10.c:2780
+#: g10/g10.c:2814
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/g10.c:2784
+#: g10/g10.c:2818
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/g10.c:2817
+#: g10/g10.c:2851
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:2864
+#: g10/g10.c:2898
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2869
+#: g10/g10.c:2903
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2874
+#: g10/g10.c:2908
 #, 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/g10.c:2970
+#: g10/g10.c:3004
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: g10/g10.c:2981
+#: g10/g10.c:3015
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/g10.c:2992
+#: g10/g10.c:3026
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/g10.c:2999
+#: g10/g10.c:3033
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3035
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/g10.c:3011
+#: g10/g10.c:3045
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:3024
+#: g10/g10.c:3058
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3060
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3029
+#: g10/g10.c:3063
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:3047
+#: g10/g10.c:3081
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3094
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:3075
+#: g10/g10.c:3109
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:3077
+#: g10/g10.c:3111
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3080
+#: g10/g10.c:3114
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:3100
+#: g10/g10.c:3134
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3143
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3168
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/g10.c:3142
+#: g10/g10.c:3176
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/g10.c:3146
+#: g10/g10.c:3180
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usu�rio"
 
-#: g10/g10.c:3167
+#: g10/g10.c:3201
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usu�rio [comandos]"
 
-#: g10/g10.c:3238
+#: g10/g10.c:3272
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usu�rio] [chaveiro]"
 
-#: g10/g10.c:3275
+#: g10/g10.c:3309
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/g10.c:3277
+#: g10/g10.c:3311
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3313
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/g10.c:3290
+#: g10/g10.c:3324
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record falhou: %s\n"
 
-#: g10/g10.c:3300
+#: g10/g10.c:3334
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/g10.c:3341
+#: g10/g10.c:3375
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:3349
+#: g10/g10.c:3383
 #, 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/g10.c:3436
+#: g10/g10.c:3470
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/g10.c:3559
+#: g10/g10.c:3593
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3597
 msgid "Go ahead and type your message ...\n"
 msgstr "V� em frente e digite sua mensagem ...\n"
 
-#: g10/g10.c:3853
+#: g10/g10.c:3887
 #, fuzzy
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1648,85 +1684,90 @@ msgstr ""
 "um nome de nota��o deve ter apenas letras, d�gitos, pontos ou sublinhados e "
 "terminar com '='\n"
 
-#: g10/g10.c:3861
+#: g10/g10.c:3895
 #, 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/g10.c:3871
+#: g10/g10.c:3900
+#, 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/g10.c:3911
 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/g10.c:3905
+#: g10/g10.c:3945
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/g10.c:3907
+#: g10/g10.c:3947
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/g10.c:3940
+#: g10/g10.c:3980
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "entradas demais no cache pk - desativado\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2750
+#: g10/getkey.c:187 g10/getkey.c:2757
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[usu�rio n�o encontrado]"
 
-#: g10/getkey.c:1677
+#: g10/getkey.c:1684
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2228
+#: g10/getkey.c:2235
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "h� uma chave secreta para esta chave p�blica!\n"
 
-#: g10/getkey.c:2459
+#: g10/getkey.c:2466
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
 
-#: g10/getkey.c:2506
+#: g10/getkey.c:2513
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:74
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/gpgv.c:70
+#: g10/gpgv.c:75
 #, fuzzy
 msgid "take the keys from this keyring"
 msgstr "Deletar esta chave do chaveiro? "
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:77
 #, fuzzy
 msgid "make timestamp conflicts only a warning"
 msgstr "conflito de \"timestamp\""
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:78
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|DA|escrever informa��es de estado para o\n"
 "descritor de arquivo DA"
 
-#: g10/gpgv.c:97
+#: g10/gpgv.c:102
 #, fuzzy
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:105
 #, fuzzy
 msgid ""
 "Syntax: gpg [options] [files]\n"
@@ -1735,7 +1776,7 @@ msgstr ""
 "Sintaxe: gpgm [op��es] [arquivos]\n"
 "Utilit�rio de manuten��o do GnuPG\n"
 
-#: g10/helptext.c:48
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1745,7 +1786,7 @@ msgstr ""
 "terceiros. Precisamos dele implementar a rede de confian�a, que n�o tem\n"
 "nada a ver com a rede de certificados (implicitamente criada)."
 
-#: g10/helptext.c:54
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1753,19 +1794,19 @@ msgid ""
 "ultimately trusted\n"
 msgstr ""
 
-#: g10/helptext.c:61
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Se voc� quiser usar esta chave n�o confi�vel assim mesmo, responda \"sim\"."
 
-#: g10/helptext.c:65
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr ""
 "Digite o ID de usu�rio do destinat�rio para o qual voc� quer enviar a\n"
 "mensagem."
 
-#: g10/helptext.c:69
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1779,23 +1820,23 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:83
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
 "Please consult your security expert first."
 msgstr ""
 
-#: g10/helptext.c:90
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "Digite o tamanho da chave"
 
-#: g10/helptext.c:94 g10/helptext.c:99 g10/helptext.c:111 g10/helptext.c:143
-#: g10/helptext.c:171 g10/helptext.c:176 g10/helptext.c:181
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "Responda \"sim\" ou \"n�o\""
 
-#: g10/helptext.c:104
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1807,19 +1848,19 @@ msgstr ""
 "rea��o a erros - o sistema tentar� interpretar o valor dado como um "
 "intervalo."
 
-#: g10/helptext.c:116
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "Digite o nome do possuidor da chave"
 
-#: g10/helptext.c:121
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr "por favor digite um endere�o de email (opcional mas recomendado)"
 
-#: g10/helptext.c:125
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "Por favor digite um coment�rio (opcional)"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1833,11 +1874,11 @@ msgstr ""
 "O  para continuar a gera��o da chave.\n"
 "S  para interromper a gera��o da chave."
 
-#: g10/helptext.c:139
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Responda \"sim\" (ou apenas \"s\") se quiser gerar a subchave."
 
-#: g10/helptext.c:147
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -1878,12 +1919,12 @@ msgid ""
 "If you don't know what the right answer is, answer \"0\"."
 msgstr ""
 
-#: g10/helptext.c:185
+#: g10/helptext.c:186
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Responda \"sim\" se quiser assinar TODOS os IDs de usu�rio"
 
-#: g10/helptext.c:189
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -1891,11 +1932,11 @@ msgstr ""
 "Responda \"sim\" se quiser realmente remover este ID de usu�rio.\n"
 "Todos os certificados tamb�m ser�o perdidos!"
 
-#: g10/helptext.c:194
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Responda \"sim\" se quiser remover a subchave"
 
-#: g10/helptext.c:199
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -1905,7 +1946,7 @@ msgstr ""
 "remover esta assinatura porque ela pode ser importante para estabelecer\n"
 "uma conex�o de confian�a � chave ou a outra chave certificada por esta."
 
-#: g10/helptext.c:204
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -1917,13 +1958,13 @@ msgstr ""
 "porque a chave desta assinatura pode estabelecer uma conex�o de confian�a\n"
 "atrav�s de outra chave j� certificada."
 
-#: g10/helptext.c:210
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "A assinatura n�o � v�lida. Faz sentido remov�-la de seu chaveiro."
 
-#: g10/helptext.c:214
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -1936,33 +1977,33 @@ msgstr ""
 "n�o consiga mais usar esta chave. Fa�a isto apenas se por alguma\n"
 "raz�o esta auto-assinatura n�o for v�lida e h� uma segunda dispon�vel."
 
-#: g10/helptext.c:222
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
 "self-signatures will be advanced by one second.\n"
 msgstr ""
 
-#: g10/helptext.c:229
+#: g10/helptext.c:230
 #, fuzzy
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Por favor digite a frase secreta"
 
-#: g10/helptext.c:235
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "Por favor repita a �ltima frase secreta, para ter certeza do que voc� "
 "digitou."
 
-#: g10/helptext.c:239
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "D� o nome para o arquivo ao qual a assinatura se aplica"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Responda \"sim\" se quiser sobrescrever o arquivo"
 
-#: g10/helptext.c:249
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -1970,7 +2011,7 @@ msgstr ""
 "Por favor digite um novo nome de arquivo. Se voc� apenas apertar RETURN o\n"
 "arquivo padr�o (que � mostrado em colchetes) ser� usado."
 
-#: g10/helptext.c:255
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -1986,477 +2027,482 @@ msgid ""
 "      this is normally used to mark an email address invalid.\n"
 msgstr ""
 
-#: g10/helptext.c:271
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
 "An empty line ends the text.\n"
 msgstr ""
 
-#: g10/helptext.c:286
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/helptext.c:294
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Nenhuma ajuda dispon�vel para `%s'"
 
-#: g10/import.c:247
+#: g10/import.c:248
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloco do tipo %d\n"
 
-#: g10/import.c:256
+#: g10/import.c:257
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu chaves processadas at� agora\n"
 
-#: g10/import.c:273
+#: g10/import.c:274
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "N�mero total processado: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, fuzzy, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:279
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sem IDs de usu�rios: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importados: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:287
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             n�o modificados: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          novos IDs de usu�rios: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        novas assinaturas: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   novas revoga��es de chaves: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chaves secretas importadas: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " chaves secretas n�o modificadas: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, fuzzy, c-format
 msgid "          not imported: %lu\n"
 msgstr "              importados: %lu"
 
-#: g10/import.c:543
+#: g10/import.c:544
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:545
+#: g10/import.c:546
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Voc� assinou estes IDs de usu�rio:\n"
 
-#: g10/import.c:582
+#: g10/import.c:583
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:594
+#: g10/import.c:595
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/import.c:606
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:620
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:646
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:694 g10/import.c:1048
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chave %08lX: sem ID de usu�rio\n"
 
-#: g10/import.c:713
+#: g10/import.c:714
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/import.c:728
+#: g10/import.c:729
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "chave %08lX: aceito ID de usu�rio sem auto-assinatura '"
 
-#: g10/import.c:734
+#: g10/import.c:735
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chave %08lX: sem IDs de usu�rios v�lidos\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
 
-#: g10/import.c:746 g10/import.c:1168
+#: g10/import.c:747 g10/import.c:1169
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
 
-#: g10/import.c:752
+#: g10/import.c:753
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/import.c:761
+#: g10/import.c:762
 #, fuzzy, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "imposs�vel escrever chaveiro: %s\n"
 
-#: g10/import.c:766 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escrevendo para `%s'\n"
 
-#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
-#: g10/import.c:2314 g10/import.c:2336
+#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
+#: g10/import.c:2315 g10/import.c:2337
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/import.c:791
+#: g10/import.c:792
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave p�blica importada\n"
 
-#: g10/import.c:815
+#: g10/import.c:816
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chave %08lX: n�o corresponde � nossa c�pia\n"
 
-#: g10/import.c:832 g10/import.c:1186
+#: g10/import.c:833 g10/import.c:1187
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel localizar bloco de chaves original: %s\n"
 
-#: g10/import.c:840 g10/import.c:1193
+#: g10/import.c:841 g10/import.c:1194
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel ler bloco de chaves original: %s\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chave %8lX: 1 novo ID de usu�rio\n"
 
-#: g10/import.c:875
+#: g10/import.c:876
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chave %08lX: %d novos IDs de usu�rios\n"
 
-#: g10/import.c:878
+#: g10/import.c:879
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: 1 nova assinatura\n"
 
-#: g10/import.c:881
+#: g10/import.c:882
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:884
+#: g10/import.c:885
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: 1 nova subchave\n"
 
-#: g10/import.c:887
+#: g10/import.c:888
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: %d novas subchaves\n"
 
-#: g10/import.c:908
+#: g10/import.c:909
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chave %08lX: n�o modificada\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1054
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/import.c:1064
+#: g10/import.c:1065
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/import.c:1081 g10/import.c:2329
+#: g10/import.c:1082 g10/import.c:2330
 #, fuzzy, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "imposs�vel bloquear chaveiro secreto: %s\n"
 
-#: g10/import.c:1092
+#: g10/import.c:1093
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1122
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chave %08lX: j� est� no chaveiro secreto\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1132
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta n�o encontrada: %s\n"
 
-#: g10/import.c:1161
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chave %08lX: sem chave p�blica - imposs�vel aplicar certificado\n"
 "de revoga��o\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1205
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - rejeitado\n"
 
-#: g10/import.c:1236
+#: g10/import.c:1237
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: certificado de revoga��o importado\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1302
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "chave %08lX: nenhum ID de usu�rio para assinatura\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1317
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inv�lida\n"
 
-#: g10/import.c:1336
+#: g10/import.c:1337
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/import.c:1347 g10/import.c:1397
+#: g10/import.c:1348 g10/import.c:1398
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
 
-#: g10/import.c:1349
+#: g10/import.c:1350
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1365
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chave %08lX.%lu: Revoga��o de subchave v�lida\n"
 
-#: g10/import.c:1414
+#: g10/import.c:1415
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1457
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chave %08lX: ignorado ID de usu�rio '"
 
-#: g10/import.c:1477
+#: g10/import.c:1478
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
 
-#: g10/import.c:1504
+#: g10/import.c:1505
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
 
-#: g10/import.c:1514
+#: g10/import.c:1515
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o no local errado - ignorada\n"
 
-#: g10/import.c:1531
+#: g10/import.c:1532
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - ignorada\n"
 
-#: g10/import.c:1545
+#: g10/import.c:1546
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o no local errado - ignorada\n"
 
-#: g10/import.c:1553
+#: g10/import.c:1554
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
 
-#: g10/import.c:1574
+#: g10/import.c:1575
 #, fuzzy, c-format
 msgid "key %s: expired signature from key %s - skipped\n"
 msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
 
-#: g10/import.c:1677
+#: g10/import.c:1678
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: detectado ID de usu�rio duplicado - unido\n"
 
-#: g10/import.c:1739
+#: g10/import.c:1740
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/import.c:1753
+#: g10/import.c:1754
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/import.c:1812
+#: g10/import.c:1813
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: certificado de revoga��o adicionado\n"
 
-#: g10/import.c:1846
+#: g10/import.c:1847
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:2235
+#: g10/import.c:2236
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "lid %lu n�o tem chave\n"
 
-#: g10/import.c:2243
+#: g10/import.c:2244
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/import.c:2245
+#: g10/import.c:2246
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/keydb.c:167
+#: g10/keydb.c:168
 #, fuzzy, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keydb.c:174
+#: g10/keydb.c:175
 #, fuzzy, c-format
 msgid "keyring `%s' created\n"
 msgstr "%s: chaveiro criado\n"
 
-#: g10/keydb.c:685
+#: g10/keydb.c:316 g10/keydb.c:319
+#, fuzzy, c-format
+msgid "keyblock resource `%s': %s\n"
+msgstr "%s: erro de leitura de bloco de chaves: %s\n"
+
+#: g10/keydb.c:698
 #, fuzzy, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[revoga��o]"
 
-#: g10/keyedit.c:255
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[auto-assinatura]"
 
-#: g10/keyedit.c:333 g10/keylist.c:405
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 assinatura incorreta\n"
 
-#: g10/keyedit.c:335 g10/keylist.c:407
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d assinaturas incorretas\n"
 
-#: g10/keyedit.c:337 g10/keylist.c:409
+#: g10/keyedit.c:344 g10/keylist.c:410
 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:339 g10/keylist.c:411
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, 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:341 g10/keylist.c:413
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 assinatura n�o verificada devido a um erro\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:415
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d assinaturas n�o verificadas devido a erros\n"
 
-#: g10/keyedit.c:345
+#: g10/keyedit.c:352
 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:347
+#: g10/keyedit.c:354
 #, 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:403 g10/pkclist.c:262
+#: g10/keyedit.c:410 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2475,162 +2521,172 @@ msgstr ""
 " 4 = Eu confio completamente\n"
 " s = Mostrar mais informa��es\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:274
+#: g10/keyedit.c:414 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:408 g10/pkclist.c:276
+#: g10/keyedit.c:415 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:427
+#: g10/keyedit.c:434
 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:443
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:594
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
-#: g10/keyedit.c:858 g10/keyedit.c:1642
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1728
 #, 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:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
-#: g10/keyedit.c:1648
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
+#: g10/keyedit.c:1734
 msgid "  Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:622
 #, fuzzy, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:650
 #, fuzzy, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/keyedit.c:676
+#: g10/keyedit.c:678
+#, fuzzy, c-format
+msgid "User ID \"%s\" is signable.  "
+msgstr "AVISO: `%s' � um arquivo vazio\n"
+
+#: g10/keyedit.c:680
+#, fuzzy
+msgid "Sign it? (y/N) "
+msgstr "Realmente assinar? "
+
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:711
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:699
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr ""
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:729
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:724
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:754
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:749
+#: g10/keyedit.c:775
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "J� assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:752
+#: g10/keyedit.c:778
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "J� assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:783
 #, 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:779
+#: g10/keyedit.c:805
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:820
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Nota: Esta chave expirou!\n"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:840
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:844
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:882
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:884
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr ""
 
-#: g10/keyedit.c:878
+#: g10/keyedit.c:909
 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:883
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:895
+#: g10/keyedit.c:926
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:950
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2639,90 +2695,90 @@ msgstr ""
 "Voc� tem certeza de que quer assinar esta chave com\n"
 "sua chave: \""
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:963
 #, 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:940
+#: g10/keyedit.c:971
 #, 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:950
+#: g10/keyedit.c:981
 #, 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:957
+#: g10/keyedit.c:988
 #, 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:964
+#: g10/keyedit.c:995
 msgid "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1000
 msgid "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1005
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1015
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:1029 g10/keyedit.c:4132 g10/keyedit.c:4223 g10/keyedit.c:4287
-#: g10/keyedit.c:4348 g10/sign.c:369
+#: g10/keyedit.c:1060 g10/keyedit.c:4350 g10/keyedit.c:4441 g10/keyedit.c:4505
+#: g10/keyedit.c:4566 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1105 g10/keygen.c:3057
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:1109 g10/keygen.c:3045
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/keyedit.c:1113 g10/keygen.c:3060
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/keyedit.c:1117 g10/keygen.c:3064
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Imposs�vel editar esta chave: %s\n"
 
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2730,12 +2786,12 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:1825
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2743,195 +2799,195 @@ msgstr ""
 "Voc� n�o quer uma frase secreta - provavelmente isto � uma *m�* id�ia!\n"
 "\n"
 
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1195
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Voc� realmente quer fazer isso? "
 
-#: g10/keyedit.c:1235
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "movendo a assinatura da chave para o local correto\n"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:1322
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/keyedit.c:1323
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de usu�rios"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "seleciona ID de usu�rio N"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "seleciona ID de usu�rio N"
 
-#: g10/keyedit.c:1327
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:1330
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1335
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:1337
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "lid %lu: id de usu�rio sem assinatura\n"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1343
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1377
 #, fuzzy
 msgid "add a photo ID"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "remove ID de usu�rio"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "remove uma chave secund�ria"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1398
 #, fuzzy
 msgid "add a revocation key"
 msgstr "adiciona nova chave secund�ria"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1402
 #, 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:1372
+#: g10/keyedit.c:1404
 msgid "flag the selected user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1409
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1411
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1418
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "muda os valores de confian�a"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1426
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoga uma chave secund�ria"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "enable key"
 msgstr "ativa uma chave"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "disable key"
 msgstr "desativa uma chave"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1436
 msgid "show selected photo IDs"
 msgstr ""
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1556
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/keyedit.c:1494
+#: g10/keyedit.c:1574
 msgid "Secret key is available.\n"
 msgstr "Chave secreta dispon�vel.\n"
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1655
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta � necess�ria para fazer isto.\n"
 
-#: g10/keyedit.c:1579
+#: g10/keyedit.c:1663
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1682
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -2939,655 +2995,695 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1722
 #, fuzzy
 msgid "Key is revoked."
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:1657
+#: g10/keyedit.c:1741
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Realmente assinar todos os IDs de usu�rio? "
 
-#: g10/keyedit.c:1660
-msgid "Hint: Select the user IDs to sign\n"
-msgstr "Sugest�o: Selecione os IDs de usu�rio para assinar\n"
-
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1748
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "classe de assinatura desconhecida"
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1771
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1713 g10/keyedit.c:1733 g10/keyedit.c:1899
+#: g10/keyedit.c:1793 g10/keyedit.c:1813 g10/keyedit.c:1979
 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:1715
+#: g10/keyedit.c:1795
 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:1717
+#: g10/keyedit.c:1797
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1718
+#: g10/keyedit.c:1798
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Realmente remover este ID de usu�rio? "
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1848
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Realmente remover este ID de usu�rio? "
 
-#: g10/keyedit.c:1780
+#: g10/keyedit.c:1860
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1808
+#: g10/keyedit.c:1888
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1822
+#: g10/keyedit.c:1902
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1919
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keyedit.c:1863
+#: g10/keyedit.c:1943
 msgid "You must select at least one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1946
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Voc� realmente quer remover as chaves selecionadas? "
 
-#: g10/keyedit.c:1867
+#: g10/keyedit.c:1947
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Voc� realmente quer remover esta chave? "
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1982
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1983
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Realmente remover este ID de usu�rio? "
 
-#: g10/keyedit.c:1921
+#: g10/keyedit.c:2001
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Voc� realmente quer revogar esta chave? "
 
-#: g10/keyedit.c:1932
+#: g10/keyedit.c:2012
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Voc� realmente quer revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:1934
+#: g10/keyedit.c:2014
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Voc� realmente quer revogar esta chave? "
 
-#: g10/keyedit.c:1975
+#: g10/keyedit.c:2055
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2007
+#: g10/keyedit.c:2087
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2093
 #, 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:2015
+#: g10/keyedit.c:2095
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:2065
+#: g10/keyedit.c:2157
+#, fuzzy, c-format
+msgid "Unable to clean `%s'\n"
+msgstr "imposs�vel abrir %s: %s\n"
+
+#: g10/keyedit.c:2160
+msgid "Please specify item to clean: `sigs', `uids', or `all'\n"
+msgstr ""
+
+#: g10/keyedit.c:2171
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvar altera��es? "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2174
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Sair sem salvar? "
 
-#: g10/keyedit.c:2078
+#: g10/keyedit.c:2184
 #, c-format
 msgid "update failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2191
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "atualiza��o da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:2092
+#: g10/keyedit.c:2198
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave n�o alterada, nenhuma atualiza��o � necess�ria.\n"
 
-#: g10/keyedit.c:2164
+#: g10/keyedit.c:2271
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2323
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2227
+#: g10/keyedit.c:2334
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2242 g10/keylist.c:307
+#: g10/keyedit.c:2349 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2473
+#: g10/keyedit.c:2580
 #, 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:2494
+#: g10/keyedit.c:2601
 #, 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:2500
+#: g10/keyedit.c:2607
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2516 g10/keyedit.c:2572 g10/keyedit.c:2684 g10/keyedit.c:2699
-#: g10/keylist.c:193 g10/keyserver.c:422
+#: g10/keyedit.c:2623 g10/keyedit.c:2679 g10/keyedit.c:2792 g10/keyedit.c:2807
+#: g10/keylist.c:194 g10/keyserver.c:421
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keyedit.c:2519 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:931
+#: g10/keyedit.c:2626 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:948
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revkey"
 
-#: g10/keyedit.c:2521 g10/keylist.c:757 g10/keylist.c:886
+#: g10/keyedit.c:2628 g10/keylist.c:758 g10/keylist.c:887
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "A chave expira em %s\n"
 
-#: g10/keyedit.c:2523 g10/keyedit.c:2574 g10/keyedit.c:2686 g10/keyedit.c:2701
-#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
-#: g10/keylist.c:913 g10/keyserver.c:428 g10/mainproc.c:937
+#: g10/keyedit.c:2630 g10/keyedit.c:2681 g10/keyedit.c:2794 g10/keyedit.c:2809
+#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
+#: g10/keylist.c:914 g10/keyserver.c:427 g10/mainproc.c:954
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "A chave expira em %s\n"
 
-#: g10/keyedit.c:2525
+#: g10/keyedit.c:2632
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "trust"
 
-#: g10/keyedit.c:2540
+#: g10/keyedit.c:2647
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr "trust"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2651
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2658
 msgid "This key has been disabled"
 msgstr "Esta chave foi desativada"
 
-#: g10/keyedit.c:2579 g10/keylist.c:199
+#: g10/keyedit.c:2686 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2754
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2654
+#: g10/keyedit.c:2762
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2718 g10/keyserver.c:432 g10/mainproc.c:1577
-#: g10/trustdb.c:1178
+#: g10/keyedit.c:2826 g10/keyedit.c:3201 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1690
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
-#: g10/keyedit.c:2720 g10/keyserver.c:436 g10/mainproc.c:1579
-#: g10/trustdb.c:531
+#: g10/keyedit.c:2828 g10/keyedit.c:3203 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1692
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2893
 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:2845
+#: g10/keyedit.c:2953
 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:2850 g10/keyedit.c:3128
+#: g10/keyedit.c:2958 g10/keyedit.c:3307
 #, 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:2856
+#: g10/keyedit.c:2964
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2996
+#: g10/keyedit.c:3104
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Deletar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3114
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Deletar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:3010
+#: g10/keyedit.c:3118
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Deletar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:3016
+#: g10/keyedit.c:3124
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:3030
+#: g10/keyedit.c:3138
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3139
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:3034
+#: g10/keyedit.c:3142
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:3123
+#: g10/keyedit.c:3167
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed.\n"
+msgstr "A chave � protegida.\n"
+
+#: g10/keyedit.c:3168
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed.\n"
+msgstr "A chave � protegida.\n"
+
+#: g10/keyedit.c:3173
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean.\n"
+msgstr "A chave � protegida.\n"
+
+#: g10/keyedit.c:3205 g10/trustdb.c:1694
+#, fuzzy
+msgid "invalid"
+msgstr "armadura inv�lida"
+
+#: g10/keyedit.c:3207
+#, fuzzy, c-format
+msgid "User ID \"%s\" removed: %s\n"
+msgstr "A chave � protegida.\n"
+
+#: g10/keyedit.c:3214
+#, fuzzy
+msgid "No user IDs are removable.\n"
+msgstr "Nenhum identificador de usu�rio para chave\n"
+
+#: g10/keyedit.c:3302
 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:3134
+#: g10/keyedit.c:3313
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3154
+#: g10/keyedit.c:3333
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Digite o tamanho da chave"
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3356
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3371
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3214
+#: g10/keyedit.c:3393
 #, 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:3233
+#: g10/keyedit.c:3412
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3239
+#: g10/keyedit.c:3418
 #, 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:3300
+#: g10/keyedit.c:3479
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as sele��es das chaves secretas.\n"
 
-#: g10/keyedit.c:3306
+#: g10/keyedit.c:3485
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor selecione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3310
+#: g10/keyedit.c:3489
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Modificando a data de validade para uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3313
+#: g10/keyedit.c:3492
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificando a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:3359
+#: g10/keyedit.c:3538
 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:3375
+#: g10/keyedit.c:3554
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/keyedit.c:3455
+#: g10/keyedit.c:3634
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de usu�rio.\n"
 
-#: g10/keyedit.c:3494 g10/keyedit.c:3604 g10/keyedit.c:3724
+#: g10/keyedit.c:3673 g10/keyedit.c:3783 g10/keyedit.c:3903
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inv�lida\n"
 
-#: g10/keyedit.c:3665
+#: g10/keyedit.c:3844
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3745
+#: g10/keyedit.c:3924
 #, 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:3746
+#: g10/keyedit.c:3925
 #, 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:3808
+#: g10/keyedit.c:3987
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:3854
+#: g10/keyedit.c:4045
+#, fuzzy, c-format
+msgid "No user ID with hash %s\n"
+msgstr "Nenhum ID de usu�rio com �ndice %d\n"
+
+#: g10/keyedit.c:4072
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:3971
+#: g10/keyedit.c:4189
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usu�rio: \""
 
-#: g10/keyedit.c:3974 g10/keyedit.c:4038 g10/keyedit.c:4081
+#: g10/keyedit.c:4192 g10/keyedit.c:4256 g10/keyedit.c:4299
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   assinado por %08lX em %s\n"
 
-#: g10/keyedit.c:3976 g10/keyedit.c:4040 g10/keyedit.c:4083
+#: g10/keyedit.c:4194 g10/keyedit.c:4258 g10/keyedit.c:4301
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:3980
+#: g10/keyedit.c:4198
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:3984
+#: g10/keyedit.c:4202
 #, 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:3988
+#: g10/keyedit.c:4206
 #, 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:4015
+#: g10/keyedit.c:4233
 #, 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:4041
+#: g10/keyedit.c:4259
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "assinar uma chave localmente"
 
-#: g10/keyedit.c:4048
+#: g10/keyedit.c:4266
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:4070
+#: g10/keyedit.c:4288
 msgid "You are about to revoke these signatures:\n"
 msgstr "Voc� est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:4090
+#: g10/keyedit.c:4308
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:4120
+#: g10/keyedit.c:4338
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4408
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4425
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4271
+#: g10/keyedit.c:4489
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:4333
+#: g10/keyedit.c:4551
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4646
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 
-#: g10/keygen.c:293
+#: g10/keygen.c:258
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "ignorado `%s': duplicado\n"
 
 # muitas ou demais ???
-#: g10/keygen.c:300
+#: g10/keygen.c:265
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "Prefer�ncias demais"
 
 # muitas ou demais ???
-#: g10/keygen.c:302
+#: g10/keygen.c:267
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "Prefer�ncias demais"
 
 # muitas ou demais ???
-#: g10/keygen.c:304
+#: g10/keygen.c:269
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "Prefer�ncias demais"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:394
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/keygen.c:829
+#: g10/keygen.c:822
 #, fuzzy
 msgid "writing direct signature\n"
 msgstr "escrevendo auto-assinatura\n"
 
-#: g10/keygen.c:868
+#: g10/keygen.c:861
 msgid "writing self signature\n"
 msgstr "escrevendo auto-assinatura\n"
 
 # key binding ???
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing key binding signature\n"
 msgstr "escrevendo assinatura ligada a uma chave\n"
 
-#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2632
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2638
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1239
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1252
+#: g10/keygen.c:1242
 #, fuzzy
 msgid "Encrypt"
 msgstr "criptografar dados"
 
-#: g10/keygen.c:1255
+#: g10/keygen.c:1245
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1263
+#: g10/keygen.c:1253
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1268
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1282
+#: g10/keygen.c:1272
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1287
+#: g10/keygen.c:1277
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1290
+#: g10/keygen.c:1280
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1293
+#: g10/keygen.c:1283
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1296
+#: g10/keygen.c:1286
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1340
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1342
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (padr�o)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1343
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1345
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1357
+#: g10/keygen.c:1347
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1348
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1350
 #, fuzzy, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1362
+#: g10/keygen.c:1352
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1431 g10/keygen.c:2509
+#: g10/keygen.c:1421 g10/keygen.c:2506
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "O par de chaves DSA ter� 1024 bits.\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1431
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1438
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Que tamanho de chave voc� quer? (1024) "
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1452
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1468
+#: g10/keygen.c:1458
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:1473 g10/keygen.c:1478
+#: g10/keygen.c:1463 g10/keygen.c:1468
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1515
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3603,7 +3699,7 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1526
 #, fuzzy
 msgid ""
 "Please specify how long the signature should be valid.\n"
@@ -3620,40 +3716,40 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1549
 msgid "Key is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:1563
-#, fuzzy
-msgid "Signature is valid for? (0) "
+#: g10/keygen.c:1554
+#, fuzzy, c-format
+msgid "Signature is valid for? (%s) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:1568
+#: g10/keygen.c:1572
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:1575
+#: g10/keygen.c:1579
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "A chave n�o expira nunca\n"
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1580
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "A chave n�o expira nunca\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1585
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "A chave expira em %s\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1586
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1592
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3661,12 +3757,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:1595
+#: g10/keygen.c:1597
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Est� correto (s/n)? "
 
-#: g10/keygen.c:1638
+#: g10/keygen.c:1641
 #, fuzzy
 msgid ""
 "\n"
@@ -3683,44 +3779,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1651
+#: g10/keygen.c:1654
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:1659
+#: g10/keygen.c:1662
 msgid "Invalid character in name\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1664
 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:1663
+#: g10/keygen.c:1666
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1674
 msgid "Email address: "
 msgstr "Endere�o de correio eletr�nico: "
 
-#: g10/keygen.c:1682
+#: g10/keygen.c:1685
 msgid "Not a valid email address\n"
 msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: g10/keygen.c:1690
+#: g10/keygen.c:1693
 msgid "Comment: "
 msgstr "Coment�rio: "
 
-#: g10/keygen.c:1696
+#: g10/keygen.c:1699
 msgid "Invalid character in comment\n"
 msgstr "Caractere inv�lido no coment�rio\n"
 
-#: g10/keygen.c:1719
+#: g10/keygen.c:1722
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:1725
+#: g10/keygen.c:1728
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3731,7 +3827,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1733
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
@@ -3746,24 +3842,24 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1746
+#: g10/keygen.c:1749
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:1756
+#: g10/keygen.c:1759
 #, 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:1757
+#: g10/keygen.c:1760
 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:1776
+#: g10/keygen.c:1779
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1816
+#: g10/keygen.c:1819
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3771,12 +3867,12 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger sua chave.\n"
 "\n"
 
-#: g10/keygen.c:1826 g10/passphrase.c:1105
+#: g10/keygen.c:1829 g10/passphrase.c:786
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1832
+#: g10/keygen.c:1835
 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"
@@ -3788,7 +3884,7 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1857
 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"
@@ -3800,50 +3896,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:2578
+#: g10/keygen.c:2575
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:2766 g10/keygen.c:2910
+#: g10/keygen.c:2774 g10/keygen.c:2918
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/keygen.c:2768 g10/keygen.c:2913
+#: g10/keygen.c:2776 g10/keygen.c:2921
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:2771 g10/keygen.c:2916
+#: g10/keygen.c:2779 g10/keygen.c:2924
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2907
 #, 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:2905
+#: g10/keygen.c:2913
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "imposs�vel bloquear chaveiro secreto: %s\n"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2931
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2938
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keygen.c:2953
+#: g10/keygen.c:2961
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:2964
+#: g10/keygen.c:2972
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -3852,12 +3948,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:2976 g10/keygen.c:3105 g10/keygen.c:3220
+#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3156 g10/sign.c:290
+#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -3865,7 +3961,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3030 g10/keygen.c:3158 g10/sign.c:292
+#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -3873,379 +3969,360 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3039 g10/keygen.c:3169
+#: g10/keygen.c:3047 g10/keygen.c:3177
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:3078 g10/keygen.c:3202
+#: g10/keygen.c:3086 g10/keygen.c:3210
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Realmente criar? "
 
-#: g10/keygen.c:3355
+#: g10/keygen.c:3363
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: g10/keygen.c:3402
+#: g10/keygen.c:3410
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keygen.c:3428
+#: g10/keygen.c:3436
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chave secreta %08lX expirou %s\n"
 
-#: g10/keygen.c:3508
-#, c-format
-msgid "length of RSA modulus is not %d\n"
-msgstr ""
-
-#: g10/keygen.c:3514
-msgid "public exponent too large (more than 32 bits)\n"
-msgstr ""
-
-#: g10/keygen.c:3520 g10/keygen.c:3526
-#, c-format
-msgid "length of an RSA prime is not %d\n"
-msgstr ""
-
-#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
+#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
 msgid "never     "
 msgstr ""
 
-#: g10/keylist.c:264
+#: g10/keylist.c:265
 #, fuzzy
 msgid "Critical signature policy: "
 msgstr "assinatura %s de: %s\n"
 
-#: g10/keylist.c:266
+#: g10/keylist.c:267
 #, fuzzy
 msgid "Signature policy: "
 msgstr "assinatura %s de: %s\n"
 
-#: g10/keylist.c:305
+#: g10/keylist.c:306
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:354 g10/keylist.c:398
+#: 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:372
+#: g10/keylist.c:373
 #, fuzzy
 msgid "Critical signature notation: "
 msgstr "Nota��o: "
 
-#: g10/keylist.c:374
+#: g10/keylist.c:375
 #, fuzzy
 msgid "Signature notation: "
 msgstr "Nota��o: "
 
-#: g10/keylist.c:385
+#: g10/keylist.c:386
 msgid "not human readable"
 msgstr ""
 
-#: g10/keylist.c:486
+#: g10/keylist.c:487
 msgid "Keyring"
 msgstr ""
 
-#: g10/keylist.c:792
+#: g10/keylist.c:793
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr "A chave expira em %s\n"
 
-#: g10/keylist.c:1488
+#: g10/keylist.c:1489
 #, fuzzy
 msgid "Primary key fingerprint:"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/keylist.c:1490
+#: g10/keylist.c:1491
 #, 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:1497
+#: g10/keylist.c:1498
 #, fuzzy
 msgid " Primary key fingerprint:"
 msgstr "       Impress�o digital:"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1500
 #, fuzzy
 msgid "      Subkey fingerprint:"
 msgstr "       Impress�o digital:"
 
-#: g10/keylist.c:1503 g10/keylist.c:1507
+#: g10/keylist.c:1504 g10/keylist.c:1508
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "       Impress�o digital:"
 
-#: g10/keylist.c:1574
+#: g10/keylist.c:1575
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1245
+#: g10/keyring.c:1246
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1252
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVISO: existem 2 arquivos com informa��es confidenciais.\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � o n�o modificado\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1255
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � o novo\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1256
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor conserte este poss�vel furo de seguran�a\n"
 
-#: g10/keyring.c:1375
+#: g10/keyring.c:1376
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keyring.c:1421
+#: g10/keyring.c:1422
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/keyring.c:1433
+#: g10/keyring.c:1434
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/keyring.c:1504
+#: g10/keyring.c:1505
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: chaveiro criado\n"
 
-#: g10/keyserver.c:107
+#: g10/keyserver.c:105
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 
-#: g10/keyserver.c:434
+#: g10/keyserver.c:433
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:635
+#: g10/keyserver.c:634
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:718 g10/keyserver.c:1238
+#: g10/keyserver.c:717 g10/keyserver.c:1267
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/keyserver.c:808
+#: g10/keyserver.c:815
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/keyserver.c:810
+#: g10/keyserver.c:817
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/keyserver.c:985
+#: g10/keyserver.c:1014
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/keyserver.c:989
+#: g10/keyserver.c:1018
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/keyserver.c:1141
+#: g10/keyserver.c:1170
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "assinado com sua chave %08lX em %s\n"
 
-#: g10/keyserver.c:1188
+#: g10/keyserver.c:1217
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "exportar chaves para um servidor"
 
-#: g10/keyserver.c:1191
+#: g10/keyserver.c:1220
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/keyserver.c:1198 g10/keyserver.c:1293
+#: g10/keyserver.c:1227 g10/keyserver.c:1322
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1275
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1255
+#: g10/keyserver.c:1284
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1314
+#: g10/keyserver.c:1343
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1320
+#: g10/keyserver.c:1349
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1361
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1366
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1374
 #, c-format
-msgid "gpgkeys_%s does not support handler version %d\n"
+msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1351
+#: g10/keyserver.c:1381
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "erro geral"
 
-#: g10/keyserver.c:1356
+#: g10/keyserver.c:1386
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "erro geral"
 
-#: g10/keyserver.c:1365
+#: g10/keyserver.c:1395
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/keyserver.c:1390 g10/keyserver.c:1424
+#: g10/keyserver.c:1420 g10/keyserver.c:1454
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s n�o � um mapa de caracteres v�lido\n"
 
-#: g10/keyserver.c:1681
+#: g10/keyserver.c:1711
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/keyserver.c:1703
+#: g10/keyserver.c:1733
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/keyserver.c:1705
+#: g10/keyserver.c:1735
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:249
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:262
-#, fuzzy, c-format
-msgid "bad passphrase or unknown cipher algorithm (%d)\n"
-msgstr "algoritmo de criptografia desconhecido"
-
-#: g10/mainproc.c:299
+#: g10/mainproc.c:300
 #, fuzzy, c-format
 msgid "%s encrypted session key\n"
 msgstr "dados criptografados com %s\n"
 
-#: g10/mainproc.c:309
+#: g10/mainproc.c:310
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "criptografado com algoritmo desconhecido %d\n"
 
-#: g10/mainproc.c:375
+#: g10/mainproc.c:376
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "a chave p�blica � %08lX\n"
 
-#: g10/mainproc.c:430
+#: g10/mainproc.c:431
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados criptografados com chave p�blica: DEK v�lido\n"
 
-#: g10/mainproc.c:463
+#: g10/mainproc.c:464
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "criptografado com chave %u-bit %s, ID %08lX, criada em %s\n"
 
-#: g10/mainproc.c:467 g10/pkclist.c:218
+#: g10/mainproc.c:468 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:472
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "criptografado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descriptografia de chave p�blica falhou: %s\n"
 
-#: g10/mainproc.c:499
+#: g10/mainproc.c:500
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Repita a frase secreta: "
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:502
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Repita a frase secreta: "
 
-#: g10/mainproc.c:529 g10/mainproc.c:551
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, fuzzy, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "dados criptografados com %s\n"
 
-#: g10/mainproc.c:537
+#: g10/mainproc.c:538
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:569
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr "descriptografia correta\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:574
 #, fuzzy
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem criptografada foi manipulada!\n"
 
-#: g10/mainproc.c:592
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
@@ -4259,304 +4336,293 @@ 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:786
+#: g10/mainproc.c:803
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoga��o isolada - use \"gpg --import\" para aplic�-la\n"
 
-#: g10/mainproc.c:1290
+#: g10/mainproc.c:1307
 msgid "signature verification suppressed\n"
 msgstr "verifica��o de assinatura suprimida\n"
 
-#: g10/mainproc.c:1332 g10/mainproc.c:1342
+#: g10/mainproc.c:1349 g10/mainproc.c:1359
 #, fuzzy
 msgid "can't handle these multiple signatures\n"
 msgstr "fazer uma assinatura separada"
 
-#: g10/mainproc.c:1352
+#: g10/mainproc.c:1369
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/mainproc.c:1353
+#: g10/mainproc.c:1370
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1357
+#: g10/mainproc.c:1374
 #, 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:1377
+#: g10/mainproc.c:1394
 #, fuzzy
 msgid "Key available at: "
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/mainproc.c:1482 g10/mainproc.c:1530
+#: g10/mainproc.c:1499 g10/mainproc.c:1547
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Assinatura INCORRETA de \""
 
-#: g10/mainproc.c:1484 g10/mainproc.c:1532
+#: g10/mainproc.c:1501 g10/mainproc.c:1549
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1486 g10/mainproc.c:1534
+#: g10/mainproc.c:1503 g10/mainproc.c:1551
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1538
+#: g10/mainproc.c:1555
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1570
+#: g10/mainproc.c:1587
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1664
+#: g10/mainproc.c:1681
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/mainproc.c:1669
+#: g10/mainproc.c:1686
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/mainproc.c:1672
+#: g10/mainproc.c:1689
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/mainproc.c:1673
+#: g10/mainproc.c:1690
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:1674
+#: g10/mainproc.c:1691
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1674 g10/trustdb.c:530
+#: g10/mainproc.c:1691 g10/trustdb.c:531
 #, fuzzy
 msgid "unknown"
 msgstr "vers�o desconhecida"
 
-#: g10/mainproc.c:1694
+#: g10/mainproc.c:1711
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1762 g10/mainproc.c:1778 g10/mainproc.c:1864
+#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "fazer uma assinatura separada"
 
-#: g10/mainproc.c:1805
+#: g10/mainproc.c:1822
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:1813
+#: g10/mainproc.c:1830
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura isolada da classe 0x%02x\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1887
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:1880
+#: g10/mainproc.c:1897
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
-#: g10/misc.c:121
+#: g10/misc.c:122
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "imposs�vel desativar core dumps: %s\n"
 
-#: g10/misc.c:141 g10/misc.c:169 g10/misc.c:241
+#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "atualiza��o do banco de dados de confiabilidade falhou: %s\n"
 
-#: g10/misc.c:206
+#: g10/misc.c:207
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "banco de dados de confiabilidade: leitura falhou (n=%d): %s\n"
 
-#: g10/misc.c:315
+#: g10/misc.c:316
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 
-#: g10/misc.c:330
+#: g10/misc.c:331
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algoritmo de criptografia n�o implementado"
 
-#: g10/misc.c:345
+#: g10/misc.c:346
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:351
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/misc.c:446
+#: g10/misc.c:447
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:447
+#: g10/misc.c:448
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 
-#: g10/misc.c:680
+#: g10/misc.c:681
 #, fuzzy, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/misc.c:684
+#: g10/misc.c:685
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/misc.c:686
+#: g10/misc.c:687
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:697
+#: g10/misc.c:694
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
+msgstr "AVISO: `%s' � um arquivo vazio\n"
+
+#: g10/misc.c:707
 #, fuzzy
 msgid "Uncompressed"
 msgstr "n�o processado(s)"
 
-#: g10/misc.c:722
+#: g10/misc.c:732
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "n�o processado(s)"
 
-#: g10/misc.c:832
+#: g10/misc.c:842
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:989
+#: g10/misc.c:999
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/misc.c:1014
+#: g10/misc.c:1024
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinat�rio padr�o desconhecido `%s'\n"
 
-#: g10/openfile.c:84
+#: g10/openfile.c:86
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Arquivo `%s' j� existe. "
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Sobrescrever (s/N)? "
 
-#: g10/openfile.c:119
+#: g10/openfile.c:121
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: sufixo desconhecido\n"
 
-#: g10/openfile.c:141
+#: g10/openfile.c:143
 msgid "Enter new filename"
 msgstr "Digite novo nome de arquivo"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:188
 msgid "writing to stdout\n"
 msgstr "escrevendo em \"stdout\"\n"
 
-#: g10/openfile.c:296
+#: g10/openfile.c:300
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "assumindo dados assinados em `%s'\n"
 
-#: g10/openfile.c:375
+#: g10/openfile.c:379
 #, fuzzy, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/openfile.c:377
+#: g10/openfile.c:381
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 
-#: g10/openfile.c:409
+#: g10/openfile.c:413
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: diret�rio criado\n"
 
-#: g10/parse-packet.c:137
+#: g10/parse-packet.c:138
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 
-#: g10/parse-packet.c:707
+#: g10/parse-packet.c:708
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1132
+#: g10/parse-packet.c:1145
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
 
-#: g10/passphrase.c:478 g10/passphrase.c:525
+#: g10/passphrase.c:305
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: g10/passphrase.c:486
-msgid "can't set client pid for the agent\n"
-msgstr ""
-
-#: g10/passphrase.c:494
-msgid "can't get server read FD for the agent\n"
-msgstr ""
-
-#: g10/passphrase.c:501
-msgid "can't get server write FD for the agent\n"
-msgstr ""
-
-#: g10/passphrase.c:534
+#: g10/passphrase.c:317
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/passphrase.c:547
+#: g10/passphrase.c:332
 #, fuzzy, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: g10/passphrase.c:568
+#: g10/passphrase.c:345
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: g10/passphrase.c:590
-msgid "communication problem with gpg-agent\n"
-msgstr ""
-
-#: g10/passphrase.c:597 g10/passphrase.c:937 g10/passphrase.c:1049
+#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
 
-#: g10/passphrase.c:700 g10/passphrase.c:1209
+#: g10/passphrase.c:511 g10/passphrase.c:890
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:525
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4568,44 +4634,30 @@ msgstr ""
 "usu�rio: \"%.*s\"\n"
 "%u-bit %s chave, ID %08lX, criada %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:550
 #, fuzzy
 msgid "Repeat passphrase\n"
 msgstr "Repita a frase secreta: "
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:552
 #, fuzzy
 msgid "Enter passphrase\n"
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:781
-#, fuzzy
-msgid "passphrase too long\n"
-msgstr "linha muito longa\n"
-
-#: g10/passphrase.c:794
-msgid "invalid response from agent\n"
-msgstr ""
-
-#: g10/passphrase.c:810 g10/passphrase.c:931
+#: g10/passphrase.c:628
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:815 g10/passphrase.c:1020
-#, c-format
-msgid "problem with the agent: agent returns 0x%lx\n"
-msgstr ""
-
-#: g10/passphrase.c:1100 g10/passphrase.c:1263
+#: g10/passphrase.c:781 g10/passphrase.c:944
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "imposs�vel pedir senha em modo n�o-interativo\n"
 
-#: g10/passphrase.c:1107 g10/passphrase.c:1268
+#: g10/passphrase.c:788 g10/passphrase.c:949
 msgid "Enter passphrase: "
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:871
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4615,21 +4667,21 @@ msgstr ""
 "Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "usu�rio: \""
 
-#: g10/passphrase.c:1196
+#: g10/passphrase.c:877
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
 
-#: g10/passphrase.c:1205
+#: g10/passphrase.c:886
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1272
+#: g10/passphrase.c:953
 msgid "Repeat passphrase: "
 msgstr "Repita a frase secreta: "
 
-#: g10/photoid.c:66
+#: g10/photoid.c:67
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4638,164 +4690,164 @@ msgid ""
 "Keeping the image close to 240x288 is a good size to use.\n"
 msgstr ""
 
-#: g10/photoid.c:80
+#: g10/photoid.c:81
 msgid "Enter JPEG filename for photo ID: "
 msgstr ""
 
-#: g10/photoid.c:94
+#: g10/photoid.c:95
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "imposs�vel abrir arquivo: %s\n"
 
-#: g10/photoid.c:102
+#: g10/photoid.c:103
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:104
+#: g10/photoid.c:105
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/photoid.c:119
+#: g10/photoid.c:120
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/photoid.c:136
+#: g10/photoid.c:137
 #, fuzzy
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Est� correto (s/n)? "
 
-#: g10/photoid.c:338
+#: g10/photoid.c:339
 #, fuzzy
 msgid "unable to display photo ID!\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:580
+#: g10/pkclist.c:62 g10/revoke.c:581
 msgid "No reason specified"
 msgstr ""
 
-#: g10/pkclist.c:63 g10/revoke.c:582
+#: g10/pkclist.c:64 g10/revoke.c:583
 #, fuzzy
 msgid "Key is superseded"
 msgstr "A chave � protegida.\n"
 
-#: g10/pkclist.c:65 g10/revoke.c:581
+#: g10/pkclist.c:66 g10/revoke.c:582
 #, fuzzy
 msgid "Key has been compromised"
 msgstr "Esta chave foi desativada"
 
-#: g10/pkclist.c:67 g10/revoke.c:583
+#: g10/pkclist.c:68 g10/revoke.c:584
 msgid "Key is no longer used"
 msgstr ""
 
-#: g10/pkclist.c:69 g10/revoke.c:584
+#: g10/pkclist.c:70 g10/revoke.c:585
 msgid "User ID is no longer valid"
 msgstr ""
 
-#: g10/pkclist.c:73
+#: g10/pkclist.c:74
 #, fuzzy
 msgid "reason for revocation: "
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/pkclist.c:90
+#: g10/pkclist.c:91
 #, fuzzy
 msgid "revocation comment: "
 msgstr "[revoga��o]"
 
-#: g10/pkclist.c:205
+#: g10/pkclist.c:206
 msgid "iImMqQsS"
 msgstr ""
 
-#: g10/pkclist.c:213
+#: g10/pkclist.c:214
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "Nenhum valor de confian�a designado para %lu:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:245
+#: g10/pkclist.c:246
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "                   ou \""
 
-#: g10/pkclist.c:255
+#: g10/pkclist.c:256
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Esta chave provavelmente pertence ao dono\n"
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:271
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr ""
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr "%08lX: N�s N�O confiamos nesta chave\n"
 
-#: g10/pkclist.c:278
+#: g10/pkclist.c:279
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/pkclist.c:284
+#: g10/pkclist.c:285
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = voltar ao menu principal\n"
 
-#: g10/pkclist.c:287
+#: g10/pkclist.c:288
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr "chave %08lX: subchave ignorada\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " q = sair\n"
 
-#: g10/pkclist.c:292
+#: g10/pkclist.c:293
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:298 g10/revoke.c:609
+#: g10/pkclist.c:299 g10/revoke.c:610
 msgid "Your decision? "
 msgstr "Sua decis�o? "
 
-#: g10/pkclist.c:319
+#: g10/pkclist.c:320
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Voc� realmente quer remover esta chave? "
 
-#: g10/pkclist.c:333
+#: g10/pkclist.c:334
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/pkclist.c:418
+#: g10/pkclist.c:419
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr "       N�o h� indica��o de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:423
+#: g10/pkclist.c:424
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr "       N�o h� indica��o de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:429
+#: g10/pkclist.c:430
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Esta chave provavelmente pertence ao dono\n"
 
-#: g10/pkclist.c:434
+#: g10/pkclist.c:435
 msgid "This key belongs to us\n"
 msgstr "Esta chave pertence a n�s\n"
 
-#: g10/pkclist.c:460
+#: g10/pkclist.c:461
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -4807,271 +4859,271 @@ msgstr ""
 "sim � pr�xima pergunta\n"
 "\n"
 
-#: g10/pkclist.c:467
+#: g10/pkclist.c:468
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Usa esta chave de qualquer modo? "
 
-#: g10/pkclist.c:501
+#: g10/pkclist.c:502
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVISO: Usando chave n�o confi�vel!\n"
 
-#: g10/pkclist.c:508
+#: g10/pkclist.c:509
 #, fuzzy
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:517
+#: g10/pkclist.c:518
 #, fuzzy
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:520
+#: g10/pkclist.c:521
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "       Isto pode significar que a assinatura � falsificada.\n"
 
-#: g10/pkclist.c:527
+#: g10/pkclist.c:528
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVISO: Esta subchave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:532
+#: g10/pkclist.c:533
 #, fuzzy
 msgid "Note: This key has been disabled.\n"
 msgstr "Esta chave foi desativada"
 
-#: g10/pkclist.c:537
+#: g10/pkclist.c:538
 msgid "Note: This key has expired!\n"
 msgstr "Nota: Esta chave expirou!\n"
 
-#: g10/pkclist.c:548
+#: g10/pkclist.c:549
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVISO: Esta chave n�o est� certificada com uma assinatura confi�vel!\n"
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:551
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "       N�o h� indica��o de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:559
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVISO: N�s N�O confiamos nesta chave!\n"
 
-#: g10/pkclist.c:559
+#: g10/pkclist.c:560
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "       A assinatura � provavelmente uma FALSIFICA��O.\n"
 
-#: g10/pkclist.c:567
+#: g10/pkclist.c:568
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVISO: Esta chave n�o est� certificada com assinaturas suficientemente\n"
 "       confi�veis!\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:570
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "       N�o se tem certeza de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:734 g10/pkclist.c:767 g10/pkclist.c:936 g10/pkclist.c:996
+#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:744 g10/pkclist.c:968
+#: g10/pkclist.c:745 g10/pkclist.c:969
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorado: a chave p�blica j� est� presente\n"
 
-#: g10/pkclist.c:786
+#: g10/pkclist.c:787
 #, fuzzy
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Voc� n�o especificou um identificador de usu�rio. (pode-se usar \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:802
+#: g10/pkclist.c:803
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:828
+#: g10/pkclist.c:829
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
 msgstr ""
 
-#: g10/pkclist.c:844
+#: g10/pkclist.c:845
 msgid "No such user ID.\n"
 msgstr "Identificador de usu�rio inexistente.\n"
 
-#: g10/pkclist.c:849 g10/pkclist.c:911
+#: g10/pkclist.c:850 g10/pkclist.c:912
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorado: chave p�blica j� marcada como destinat�rio padr�o\n"
 
-#: g10/pkclist.c:867
+#: g10/pkclist.c:868
 msgid "Public key is disabled.\n"
 msgstr "A chave p�blica est� desativada.\n"
 
-#: g10/pkclist.c:874
+#: g10/pkclist.c:875
 #, fuzzy
 msgid "skipped: public key already set\n"
 msgstr "%s: ignorado: a chave p�blica j� est� presente\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:904
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "destinat�rio padr�o desconhecido `%s'\n"
 
-#: g10/pkclist.c:948
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorado: a chave p�blica est� desativada\n"
 
-#: g10/pkclist.c:1003
+#: g10/pkclist.c:1004
 msgid "no valid addressees\n"
 msgstr "nenhum endere�o v�lido\n"
 
-#: g10/plaintext.c:90
+#: g10/plaintext.c:91
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "dados n�o salvos; use a op��o \"--output\" para salv�-los\n"
 
-#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
+#: g10/plaintext.c:136 g10/plaintext.c:141 g10/plaintext.c:159
 #, fuzzy, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/plaintext.c:446
+#: g10/plaintext.c:447
 msgid "Detached signature.\n"
 msgstr "Assinatura separada.\n"
 
-#: g10/plaintext.c:450
+#: g10/plaintext.c:452
 msgid "Please enter name of data file: "
 msgstr "Por favor digite o nome do arquivo de dados: "
 
-#: g10/plaintext.c:478
+#: g10/plaintext.c:481
 msgid "reading stdin ...\n"
 msgstr "lendo de \"stdin\" ...\n"
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:515
 #, fuzzy
 msgid "no signed data\n"
 msgstr "no dados assinados\n"
 
-#: g10/plaintext.c:526
+#: g10/plaintext.c:529
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposs�vel abrir dados assinados `%s'\n"
 
-#: g10/pubkey-enc.c:103
+#: g10/pubkey-enc.c:104
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "destinat�rio an�nimo; tentando chave secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:119
+#: g10/pubkey-enc.c:120
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "certo, n�s somos o destinat�rio an�nimo.\n"
 
-#: g10/pubkey-enc.c:207
+#: g10/pubkey-enc.c:208
 msgid "old encoding of the DEK is not supported\n"
 msgstr "codifica��o antiga do DEK n�o suportada\n"
 
-#: g10/pubkey-enc.c:228
+#: g10/pubkey-enc.c:229
 #, fuzzy, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: g10/pubkey-enc.c:266
+#: g10/pubkey-enc.c:267
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:287
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTA: chave secreta %08lX expirou %s\n"
 
-#: g10/pubkey-enc.c:292
+#: g10/pubkey-enc.c:293
 #, fuzzy
 msgid "NOTE: key has been revoked"
 msgstr "chave %08lX: a chave foi revogada!\n"
 
-#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:545
+#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
+#: g10/revoke.c:188 g10/revoke.c:546
 #, fuzzy, c-format
 msgid "build_packet failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: g10/revoke.c:146
+#: g10/revoke.c:147
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "chave %08lX: sem ID de usu�rio\n"
 
-#: g10/revoke.c:272
+#: g10/revoke.c:273
 msgid "To be revoked by:\n"
 msgstr ""
 
-#: g10/revoke.c:276
+#: g10/revoke.c:277
 msgid "(This is a sensitive revocation key)\n"
 msgstr ""
 
-#: g10/revoke.c:280
+#: g10/revoke.c:281
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/revoke.c:293 g10/revoke.c:511
+#: g10/revoke.c:294 g10/revoke.c:512
 msgid "ASCII armored output forced.\n"
 msgstr ""
 
-#: g10/revoke.c:307 g10/revoke.c:525
+#: g10/revoke.c:308 g10/revoke.c:526
 #, fuzzy, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: g10/revoke.c:370
+#: g10/revoke.c:371
 #, fuzzy
 msgid "Revocation certificate created.\n"
 msgstr "chave %08lX: certificado de revoga��o adicionado\n"
 
-#: g10/revoke.c:376
+#: g10/revoke.c:377
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr ""
 
-#: g10/revoke.c:432
+#: g10/revoke.c:433
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/revoke.c:461
+#: g10/revoke.c:462
 #, fuzzy, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:473
 #, fuzzy
 msgid "public key does not match secret key!\n"
 msgstr "lid %lu n�o tem chave\n"
 
-#: g10/revoke.c:479
+#: g10/revoke.c:480
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/revoke.c:496
+#: g10/revoke.c:497
 #, fuzzy
 msgid "unknown protection algorithm\n"
 msgstr "algoritmo de compress�o desconhecido"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 #, fuzzy
 msgid "NOTE: This key is not protected!\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/revoke.c:551
+#: g10/revoke.c:552
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5082,112 +5134,112 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/revoke.c:602
+#: g10/revoke.c:603
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:604
+#: g10/revoke.c:605
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:645
+#: g10/revoke.c:646
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 
-#: g10/revoke.c:673
+#: g10/revoke.c:674
 #, fuzzy, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/revoke.c:675
+#: g10/revoke.c:676
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Usa esta chave de qualquer modo? "
 
-#: g10/seckey-cert.c:54
+#: g10/seckey-cert.c:55
 #, fuzzy
 msgid "secret key parts are not available\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/seckey-cert.c:60
+#: g10/seckey-cert.c:61
 #, fuzzy, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: g10/seckey-cert.c:71
+#: g10/seckey-cert.c:72
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: g10/seckey-cert.c:265
+#: g10/seckey-cert.c:266
 #, fuzzy
 msgid "Invalid passphrase; please try again"
 msgstr "Frase secreta inv�lida; por favor tente novamente ...\n"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:267
 #, c-format
 msgid "%s ...\n"
 msgstr ""
 
-#: g10/seckey-cert.c:326
+#: g10/seckey-cert.c:327
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVISO: Chave fraca detectada - por favor mude a frase secreta novamente.\n"
 
-#: g10/seckey-cert.c:364
+#: g10/seckey-cert.c:365
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 
-#: g10/seskey.c:52
+#: g10/seskey.c:53
 msgid "weak key created - retrying\n"
 msgstr "chave fraca criada - tentando novamente\n"
 
-#: g10/seskey.c:57
+#: g10/seskey.c:58
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "imposs�vel evitar chave fraca para criptografia sim�trica;\n"
 "%d tentativas!\n"
 
-#: g10/seskey.c:213
+#: g10/seskey.c:214
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr ""
 
-#: g10/sig-check.c:75
+#: g10/sig-check.c:76
 msgid "WARNING: signature digest conflict in message\n"
 msgstr ""
 
-#: g10/sig-check.c:99
+#: g10/sig-check.c:100
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 
-#: g10/sig-check.c:102
+#: g10/sig-check.c:103
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 
-#: g10/sig-check.c:168
+#: g10/sig-check.c:169
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "a chave p�blica � %lu segundo mais nova que a assinatura\n"
 
-#: g10/sig-check.c:169
+#: g10/sig-check.c:170
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "a chave p�blica � %lu segundos mais nova que a assinatura\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:181
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5195,7 +5247,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:183
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5203,127 +5255,127 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:193
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTA: chave de assinatura %08lX expirou %s\n"
 
-#: g10/sig-check.c:275
+#: g10/sig-check.c:276
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "assumindo assinatura incorreta devido a um bit cr�tico desconhecido\n"
 
-#: g10/sig-check.c:532
+#: g10/sig-check.c:533
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/sig-check.c:558
+#: g10/sig-check.c:559
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/sign.c:85
+#: g10/sign.c:86
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:93
+#: g10/sign.c:94
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 
-#: g10/sign.c:112
+#: g10/sign.c:113
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:138
+#: g10/sign.c:139
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:146
+#: g10/sign.c:147
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:159
+#: g10/sign.c:160
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:187
+#: g10/sign.c:188
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:364
+#: g10/sign.c:365
 #, fuzzy, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "leitura de registro de assinatura falhou: %s\n"
 
-#: g10/sign.c:373
+#: g10/sign.c:374
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/sign.c:741
+#: g10/sign.c:761
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:808
+#: g10/sign.c:830
 #, 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:900
+#: g10/sign.c:922
 msgid "signing:"
 msgstr "assinando:"
 
-#: g10/sign.c:1007
+#: g10/sign.c:1034
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1180
+#: g10/sign.c:1212
 #, fuzzy, c-format
 msgid "%s encryption will be used\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/skclist.c:126 g10/skclist.c:190
+#: g10/skclist.c:127 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "a chave n�o est� marcada como insegura - imposs�vel us�-la com o pseudo "
 "RNG!\n"
 
-#: g10/skclist.c:157
+#: g10/skclist.c:158
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "ignorado `%s': duplicado\n"
 
-#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "ignorado `%s': %s\n"
 
-#: g10/skclist.c:170
+#: g10/skclist.c:171
 #, fuzzy
 msgid "skipped: secret key already present\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/skclist.c:185
+#: g10/skclist.c:186
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "ignorado `%s': esta � uma chave ElGamal gerada pelo PGP que n�o � segura "
 "para assinaturas!\n"
 
-#: g10/tdbdump.c:59 g10/trustdb.c:365
+#: g10/tdbdump.c:60 g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "registro de confian�a %lu, tipo %d: escrita falhou: %s\n"
 
-#: g10/tdbdump.c:104
+#: g10/tdbdump.c:105
 #, fuzzy, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5332,352 +5384,352 @@ msgstr ""
 "# Lista de valores de confian�a designados, criada em %s\n"
 "# (Use \"gpgm --import-ownertrust\" para restaur�-los)\n"
 
-#: g10/tdbdump.c:159 g10/tdbdump.c:167 g10/tdbdump.c:172 g10/tdbdump.c:177
+#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/tdbdump.c:159
+#: g10/tdbdump.c:160
 #, fuzzy
 msgid "line too long"
 msgstr "linha muito longa\n"
 
-#: g10/tdbdump.c:167
+#: g10/tdbdump.c:168
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:173
+#: g10/tdbdump.c:174
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "erro: impress�o digital inv�lida\n"
 
-#: g10/tdbdump.c:178
+#: g10/tdbdump.c:179
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr "importar os valores de confian�a"
 
-#: g10/tdbdump.c:214
+#: g10/tdbdump.c:215
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "erro lendo registro de diret�rio: %s\n"
 
-#: g10/tdbdump.c:218
+#: g10/tdbdump.c:219
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "erro de leitura: %s\n"
 
-#: g10/tdbdump.c:227 g10/trustdb.c:380
+#: g10/tdbdump.c:228 g10/trustdb.c:381
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "banco de dados de confiabilidade: sincroniza��o falhou: %s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1440
+#: g10/tdbio.c:129 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "banco de dados de confiabilidade rec %lu: lseek falhou: %s\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1447
+#: g10/tdbio.c:135 g10/tdbio.c:1448
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "banco de dados de confiabilidade rec %lu: escrita falhou (n=%d): %s\n"
 
-#: g10/tdbio.c:244
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "transa��o de banco de dados de confiabilidade muito grande\n"
 
-#: g10/tdbio.c:497
+#: g10/tdbio.c:498
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: g10/tdbio.c:512
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: diret�rio inexistente!\n"
 
-#: g10/tdbio.c:522 g10/tdbio.c:545 g10/tdbio.c:588
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/tdbio.c:524 g10/tdbio.c:591
+#: g10/tdbio.c:525 g10/tdbio.c:592
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/tdbio.c:550
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: falha ao criar registro de vers�o: %s"
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: banco de dados de confiabilidade inv�lido criado\n"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: banco de dados de confiabilidade criado\n"
 
-#: g10/tdbio.c:597
+#: g10/tdbio.c:598
 msgid "NOTE: trustdb not writable\n"
 msgstr ""
 
-#: g10/tdbio.c:614
+#: g10/tdbio.c:615
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: banco de dados de confiabilidade inv�lido\n"
 
-#: g10/tdbio.c:646
+#: g10/tdbio.c:647
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
 
-#: g10/tdbio.c:654
+#: g10/tdbio.c:655
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: erro atualizando registro de vers�o: %s\n"
 
-#: g10/tdbio.c:671 g10/tdbio.c:691 g10/tdbio.c:707 g10/tdbio.c:721
-#: g10/tdbio.c:751 g10/tdbio.c:1373 g10/tdbio.c:1400
+#: g10/tdbio.c:672 g10/tdbio.c:692 g10/tdbio.c:708 g10/tdbio.c:722
+#: g10/tdbio.c:752 g10/tdbio.c:1374 g10/tdbio.c:1401
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: erro lendo registro de vers�o: %s\n"
 
-#: g10/tdbio.c:730
+#: g10/tdbio.c:731
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: erro escrevendo registro de vers�o: %s\n"
 
-#: g10/tdbio.c:1169
+#: g10/tdbio.c:1170
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "banco de dados de confiabilidade: lseek falhou: %s\n"
 
-#: g10/tdbio.c:1177
+#: g10/tdbio.c:1178
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "banco de dados de confiabilidade: leitura falhou (n=%d): %s\n"
 
-#: g10/tdbio.c:1198
+#: g10/tdbio.c:1199
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/tdbio.c:1216
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registro de vers�o com recnum %lu\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1222
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: vers�o de arquivo inv�lida %d\n"
 
-#: g10/tdbio.c:1406
+#: g10/tdbio.c:1407
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: erro lendo registro livre: %s\n"
 
-#: g10/tdbio.c:1414
+#: g10/tdbio.c:1415
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: erro escrevendo registro de diret�rio: %s\n"
 
-#: g10/tdbio.c:1424
+#: g10/tdbio.c:1425
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: falha ao zerar um registro: %s\n"
 
-#: g10/tdbio.c:1454
+#: g10/tdbio.c:1455
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: falha ao anexar um registro: %s\n"
 
-#: g10/tdbio.c:1499
+#: g10/tdbio.c:1500
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "O banco de dados de confiabilidade est� danificado; por favor rode\n"
 "\"gpg --fix-trust-db\".\n"
 
-#: g10/textfilter.c:147
+#: g10/textfilter.c:148
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "imposs�vel manipular linhas de texto maiores que %d caracteres\n"
 
-#: g10/textfilter.c:244
+#: g10/textfilter.c:245
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "linha de entrada maior que %d caracteres\n"
 
-#: g10/trustdb.c:226
+#: g10/trustdb.c:227
 #, fuzzy, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "%s n�o � um mapa de caracteres v�lido\n"
 
-#: g10/trustdb.c:257
+#: g10/trustdb.c:258
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "chave %08lX: aceita como chave confi�vel.\n"
 
-#: g10/trustdb.c:295
+#: g10/trustdb.c:296
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr ""
 "chave %08lX: imposs�vel coloc�-la no banco de dados de confiabilidade\n"
 
-#: g10/trustdb.c:310
+#: g10/trustdb.c:311
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/trustdb.c:320
+#: g10/trustdb.c:321
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/trustdb.c:344
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "registro de confian�a %lu, tipo req %d: falha na leitura: %s\n"
 
-#: g10/trustdb.c:350
+#: g10/trustdb.c:351
 #, fuzzy, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "registro de confian�a %lu: remo��o falhou: %s\n"
 
-#: g10/trustdb.c:446
+#: g10/trustdb.c:447
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:452
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:506
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ revoked]"
 msgstr "revkey"
 
-#: g10/trustdb.c:508 g10/trustdb.c:513
+#: g10/trustdb.c:509 g10/trustdb.c:514
 #, fuzzy
 msgid "[ expired]"
 msgstr "expire"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 #, fuzzy
 msgid "[ unknown]"
 msgstr "vers�o desconhecida"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:536
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:576
+#: 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:582 g10/trustdb.c:2157
+#: g10/trustdb.c:583 g10/trustdb.c:2309
 #, 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:591
+#: 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:606
+#: 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:838 g10/trustdb.c:1276
+#: 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:1033
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1037
+#: g10/trustdb.c:1038
 #, fuzzy
 msgid "checking the trustdb\n"
 msgstr "muda os valores de confian�a"
 
-#: g10/trustdb.c:1901
+#: g10/trustdb.c:2053
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:1965
+#: g10/trustdb.c:2117
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:2131
 #, 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:2002
+#: g10/trustdb.c:2154
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2240
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2163
+#: g10/trustdb.c:2315
 #, 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"
 
-#: g10/verify.c:116
+#: g10/verify.c:117
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -5687,310 +5739,325 @@ msgstr ""
 "Por favor lembre-se de que o arquivo com a assinatura (.sig ou .asc)\n"
 "deve ser o primeiro arquivo dado na linha de comando.\n"
 
-#: g10/verify.c:189
+#: g10/verify.c:190
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "linha %u muito longa ou sem LF\n"
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "erro geral"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "formato de pacote desconhecido"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "vers�o desconhecida"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "algoritmo de chave p�blica desconhecido"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "algoritmo de \"digest\" desconhecido"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "chave p�blica incorreta"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "chave secreta incorreta"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "assinatura incorreta"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "erro de \"checksum\""
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "frase secreta incorreta"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "chave p�blica n�o encontrada"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "algoritmo de criptografia desconhecido"
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "n�o � poss�vel abrir o chaveiro"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "pacote inv�lido"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "armadura inv�lida"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "identificador de usu�rio inexistente"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "chave secreta n�o dispon�vel"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "chave secreta incorreta"
 
 # suportado ???
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "n�o suportado"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "chave incorreta"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "erro de leitura"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "erro de escrita"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "algoritmo de compress�o desconhecido"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "erro na abertura de arquivo"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "erro na cria��o de arquivo"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "frase secreta inv�lida"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "algoritmo de chave p�blica n�o implementado"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "algoritmo de criptografia n�o implementado"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "classe de assinatura desconhecida"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "erro no banco de dados de confiabilidade"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "MPI incorreto"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "limite de recurso"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "chaveiro inv�lido"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "certificado incorreto"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "identificador de usu�rio malformado"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "erro no fechamento de arquivo"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "erro na renomea��o de arquivo"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "erro na remo��o de arquivo"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "dados inesperados"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "conflito de \"timestamp\""
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "algoritmo de chave p�blica inutiliz�vel"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "o arquivo j� existe"
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "chave fraca"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "argumento inv�lido"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "URI incorreto"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "URI n�o suportado"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "erro na rede"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "n�o criptografado"
 
-#: util/errors.c:103
+#: util/errors.c:104
 msgid "not processed"
 msgstr "n�o processado(s)"
 
-#: util/errors.c:105
+#: util/errors.c:106
 #, fuzzy
 msgid "unusable public key"
 msgstr "chave p�blica incorreta"
 
-#: util/errors.c:106
+#: util/errors.c:107
 #, fuzzy
 msgid "unusable secret key"
 msgstr "chave secreta incorreta"
 
-#: util/errors.c:107
+#: util/errors.c:108
 #, fuzzy
 msgid "keyserver error"
 msgstr "erro geral"
 
-#: util/errors.c:108
+#: util/errors.c:109
 msgid "canceled"
 msgstr ""
 
-#: util/errors.c:109
+#: util/errors.c:110
 #, fuzzy
 msgid "no card"
 msgstr "n�o criptografado"
 
-#: util/logger.c:157
+#: util/logger.c:158
 msgid "ERROR: "
 msgstr ""
 
-#: util/logger.c:160
+#: util/logger.c:161
 msgid "WARNING: "
 msgstr ""
 
-#: util/logger.c:223
+#: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... isto � um bug (%s:%d:%s)\n"
 
-#: util/logger.c:229
+#: util/logger.c:230
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "voc� encontrou um bug ... (%s:%d)\n"
 
-#: util/miscutil.c:336 util/miscutil.c:373
+#: util/miscutil.c:330 util/miscutil.c:367
 #, fuzzy
 msgid "yes"
 msgstr "sim"
 
-#: util/miscutil.c:337 util/miscutil.c:378
+#: util/miscutil.c:331 util/miscutil.c:372
 msgid "yY"
 msgstr "sS"
 
-#: util/miscutil.c:339 util/miscutil.c:375
+#: util/miscutil.c:333 util/miscutil.c:369
 msgid "no"
 msgstr "n�o"
 
-#: util/miscutil.c:340 util/miscutil.c:379
+#: util/miscutil.c:334 util/miscutil.c:373
 msgid "nN"
 msgstr "nN"
 
 # INICIO MENU
-#: util/miscutil.c:377
+#: util/miscutil.c:371
 msgid "quit"
 msgstr "sair"
 
-#: util/miscutil.c:380
+#: util/miscutil.c:374
 msgid "qQ"
 msgstr "qQ"
 
-#: util/miscutil.c:413
+#: util/miscutil.c:407
 msgid "okay|okay"
 msgstr ""
 
-#: util/miscutil.c:415
+#: util/miscutil.c:409
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:416
+#: util/miscutil.c:410
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:417
+#: util/miscutil.c:411
 #, fuzzy
 msgid "cC"
 msgstr "c"
 
-#: util/secmem.c:90
+#: util/secmem.c:91
 #, fuzzy
 msgid "WARNING: using insecure memory!\n"
 msgstr "Aviso: usando mem�ria insegura!\n"
 
-#: util/secmem.c:91
+#: util/secmem.c:92
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr ""
 
-#: util/secmem.c:343
+#: util/secmem.c:344
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "a opera��o n�o � poss�vel sem mem�ria segura inicializada\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:345
 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 "error getting serial number: %s\n"
+#~ msgstr "erro na cria��o da frase secreta: %s\n"
+
+#~ msgid "Hint: Select the user IDs to sign\n"
+#~ msgstr "Sugest�o: Selecione os IDs de usu�rio para assinar\n"
+
+#, fuzzy
+#~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+#~ msgstr "algoritmo de criptografia desconhecido"
+
+#, fuzzy
+#~ msgid "passphrase too long\n"
+#~ msgstr "linha muito longa\n"
+
 #~ msgid "select secondary key N"
 #~ msgstr "seleciona chave secund�ria N"
 
@@ -6946,19 +7013,9 @@ msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 #~ msgid "%s: can't create keyring: %s\n"
 #~ msgstr "%s: imposs�vel criar chaveiro: %s\n"
 
-#, fuzzy
-#~ msgid "invalid"
-#~ msgstr "armadura inv�lida"
-
-#~ msgid "RSA key cannot be used in this version\n"
-#~ msgstr "chave RSA n�o pode ser usada nesta vers�o\n"
-
 #~ msgid "No key for user ID\n"
 #~ msgstr "Nenhuma chave para identificador de usu�rio\n"
 
-#~ msgid "No user ID for key\n"
-#~ msgstr "Nenhum identificador de usu�rio para chave\n"
-
 #~ msgid "no secret key for decryption available\n"
 #~ msgstr "nenhuma chave secreta para descriptografia dispon�vel\n"
 
@@ -7053,9 +7110,6 @@ msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 #~ msgid "lid %lu: okay\n"
 #~ msgstr "lid %lu: correto\n"
 
-#~ msgid "%s: keyblock read problem: %s\n"
-#~ msgstr "%s: erro de leitura de bloco de chaves: %s\n"
-
 #~ msgid "%s: update failed: %s\n"
 #~ msgstr "%s: atualiza��o falhou: %s\n"
 
diff --git a/po/ro.po b/po/ro.po
index 021b38554..75a47929d 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,16 +1,16 @@
 # Mesajele �n limba rom�n� pentru gnupg.
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 # Acest fi�ier este distribuit sub aceea�i licen�� ca �i pachetul gnupg.
-# Laurentiu Buzdugan <[email protected]>, 2003, 2004.
+# Laurentiu Buzdugan <[email protected]>, 2003, 2004, 2005.
 #
 #
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.4.0\n"
+"Project-Id-Version: gnupg 1.4.1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-03-15 16:35+0100\n"
-"PO-Revision-Date: 2004-12-28 12:00-0500\n"
+"POT-Creation-Date: 2005-05-31 10:05+0200\n"
+"PO-Revision-Date: 2005-03-15 12:00-0500\n"
 "Last-Translator: Laurentiu Buzdugan <[email protected]>\n"
 "Language-Team: Romanian <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -18,84 +18,84 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: cipher/primegen.c:120
+#: cipher/primegen.c:121
 #, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr "nu pot genera un num�r prim cu  pbi�i=%u qbi�i=%u\n"
 
-#: cipher/primegen.c:311
+#: cipher/primegen.c:312
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "nu pot genera un num�r prim cu mai pu�in de %d bi�i\n"
 
-#: cipher/random.c:163
+#: cipher/random.c:164
 msgid "no entropy gathering module detected\n"
 msgstr "nu a fost g�sit nici un modul de adunare a entropiei\n"
 
-#: cipher/random.c:387 g10/card-util.c:656 g10/card-util.c:725
-#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2255
-#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
-#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
-#: g10/tdbio.c:600
+#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
+#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
+#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
+#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
+#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/tdbio.c:601
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nu pot deschide `%s': %s\n"
 
-#: cipher/random.c:391
+#: cipher/random.c:392
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "nu pot ob�ine statistici `%s': %s\n"
 
-#: cipher/random.c:396
+#: cipher/random.c:397
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' nu este un fi�ier normal - ignorat\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:402
 msgid "note: random_seed file is empty\n"
 msgstr "not�: fi�ier random_seed este gol\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:408
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "AVERTISMENT: dimensiune invalid� pentru fi�ierul random_seed - nu va fi "
 "folosit�\n"
 
-#: cipher/random.c:415
+#: cipher/random.c:416
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "nu pot citi `%s': %s\n"
 
-#: cipher/random.c:453
+#: cipher/random.c:454
 msgid "note: random_seed file not updated\n"
 msgstr "not�: fi�ierul random_seed nu a fost actualizat\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2723
-#: g10/keygen.c:2753 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
-#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nu pot crea `%s': %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:481
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "nu pot scrie `%s': %s\n"
 
-#: cipher/random.c:483
+#: cipher/random.c:484
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "nu pot �nchide `%s': %s\n"
 
-#: cipher/random.c:728
+#: cipher/random.c:729
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "AVERISMENT: este folosit un generator de numere aleatoare nesigur "
 "(insecure)!!\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:730
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -109,7 +109,7 @@ msgstr ""
 "NU FOLOSI�I NICI O DAT� GENERAT� DE ACEST PROGRAM!!\n"
 "\n"
 
-#: cipher/rndegd.c:204
+#: cipher/rndegd.c:205
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -118,7 +118,7 @@ msgstr ""
 "V� rug�m a�tepta�i, este adunat� entropia. Face�i ceva dac� v� ajut� s�\n"
 "nu v� plictisi�i, pentru c� va �mbun�t��i calitatea entropiei.\n"
 
-#: cipher/rndlinux.c:134
+#: cipher/rndlinux.c:135
 #, c-format
 msgid ""
 "\n"
@@ -130,45 +130,62 @@ msgstr ""
 "a da sistemului de operare o �ans� de a colecta mai mult� entropie\n"
 "(Mai sunt necesari %d octe�i)\n"
 
-#: g10/app-openpgp.c:547
+#: g10/app-openpgp.c:596
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "am e�uat s� stochez amprenta: %s\n"
 
-#: g10/app-openpgp.c:560
+#: g10/app-openpgp.c:609
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "am e�uat s� stochez data cre�rii: %s\n"
 
-#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
+#: g10/app-openpgp.c:977
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "citire cheii a e�uat\n"
+
+#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+msgid "response does not contain the public key data\n"
+msgstr "r�spunsul nu con�ine datele cheii publice\n"
+
+#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+msgid "response does not contain the RSA modulus\n"
+msgstr "r�spunsul nu con�ine modulul RSA\n"
+
+#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+msgid "response does not contain the RSA public exponent\n"
+msgstr "r�spunsul nu con�ine exponentul public RSA\n"
+
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "apelul PIN a returnat eroare: %s\n"
 
-#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN-ul pentru CHV%d este prea scurt; lungimea minim� este %d\n"
 
-#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
-#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
+#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
+#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verificarea CHV%d a e�uat: %s\n"
 
-#: g10/app-openpgp.c:836
+#: g10/app-openpgp.c:1310
 msgid "access to admin commands is not configured\n"
 msgstr "accesul la comenzile de administrare nu este configurat�\n"
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
 msgid "error retrieving CHV status from card\n"
 msgstr "eroare la recuperarea st�rii CHV de pe card\n"
 
-#: g10/app-openpgp.c:857
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
 msgid "card is permanently locked!\n"
 msgstr "cardul este �ncuiat permanent!\n"
 
-#: g10/app-openpgp.c:862
+#: g10/app-openpgp.c:1336
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "%d �ncerc�ri PIN Admin r�mase �nainte de a �ncuia cardul permanent\n"
@@ -176,333 +193,339 @@ msgstr "%d �ncerc�ri PIN Admin r�mase �nainte de a �ncuia cardul permanent\n"
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:869
+#: g10/app-openpgp.c:1343
 msgid "|A|Admin PIN"
 msgstr "|A|PIN Admin"
 
-#: g10/app-openpgp.c:1018
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:1492
 msgid "|AN|New Admin PIN"
 msgstr "|AN|PIN Admin Nou"
 
-#: g10/app-openpgp.c:1018
+#: g10/app-openpgp.c:1492
 msgid "|N|New PIN"
 msgstr "|N|PIN Nou"
 
-#: g10/app-openpgp.c:1022
+#: g10/app-openpgp.c:1496
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "eroare la ob�inere noului PIN: %s\n"
 
-#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
+#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
 msgid "error reading application data\n"
 msgstr "eroare la citirea datelor aplica�iei\n"
 
-#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
+#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
 msgid "error reading fingerprint DO\n"
 msgstr "eroare la citirea amprentei DO\n"
 
-#: g10/app-openpgp.c:1104
+#: g10/app-openpgp.c:1562
 msgid "key already exists\n"
 msgstr "cheia exist� deja\n"
 
-#: g10/app-openpgp.c:1108
+#: g10/app-openpgp.c:1566
 msgid "existing key will be replaced\n"
 msgstr "cheia existent� va fi �nlocuit�\n"
 
-#: g10/app-openpgp.c:1110
+#: g10/app-openpgp.c:1568
 msgid "generating new key\n"
 msgstr "generez o nou� cheie\n"
 
-#: g10/app-openpgp.c:1120
+#: g10/app-openpgp.c:1735
+msgid "creation timestamp missing\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1742
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1749
+#, fuzzy, c-format
+msgid "RSA public exponent missing or largerr than %d bits\n"
+msgstr "exponent public prea lung (mai mult de 32 bi�i)\n"
+
+#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1827
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "am e�uat s� stochez cheia: %s\n"
+
+#: g10/app-openpgp.c:1886
 msgid "please wait while key is being generated ...\n"
 msgstr "v� rug�m a�tepta�i c�t� vreme este creat� noua cheie ...\n"
 
-#: g10/app-openpgp.c:1135
+#: g10/app-openpgp.c:1901
 msgid "generating key failed\n"
 msgstr "generarea cheii a e�uat\n"
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1904
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "generarea cheii este complet� (%d secunde)\n"
 
-#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
-msgid "response does not contain the public key data\n"
-msgstr "r�spunsul nu con�ine datele cheii publice\n"
-
-#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
-msgid "response does not contain the RSA modulus\n"
-msgstr "r�spunsul nu con�ine modulul RSA\n"
-
-#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
-msgid "response does not contain the RSA public exponent\n"
-msgstr "r�spunsul nu con�ine exponentul public RSA\n"
-
-#: g10/app-openpgp.c:1195
+#: g10/app-openpgp.c:1961
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "structur� invalid� a cardului OpenPGP (DO 0x93)\n"
 
-#: g10/app-openpgp.c:1356
+#: g10/app-openpgp.c:2130
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "semn�turi create p�n� acum: %lu\n"
 
-#: g10/app-openpgp.c:1364
-#, c-format
-msgid "PIN [sigs done: %lu]"
+#: g10/app-openpgp.c:2138
+#, fuzzy, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "PIN [semn�turi f�cute: %lu]"
 
-#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
+#: g10/app-openpgp.c:2399
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nu pot accesa %s - card OpenPGP invalid?\n"
 
-#: g10/app-openpgp.c:1731
-#, c-format
-msgid "error getting serial number: %s\n"
-msgstr "eroare la ob�inerea num�rului serial: %s\n"
-
-#: g10/app-openpgp.c:1826
-#, c-format
-msgid "failed to store the key: %s\n"
-msgstr "am e�uat s� stochez cheia: %s\n"
-
-#: g10/app-openpgp.c:1868
-msgid "reading the key failed\n"
-msgstr "citire cheii a e�uat\n"
-
-#: g10/armor.c:317
+#: g10/armor.c:318
 #, c-format
 msgid "armor: %s\n"
 msgstr "armur�: %s\n"
 
-#: g10/armor.c:346
+#: g10/armor.c:347
 msgid "invalid armor header: "
 msgstr "header armur� invalid: "
 
-#: g10/armor.c:353
+#: g10/armor.c:354
 msgid "armor header: "
 msgstr "header armur�: "
 
-#: g10/armor.c:364
+#: g10/armor.c:365
 msgid "invalid clearsig header\n"
 msgstr "header clearsig invalid\n"
 
-#: g10/armor.c:416
+#: g10/armor.c:417
 msgid "nested clear text signatures\n"
 msgstr "semn�turi text �n clar �ncuib�rite\n"
 
-#: g10/armor.c:551
+#: g10/armor.c:552
 msgid "unexpected armor: "
 msgstr "armur� nea�teptat�: "
 
-#: g10/armor.c:563
+#: g10/armor.c:564
 msgid "invalid dash escaped line: "
 msgstr "linie cu liniu�� escape invalid�: "
 
-#: g10/armor.c:715 g10/armor.c:1322
+#: g10/armor.c:716 g10/armor.c:1323
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "caracter radix64 invalid %02X s�rit\n"
 
-#: g10/armor.c:758
+#: g10/armor.c:759
 msgid "premature eof (no CRC)\n"
 msgstr "eof prematur (nici un CRC)\n"
 
-#: g10/armor.c:792
+#: g10/armor.c:793
 msgid "premature eof (in CRC)\n"
 msgstr "eof prematur (�n CRC)\n"
 
-#: g10/armor.c:800
+#: g10/armor.c:801
 msgid "malformed CRC\n"
 msgstr "CRC anormal\n"
 
-#: g10/armor.c:804 g10/armor.c:1359
+#: g10/armor.c:805 g10/armor.c:1360
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "eroare CRC; %06lX - %06lX\n"
 
-#: g10/armor.c:824
+#: g10/armor.c:825
 msgid "premature eof (in trailer)\n"
 msgstr "eof prematur (�n trailer)\n"
 
-#: g10/armor.c:828
+#: g10/armor.c:829
 msgid "error in trailer line\n"
 msgstr "eroare linia de trailer\n"
 
-#: g10/armor.c:1137
+#: g10/armor.c:1138
 msgid "no valid OpenPGP data found.\n"
 msgstr "nici o dat� OpenPGP valid� g�sit�.\n"
 
-#: g10/armor.c:1142
+#: g10/armor.c:1143
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armur� invalid�: linie mai lung� de %d caractere\n"
 
-#: g10/armor.c:1146
+#: g10/armor.c:1147
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "caracter printabil �n ghilimele �n armur� - probabil a fost folosit un MTA "
 "cu bug-uri\n"
 
-#: g10/card-util.c:58 g10/card-util.c:295
+#: g10/card-util.c:63 g10/card-util.c:303
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "cardul OpenPGP nu e disponibil: %s\n"
 
-#: g10/card-util.c:63
+#: g10/card-util.c:68
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "cardul OpenPGP nr. %s detectat\n"
 
-#: g10/card-util.c:70 g10/card-util.c:1329 g10/delkey.c:127 g10/keyedit.c:1430
-#: g10/keygen.c:2439 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1510
+#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
 msgid "can't do this in batch mode\n"
 msgstr "nu pot face acest lucru �n modul batch\n"
 
-#: g10/card-util.c:97 g10/card-util.c:1108 g10/card-util.c:1191
-#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
-#: g10/keygen.c:1365
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
+#: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "Selec�ia d-voastr�? "
 
-#: g10/card-util.c:206 g10/card-util.c:256
+#: g10/card-util.c:213 g10/card-util.c:263
 msgid "[not set]"
 msgstr "[nesetat(�)]"
 
-#: g10/card-util.c:391
+#: g10/card-util.c:410
 msgid "male"
 msgstr "masculin"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 msgid "female"
 msgstr "feminin"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 msgid "unspecified"
 msgstr "nespecificat(�)"
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 msgid "not forced"
 msgstr "nefor�at(�)"
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 msgid "forced"
 msgstr "for�at(�)"
 
-#: g10/card-util.c:497
+#: g10/card-util.c:516
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Eroare: Deocamdat� sunt permise numai caractere ASCII.\n"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:518
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Eroare: Caracterul \"<\" nu poate fi folosit.\n"
 
-#: g10/card-util.c:501
+#: g10/card-util.c:520
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Eroare: Spa�iile duble nu sunt permise.\n"
 
-#: g10/card-util.c:518
+#: g10/card-util.c:537
 msgid "Cardholder's surname: "
 msgstr "Numele de familie al proprietarului cardului: "
 
-#: g10/card-util.c:520
+#: g10/card-util.c:539
 msgid "Cardholder's given name: "
 msgstr "Prenumele proprietarului cardului: "
 
-#: g10/card-util.c:538
+#: g10/card-util.c:557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Eroare: Nume combinat prea lung (limita este de %d caractere).\n"
 
-#: g10/card-util.c:559
+#: g10/card-util.c:578
 msgid "URL to retrieve public key: "
 msgstr "URL pentru a aduce cheia public�: "
 
-#: g10/card-util.c:567
+#: g10/card-util.c:586
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Eroare: URL prea lung (limita este de %d caractere).\n"
 
-#: g10/card-util.c:665 g10/card-util.c:734 g10/import.c:261
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:692
 msgid "Login data (account name): "
 msgstr "Date login (nume cont): "
 
-#: g10/card-util.c:683
+#: g10/card-util.c:702
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Eroare: datele de login prea lungi (limita este de %d caractere).\n"
 
-#: g10/card-util.c:742
+#: g10/card-util.c:761
 msgid "Private DO data: "
 msgstr "Date DO personale: "
 
-#: g10/card-util.c:752
+#: g10/card-util.c:771
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Eroare DO personal pre lung (limita este de %d caractere).\n"
 
-#: g10/card-util.c:772
+#: g10/card-util.c:791
 msgid "Language preferences: "
 msgstr "Preferin�e limb�: "
 
-#: g10/card-util.c:780
+#: g10/card-util.c:799
 msgid "Error: invalid length of preference string.\n"
 msgstr "Eroare: lungime invalid� pentru �ir preferin�e.\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:808
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Eroare: caractere invalide �n �ir preferin�e.\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:829
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Sex ((M)asculin, (F)eminin sau spa�iu): "
 
-#: g10/card-util.c:824
+#: g10/card-util.c:843
 msgid "Error: invalid response.\n"
 msgstr "Eroare: r�spuns invalid.\n"
 
-#: g10/card-util.c:845
+#: g10/card-util.c:864
 msgid "CA fingerprint: "
 msgstr "Amprenta CA: "
 
-#: g10/card-util.c:868
+#: g10/card-util.c:887
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Eroare: amprent� formatat� invalid.\n"
 
-#: g10/card-util.c:916
+#: g10/card-util.c:935
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "opera�ia pe cheie nu e posibil�: %s\n"
 
-#: g10/card-util.c:917
+#: g10/card-util.c:936
 msgid "not an OpenPGP card"
 msgstr "nu este un card OpenPGP"
 
-#: g10/card-util.c:926
+#: g10/card-util.c:945
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "eroare la ob�inerea informa�iei pentru cheia curent�: %s\n"
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1030
 msgid "Replace existing key? (y/N) "
 msgstr "�nlocuiesc cheia existent�? (d/N) "
 
-#: g10/card-util.c:1030 g10/card-util.c:1039
+#: g10/card-util.c:1051 g10/card-util.c:1060
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Creez copie de rezerv� a cheii de cifrare �n afara cardului? (d/N) "
 
-#: g10/card-util.c:1051
+#: g10/card-util.c:1072
 msgid "Replace existing keys? (y/N) "
 msgstr "�nlocuiesc cheile existente? (d/N) "
 
-#: g10/card-util.c:1060
+#: g10/card-util.c:1081
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -513,126 +536,130 @@ msgstr ""
 "   PIN = `%s'     PIN Admin = `%s'\n"
 "Ar trebui s� le schimba�i folosind comanda --change-pin\n"
 
-#: g10/card-util.c:1099
+#: g10/card-util.c:1120
 msgid "Please select the type of key to generate:\n"
 msgstr "V� rug�m selecta�i tipul de cheie de generat:\n"
 
-#: g10/card-util.c:1101 g10/card-util.c:1182
+#: g10/card-util.c:1122 g10/card-util.c:1203
 msgid "   (1) Signature key\n"
 msgstr "   (1) Cheie de semnare\n"
 
-#: g10/card-util.c:1102 g10/card-util.c:1184
+#: g10/card-util.c:1123 g10/card-util.c:1205
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Cheie de cifrare\n"
 
-#: g10/card-util.c:1103 g10/card-util.c:1186
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Cheie de autentificare\n"
 
-#: g10/card-util.c:1119 g10/card-util.c:1202 g10/keyedit.c:908
-#: g10/keygen.c:1404 g10/revoke.c:642
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
+#: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "Selec�ie invalid�.\n"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1200
 msgid "Please select where to store the key:\n"
 msgstr "V� rug�m selecta�i unde s� fie stocat� cheia:\n"
 
-#: g10/card-util.c:1214
+#: g10/card-util.c:1235
 msgid "unknown key protection algorithm\n"
 msgstr "algoritm de protec�ie a cheii necunoscut\n"
 
-#: g10/card-util.c:1219
+#: g10/card-util.c:1240
 msgid "secret parts of key are not available\n"
 msgstr "p�r�i secrete ale cheii nu sunt disponibile\n"
 
-#: g10/card-util.c:1224
+#: g10/card-util.c:1245
 msgid "secret key already stored on a card\n"
 msgstr "cheia secret� deja stocat� pe un card\n"
 
-#: g10/card-util.c:1294 g10/keyedit.c:1317
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "ie�i din acest meniu"
 
-#: g10/card-util.c:1296
+#: g10/card-util.c:1318
 msgid "show admin commands"
 msgstr "arat� comenzi administrare"
 
-#: g10/card-util.c:1297 g10/keyedit.c:1320
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "afi�eaz� acest mesaj"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1321
 msgid "list all available data"
 msgstr "afi�eaz� toate datele disponibile"
 
-#: g10/card-util.c:1302
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr "schimb� numele purt�torului cardului"
 
-#: g10/card-util.c:1303
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr "schimb� URL-ul de unde s� fie adus� cheia"
 
-#: g10/card-util.c:1304
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr "adu cheia specificat� de URL-ul de pe card"
 
-#: g10/card-util.c:1305
+#: g10/card-util.c:1327
 msgid "change the login name"
 msgstr "schimb� numele de login"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1328
 msgid "change the language preferences"
 msgstr "schimb� preferin�ele de limb�"
 
-#: g10/card-util.c:1307
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr "schimb� sexul purt�torului cardului"
 
-#: g10/card-util.c:1308
+#: g10/card-util.c:1330
 msgid "change a CA fingerprint"
 msgstr "schimb� o amprent� CA"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr "comut� fanionul PIN de for�are a semn�turii"
 
-#: g10/card-util.c:1310
+#: g10/card-util.c:1332
 msgid "generate new keys"
 msgstr "genereaz� noi chei"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr "meniu pentru a schimba sau debloca PIN-ul"
 
-#: g10/card-util.c:1377 g10/keyedit.c:1526
+#: g10/card-util.c:1334
+msgid "verify the PIN and list all data"
+msgstr ""
+
+#: g10/card-util.c:1454 g10/keyedit.c:1609
 msgid "Command> "
 msgstr "Comand�> "
 
-#: g10/card-util.c:1412
+#: g10/card-util.c:1492
 msgid "Admin-only command\n"
 msgstr "Comand� numai-administrare\n"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1523
 msgid "Admin commands are allowed\n"
 msgstr "Sunt permise comenzi administrare\n"
 
-#: g10/card-util.c:1430
+#: g10/card-util.c:1525
 msgid "Admin commands are not allowed\n"
 msgstr "Nu sunt permise comenzi administrare\n"
 
-#: g10/card-util.c:1499 g10/keyedit.c:2104
+#: g10/card-util.c:1599 g10/keyedit.c:2210
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comand� invalid�  (�ncerca�i \"ajutor\")\n"
 
-#: g10/cardglue.c:287
+#: g10/cardglue.c:396
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 "V� rug�m introduce�i cardul �i ap�sa�i return sau ap�sa�i 'c' pentru a "
 "renun�a: "
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:519
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -641,133 +668,133 @@ msgstr ""
 "V� rug�m scoate�i cardul curent �i introduca�i unul cu num�r de seris:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:380
+#: g10/cardglue.c:527
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "Ap�sa�i return c�nd sunte�i gata sau ap�sa�i 'c' pentru a renun�a: "
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:852
 msgid "Enter New Admin PIN: "
 msgstr "Introduce�i noul PIN Admin: "
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:853
 msgid "Enter New PIN: "
 msgstr "introduce�i noul PIN: "
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:854
 msgid "Enter Admin PIN: "
 msgstr "Introduce�i PIN Admin: "
 
-#: g10/cardglue.c:691
+#: g10/cardglue.c:855
 msgid "Enter PIN: "
 msgstr "Introduce�i PIN: "
 
-#: g10/cardglue.c:705
+#: g10/cardglue.c:872
 msgid "Repeat this PIN: "
 msgstr "Repeta�i acest PIN: "
 
-#: g10/cardglue.c:719
+#: g10/cardglue.c:886
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN-ul nu a fost repetat corect; mai �ncerca�i o dat�"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
-#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nu pot deschide `%s'\n"
 
-#: g10/decrypt.c:104 g10/encode.c:859
+#: g10/decrypt.c:105 g10/encode.c:846
 msgid "--output doesn't work for this command\n"
 msgstr "--output nu merge pentru aceast� comand�\n"
 
-#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3167 g10/keyserver.c:1511
-#: g10/revoke.c:226
+#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3346 g10/keyserver.c:1541
+#: g10/revoke.c:227
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "cheia \"%s\" nu a fost g�sit�: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2300 g10/keyserver.c:1525
-#: g10/revoke.c:232 g10/revoke.c:439
+#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "eroare la citire keyblock: %s\n"
 
-#: g10/delkey.c:128 g10/delkey.c:135
+#: g10/delkey.c:129 g10/delkey.c:136
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(dac� nu specifica�i cheia prin amprent�)\n"
 
-#: g10/delkey.c:134
+#: g10/delkey.c:135
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "nu pot face acest lucru �n mod batch f�r� \"--yes\"\n"
 
-#: g10/delkey.c:146
+#: g10/delkey.c:147
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "�terge aceast� cheie din inelul de chei? (d/N) "
 
-#: g10/delkey.c:154
+#: g10/delkey.c:155
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Aceasta este o cheie secret�! - chiar dori�i s� o �terge�i? (d/N) "
 
-#: g10/delkey.c:164
+#: g10/delkey.c:165
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "stergere keyblock a e�uat: %s\n"
 
-#: g10/delkey.c:174
+#: g10/delkey.c:175
 msgid "ownertrust information cleared\n"
 msgstr "informa�ii �ncredere-proprietar cur��ate\n"
 
-#: g10/delkey.c:205
+#: g10/delkey.c:206
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "exist� o cheie secret� pentru cheia public� \"%s\"!\n"
 
-#: g10/delkey.c:207
+#: g10/delkey.c:208
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 "folosi�i op�iunea \"--delete-secret-keys\" pentru a o �terge pe aceasta mai "
 "�nt�i.\n"
 
-#: g10/encode.c:210 g10/sign.c:1186
+#: g10/encode.c:211 g10/sign.c:1218
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "eroare la crearea frazei-parol�: %s\n"
 
-#: g10/encode.c:215
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "nu pot crea un pachet ESK simetric datorit� modului S2K\n"
 
-#: g10/encode.c:228
+#: g10/encode.c:229
 #, c-format
 msgid "using cipher %s\n"
 msgstr "folosesc cifrul %s\n"
 
-#: g10/encode.c:238 g10/encode.c:558
+#: g10/encode.c:239 g10/encode.c:545
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' deja compresat\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
+#: g10/encode.c:302 g10/encode.c:591 g10/sign.c:566
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTISMENT: `%s' este un fi�ier gol\n"
 
-#: g10/encode.c:472
+#: g10/encode.c:466
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "�n modul --pgp2 pute�i cifra numai cu chei RSA de 2048 bi�i sau mai pu�in\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:488
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "citesc din `%s'\n"
 
-#: g10/encode.c:530
+#: g10/encode.c:517
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "nu pot folosi cifrul IDEA pentru pentru toate cheile pentru care cifra�i.\n"
 
-#: g10/encode.c:540
+#: g10/encode.c:527
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -775,7 +802,7 @@ msgstr ""
 "AVERTISMENT: for��nd cifrul simetric %s (%d) viola�i preferin�ele "
 "destinatarului\n"
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:635 g10/sign.c:899
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -784,125 +811,125 @@ msgstr ""
 "AVERTISMENT: for��nd algoritmul de compresie %s (%d) viola�i preferin�ele "
 "destinatarului\n"
 
-#: g10/encode.c:735
+#: g10/encode.c:722
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "for��nd cifrul simetric %s (%d) viola�i preferin�ele destinatarului\n"
 
-#: g10/encode.c:805 g10/pkclist.c:721 g10/pkclist.c:757
+#: g10/encode.c:792 g10/pkclist.c:722 g10/pkclist.c:758
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "nu pute�i folosi %s c�t� vreme �n modul %s\n"
 
-#: g10/encode.c:832
+#: g10/encode.c:819
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrat pentru: \"%s\"\n"
 
-#: g10/encr-data.c:66 g10/mainproc.c:301
+#: g10/encr-data.c:67 g10/mainproc.c:302
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s date cifrate\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:305
+#: g10/encr-data.c:69 g10/mainproc.c:306
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrat cu un algoritm necunoscut %d\n"
 
-#: g10/encr-data.c:92
+#: g10/encr-data.c:93
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "AVERTISMENT: mesajul a fost cifrat cu o cheie slab� din cifrul simetric.\n"
 
-#: g10/encr-data.c:103
+#: g10/encr-data.c:104
 msgid "problem handling encrypted packet\n"
 msgstr "problem� cu m�nuirea pachetului cifrat\n"
 
-#: g10/exec.c:48
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "nu este suportat� execu�ia nici unui program la distan��\n"
 
-#: g10/exec.c:184 g10/openfile.c:406
+#: g10/exec.c:173 g10/openfile.c:410
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nu pot crea directorul `%s': %s\n"
 
-#: g10/exec.c:325
+#: g10/exec.c:314
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "chemarea programelor externe sunt deactivate datorit� op�iunilor nesigure "
 "pentru permisiunile fi�ierului\n"
 
-#: g10/exec.c:355
+#: g10/exec.c:344
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "aceast� platform� necesit� fi�iere temporare c�nd sunt chemate programe "
 "externe\n"
 
-#: g10/exec.c:433
+#: g10/exec.c:422
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "nu pot executa programul `%s': %s\n"
 
-#: g10/exec.c:436
+#: g10/exec.c:425
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "nu pot executa shell-ul `%s': %s\n"
 
-#: g10/exec.c:521
+#: g10/exec.c:510
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "eroare de sistem la chemarea programului extern: %s\n"
 
-#: g10/exec.c:532 g10/exec.c:598
+#: g10/exec.c:521 g10/exec.c:587
 msgid "unnatural exit of external program\n"
 msgstr "ie�ire nenatural� a programului extern\n"
 
-#: g10/exec.c:547
+#: g10/exec.c:536
 msgid "unable to execute external program\n"
 msgstr "nu pot executa programul extern\n"
 
-#: g10/exec.c:563
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "nu pot citi r�spunsul programului extern: %s\n"
 
-#: g10/exec.c:609 g10/exec.c:616
+#: g10/exec.c:598 g10/exec.c:605
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "AVERTISMENT: nu pot �terge fi�ierul temporar (%s) `%s': %s\n"
 
-#: g10/exec.c:621
+#: g10/exec.c:610
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "AVERTISMENT: nu pot �terge directorul temporar `%s': %s\n"
 
-#: g10/export.c:183
+#: g10/export.c:184
 msgid "exporting secret keys not allowed\n"
 msgstr "exportul cheilor secrete nu este permis\n"
 
-#: g10/export.c:212
+#: g10/export.c:213
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "cheia %s: nu e protejat� - s�rit�\n"
 
-#: g10/export.c:220
+#: g10/export.c:221
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "cheia %s: cheie stil PGP 2.x - s�rit�\n"
 
-#: g10/export.c:395
+#: g10/export.c:398
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "AVERTISMENT: cheia secret� %s nu are un checksum SK simplu\n"
 
-#: g10/export.c:427
+#: g10/export.c:430
 msgid "WARNING: nothing exported\n"
 msgstr "AVERTISMENT: nimic exportat\n"
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid ""
 "@Commands:\n"
 " "
@@ -910,127 +937,127 @@ msgstr ""
 "@Comenzi:\n"
 " "
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "|[file]|make a signature"
 msgstr "|[fi�ier]|creaz� o semn�tur�"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "|[file]|make a clear text signature"
 msgstr "|[fi�ier]|creaz� o semn�tur� text �n clar"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "make a detached signature"
 msgstr "creaz� o semn�tur� deta�at�"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encrypt data"
 msgstr "cifreaz� datele"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "encryption only with symmetric cipher"
 msgstr "cifreaz� numai cu cifru simetric"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "decrypt data (default)"
 msgstr "decripteaz� datele (implicit)"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "verify a signature"
 msgstr "verific� o semn�tur�"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys"
 msgstr "enumer� chei"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and signatures"
 msgstr "enumer� chei �i semn�turi"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 msgid "list and check key signatures"
 msgstr "enumer� �i verific� semn�turile cheii"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "list keys and fingerprints"
 msgstr "enumer� chei �i amprente"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "list secret keys"
 msgstr "enumer� chei secrete"
 
-#: g10/g10.c:379
+#: g10/g10.c:381
 msgid "generate a new key pair"
 msgstr "genereaz� o nou� perechi de chei"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the public keyring"
 msgstr "�terge chei de pe inelul de chei public"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "remove keys from the secret keyring"
 msgstr "�terge chei de pe inelul de chei secret"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign a key"
 msgstr "semneaz� o cheie"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "sign a key locally"
 msgstr "semneaz� o cheie local"
 
-#: g10/g10.c:385
+#: g10/g10.c:387
 msgid "sign or edit a key"
 msgstr "semneaz� sau editeaz� o cheie"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "generate a revocation certificate"
 msgstr "genereaz� un certificat de revocare"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "export keys"
 msgstr "export� chei"
 
-#: g10/g10.c:389
+#: g10/g10.c:391
 msgid "export keys to a key server"
 msgstr "export� chei pentru un server de chei"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "import keys from a key server"
 msgstr "import� chei de la un server de chei"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "search for keys on a key server"
 msgstr "caut� pentru chei pe un server de chei"
 
-#: g10/g10.c:394
+#: g10/g10.c:396
 msgid "update all keys from a keyserver"
 msgstr "actualizeaz� toate cheile de la un server de chei"
 
-#: g10/g10.c:397
+#: g10/g10.c:399
 msgid "import/merge keys"
 msgstr "import�/combin� chei"
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "print the card status"
 msgstr "afi�eaz� starea cardului"
 
-#: g10/g10.c:401
+#: g10/g10.c:403
 msgid "change data on a card"
 msgstr "schimb� data de pe card"
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "change a card's PIN"
 msgstr "schimb� PIN-ul unui card"
 
-#: g10/g10.c:410
+#: g10/g10.c:412
 msgid "update the trust database"
 msgstr "actualizeaz� baza de date de �ncredere"
 
-#: g10/g10.c:417
+#: g10/g10.c:419
 msgid "|algo [files]|print message digests"
 msgstr "|algo [fi�iere]|afi�eaz� rezumate mesaje"
 
-#: g10/g10.c:421 g10/gpgv.c:66
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1040,51 +1067,51 @@ msgstr ""
 "Op�iuni:\n"
 " "
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "create ascii armored output"
 msgstr "creaz� ie�ire �n armur� ascii"
 
-#: g10/g10.c:425
+#: g10/g10.c:427
 msgid "|NAME|encrypt for NAME"
 msgstr "|NUME|cifrare pentru NUME"
 
-#: g10/g10.c:436
+#: g10/g10.c:438
 msgid "use this user-id to sign or decrypt"
 msgstr "folose�te acest id-utilizator pentru a semna sau decripta"
 
-#: g10/g10.c:437
+#: g10/g10.c:439
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|seteaz� nivel de compresie N (0 deactiveaz�)"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "use canonical text mode"
 msgstr "folose�te modul text canonic"
 
-#: g10/g10.c:452
+#: g10/g10.c:458
 msgid "use as output file"
 msgstr "folose�te ca fi�ier ie�ire"
 
-#: g10/g10.c:454 g10/gpgv.c:68
+#: g10/g10.c:460 g10/gpgv.c:73
 msgid "verbose"
 msgstr "locvace"
 
-#: g10/g10.c:465
+#: g10/g10.c:471
 msgid "do not make any changes"
 msgstr "nu face nici o schimbare"
 
-#: g10/g10.c:466
+#: g10/g10.c:472
 msgid "prompt before overwriting"
 msgstr "�ntreab� �nainte de a suprascrie"
 
-#: g10/g10.c:507
+#: g10/g10.c:513
 msgid "use strict OpenPGP behavior"
 msgstr "folose�te comportament strict OpenPGP"
 
-#: g10/g10.c:508
+#: g10/g10.c:514
 msgid "generate PGP 2.x compatible messages"
 msgstr "genereaz� mesaje compatibile cu PGP 2.x"
 
-#: g10/g10.c:536
+#: g10/g10.c:542
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1092,7 +1119,7 @@ msgstr ""
 "@\n"
 "(Arat� pagina man pentru o list� complet� a comenzilor �i op�iunilor)\n"
 
-#: g10/g10.c:539
+#: g10/g10.c:545
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1112,15 +1139,15 @@ msgstr ""
 " --list-keys [nume]         arat� chei\n"
 " --fingerprint [nume]       arat� amprente\n"
 
-#: g10/g10.c:720 g10/gpgv.c:93
+#: g10/g10.c:724 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Raporta�i bug-uri la <[email protected]>.\n"
 
-#: g10/g10.c:737
+#: g10/g10.c:741
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: g10/g10.c:740
+#: g10/g10.c:744
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1130,7 +1157,7 @@ msgstr ""
 "sign, check, encrypt sau decrypt\n"
 "opera�iunea implicit� depinde de datele de intrare\n"
 
-#: g10/g10.c:751
+#: g10/g10.c:755
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1138,77 +1165,77 @@ msgstr ""
 "\n"
 "Algoritmuri suportate:\n"
 
-#: g10/g10.c:754
+#: g10/g10.c:758
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/g10.c:760 g10/keyedit.c:2141
+#: g10/g10.c:764 g10/keyedit.c:2248
 msgid "Cipher: "
 msgstr "Cifru: "
 
-#: g10/g10.c:766
+#: g10/g10.c:770
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:772 g10/keyedit.c:2187
+#: g10/g10.c:776 g10/keyedit.c:2294
 msgid "Compression: "
 msgstr "Compresie: "
 
-#: g10/g10.c:855
+#: g10/g10.c:859
 msgid "usage: gpg [options] "
 msgstr "folosire: gpg [op�iuni] "
 
-#: g10/g10.c:1003
+#: g10/g10.c:1007
 msgid "conflicting commands\n"
 msgstr "comenzi �n conflict\n"
 
-#: g10/g10.c:1021
+#: g10/g10.c:1025
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "nu am g�sit nici un semn = �n defini�ia grupului `%s'\n"
 
-#: g10/g10.c:1218
+#: g10/g10.c:1222
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate nesigur� (unsafe) pentru directorul home `%s'\n"
 
-#: g10/g10.c:1221
+#: g10/g10.c:1225
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate nesigur� (unsafe) pentru fi�ier configurare `%s'\n"
 
-#: g10/g10.c:1224
+#: g10/g10.c:1228
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVERTISMENT: proprietate nesigur� (unsafe) pentru extensia `%s'\n"
 
-#: g10/g10.c:1230
+#: g10/g10.c:1234
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni nesigure (unsafe) pentru directorul home `%s'\n"
 
-#: g10/g10.c:1233
+#: g10/g10.c:1237
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni nesigure (unsafe) pentru fi�ier configurare `%s'\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1240
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru extensia `%s'\n"
 
-#: g10/g10.c:1242
+#: g10/g10.c:1246
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
 "directorul home `%s'\n"
 
-#: g10/g10.c:1245
+#: g10/g10.c:1249
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1216,21 +1243,21 @@ msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru fi�ier "
 "configurare `%s'\n"
 
-#: g10/g10.c:1248
+#: g10/g10.c:1252
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
 "extensia `%s'\n"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1258
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
 "directorul home `%s'\n"
 
-#: g10/g10.c:1257
+#: g10/g10.c:1261
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1238,374 +1265,384 @@ msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru fi�ier "
 "configurare `%s'\n"
 
-#: g10/g10.c:1260
+#: g10/g10.c:1264
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
 "extensia `%s'\n"
 
-#: g10/g10.c:1401
+#: g10/g10.c:1405
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "articol configurare necunoscut `%s'\n"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1802
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOT�: fisier op�iuni implicite vechi `%s' ignorat\n"
 
-#: g10/g10.c:1838
+#: g10/g10.c:1844
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOT�: nici un fi�ier op�iuni implicit `%s'\n"
 
-#: g10/g10.c:1842
+#: g10/g10.c:1848
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fi�ier op�iuni `%s': %s\n"
 
-#: g10/g10.c:1849
+#: g10/g10.c:1855
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "citesc op�iuni din `%s'\n"
 
-#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOT�: %s nu este pentru o folosire normal�!\n"
 
-#: g10/g10.c:2076
+#: g10/g10.c:2082
 #, 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/g10.c:2293
+#: g10/g10.c:2236 g10/g10.c:2248
+#, fuzzy, c-format
+msgid "`%s' is not a valid signature expiration\n"
+msgstr "`%s' nu este un set de carectere valid\n"
+
+#: g10/g10.c:2321
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' nu este un set de carectere valid\n"
 
 #
-#: g10/g10.c:2312 g10/keyedit.c:3683
+#: g10/g10.c:2340 g10/keyedit.c:3862
 msgid "could not parse keyserver URL\n"
 msgstr "nu am putut interpreta URL-ul serverului de chei\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2346
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op�iuni server de chei invalide\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2349
 msgid "invalid keyserver options\n"
 msgstr "op�iuni server de chei invalide\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2356
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op�iuni import invalide\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2359
 msgid "invalid import options\n"
 msgstr "op�iuni import invalide\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2366
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op�iuni export invalide\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2369
 msgid "invalid export options\n"
 msgstr "op�iuni export invalide\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2376
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op�iuni enumerare invalide\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2379
 msgid "invalid list options\n"
 msgstr "op�iuni enumerare invalide\n"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2401
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op�iuni verificare invalide\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2404
 msgid "invalid verify options\n"
 msgstr "op�iuni verificare invalide\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2411
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nu pot seta cale-execu�ie ca %s\n"
 
-#: g10/g10.c:2573
+#: g10/g10.c:2602
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTISMENT: programul ar putea crea un fi�ier core!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2606
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTISMENT: %s �nlocuie�te %s\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2615
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s nu este permis cu %s!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2618
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nu are sens cu %s!\n"
 
-#: g10/g10.c:2603
+#: g10/g10.c:2625
 #, fuzzy, c-format
+msgid "NOTE: %s is not available in this version\n"
+msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
+
+#: g10/g10.c:2640
+#, c-format
 msgid "will not run with insecure memory due to %s\n"
-msgstr "nu va rula cu memorie neprotejat� (insecure) datorit� faptului c� %s"
+msgstr "nu va rula cu memorie neprotejat� (insecure) pentru c� %s\n"
 
-#: g10/g10.c:2617
+#: g10/g10.c:2654
 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/g10.c:2623
+#: g10/g10.c:2660
 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/g10.c:2629
+#: g10/g10.c:2666
 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/g10.c:2642
+#: g10/g10.c:2679
 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/g10.c:2712 g10/g10.c:2736
+#: g10/g10.c:2746 g10/g10.c:2770
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritm cifrare selectat este invalid\n"
 
-#: g10/g10.c:2718 g10/g10.c:2742
+#: g10/g10.c:2752 g10/g10.c:2776
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritm rezumat selectat este invalid\n"
 
-#: g10/g10.c:2724
+#: g10/g10.c:2758
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritm compresie selectat este invalid\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2764
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritm rezumat certificare selectat este invalid\n"
 
-#: g10/g10.c:2745
+#: g10/g10.c:2779
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed trebuie s� fie mai mare dec�t 0\n"
 
-#: g10/g10.c:2747
+#: g10/g10.c:2781
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed trebuie s� fie mai mare dec�t 1\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2783
 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/g10.c:2751
+#: g10/g10.c:2785
 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/g10.c:2753
+#: g10/g10.c:2787
 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/g10.c:2756
+#: g10/g10.c:2790
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOT�: modul S2K simplu (0) este contraindicat cu insisten��\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2794
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mod S2K invalid; trebuie s� fie 0, 1 sau 3\n"
 
-#: g10/g10.c:2767
+#: g10/g10.c:2801
 msgid "invalid default preferences\n"
 msgstr "preferin�e implicite invalide\n"
 
-#: g10/g10.c:2776
+#: g10/g10.c:2810
 msgid "invalid personal cipher preferences\n"
 msgstr "preferin�e cifrare personale invalide\n"
 
-#: g10/g10.c:2780
+#: g10/g10.c:2814
 msgid "invalid personal digest preferences\n"
 msgstr "preferin�e rezumat personale invalide\n"
 
-#: g10/g10.c:2784
+#: g10/g10.c:2818
 msgid "invalid personal compress preferences\n"
 msgstr "preferin�e compresie personale invalide\n"
 
-#: g10/g10.c:2817
+#: g10/g10.c:2851
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s nu merge �nc� cu %s!\n"
 
-#: g10/g10.c:2864
+#: g10/g10.c:2898
 #, 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/g10.c:2869
+#: g10/g10.c:2903
 #, 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/g10.c:2874
+#: g10/g10.c:2908
 #, 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/g10.c:2970
+#: g10/g10.c:3004
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "am e�uat s� ini�ializez TrustDB:%s\n"
 
-#: g10/g10.c:2981
+#: g10/g10.c:3015
 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/g10.c:2992
+#: g10/g10.c:3026
 msgid "--store [filename]"
 msgstr "--store [nume_fi�ier]"
 
-#: g10/g10.c:2999
+#: g10/g10.c:3033
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nume_fi�ier]"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3035
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "cifrarea simetric� a lui `%s' a e�uat: %s\n"
 
-#: g10/g10.c:3011
+#: g10/g10.c:3045
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nume_fi�ier]"
 
-#: g10/g10.c:3024
+#: g10/g10.c:3058
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nume_fi�ier]"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3060
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "nu pute�i folosi --symmetric --encrypt cu --s2k-mode 0\n"
 
-#: g10/g10.c:3029
+#: g10/g10.c:3063
 #, 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/g10.c:3047
+#: g10/g10.c:3081
 msgid "--sign [filename]"
 msgstr "--sign [nume_fi�ier]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3094
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nume_fi�ier]"
 
-#: g10/g10.c:3075
+#: g10/g10.c:3109
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nume_fi�ier]"
 
-#: g10/g10.c:3077
+#: g10/g10.c:3111
 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/g10.c:3080
+#: g10/g10.c:3114
 #, 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/g10.c:3100
+#: g10/g10.c:3134
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nume_fi�ier]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3143
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nume_fi�ier]"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3168
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nume_fi�ier]"
 
-#: g10/g10.c:3142
+#: g10/g10.c:3176
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizator"
 
-#: g10/g10.c:3146
+#: g10/g10.c:3180
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizator"
 
-#: g10/g10.c:3167
+#: g10/g10.c:3201
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizator [comenzi]"
 
-#: g10/g10.c:3238
+#: g10/g10.c:3272
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizator] [inel_chei]"
 
-#: g10/g10.c:3275
+#: g10/g10.c:3309
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "trimitere server de chei e�uat�: %s\n"
 
-#: g10/g10.c:3277
+#: g10/g10.c:3311
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recep�ie server de chei e�uat�: %s\n"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3313
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export cheie e�uat: %s\n"
 
-#: g10/g10.c:3290
+#: g10/g10.c:3324
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "c�utare server de chei e�uat�: %s\n"
 
-#: g10/g10.c:3300
+#: g10/g10.c:3334
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualizare server de chei e�uat�: %s\n"
 
-#: g10/g10.c:3341
+#: g10/g10.c:3375
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminarea armurii a e�uat: %s\n"
 
-#: g10/g10.c:3349
+#: g10/g10.c:3383
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "punerea armurii a e�uat: %s\n"
 
-#: g10/g10.c:3436
+#: g10/g10.c:3470
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: g10/g10.c:3559
+#: g10/g10.c:3593
 msgid "[filename]"
 msgstr "[nume_fi�ier]"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3597
 msgid "Go ahead and type your message ...\n"
 msgstr "Da�i-i drumul �i scrie�i mesajul ...\n"
 
-#: g10/g10.c:3853
+#: g10/g10.c:3887
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1613,76 +1650,81 @@ msgstr ""
 "un nume de nota�ie trebuie s� con�in� numai caractere imprimabile sau spa�ii "
 "�i s� se termine cu un '='\n"
 
-#: g10/g10.c:3861
+#: g10/g10.c:3895
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nume de nota�ie utilizator trebuie s� con�in� caracterul '@'\n"
 
-#: g10/g10.c:3871
+#: g10/g10.c:3900
+#, fuzzy
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr "un nume de nota�ie utilizator trebuie s� con�in� caracterul '@'\n"
+
+#: g10/g10.c:3911
 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/g10.c:3905
+#: g10/g10.c:3945
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL-ul politicii de certificare furnizat este invalid\n"
 
-#: g10/g10.c:3907
+#: g10/g10.c:3947
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL-ul politicii de semn�turi furnizat este invalid\n"
 
-#: g10/g10.c:3940
+#: g10/g10.c:3980
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "prea multe intr�ri �n cache-ul pk - deactivat\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2750
+#: g10/getkey.c:187 g10/getkey.c:2757
 msgid "[User ID not found]"
 msgstr "[ID utilizator nu a fost g�sit]"
 
-#: g10/getkey.c:1677
+#: g10/getkey.c:1684
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Cheia invalid� %s f�cut� valid� de --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2228
+#: g10/getkey.c:2235
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "nici o subcheie secret� pentru subcheia public� %s - ignorat�\n"
 
-#: g10/getkey.c:2459
-#, fuzzy, c-format
+#: g10/getkey.c:2466
+#, c-format
 msgid "using subkey %s instead of primary key %s\n"
-msgstr "folosim cheia secundar� %s �n loc de cheia primar� %s\n"
+msgstr "folosim subcheia %s �n loc de cheia primar� %s\n"
 
-#: g10/getkey.c:2506
+#: g10/getkey.c:2513
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "cheia %s: cheie secret� f�r� cheie public� - s�rit�\n"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:74
 msgid "be somewhat more quiet"
 msgstr "fii oarecum mai t�cut"
 
-#: g10/gpgv.c:70
+#: g10/gpgv.c:75
 msgid "take the keys from this keyring"
 msgstr "ia cheile de pe acest inel de chei"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:77
 msgid "make timestamp conflicts only a warning"
 msgstr "d� numai un avertisment la conflicte de timestamp"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:78
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrie informa�ii de stare �n acest FD"
 
-#: g10/gpgv.c:97
+#: g10/gpgv.c:102
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Folosire: gpgv [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:105
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1690,7 +1732,7 @@ msgstr ""
 "Sintax�: gpg [op�iuni] [fi�iere]\n"
 "Verific� semn�turi folosind cheile cunoscute ca fiind de �ncredere\n"
 
-#: g10/helptext.c:48
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1701,7 +1743,7 @@ msgstr ""
 "implement�m re�eaua-de-�ncredere; aceasta nu are nimic �n comun cu\n"
 "certificatele-de-re�ea (create implicit)."
 
-#: g10/helptext.c:54
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1713,18 +1755,18 @@ msgstr ""
 "ave�i acces la cheia secret�.  R�spunde�i \"da\" pentru a seta\n"
 "aceast� cheie cu nivel de �ncredere suprem\n"
 
-#: g10/helptext.c:61
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Dac� dori�i oricum s� folosi�i aceast� cheie f�r� �ncredere, r�spunde�i \"da"
 "\"."
 
-#: g10/helptext.c:65
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Introduce�i ID-ul utilizator al destinatarului mesajului."
 
-#: g10/helptext.c:69
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1749,7 +1791,7 @@ msgstr ""
 "Prima cheie (primar�) trebuie s� fie �ntotdeauna o cheie cu care se poate "
 "semna."
 
-#: g10/helptext.c:83
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -1759,16 +1801,16 @@ msgstr ""
 "semnare �i pentru cifrare.  Acest algoritm ar trebui folosit numai\n"
 "�n anumite domenii.  V� rug�m consulta�i mai �nt�i un expert �n domeniu."
 
-#: g10/helptext.c:90
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "Introduce�i lungimea cheii"
 
-#: g10/helptext.c:94 g10/helptext.c:99 g10/helptext.c:111 g10/helptext.c:143
-#: g10/helptext.c:171 g10/helptext.c:176 g10/helptext.c:181
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "R�spunde�i \"da\" sau \"nu\""
 
-#: g10/helptext.c:104
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1780,19 +1822,19 @@ msgstr ""
 "ob�ine un r�spuns de eroare bun - �n loc sistemul �ncearc� s�\n"
 "interpreteze valoare dat� ca un interval."
 
-#: g10/helptext.c:116
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "Introduce�i numele de�in�torului cheii"
 
-#: g10/helptext.c:121
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr "v� rug�m introduce�i o adres� de email (op�ional� dar recomandat�)"
 
-#: g10/helptext.c:125
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "V� rug�m introduce�i un comentriu op�ional"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1806,12 +1848,12 @@ msgstr ""
 "O  pentru a continua cu generarea cheii.\n"
 "T  pentru a termina generarea cheii."
 
-#: g10/helptext.c:139
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr ""
 "R�spunde�i \"da\" (sau numai \"d\") dac� sunte�i OK s� genera�i subcheia."
 
-#: g10/helptext.c:147
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -1885,11 +1927,11 @@ msgstr ""
 "\n"
 "Dac� nu �ti�i care este r�spunsul, r�spunde�i \"0\"."
 
-#: g10/helptext.c:185
+#: g10/helptext.c:186
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "R�spunde�i \"da\" dac� dori�i s� semna�i TOATE ID-urile utilizator"
 
-#: g10/helptext.c:189
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -1897,11 +1939,11 @@ msgstr ""
 "R�spunde�i \"da\" dac� �ntr-adev�r dori�i s� �terge�i acest ID utilizator.\n"
 "Toate certificatele sunt de asemenea pierdute!"
 
-#: g10/helptext.c:194
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "R�spunde�i \"da\" dac� este OK s� �terge�i subcheia"
 
-#: g10/helptext.c:199
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -1912,7 +1954,7 @@ msgstr ""
 "stabilirea conexiunii de �ncredere la cheie sau alt� cheie certificat�\n"
 "de aceast� cheie."
 
-#: g10/helptext.c:204
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -1924,7 +1966,7 @@ msgstr ""
 "cheie a fost folosit� pentru c� aceast� cheie de semnare ar putea\n"
 "constitui o conexiune de �ncredere spre o alt� cheie deja certificat�."
 
-#: g10/helptext.c:210
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -1932,7 +1974,7 @@ msgstr ""
 "Semn�tura nu este valid�.  Aceasta ar trebui �tears� de pe inelul\n"
 "d-voastr� de chei."
 
-#: g10/helptext.c:214
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -1946,7 +1988,7 @@ msgstr ""
 "A�a c� face�i acest lucru numai dac� aceast� auto-semn�tur� este\n"
 "dintr-o oarecare cauz� invalid� �i o a doua este disponibil�."
 
-#: g10/helptext.c:222
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -1956,25 +1998,25 @@ msgstr ""
 "cele selectate) conform cu lista curent� de preferin�e.  Timestamp-urile\n"
 "tuturor auto-semn�turilor afectate vor fi avansate cu o secund�.\n"
 
-#: g10/helptext.c:229
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr ""
 "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
 
-#: g10/helptext.c:235
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "V� rug�m repeta�i ultima fraz�-parol�, pentru a fi sigur(�) ce a�i tastat."
 
-#: g10/helptext.c:239
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "Da�i numele fi�ierului la care se aplic� semn�tura"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "R�spunde�i \"da\" dac� este OK s� suprascrie�i fi�ierul"
 
-#: g10/helptext.c:249
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -1982,7 +2024,7 @@ msgstr ""
 "V� rug�m introduce�i un nou nume-fi�ier. Dac� doar ap�sa�i RETURN,\n"
 "va fi folosit fi�ierul implicit (ar�tat �n paranteze)."
 
-#: g10/helptext.c:255
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2011,7 +2053,7 @@ msgstr ""
 "folosit;\n"
 "      de obicei folosit� pentru a marca o adres� de email ca invalid�.\n"
 
-#: g10/helptext.c:271
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2021,474 +2063,476 @@ msgstr ""
 "certificat de revocare.  V� rug�m fi�i concis.\n"
 "O linie goal� termin� textul.\n"
 
-#: g10/helptext.c:286
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "Nici un ajutor disponibil"
 
-#: g10/helptext.c:294
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Nici un disponibil disponibil pentru `%s'"
 
-#: g10/import.c:247
+#: g10/import.c:248
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "bloc de tip %d s�rit\n"
 
-#: g10/import.c:256
+#: g10/import.c:257
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu chei procesate p�n� acum\n"
 
-#: g10/import.c:273
+#: g10/import.c:274
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Num�r total procesate: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      chei noi s�rite: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:279
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "  f�r� ID-uri utilizator: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "              imported: %lu"
 msgstr "               importate: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:287
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             neschimbate: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "   noi ID-uri utilizator: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "             noi subchei: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "           noi semn�turi: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "    noi revoc�ri de chei: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     chei secrete citite: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chei secrete importate: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chei secrete neschimbate: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "            ne importate: %lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:544
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr "AVERTISMENT: cheia %s con�ine preferin�e pentru indisponibil\n"
 
-#: g10/import.c:545
+#: g10/import.c:546
 msgid "algorithms on these user IDs:\n"
 msgstr "algoritmuri pentru aceste ID-uri utilizator:\n"
 
-#: g10/import.c:582
+#: g10/import.c:583
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": preferin�� pentru algoritm de cifrare %s\n"
 
-#: g10/import.c:594
+#: g10/import.c:595
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": preferin�� pentru algoritm rezumat %s\n"
 
-#: g10/import.c:606
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": preferin�� pentru algoritm compresie %s\n"
 
-#: g10/import.c:619
+#: g10/import.c:620
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 "este puternic sugerat s� v� actualiza�i preferin�ele �i re-distribui�i\n"
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "aceast� cheie pentru a avita probleme poten�iale de ne-potrivire de "
 "algoritm\n"
 
-#: g10/import.c:645
+#: g10/import.c:646
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "v� pute�i actualiza preferin�ele cu: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:694 g10/import.c:1048
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "cheia %s: nici un ID utilizator\n"
 
-#: g10/import.c:713
+#: g10/import.c:714
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "cheia %s: subcheia HPK corupt� a fost reparat�\n"
 
-#: g10/import.c:728
+#: g10/import.c:729
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "cheia %s: am acceptat ID-ul utilizator ce nu e auto-semnat \"%s\"\n"
 
-#: g10/import.c:734
+#: g10/import.c:735
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "cheia %s: nici un ID utilizator valid\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 msgid "this may be caused by a missing self-signature\n"
 msgstr "aceasta poate fi cauzat� de o auto-semn�tur� ce lipse�te\n"
 
-#: g10/import.c:746 g10/import.c:1168
+#: g10/import.c:747 g10/import.c:1169
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "cheia %s: cheia public� nu a fost g�sit�: %s\n"
 
-#: g10/import.c:752
+#: g10/import.c:753
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "cheia %s: cheie nou� - s�rit�\n"
 
-#: g10/import.c:761
+#: g10/import.c:762
 #, c-format
 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:766 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scriu �n `%s'\n"
 
-#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
-#: g10/import.c:2314 g10/import.c:2336
+#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
+#: g10/import.c:2315 g10/import.c:2337
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "eroare la scrierea inelului de chei `%s': %s\n"
 
-#: g10/import.c:791
+#: g10/import.c:792
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "cheia %s: cheia public� \"%s\" importat�\n"
 
-#: g10/import.c:815
+#: g10/import.c:816
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "cheia %s: nu se potrive�te cu copia noastr�\n"
 
-#: g10/import.c:832 g10/import.c:1186
+#: g10/import.c:833 g10/import.c:1187
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "cheia %s: nu pot g�si keyblock-ul original: %s\n"
 
-#: g10/import.c:840 g10/import.c:1193
+#: g10/import.c:841 g10/import.c:1194
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "cheia %s: nu pot citi keyblock-ul original: %s\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "cheia %s: \"%s\" 1 nou ID utilizator\n"
 
-#: g10/import.c:875
+#: g10/import.c:876
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
 
-#: g10/import.c:878
+#: g10/import.c:879
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "cheia %s: \"%s\" 1 nou� semn�tur�\n"
 
-#: g10/import.c:881
+#: g10/import.c:882
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
 
-#: g10/import.c:884
+#: g10/import.c:885
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "cheia %s: \"%s\" 1 nou� subcheie\n"
 
-#: g10/import.c:887
+#: g10/import.c:888
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "cheia %s: \"%s\" %d noi subchei\n"
 
-#: g10/import.c:908
+#: g10/import.c:909
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "cheia %s: \"%s\" nu a fost schimbat�\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1054
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "cheia %s: cheie secret� cu cifru invalid %d - s�rit�\n"
 
-#: g10/import.c:1064
+#: g10/import.c:1065
 msgid "importing secret keys not allowed\n"
 msgstr "importul de chei secrete nu este permis\n"
 
-#: g10/import.c:1081 g10/import.c:2329
+#: g10/import.c:1082 g10/import.c:2330
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nici un inel de chei secrete implicit: %s\n"
 
-#: g10/import.c:1092
+#: g10/import.c:1093
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "cheia %s: cheie secret� importat�\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1122
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "cheia %s: deja �n inelul de chei secrete\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1132
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "cheia %s: cheia secret� nu a fost g�sit�: %s\n"
 
-#: g10/import.c:1161
+#: g10/import.c:1162
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "cheia %s: nici o cheie public� - nu pot aplica certificatul de revocare\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1205
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "cheia %s: certificat de revocare invalid: %s - respins\n"
 
-#: g10/import.c:1236
+#: g10/import.c:1237
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "cheia %s: certificatul de revocare \"%s\" importat\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1302
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "cheia %s: nici un ID utilizator pentru semn�tur�\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1317
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "cheia %s: algoritm cu cheie public� nesuportat pentru ID-ul utilizator \"%s"
 "\"\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "cheia %s: auto-semn�tur� invalid� pentru ID-ul utilizator \"%s\"\n"
 
-#: g10/import.c:1336
+#: g10/import.c:1337
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "cheia %s: nici o subcheie pentru legarea cheii\n"
 
-#: g10/import.c:1347 g10/import.c:1397
+#: g10/import.c:1348 g10/import.c:1398
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "cheia %s: algoritm cu cheie public� nesuportat\n"
 
-#: g10/import.c:1349
+#: g10/import.c:1350
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "cheia %s: legare subcheie invalid�\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1365
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "cheia %s: am �ters multiple leg�turi de subchei\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "cheia %s: nici o subcheie pentru revocare de cheie\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "cheia %s: revocare de subcheie invalid�\n"
 
-#: g10/import.c:1414
+#: g10/import.c:1415
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "cheia %s: am �ters multiple revoc�ri de subcheie\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1457
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "cheia %s: am s�rit ID-ul utilizator \"%s\"\n"
 
-#: g10/import.c:1477
+#: g10/import.c:1478
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "cheia %s: am s�rit subcheia\n"
 
-#: g10/import.c:1504
+#: g10/import.c:1505
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "cheia %s: semn�tura nu poate fi exportat� (clasa 0x%02X) - s�rit�\n"
 
-#: g10/import.c:1514
+#: g10/import.c:1515
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "cheia %s: certificat de revocare �ntr-un loc gre�it - s�rit\n"
 
-#: g10/import.c:1531
+#: g10/import.c:1532
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "cheia %s: certificat de revocare invalid: %s - s�rit\n"
 
-#: g10/import.c:1545
+#: g10/import.c:1546
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "cheia %s: semn�tur� subcheie �ntr-un loc gre�it - s�rit�\n"
 
-#: g10/import.c:1553
+#: g10/import.c:1554
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "cheia %s: clas� de semn�tur� nea�teptat� (0x%02X) - s�rit�\n"
 
-#: g10/import.c:1574
-#, fuzzy, c-format
+#: g10/import.c:1575
+#, c-format
 msgid "key %s: expired signature from key %s - skipped\n"
-msgstr "cheia %s: clas� de semn�tur� nea�teptat� (0x%02X) - s�rit�\n"
+msgstr "cheia %s: semn�tur� expirat� de la cheia %s - s�rit�\n"
 
-#: g10/import.c:1677
+#: g10/import.c:1678
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "cheia %s: am detectat un ID utilizator duplicat - combinate\n"
 
-#: g10/import.c:1739
+#: g10/import.c:1740
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "AVERTISMENT: cheia %s poate fi revocat�: aduc revocarea cheii %s\n"
 
-#: g10/import.c:1753
+#: g10/import.c:1754
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVERTISMENT: cheia %s poate fi revocat�: cheia de revocare %s nu este "
 "prezent�.\n"
 
-#: g10/import.c:1812
+#: g10/import.c:1813
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "cheia %s: am ad�ugat certificatul de revocare \"%s\"\n"
 
-#: g10/import.c:1846
+#: g10/import.c:1847
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "cheia %s: am ad�ugat semn�tura de cheie direct�\n"
 
-#: g10/import.c:2235
-#, fuzzy
+#: g10/import.c:2236
 msgid "NOTE: a key's S/N does not match the card's one\n"
-msgstr "cheia public� nu se potrive�te cu cheia secret�!\n"
+msgstr "NOT�: S/N-ul unei chei nu se potrive�te cu cel al cardului\n"
 
-#: g10/import.c:2243
-#, fuzzy
+#: g10/import.c:2244
 msgid "NOTE: primary key is online and stored on card\n"
-msgstr "cheia secret� deja stocat� pe un card\n"
+msgstr "NOT�: cheia primar� este online �i stocat� pe card\n"
 
-#: g10/import.c:2245
-#, fuzzy
+#: g10/import.c:2246
 msgid "NOTE: secondary key is online and stored on card\n"
-msgstr "cheia secret� deja stocat� pe un card\n"
+msgstr "NOT�: cheia secundar� este online �i stocat� pe card\n"
 
-#: g10/keydb.c:167
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "eroare la crearea inelului de chei `%s': %s\n"
 
-#: g10/keydb.c:174
+#: g10/keydb.c:175
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "inelul de chei `%s' creat\n"
 
-#: g10/keydb.c:685
+#: g10/keydb.c:316 g10/keydb.c:319
+#, fuzzy, c-format
+msgid "keyblock resource `%s': %s\n"
+msgstr "eroare la creearea `%s': %s\n"
+
+#: g10/keydb.c:698
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "am e�uat s� reconstruiesc cache-ul inelului de chei: %s\n"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[revocare]"
 
-#: g10/keyedit.c:255
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[auto-semn�tur�]"
 
-#: g10/keyedit.c:333 g10/keylist.c:405
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 semn�tur� incorect�\n"
 
-#: g10/keyedit.c:335 g10/keylist.c:407
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d semn�turi incorecte\n"
 
-#: g10/keyedit.c:337 g10/keylist.c:409
+#: g10/keyedit.c:344 g10/keylist.c:410
 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:339 g10/keylist.c:411
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, 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:341 g10/keylist.c:413
+#: g10/keyedit.c:348 g10/keylist.c:414
 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:343 g10/keylist.c:415
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, 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:345
+#: g10/keyedit.c:352
 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:347
+#: g10/keyedit.c:354
 #, 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:403 g10/pkclist.c:262
+#: g10/keyedit.c:410 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2499,17 +2543,17 @@ msgstr ""
 "pentru a verifica cheile altor utilizatori (folosind pa�apoarte,\n"
 "verific�nd amprentele din diferite surse, etc.)\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:274
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = Am o �ncredere marginal�\n"
 
-#: g10/keyedit.c:408 g10/pkclist.c:276
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = Am toat� �ncrederea\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:434
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2519,38 +2563,48 @@ 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:443
+#: g10/keyedit.c:450
 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:585
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "ID utilizator \"%s\" a fost revocat."
 
-#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
-#: g10/keyedit.c:858 g10/keyedit.c:1642
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1728
 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:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
-#: g10/keyedit.c:1648
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
+#: g10/keyedit.c:1734
 msgid "  Unable to sign.\n"
 msgstr "  Nu pot semna.\n"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "ID utilizator \"%s\" este expirat."
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:650
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ID-ul utilizator \"%s\" nu este auto-semnat."
 
-#: g10/keyedit.c:676
+#: g10/keyedit.c:678
+#, fuzzy, c-format
+msgid "User ID \"%s\" is signable.  "
+msgstr "ID-ul utilizator \"%s\" nu este auto-semnat."
+
+#: g10/keyedit.c:680
+#, fuzzy
+msgid "Sign it? (y/N) "
+msgstr "Dori�i cu adev�rat s� semna�i? (d/N) "
+
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2559,11 +2613,11 @@ msgstr ""
 "Auto-semn�tura pe \"%s\"\n"
 "este o semn�tur� stil PGP 2.x.\n"
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:711
 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:699
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2572,12 +2626,12 @@ msgstr ""
 "Semn�tura d-voastr� curent� pe \"%s\"\n"
 "a expirat.\n"
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:729
 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:724
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2586,43 +2640,43 @@ msgstr ""
 "Semn�tura d-voastr� curent� pe \"%s\"\n"
 "semn�tur� local�.\n"
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:754
 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:749
+#: g10/keyedit.c:775
 #, 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:752
+#: g10/keyedit.c:778
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" a fost deja semnat� de cheia %s\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:783
 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:779
+#: g10/keyedit.c:805
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nimic de semnat cu cheia %s\n"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "Aceast� cheie a expirat!"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Aceast� cheie va expira pe %s.\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:844
 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:851
+#: g10/keyedit.c:882
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2630,11 +2684,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:853
+#: g10/keyedit.c:884
 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:878
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2645,31 +2699,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:883
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Nu voi r�spunde.%s\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Nu am verificat deloc.%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:918
 #, 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:889
+#: g10/keyedit.c:920
 #, 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:895
+#: g10/keyedit.c:926
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Selec�ia dvs.? (introduce�i `?' pentru informa�ii suplimentare): "
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:950
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2678,75 +2732,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:926
+#: g10/keyedit.c:957
 msgid "This will be a self-signature.\n"
 msgstr "Aceasta va fi o auto-semn�tur�.\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:963
 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:940
+#: g10/keyedit.c:971
 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:950
+#: g10/keyedit.c:981
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Semn�tura va fi marcat� ca non-exportabil�.\n"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:988
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Semn�tura va fi marcat� ca non-revocabil�.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:995
 msgid "I have not checked this key at all.\n"
 msgstr "Nu am verificat aceast� cheie deloc.\n"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1000
 msgid "I have checked this key casually.\n"
 msgstr "Am verificat aceast� cheie superficial.\n"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1005
 msgid "I have checked this key very carefully.\n"
 msgstr "Am verificat aceast� cheie foarte atent.\n"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1015
 msgid "Really sign? (y/N) "
 msgstr "Dori�i cu adev�rat s� semna�i? (d/N) "
 
-#: g10/keyedit.c:1029 g10/keyedit.c:4132 g10/keyedit.c:4223 g10/keyedit.c:4287
-#: g10/keyedit.c:4348 g10/sign.c:369
+#: g10/keyedit.c:1060 g10/keyedit.c:4350 g10/keyedit.c:4441 g10/keyedit.c:4505
+#: g10/keyedit.c:4566 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "semnarea a e�uat: %s\n"
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1125
 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:1105 g10/keygen.c:3057
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "Aceast� cheie nu este protejat�.\n"
 
-#: g10/keyedit.c:1109 g10/keygen.c:3045
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 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:1113 g10/keygen.c:3060
-#, fuzzy
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 msgid "Secret parts of primary key are stored on-card.\n"
-msgstr "P�r�ile secrete ale cheii primare nu sunt disponibile.\n"
+msgstr "P�r�i secrete ale cheii primare sunt stacate pe card.\n"
 
-#: g10/keyedit.c:1117 g10/keygen.c:3064
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "Cheia este protejat�.\n"
 
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Nu pot edita aceast� cheie: %s\n"
 
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2754,11 +2809,11 @@ msgstr ""
 "Introduce�i noua fraz�-parol� pentru acest� cheie secret�.\n"
 "\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:1825
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "fraza-parol� nu a fost repetat� corect; mai �ncerca�i o dat�"
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2766,425 +2821,409 @@ msgstr ""
 "Nu dori�i o fraz�-parol� - aceasta este probabil o idee *proast�*!\n"
 "\n"
 
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1195
 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:1235
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "mut o semn�tur� de cheie �n locul corect\n"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "salveaz� �i termin�"
 
-#: g10/keyedit.c:1322
-#, fuzzy
+#: g10/keyedit.c:1354
 msgid "show key fingerprint"
-msgstr "afi�eaz� amprenta"
+msgstr "afi�eaz� amprenta cheii"
 
-#: g10/keyedit.c:1323
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "enumer� chei �i ID-uri utilizator"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "selecteaz� ID utilizator N"
 
-#: g10/keyedit.c:1326
-#, fuzzy
+#: g10/keyedit.c:1358
 msgid "select subkey N"
-msgstr "selecteaz� ID utilizator N"
+msgstr "selecteaz� subcheia N"
 
-#: g10/keyedit.c:1327
-#, fuzzy
+#: g10/keyedit.c:1359
 msgid "check signatures"
-msgstr "revoc� semn�turi"
+msgstr "verific� semn�turi"
 
-#: g10/keyedit.c:1330
+#: g10/keyedit.c:1362
 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:1335
-#, fuzzy
+#: g10/keyedit.c:1367
 msgid "sign selected user IDs locally"
-msgstr "semneaz� cheia local"
+msgstr "semneaz� ID-urile utilizatorilor selecta�i local"
 
-#: g10/keyedit.c:1337
-#, fuzzy
+#: g10/keyedit.c:1369
 msgid "sign selected user IDs with a trust signature"
-msgstr "Sugestie: Selecta�i ID-ul utilizator de semnat\n"
+msgstr "semneaz� ID-urile utilizatorilor selecta�i cu o semn�tur� de �ncredere"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
-msgstr ""
+msgstr "semneaz� ID-urile utilizatorilor selecta�i cu o semn�tur� irevocabil�"
 
-#: g10/keyedit.c:1343
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "adaug� un ID utilizator"
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "adaug� o poz� ID"
 
-#: g10/keyedit.c:1347
-#, fuzzy
+#: g10/keyedit.c:1379
 msgid "delete selected user IDs"
-msgstr "�terge ID utilizator"
+msgstr "�terge ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1352
-#, fuzzy
+#: g10/keyedit.c:1384
 msgid "add a subkey"
-msgstr "addkey"
+msgstr "adaug� o subcheie"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr "adaug� o cheie la un smartcard"
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr "mut� o cheie pe un smartcard"
 
-#: g10/keyedit.c:1360
-#, fuzzy
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
-msgstr "mut� o cheie pe un smartcard"
+msgstr "mut� o cheie de rezerv� pe un smartcard"
 
-#: g10/keyedit.c:1364
-#, fuzzy
+#: g10/keyedit.c:1396
 msgid "delete selected subkeys"
-msgstr "�terge o cheie secundar�"
+msgstr "�terge subcheile selectate"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr "adaug� o cheie de revocare"
 
-#: g10/keyedit.c:1368
-#, fuzzy
+#: g10/keyedit.c:1400
 msgid "delete signatures from the selected user IDs"
-msgstr ""
-"Dori�i �ntr-adev�r s� actualiza�i preferin�ele pentru ID-urile utilizator "
-"selectate? (d/N) "
+msgstr "�terge semn�turile de pe ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1370
-#, fuzzy
+#: g10/keyedit.c:1402
 msgid "change the expiration date for the key or selected subkeys"
-msgstr "Nu pute�i schimba data de expirare a unei chei v3\n"
+msgstr "schimb� data de expirare pentru cheia sau subcheile selectate"
 
-#: g10/keyedit.c:1372
-#, fuzzy
+#: g10/keyedit.c:1404
 msgid "flag the selected user ID as primary"
-msgstr "marcheaz� ID-ul utilizator ca primar"
+msgstr "marcheaz� ID-ul utilizator selectat ca primar"
 
-#: g10/keyedit.c:1374
-#, fuzzy
+#: g10/keyedit.c:1406
 msgid "toggle between the secret and public key listings"
 msgstr "comut� �ntre listele de chei secrete �i publice"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "enumer� preferin�ele (expert)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "afi�eaz� preferin�ele (detaliat)"
 
-#: g10/keyedit.c:1381
-#, fuzzy
+#: g10/keyedit.c:1413
 msgid "set preference list for the selected user IDs"
-msgstr ""
-"Dori�i �ntr-adev�r s� actualiza�i preferin�ele pentru ID-urile utilizator "
-"selectate? (d/N) "
+msgstr "seteaz� lista de preferin�e pentru ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1386
-#, fuzzy
+#: g10/keyedit.c:1418
 msgid "set preferred keyserver URL for the selected user IDs"
-msgstr "seteaz� URL pentru serverul de chei preferat"
+msgstr ""
+"seteaz� URL-ul serverului de chei preferat pentru ID-urile utilizator "
+"selectate"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "schimb� fraza-parol�"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "schimb� �ncrederea pentru proprietar"
 
-#: g10/keyedit.c:1394
-#, fuzzy
+#: g10/keyedit.c:1426
 msgid "revoke signatures on the selected user IDs"
-msgstr ""
-"Dori�i �ntr-adev�r s� revoca�i toate ID-urile utilizator selectate? (d/N) "
+msgstr "revoc� semn�turile pentru ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1396
-#, fuzzy
+#: g10/keyedit.c:1428
 msgid "revoke selected user IDs"
-msgstr "revoc� un ID utilizator"
+msgstr "revoc� ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1401
-#, fuzzy
+#: g10/keyedit.c:1433
 msgid "revoke key or selected subkeys"
-msgstr "revoc� o cheie secundar�"
+msgstr "revoc� cheia sau subcheile selectate"
 
-#: g10/keyedit.c:1402
-#, fuzzy
+#: g10/keyedit.c:1434
 msgid "enable key"
-msgstr "activeaz� o cheie"
+msgstr "activeaz� cheia"
 
-#: g10/keyedit.c:1403
-#, fuzzy
+#: g10/keyedit.c:1435
 msgid "disable key"
-msgstr "deactiveaz� o cheie"
+msgstr "deactiveaz� cheia"
 
-#: g10/keyedit.c:1404
-#, fuzzy
+#: g10/keyedit.c:1436
 msgid "show selected photo IDs"
-msgstr "arat� o poz� ID"
+msgstr "arat� pozele pentru ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1556
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "eroare la citire keyblock secret \"%s\": %s\n"
 
-#: g10/keyedit.c:1494
+#: g10/keyedit.c:1574
 msgid "Secret key is available.\n"
 msgstr "Cheia secret� este disponibil�.\n"
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1655
 msgid "Need the secret key to do this.\n"
 msgstr "Ave�i nevoie de cheia secret� pentru a face aceasta.\n"
 
-#: g10/keyedit.c:1579
+#: g10/keyedit.c:1663
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "V� rug�m folosi�i mai �nt�i comanda \"toggle\".\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1682
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
 "  a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
+"* Comanda `sign' (semneaz�) poate fi prefixat� cu un `l' pentru semn�turi\n"
+"  locale (lsign), un `t' pentru semn�turi de �ncredere (tsign), un `nr'\n"
+"  pentru semn�turi irevocabile (nrsign), sau orice combina�ie a acestora\n"
+"  (ltsign, tnrsign, etc.).\n"
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1722
 msgid "Key is revoked."
 msgstr "Cheia este revocat�."
 
-#: g10/keyedit.c:1657
+#: g10/keyedit.c:1741
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Semna�i �ntr-adev�r toate ID-urile utilizator? (d/N) "
 
-#: g10/keyedit.c:1660
-msgid "Hint: Select the user IDs to sign\n"
-msgstr "Sugestie: Selecta�i ID-ul utilizator de semnat\n"
-
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1748
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Tip de semn�tur� necunoscut `%s'\n"
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1771
 #, 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:1713 g10/keyedit.c:1733 g10/keyedit.c:1899
+#: g10/keyedit.c:1793 g10/keyedit.c:1813 g10/keyedit.c:1979
 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:1715
+#: g10/keyedit.c:1795
 msgid "You can't delete the last user ID!\n"
 msgstr "Nu pute�i �terge ultimul ID utilizator!\n"
 
-#: g10/keyedit.c:1717
+#: g10/keyedit.c:1797
 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:1718
+#: g10/keyedit.c:1798
 msgid "Really remove this user ID? (y/N) "
 msgstr "�terge�i �ntr-adev�r acest ID utilizator? (d/N) "
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1848
 msgid "Really move the primary key? (y/N) "
 msgstr "Muta�i �ntr-adev�r cheia primar�? (d/N) "
 
-#: g10/keyedit.c:1780
+#: g10/keyedit.c:1860
 msgid "You must select exactly one key.\n"
 msgstr "Trebuie s� selecta�i exact o cheie.\n"
 
-#: g10/keyedit.c:1808
+#: g10/keyedit.c:1888
 msgid "Command expects a filename argument\n"
-msgstr ""
+msgstr "Comanda a�teapt� un nume de fi�ier ca argument\n"
 
-#: g10/keyedit.c:1822
-#, fuzzy, c-format
+#: g10/keyedit.c:1902
+#, c-format
 msgid "Can't open `%s': %s\n"
-msgstr "nu pot deschide `%s': %s\n"
+msgstr "Nu pot deschide `%s': %s\n"
 
-#: g10/keyedit.c:1839
-#, fuzzy, c-format
+#: g10/keyedit.c:1919
+#, c-format
 msgid "Error reading backup key from `%s': %s\n"
-msgstr "eroare la crearea inelului de chei `%s': %s\n"
+msgstr "Eroare citind cheia de rezerv� de pe `%s': %s\n"
 
-#: g10/keyedit.c:1863
+#: g10/keyedit.c:1943
 msgid "You must select at least one key.\n"
 msgstr "Trebuie s� selecta�i cel pu�in o cheie.\n"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1946
 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:1867
+#: g10/keyedit.c:1947
 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:1902
+#: g10/keyedit.c:1982
 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:1903
+#: g10/keyedit.c:1983
 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:1921
-#, fuzzy
+#: g10/keyedit.c:2001
 msgid "Do you really want to revoke the entire key? (y/N) "
-msgstr "Dori�i �ntr-adev�r s� revoca�i aceast� cheie? (d/N) "
+msgstr "Dori�i �ntr-adev�r s� revoca�i toat� cheia? (d/N) "
 
-#: g10/keyedit.c:1932
-#, fuzzy
+#: g10/keyedit.c:2012
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
-msgstr "Dori�i �ntr-adev�r s� revoca�i cheile selectate? (d/N) "
+msgstr "Dori�i �ntr-adev�r s� revoca�i subcheile selectate? (d/N) "
 
-#: g10/keyedit.c:1934
-#, fuzzy
+#: g10/keyedit.c:2014
 msgid "Do you really want to revoke this subkey? (y/N) "
-msgstr "Dori�i �ntr-adev�r s� revoca�i aceast� cheie? (d/N) "
+msgstr "Dori�i �ntr-adev�r s� revoca�i aceast� subcheie? (d/N) "
 
-#: g10/keyedit.c:1975
+#: g10/keyedit.c:2055
 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:2007
+#: g10/keyedit.c:2087
 msgid "Set preference list to:\n"
 msgstr "Seteaz� lista de preferin�e ca:\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2093
 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:2015
+#: g10/keyedit.c:2095
 msgid "Really update the preferences? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� actualiza�i preferin�ele? (d/N) "
 
-#: g10/keyedit.c:2065
+#: g10/keyedit.c:2157
+#, fuzzy, c-format
+msgid "Unable to clean `%s'\n"
+msgstr "nu pot executa programul `%s': %s\n"
+
+#: g10/keyedit.c:2160
+msgid "Please specify item to clean: `sigs', `uids', or `all'\n"
+msgstr ""
+
+#: g10/keyedit.c:2171
 msgid "Save changes? (y/N) "
 msgstr "Salva�i schimb�rile?  (d/N) "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2174
 msgid "Quit without saving? (y/N) "
 msgstr "Termina�i f�r� a salva?  (d/N) "
 
-#: g10/keyedit.c:2078
+#: g10/keyedit.c:2184
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualizarea a e�uat: %s\n"
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2191
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualizarea secretului a e�uat: %s\n"
 
-#: g10/keyedit.c:2092
+#: g10/keyedit.c:2198
 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:2164
+#: g10/keyedit.c:2271
 msgid "Digest: "
 msgstr "Rezumat: "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2323
 msgid "Features: "
 msgstr "Capabilit��i: "
 
-#: g10/keyedit.c:2227
+#: g10/keyedit.c:2334
 msgid "Keyserver no-modify"
 msgstr "Server de chei no-modify"
 
-#: g10/keyedit.c:2242 g10/keylist.c:307
+#: g10/keyedit.c:2349 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "Server de chei preferat: "
 
-#: g10/keyedit.c:2473
-#, fuzzy, c-format
+#: g10/keyedit.c:2580
+#, c-format
 msgid "This key was revoked on %s by %s key %s\n"
-msgstr "Aceast� cheie poate fi revocat� de cheia %s %s"
+msgstr "Aceast� cheie a fost revocat� pe %s de %s cheia %s\n"
 
-#: g10/keyedit.c:2494
+#: g10/keyedit.c:2601
 #, c-format
 msgid "This key may be revoked by %s key %s"
-msgstr "Aceast� cheie poate fi revocat� de cheia %s %s"
+msgstr "Aceast� cheie poate fi revocat� de %s cheia %s"
 
-#: g10/keyedit.c:2500
+#: g10/keyedit.c:2607
 msgid "(sensitive)"
 msgstr " (senzitiv)"
 
-#: g10/keyedit.c:2516 g10/keyedit.c:2572 g10/keyedit.c:2684 g10/keyedit.c:2699
-#: g10/keylist.c:193 g10/keyserver.c:422
+#: g10/keyedit.c:2623 g10/keyedit.c:2679 g10/keyedit.c:2792 g10/keyedit.c:2807
+#: g10/keylist.c:194 g10/keyserver.c:421
 #, c-format
 msgid "created: %s"
 msgstr "creat�: %s"
 
-#: g10/keyedit.c:2519 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:931
+#: g10/keyedit.c:2626 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:948
 #, c-format
 msgid "revoked: %s"
 msgstr "revocat�: %s"
 
-#: g10/keyedit.c:2521 g10/keylist.c:757 g10/keylist.c:886
+#: g10/keyedit.c:2628 g10/keylist.c:758 g10/keylist.c:887
 #, c-format
 msgid "expired: %s"
 msgstr "expirat�: %s"
 
-#: g10/keyedit.c:2523 g10/keyedit.c:2574 g10/keyedit.c:2686 g10/keyedit.c:2701
-#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
-#: g10/keylist.c:913 g10/keyserver.c:428 g10/mainproc.c:937
+#: g10/keyedit.c:2630 g10/keyedit.c:2681 g10/keyedit.c:2794 g10/keyedit.c:2809
+#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
+#: g10/keylist.c:914 g10/keyserver.c:427 g10/mainproc.c:954
 #, c-format
 msgid "expires: %s"
 msgstr "expir�: %s"
 
-#: g10/keyedit.c:2525
+#: g10/keyedit.c:2632
 #, c-format
 msgid "usage: %s"
 msgstr "folosire: %s"
 
-#: g10/keyedit.c:2540
+#: g10/keyedit.c:2647
 #, c-format
 msgid "trust: %s"
 msgstr "�ncredere: %s"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2651
 #, c-format
 msgid "validity: %s"
 msgstr "validitate: %s"
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2658
 msgid "This key has been disabled"
 msgstr "Aceast� cheie a fost deactivat�"
 
-#: g10/keyedit.c:2579 g10/keylist.c:199
+#: g10/keyedit.c:2686 g10/keylist.c:200
 msgid "card-no: "
 msgstr "nr-card: "
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2754
 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:2654
+#: g10/keyedit.c:2762
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3193,17 +3232,17 @@ msgstr ""
 "corect� dac� nu reporni�i programul.\n"
 
 #
-#: g10/keyedit.c:2718 g10/keyserver.c:432 g10/mainproc.c:1577
-#: g10/trustdb.c:1178
+#: g10/keyedit.c:2826 g10/keyedit.c:3201 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1690
 msgid "revoked"
 msgstr "revocat�"
 
-#: g10/keyedit.c:2720 g10/keyserver.c:436 g10/mainproc.c:1579
-#: g10/trustdb.c:531
+#: g10/keyedit.c:2828 g10/keyedit.c:3203 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1692
 msgid "expired"
 msgstr "expirat�"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2893
 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"
@@ -3212,7 +3251,7 @@ msgstr ""
 "              Aceast� comand� poate cauza ca un alt ID utilizator\n"
 "              s� devin� ID-ul utilizator primar presupus.\n"
 
-#: g10/keyedit.c:2845
+#: g10/keyedit.c:2953
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3221,45 +3260,75 @@ 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:2850 g10/keyedit.c:3128
+#: g10/keyedit.c:2958 g10/keyedit.c:3307
 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:2856
+#: g10/keyedit.c:2964
 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:2996
+#: g10/keyedit.c:3104
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� bun�? (d/N/t)"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3114
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� invalid�? (d/N/t)"
 
-#: g10/keyedit.c:3010
+#: g10/keyedit.c:3118
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� necunoscut�? (d/N/t)"
 
-#: g10/keyedit.c:3016
+#: g10/keyedit.c:3124
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�terge�i �ntr-adev�r aceast� auto-semn�tur�? (d/N)"
 
-#: g10/keyedit.c:3030
+#: g10/keyedit.c:3138
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Am �ters %d semn�turi.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3139
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Am �ters %d semn�turi.\n"
 
-#: g10/keyedit.c:3034
+#: g10/keyedit.c:3142
 msgid "Nothing deleted.\n"
 msgstr "Nu am �ters nimic.\n"
 
-#: g10/keyedit.c:3123
+#: g10/keyedit.c:3167
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed.\n"
+msgstr "ID utilizator \"%s\" a fost revocat."
+
+#: g10/keyedit.c:3168
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed.\n"
+msgstr "ID utilizator \"%s\" a fost revocat."
+
+#: g10/keyedit.c:3173
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean.\n"
+msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
+
+#: g10/keyedit.c:3205 g10/trustdb.c:1694
+#, fuzzy
+msgid "invalid"
+msgstr "armur� invalid�"
+
+#: g10/keyedit.c:3207
+#, fuzzy, c-format
+msgid "User ID \"%s\" removed: %s\n"
+msgstr "ID utilizator \"%s\" a fost revocat."
+
+#: g10/keyedit.c:3214
+#, fuzzy
+msgid "No user IDs are removable.\n"
+msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
+
+#: g10/keyedit.c:3302
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3269,334 +3338,337 @@ msgstr ""
 "revocator          desemnat poate face ca unele versiuni de PGP s� resping� "
 "cheia.\n"
 
-#: g10/keyedit.c:3134
+#: g10/keyedit.c:3313
 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:3154
+#: g10/keyedit.c:3333
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduce�i ID-ul utilizator al revocatorului desemnat: "
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3356
 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:3192
+#: g10/keyedit.c:3371
 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:3214
+#: g10/keyedit.c:3393
 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:3233
+#: g10/keyedit.c:3412
 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:3239
+#: g10/keyedit.c:3418
 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:3300
+#: g10/keyedit.c:3479
 msgid "Please remove selections from the secret keys.\n"
 msgstr "V� rug�m �terge�i selec�iile din cheile secrete.\n"
 
-#: g10/keyedit.c:3306
-#, fuzzy
+#: g10/keyedit.c:3485
 msgid "Please select at most one subkey.\n"
-msgstr "V� rug�m selecta�i cel mult o cheie secundar�.\n"
+msgstr "V� rug�m selecta�i cel mult o subcheie.\n"
 
-#: g10/keyedit.c:3310
-#, fuzzy
+#: g10/keyedit.c:3489
 msgid "Changing expiration time for a subkey.\n"
-msgstr "Schimbarea timpului de expirare pentru o cheie secundar�.\n"
+msgstr "Schimb timpul de expirare pentru o subcheie.\n"
 
-#: g10/keyedit.c:3313
+#: g10/keyedit.c:3492
 msgid "Changing expiration time for the primary key.\n"
-msgstr "Schimbarea timpului de expirare pentru o cheie primar�.\n"
+msgstr "Schimb timpul de expirare pentru cheia primar�.\n"
 
-#: g10/keyedit.c:3359
+#: g10/keyedit.c:3538
 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:3375
+#: g10/keyedit.c:3554
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/keyedit.c:3455
+#: g10/keyedit.c:3634
 msgid "Please select exactly one user ID.\n"
 msgstr "V� rug�m selecta�i exact un ID utilizator.\n"
 
-#: g10/keyedit.c:3494 g10/keyedit.c:3604 g10/keyedit.c:3724
+#: g10/keyedit.c:3673 g10/keyedit.c:3783 g10/keyedit.c:3903
 #, 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:3665
+#: g10/keyedit.c:3844
 msgid "Enter your preferred keyserver URL: "
 msgstr "Introduce�i URL-ul serverului de chei preferat: "
 
-#: g10/keyedit.c:3745
+#: g10/keyedit.c:3924
 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:3746
+#: g10/keyedit.c:3925
 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:3808
+#: g10/keyedit.c:3987
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nici un ID utilizator cu indicele %d\n"
 
-#: g10/keyedit.c:3854
+#: g10/keyedit.c:4045
 #, fuzzy, c-format
-msgid "No subkey with index %d\n"
+msgid "No user ID with hash %s\n"
 msgstr "Nici un ID utilizator cu indicele %d\n"
 
-#: g10/keyedit.c:3971
+#: g10/keyedit.c:4072
+#, c-format
+msgid "No subkey with index %d\n"
+msgstr "Nici o subcheie cu indicele %d\n"
+
+#: g10/keyedit.c:4189
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID utilizator: \"%s\"\n"
 
-#: g10/keyedit.c:3974 g10/keyedit.c:4038 g10/keyedit.c:4081
+#: g10/keyedit.c:4192 g10/keyedit.c:4256 g10/keyedit.c:4299
 #, 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:3976 g10/keyedit.c:4040 g10/keyedit.c:4083
+#: g10/keyedit.c:4194 g10/keyedit.c:4258 g10/keyedit.c:4301
 msgid " (non-exportable)"
 msgstr " (non-exportabil�)"
 
-#: g10/keyedit.c:3980
+#: g10/keyedit.c:4198
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Aceast� semn�tur� a expirat pe %s.\n"
 
-#: g10/keyedit.c:3984
+#: g10/keyedit.c:4202
 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:3988
+#: g10/keyedit.c:4206
 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:4015
+#: g10/keyedit.c:4233
 #, 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:4041
+#: g10/keyedit.c:4259
 msgid " (non-revocable)"
 msgstr " (non-revocabil�)"
 
-#: g10/keyedit.c:4048
+#: g10/keyedit.c:4266
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocat� de cheia d-voastr� %s pe %s\n"
 
-#: g10/keyedit.c:4070
+#: g10/keyedit.c:4288
 msgid "You are about to revoke these signatures:\n"
 msgstr "Sunte�i pe cale s� revoca�i aceste semn�turi:\n"
 
-#: g10/keyedit.c:4090
+#: g10/keyedit.c:4308
 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:4120
+#: g10/keyedit.c:4338
 msgid "no secret key\n"
 msgstr "nici o cheie secret�\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4408
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4425
 #, 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:4271
-#, fuzzy, c-format
+#: g10/keyedit.c:4489
+#, c-format
 msgid "Key %s is already revoked.\n"
-msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
+msgstr "Cheia %s este deja revocat�.\n"
 
-#: g10/keyedit.c:4333
-#, fuzzy, c-format
+#: g10/keyedit.c:4551
+#, c-format
 msgid "Subkey %s is already revoked.\n"
-msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
+msgstr "Subcheia %s este deja revocat�.\n"
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4646
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Afi�ez poza ID %s de dimensiune %ld pentru cheia %s (uid %d)\n"
 
-#: g10/keygen.c:293
+#: g10/keygen.c:258
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "preferin�a `%s' duplicat�\n"
 
-#: g10/keygen.c:300
+#: g10/keygen.c:265
 msgid "too many cipher preferences\n"
 msgstr "prea multe preferin�e de cifrare\n"
 
-#: g10/keygen.c:302
+#: g10/keygen.c:267
 msgid "too many digest preferences\n"
 msgstr "prea multe preferin�e de rezumat\n"
 
-#: g10/keygen.c:304
+#: g10/keygen.c:269
 msgid "too many compression preferences\n"
 msgstr "prea multe preferin�e de compresie\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:394
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "articol invalid `%s' �n �irul de preferin�e\n"
 
-#: g10/keygen.c:829
+#: g10/keygen.c:822
 msgid "writing direct signature\n"
 msgstr "scriu semn�tur� direct�\n"
 
-#: g10/keygen.c:868
+#: g10/keygen.c:861
 msgid "writing self signature\n"
 msgstr "scriu auto semn�tur�\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing key binding signature\n"
 msgstr "scriu semn�tur� legat� de cheie\n"
 
-#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2632
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "lungime cheie invalid�; folosesc %u bi�i\n"
 
-#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2638
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "lungime cheie rotunjit� la %u bi�i\n"
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1239
 msgid "Sign"
 msgstr "Semneaz�"
 
-#: g10/keygen.c:1252
+#: g10/keygen.c:1242
 msgid "Encrypt"
 msgstr "Cifreaz�"
 
-#: g10/keygen.c:1255
+#: g10/keygen.c:1245
 msgid "Authenticate"
 msgstr "Autentific�"
 
-#: g10/keygen.c:1263
+#: g10/keygen.c:1253
 msgid "SsEeAaQq"
 msgstr "SsCcAaTt"
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1268
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Ac�iuni posibile pentru o cheie %s: "
 
-#: g10/keygen.c:1282
+#: g10/keygen.c:1272
 msgid "Current allowed actions: "
 msgstr "Ac�iuni permise curent: "
 
-#: g10/keygen.c:1287
+#: g10/keygen.c:1277
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Comut� capabilitatea de semnare\n"
 
-#: g10/keygen.c:1290
+#: g10/keygen.c:1280
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Comut� capabilitatea de cifrare\n"
 
-#: g10/keygen.c:1293
+#: g10/keygen.c:1283
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Comut� capabilitatea de autentificare\n"
 
-#: g10/keygen.c:1296
+#: g10/keygen.c:1286
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Terminat\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1340
 msgid "Please select what kind of key you want:\n"
 msgstr "Selecta�i ce fel de cheie dori�i:\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1342
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA �i Elgamal (implicit)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1343
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (numai semnare)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1345
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (seteaz� singur capabilit��ile)\n"
 
-#: g10/keygen.c:1357
+#: g10/keygen.c:1347
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (numai cifrare)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1348
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (numai semnare)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1350
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (numai cifrare)\n"
 
-#: g10/keygen.c:1362
+#: g10/keygen.c:1352
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (seteaz� singur capabilit��ile)\n"
 
-#: g10/keygen.c:1431 g10/keygen.c:2509
+#: g10/keygen.c:1421 g10/keygen.c:2506
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "Perechea de chei DSA va avea %u bi�i.\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1431
 #, 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:1448
+#: g10/keygen.c:1438
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Ce lungime de cheie dori�i? (%u) "
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1452
 #, 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:1468
+#: g10/keygen.c:1458
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Lungimea cheii necesar� este %u bi�i\n"
 
-#: g10/keygen.c:1473 g10/keygen.c:1478
+#: g10/keygen.c:1463 g10/keygen.c:1468
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rotunjit� prin adaos la %u bi�i\n"
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1515
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3612,7 +3684,7 @@ msgstr ""
 "      <n>m = cheia expir� �n n luni\n"
 "      <n>y = cheia expir� �n n ani\n"
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1526
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3628,39 +3700,38 @@ msgstr ""
 "      <n>m = semn�tura expir� �n n luni\n"
 "      <n>y = semn�tura expir� �n n ani\n"
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1549
 msgid "Key is valid for? (0) "
 msgstr "Cheia este valid� pentru? (0) "
 
-#: g10/keygen.c:1563
-msgid "Signature is valid for? (0) "
+#: g10/keygen.c:1554
+#, fuzzy, c-format
+msgid "Signature is valid for? (%s) "
 msgstr "Semn�tura este valid� pentru? (0) "
 
-#: g10/keygen.c:1568
+#: g10/keygen.c:1572
 msgid "invalid value\n"
 msgstr "valoare invalid�\n"
 
-#: g10/keygen.c:1575
-#, fuzzy
+#: g10/keygen.c:1579
 msgid "Key does not expire at all\n"
-msgstr "%s nu expir� deloc\n"
+msgstr "Cheia nu expir� deloc\n"
 
-#: g10/keygen.c:1576
-#, fuzzy
+#: g10/keygen.c:1580
 msgid "Signature does not expire at all\n"
-msgstr "%s nu expir� deloc\n"
+msgstr "Semn�tura nu expir� deloc\n"
 
-#: g10/keygen.c:1583
-#, fuzzy, c-format
+#: g10/keygen.c:1585
+#, c-format
 msgid "Key expires at %s\n"
-msgstr "%s expir� la %s\n"
+msgstr "Cheia expir� pe %s\n"
 
-#: g10/keygen.c:1584
-#, fuzzy, c-format
+#: g10/keygen.c:1586
+#, c-format
 msgid "Signature expires at %s\n"
-msgstr "Semn�tura expir� %s\n"
+msgstr "Semn�tura expir� pe %s\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1592
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3668,11 +3739,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:1595
+#: g10/keygen.c:1597
 msgid "Is this correct? (y/N) "
 msgstr "Este aceasta corect? (d/N) "
 
-#: g10/keygen.c:1638
+#: g10/keygen.c:1641
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3689,44 +3760,44 @@ msgstr ""
 "    \"Popa Ioan (popic�) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1651
+#: g10/keygen.c:1654
 msgid "Real name: "
 msgstr "Nume real: "
 
-#: g10/keygen.c:1659
+#: g10/keygen.c:1662
 msgid "Invalid character in name\n"
 msgstr "Caracter invalid �n nume\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1664
 msgid "Name may not start with a digit\n"
 msgstr "Numele nu poate �ncepe cu o cifr�\n"
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1666
 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:1671
+#: g10/keygen.c:1674
 msgid "Email address: "
 msgstr "Adres� de email: "
 
-#: g10/keygen.c:1682
+#: g10/keygen.c:1685
 msgid "Not a valid email address\n"
 msgstr "Nu este o adres� de email valid�\n"
 
-#: g10/keygen.c:1690
+#: g10/keygen.c:1693
 msgid "Comment: "
 msgstr "Comentariu: "
 
-#: g10/keygen.c:1696
+#: g10/keygen.c:1699
 msgid "Invalid character in comment\n"
 msgstr "Caracter invalid �n comentariu\n"
 
-#: g10/keygen.c:1719
+#: g10/keygen.c:1722
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Folosi�i setul de caractere `%s'\n"
 
-#: g10/keygen.c:1725
+#: g10/keygen.c:1728
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3737,7 +3808,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1733
 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"
 
@@ -3752,23 +3823,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:1746
+#: g10/keygen.c:1749
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoTt"
 
-#: g10/keygen.c:1756
+#: g10/keygen.c:1759
 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:1757
+#: g10/keygen.c:1760
 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:1776
+#: g10/keygen.c:1779
 msgid "Please correct the error first\n"
 msgstr "V� rug�m corecta�i mai �nt�i eroarea\n"
 
-#: g10/keygen.c:1816
+#: g10/keygen.c:1819
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3776,12 +3847,12 @@ msgstr ""
 "Ave�i nevoie de o fraz�-parol� pentru a v� proteja cheia secret�.\n"
 "\n"
 
-#: g10/keygen.c:1826 g10/passphrase.c:1105
+#: g10/keygen.c:1829 g10/passphrase.c:786
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1832
+#: g10/keygen.c:1835
 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"
@@ -3792,7 +3863,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:1854
+#: g10/keygen.c:1857
 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"
@@ -3804,66 +3875,65 @@ 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:2578
+#: g10/keygen.c:2575
 msgid "Key generation canceled.\n"
 msgstr "Generarea cheii a fost anulat�.\n"
 
-#: g10/keygen.c:2766 g10/keygen.c:2910
+#: g10/keygen.c:2774 g10/keygen.c:2918
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "scriu cheia public� �n `%s'\n"
 
-#: g10/keygen.c:2768 g10/keygen.c:2913
+#: g10/keygen.c:2776 g10/keygen.c:2921
 #, c-format
 msgid "writing secret key stub to `%s'\n"
-msgstr "scriu chitan�a cheii secrete �n `%s'\n"
+msgstr "scriu talonul (stub) cheii secrete �n `%s'\n"
 
-#: g10/keygen.c:2771 g10/keygen.c:2916
+#: g10/keygen.c:2779 g10/keygen.c:2924
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "scriu cheia secret� �n `%s'\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2907
 #, 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:2905
+#: g10/keygen.c:2913
 #, 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:2923
+#: g10/keygen.c:2931
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "eroare la scrierea inelului de chei public `%s': %s\n"
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2938
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "eroare la scrierea inelului de chei secret `%s': %s\n"
 
-#: g10/keygen.c:2953
+#: g10/keygen.c:2961
 msgid "public and secret key created and signed.\n"
 msgstr "cheile secret� �i public� au fost create �i semnate.\n"
 
-#: g10/keygen.c:2964
-#, fuzzy
+#: g10/keygen.c:2972
 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 ""
 "De notat c� aceast� cheie nu poate fi folosit� pentru cifrare.  Poate "
 "dori�i\n"
-"s� folosi�i comanda \"--edit-key\" pentru a genera o cheie secundar� pentru\n"
-"acest scop.\n"
+"s� folosi�i comanda \"--edit-key\" pentru a genera o subcheie secundar�\n"
+"pentru acest scop.\n"
 
-#: g10/keygen.c:2976 g10/keygen.c:3105 g10/keygen.c:3220
+#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generarea cheii a e�uat: %s\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3156 g10/sign.c:290
+#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -3871,7 +3941,7 @@ msgstr ""
 "cheia a fost creat� %lu secund� �n viitor (warp �n timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/keygen.c:3030 g10/keygen.c:3158 g10/sign.c:292
+#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -3879,365 +3949,346 @@ msgstr ""
 "cheia a fost creat� %lu secunde �n viitor (warp �n timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/keygen.c:3039 g10/keygen.c:3169
+#: g10/keygen.c:3047 g10/keygen.c:3177
 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:3078 g10/keygen.c:3202
+#: g10/keygen.c:3086 g10/keygen.c:3210
 msgid "Really create? (y/N) "
 msgstr "Crea�i �ntr-adev�r? (d/N) "
 
-#: g10/keygen.c:3355
+#: g10/keygen.c:3363
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "stocarea cheii pe card a e�uat: %s\n"
 
-#: g10/keygen.c:3402
+#: g10/keygen.c:3410
 #, 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:3428
+#: g10/keygen.c:3436
 #, 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"
 
-#: g10/keygen.c:3508
-#, c-format
-msgid "length of RSA modulus is not %d\n"
-msgstr "lungimea modulului RSA nu este %d\n"
-
-#: g10/keygen.c:3514
-msgid "public exponent too large (more than 32 bits)\n"
-msgstr "exponent public prea lung (mai mult de 32 bi�i)\n"
-
-#: g10/keygen.c:3520 g10/keygen.c:3526
-#, c-format
-msgid "length of an RSA prime is not %d\n"
-msgstr "lungimea unui prim RSA nu este %d\n"
-
-#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
+#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
 msgid "never     "
 msgstr "niciodat� "
 
-#: g10/keylist.c:264
+#: g10/keylist.c:265
 msgid "Critical signature policy: "
 msgstr "Politic� de semn�turi critic�: "
 
-#: g10/keylist.c:266
+#: g10/keylist.c:267
 msgid "Signature policy: "
 msgstr "Politic� de semn�turi: "
 
-#: g10/keylist.c:305
+#: g10/keylist.c:306
 msgid "Critical preferred keyserver: "
 msgstr "Server de chei preferat critic: "
 
-#: g10/keylist.c:354 g10/keylist.c:398
+#: 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:372
+#: g10/keylist.c:373
 msgid "Critical signature notation: "
 msgstr "Notare semn�tur� critic�: "
 
-#: g10/keylist.c:374
+#: g10/keylist.c:375
 msgid "Signature notation: "
 msgstr "Notare semn�tur�: "
 
-#: g10/keylist.c:385
+#: g10/keylist.c:386
 msgid "not human readable"
 msgstr "ilizibil"
 
-#: g10/keylist.c:486
+#: g10/keylist.c:487
 msgid "Keyring"
 msgstr "Inel de chei"
 
-#: g10/keylist.c:792
+#: g10/keylist.c:793
 #, c-format
 msgid "expired: %s)"
 msgstr "expirat: %s)"
 
-#: g10/keylist.c:1488
+#: g10/keylist.c:1489
 msgid "Primary key fingerprint:"
 msgstr "Amprent� cheie primar�:"
 
-#: g10/keylist.c:1490
+#: g10/keylist.c:1491
 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:1497
+#: g10/keylist.c:1498
 msgid " Primary key fingerprint:"
 msgstr " Amprent� cheie primar�:"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1500
 msgid "      Subkey fingerprint:"
 msgstr "      Amprent� subcheie:"
 
-#: g10/keylist.c:1503 g10/keylist.c:1507
+#: g10/keylist.c:1504 g10/keylist.c:1508
 msgid "      Key fingerprint ="
 msgstr "      Amprent� cheie ="
 
-#: g10/keylist.c:1574
+#: g10/keylist.c:1575
 msgid "      Card serial no. ="
 msgstr "      Card nr. serie ="
 
-#: g10/keyring.c:1245
+#: g10/keyring.c:1246
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "redenumirea `%s' ca `%s' a e�uat: %s\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1252
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVERTISMENT: exist� 2 fi�iere cu informa�ii confiden�iale.\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s este cel neschimbat\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1255
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s este cel nou\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1256
 msgid "Please fix this possible security flaw\n"
 msgstr "V� rug�m repara�i aceast� deficien�� posibil� de securitate\n"
 
-#: g10/keyring.c:1375
+#: g10/keyring.c:1376
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "pun �n cache inelul de chei `%s'\n"
 
-#: g10/keyring.c:1421
+#: g10/keyring.c:1422
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu chei puse �n cache p�n� acum (%lu semn�turi)\n"
 
-#: g10/keyring.c:1433
+#: g10/keyring.c:1434
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu chei puse �n cache (%lu semn�turi)\n"
 
-#: g10/keyring.c:1504
+#: g10/keyring.c:1505
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: inelul de chei creat\n"
 
-#: g10/keyserver.c:107
+#: g10/keyserver.c:105
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "AVERTISMENT: op�iunile serverului de chei `%s' nu sunt folosite pe aceast� "
 "platform�\n"
 
-#: g10/keyserver.c:434
+#: g10/keyserver.c:433
 msgid "disabled"
 msgstr "deactivat(�)"
 
-#: g10/keyserver.c:635
+#: g10/keyserver.c:634
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Introduce�i num�r/numere, N)ext (urm�tor), sau Q)uit (termin�) > "
 
-#: g10/keyserver.c:718 g10/keyserver.c:1238
+#: g10/keyserver.c:717 g10/keyserver.c:1267
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "protocol server de chei invalid (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:808
+#: g10/keyserver.c:815
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "cheia \"%s\" nu a fost g�sit� pe serverul de chei\n"
 
-#: g10/keyserver.c:810
+#: g10/keyserver.c:817
 msgid "key not found on keyserver\n"
 msgstr "cheia nu a fost g�sit� pe serverul de chei\n"
 
-#: g10/keyserver.c:985
+#: g10/keyserver.c:1014
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "cer cheia %s de la serverul %s %s\n"
 
-#: g10/keyserver.c:989
+#: g10/keyserver.c:1018
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "cer cheia %s de la %s\n"
 
-#: g10/keyserver.c:1141
+#: g10/keyserver.c:1170
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "trimit cheia %s serverului %s %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1174
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "trimit cheia %s lui %s\n"
 
-#: g10/keyserver.c:1188
+#: g10/keyserver.c:1217
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "caut \"%s\" de pe serverul %s %s\n"
 
-#: g10/keyserver.c:1191
+#: g10/keyserver.c:1220
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "caut \"%s\" de pe %s\n"
 
-#: g10/keyserver.c:1198 g10/keyserver.c:1293
+#: g10/keyserver.c:1227 g10/keyserver.c:1322
 msgid "no keyserver action!\n"
 msgstr "nici o ac�iune pentru serverul de chei!\n"
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1275
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 "AVERTISMENT: manipulator server de chei dintr-o versiune diferit� de GnuPG (%"
 "s)\n"
 
-#: g10/keyserver.c:1255
+#: g10/keyserver.c:1284
 msgid "keyserver did not send VERSION\n"
 msgstr "serverul de chei nu a trimis VERSION (versiune)\n"
 
-#: g10/keyserver.c:1314
+#: g10/keyserver.c:1343
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "nici un server de chei cunoscut (folosi�i op�iunea --keyserver)\n"
 
-#: g10/keyserver.c:1320
+#: g10/keyserver.c:1349
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 "apeluri c�tre server de chei extern nu este suportat de acest program\n"
 
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1361
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "nici un manipulator (handler) pentru schema serverului de chei `%s'\n"
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1366
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "ac�iunea `%s' nu este suportat� cu schema serverului de chei `%s'\n"
 
-#: g10/keyserver.c:1345
-#, c-format
-msgid "gpgkeys_%s does not support handler version %d\n"
+#: g10/keyserver.c:1374
+#, fuzzy, c-format
+msgid "%s does not support handler version %d\n"
 msgstr "gpgkeys_%s nu suport� versiunea de manipulator (handler) %d\n"
 
-#: g10/keyserver.c:1351
+#: g10/keyserver.c:1381
 msgid "keyserver timed out\n"
 msgstr "serverul de chei a epuizat timpul de a�teptare (timed out)\n"
 
-#: g10/keyserver.c:1356
+#: g10/keyserver.c:1386
 msgid "keyserver internal error\n"
 msgstr "eroare intern� server de chei\n"
 
-#: g10/keyserver.c:1365
+#: g10/keyserver.c:1395
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "eroare de comunicare server de chei: %s\n"
 
-#: g10/keyserver.c:1390 g10/keyserver.c:1424
+#: g10/keyserver.c:1420 g10/keyserver.c:1454
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" nu este un ID de cheie: s�rit\n"
 
-#: g10/keyserver.c:1681
+#: g10/keyserver.c:1711
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
 
-#: g10/keyserver.c:1703
+#: g10/keyserver.c:1733
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "reactualizez 1 cheie de la %s\n"
 
-#: g10/keyserver.c:1705
+#: g10/keyserver.c:1735
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "reactualizez %d chei de la %s\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:249
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "dimensiune ciudat� pentru o cheie de sesiune cifrat� (%d)\n"
 
-#: g10/mainproc.c:262
-#, c-format
-msgid "bad passphrase or unknown cipher algorithm (%d)\n"
-msgstr "fraz�=parol� gre�it� sau algoritm cifrare necunoscut (%d)\n"
-
-#: g10/mainproc.c:299
+#: g10/mainproc.c:300
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s cheie de sesiune cifrat�\n"
 
-#: g10/mainproc.c:309
+#: g10/mainproc.c:310
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "fraza-parol� generat� cu un algoritm rezumat necunoscut %d\n"
 
-#: g10/mainproc.c:375
+#: g10/mainproc.c:376
 #, c-format
 msgid "public key is %s\n"
 msgstr "cheia public� este %s\n"
 
-#: g10/mainproc.c:430
+#: g10/mainproc.c:431
 msgid "public key encrypted data: good DEK\n"
 msgstr "date cigrate cu cheie public�: DEK bun\n"
 
-#: g10/mainproc.c:463
+#: g10/mainproc.c:464
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "cifrat cu cheia %u-bit %s, ID %s, creat� %s\n"
 
-#: g10/mainproc.c:467 g10/pkclist.c:218
+#: g10/mainproc.c:468 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:472
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrat cu cheia %s, ID %s\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decriptarea cu cheie public� a e�uat: %s\n"
 
-#: g10/mainproc.c:499
+#: g10/mainproc.c:500
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrat� cu %lu fraze-parol�\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:502
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrat� cu 1 fraz�-parol�\n"
 
-#: g10/mainproc.c:529 g10/mainproc.c:551
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "presupunem date cifrate %s\n"
 
-#: g10/mainproc.c:537
+#: g10/mainproc.c:538
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "cifru IDEA indisponibil, vom �ncerca s� folosim %s �n loc\n"
 
-#: g10/mainproc.c:569
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr "decriptare OK\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:574
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVERTISMENT: mesajul nu a avut integritatea protejat�\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTISMENT: mesajul cifrat a fost manipulat!\n"
 
-#: g10/mainproc.c:592
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decriptarea a e�uat: %s\n"
@@ -4251,304 +4302,293 @@ 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:786
+#: g10/mainproc.c:803
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocare standalone - folosi�i \"gpg --import\" pentru a aplica\n"
 
-#: g10/mainproc.c:1290
+#: g10/mainproc.c:1307
 msgid "signature verification suppressed\n"
 msgstr "verificare semn�tur� eliminat�\n"
 
-#: g10/mainproc.c:1332 g10/mainproc.c:1342
+#: g10/mainproc.c:1349 g10/mainproc.c:1359
 msgid "can't handle these multiple signatures\n"
 msgstr "nu pot m�nui aceste semn�turi multiple\n"
 
-#: g10/mainproc.c:1352
+#: g10/mainproc.c:1369
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Semn�tur� f�cut� %s\n"
 
-#: g10/mainproc.c:1353
+#: g10/mainproc.c:1370
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               folosind cheia %s %s\n"
 
-#: g10/mainproc.c:1357
+#: g10/mainproc.c:1374
 #, 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:1377
+#: g10/mainproc.c:1394
 msgid "Key available at: "
 msgstr "Cheie disponibil� la: "
 
-#: g10/mainproc.c:1482 g10/mainproc.c:1530
+#: g10/mainproc.c:1499 g10/mainproc.c:1547
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Semn�tur� INCORECT� din \"%s\""
 
-#: g10/mainproc.c:1484 g10/mainproc.c:1532
+#: g10/mainproc.c:1501 g10/mainproc.c:1549
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Semn�tur� expirat� din \"%s\""
 
-#: g10/mainproc.c:1486 g10/mainproc.c:1534
+#: g10/mainproc.c:1503 g10/mainproc.c:1551
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Semn�tur� bun� din \"%s\""
 
-#: g10/mainproc.c:1538
+#: g10/mainproc.c:1555
 msgid "[uncertain]"
 msgstr "[nesigur]"
 
-#: g10/mainproc.c:1570
+#: g10/mainproc.c:1587
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \"%s\""
 
-#: g10/mainproc.c:1664
+#: g10/mainproc.c:1681
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Semn�tur� expirat� %s\n"
 
-#: g10/mainproc.c:1669
+#: g10/mainproc.c:1686
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Semn�tura expir� %s\n"
 
-#: g10/mainproc.c:1672
+#: g10/mainproc.c:1689
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "semn�tur� %s, algoritm rezumat %s\n"
 
-#: g10/mainproc.c:1673
+#: g10/mainproc.c:1690
 msgid "binary"
 msgstr "binar"
 
-#: g10/mainproc.c:1674
+#: g10/mainproc.c:1691
 msgid "textmode"
 msgstr "modtext"
 
-#: g10/mainproc.c:1674 g10/trustdb.c:530
+#: g10/mainproc.c:1691 g10/trustdb.c:531
 msgid "unknown"
 msgstr "necunoscut"
 
-#: g10/mainproc.c:1694
+#: g10/mainproc.c:1711
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nu pot verifica semn�tura: %s\n"
 
-#: g10/mainproc.c:1762 g10/mainproc.c:1778 g10/mainproc.c:1864
+#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
 msgid "not a detached signature\n"
 msgstr "nu o semn�tur� deta�at�\n"
 
-#: g10/mainproc.c:1805
+#: g10/mainproc.c:1822
 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:1813
+#: g10/mainproc.c:1830
 #, 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:1870
+#: g10/mainproc.c:1887
 msgid "old style (PGP 2.x) signature\n"
 msgstr "semn�tur� de stil vechi (PGP 2.x)\n"
 
-#: g10/mainproc.c:1880
+#: g10/mainproc.c:1897
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pachet root invalid detectat �n proc_tree()\n"
 
-#: g10/misc.c:121
+#: g10/misc.c:122
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "nu pot deactiva generarea fi�ierelor core: %s\n"
 
-#: g10/misc.c:141 g10/misc.c:169 g10/misc.c:241
+#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "fstat pentru `%s' a e�uat �n %s: %s\n"
 
-#: g10/misc.c:206
+#: g10/misc.c:207
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) a e�uat �n %s: %s\n"
 
-#: g10/misc.c:315
+#: g10/misc.c:316
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "AVERTISMENT: folosesc algoritmul cu cheie public� experimental %s\n"
 
-#: g10/misc.c:330
+#: g10/misc.c:331
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "AVERTISMENT: folosesc algoritmul de cifrare experimental %s\n"
 
-#: g10/misc.c:345
+#: g10/misc.c:346
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "AVERTISMENT: folosesc algoritmul rezumat experimental %s\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:351
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "AVERTISMENT: algoritmul rezumat %s este prea vechi (deprecated)\n"
 
-#: g10/misc.c:446
+#: g10/misc.c:447
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "plugin-ul pentru cifrare IDEA nu este prezent\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:448
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 "vede�i http://www.gnupg.org/why-not-idea.html pentru informa�ii "
 "suplimentare\n"
 
-#: g10/misc.c:680
+#: g10/misc.c:681
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: op�iune �nvechit� \"%s\"\n"
 
-#: g10/misc.c:684
+#: g10/misc.c:685
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVERTISMENT: \"%s\" este o op�iune �nvechit�\n"
 
-#: g10/misc.c:686
+#: g10/misc.c:687
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "v� rug�m folosi�i \"%s%s\" �n loc\n"
 
-#: g10/misc.c:697
+#: g10/misc.c:694
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
+msgstr "AVERTISMENT: \"%s\" este o op�iune �nvechit�\n"
+
+#: g10/misc.c:707
 msgid "Uncompressed"
 msgstr "Necompresat"
 
 #
-#: g10/misc.c:722
+#: g10/misc.c:732
 msgid "uncompressed|none"
 msgstr "necompresat|niciunul"
 
-#: g10/misc.c:832
+#: g10/misc.c:842
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "acest mesaj s-ar putea s� nu poat� fi folosit de %s\n"
 
-#: g10/misc.c:989
+#: g10/misc.c:999
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "op�iune ambigu� `%s'\n"
 
-#: g10/misc.c:1014
+#: g10/misc.c:1024
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "op�iune necunoscut� `%s'\n"
 
-#: g10/openfile.c:84
+#: g10/openfile.c:86
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Fi�ierul `%s' exist�. "
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 msgid "Overwrite? (y/N) "
 msgstr "Suprascriu? (d/N) "
 
-#: g10/openfile.c:119
+#: g10/openfile.c:121
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: sufix necunoscut\n"
 
-#: g10/openfile.c:141
+#: g10/openfile.c:143
 msgid "Enter new filename"
 msgstr "Introduce�i un nou nume-fi�ier"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:188
 msgid "writing to stdout\n"
 msgstr "scriu la stdout\n"
 
-#: g10/openfile.c:296
+#: g10/openfile.c:300
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "presupun date semnate �n `%s'\n"
 
-#: g10/openfile.c:375
+#: g10/openfile.c:379
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "fi�ier de configurare nou `%s' creat\n"
 
-#: g10/openfile.c:377
+#: g10/openfile.c:381
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 "AVERTISMENT: op�iunile din %s nu sunt �nc� active �n timpul acestei rul�ri\n"
 
-#: g10/openfile.c:409
+#: g10/openfile.c:413
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "director `%s' creat\n"
 
-#: g10/parse-packet.c:137
+#: g10/parse-packet.c:138
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "nu pot m�nui algoritmul cu cheie public� %d\n"
 
-#: g10/parse-packet.c:707
+#: g10/parse-packet.c:708
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVERTISMENT: cheie de sesiune cifrat� simetric poten�ial nesigur� "
 "(insecure)\n"
 
-#: g10/parse-packet.c:1132
+#: g10/parse-packet.c:1145
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpachetul de tip %d are bitul critic setat\n"
 
-#: g10/passphrase.c:478 g10/passphrase.c:525
+#: g10/passphrase.c:305
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
 
-#: g10/passphrase.c:486
-msgid "can't set client pid for the agent\n"
-msgstr "nu pot seta pid-ul client pentru agent\n"
-
-#: g10/passphrase.c:494
-msgid "can't get server read FD for the agent\n"
-msgstr "nu pot convinge serverul s� citeasc� FD pentru agent\n"
-
-#: g10/passphrase.c:501
-msgid "can't get server write FD for the agent\n"
-msgstr "nu pot convinge serverul s� scrie FD pentru agent\n"
-
-#: g10/passphrase.c:534
+#: g10/passphrase.c:317
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabila de mediu GPG_AGENT_INFO anormal�\n"
 
-#: g10/passphrase.c:547
+#: g10/passphrase.c:332
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent versiune protocol %d nu este suportat\n"
 
-#: g10/passphrase.c:568
+#: g10/passphrase.c:345
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nu m� pot conecta la `%s': %s\n"
 
-#: g10/passphrase.c:590
-msgid "communication problem with gpg-agent\n"
-msgstr "probleme de comunicare cu gpg-agent\n"
-
-#: g10/passphrase.c:597 g10/passphrase.c:937 g10/passphrase.c:1049
+#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problem� cu agentul - deactivez  folosirea agentului\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1209
+#: g10/passphrase.c:511 g10/passphrase.c:890
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (ID cheie principal� %s)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:525
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4560,41 +4600,28 @@ msgstr ""
 "\"%.*s\"\n"
 "cheia %u-bit %s, ID %s, creat� %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:550
 msgid "Repeat passphrase\n"
 msgstr "Repeta�i fraza-parol�\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:552
 msgid "Enter passphrase\n"
 msgstr "Introduce�i fraza-parol�\n"
 
-#: g10/passphrase.c:781
-msgid "passphrase too long\n"
-msgstr "fraz�-parol� prea lung�\n"
-
-#: g10/passphrase.c:794
-msgid "invalid response from agent\n"
-msgstr "r�spuns invalid de la agent\n"
-
-#: g10/passphrase.c:810 g10/passphrase.c:931
+#: g10/passphrase.c:628
 msgid "cancelled by user\n"
 msgstr "anulat� de utilizator\n"
 
-#: g10/passphrase.c:815 g10/passphrase.c:1020
-#, c-format
-msgid "problem with the agent: agent returns 0x%lx\n"
-msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
-
 #
-#: g10/passphrase.c:1100 g10/passphrase.c:1263
+#: g10/passphrase.c:781 g10/passphrase.c:944
 msgid "can't query passphrase in batch mode\n"
 msgstr "nu pot cere fraza-parol� �n modul batch\n"
 
-#: g10/passphrase.c:1107 g10/passphrase.c:1268
+#: g10/passphrase.c:788 g10/passphrase.c:949
 msgid "Enter passphrase: "
 msgstr "Introduce�i fraza-parol�: "
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:871
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4603,21 +4630,21 @@ msgstr ""
 "Ave�i nevoie de o fraz�-parol� pentru a descuia cheia secret� pentru\n"
 "utilizator: \"%s\"\n"
 
-#: g10/passphrase.c:1196
+#: g10/passphrase.c:877
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "cheia %u-bit %s, ID %s, creat� %s"
 
-#: g10/passphrase.c:1205
+#: g10/passphrase.c:886
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (subcheie pe cheia principal� ID %s)"
 
-#: g10/passphrase.c:1272
+#: g10/passphrase.c:953
 msgid "Repeat passphrase: "
 msgstr "Repeta�i fraza-parol�: "
 
-#: g10/photoid.c:66
+#: g10/photoid.c:67
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4633,113 +4660,113 @@ msgstr ""
 "foarte larg�!\n"
 "�ncerca�i s� folosi�i o imagine de aproximativ 240x288 pixeli.\n"
 
-#: g10/photoid.c:80
+#: g10/photoid.c:81
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Introduce�i nume-fi�ier JPEG pentru poz� ID: "
 
-#: g10/photoid.c:94
+#: g10/photoid.c:95
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "nu pot deschide fi�ierul JPEG `%s': %s\n"
 
-#: g10/photoid.c:102
+#: g10/photoid.c:103
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Acest JPEG este foarte mare (%d octe�i) !\n"
 
-#: g10/photoid.c:104
+#: g10/photoid.c:105
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Sunte�i sigur(�) c� dori�i s� �l folosi�i? (d/N) "
 
-#: g10/photoid.c:119
+#: g10/photoid.c:120
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "`%s' nu este un fi�ier JPEG\n"
 
-#: g10/photoid.c:136
+#: g10/photoid.c:137
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Este aceast� poz� corect� (d/N/t)? "
 
-#: g10/photoid.c:338
+#: g10/photoid.c:339
 msgid "unable to display photo ID!\n"
 msgstr "nu pot afi�a poza ID!\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:580
+#: g10/pkclist.c:62 g10/revoke.c:581
 msgid "No reason specified"
 msgstr "Nici un motiv specificat"
 
-#: g10/pkclist.c:63 g10/revoke.c:582
+#: g10/pkclist.c:64 g10/revoke.c:583
 msgid "Key is superseded"
 msgstr "Cheia este �nlocuit�"
 
-#: g10/pkclist.c:65 g10/revoke.c:581
+#: g10/pkclist.c:66 g10/revoke.c:582
 msgid "Key has been compromised"
 msgstr "Cheia a fost compromis�"
 
-#: g10/pkclist.c:67 g10/revoke.c:583
+#: g10/pkclist.c:68 g10/revoke.c:584
 msgid "Key is no longer used"
 msgstr "Cheia nu mai este folosit�"
 
-#: g10/pkclist.c:69 g10/revoke.c:584
+#: g10/pkclist.c:70 g10/revoke.c:585
 msgid "User ID is no longer valid"
 msgstr "ID utilizator nu mai este valid"
 
-#: g10/pkclist.c:73
+#: g10/pkclist.c:74
 msgid "reason for revocation: "
 msgstr "motiv pentru revocare: "
 
-#: g10/pkclist.c:90
+#: g10/pkclist.c:91
 msgid "revocation comment: "
 msgstr "comentariu revocare: "
 
-#: g10/pkclist.c:205
+#: g10/pkclist.c:206
 msgid "iImMqQsS"
 msgstr "iImMtTsS"
 
-#: g10/pkclist.c:213
+#: g10/pkclist.c:214
 msgid "No trust value assigned to:\n"
 msgstr "Nici o valoare de �ncredere atribuit� lui:\n"
 
-#: g10/pkclist.c:245
+#: g10/pkclist.c:246
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "  aka \"%s\"\n"
 
-#: g10/pkclist.c:255
+#: g10/pkclist.c:256
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr ""
 "C�t de mult crede�i c� aceast� cheie apar�ine �ntr-adev�r utilizatorului "
 "numit?\n"
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:271
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr "  %d = Nu �tiu sau nu vreau s� m� pronun�\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr "  %d = NU am �ncredere\n"
 
-#: g10/pkclist.c:278
+#: g10/pkclist.c:279
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr "  %d = Am �ncredere suprem�\n"
 
-#: g10/pkclist.c:284
+#: g10/pkclist.c:285
 msgid "  m = back to the main menu\n"
 msgstr "  m = �napoi la meniul principal\n"
 
-#: g10/pkclist.c:287
+#: g10/pkclist.c:288
 msgid "  s = skip this key\n"
 msgstr "  s = s�ri peste cheia asta\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 msgid "  q = quit\n"
 msgstr "  t = termin�\n"
 
-#: g10/pkclist.c:292
+#: g10/pkclist.c:293
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
@@ -4748,42 +4775,42 @@ msgstr ""
 "Nivelul minim de �ncredere pentru aceast� cheie este: %s\n"
 "\n"
 
-#: g10/pkclist.c:298 g10/revoke.c:609
+#: g10/pkclist.c:299 g10/revoke.c:610
 msgid "Your decision? "
 msgstr "Decizia d-voastr�? "
 
-#: g10/pkclist.c:319
+#: g10/pkclist.c:320
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr ""
 "Dori�i �ntr-adev�r s� seta�i aceast� cheie cu �ncredere suprem�? (d/N) "
 
-#: g10/pkclist.c:333
+#: g10/pkclist.c:334
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificatele ce conduc la o cheie cu �ncredere suprem�:\n"
 
-#: g10/pkclist.c:418
+#: g10/pkclist.c:419
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Nu exist� nici o indica�ie c� aceast� cheie apar�ine �ntr-adev�r "
 "utilizatorului numit\n"
 
-#: g10/pkclist.c:423
+#: g10/pkclist.c:424
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Nu exist� nici o indica�ie c� aceast� cheie apar�ine �ntr-adev�r "
 "utilizatorului numit\n"
 
-#: g10/pkclist.c:429
+#: g10/pkclist.c:430
 msgid "This key probably belongs to the named user\n"
 msgstr "Aceast� cheie apar�ine probabil utilizatorului numit\n"
 
-#: g10/pkclist.c:434
+#: g10/pkclist.c:435
 msgid "This key belongs to us\n"
 msgstr "Aceast� cheie ne apar�ine\n"
 
-#: g10/pkclist.c:460
+#: g10/pkclist.c:461
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -4793,93 +4820,93 @@ msgstr ""
 "utilizator.  Dac� �ti�i *cu adev�rat* ce face�i, pute�i\n"
 "r�spunde cu da la urm�toarea �ntrebare.\n"
 
-#: g10/pkclist.c:467
+#: g10/pkclist.c:468
 msgid "Use this key anyway? (y/N) "
 msgstr "Folosi�i oricum aceast� cheie? (d/N) "
 
-#: g10/pkclist.c:501
+#: g10/pkclist.c:502
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVERTISMENT: Folosi�i o cheie f�r� �ncredere!\n"
 
-#: g10/pkclist.c:508
+#: g10/pkclist.c:509
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "AVERTISMENT: aceast� cheie poate fi revocat� (cheia de revocare nu este "
 "prezent�)\n"
 
-#: g10/pkclist.c:517
+#: g10/pkclist.c:518
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "AVERTISMENT: Aceast� cheie a fost revocat� revocatorul desemnat!\n"
 
-#: g10/pkclist.c:520
+#: g10/pkclist.c:521
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVERTISMENT: Aceast� cheie a fost revocat� de proprietarul ei!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Aceasta ar putea �nsemna c� semn�tura e falsificat�.\n"
 
-#: g10/pkclist.c:527
+#: g10/pkclist.c:528
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVERTISMENT: Aceast� cheie a fost revocat� de proprietarul ei!\n"
 
-#: g10/pkclist.c:532
+#: g10/pkclist.c:533
 msgid "Note: This key has been disabled.\n"
 msgstr "Not�: Aceast� cheie a fost deactivat�.\n"
 
-#: g10/pkclist.c:537
+#: g10/pkclist.c:538
 msgid "Note: This key has expired!\n"
 msgstr "Not�: Aceast� cheie a expirat!\n"
 
-#: g10/pkclist.c:548
+#: g10/pkclist.c:549
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "AVERTISMENT: Aceast� cheie nu este certificat� de o semn�tur� de �ncredere!\n"
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:551
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Nu exist� nici o indica�ie c� semn�tura apar�ine proprietarului.\n"
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:559
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVERTISMENT: Noi NU avem �ncredere �n aceast� cheie!\n"
 
-#: g10/pkclist.c:559
+#: g10/pkclist.c:560
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Semn�tura este probabil un FALS.\n"
 
-#: g10/pkclist.c:567
+#: g10/pkclist.c:568
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVERTISMENT: Aceast� cheie nu este certificat� cu suficiente semn�turi de "
 "�ncredere!\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:570
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Nu este sigur c� semn�tura apar�ine proprietarului.\n"
 
-#: g10/pkclist.c:734 g10/pkclist.c:767 g10/pkclist.c:936 g10/pkclist.c:996
+#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: s�rit�: %s\n"
 
-#: g10/pkclist.c:744 g10/pkclist.c:968
+#: g10/pkclist.c:745 g10/pkclist.c:969
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: s�rit�: cheia public� este deja prezent�\n"
 
-#: g10/pkclist.c:786
+#: g10/pkclist.c:787
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Nu a�i specificat un ID utilizator. (pute�i folosi \"-r\")\n"
 
-#: g10/pkclist.c:802
+#: g10/pkclist.c:803
 msgid "Current recipients:\n"
 msgstr "Destinatari curen�i:\n"
 
-#: g10/pkclist.c:828
+#: g10/pkclist.c:829
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -4887,169 +4914,169 @@ msgstr ""
 "\n"
 "Introduce�i ID-ul utilizator.  Termina�i cu o linie nou�: "
 
-#: g10/pkclist.c:844
+#: g10/pkclist.c:845
 msgid "No such user ID.\n"
 msgstr "Nu exist� acest ID utilizator.\n"
 
-#: g10/pkclist.c:849 g10/pkclist.c:911
+#: g10/pkclist.c:850 g10/pkclist.c:912
 msgid "skipped: public key already set as default recipient\n"
 msgstr "s�rit�: cheia public� setat� deja ca destinatar implicit\n"
 
-#: g10/pkclist.c:867
+#: g10/pkclist.c:868
 msgid "Public key is disabled.\n"
 msgstr "Cheia public� este deactivat�.\n"
 
-#: g10/pkclist.c:874
+#: g10/pkclist.c:875
 msgid "skipped: public key already set\n"
 msgstr "s�rit�: cheia public� setat� deja\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:904
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "destinatar implicit necunoscut \"%s\"\n"
 
-#: g10/pkclist.c:948
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: s�rit�: cheia public� este deactivat�\n"
 
-#: g10/pkclist.c:1003
+#: g10/pkclist.c:1004
 msgid "no valid addressees\n"
 msgstr "nici un destinatar valid\n"
 
-#: g10/plaintext.c:90
+#: g10/plaintext.c:91
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "datele nu au fost salvate: folosi�i op�iunea \"--output\" pentru a le salva\n"
 
-#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
+#: g10/plaintext.c:136 g10/plaintext.c:141 g10/plaintext.c:159
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "eroare la creearea `%s': %s\n"
 
-#: g10/plaintext.c:446
+#: g10/plaintext.c:447
 msgid "Detached signature.\n"
 msgstr "Semn�tur� deta�at�.\n"
 
-#: g10/plaintext.c:450
+#: g10/plaintext.c:452
 msgid "Please enter name of data file: "
 msgstr "V� rug�m introduce�i numele fi�ierului de date: "
 
-#: g10/plaintext.c:478
+#: g10/plaintext.c:481
 msgid "reading stdin ...\n"
 msgstr "citesc stdin ...\n"
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:515
 msgid "no signed data\n"
 msgstr "nici o dat� semnat�\n"
 
-#: g10/plaintext.c:526
+#: g10/plaintext.c:529
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nu pot deschide date semnate `%s'\n"
 
-#: g10/pubkey-enc.c:103
+#: g10/pubkey-enc.c:104
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "destinator anonim; �ncerc cheia secret� %s ...\n"
 
-#: g10/pubkey-enc.c:119
+#: g10/pubkey-enc.c:120
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "OK, noi suntem destinatarul anonim.\n"
 
-#: g10/pubkey-enc.c:207
+#: g10/pubkey-enc.c:208
 msgid "old encoding of the DEK is not supported\n"
 msgstr "vechea encodare a lui DEK nu este suportat�\n"
 
-#: g10/pubkey-enc.c:228
+#: g10/pubkey-enc.c:229
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "algoritm cifrare %d%s este necunoscut sau deactivat\n"
 
-#: g10/pubkey-enc.c:266
+#: g10/pubkey-enc.c:267
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 "AVERTISMENT: algoritm cifrare %s nu a fost g�sit �n preferin�ele "
 "destinatarului\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:287
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOT�: cheia secret� %s a expirat la %s\n"
 
-#: g10/pubkey-enc.c:292
+#: g10/pubkey-enc.c:293
 msgid "NOTE: key has been revoked"
 msgstr "NOT�: cheia a fost revocat�"
 
-#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:545
+#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
+#: g10/revoke.c:188 g10/revoke.c:546
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet a e�uat: %s\n"
 
-#: g10/revoke.c:146
+#: g10/revoke.c:147
 #, c-format
 msgid "key %s has no user IDs\n"
 msgstr "cheia %s nu are nici un ID utilizator\n"
 
-#: g10/revoke.c:272
+#: g10/revoke.c:273
 msgid "To be revoked by:\n"
 msgstr "Pentru a fi revocat de:\n"
 
-#: g10/revoke.c:276
+#: g10/revoke.c:277
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Aceasta este o cheie de revocare senzitiv�)\n"
 
-#: g10/revoke.c:280
+#: g10/revoke.c:281
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Crea�i un certificat de revocare desemnat pentru aceast� cheie? (d/N) "
 
-#: g10/revoke.c:293 g10/revoke.c:511
+#: g10/revoke.c:294 g10/revoke.c:512
 msgid "ASCII armored output forced.\n"
 msgstr "Ie�ire �n armur� ASCII for�at�.\n"
 
-#: g10/revoke.c:307 g10/revoke.c:525
+#: g10/revoke.c:308 g10/revoke.c:526
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet a e�uat: %s\n"
 
-#: g10/revoke.c:370
+#: g10/revoke.c:371
 msgid "Revocation certificate created.\n"
 msgstr "Certificat de revocare creat.\n"
 
-#: g10/revoke.c:376
+#: g10/revoke.c:377
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "nici o cheie de revocare g�sit� pentru \"%s\"\n"
 
-#: g10/revoke.c:432
+#: g10/revoke.c:433
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "cheia secret� \"%s\" nu a fost g�sit�: %s\n"
 
-#: g10/revoke.c:461
+#: g10/revoke.c:462
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "nici o cheie public� corespunz�toare: %s\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:473
 msgid "public key does not match secret key!\n"
 msgstr "cheia public� nu se potrive�te cu cheia secret�!\n"
 
-#: g10/revoke.c:479
+#: g10/revoke.c:480
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Crea�i un certificat de revocare pentru aceast� cheie? (d/N) "
 
-#: g10/revoke.c:496
+#: g10/revoke.c:497
 msgid "unknown protection algorithm\n"
 msgstr "algoritm de protec�ie necunoscut\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOT�: Aceast� cheie nu este protejat�!\n"
 
-#: g10/revoke.c:551
+#: g10/revoke.c:552
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5067,111 +5094,111 @@ msgstr ""
 "caz c� mediumul este deteriorat.  Dar fi�i atent: sistemul de tip�rire al\n"
 "ma�inii d-voastr� ar putea p�stra datele �i s� le fac� accesibile altora!\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid "Please select the reason for the revocation:\n"
 msgstr "V� rug�m selecta�i motivul pentru revocare:\n"
 
-#: g10/revoke.c:602
+#: g10/revoke.c:603
 msgid "Cancel"
 msgstr "Renun��"
 
-#: g10/revoke.c:604
+#: g10/revoke.c:605
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Probabil dori�i s� selecta�i %d aici)\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:646
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Introduce�i o descriere op�ional�; termina�i cu o linie goal�:\n"
 
-#: g10/revoke.c:673
+#: g10/revoke.c:674
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Motiv pentru revocare: %s\n"
 
-#: g10/revoke.c:675
+#: g10/revoke.c:676
 msgid "(No description given)\n"
 msgstr "(Nici o descriere dat�)\n"
 
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 msgid "Is this okay? (y/N) "
 msgstr "Este aceasta OK? (d/N) "
 
-#: g10/seckey-cert.c:54
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "p�r�i ale cheii secrete nu sunt disponibile\n"
 
-#: g10/seckey-cert.c:60
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "algoritm de protec�ie %d%s nu este suportat\n"
 
-#: g10/seckey-cert.c:71
+#: g10/seckey-cert.c:72
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "algoritm rezumat %d nu este suportat\n"
 
-#: g10/seckey-cert.c:265
+#: g10/seckey-cert.c:266
 msgid "Invalid passphrase; please try again"
 msgstr "Fraz�-parol� invalid�; v� rug�m mai �ncerca�i o dat�"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:267
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:326
+#: g10/seckey-cert.c:327
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVERTISMENT: Cheie slab� detectat� - v� rug�m schimba�i din nou fraza-"
 "parol�.\n"
 
-#: g10/seckey-cert.c:364
+#: g10/seckey-cert.c:365
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr "generez �nvechitul checksum de 16-bit pentru protec�ia cheii secrete\n"
 
-#: g10/seskey.c:52
+#: g10/seskey.c:53
 msgid "weak key created - retrying\n"
 msgstr "cheie slab� creat� - re�ncerc\n"
 
-#: g10/seskey.c:57
+#: g10/seskey.c:58
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr "nu pot evita cheie slab� pentru cifru simetric; am �ncercat %d ori!\n"
 
-#: g10/seskey.c:213
+#: g10/seskey.c:214
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA necesit� folosirea unui algoritm cu hash de 160 bi�i\n"
 
-#: g10/sig-check.c:75
+#: g10/sig-check.c:76
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "AVERTISMENT: conflict pentru rezumat semn�tur� �n mesaj\n"
 
-#: g10/sig-check.c:99
+#: g10/sig-check.c:100
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 "AVERTISMENT: subcheia de semnare %s nu este certificat� reciproc (cross-"
 "certified)\n"
 
-#: g10/sig-check.c:102
+#: g10/sig-check.c:103
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "AVERTISMENT: subcheia de semnare %s are o certificare-reciproc� invalid� "
 "(invalid cross-certification)\n"
 
-#: g10/sig-check.c:168
+#: g10/sig-check.c:169
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "cheie public� %s este mai nou� cu %lu secund� dec�t semn�tura\n"
 
-#: g10/sig-check.c:169
+#: g10/sig-check.c:170
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "cheie public� %s este mai nou� cu %lu secunde dec�t semn�tura\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:181
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5179,7 +5206,7 @@ msgstr ""
 "cheia %s a fost creat� %lu secund� �n viitor (warp �n timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:183
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5187,52 +5214,52 @@ msgstr ""
 "cheia %s a fost creat� %lu secunde �n viitor (warp �n timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:193
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOT�: cheia semn�turii %s a expirat %s\n"
 
-#: g10/sig-check.c:275
+#: g10/sig-check.c:276
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "presupun semn�tur� incorect� din cheia %s datorit� unui bit critic "
 "necunoscut\n"
 
-#: g10/sig-check.c:532
+#: g10/sig-check.c:533
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "cheia %s: nici o subcheie pentru semn�tura de revocare a subcheii\n"
 
-#: g10/sig-check.c:558
+#: g10/sig-check.c:559
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "cheia %s: nici o subcheie pentru semn�tura legat� de subcheie\n"
 
-#: g10/sign.c:85
+#: g10/sign.c:86
 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:93
+#: g10/sign.c:94
 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:112
+#: g10/sign.c:113
 #, 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:138
+#: g10/sign.c:139
 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:146
+#: g10/sign.c:147
 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:159
+#: g10/sign.c:160
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5240,7 +5267,7 @@ msgstr ""
 "AVERTISMENT: nu pot %%-expanda URL-ul de politici (prea mare).  �l folosesc "
 "neexpandat.\n"
 
-#: g10/sign.c:187
+#: g10/sign.c:188
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5249,21 +5276,21 @@ msgstr ""
 "AVERTISMENT: nu pot %%-expanda URL-ul serverului de chei (prea mare).  �l "
 "folosesc neexpandat.\n"
 
-#: g10/sign.c:364
+#: g10/sign.c:365
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "verificarea semn�turii create a e�uat: %s\n"
 
-#: g10/sign.c:373
+#: g10/sign.c:374
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s semn�tur� de la: \"%s\"\n"
 
-#: g10/sign.c:741
+#: g10/sign.c:761
 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:808
+#: g10/sign.c:830
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5271,49 +5298,49 @@ msgstr ""
 "AVERTISMENT: for�area algoritmului rezumat %s (%d) violeaz� preferin�ele "
 "destinatarului\n"
 
-#: g10/sign.c:900
+#: g10/sign.c:922
 msgid "signing:"
 msgstr "semnare:"
 
-#: g10/sign.c:1007
+#: g10/sign.c:1034
 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:1180
+#: g10/sign.c:1212
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "va fi folosit� cifrarea %s\n"
 
-#: g10/skclist.c:126 g10/skclist.c:190
+#: g10/skclist.c:127 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "cheia nu este marcat� ca sigur� - nu o pot folosi cu GNA falsificat!\n"
 
-#: g10/skclist.c:157
+#: g10/skclist.c:158
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "s�rit� \"%s\": duplicat�\n"
 
-#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "s�rit� \"%s\": %s\n"
 
-#: g10/skclist.c:170
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "s�rit�: cheia secret� deja prezent�\n"
 
-#: g10/skclist.c:185
+#: g10/skclist.c:186
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "aceasta este o cheie ElGamal generat� de PGP care nu e sigur� pentru "
 "semn�turi!"
 
-#: g10/tdbdump.c:59 g10/trustdb.c:365
+#: g10/tdbdump.c:60 g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "�nregistrare �ncredere %lu, tip %d: scrierea a e�uat: %s\n"
 
-#: g10/tdbdump.c:104
+#: g10/tdbdump.c:105
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5322,344 +5349,344 @@ msgstr ""
 "# List� cu valori de �ncredere atribuite, creat� %s\n"
 "# (Folosi�i \"gpg --import-ownertrust\" pentru a le reface)\n"
 
-#: g10/tdbdump.c:159 g10/tdbdump.c:167 g10/tdbdump.c:172 g10/tdbdump.c:177
+#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
 #, c-format
 msgid "error in `%s': %s\n"
 msgstr "eroare �n `%s': %s\n"
 
-#: g10/tdbdump.c:159
+#: g10/tdbdump.c:160
 msgid "line too long"
 msgstr "linie prea lung�"
 
-#: g10/tdbdump.c:167
+#: g10/tdbdump.c:168
 msgid "colon missing"
 msgstr "caracter : lips�"
 
-#: g10/tdbdump.c:173
+#: g10/tdbdump.c:174
 msgid "invalid fingerprint"
 msgstr "amprent� invalid�"
 
-#: g10/tdbdump.c:178
+#: g10/tdbdump.c:179
 msgid "ownertrust value missing"
 msgstr "lipse�te valorea �ncrederii �n proprietari (ownertrust)"
 
-#: g10/tdbdump.c:214
+#: g10/tdbdump.c:215
 #, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "eroare g�sire �nregistrare �ncredere �n `%s': %s\n"
 
-#: g10/tdbdump.c:218
+#: g10/tdbdump.c:219
 #, c-format
 msgid "read error in `%s': %s\n"
 msgstr "eroare citire �n `%s': %s\n"
 
-#: g10/tdbdump.c:227 g10/trustdb.c:380
+#: g10/tdbdump.c:228 g10/trustdb.c:381
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sincronizarea a e�uat: %s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1440
+#: g10/tdbio.c:129 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek a e�uat: %s\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1447
+#: g10/tdbio.c:135 g10/tdbio.c:1448
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: scrierea a e�uat (n=%d): %s\n"
 
-#: g10/tdbio.c:244
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "tranzac�ia trustdb prea mare\n"
 
-#: g10/tdbio.c:497
+#: g10/tdbio.c:498
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "nu pot accesa `%s': %s\n"
 
-#: g10/tdbio.c:512
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: directorul nu exist�!\n"
 
-#: g10/tdbio.c:522 g10/tdbio.c:545 g10/tdbio.c:588
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "nu pot crea �ncuietoare (lock) pentru `%s'\n"
 
-#: g10/tdbio.c:524 g10/tdbio.c:591
+#: g10/tdbio.c:525 g10/tdbio.c:592
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "nu pot �ncuia (lock) `%s'\n"
 
-#: g10/tdbio.c:550
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: am e�uat s� creez �nregistrare versiune: %s"
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: a fost creat trustdb invalid\n"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: a fost creat trustdb\n"
 
-#: g10/tdbio.c:597
+#: g10/tdbio.c:598
 msgid "NOTE: trustdb not writable\n"
 msgstr "NOT�: nu poate fi scris �n trustdb\n"
 
-#: g10/tdbio.c:614
+#: g10/tdbio.c:615
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: trustdb invalid\n"
 
-#: g10/tdbio.c:646
+#: g10/tdbio.c:647
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: am e�uat s� creez hashtable: %s\n"
 
-#: g10/tdbio.c:654
+#: g10/tdbio.c:655
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: eroare actualizare �nregistrare versiune: %s\n"
 
-#: g10/tdbio.c:671 g10/tdbio.c:691 g10/tdbio.c:707 g10/tdbio.c:721
-#: g10/tdbio.c:751 g10/tdbio.c:1373 g10/tdbio.c:1400
+#: g10/tdbio.c:672 g10/tdbio.c:692 g10/tdbio.c:708 g10/tdbio.c:722
+#: g10/tdbio.c:752 g10/tdbio.c:1374 g10/tdbio.c:1401
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: eroare citire �nregistrare versiune: %s\n"
 
-#: g10/tdbio.c:730
+#: g10/tdbio.c:731
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: eroare scriere �nregistrare versiune: %s\n"
 
-#: g10/tdbio.c:1169
+#: g10/tdbio.c:1170
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek a e�uat: %s\n"
 
-#: g10/tdbio.c:1177
+#: g10/tdbio.c:1178
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: citirea a e�uat (n=%d): %s\n"
 
-#: g10/tdbio.c:1198
+#: g10/tdbio.c:1199
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: nu e un fi�ier trustdb\n"
 
-#: g10/tdbio.c:1216
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: �nregistrare versiune cu recnum %lu\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1222
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versiune fi�ier invalid� %d\n"
 
-#: g10/tdbio.c:1406
+#: g10/tdbio.c:1407
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: eroare citire �nregistrare liber�: %s\n"
 
-#: g10/tdbio.c:1414
+#: g10/tdbio.c:1415
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: eroare scriere �nregistrare dir: %s\n"
 
-#: g10/tdbio.c:1424
+#: g10/tdbio.c:1425
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: eroare setere la zero a �nregistr�rii: %s\n"
 
-#: g10/tdbio.c:1454
+#: g10/tdbio.c:1455
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: ad�ugarea unei �nregistr�ri a e�uat: %s\n"
 
-#: g10/tdbio.c:1499
+#: g10/tdbio.c:1500
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "trustdb este corupt�; rula�i \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:147
+#: g10/textfilter.c:148
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "nu pot m�nui linii de text mai lungi de %d caractere\n"
 
-#: g10/textfilter.c:244
+#: g10/textfilter.c:245
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "linii de intrare mai lungi de %d caractere\n"
 
-#: g10/trustdb.c:226
+#: g10/trustdb.c:227
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' nu este un ID-cheie de lungime valid�\n"
 
-#: g10/trustdb.c:257
+#: g10/trustdb.c:258
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "cheia %s: acceptat� ca cheie de �ncredere\n"
 
-#: g10/trustdb.c:295
+#: g10/trustdb.c:296
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "cheia %s apare de mai multe ori �n trustdb\n"
 
-#: g10/trustdb.c:310
+#: g10/trustdb.c:311
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "cheia %s: nici o cheie public� pentru cheia de �ncredere - s�rit�\n"
 
-#: g10/trustdb.c:320
+#: g10/trustdb.c:321
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "cheia %s marcat� ca av�nd �ncredere suprem�\n"
 
-#: g10/trustdb.c:344
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "�nregistrare �ncredere %lu, tip req %d: citirea a e�uat: %s\n"
 
-#: g10/trustdb.c:350
+#: g10/trustdb.c:351
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "�nregistrare �ncredere %lu nu este de tipul cerut %d\n"
 
-#: g10/trustdb.c:446
+#: g10/trustdb.c:447
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "nu pot folosi model de �ncredere (%d) - presupun model de �ncredere %s\n"
 
-#: g10/trustdb.c:452
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr "folosesc model de �ncredere %s\n"
 
-#: g10/trustdb.c:504
+#: 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:506
+#: g10/trustdb.c:507
 msgid "[ revoked]"
 msgstr "[revocat�]"
 
-#: g10/trustdb.c:508 g10/trustdb.c:513
+#: g10/trustdb.c:509 g10/trustdb.c:514
 msgid "[ expired]"
 msgstr "[expirat�] "
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 msgid "[ unknown]"
 msgstr "[necunoscut�]"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr "[  nedef ]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr "[marginal]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr "[ deplin�]"
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr "[ suprem�]"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr "nedefinit�"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 msgid "never"
 msgstr "niciodat�"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr "marginal"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:536
 msgid "full"
 msgstr "deplin�"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr "suprem�"
 
-#: g10/trustdb.c:576
+#: g10/trustdb.c:577
 msgid "no need for a trustdb check\n"
 msgstr "nu e nevoie de o verificare trustdb\n"
 
-#: g10/trustdb.c:582 g10/trustdb.c:2157
+#: g10/trustdb.c:583 g10/trustdb.c:2309
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "urm�toarea verificare trustdb programat� pe %s\n"
 
-#: g10/trustdb.c:591
+#: 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:606
+#: 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:838 g10/trustdb.c:1276
+#: 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:1033
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr "v� rug�m face�i un --check-trustdb\n"
 
-#: g10/trustdb.c:1037
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "verific trustdb\n"
 
-#: g10/trustdb.c:1901
+#: g10/trustdb.c:2053
 #, 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:1965
+#: g10/trustdb.c:2117
 msgid "no ultimately trusted keys found\n"
 msgstr "nu am g�sit nici o cheie cu �ncredere suprem�\n"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:2131
 #, 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:2002
+#: g10/trustdb.c:2154
 #, 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:2088
+#: g10/trustdb.c:2240
 #, 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:2163
+#: g10/trustdb.c:2315
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 "nu pot actualiza �nregistrare versiunii trustdb: scrierea a e�uat: %s\n"
 
-#: g10/verify.c:116
+#: g10/verify.c:117
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -5669,671 +5696,342 @@ msgstr ""
 "V� rug�m aminti�i-v� c� fi�ierul de semn�tur� (.sig sau .asc)\n"
 "ar trebui s� fie primul dat �n linia de comand�.\n"
 
-#: g10/verify.c:189
+#: g10/verify.c:190
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "linia de intrare %u prea lung� sau lipse�te LF\n"
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "eroare general�"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "tip de pachet necunoscut"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "versiune necunoscut�"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "algoritm pubkey necunoscut"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "algoritm rezumat necunoscut"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "cheie public� incorect�"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "cheie secret� incorect�"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "semn�tur� incorect�"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "eroare checksum"
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "fraz�-parol� incorect�"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "cheia public� nu a fost g�sit�"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "algoritm cifrare necunoscut"
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "nu pot deschide inelul de chei"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "pachet invalid"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "armur� invalid�"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "nu exist� acest id utilizator"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "cheia secret� nu e disponibil�"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "a fost folosit� o cheie secret� gre�it�"
 
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "nu este suportat(�)"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "cheie incorect�"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "eroare citire fi�ier"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "eroare scriere fi�ier"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "algoritm compresie necunoscut"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "eroare deschidere fi�ier"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "eroare creare fi�ier"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "fraz�-parol� invalid�"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "algoritm pubkey neimplementat"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "algoritm cifrare neimplementat"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "clas� semn�turi necunoscut�"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "eroare baz� de date �ncredere"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "MPI incorect"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "limit� resurse"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "inel de chei invalid"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "certificat incorect"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "id utilizator anormal"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "eroare �nchidere fi�ier"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "eroare redenumire fi�ier"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "eroare �tergere fi�ier"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "date nea�teptate"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "conflict timestamp"
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "algoritm pubkey nefolosibil"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "fi�ierul exist�"
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "cheie slab�"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "argument invalid"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "URI incorect"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "URI nesuportat"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "eroare re�ea"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "necifrat"
 
-#: util/errors.c:103
+#: util/errors.c:104
 msgid "not processed"
 msgstr "neprocesat"
 
-#: util/errors.c:105
+#: util/errors.c:106
 msgid "unusable public key"
 msgstr "cheie public� de nefolosit"
 
-#: util/errors.c:106
+#: util/errors.c:107
 msgid "unusable secret key"
 msgstr "cheie secret� de nefolosit"
 
-#: util/errors.c:107
+#: util/errors.c:108
 msgid "keyserver error"
 msgstr "eroare server de chei"
 
-#: util/errors.c:108
+#: util/errors.c:109
 msgid "canceled"
 msgstr "anulat�"
 
-#: util/errors.c:109
+#: util/errors.c:110
 msgid "no card"
 msgstr "nici un card"
 
-#: util/logger.c:157
+#: util/logger.c:158
 msgid "ERROR: "
 msgstr "EROARE: "
 
-#: util/logger.c:160
+#: util/logger.c:161
 msgid "WARNING: "
 msgstr "AVERTISMENT: "
 
-#: util/logger.c:223
+#: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... acesta este un bug (%s:%d:%s)\n"
 
-#: util/logger.c:229
+#: util/logger.c:230
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "a�i g�sit un bug ... (%s:%d)\n"
 
-#: util/miscutil.c:336 util/miscutil.c:373
+#: util/miscutil.c:330 util/miscutil.c:367
 msgid "yes"
 msgstr "da"
 
-#: util/miscutil.c:337 util/miscutil.c:378
+#: util/miscutil.c:331 util/miscutil.c:372
 msgid "yY"
 msgstr "dD"
 
-#: util/miscutil.c:339 util/miscutil.c:375
+#: util/miscutil.c:333 util/miscutil.c:369
 msgid "no"
 msgstr "nu"
 
-#: util/miscutil.c:340 util/miscutil.c:379
+#: util/miscutil.c:334 util/miscutil.c:373
 msgid "nN"
 msgstr "nN"
 
-#: util/miscutil.c:377
+#: util/miscutil.c:371
 msgid "quit"
 msgstr "termin�"
 
-#: util/miscutil.c:380
+#: util/miscutil.c:374
 msgid "qQ"
 msgstr "tT"
 
-#: util/miscutil.c:413
+#: util/miscutil.c:407
 msgid "okay|okay"
 msgstr "OK|OK"
 
-#: util/miscutil.c:415
+#: util/miscutil.c:409
 msgid "cancel|cancel"
 msgstr "renun��|renun��"
 
-#: util/miscutil.c:416
+#: util/miscutil.c:410
 msgid "oO"
 msgstr "oO"
 
-#: util/miscutil.c:417
+#: util/miscutil.c:411
 msgid "cC"
 msgstr "cC"
 
-#: util/secmem.c:90
+#: util/secmem.c:91
 msgid "WARNING: using insecure memory!\n"
 msgstr "AVERTISMENT: este folosit� memorie neprotejat� (insecure)!\n"
 
-#: util/secmem.c:91
+#: util/secmem.c:92
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "vede�i http://www.gnupg.org/faq.html pentru informa�ii suplimentare\n"
 
-#: util/secmem.c:343
+#: util/secmem.c:344
 msgid "operation is not possible without initialized secure memory\n"
 msgstr ""
 "opera�ia nu este posibil� f�r� memorie protejat� (secure) ini�ializat�\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:345
 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 "select secondary key N"
-#~ msgstr "selecteaz� cheie secundar� N"
-
-#~ msgid "list signatures"
-#~ msgstr "enumer� semn�turi"
-
-#~ msgid "sign the key"
-#~ msgstr "semneaz� cheia"
-
-#~ msgid "add a secondary key"
-#~ msgstr "adaug� o cheie secundar�"
-
-#~ msgid "delete signatures"
-#~ msgstr "�terge semn�turi"
-
-#~ msgid "change the expire date"
-#~ msgstr "schimb� data de expirare"
-
-#~ msgid "set preference list"
-#~ msgstr "seteaz� lista de preferin�e"
-
-#~ msgid "updated preferences"
-#~ msgstr "preferin�e actualizate"
-
-#~ msgid "No secondary key with index %d\n"
-#~ msgstr "Nici o cheie secundar� cu indicele %d\n"
-
-#~ msgid "--nrsign-key user-id"
-#~ msgstr "--nrsign-key id-utilizator"
-
-#~ msgid "--nrlsign-key user-id"
-#~ msgstr "--nrlsign-key id-utilizator"
-
-#~ msgid "make a trust signature"
-#~ msgstr "creaz� o semn�tur� de �ncredere"
-
-#~ msgid "sign the key non-revocably"
-#~ msgstr "semneaz� cheia irevocabil"
-
-#~ msgid "sign the key locally and non-revocably"
-#~ msgstr "semneaz� cheia local �i irevocabil"
-
-#~ msgid "q"
-#~ msgstr "t"
-
-#~ msgid "help"
-#~ msgstr "ajutor"
-
-#~ msgid "list"
-#~ msgstr "enumer�"
+#~ msgid "error getting serial number: %s\n"
+#~ msgstr "eroare la ob�inerea num�rului serial: %s\n"
 
-#~ msgid "l"
-#~ msgstr "l"
+#~ msgid "Hint: Select the user IDs to sign\n"
+#~ msgstr "Sugestie: Selecta�i ID-ul utilizator de semnat\n"
 
-#~ msgid "debug"
-#~ msgstr "depanare"
+#~ msgid "length of RSA modulus is not %d\n"
+#~ msgstr "lungimea modulului RSA nu este %d\n"
 
-#~ msgid "name"
-#~ msgstr "nume"
+#~ msgid "length of an RSA prime is not %d\n"
+#~ msgstr "lungimea unui prim RSA nu este %d\n"
 
-#~ msgid "login"
-#~ msgstr "login"
+#~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+#~ msgstr "fraz�=parol� gre�it� sau algoritm cifrare necunoscut (%d)\n"
 
-#~ msgid "cafpr"
-#~ msgstr "cafpr"
+#~ msgid "can't set client pid for the agent\n"
+#~ msgstr "nu pot seta pid-ul client pentru agent\n"
 
-#~ msgid "forcesig"
-#~ msgstr "forcesig"
+#~ msgid "can't get server read FD for the agent\n"
+#~ msgstr "nu pot convinge serverul s� citeasc� FD pentru agent\n"
 
-#~ msgid "generate"
-#~ msgstr "genereaz�"
+#~ msgid "can't get server write FD for the agent\n"
+#~ msgstr "nu pot convinge serverul s� scrie FD pentru agent\n"
 
-#~ msgid "passwd"
-#~ msgstr "parola"
+#~ msgid "communication problem with gpg-agent\n"
+#~ msgstr "probleme de comunicare cu gpg-agent\n"
 
-#~ msgid "save"
-#~ msgstr "salveaz�"
+#~ msgid "passphrase too long\n"
+#~ msgstr "fraz�-parol� prea lung�\n"
 
-#~ msgid "fpr"
-#~ msgstr "ampr"
+#~ msgid "invalid response from agent\n"
+#~ msgstr "r�spuns invalid de la agent\n"
 
-#~ msgid "uid"
-#~ msgstr "uid"
-
-#~ msgid "key"
-#~ msgstr "cheie"
-
-#~ msgid "check"
-#~ msgstr "verific�"
-
-#~ msgid "c"
-#~ msgstr "c"
-
-#~ msgid "sign"
-#~ msgstr "semneaz�"
-
-#~ msgid "s"
-#~ msgstr "s"
-
-#~ msgid "tsign"
-#~ msgstr "tsign"
-
-#~ msgid "lsign"
-#~ msgstr "lsign"
-
-#~ msgid "nrsign"
-#~ msgstr "nrsign"
-
-#~ msgid "nrlsign"
-#~ msgstr "nrlsign"
-
-#~ msgid "adduid"
-#~ msgstr "adduid"
-
-#~ msgid "addphoto"
-#~ msgstr "addphoto"
-
-#~ msgid "deluid"
-#~ msgstr "deluid"
-
-#~ msgid "delphoto"
-#~ msgstr "delphoto"
-
-#~ msgid "addcardkey"
-#~ msgstr "addcardkey"
-
-#~ msgid "delkey"
-#~ msgstr "stecheie"
-
-#~ msgid "addrevoker"
-#~ msgstr "adarev"
-
-#~ msgid "delsig"
-#~ msgstr "stesem"
-
-#~ msgid "expire"
-#~ msgstr "expira"
-
-#~ msgid "primary"
-#~ msgstr "primar"
-
-#~ msgid "toggle"
-#~ msgstr "comuta"
-
-#~ msgid "t"
-#~ msgstr "t"
-
-#~ msgid "pref"
-#~ msgstr "pref"
-
-#~ msgid "showpref"
-#~ msgstr "showpref"
-
-#~ msgid "setpref"
-#~ msgstr "setpref"
-
-#~ msgid "updpref"
-#~ msgstr "updpref"
-
-#~ msgid "keyserver"
-#~ msgstr "server de chei"
-
-#~ msgid "trust"
-#~ msgstr "�ncredere"
-
-#~ msgid "revsig"
-#~ msgstr "revsem"
-
-#~ msgid "revuid"
-#~ msgstr "revuid"
-
-#~ msgid "revkey"
-#~ msgstr "revkey"
-
-#~ msgid "disable"
-#~ msgstr "deactiveaz�"
-
-#~ msgid "enable"
-#~ msgstr "activeaz�"
-
-#~ msgid "showphoto"
-#~ msgstr "showphoto"
+#~ msgid "problem with the agent: agent returns 0x%lx\n"
+#~ msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
 
 #~ msgid "digest algorithm `%s' is read-only in this release\n"
 #~ msgstr "algoritm rezumat `%s' este numai-citire �n acest� edi�ie\n"
 
 #~ msgid ""
-#~ "About to generate a new %s keypair.\n"
-#~ "              minimum keysize is  768 bits\n"
-#~ "              default keysize is 1024 bits\n"
-#~ "    highest suggested keysize is 2048 bits\n"
-#~ msgstr ""
-#~ "Pe cale s� genera�i o nou� pereche de chei %s.\n"
-#~ "              lungimea minim� este  768 bits\n"
-#~ "           lungimea implicit� este 1024 bits\n"
-#~ " cea mai lung� cheie sugerat� este 2048 bits\n"
-
-#~ msgid "DSA only allows keysizes from 512 to 1024\n"
-#~ msgstr "DSA permite numai chei de la 512 la 1024\n"
-
-#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-#~ msgstr ""
-#~ "lungime cheie prea mic�; 1024 este cea mai mic� valoare permis� pentru "
-#~ "RSA.\n"
-
-#~ msgid "keysize too small; 768 is smallest value allowed.\n"
-#~ msgstr "lungime cheie prea mic�; 768 este cea mai mic� valoare permis�.\n"
-
-#~ msgid "keysize too large; %d is largest value allowed.\n"
-#~ msgstr "lungime cheie prea mare; %d este cea mai mare valoare permis�.\n"
-
-#~ msgid ""
-#~ "Keysizes larger than 2048 are not suggested because\n"
-#~ "computations take REALLY long!\n"
-#~ msgstr ""
-#~ "Lungimi pentru chei mai mari de 2048 nu sunt sugerate\n"
-#~ "deoarece calculele iau FOARTE MULT timp!\n"
-
-#~ msgid "Are you sure that you want this keysize? (y/N) "
-#~ msgstr "Sunte�i sigur(�) c� dori�i aceast� lungime de cheie? (d/N) "
-
-#~ msgid ""
-#~ "Okay, but keep in mind that your monitor and keyboard radiation is also "
-#~ "very vulnerable to attacks!\n"
-#~ msgstr ""
-#~ "Bine, dar �ine�i minte c� radia�ia monitorului �i tastaturii d-voastr� "
-#~ "este de asemenea vulnerabil� la atacuri!\n"
-
-#~ msgid "Experimental algorithms should not be used!\n"
-#~ msgstr "Algoritme experimentale nu ar trebui folosite!\n"
-
-#~ msgid ""
-#~ "this cipher algorithm is deprecated; please use a more standard one!\n"
-#~ msgstr ""
-#~ "acest algoritm de cifrare este �nvechit; v� rug�m folosi�i unul "
-#~ "standard!\n"
-
-#~ msgid "writing to file `%s'\n"
-#~ msgstr "scriu �n fi�ierul `%s'\n"
-
-#~ msgid "sorry, can't do this in batch mode\n"
-#~ msgstr "�mi pare r�u, nu pot face acest lucru �n modul batch\n"
-
-#~ msgid "key `%s' not found: %s\n"
-#~ msgstr "cheia `%s' nu a fost g�sit�: %s\n"
-
-#~ msgid "can't create file `%s': %s\n"
-#~ msgstr "nu pot crea fi�ierul `%s': %s\n"
-
-#~ msgid "can't open file `%s': %s\n"
-#~ msgstr "nu pot deschide fi�ierul: %s\n"
-
-#~ msgid "          \""
-#~ msgstr "          \""
-
-#~ msgid " i = please show me more information\n"
-#~ msgstr " i = arat�-mi mai multe informa�ii\n"
-
-#~ msgid "key %08lX: key has been revoked!\n"
-#~ msgstr "cheia %08lX: cheia a fost revocat�!\n"
-
-#~ msgid "key %08lX: subkey has been revoked!\n"
-#~ msgstr "cheie %08lX: subcheia a fost revocat�!\n"
-
-#~ msgid "%08lX: key has expired\n"
-#~ msgstr "%08lX: cheia a expirat\n"
-
-#~ msgid "%08lX: We do NOT trust this key\n"
-#~ msgstr "%08lX: Noi NU avem �ncredere �n acest� cheie\n"
-
-#~ msgid "   (%d) RSA (sign and encrypt)\n"
-#~ msgstr "   (%d) RSA (semnare �i cifrare)\n"
-
-#~ msgid "   (%d) RSA (auth only)\n"
-#~ msgstr "   (%d) RSA (numai autentificare)\n"
-
-#~ msgid "   (%d) RSA (sign and auth)\n"
-#~ msgstr "   (%d) RSA (semnare �i autentificare)\n"
-
-#~ msgid "   (%d) RSA (encrypt and auth)\n"
-#~ msgstr "   (%d) RSA (cifrare �i autentificare)\n"
-
-#~ msgid "  (%d) RSA (sign, encrypt and auth)\n"
-#~ msgstr "   (%d) RSA (semnare, cifrare �i autentificare)\n"
-
-#~ msgid "%s: can't open: %s\n"
-#~ msgstr "%s: nu pot deschide: %s\n"
-
-#~ msgid "%s: WARNING: empty file\n"
-#~ msgstr "%s: AVERTISMENT: fi�ier gol\n"
-
-#~ msgid "can't open %s: %s\n"
-#~ msgstr "nu pot deschide %s: %s\n"
-
-#~ msgid "   (%d) I trust marginally\n"
-#~ msgstr "   (%d) Am o �ncredere marginal�\n"
-
-#~ msgid "   (%d) I trust fully\n"
-#~ msgstr "   (%d) Am toat� �ncrederea\n"
-
-#~ msgid "expires"
-#~ msgstr "expira"
-
-#~ msgid ""
-#~ "\"\n"
-#~ "locally signed with your key %s at %s\n"
-#~ msgstr ""
-#~ "\"\n"
-#~ "semnat� local cu cheie d-voastr� %s la %s\n"
-
-#~ msgid "   signed by %s on %s%s\n"
-#~ msgstr "   semnat� de %s la %s%s\n"
-
-#~ msgid "%s: can't access: %s\n"
-#~ msgstr "%s: nu pot accesa: %s\n"
-
-#~ msgid "%s: can't create lock\n"
-#~ msgstr "%s: nu pot crea �ncuietoare(lock)\n"
-
-#~ msgid "%s: can't make lock\n"
-#~ msgstr "%s: nu pot crea �ncuietoare(lock)\n"
-
-#~ msgid "%s: can't create: %s\n"
-#~ msgstr "%s: nu pot crea: %s\n"
-
-#~ msgid "%s: can't create directory: %s\n"
-#~ msgstr "%s: nu pot crea director: %s\n"
-
-#~ msgid "If you want to use this revoked key anyway, answer \"yes\"."
-#~ msgstr ""
-#~ "Dac� dori�i oricum s� folosi�i aceast� cheie revocat�, r�spunde�i \"da\"."
-
-#~ msgid "Unable to open photo \"%s\": %s\n"
-#~ msgstr "Nu pot deschide poza \"%s\": %s\n"
-
-#~ msgid "can't open file: %s\n"
-#~ msgstr "nu pot deschide fi�ierul: %s\n"
-
-#~ msgid "error: missing colon\n"
-#~ msgstr "eroare: `:' lips�\n"
-
-#~ msgid "error: no ownertrust value\n"
-#~ msgstr "eroare: nici o valoare �ncredere pentru proprietar\n"
-
-#~ msgid " (main key ID %08lX)"
-#~ msgstr " (ID cheie principal� %08lX)"
-
-#~ msgid "rev! subkey has been revoked: %s\n"
-#~ msgstr "rev! subcheia a fost revocat�: %s\n"
-
-#~ msgid "rev- faked revocation found\n"
-#~ msgstr "rev- a fost g�sit� o revocare falsificat�\n"
-
-#~ msgid "rev? problem checking revocation: %s\n"
-#~ msgstr "rev? probleme la verificare revoc�rii: %s\n"
-
-#~ msgid " [expired: %s]"
-#~ msgstr " [expirat�: %s]"
-
-#~ msgid " [expires: %s]"
-#~ msgstr " [expir�: %s]"
-
-#~ msgid " [revoked: %s]"
-#~ msgstr "[revocat�: %s] "
-
-#~ msgid "can't create %s: %s\n"
-#~ msgstr "nu pot crea %s: %s\n"
-
-#~ msgid ""
 #~ "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
 #~ msgstr ""
 #~ "AVERTISMENT: rezumatul `%s' nu este parte din OpenPGP.  Folosi�i-l pe "
@@ -6490,6 +6188,30 @@ msgstr "(a�i folosit probabil un program nepotrivit pentru aceast� sarcin�)\n"
 #~ msgid "compress algorithm must be in range %d..%d\n"
 #~ msgstr "algoritm compresie trebuie s� fie �n intervalul %d..%d\n"
 
+#~ msgid "--nrsign-key user-id"
+#~ msgstr "--nrsign-key id-utilizator"
+
+#~ msgid "--nrlsign-key user-id"
+#~ msgstr "--nrlsign-key id-utilizator"
+
+#~ msgid "can't open %s: %s\n"
+#~ msgstr "nu pot deschide %s: %s\n"
+
+#~ msgid " i = please show me more information\n"
+#~ msgstr " i = arat�-mi mai multe informa�ii\n"
+
+#~ msgid "key %08lX: key has been revoked!\n"
+#~ msgstr "cheia %08lX: cheia a fost revocat�!\n"
+
+#~ msgid "key %08lX: subkey has been revoked!\n"
+#~ msgstr "cheie %08lX: subcheia a fost revocat�!\n"
+
+#~ msgid "%08lX: key has expired\n"
+#~ msgstr "%08lX: cheia a expirat\n"
+
+#~ msgid "%08lX: We do NOT trust this key\n"
+#~ msgstr "%08lX: Noi NU avem �ncredere �n acest� cheie\n"
+
 #~ msgid ""
 #~ "%08lX: It is not sure that this key really belongs to the owner\n"
 #~ "but it is accepted anyway\n"
@@ -6500,6 +6222,57 @@ msgstr "(a�i folosit probabil un program nepotrivit pentru aceast� sarcin�)\n"
 #~ msgid "preference %c%lu is not valid\n"
 #~ msgstr "preferin�a %c%lu nu este valid�\n"
 
+#~ msgid "   (%d) RSA (sign and encrypt)\n"
+#~ msgstr "   (%d) RSA (semnare �i cifrare)\n"
+
+#~ msgid ""
+#~ "About to generate a new %s keypair.\n"
+#~ "              minimum keysize is  768 bits\n"
+#~ "              default keysize is 1024 bits\n"
+#~ "    highest suggested keysize is 2048 bits\n"
+#~ msgstr ""
+#~ "Pe cale s� genera�i o nou� pereche de chei %s.\n"
+#~ "              lungimea minim� este  768 bits\n"
+#~ "           lungimea implicit� este 1024 bits\n"
+#~ " cea mai lung� cheie sugerat� este 2048 bits\n"
+
+#~ msgid "DSA only allows keysizes from 512 to 1024\n"
+#~ msgstr "DSA permite numai chei de la 512 la 1024\n"
+
+#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+#~ msgstr ""
+#~ "lungime cheie prea mic�; 1024 este cea mai mic� valoare permis� pentru "
+#~ "RSA.\n"
+
+#~ msgid "keysize too small; 768 is smallest value allowed.\n"
+#~ msgstr "lungime cheie prea mic�; 768 este cea mai mic� valoare permis�.\n"
+
+#~ msgid "keysize too large; %d is largest value allowed.\n"
+#~ msgstr "lungime cheie prea mare; %d este cea mai mare valoare permis�.\n"
+
+#~ msgid ""
+#~ "Keysizes larger than 2048 are not suggested because\n"
+#~ "computations take REALLY long!\n"
+#~ msgstr ""
+#~ "Lungimi pentru chei mai mari de 2048 nu sunt sugerate\n"
+#~ "deoarece calculele iau FOARTE MULT timp!\n"
+
+#~ msgid "Are you sure that you want this keysize? "
+#~ msgstr "Sunte�i sigur(�) c� dori�i aceast� lungime de cheie? "
+
+#~ msgid ""
+#~ "Okay, but keep in mind that your monitor and keyboard radiation is also "
+#~ "very vulnerable to attacks!\n"
+#~ msgstr ""
+#~ "Bine, dar �ine�i minte c� radia�ia monitorului �i tastaturii d-voastr� "
+#~ "este de asemenea vulnerabil� la atacuri!\n"
+
+#~ msgid "%s: can't open: %s\n"
+#~ msgstr "%s: nu pot deschide: %s\n"
+
+#~ msgid "%s: WARNING: empty file\n"
+#~ msgstr "%s: AVERTISMENT: fi�ier gol\n"
+
 #~ msgid "key %08lX: not a rfc2440 key - skipped\n"
 #~ msgstr "cheia %08lX: nu e o cheie rfc2440 - s�rit�\n"
 
@@ -6512,15 +6285,175 @@ msgstr "(a�i folosit probabil un program nepotrivit pentru aceast� sarcin�)\n"
 #~ msgid " (default)"
 #~ msgstr "(implicit)"
 
+#~ msgid "q"
+#~ msgstr "t"
+
+#~ msgid "save"
+#~ msgstr "salveaz�"
+
+#~ msgid "help"
+#~ msgstr "ajutor"
+
+#~ msgid "fpr"
+#~ msgstr "ampr"
+
+#~ msgid "list"
+#~ msgstr "enumer�"
+
+#~ msgid "l"
+#~ msgstr "l"
+
+#~ msgid "uid"
+#~ msgstr "uid"
+
+#~ msgid "key"
+#~ msgstr "cheie"
+
+#~ msgid "select secondary key N"
+#~ msgstr "selecteaz� cheie secundar� N"
+
+#~ msgid "check"
+#~ msgstr "verific�"
+
+#~ msgid "list signatures"
+#~ msgstr "enumer� semn�turi"
+
+#~ msgid "sign the key"
+#~ msgstr "semneaz� cheia"
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#~ msgid "lsign"
+#~ msgstr "lsign"
+
+#~ msgid "nrsign"
+#~ msgstr "nrsign"
+
+#~ msgid "sign the key non-revocably"
+#~ msgstr "semneaz� cheia irevocabil"
+
+#~ msgid "nrlsign"
+#~ msgstr "nrlsign"
+
+#~ msgid "sign the key locally and non-revocably"
+#~ msgstr "semneaz� cheia local �i irevocabil"
+
+#~ msgid "debug"
+#~ msgstr "depanare"
+
+#~ msgid "adduid"
+#~ msgstr "adduid"
+
+#~ msgid "addphoto"
+#~ msgstr "addphoto"
+
+#~ msgid "deluid"
+#~ msgstr "deluid"
+
+#~ msgid "delphoto"
+#~ msgstr "delphoto"
+
+#~ msgid "add a secondary key"
+#~ msgstr "adaug� o cheie secundar�"
+
+#~ msgid "delkey"
+#~ msgstr "stecheie"
+
+#~ msgid "addrevoker"
+#~ msgstr "adarev"
+
+#~ msgid "delsig"
+#~ msgstr "stesem"
+
+#~ msgid "delete signatures"
+#~ msgstr "�terge semn�turi"
+
+#~ msgid "primary"
+#~ msgstr "primar"
+
+#~ msgid "toggle"
+#~ msgstr "comuta"
+
+#~ msgid "t"
+#~ msgstr "t"
+
+#~ msgid "pref"
+#~ msgstr "pref"
+
+#~ msgid "showpref"
+#~ msgstr "showpref"
+
+#~ msgid "setpref"
+#~ msgstr "setpref"
+
+#~ msgid "updpref"
+#~ msgstr "updpref"
+
+#~ msgid "passwd"
+#~ msgstr "parola"
+
+#~ msgid "trust"
+#~ msgstr "�ncredere"
+
+#~ msgid "revsig"
+#~ msgstr "revsem"
+
+#~ msgid "revoke signatures"
+#~ msgstr "revoc� semn�turi"
+
+#~ msgid "revuid"
+#~ msgstr "revuid"
+
+#~ msgid "revoke a user ID"
+#~ msgstr "revoc� un ID utilizator"
+
+#~ msgid "revkey"
+#~ msgstr "revkey"
+
+#~ msgid "showphoto"
+#~ msgstr "showphoto"
+
 #~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 #~ msgstr "%s%c %4u%c/%08lX  creat�: %s expir�: %s"
 
+#~ msgid "rev! subkey has been revoked: %s\n"
+#~ msgstr "rev! subcheia a fost revocat�: %s\n"
+
+#~ msgid "rev- faked revocation found\n"
+#~ msgstr "rev- a fost g�sit� o revocare falsificat�\n"
+
+#~ msgid "rev? problem checking revocation: %s\n"
+#~ msgstr "rev? probleme la verificare revoc�rii: %s\n"
+
+#~ msgid ""
+#~ "\"\n"
+#~ "locally signed with your key %08lX at %s\n"
+#~ msgstr ""
+#~ "\"\n"
+#~ "semnat� local cu cheie d-voastr� %08lX pe %s\n"
+
+#~ msgid "   signed by %08lX at %s%s%s\n"
+#~ msgstr "   semnat� de %08lX pe %s%s%s\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: "
 
+#~ msgid "Experimental algorithms should not be used!\n"
+#~ msgstr "Algoritme experimentale nu ar trebui folosite!\n"
+
+#~ msgid ""
+#~ "this cipher algorithm is deprecated; please use a more standard one!\n"
+#~ msgstr ""
+#~ "acest algoritm de cifrare este �nvechit; v� rug�m folosi�i unul "
+#~ "standard!\n"
+
 #~ msgid "can't get key from keyserver: %s\n"
 #~ msgstr "nu pot ob�ine cheia de la serverul de chei: %s\n"
 
@@ -6560,6 +6493,18 @@ msgstr "(a�i folosit probabil un program nepotrivit pentru aceast� sarcin�)\n"
 #~ "cheia %08lX a fost creat� %lu secunde �n viitor (warp �n timp sau "
 #~ "probleme cu ceasul)\n"
 
+#~ msgid "%s: can't access: %s\n"
+#~ msgstr "%s: nu pot accesa: %s\n"
+
+#~ msgid "%s: can't create lock\n"
+#~ msgstr "%s: nu pot crea �ncuietoare(lock)\n"
+
+#~ msgid "%s: can't make lock\n"
+#~ msgstr "%s: nu pot crea �ncuietoare(lock)\n"
+
+#~ msgid "%s: can't create: %s\n"
+#~ msgstr "%s: nu pot crea: %s\n"
+
 #~ msgid "key %08lX marked as ultimately trusted\n"
 #~ msgstr "cheia %08lX marcat� ca av�nd �ncredere suprem�\n"
 
@@ -6573,6 +6518,13 @@ msgstr "(a�i folosit probabil un program nepotrivit pentru aceast� sarcin�)\n"
 #~ msgstr ""
 #~ "verificare la nivel %d semnat=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 
+#~ msgid "%s: can't create directory: %s\n"
+#~ msgstr "%s: nu pot crea director: %s\n"
+
+#~ msgid "If you want to use this revoked key anyway, answer \"yes\"."
+#~ msgstr ""
+#~ "Dac� dori�i oricum s� folosi�i aceast� cheie revocat�, r�spunde�i \"da\"."
+
 #~ msgid ""
 #~ "Select the algorithm to use.\n"
 #~ "\n"
@@ -6638,3 +6590,39 @@ msgstr "(a�i folosit probabil un program nepotrivit pentru aceast� sarcin�)\n"
 
 #~ msgid "key %08lX incomplete\n"
 #~ msgstr "cheie %08lX incomplet�\n"
+
+#~ msgid "sorry, can't do this in batch mode\n"
+#~ msgstr "�mi pare r�u, nu pot face acest lucru �n modul batch\n"
+
+#~ msgid "can't open file: %s\n"
+#~ msgstr "nu pot deschide fi�ierul: %s\n"
+
+#~ msgid "error: missing colon\n"
+#~ msgstr "eroare: `:' lips�\n"
+
+#~ msgid "error: no ownertrust value\n"
+#~ msgstr "eroare: nici o valoare �ncredere pentru proprietar\n"
+
+#~ msgid "   (%d) ElGamal (sign and encrypt)\n"
+#~ msgstr "   (%d) ElGamal (semnare �i cifrare)\n"
+
+#~ msgid ""
+#~ "The use of this algorithm is only supported by GnuPG.  You will not be\n"
+#~ "able to use this key to communicate with PGP users.  This algorithm is "
+#~ "also\n"
+#~ "very slow, and may not be as secure as the other choices.\n"
+#~ msgstr ""
+#~ "Folosirea acestui algoritm este suportat� numai de GnuPG.  Nu ve�i putea\n"
+#~ "folosi aceast� cheie pentru a comunica cu al�i utilizatori PGP.  Mai "
+#~ "mult,\n"
+#~ "acest algoritm este foarte lent �i ar putea fi mai pu�in sigur dec�t\n"
+#~ "celelalte op�iuni.\n"
+
+#~ msgid "Create anyway? "
+#~ msgstr "Crea�i oricum? "
+
+#~ msgid "invalid symkey algorithm detected (%d)\n"
+#~ msgstr "am detectat algoritm symkey invalid (%d)\n"
+
+#~ msgid "this keyserver is not fully HKP compatible\n"
+#~ msgstr "acest server de chei nu este �n totalitate compatibil cu HKP\n"
diff --git a/po/ru.po b/po/ru.po
index c52f98b42..cebdaf7a3 100644
--- a/po/ru.po
+++ b/po/ru.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: 2005-03-15 16:35+0100\n"
+"POT-Creation-Date: 2005-05-31 10:05+0200\n"
 "PO-Revision-Date: 2005-02-01 09:35+0300\n"
 "Last-Translator: Maxim Britov <[email protected]>\n"
 "Language-Team: Russian <[email protected]>\n"
@@ -15,80 +15,80 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:120
+#: cipher/primegen.c:121
 #, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr "не могу сгенерировать простое число с pbits=%u qbits=%u\n"
 
-#: cipher/primegen.c:311
+#: cipher/primegen.c:312
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "не могу сгенерировать простое число меньше чем с %d битами\n"
 
-#: cipher/random.c:163
+#: cipher/random.c:164
 msgid "no entropy gathering module detected\n"
 msgstr "не найден модуль накопления энтропии\n"
 
-#: cipher/random.c:387 g10/card-util.c:656 g10/card-util.c:725
-#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2255
-#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
-#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
-#: g10/tdbio.c:600
+#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
+#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
+#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
+#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
+#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/tdbio.c:601
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "не могу открыть `%s': %s\n"
 
-#: cipher/random.c:391
+#: cipher/random.c:392
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "не могу выполнить stat `%s': %s\n"
 
-#: cipher/random.c:396
+#: cipher/random.c:397
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' не регулярный файл - проигнорирован\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:402
 msgid "note: random_seed file is empty\n"
 msgstr "замечание: файл random_seed пуст\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:408
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "ВНИМАНИЕ: недопустимый размер файла random_seed - не использую\n"
 
-#: cipher/random.c:415
+#: cipher/random.c:416
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "не могу прочитать `%s': %s\n"
 
-#: cipher/random.c:453
+#: cipher/random.c:454
 msgid "note: random_seed file not updated\n"
 msgstr "замечание: файл random_seed не обновлен\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2723
-#: g10/keygen.c:2753 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
-#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "не могу создать `%s': %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:481
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "не могу записать `%s': %s\n"
 
-#: cipher/random.c:483
+#: cipher/random.c:484
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "не могу закрыть `%s': %s\n"
 
-#: cipher/random.c:728
+#: cipher/random.c:729
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "ВНИМАНИЕ: используется небезопасный генератор случайных чисел!!\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:730
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -103,7 +103,7 @@ msgstr ""
 "НЕ ПОЛЬЗУЙТЕСЬ ДАННЫМИ СОЗДАННЫМИ ЭТОЙ ВЕРСИЕЙ ПРОГРАММЫ!!\n"
 "\n"
 
-#: cipher/rndegd.c:204
+#: cipher/rndegd.c:205
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -113,7 +113,7 @@ msgstr ""
 "Вы можете выполнять в это время какую-нибудь работу, это спасет от скуки\n"
 "и увеличит качество и скорость сбора случайных данных.\n"
 
-#: cipher/rndlinux.c:134
+#: cipher/rndlinux.c:135
 #, c-format
 msgid ""
 "\n"
@@ -124,45 +124,62 @@ msgstr ""
 "Недостаточно случайных чисел.  Выполняйте какие-либо действия для того,\n"
 "чтобы ОС могла получить больше случайных данных! (Необходимо ещё %d байт)\n"
 
-#: g10/app-openpgp.c:547
+#: g10/app-openpgp.c:596
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "сбой сохранения отпечатка: %s\n"
 
-#: g10/app-openpgp.c:560
+#: g10/app-openpgp.c:609
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "сбой сохранения даты создания: %s\n"
 
-#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
+#: g10/app-openpgp.c:977
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "сбой при чтении ключа\n"
+
+#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+msgid "response does not contain the public key data\n"
+msgstr "ответ не содержит данных открытого ключа\n"
+
+#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+msgid "response does not contain the RSA modulus\n"
+msgstr "в ответе отсутствует модуль RSA\n"
+
+#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+msgid "response does not contain the RSA public exponent\n"
+msgstr "в ответе отсутствует открытая экспонента RSA\n"
+
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
-#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
+#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
+#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "при проверке CHV%d сбой: %s\n"
 
-#: g10/app-openpgp.c:836
+#: g10/app-openpgp.c:1310
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:857
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:862
+#: g10/app-openpgp.c:1336
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -170,333 +187,339 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:869
+#: g10/app-openpgp.c:1343
 msgid "|A|Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1018
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:1492
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1018
+#: g10/app-openpgp.c:1492
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1022
+#: g10/app-openpgp.c:1496
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
+#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
 msgid "error reading application data\n"
 msgstr "ошибка чтения данных приложения\n"
 
-#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
+#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
 msgid "error reading fingerprint DO\n"
 msgstr "ошибка чтения отпечатка DO\n"
 
-#: g10/app-openpgp.c:1104
+#: g10/app-openpgp.c:1562
 msgid "key already exists\n"
 msgstr "ключ уже существует\n"
 
-#: g10/app-openpgp.c:1108
+#: g10/app-openpgp.c:1566
 msgid "existing key will be replaced\n"
 msgstr "существующий ключ будет заменен\n"
 
-#: g10/app-openpgp.c:1110
+#: g10/app-openpgp.c:1568
 msgid "generating new key\n"
 msgstr "генерация нового ключа\n"
 
-#: g10/app-openpgp.c:1120
+#: g10/app-openpgp.c:1735
+msgid "creation timestamp missing\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1742
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1749
+#, fuzzy, c-format
+msgid "RSA public exponent missing or largerr than %d bits\n"
+msgstr "открытая экспонента слишком велика (более 32 бит)\n"
+
+#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1827
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "сбой сохранения ключа: %s\n"
+
+#: g10/app-openpgp.c:1886
 msgid "please wait while key is being generated ...\n"
 msgstr "пожалуйста, подождите, пока будет генерироваться ключ ...\n"
 
-#: g10/app-openpgp.c:1135
+#: g10/app-openpgp.c:1901
 msgid "generating key failed\n"
 msgstr "сбой при генерации ключа\n"
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1904
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "ключ сгенерирован (%d секунд)\n"
 
-#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
-msgid "response does not contain the public key data\n"
-msgstr "ответ не содержит данных открытого ключа\n"
-
-#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
-msgid "response does not contain the RSA modulus\n"
-msgstr "в ответе отсутствует модуль RSA\n"
-
-#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
-msgid "response does not contain the RSA public exponent\n"
-msgstr "в ответе отсутствует открытая экспонента RSA\n"
-
-#: g10/app-openpgp.c:1195
+#: g10/app-openpgp.c:1961
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1356
+#: g10/app-openpgp.c:2130
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1364
+#: g10/app-openpgp.c:2138
 #, c-format
-msgid "PIN [sigs done: %lu]"
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
-#, c-format
-msgid "can't access %s - invalid OpenPGP card?\n"
+#: g10/app-openpgp.c:2399
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1731
+#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
 #, c-format
-msgid "error getting serial number: %s\n"
-msgstr "ошибка при получении серийного номера: %s\n"
-
-#: g10/app-openpgp.c:1826
-#, c-format
-msgid "failed to store the key: %s\n"
-msgstr "сбой сохранения ключа: %s\n"
-
-#: g10/app-openpgp.c:1868
-msgid "reading the key failed\n"
-msgstr "сбой при чтении ключа\n"
+msgid "can't access %s - invalid OpenPGP card?\n"
+msgstr ""
 
-#: g10/armor.c:317
+#: g10/armor.c:318
 #, c-format
 msgid "armor: %s\n"
 msgstr "формат ASCII: %s\n"
 
-#: g10/armor.c:346
+#: g10/armor.c:347
 msgid "invalid armor header: "
 msgstr "неправильный заголовок ASCII: "
 
-#: g10/armor.c:353
+#: g10/armor.c:354
 msgid "armor header: "
 msgstr "заголовок ASCII: "
 
-#: g10/armor.c:364
+#: g10/armor.c:365
 msgid "invalid clearsig header\n"
 msgstr "неправильный заголовок прозрачной подписи\n"
 
-#: g10/armor.c:416
+#: g10/armor.c:417
 msgid "nested clear text signatures\n"
 msgstr "вложенные прозрачные подписи\n"
 
-#: g10/armor.c:551
+#: g10/armor.c:552
 msgid "unexpected armor: "
 msgstr "неожиданный формат ASCII:"
 
-#: g10/armor.c:563
+#: g10/armor.c:564
 msgid "invalid dash escaped line: "
 msgstr "неправильный отступ из минусов: "
 
-#: g10/armor.c:715 g10/armor.c:1322
+#: g10/armor.c:716 g10/armor.c:1323
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "недопустимый символ radix64 %02X пропущен\n"
 
-#: g10/armor.c:758
+#: g10/armor.c:759
 msgid "premature eof (no CRC)\n"
 msgstr "преждевременный конец файла (нет CRC)\n"
 
-#: g10/armor.c:792
+#: g10/armor.c:793
 msgid "premature eof (in CRC)\n"
 msgstr "преждевременный конец файла (в CRC)\n"
 
-#: g10/armor.c:800
+#: g10/armor.c:801
 msgid "malformed CRC\n"
 msgstr "поврежденный CRC\n"
 
-#: g10/armor.c:804 g10/armor.c:1359
+#: g10/armor.c:805 g10/armor.c:1360
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "ошибка CRC; %06lX - %06lX\n"
 
-#: g10/armor.c:824
+#: g10/armor.c:825
 msgid "premature eof (in trailer)\n"
 msgstr "преждевременный конец файла (в дополнении)\n"
 
-#: g10/armor.c:828
+#: g10/armor.c:829
 msgid "error in trailer line\n"
 msgstr "ошибка в строке дополнения\n"
 
-#: g10/armor.c:1137
+#: g10/armor.c:1138
 msgid "no valid OpenPGP data found.\n"
 msgstr "не найдено данных формата OpenPGP.\n"
 
-#: g10/armor.c:1142
+#: g10/armor.c:1143
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "неправильный ASCII формат: строка длиннее %d символов\n"
 
-#: g10/armor.c:1146
+#: g10/armor.c:1147
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "символы quoted printable в кодировке ASCII - вероятно использовался плохой "
 "MTA\n"
 
-#: g10/card-util.c:58 g10/card-util.c:295
+#: g10/card-util.c:63 g10/card-util.c:303
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "Карта OpenPGP недоступна: %s\n"
 
-#: g10/card-util.c:63
+#: g10/card-util.c:68
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Обнаружена карта OpenPGP номер %s \n"
 
-#: g10/card-util.c:70 g10/card-util.c:1329 g10/delkey.c:127 g10/keyedit.c:1430
-#: g10/keygen.c:2439 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1510
+#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
 msgid "can't do this in batch mode\n"
 msgstr "невозможно сделать это в пакетном режиме\n"
 
-#: g10/card-util.c:97 g10/card-util.c:1108 g10/card-util.c:1191
-#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
-#: g10/keygen.c:1365
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
+#: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "Ваш выбор (?-подробнее)? "
 
-#: g10/card-util.c:206 g10/card-util.c:256
+#: g10/card-util.c:213 g10/card-util.c:263
 msgid "[not set]"
 msgstr "[не установлено]"
 
-#: g10/card-util.c:391
+#: g10/card-util.c:410
 msgid "male"
 msgstr "мужской"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 msgid "female"
 msgstr "женский"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 msgid "unspecified"
 msgstr "не задан"
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 msgid "not forced"
 msgstr ""
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:497
+#: g10/card-util.c:516
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:499
+#: g10/card-util.c:518
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Ошибка: Нельзя использовать символ \"<\"\n"
 
-#: g10/card-util.c:501
+#: g10/card-util.c:520
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Ошибка: Двойные пробелы недопустимы.\n"
 
-#: g10/card-util.c:518
+#: g10/card-util.c:537
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:539
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:538
+#: g10/card-util.c:557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:559
+#: g10/card-util.c:578
 msgid "URL to retrieve public key: "
 msgstr "URL для получения открытого ключа: "
 
-#: g10/card-util.c:567
+#: g10/card-util.c:586
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Ошибка: URL слишком длинный (предел - %d символов).\n"
 
-#: g10/card-util.c:665 g10/card-util.c:734 g10/import.c:261
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "ошибка чтения `%s': %s\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:692
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:683
+#: g10/card-util.c:702
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:742
+#: g10/card-util.c:761
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:752
+#: g10/card-util.c:771
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:772
+#: g10/card-util.c:791
 msgid "Language preferences: "
 msgstr "Предпочитаемый язык: "
 
-#: g10/card-util.c:780
+#: g10/card-util.c:799
 msgid "Error: invalid length of preference string.\n"
 msgstr "Ошибка: недопустимая длина строки предпочтений.\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:808
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Ошибка: недопустимые символы в строке предпочтений.\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:829
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Пол ((M)Мужской, (F)Женский или пробел): "
 
-#: g10/card-util.c:824
+#: g10/card-util.c:843
 msgid "Error: invalid response.\n"
 msgstr "Ошибка: недопустимый ответ.\n"
 
-#: g10/card-util.c:845
+#: g10/card-util.c:864
 msgid "CA fingerprint: "
 msgstr "отпечаток CA: "
 
-#: g10/card-util.c:868
+#: g10/card-util.c:887
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Ошибка: неправильный формат отпечатка.\n"
 
-#: g10/card-util.c:916
+#: g10/card-util.c:935
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "операция с ключом невозможна: %s\n"
 
-#: g10/card-util.c:917
+#: g10/card-util.c:936
 msgid "not an OpenPGP card"
 msgstr "карта не OpenPGP"
 
-#: g10/card-util.c:926
+#: g10/card-util.c:945
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "ошибка при считывании информации ключа: %s\n"
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1030
 msgid "Replace existing key? (y/N) "
 msgstr "Заменить существующий ключ? (y/N) "
 
-#: g10/card-util.c:1030 g10/card-util.c:1039
+#: g10/card-util.c:1051 g10/card-util.c:1060
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1051
+#: g10/card-util.c:1072
 msgid "Replace existing keys? (y/N) "
 msgstr "Заменить существующие ключи? (y/N) "
 
-#: g10/card-util.c:1060
+#: g10/card-util.c:1081
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -507,124 +530,128 @@ msgstr ""
 "   PIN = `%s'     Admin PIN = `%s'\n"
 "Вы должны изменить их используя команду --change-pin\n"
 
-#: g10/card-util.c:1099
+#: g10/card-util.c:1120
 msgid "Please select the type of key to generate:\n"
 msgstr "Выберите тип создаваемого ключа:\n"
 
-#: g10/card-util.c:1101 g10/card-util.c:1182
+#: g10/card-util.c:1122 g10/card-util.c:1203
 msgid "   (1) Signature key\n"
 msgstr "   (1) Ключ подписи\n"
 
-#: g10/card-util.c:1102 g10/card-util.c:1184
+#: g10/card-util.c:1123 g10/card-util.c:1205
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Ключ шифрования\n"
 
-#: g10/card-util.c:1103 g10/card-util.c:1186
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Ключ аутентификации\n"
 
-#: g10/card-util.c:1119 g10/card-util.c:1202 g10/keyedit.c:908
-#: g10/keygen.c:1404 g10/revoke.c:642
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
+#: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "Неправильный выбор.\n"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1200
 msgid "Please select where to store the key:\n"
 msgstr "Выберите, где сохранить ключ:\n"
 
-#: g10/card-util.c:1214
+#: g10/card-util.c:1235
 msgid "unknown key protection algorithm\n"
 msgstr "неизвестный алгоритм защиты ключа\n"
 
-#: g10/card-util.c:1219
+#: g10/card-util.c:1240
 msgid "secret parts of key are not available\n"
 msgstr "секретные части ключа недоступны\n"
 
-#: g10/card-util.c:1224
+#: g10/card-util.c:1245
 msgid "secret key already stored on a card\n"
 msgstr "секретный ключ уже сохранен в карте\n"
 
-#: g10/card-util.c:1294 g10/keyedit.c:1317
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "выйти из этого меню"
 
-#: g10/card-util.c:1296
+#: g10/card-util.c:1318
 msgid "show admin commands"
 msgstr "показать управляющие команды"
 
-#: g10/card-util.c:1297 g10/keyedit.c:1320
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "показать данную справку"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1321
 msgid "list all available data"
 msgstr "вывести все доступные данные"
 
-#: g10/card-util.c:1302
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr "изменить имя владельца карты"
 
-#: g10/card-util.c:1303
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr "изменить URL получения ключа"
 
-#: g10/card-util.c:1304
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr "запросить ключ, указанный по заданному картой URL"
 
-#: g10/card-util.c:1305
+#: g10/card-util.c:1327
 msgid "change the login name"
 msgstr "изменить учетное имя"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1328
 msgid "change the language preferences"
 msgstr "изменить языковые предпочтения"
 
-#: g10/card-util.c:1307
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr "изменение пола владельца карты"
 
-#: g10/card-util.c:1308
+#: g10/card-util.c:1330
 msgid "change a CA fingerprint"
 msgstr "сменить отпечаток CA"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1310
+#: g10/card-util.c:1332
 msgid "generate new keys"
 msgstr "сгенерировать новые ключи"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr "меню изменения или разблокировки PIN"
 
-#: g10/card-util.c:1377 g10/keyedit.c:1526
+#: g10/card-util.c:1334
+msgid "verify the PIN and list all data"
+msgstr ""
+
+#: g10/card-util.c:1454 g10/keyedit.c:1609
 msgid "Command> "
 msgstr "Команда> "
 
-#: g10/card-util.c:1412
+#: g10/card-util.c:1492
 msgid "Admin-only command\n"
 msgstr "Команды администратора\n"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1523
 msgid "Admin commands are allowed\n"
 msgstr "Команды администрирования разрешены\n"
 
-#: g10/card-util.c:1430
+#: g10/card-util.c:1525
 msgid "Admin commands are not allowed\n"
 msgstr "Команды администрирования не разрешены\n"
 
-#: g10/card-util.c:1499 g10/keyedit.c:2104
+#: g10/card-util.c:1599 g10/keyedit.c:2210
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Недопустимая команда  (список команд: \"help\")\n"
 
-#: g10/cardglue.c:287
+#: g10/cardglue.c:396
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr "Вставьте карту и нажмите Enter или введите 'c' для отмены: "
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:519
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -633,259 +660,259 @@ msgstr ""
 "Извлеките текущую карту и вставьте карту с серийным номером:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:380
+#: g10/cardglue.c:527
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "Нажмите Enter, когда будете готовы или введите 'c' для отмены: "
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:852
 msgid "Enter New Admin PIN: "
 msgstr "Введите новый Admin PIN: "
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:853
 msgid "Enter New PIN: "
 msgstr "Введите новый PIN: "
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:854
 msgid "Enter Admin PIN: "
 msgstr "Введите Admin PIN: "
 
-#: g10/cardglue.c:691
+#: g10/cardglue.c:855
 msgid "Enter PIN: "
 msgstr "Введите PIN: "
 
-#: g10/cardglue.c:705
+#: g10/cardglue.c:872
 msgid "Repeat this PIN: "
 msgstr "Повторите ввод PIN: "
 
-#: g10/cardglue.c:719
+#: g10/cardglue.c:886
 msgid "PIN not correctly repeated; try again"
 msgstr "повторный ввод PIN некорректен; попробуйте еще раз"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
-#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "не могу открыть `%s'\n"
 
-#: g10/decrypt.c:104 g10/encode.c:859
+#: g10/decrypt.c:105 g10/encode.c:846
 msgid "--output doesn't work for this command\n"
 msgstr "--output не работает для данной команды\n"
 
-#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3167 g10/keyserver.c:1511
-#: g10/revoke.c:226
+#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3346 g10/keyserver.c:1541
+#: g10/revoke.c:227
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "ключ \"%s\" не найден: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2300 g10/keyserver.c:1525
-#: g10/revoke.c:232 g10/revoke.c:439
+#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "ошибка чтения блока ключей: %s\n"
 
-#: g10/delkey.c:128 g10/delkey.c:135
+#: g10/delkey.c:129 g10/delkey.c:136
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(если только Вы не задали ключ отпечатком)\n"
 
-#: g10/delkey.c:134
+#: g10/delkey.c:135
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "не могу выполнить в пакетном режиме без \"--yes\"\n"
 
-#: g10/delkey.c:146
+#: g10/delkey.c:147
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Удалить данный ключ из таблицы ключей? (y/N)"
 
-#: g10/delkey.c:154
+#: g10/delkey.c:155
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Это секретный ключ! - действительно удалить? (y/N)"
 
-#: g10/delkey.c:164
+#: g10/delkey.c:165
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "сбой при удалении блока ключа: %s\n"
 
-#: g10/delkey.c:174
+#: g10/delkey.c:175
 msgid "ownertrust information cleared\n"
 msgstr "информация о доверии владельцу очищена\n"
 
-#: g10/delkey.c:205
+#: g10/delkey.c:206
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "имеется секретный ключ для открытого ключа \"%s\"!\n"
 
-#: g10/delkey.c:207
+#: g10/delkey.c:208
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "сначала используйте опцию \"--delete-secret-keys\".\n"
 
-#: g10/encode.c:210 g10/sign.c:1186
+#: g10/encode.c:211 g10/sign.c:1218
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "ошибка при создании ключевой фразы (пароля): %s\n"
 
-#: g10/encode.c:215
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "не могу использовать симметричный пакет ESK в S2K режиме\n"
 
-#: g10/encode.c:228
+#: g10/encode.c:229
 #, c-format
 msgid "using cipher %s\n"
 msgstr "используемый алгоритм шифрования %s\n"
 
-#: g10/encode.c:238 g10/encode.c:558
+#: g10/encode.c:239 g10/encode.c:545
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' уже сжат\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
+#: g10/encode.c:302 g10/encode.c:591 g10/sign.c:566
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ВНИМАНИЕ: `%s' пустой файл\n"
 
-#: g10/encode.c:472
+#: g10/encode.c:466
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "в режиме --pgp2 ключ RSA для ширования должен быть не более 2048 бит\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:488
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "читаю из `%s'\n"
 
-#: g10/encode.c:530
+#: g10/encode.c:517
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "не могу использовать шифр IDEA для всех ключей.\n"
 
-#: g10/encode.c:540
+#: g10/encode.c:527
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "ВНИМАНИЕ: использование шифра %s (%d) противоречит предпочтениям получателя\n"
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:635 g10/sign.c:899
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "ВНИМАНИЕ: сжатие алгоритмом %s (%d) нарушает предпочтения получателя\n"
 
-#: g10/encode.c:735
+#: g10/encode.c:722
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "использование шифра %s (%d) противоречит предпочтениям получателя\n"
 
-#: g10/encode.c:805 g10/pkclist.c:721 g10/pkclist.c:757
+#: g10/encode.c:792 g10/pkclist.c:722 g10/pkclist.c:758
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "Вы не можете использовать %s в режиме %s\n"
 
-#: g10/encode.c:832
+#: g10/encode.c:819
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s зашифровано для: \"%s\"\n"
 
-#: g10/encr-data.c:66 g10/mainproc.c:301
+#: g10/encr-data.c:67 g10/mainproc.c:302
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "Данные зашифрованы алгоритмом %s\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:305
+#: g10/encr-data.c:69 g10/mainproc.c:306
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "зашифровано неизвестным алгоритмом %d\n"
 
-#: g10/encr-data.c:92
+#: g10/encr-data.c:93
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ВНИМАНИЕ: сообщение было зашифровано слабым ключом симметричного шифра.\n"
 
-#: g10/encr-data.c:103
+#: g10/encr-data.c:104
 msgid "problem handling encrypted packet\n"
 msgstr "проблема обработки зашифрованного пакета\n"
 
-#: g10/exec.c:48
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "удаленный запуск программы не поддерживается\n"
 
-#: g10/exec.c:184 g10/openfile.c:406
+#: g10/exec.c:173 g10/openfile.c:410
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "не могу создать каталог `%s': %s\n"
 
-#: g10/exec.c:325
+#: g10/exec.c:314
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr "вызов внешних программ отключен из-за небезопасных прав доступа\n"
 
-#: g10/exec.c:355
+#: g10/exec.c:344
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "на данной платформе требуется использование временных файлов при вызове "
 "внешних программ\n"
 
-#: g10/exec.c:433
+#: g10/exec.c:422
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "не могу запустить программу `%s': %s\n"
 
-#: g10/exec.c:436
+#: g10/exec.c:425
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "не могу запустить оболочку `%s': %s\n"
 
-#: g10/exec.c:521
+#: g10/exec.c:510
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "ошибка системы при вызове внешней программы: %s\n"
 
-#: g10/exec.c:532 g10/exec.c:598
+#: g10/exec.c:521 g10/exec.c:587
 msgid "unnatural exit of external program\n"
 msgstr "ненормальное завершение внешней программы\n"
 
-#: g10/exec.c:547
+#: g10/exec.c:536
 msgid "unable to execute external program\n"
 msgstr "не могу запустить внешнюю программу\n"
 
-#: g10/exec.c:563
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "не могу прочитать ответ внешней программы: %s\n"
 
-#: g10/exec.c:609 g10/exec.c:616
+#: g10/exec.c:598 g10/exec.c:605
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "ВНИМАНИЕ: не могу удалить временный файл (%s) `%s': %s\n"
 
-#: g10/exec.c:621
+#: g10/exec.c:610
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "ВНИМАНИЕ: не могу удалить временный каталог `%s': %s\n"
 
-#: g10/export.c:183
+#: g10/export.c:184
 msgid "exporting secret keys not allowed\n"
 msgstr "экспорт секретных ключей не разрешен\n"
 
-#: g10/export.c:212
+#: g10/export.c:213
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "ключ %s: не защищен - пропущен\n"
 
-#: g10/export.c:220
+#: g10/export.c:221
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "ключ %s: стиля PGP 2.x - пропущен\n"
 
-#: g10/export.c:395
+#: g10/export.c:398
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "ВНИМАНИЕ: секретный ключ %s не имеет простой контрольной суммы SK\n"
 
-#: g10/export.c:427
+#: g10/export.c:430
 msgid "WARNING: nothing exported\n"
 msgstr "ВНИМАНИЕ: нечего экспортировать\n"
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid ""
 "@Commands:\n"
 " "
@@ -893,127 +920,127 @@ msgstr ""
 "@Команды:\n"
 " "
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "|[file]|make a signature"
 msgstr "|[file]|создать подпись к файлу"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|создать прозрачную подпись к файлу"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "make a detached signature"
 msgstr "создать отделенную подпись"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encrypt data"
 msgstr "зашифровать данные"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "encryption only with symmetric cipher"
 msgstr "зашифровать только симметричным шифром"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "decrypt data (default)"
 msgstr "расшифровать данные (по умолчанию)"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "verify a signature"
 msgstr "проверить подпись"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys"
 msgstr "вывести список ключей"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and signatures"
 msgstr "вывести список ключей и подписей"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 msgid "list and check key signatures"
 msgstr "вывести и проверить подписи ключей"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "list keys and fingerprints"
 msgstr "вывести список ключей и их отпечатков"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "list secret keys"
 msgstr "вывести список секретных ключей"
 
-#: g10/g10.c:379
+#: g10/g10.c:381
 msgid "generate a new key pair"
 msgstr "создать новую пару ключей"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the public keyring"
 msgstr "удалить ключи из таблицы открытых ключей"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "remove keys from the secret keyring"
 msgstr "удалить ключи из таблицы закрытых ключей"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign a key"
 msgstr "подписать ключ"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "sign a key locally"
 msgstr "подписать ключ локально"
 
-#: g10/g10.c:385
+#: g10/g10.c:387
 msgid "sign or edit a key"
 msgstr "подписать или редактировать ключ"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "generate a revocation certificate"
 msgstr "создать сертификат отзыва"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "export keys"
 msgstr "экспортировать ключи"
 
-#: g10/g10.c:389
+#: g10/g10.c:391
 msgid "export keys to a key server"
 msgstr "экспортировать ключи на сервер ключей"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "import keys from a key server"
 msgstr "импортировать ключи с сервера ключей"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "search for keys on a key server"
 msgstr "искать ключи на сервере ключей"
 
-#: g10/g10.c:394
+#: g10/g10.c:396
 msgid "update all keys from a keyserver"
 msgstr "обновить все ключи с сервера ключей"
 
-#: g10/g10.c:397
+#: g10/g10.c:399
 msgid "import/merge keys"
 msgstr "импортировать/объединить ключи"
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "print the card status"
 msgstr "показать состояние карты"
 
-#: g10/g10.c:401
+#: g10/g10.c:403
 msgid "change data on a card"
 msgstr "изменить данные на карте"
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "change a card's PIN"
 msgstr "сменить PIN карты"
 
-#: g10/g10.c:410
+#: g10/g10.c:412
 msgid "update the trust database"
 msgstr "обновить таблицу доверий"
 
-#: g10/g10.c:417
+#: g10/g10.c:419
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|вывести хэши файлов"
 
-#: g10/g10.c:421 g10/gpgv.c:66
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1023,51 +1050,51 @@ msgstr ""
 "Параметры:\n"
 " "
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "create ascii armored output"
 msgstr "вывод в ASCII формате"
 
-#: g10/g10.c:425
+#: g10/g10.c:427
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|зашифровать для получателя NAME"
 
-#: g10/g10.c:436
+#: g10/g10.c:438
 msgid "use this user-id to sign or decrypt"
 msgstr "использовать данный User ID для подписывания и расшифрования"
 
-#: g10/g10.c:437
+#: g10/g10.c:439
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|установить уровень сжатия N (по умолчанию - 0)"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "use canonical text mode"
 msgstr "использовать канонический текстовый режим"
 
-#: g10/g10.c:452
+#: g10/g10.c:458
 msgid "use as output file"
 msgstr "вывод в указанный файл"
 
-#: g10/g10.c:454 g10/gpgv.c:68
+#: g10/g10.c:460 g10/gpgv.c:73
 msgid "verbose"
 msgstr "подробно"
 
-#: g10/g10.c:465
+#: g10/g10.c:471
 msgid "do not make any changes"
 msgstr "не делать никаких изменений"
 
-#: g10/g10.c:466
+#: g10/g10.c:472
 msgid "prompt before overwriting"
 msgstr "спросить перед перезаписью"
 
-#: g10/g10.c:507
+#: g10/g10.c:513
 msgid "use strict OpenPGP behavior"
 msgstr "строго следовать стандарту OpenPGP"
 
-#: g10/g10.c:508
+#: g10/g10.c:514
 msgid "generate PGP 2.x compatible messages"
 msgstr "создает сообщение совместимым с PGP 2.x"
 
-#: g10/g10.c:536
+#: g10/g10.c:542
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1075,7 +1102,7 @@ msgstr ""
 "@\n"
 "(См. документацию для более полного ознакомления с командами и параметрами)\n"
 
-#: g10/g10.c:539
+#: g10/g10.c:545
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1095,15 +1122,15 @@ msgstr ""
 " --list-keys [имена]        показать ключи\n"
 " --fingerprint [имена]      показать отпечатки\n"
 
-#: g10/g10.c:720 g10/gpgv.c:93
+#: g10/g10.c:724 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "О найденных ошибка сообщайте <[email protected]>.\n"
 
-#: g10/g10.c:737
+#: g10/g10.c:741
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Использование: gpg [параметры] [файлы] (-h для подсказки)"
 
-#: g10/g10.c:740
+#: g10/g10.c:744
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1113,7 +1140,7 @@ msgstr ""
 "подписать и проверить, зашифровать или расшифровать\n"
 "операция по умолчанию зависит от входных данных\n"
 
-#: g10/g10.c:751
+#: g10/g10.c:755
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1121,92 +1148,92 @@ msgstr ""
 "\n"
 "Поддерживаются следующие алгоритмы:\n"
 
-#: g10/g10.c:754
+#: g10/g10.c:758
 msgid "Pubkey: "
 msgstr "С открытым ключом: "
 
-#: g10/g10.c:760 g10/keyedit.c:2141
+#: g10/g10.c:764 g10/keyedit.c:2248
 msgid "Cipher: "
 msgstr "Симметричные шифры: "
 
-#: g10/g10.c:766
+#: g10/g10.c:770
 msgid "Hash: "
 msgstr "Хэш-функции: "
 
-#: g10/g10.c:772 g10/keyedit.c:2187
+#: g10/g10.c:776 g10/keyedit.c:2294
 msgid "Compression: "
 msgstr "Алгоритмы сжатия: "
 
-#: g10/g10.c:855
+#: g10/g10.c:859
 msgid "usage: gpg [options] "
 msgstr "использование: gpg [опции] "
 
-#: g10/g10.c:1003
+#: g10/g10.c:1007
 msgid "conflicting commands\n"
 msgstr "несовместимые команды\n"
 
-#: g10/g10.c:1021
+#: g10/g10.c:1025
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "отсутствует знак = в определении группы `%s'\n"
 
-#: g10/g10.c:1218
+#: g10/g10.c:1222
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец домашнего каталога `%s'\n"
 
-#: g10/g10.c:1221
+#: g10/g10.c:1225
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец файла конфигурации `%s'\n"
 
-#: g10/g10.c:1224
+#: g10/g10.c:1228
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец файла модуля расширения `%s'\n"
 
-#: g10/g10.c:1230
+#: g10/g10.c:1234
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа к домашнему каталогу `%s'\n"
 
-#: g10/g10.c:1233
+#: g10/g10.c:1237
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа к файлу конфигурации `%s'\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1240
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа к файлу модуля расширения `%s'\n"
 
-#: g10/g10.c:1242
+#: g10/g10.c:1246
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасный владелец каталога содержащего домашний каталог `%s'\n"
 
-#: g10/g10.c:1245
+#: g10/g10.c:1249
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасный владелец каталога содержащего файл конфигурации `%s'\n"
 
-#: g10/g10.c:1248
+#: g10/g10.c:1252
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасный владелец каталога содержащего модуль расширения `%s'\n"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1258
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасные права доступа к каталогу содержащему домашний каталог "
 "`%s'\n"
 
-#: g10/g10.c:1257
+#: g10/g10.c:1261
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1214,373 +1241,383 @@ msgstr ""
 "ВНИМАНИЕ: небезопасные права доступа к каталогу содержащему файл "
 "конфигурации `%s'\n"
 
-#: g10/g10.c:1260
+#: g10/g10.c:1264
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасные права доступа к каталогу содержащему файл модуля "
 "расширения `%s'\n"
 
-#: g10/g10.c:1401
+#: g10/g10.c:1405
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "неизвестный параметр в файле конфигурации `%s'\n"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1802
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "ЗАМЕЧАНИЕ: старый файл конфигурации по умолчанию `%s' проигнорирован\n"
 
-#: g10/g10.c:1838
+#: g10/g10.c:1844
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "ЗАМЕЧАНИЕ: файл конфигурации `%s' не обнаружен\n"
 
-#: g10/g10.c:1842
+#: g10/g10.c:1848
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "файл конфигурации `%s': %s\n"
 
-#: g10/g10.c:1849
+#: g10/g10.c:1855
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "параметры конфигурации взяты из файла `%s'\n"
 
-#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "ЗАМЕЧАНИЕ: %s не предназначен для нормального применения!\n"
 
-#: g10/g10.c:2076
+#: g10/g10.c:2082
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "расширение шифра `%s' не загружено вследствие небезопасных прав доступа\n"
 
-#: g10/g10.c:2293
+#: g10/g10.c:2236 g10/g10.c:2248
+#, fuzzy, c-format
+msgid "`%s' is not a valid signature expiration\n"
+msgstr "`%s' недопустимая таблица символов\n"
+
+#: g10/g10.c:2321
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' недопустимая таблица символов\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3683
+#: g10/g10.c:2340 g10/keyedit.c:3862
 msgid "could not parse keyserver URL\n"
 msgstr "не могу проанализировать URL сервера ключей\n"
 
 # test it
-#: g10/g10.c:2318
+#: g10/g10.c:2346
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недопустимые параметры для сервера ключей\n"
 
 # test it
-#: g10/g10.c:2321
+#: g10/g10.c:2349
 msgid "invalid keyserver options\n"
 msgstr "недопустимые параметры для сервера ключей\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2356
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недопустимые параметры импорта\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2359
 msgid "invalid import options\n"
 msgstr "недопустимые параметры импорта\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2366
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недопустимые параметры экспорта\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2369
 msgid "invalid export options\n"
 msgstr "недопустимые параметры экспорта\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2376
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недопустимый список параметров\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2379
 msgid "invalid list options\n"
 msgstr "недопустимый список параметров\n"
 
 # test it
-#: g10/g10.c:2373
+#: g10/g10.c:2401
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недопустимые параметры проверки \n"
 
 # test it
-#: g10/g10.c:2376
+#: g10/g10.c:2404
 msgid "invalid verify options\n"
 msgstr "недопустимые параметры проверки\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2411
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "не могу определить путь запуска для %s\n"
 
-#: g10/g10.c:2573
+#: g10/g10.c:2602
 msgid "WARNING: program may create a core file!\n"
 msgstr "ВНИМАНИЕ: возможно создание файла дампа памяти!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2606
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ВНИМАНИЕ: %s заместит %s\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2615
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не допускается использовать с %s!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2618
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s не имеет смысла совместно с %s!\n"
 
-#: g10/g10.c:2603
+#: g10/g10.c:2625
+#, fuzzy, c-format
+msgid "NOTE: %s is not available in this version\n"
+msgstr "gpg-agent недоступен в данной сессии\n"
+
+#: g10/g10.c:2640
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "не будет работать с небезопасной памятью из-за %s\n"
 
-#: g10/g10.c:2617
+#: g10/g10.c:2654
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "можно сделать только отделенную или прозрачную подпись в режиме --pgp2\n"
 
-#: g10/g10.c:2623
+#: g10/g10.c:2660
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "Вы не можете одновременно подписать и зашифровать в режиме --pgp2\n"
 
-#: g10/g10.c:2629
+#: g10/g10.c:2666
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "Вы должны использовать файлы (а не каналы (pipe)) в режиме --pgp2.\n"
 
-#: g10/g10.c:2642
+#: g10/g10.c:2679
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "для зашифрования сообщения в режиме --pgp2 требуется шифр IDEA\n"
 
-#: g10/g10.c:2712 g10/g10.c:2736
+#: g10/g10.c:2746 g10/g10.c:2770
 msgid "selected cipher algorithm is invalid\n"
 msgstr "выбран неверный алгоритм шифрования\n"
 
-#: g10/g10.c:2718 g10/g10.c:2742
+#: g10/g10.c:2752 g10/g10.c:2776
 msgid "selected digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция\n"
 
-#: g10/g10.c:2724
+#: g10/g10.c:2758
 msgid "selected compression algorithm is invalid\n"
 msgstr "выбран неверный алгоритм сжатия\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2764
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция для сертификации\n"
 
-#: g10/g10.c:2745
+#: g10/g10.c:2779
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed должен быть больше 0\n"
 
-#: g10/g10.c:2747
+#: g10/g10.c:2781
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed должен быть больше 1\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2783
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n"
 
-#: g10/g10.c:2751
+#: g10/g10.c:2785
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "недопустимый default-cert-level; должен быть 0, 1, 2 или 3\n"
 
-#: g10/g10.c:2753
+#: g10/g10.c:2787
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "недопустимый min-cert-level; должен быть 0, 1, 2 или 3\n"
 
-#: g10/g10.c:2756
+#: g10/g10.c:2790
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "ЗАМЕЧАНИЕ: простой режим S2K (0) строго не рекомендуется\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2794
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "недопустимый режим S2K; должно быть 0, 1 или 3\n"
 
-#: g10/g10.c:2767
+#: g10/g10.c:2801
 msgid "invalid default preferences\n"
 msgstr "недопустимые предпочтения по умолчанию\n"
 
-#: g10/g10.c:2776
+#: g10/g10.c:2810
 msgid "invalid personal cipher preferences\n"
 msgstr "недопустимые персональные предпочтения шифра\n"
 
-#: g10/g10.c:2780
+#: g10/g10.c:2814
 msgid "invalid personal digest preferences\n"
 msgstr "недопустимые персональные предпочтения хэш-функции\n"
 
-#: g10/g10.c:2784
+#: g10/g10.c:2818
 msgid "invalid personal compress preferences\n"
 msgstr "недопустимые персональные предпочтения алгоритмов сжатия\n"
 
-#: g10/g10.c:2817
+#: g10/g10.c:2851
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s пока не работает совместно с %s!\n"
 
-#: g10/g10.c:2864
+#: g10/g10.c:2898
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "Вы не можете использовать шифрование `%s' в режиме %s\n"
 
-#: g10/g10.c:2869
+#: g10/g10.c:2903
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "Вы не можете использовать хэш-функцию `%s' в режиме %s\n"
 
-#: g10/g10.c:2874
+#: g10/g10.c:2908
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "Вы не можете использовать сжатие `%s' в режиме %s\n"
 
-#: g10/g10.c:2970
+#: g10/g10.c:3004
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "сбой инициализации таблицы доверий: %s\n"
 
-#: g10/g10.c:2981
+#: g10/g10.c:3015
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ВНИМАНИЕ: получатели (-r) заданы без использования шифрования с открытым "
 "ключом\n"
 
-#: g10/g10.c:2992
+#: g10/g10.c:3026
 msgid "--store [filename]"
 msgstr "--store [filename]"
 
-#: g10/g10.c:2999
+#: g10/g10.c:3033
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filename]"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3035
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "симметричное шифрование `%s' не удалось: %s\n"
 
-#: g10/g10.c:3011
+#: g10/g10.c:3045
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filename]"
 
-#: g10/g10.c:3024
+#: g10/g10.c:3058
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [имяфайла]"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3060
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "нельзя использовать --symmetric --encrypt совместно с --s2k-mode 0\n"
 
-#: g10/g10.c:3029
+#: g10/g10.c:3063
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "невозможно использовать --symmetric --encrypt в режиме %s\n"
 
-#: g10/g10.c:3047
+#: g10/g10.c:3081
 msgid "--sign [filename]"
 msgstr "--sign [filename]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3094
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filename]"
 
-#: g10/g10.c:3075
+#: g10/g10.c:3109
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [имяфайла]"
 
-#: g10/g10.c:3077
+#: g10/g10.c:3111
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "нельзя использовать --symmetric --sign --encrypt совместно с --s2k-mode 0\n"
 
-#: g10/g10.c:3080
+#: g10/g10.c:3114
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "невозможно использовать --symmetric --sign --encrypt в режиме %s\n"
 
-#: g10/g10.c:3100
+#: g10/g10.c:3134
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filename]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3143
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filename]"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3168
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filename]"
 
-#: g10/g10.c:3142
+#: g10/g10.c:3176
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:3146
+#: g10/g10.c:3180
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:3167
+#: g10/g10.c:3201
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [commands]"
 
-#: g10/g10.c:3238
+#: g10/g10.c:3272
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [keyring]"
 
-#: g10/g10.c:3275
+#: g10/g10.c:3309
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "сбой при отправке на сервер ключей: %s\n"
 
-#: g10/g10.c:3277
+#: g10/g10.c:3311
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "сбой при получении с сервера ключей: %s\n"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3313
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "сбой при экспорте ключа: %s\n"
 
-#: g10/g10.c:3290
+#: g10/g10.c:3324
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "сбой при поиске на сервере ключей: %s\n"
 
-#: g10/g10.c:3300
+#: g10/g10.c:3334
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "сбой при обновлении с сервера ключей: %s\n"
 
-#: g10/g10.c:3341
+#: g10/g10.c:3375
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ошибка преобразования из ASCII формата: %s\n"
 
-#: g10/g10.c:3349
+#: g10/g10.c:3383
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ошибка преобразования в ASCII формат: %s\n"
 
-#: g10/g10.c:3436
+#: g10/g10.c:3470
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "недопустимая хэш-функция `%s'\n"
 
-#: g10/g10.c:3559
+#: g10/g10.c:3593
 msgid "[filename]"
 msgstr "[filename]"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3597
 msgid "Go ahead and type your message ...\n"
 msgstr "Набирайте Ваше сообщение ...\n"
 
-#: g10/g10.c:3853
+#: g10/g10.c:3887
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1588,77 +1625,82 @@ msgstr ""
 "имя примечания должно содержать только печатные символы или пробелы,и "
 "заканчиваться знаком '='\n"
 
-#: g10/g10.c:3861
+#: g10/g10.c:3895
 msgid "a user notation name must contain the '@' character\n"
 msgstr "имя примечания пользователя должно содержать '@' символ\n"
 
-#: g10/g10.c:3871
+#: g10/g10.c:3900
+#, fuzzy
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr "имя примечания пользователя должно содержать '@' символ\n"
+
+#: g10/g10.c:3911
 msgid "a notation value must not use any control characters\n"
 msgstr "значение примечания не должно содержать управляющие символы\n"
 
-#: g10/g10.c:3905
+#: g10/g10.c:3945
 msgid "the given certification policy URL is invalid\n"
 msgstr "заданный URL политики сертификации неверен\n"
 
-#: g10/g10.c:3907
+#: g10/g10.c:3947
 msgid "the given signature policy URL is invalid\n"
 msgstr "заданный URL политики подписи неверен\n"
 
-#: g10/g10.c:3940
+#: g10/g10.c:3980
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "заданный URL предпочитаемого сервера ключей неправилен\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "слишком много входов в pk кэше - отключено\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2750
+#: g10/getkey.c:187 g10/getkey.c:2757
 msgid "[User ID not found]"
 msgstr "[User ID не найден]"
 
-#: g10/getkey.c:1677
+#: g10/getkey.c:1684
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Дефектный ключ %s признан пригодным согласно параметра --allow-non-"
 "selfsigned-uid\n"
 
-#: g10/getkey.c:2228
+#: g10/getkey.c:2235
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "нет секретного подключа для открытого подключа %s - игнорируем\n"
 
-#: g10/getkey.c:2459
+#: g10/getkey.c:2466
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "использую подклключ %s вместо главного ключа %s\n"
 
-#: g10/getkey.c:2506
+#: g10/getkey.c:2513
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "ключ %s: секретный ключ без открытого ключа - пропущен\n"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:74
 msgid "be somewhat more quiet"
 msgstr "уменьшить количество выводимой информации"
 
-#: g10/gpgv.c:70
+#: g10/gpgv.c:75
 msgid "take the keys from this keyring"
 msgstr "используются ключи из этой таблицы ключей"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:77
 msgid "make timestamp conflicts only a warning"
 msgstr "при несоответствии отметки времени - только предупреждением"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:78
 msgid "|FD|write status info to this FD"
 msgstr "|FD|выводить инфромацию в файл с дескриптором FD"
 
-#: g10/gpgv.c:97
+#: g10/gpgv.c:102
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Использовать: gpgv [параметры] [файлы] (-h для подсказки)"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:105
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1666,7 +1708,7 @@ msgstr ""
 "Синтаксис: gpg [параметры] [файлы]\n"
 "Проверка подписей сделанных доверяемыми ключами\n"
 
-#: g10/helptext.c:48
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1676,7 +1718,7 @@ msgstr ""
 "третьей стороне.  Это необходимо для реализации сети доверия web-of-trust;\n"
 " и не имеет ничего общего с (неявно созданной) сетью сертификатов."
 
-#: g10/helptext.c:54
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1688,17 +1730,17 @@ msgstr ""
 "секретный ключ.  Ответьте \"yes\" для присвоения абсолютного доверия\n"
 "данному ключу\n"
 
-#: g10/helptext.c:61
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Если Вы хотите использовать данный недоверяемый ключ - ответьте \"yes\"."
 
-#: g10/helptext.c:65
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Введите User ID адресата, которому Вы хотите отправить сообщение."
 
-#: g10/helptext.c:69
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1722,7 +1764,7 @@ msgstr ""
 "\n"
 "Первый (главный) ключ всегда должен быть подписывающим."
 
-#: g10/helptext.c:83
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -1733,16 +1775,16 @@ msgstr ""
 "Проконсультируйтесь с Вашим экспертом по безопасности перед тем,\n"
 "как использовать данный ключ."
 
-#: g10/helptext.c:90
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "Введите размер ключа"
 
-#: g10/helptext.c:94 g10/helptext.c:99 g10/helptext.c:111 g10/helptext.c:143
-#: g10/helptext.c:171 g10/helptext.c:176 g10/helptext.c:181
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "Ответьте \"yes\" или \"no\""
 
-#: g10/helptext.c:104
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1754,19 +1796,19 @@ msgstr ""
 "уведомление при ошибке в формате - вместо этого система попробует\n"
 "интерпретировать введенное Вами значение как интервал."
 
-#: g10/helptext.c:116
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "Введите имя владельца ключа"
 
-#: g10/helptext.c:121
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr "введите необязательный, но очень рекомендуемый email адрес"
 
-#: g10/helptext.c:125
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "Введите необязательный комментарий"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1780,11 +1822,11 @@ msgstr ""
 "O  продолжить создание ключа.\n"
 "Q  выйти и прервать создание ключа."
 
-#: g10/helptext.c:139
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Ответьте \"yes\" (или только \"y\"), если Вы готовы создавать подключ."
 
-#: g10/helptext.c:147
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -1853,11 +1895,11 @@ msgstr ""
 "\n"
 "Если Вы не можете определиться с правильным ответом, ответьте \"0\"."
 
-#: g10/helptext.c:185
+#: g10/helptext.c:186
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Ответьте \"yes\", если Вы хотите подписать ВСЕ User ID"
 
-#: g10/helptext.c:189
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -1865,11 +1907,11 @@ msgstr ""
 "Ответьте \"yes\", если Вы действительно хотите удалить данный User ID.\n"
 "Все сертификаты также будут потеряны!"
 
-#: g10/helptext.c:194
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Ответьте \"yes\", если Вы готовы удалить подключ"
 
-#: g10/helptext.c:199
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -1879,7 +1921,7 @@ msgstr ""
 "удалять такие подписи, потому, что она может быть важна для установления\n"
 "достоверности ключа или других ключей подписанных данным ключом."
 
-#: g10/helptext.c:204
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -1891,7 +1933,7 @@ msgstr ""
 "узнаете, какой ключ был использован, т.к. эта подпись может\n"
 "устанавливать достоверность через другие уже удостоверенные ключи."
 
-#: g10/helptext.c:210
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -1899,7 +1941,7 @@ msgstr ""
 "Подпись недействительна.  Это дает основания удалить ее из\n"
 "Вашей связки ключей."
 
-#: g10/helptext.c:214
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -1913,7 +1955,7 @@ msgstr ""
 "Делайте это только если данная самоподпись не действительна по\n"
 "каким-то причинам и существует доступная вторая."
 
-#: g10/helptext.c:222
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -1923,24 +1965,24 @@ msgstr ""
 "на текущий список предпочтений.  Отметка времени на всех затронутых\n"
 "самоподписях будет увеличена на одну секунду\n"
 
-#: g10/helptext.c:229
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Введите парольную фразу (это секретная строка) \n"
 
-#: g10/helptext.c:235
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "Повторите парольную фразу, чтобы убедиться в том, что она набрана правильно."
 
-#: g10/helptext.c:239
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "Введите имя файла, к которому относится данная подпись"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Ответьте \"yes\", если Вы хотите перезаписать файл"
 
-#: g10/helptext.c:249
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -1948,7 +1990,7 @@ msgstr ""
 "Введите новое имя файла. Если Вы нажмете только RETURN будет использован\n"
 "по умолчанию тот файл, который показан в квадратных скобках."
 
-#: g10/helptext.c:255
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -1977,7 +2019,7 @@ msgstr ""
 "      Обычно используется, для указания, что данный e-mail больше\n"
 "      не используется\n"
 
-#: g10/helptext.c:271
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -1987,473 +2029,478 @@ msgstr ""
 "причины создания сертификата отзыва.  Будьте кратки.\n"
 "Для завершения введите пустую строку.\n"
 
-#: g10/helptext.c:286
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "Нет доступной справки"
 
-#: g10/helptext.c:294
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Нет справки для `%s'"
 
-#: g10/import.c:247
+#: g10/import.c:248
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "пропущен блок типа %d\n"
 
 # test it
-#: g10/import.c:256
+#: g10/import.c:257
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu ключей обработано\n"
 
-#: g10/import.c:273
+#: g10/import.c:274
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Всего обработано: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "        пропущено новых ключей: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:279
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "                   без User ID: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "              imported: %lu"
 msgstr "                 импортировано: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:287
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                  неизмененных: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "                 новых User ID: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "               новых подключей: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                новых подписей: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "          новых отзывов ключей: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "    прочитано секретных ключей: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "импортировано секретных ключей: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " неизменённых секретных ключей: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "              не импортировано: %lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:544
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr "ВНИМАНИЕ: ключ %s содержит недопустимые предпочтения\n"
 
-#: g10/import.c:545
+#: g10/import.c:546
 msgid "algorithms on these user IDs:\n"
 msgstr "алгоритмы для этих User ID:\n"
 
-#: g10/import.c:582
+#: g10/import.c:583
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": предпочитает шифр %s\n"
 
-#: g10/import.c:594
+#: g10/import.c:595
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": предпочитает хеш-функцию %s\n"
 
-#: g10/import.c:606
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": предпочитает сжатие %s\n"
 
-#: g10/import.c:619
+#: g10/import.c:620
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "крайне желательно, чтобы Вы обновили Ваши предпочтения и\n"
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "распространили этот ключ, чтобы избежать потенциальных проблем несовпадения "
 "алгоритмов\n"
 
-#: g10/import.c:645
+#: g10/import.c:646
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "Вы можете обновить список предпочтений используя:\n"
 "\tgpg --edit-key %s updpref save\n"
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:694 g10/import.c:1048
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "ключ %s: не имеет User ID\n"
 
-#: g10/import.c:713
+#: g10/import.c:714
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "ключ %s: PKS повреждение ключа исправлено\n"
 
-#: g10/import.c:728
+#: g10/import.c:729
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "ключ %s: принят без самоподписанного User ID \"%s\"\n"
 
-#: g10/import.c:734
+#: g10/import.c:735
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "ключ %s: нет действительных User ID\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 msgid "this may be caused by a missing self-signature\n"
 msgstr "причиной этого может быть отсутствие самоподписи\n"
 
-#: g10/import.c:746 g10/import.c:1168
+#: g10/import.c:747 g10/import.c:1169
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "ключ %s: не найден открытый ключ: %s\n"
 
-#: g10/import.c:752
+#: g10/import.c:753
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "ключ %s: новый ключ - пропущен\n"
 
-#: g10/import.c:761
+#: g10/import.c:762
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "нет доступной для записи таблицы ключей: %s\n"
 
-#: g10/import.c:766 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "сохраняю в `%s'\n"
 
-#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
-#: g10/import.c:2314 g10/import.c:2336
+#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
+#: g10/import.c:2315 g10/import.c:2337
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "ошибка записи таблицы ключей `%s': %s\n"
 
-#: g10/import.c:791
+#: g10/import.c:792
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "ключ %s: открытый ключ \"%s\" импортирован\n"
 
-#: g10/import.c:815
+#: g10/import.c:816
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "ключ %s: не совпадает с копией хранимой у нас\n"
 
-#: g10/import.c:832 g10/import.c:1186
+#: g10/import.c:833 g10/import.c:1187
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "ключ %s: не нахожу оригинальный блок ключей: %s\n"
 
-#: g10/import.c:840 g10/import.c:1193
+#: g10/import.c:841 g10/import.c:1194
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "ключ %s: не могу прочитать оригинальный блок ключей: %s\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "ключ %s: \"%s\" 1 новый User ID\n"
 
-#: g10/import.c:875
+#: g10/import.c:876
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "ключ %s: \"%s\" %d новых User ID\n"
 
-#: g10/import.c:878
+#: g10/import.c:879
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "ключ %s: \"%s\" 1 новая подпись\n"
 
-#: g10/import.c:881
+#: g10/import.c:882
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "ключ %s: \"%s\" %d новых подписей\n"
 
-#: g10/import.c:884
+#: g10/import.c:885
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "ключ %s: \"%s\" 1 новый подключ\n"
 
-#: g10/import.c:887
+#: g10/import.c:888
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "ключ %s: \"%s\" %d новых подключей\n"
 
-#: g10/import.c:908
+#: g10/import.c:909
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "ключ %s: \"%s\" не изменен\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1054
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "ключ %s: секретный ключ с недопустимым шифром %d - пропущен\n"
 
-#: g10/import.c:1064
+#: g10/import.c:1065
 msgid "importing secret keys not allowed\n"
 msgstr "импортирование секретного ключа не позволено\n"
 
-#: g10/import.c:1081 g10/import.c:2329
+#: g10/import.c:1082 g10/import.c:2330
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "нет основной таблицы секретных ключей: %s\n"
 
-#: g10/import.c:1092
+#: g10/import.c:1093
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "ключ %s: секретный ключ импортирован\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1122
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "ключ %s: уже есть в таблице секретных ключей\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1132
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "ключ %s: не найден секретный ключ: %s\n"
 
-#: g10/import.c:1161
+#: g10/import.c:1162
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "ключ %s: нет открытого ключа - не могу применить сертификат отзыва\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1205
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "ключ %s: неправильный сертификат отзыва: %s - отвергнут\n"
 
-#: g10/import.c:1236
+#: g10/import.c:1237
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "ключ %s: \"%s\" сертификат отзыва импортирован\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1302
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "ключ %s: нет User ID для подписи\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1317
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "ключ %s: неподдерживаемый алгоритм с открытым ключом у User ID \"%s\" \n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "ключ %s: неправильная самоподпись на User ID \"%s\"\n"
 
-#: g10/import.c:1336
+#: g10/import.c:1337
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "ключ %s: нет подключа для связывания подключей\n"
 
-#: g10/import.c:1347 g10/import.c:1397
+#: g10/import.c:1348 g10/import.c:1398
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "ключ %s: неподдерживаемый алгоритм с открытым ключом\n"
 
-#: g10/import.c:1349
+#: g10/import.c:1350
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "ключ %s: неправильная связь подключей\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1365
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "ключ %s: удалено многократное связывание подключей\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "ключ %s: нет подключа для отзывающего ключа\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "ключ %s: неправильный отзыв подключа\n"
 
 # test it
-#: g10/import.c:1414
+#: g10/import.c:1415
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "ключ %s: удалена многожественность подключей отзыва\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1457
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "ключ %s: пропущен User ID \"%s\"\n"
 
-#: g10/import.c:1477
+#: g10/import.c:1478
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "ключ %s: пропущен подключ\n"
 
-#: g10/import.c:1504
+#: g10/import.c:1505
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "ключ %s: не экспортируемая подпись (класс 0x%02X) - пропущена\n"
 
-#: g10/import.c:1514
+#: g10/import.c:1515
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "ключ %s: сертификат отзыва в неправильном месте - пропущен\n"
 
-#: g10/import.c:1531
+#: g10/import.c:1532
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "ключ %s: неправильный сертификат отзыва: %s - пропущен\n"
 
-#: g10/import.c:1545
+#: g10/import.c:1546
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "ключ %s: подпись подключа в неправильном месте - пропущена\n"
 
-#: g10/import.c:1553
+#: g10/import.c:1554
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "ключ %s: неизвестный класс подписи (0x%02X) - пропущена\n"
 
-#: g10/import.c:1574
+#: g10/import.c:1575
 #, c-format
 msgid "key %s: expired signature from key %s - skipped\n"
 msgstr "ключ %s: просрочена подпись ключом %s - пропущено\n"
 
-#: g10/import.c:1677
+#: g10/import.c:1678
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "ключ %s: обнаружено дублирование User ID - объединены\n"
 
-#: g10/import.c:1739
+#: g10/import.c:1740
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "ВНИМАНИЕ: ключ %s возможно отозван: запрашиваю ключ отзыва %s\n"
 
-#: g10/import.c:1753
+#: g10/import.c:1754
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "ВНИМАНИЕ: ключ %s возможно отозван: ключ отзыва %s не получен.\n"
 
-#: g10/import.c:1812
+#: g10/import.c:1813
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "ключ %s: \"%s\" добавлен сертификат отзыва\n"
 
-#: g10/import.c:1846
+#: g10/import.c:1847
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "ключ %s: direct key signature добавлена\n"
 
-#: g10/import.c:2235
+#: g10/import.c:2236
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "ПРЕДУПРЕЖДАЮ: S/N ключа не соответствует S/N ключа на карте\n"
 
-#: g10/import.c:2243
+#: g10/import.c:2244
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ПРЕДУПРЕЖДАЮ: главный ключ готов и сохранен в карте\n"
 
-#: g10/import.c:2245
+#: g10/import.c:2246
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ПРЕДУПРЕЖДАЮ: вторичный ключ готов и сохранен в карте\n"
 
-#: g10/keydb.c:167
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "ошибка создания таблицы ключей `%s': %s\n"
 
-#: g10/keydb.c:174
+#: g10/keydb.c:175
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "создана таблица ключей `%s'\n"
 
-#: g10/keydb.c:685
+#: g10/keydb.c:316 g10/keydb.c:319
+#, fuzzy, c-format
+msgid "keyblock resource `%s': %s\n"
+msgstr "ошибка создания `%s': %s\n"
+
+#: g10/keydb.c:698
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "сбой перестройки кэша таблицы ключей: %s\n"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[отозван]"
 
-#: g10/keyedit.c:255
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[самоподпись]"
 
-#: g10/keyedit.c:333 g10/keylist.c:405
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 плохая подпись\n"
 
-#: g10/keyedit.c:335 g10/keylist.c:407
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d плохих подписей\n"
 
-#: g10/keyedit.c:337 g10/keylist.c:409
+#: g10/keyedit.c:344 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 подпись не проверена за отсутствием ключа\n"
 
-#: g10/keyedit.c:339 g10/keylist.c:411
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d подписей не проверено за отсутствием ключей\n"
 
-#: g10/keyedit.c:341 g10/keylist.c:413
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 подпись не проверена из-за ошибки\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:415
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d подписей не проверено из-за ошибок\n"
 
-#: g10/keyedit.c:345
+#: g10/keyedit.c:352
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "обнаружен 1 User ID без действительной самоподписи\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:354
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "обнаружено %d User ID без действительной самоподписи\n"
 
-#: g10/keyedit.c:403 g10/pkclist.c:262
+#: g10/keyedit.c:410 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2465,17 +2512,17 @@ msgstr ""
 "Проверяет паспорт, сверяет отпечатки ключей и т.п.?\n"
 "\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:274
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Доверяю ограниченно\n"
 
-#: g10/keyedit.c:408 g10/pkclist.c:276
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Полностью доверяю\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:434
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2486,38 +2533,48 @@ msgstr ""
 "trust signatures on your behalf.\n"
 
 # check it
-#: g10/keyedit.c:443
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "Введите домен, ограничивающий использование данной подписи, или пустую "
 "строку, если нет ограничений.\n"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "User ID \"%s\" отозван."
 
-#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
-#: g10/keyedit.c:858 g10/keyedit.c:1642
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1728
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Вы уверены, что хотите это подписать? (y/N) "
 
-#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
-#: g10/keyedit.c:1648
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
+#: g10/keyedit.c:1734
 msgid "  Unable to sign.\n"
 msgstr "  Не могу подписать.\n"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "User ID \"%s\" просрочен."
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:650
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "User ID \"%s\" без самоподписи."
 
-#: g10/keyedit.c:676
+#: g10/keyedit.c:678
+#, fuzzy, c-format
+msgid "User ID \"%s\" is signable.  "
+msgstr "User ID \"%s\" без самоподписи."
+
+#: g10/keyedit.c:680
+#, fuzzy
+msgid "Sign it? (y/N) "
+msgstr "Действительно подписать? (y/N)"
+
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2526,11 +2583,11 @@ msgstr ""
 "Самоподпись у \"%s\"\n"
 "это подпись PGP 2.x -стиля.\n"
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:711
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Вы хотите сделать это OpenPGP самоподписью? (y/N) "
 
-#: g10/keyedit.c:699
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2539,11 +2596,11 @@ msgstr ""
 "Ваша текущая подпись на  \"%s\"\n"
 "просрочена.\n"
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:729
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Вы хотите сделать новую подпись для замены просроченной? (y/N) "
 
-#: g10/keyedit.c:724
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2552,55 +2609,55 @@ msgstr ""
 "Ваша текущая подпись на \"%s\"\n"
 "является локальной.\n"
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:754
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Вы хотите сделать это полностью экспортируемой подписью? (y/N) "
 
-#: g10/keyedit.c:749
+#: g10/keyedit.c:775
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" уже локально подписан ключом %s\n"
 
-#: g10/keyedit.c:752
+#: g10/keyedit.c:778
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" уже подписан ключом %s\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:783
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Вы действительно хотите снова подписать это? (y/N)"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:805
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Нечего подписывать ключом %s\n"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "Данный ключ просрочен!"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Срок действительности данного ключа истекает %s.\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:844
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 "Вы хотите, чтобы Ваша подпись была действительна до того же времени?(Y/n) "
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:882
 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:853
+#: g10/keyedit.c:884
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Это сделает ключ несовместимым с PGP 2.x.\n"
 
-#: g10/keyedit.c:878
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2610,31 +2667,31 @@ msgstr ""
 "чье имя указано в User ID ключа?\n"
 "  Если Вы не знаете что ответить, введите \"0\".\n"
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Не буду отвечать.%s\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Я не проверял совсем.%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Я проверил частично.%s\n"
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Я проверил очень тщательно.%s\n"
 
-#: g10/keyedit.c:895
+#: g10/keyedit.c:926
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Ваше решение? (введите '?' для получения информации)"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:950
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2643,75 +2700,75 @@ msgstr ""
 "Вы уверены, что хотите подписать этот ключ\n"
 "своим ключом: \"%s\" (%s)\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:957
 msgid "This will be a self-signature.\n"
 msgstr "Это будет самоподпись.\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:963
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "ВНИМАНИЕ: подпись не будет помечена как не экспортируемая.\n"
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:971
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "ВНИМАНИЕ: подпись не будет помечена как не отзываемая.\n"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:981
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Подпись будет помечена как не экспортируемая.\n"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:988
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Подпись будет помечена как не отзываемая.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:995
 msgid "I have not checked this key at all.\n"
 msgstr "Я совсем не проверял этот ключ.\n"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1000
 msgid "I have checked this key casually.\n"
 msgstr "Я проверил этот ключ только частично.\n"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1005
 msgid "I have checked this key very carefully.\n"
 msgstr "Я очень тщательно проверил этот ключ.\n"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1015
 msgid "Really sign? (y/N) "
 msgstr "Действительно подписать? (y/N)"
 
-#: g10/keyedit.c:1029 g10/keyedit.c:4132 g10/keyedit.c:4223 g10/keyedit.c:4287
-#: g10/keyedit.c:4348 g10/sign.c:369
+#: g10/keyedit.c:1060 g10/keyedit.c:4350 g10/keyedit.c:4441 g10/keyedit.c:4505
+#: g10/keyedit.c:4566 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "не удалось подписать: %s\n"
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1105 g10/keygen.c:3057
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "Данный ключ не защищен.\n"
 
-#: g10/keyedit.c:1109 g10/keygen.c:3045
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Секретная часть главного ключа отсутствует.\n"
 
-#: g10/keyedit.c:1113 g10/keygen.c:3060
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Секретная часть главного ключа отсутствует.\n"
 
-#: g10/keyedit.c:1117 g10/keygen.c:3064
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "Ключ защищен.\n"
 
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Не могу редактировать данный ключ: %s\n"
 
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2719,11 +2776,11 @@ msgstr ""
 "Введите новый пароль для данного секретного ключа.\n"
 "\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:1825
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "повторный ввод пароля некорректен; попробуйте еще раз"
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2731,173 +2788,173 @@ msgstr ""
 "Вы не хотите задать пароль? Это очень ПЛОХАЯ идея!\n"
 "\n"
 
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1195
 msgid "Do you really want to do this? (y/N) "
 msgstr "Вы действительно хотите сделать это? (y/N)"
 
-#: g10/keyedit.c:1235
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "перемещение подписи ключа в правильное место\n"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "сохранить и выйти"
 
-#: g10/keyedit.c:1322
+#: g10/keyedit.c:1354
 msgid "show key fingerprint"
 msgstr "показать отпечаток ключа"
 
-#: g10/keyedit.c:1323
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "вывести список ключей и User ID"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "выбрать User ID N"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1358
 msgid "select subkey N"
 msgstr "выбрать подключ N"
 
-#: g10/keyedit.c:1327
+#: g10/keyedit.c:1359
 msgid "check signatures"
 msgstr "проверка подписей"
 
-#: g10/keyedit.c:1330
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "подписать выбранные User ID [* описание соотв. команд см. ниже]"
 
-#: g10/keyedit.c:1335
+#: g10/keyedit.c:1367
 msgid "sign selected user IDs locally"
 msgstr "локально подписать выбранные User ID"
 
-#: g10/keyedit.c:1337
+#: g10/keyedit.c:1369
 msgid "sign selected user IDs with a trust signature"
 msgstr "подписать выбранные User ID - trust подписью"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "подписать выбранные User ID без возможности отзыва"
 
-#: g10/keyedit.c:1343
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "добавить User ID"
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "добавить фото ID"
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1379
 msgid "delete selected user IDs"
 msgstr "удалить выбранные User ID"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1384
 msgid "add a subkey"
 msgstr "добавить подключ"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr "добавить ключ на карту"
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr "переместить ключ на карту"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1392
 #, fuzzy
 msgid "move a backup key to a smartcard"
 msgstr "переместить ключ на карту"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1396
 msgid "delete selected subkeys"
 msgstr "удалить выбранные подключи"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr "добавить ключ отзыва"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1400
 msgid "delete signatures from the selected user IDs"
 msgstr "удалить подписи у выбранных User ID"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1402
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "сменить срок действительности ключа или выбранных подключей"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1404
 msgid "flag the selected user ID as primary"
 msgstr "пометить выбранные User ID как главные"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1406
 msgid "toggle between the secret and public key listings"
 msgstr "переключение между просмотром открытых и закрытых ключей"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "список предпочтений (экспертам)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "список предпочтений (подробный)"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1413
 msgid "set preference list for the selected user IDs"
 msgstr "установить список предпочтений для выбранных User ID"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1418
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "установить URL предпочитаемого сервера ключей для выбранных User ID"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "сменить пароль"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "изменить уровень доверия владельцу"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1426
 msgid "revoke signatures on the selected user IDs"
 msgstr "отозвать подписи у выбранных User ID"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1428
 msgid "revoke selected user IDs"
 msgstr "отзыв выбранных User ID"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1433
 msgid "revoke key or selected subkeys"
 msgstr "отзыв ключа или выбранных подключей"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1434
 msgid "enable key"
 msgstr "включить ключ"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1435
 msgid "disable key"
 msgstr "отключить ключ"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1436
 msgid "show selected photo IDs"
 msgstr "показать выбранные фото ID"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1556
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "ошибка чтения секретного блока ключа \"%s\": %s\n"
 
-#: g10/keyedit.c:1494
+#: g10/keyedit.c:1574
 msgid "Secret key is available.\n"
 msgstr "Секретный ключ доступен.\n"
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1655
 msgid "Need the secret key to do this.\n"
 msgstr "Для данного действия нужен секретный ключ.\n"
 
-#: g10/keyedit.c:1579
+#: g10/keyedit.c:1663
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Сначала воспользуйтесь командой \"toggle\".\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1682
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -2909,221 +2966,226 @@ msgstr ""
 "  `t' - trust подпись (tsign), `nr' - без возможности отзыва\n"
 "  (nrsign) или любым их сочетанием (ltsign, tnrsign и т.д.).\n"
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1722
 msgid "Key is revoked."
 msgstr "Ключ отозван."
 
-#: g10/keyedit.c:1657
+#: g10/keyedit.c:1741
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Вы действительно хотите подписать ВСЕ User ID? (y/N)"
 
-#: g10/keyedit.c:1660
-msgid "Hint: Select the user IDs to sign\n"
-msgstr "Подсказка: Выберите User IDs для подписи\n"
-
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1748
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "неизвестный тип подписи `%s'\n"
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1771
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Данная команда не допустима в режиме %s.\n"
 
-#: g10/keyedit.c:1713 g10/keyedit.c:1733 g10/keyedit.c:1899
+#: g10/keyedit.c:1793 g10/keyedit.c:1813 g10/keyedit.c:1979
 msgid "You must select at least one user ID.\n"
 msgstr "Вы должны выбрать хотя бы один User ID.\n"
 
-#: g10/keyedit.c:1715
+#: g10/keyedit.c:1795
 msgid "You can't delete the last user ID!\n"
 msgstr "Вы не можете удалить последний User ID!\n"
 
-#: g10/keyedit.c:1717
+#: g10/keyedit.c:1797
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Вы действительно хотите удалить ВСЕ выбранные User IDs? (y/N)"
 
-#: g10/keyedit.c:1718
+#: g10/keyedit.c:1798
 msgid "Really remove this user ID? (y/N) "
 msgstr "Вы действительно хотите удалить данный User ID? (y/N)"
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1848
 msgid "Really move the primary key? (y/N) "
 msgstr "Действительно удалить главный ключ? (y/N)"
 
-#: g10/keyedit.c:1780
+#: g10/keyedit.c:1860
 msgid "You must select exactly one key.\n"
 msgstr "Вы должны выбрать хотя бы один ключ.\n"
 
-#: g10/keyedit.c:1808
+#: g10/keyedit.c:1888
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1822
+#: g10/keyedit.c:1902
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "не могу открыть `%s': %s\n"
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1919
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "ошибка создания таблицы ключей `%s': %s\n"
 
-#: g10/keyedit.c:1863
+#: g10/keyedit.c:1943
 msgid "You must select at least one key.\n"
 msgstr "Вы должны выбрать хотя бы один ключ.\n"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1946
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Вы действительно хотите удалить выбранные ключи? (y/N)"
 
-#: g10/keyedit.c:1867
+#: g10/keyedit.c:1947
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Вы действительно хотите удалить данный ключ? (y/N)"
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1982
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Действительно отозвать ВСЕ выбранные User ID? (y/N)"
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1983
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Действительно отозвать данный User ID? (y/N)"
 
-#: g10/keyedit.c:1921
+#: g10/keyedit.c:2001
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Вы действительно хотите отозвать ключ целиком? (y/N)"
 
-#: g10/keyedit.c:1932
+#: g10/keyedit.c:2012
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Вы действительно хотите отозвать выбранные подключи? (y/N)"
 
-#: g10/keyedit.c:1934
+#: g10/keyedit.c:2014
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Вы действительно хотите отозвать данный подключ? (y/N)"
 
-#: g10/keyedit.c:1975
+#: g10/keyedit.c:2055
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "Невозможно присвоить степень доверия пока используется указанная "
 "пользователем таблица доверий\n"
 
-#: g10/keyedit.c:2007
+#: g10/keyedit.c:2087
 msgid "Set preference list to:\n"
 msgstr "установить предпочтения в:\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2093
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Действительно обновить предпочтения для выбранных User ID? (y/N)"
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2095
 msgid "Really update the preferences? (y/N) "
 msgstr "Действительно обновить предпочтения? (y/N)"
 
-#: g10/keyedit.c:2065
+#: g10/keyedit.c:2157
+#, fuzzy, c-format
+msgid "Unable to clean `%s'\n"
+msgstr "не могу запустить программу `%s': %s\n"
+
+#: g10/keyedit.c:2160
+msgid "Please specify item to clean: `sigs', `uids', or `all'\n"
+msgstr ""
+
+#: g10/keyedit.c:2171
 msgid "Save changes? (y/N) "
 msgstr "Сохранить изменения? (y/N)"
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2174
 msgid "Quit without saving? (y/N) "
 msgstr "Выйти без сохранения? (y/N)"
 
-#: g10/keyedit.c:2078
+#: g10/keyedit.c:2184
 #, c-format
 msgid "update failed: %s\n"
 msgstr "сбой при обновлении: %s\n"
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2191
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "сбой при обновлений секретного ключа: %s\n"
 
-#: g10/keyedit.c:2092
+#: g10/keyedit.c:2198
 msgid "Key not changed so no update needed.\n"
 msgstr "ключ не изменялся - обновление не нужно.\n"
 
-#: g10/keyedit.c:2164
+#: g10/keyedit.c:2271
 msgid "Digest: "
 msgstr "Хэш-функции: "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2323
 msgid "Features: "
 msgstr "Опции: "
 
 # check it
-#: g10/keyedit.c:2227
+#: g10/keyedit.c:2334
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2242 g10/keylist.c:307
+#: g10/keyedit.c:2349 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "Предпочитаемый сервер ключей: "
 
-#: g10/keyedit.c:2473
+#: g10/keyedit.c:2580
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Данный ключ был отозван %s - %s ключом %s\n"
 
-#: g10/keyedit.c:2494
+#: g10/keyedit.c:2601
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Данный ключ может быть отозван %s ключом %s "
 
-#: g10/keyedit.c:2500
+#: g10/keyedit.c:2607
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2516 g10/keyedit.c:2572 g10/keyedit.c:2684 g10/keyedit.c:2699
-#: g10/keylist.c:193 g10/keyserver.c:422
+#: g10/keyedit.c:2623 g10/keyedit.c:2679 g10/keyedit.c:2792 g10/keyedit.c:2807
+#: g10/keylist.c:194 g10/keyserver.c:421
 #, c-format
 msgid "created: %s"
 msgstr "создан: %s"
 
-#: g10/keyedit.c:2519 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:931
+#: g10/keyedit.c:2626 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:948
 #, c-format
 msgid "revoked: %s"
 msgstr "отозван: %s"
 
-#: g10/keyedit.c:2521 g10/keylist.c:757 g10/keylist.c:886
+#: g10/keyedit.c:2628 g10/keylist.c:758 g10/keylist.c:887
 #, c-format
 msgid "expired: %s"
 msgstr "просрочен с: %s"
 
-#: g10/keyedit.c:2523 g10/keyedit.c:2574 g10/keyedit.c:2686 g10/keyedit.c:2701
-#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
-#: g10/keylist.c:913 g10/keyserver.c:428 g10/mainproc.c:937
+#: g10/keyedit.c:2630 g10/keyedit.c:2681 g10/keyedit.c:2794 g10/keyedit.c:2809
+#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
+#: g10/keylist.c:914 g10/keyserver.c:427 g10/mainproc.c:954
 #, c-format
 msgid "expires: %s"
 msgstr "годен до: %s"
 
-#: g10/keyedit.c:2525
+#: g10/keyedit.c:2632
 #, c-format
 msgid "usage: %s"
 msgstr "применяемость: %s"
 
-#: g10/keyedit.c:2540
+#: g10/keyedit.c:2647
 #, c-format
 msgid "trust: %s"
 msgstr "доверие: %s"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2651
 #, c-format
 msgid "validity: %s"
 msgstr "достоверность: %s"
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2658
 msgid "This key has been disabled"
 msgstr "Данный ключ отключен"
 
-#: g10/keyedit.c:2579 g10/keylist.c:199
+#: g10/keyedit.c:2686 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2754
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Не может быть предпочтений в PGP 2.x-стиле User ID.\n"
 
-#: g10/keyedit.c:2654
+#: g10/keyedit.c:2762
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3131,18 +3193,18 @@ msgstr ""
 "Учтите, что показанные степени достоверности могут быть неверными,\n"
 "пока Вы не перезапустите программу.\n"
 
-#: g10/keyedit.c:2718 g10/keyserver.c:432 g10/mainproc.c:1577
-#: g10/trustdb.c:1178
+#: g10/keyedit.c:2826 g10/keyedit.c:3201 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1690
 msgid "revoked"
 msgstr "отозван"
 
-#: g10/keyedit.c:2720 g10/keyserver.c:436 g10/mainproc.c:1579
-#: g10/trustdb.c:531
+#: g10/keyedit.c:2828 g10/keyedit.c:3203 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1692
 msgid "expired"
 msgstr "просрочен с"
 
 # check it
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2893
 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"
@@ -3150,7 +3212,7 @@ msgstr ""
 "ВНИМАНИЕ: нет User ID помеченного как главный.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 
-#: g10/keyedit.c:2845
+#: g10/keyedit.c:2953
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3159,45 +3221,75 @@ msgstr ""
 "ВНИМАНИЕ: Это ключ PGP2.  Добавление фото ID может в некоторых версиях\n"
 "         PGP вызвать выбраковку ключа.\n"
 
-#: g10/keyedit.c:2850 g10/keyedit.c:3128
+#: g10/keyedit.c:2958 g10/keyedit.c:3307
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Вы уверены, что хотите добавить это? (y/N) "
 
-#: g10/keyedit.c:2856
+#: g10/keyedit.c:2964
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Вы не можете добавить фото ID в ключ PGP2-типа.\n"
 
-#: g10/keyedit.c:2996
+#: g10/keyedit.c:3104
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Удалить данную действительную подпись? (y/N/q)"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3114
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Удалить данную недействительную подпись? (y/N/q)"
 
-#: g10/keyedit.c:3010
+#: g10/keyedit.c:3118
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Удалить данную неизвестную подпись? (y/N/q)"
 
-#: g10/keyedit.c:3016
+#: g10/keyedit.c:3124
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Действительно удалить данную самоподпись? (y/N)"
 
-#: g10/keyedit.c:3030
+#: g10/keyedit.c:3138
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Удалена %d подпись.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3139
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Удалено %d подписи.\n"
 
-#: g10/keyedit.c:3034
+#: g10/keyedit.c:3142
 msgid "Nothing deleted.\n"
 msgstr "Ничего не удалено.\n"
 
-#: g10/keyedit.c:3123
+#: g10/keyedit.c:3167
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed.\n"
+msgstr "User ID \"%s\" отозван."
+
+#: g10/keyedit.c:3168
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed.\n"
+msgstr "User ID \"%s\" отозван."
+
+#: g10/keyedit.c:3173
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean.\n"
+msgstr "User ID \"%s\" уже отозван\n"
+
+#: g10/keyedit.c:3205 g10/trustdb.c:1694
+#, fuzzy
+msgid "invalid"
+msgstr "неправильный ASCII формат"
+
+#: g10/keyedit.c:3207
+#, fuzzy, c-format
+msgid "User ID \"%s\" removed: %s\n"
+msgstr "User ID \"%s\" отозван."
+
+#: g10/keyedit.c:3214
+#, fuzzy
+msgid "No user IDs are removable.\n"
+msgstr "User ID \"%s\" уже отозван\n"
+
+#: g10/keyedit.c:3302
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3206,328 +3298,333 @@ msgstr ""
 "ВНИМАНИЕ: Это ключ PGP 2.x. Добавление назначенного отзывающим ключа\n"
 "          может в некоторых версиях PGP вызвать выбраковку ключа.\n"
 
-#: g10/keyedit.c:3134
+#: g10/keyedit.c:3313
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Вы не можете добавить назначенный отзывающим ключ в PGP 2.x ключ.\n"
 
-#: g10/keyedit.c:3154
+#: g10/keyedit.c:3333
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Укажите User ID ключа, назначенного отзывающим: "
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3356
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "нельзя назначить ключ PGP 2.x отзывающим\n"
 
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3371
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "ключ не может быть назначен отзывающим сам себя\n"
 
-#: g10/keyedit.c:3214
+#: g10/keyedit.c:3393
 msgid "this key has already been designated as a revoker\n"
 msgstr "этот ключ уже назначен отзывающим\n"
 
-#: g10/keyedit.c:3233
+#: g10/keyedit.c:3412
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "ВНИМАНИЕ: назначение ключа отзывающим невозможно будет отменить!\n"
 
-#: g10/keyedit.c:3239
+#: g10/keyedit.c:3418
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Вы уверены, что хотите назначить данный ключ отзывающим? (y/N)"
 
-#: g10/keyedit.c:3300
+#: g10/keyedit.c:3479
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Снимите выделение с секретного ключа.\n"
 
-#: g10/keyedit.c:3306
+#: g10/keyedit.c:3485
 msgid "Please select at most one subkey.\n"
 msgstr "Выделите не менее одного подключа.\n"
 
-#: g10/keyedit.c:3310
+#: g10/keyedit.c:3489
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Смена срока действительности подключа.\n"
 
-#: g10/keyedit.c:3313
+#: g10/keyedit.c:3492
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Смена срока действия главного ключа\n"
 
-#: g10/keyedit.c:3359
+#: g10/keyedit.c:3538
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Вы не можете изменить срок действия v3 ключа\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3554
 msgid "No corresponding signature in secret ring\n"
 msgstr "Нет соответствующей подписи в связке секретных\n"
 
-#: g10/keyedit.c:3455
+#: g10/keyedit.c:3634
 msgid "Please select exactly one user ID.\n"
 msgstr "Выберите только один User ID.\n"
 
-#: g10/keyedit.c:3494 g10/keyedit.c:3604 g10/keyedit.c:3724
+#: g10/keyedit.c:3673 g10/keyedit.c:3783 g10/keyedit.c:3903
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "пропуск v3 самоподписи на User ID \"%s\"\n"
 
-#: g10/keyedit.c:3665
+#: g10/keyedit.c:3844
 msgid "Enter your preferred keyserver URL: "
 msgstr "Введите URL предпочтаемого сервера ключей: "
 
-#: g10/keyedit.c:3745
+#: g10/keyedit.c:3924
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Вы действительно хотите заменить его? (y/N)"
 
-#: g10/keyedit.c:3746
+#: g10/keyedit.c:3925
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Вы действительно хотите удалить его? (y/N)"
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3987
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Нет User ID с индексом %d\n"
 
+#: g10/keyedit.c:4045
+#, fuzzy, c-format
+msgid "No user ID with hash %s\n"
+msgstr "Нет User ID с индексом %d\n"
+
 # c-format
-#: g10/keyedit.c:3854
+#: g10/keyedit.c:4072
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Нет подключа с индексом %d\n"
 
-#: g10/keyedit.c:3971
+#: g10/keyedit.c:4189
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "User ID: \"%s\"\n"
 
-#: g10/keyedit.c:3974 g10/keyedit.c:4038 g10/keyedit.c:4081
+#: g10/keyedit.c:4192 g10/keyedit.c:4256 g10/keyedit.c:4299
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "подписано Вашим ключом %s от %s%s%s\n"
 
-#: g10/keyedit.c:3976 g10/keyedit.c:4040 g10/keyedit.c:4083
+#: g10/keyedit.c:4194 g10/keyedit.c:4258 g10/keyedit.c:4301
 msgid " (non-exportable)"
 msgstr " (не экспортируемая)"
 
-#: g10/keyedit.c:3980
+#: g10/keyedit.c:4198
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Срок действительности подписи закончился %s.\n"
 
-#: g10/keyedit.c:3984
+#: g10/keyedit.c:4202
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Вы уверены, что хотите отозвать? (y/N) "
 
-#: g10/keyedit.c:3988
+#: g10/keyedit.c:4206
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Создать сертификат отзыва для данной подписи? (y/N) "
 
-#: g10/keyedit.c:4015
+#: g10/keyedit.c:4233
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Вы подписали данные User ID на ключе %s:\n"
 
-#: g10/keyedit.c:4041
+#: g10/keyedit.c:4259
 msgid " (non-revocable)"
 msgstr " (не отзываемая)"
 
-#: g10/keyedit.c:4048
+#: g10/keyedit.c:4266
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "отзыв Вашим ключом %s от %s\n"
 
-#: g10/keyedit.c:4070
+#: g10/keyedit.c:4288
 msgid "You are about to revoke these signatures:\n"
 msgstr "Вы отзываете следующие подписи:\n"
 
-#: g10/keyedit.c:4090
+#: g10/keyedit.c:4308
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Действительно создать сертификат отзыва? (y/N) "
 
-#: g10/keyedit.c:4120
+#: g10/keyedit.c:4338
 msgid "no secret key\n"
 msgstr "нет секретного ключа\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4408
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" уже отозван\n"
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4425
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "ВНИМАНИЕ: User ID подпись датирована %d секундами в будущем\n"
 
-#: g10/keyedit.c:4271
+#: g10/keyedit.c:4489
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Ключ %s уже отозван\n"
 
-#: g10/keyedit.c:4333
+#: g10/keyedit.c:4551
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Подключ %s уже отозван\n"
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4646
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Показ %s фото ID размера %ld для ключа %s (uid %d)\n"
 
-#: g10/keygen.c:293
+#: g10/keygen.c:258
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "предпочтение `%s' дублируется\n"
 
-#: g10/keygen.c:300
+#: g10/keygen.c:265
 msgid "too many cipher preferences\n"
 msgstr "слишком много предпочтений для шифра\n"
 
-#: g10/keygen.c:302
+#: g10/keygen.c:267
 msgid "too many digest preferences\n"
 msgstr "слишком много предпочтений для хэш-функций\n"
 
-#: g10/keygen.c:304
+#: g10/keygen.c:269
 msgid "too many compression preferences\n"
 msgstr "слишком много предпочтений для методов сжатия\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:394
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "недопустимое вхождение `%s' в строке предпочтений\n"
 
-#: g10/keygen.c:829
+#: g10/keygen.c:822
 msgid "writing direct signature\n"
 msgstr "writing direct signature\n"
 
-#: g10/keygen.c:868
+#: g10/keygen.c:861
 msgid "writing self signature\n"
 msgstr "сохраняем самоподпись\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing key binding signature\n"
 msgstr "сохраняем объединяющую подпись\n"
 
-#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2632
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "неверный размер ключа; используется %u бит\n"
 
-#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2638
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "размер ключа приведен к %u битам\n"
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1239
 msgid "Sign"
 msgstr ""
 
-#: g10/keygen.c:1252
+#: g10/keygen.c:1242
 msgid "Encrypt"
 msgstr ""
 
-#: g10/keygen.c:1255
+#: g10/keygen.c:1245
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1263
+#: g10/keygen.c:1253
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1268
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1282
+#: g10/keygen.c:1272
 msgid "Current allowed actions: "
 msgstr "Допустимы действия:"
 
-#: g10/keygen.c:1287
+#: g10/keygen.c:1277
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Переключить возможность использования для подписи\n"
 
-#: g10/keygen.c:1290
+#: g10/keygen.c:1280
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Переключить возможность использования для шифрования\n"
 
-#: g10/keygen.c:1293
+#: g10/keygen.c:1283
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Переключить возможность использования для аутентификации\n"
 
-#: g10/keygen.c:1296
+#: g10/keygen.c:1286
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Завершено\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1340
 msgid "Please select what kind of key you want:\n"
 msgstr "Выберите тип ключа:\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1342
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA и ElGamal (по умолчанию)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1343
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (только для подписи)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1345
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (с требуемыми возможностями)\n"
 
-#: g10/keygen.c:1357
+#: g10/keygen.c:1347
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (только для шифрования)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1348
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (только для подписи)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1350
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (только для шифрования)\n"
 
-#: g10/keygen.c:1362
+#: g10/keygen.c:1352
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (с требуемыми возможностями)\n"
 
-#: g10/keygen.c:1431 g10/keygen.c:2509
+#: g10/keygen.c:1421 g10/keygen.c:2506
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "Пара ключей DSA будет иметь длину %u бит.\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1431
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "ключи %s могут иметь длину от %u до %u бит.\n"
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1438
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Какой размер ключа Вам необходим? (%u) "
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1452
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "размер ключей %s должен быть в пределах %u-%u\n"
 
-#: g10/keygen.c:1468
+#: g10/keygen.c:1458
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Запрашиваемый размер ключа %u бит\n"
 
-#: g10/keygen.c:1473 g10/keygen.c:1478
+#: g10/keygen.c:1463 g10/keygen.c:1468
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "округлен до %u бит\n"
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1515
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3543,7 +3640,7 @@ msgstr ""
 "      <n>m = срок действительности n месяцев\n"
 "      <n>y = срок действительности n лет\n"
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1526
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3559,37 +3656,38 @@ msgstr ""
 "      <n>m = срок действительности подписи n месяцев\n"
 "      <n>y = срок действительности подписи n лет\n"
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1549
 msgid "Key is valid for? (0) "
 msgstr "Ключ действителен до? (0) "
 
-#: g10/keygen.c:1563
-msgid "Signature is valid for? (0) "
+#: g10/keygen.c:1554
+#, fuzzy, c-format
+msgid "Signature is valid for? (%s) "
 msgstr "Подпись действительна до? (0) "
 
-#: g10/keygen.c:1568
+#: g10/keygen.c:1572
 msgid "invalid value\n"
 msgstr "недопустимое значение\n"
 
-#: g10/keygen.c:1575
+#: g10/keygen.c:1579
 msgid "Key does not expire at all\n"
 msgstr "Ключ не имеет ограничения срока действительности\n"
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1580
 msgid "Signature does not expire at all\n"
 msgstr "Подпись не имеет ограничения срока действительности\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1585
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Ключ действителен до: %s\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1586
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Подпись действительна до %s\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1592
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3597,11 +3695,11 @@ msgstr ""
 "Ваша система не может корректно отображать даты после 2038.\n"
 "Однако, корректно обрабатываются даты до 2106.\n"
 
-#: g10/keygen.c:1595
+#: g10/keygen.c:1597
 msgid "Is this correct? (y/N) "
 msgstr "Все верно? (y/N) "
 
-#: g10/keygen.c:1638
+#: g10/keygen.c:1641
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3616,44 +3714,44 @@ msgstr ""
 "    \"Baba Yaga (pensioner) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1651
+#: g10/keygen.c:1654
 msgid "Real name: "
 msgstr "Ваше настоящее имя: "
 
-#: g10/keygen.c:1659
+#: g10/keygen.c:1662
 msgid "Invalid character in name\n"
 msgstr "Недопустимый символ в Имени\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1664
 msgid "Name may not start with a digit\n"
 msgstr "Имя не должно начинаться с цифры\n"
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1666
 msgid "Name must be at least 5 characters long\n"
 msgstr "Имя не должно быть короче 5 символов\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1674
 msgid "Email address: "
 msgstr "Email-адрес: "
 
-#: g10/keygen.c:1682
+#: g10/keygen.c:1685
 msgid "Not a valid email address\n"
 msgstr "Неправильный e-mail адрес\n"
 
-#: g10/keygen.c:1690
+#: g10/keygen.c:1693
 msgid "Comment: "
 msgstr "Комментарий: "
 
-#: g10/keygen.c:1696
+#: g10/keygen.c:1699
 msgid "Invalid character in comment\n"
 msgstr "Недопустимый символ в комментарии\n"
 
-#: g10/keygen.c:1719
+#: g10/keygen.c:1722
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Используется таблица символов: `%s'.\n"
 
-#: g10/keygen.c:1725
+#: g10/keygen.c:1728
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3664,7 +3762,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1733
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Не вставляйте email-адрес в имя пользователя или комментарий\n"
 
@@ -3679,24 +3777,24 @@ msgstr "Не вставляйте email-адрес в имя пользоват�
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1746
+#: g10/keygen.c:1749
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1756
+#: g10/keygen.c:1759
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Сменить (N)Имя, (C)Комментарий, (E)email-адрес или (Q)Выход? "
 
-#: g10/keygen.c:1757
+#: g10/keygen.c:1760
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Сменить (N)Имя, (C)Комментарий, (E)email-адрес или (O)Принять/(Q)Выход? "
 
-#: g10/keygen.c:1776
+#: g10/keygen.c:1779
 msgid "Please correct the error first\n"
 msgstr "Сначала исправьте ошибку\n"
 
-#: g10/keygen.c:1816
+#: g10/keygen.c:1819
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3704,12 +3802,12 @@ msgstr ""
 "Для защиты секретного ключа необходим пароль.\n"
 "\n"
 
-#: g10/keygen.c:1826 g10/passphrase.c:1105
+#: g10/keygen.c:1829 g10/passphrase.c:786
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1832
+#: g10/keygen.c:1835
 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"
@@ -3721,7 +3819,7 @@ msgstr ""
 "запустив данную программу с ключом \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1857
 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"
@@ -3733,50 +3831,50 @@ msgstr ""
 "обращения к дискам) в процессе генерации; это даст генератору\n"
 "случайных чисел возможность получить лучшую энтропию.\n"
 
-#: g10/keygen.c:2578
+#: g10/keygen.c:2575
 msgid "Key generation canceled.\n"
 msgstr "Создание ключа прервано.\n"
 
-#: g10/keygen.c:2766 g10/keygen.c:2910
+#: g10/keygen.c:2774 g10/keygen.c:2918
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "сохранение открытого ключа в `%s'\n"
 
-#: g10/keygen.c:2768 g10/keygen.c:2913
+#: g10/keygen.c:2776 g10/keygen.c:2921
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "сохранение заглушки секретного ключа в `%s'\n"
 
-#: g10/keygen.c:2771 g10/keygen.c:2916
+#: g10/keygen.c:2779 g10/keygen.c:2924
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "сохранение секретного ключа в `%s'\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2907
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "нет доступной для записи таблицы открытых ключей: %s\n"
 
-#: g10/keygen.c:2905
+#: g10/keygen.c:2913
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "нет доступной для записи таблицы закрытых ключей: %s\n"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2931
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "ошибка записи таблицы открытых ключей `%s': %s\n"
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2938
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "ошибка записи таблицы секретных ключей `%s': %s\n"
 
-#: g10/keygen.c:2953
+#: g10/keygen.c:2961
 msgid "public and secret key created and signed.\n"
 msgstr "открытый и закрытый ключи созданы и подписаны.\n"
 
-#: g10/keygen.c:2964
+#: g10/keygen.c:2972
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -3785,384 +3883,365 @@ msgstr ""
 "Учтите, что данный ключ не может использоваться для шифрования.  Вы можете\n"
 "воспользоваться командой \"--edit-key\" и создать подключ для этих целей.\n"
 
-#: g10/keygen.c:2976 g10/keygen.c:3105 g10/keygen.c:3220
+#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Сбой при создании ключа: %s\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3156 g10/sign.c:290
+#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
 #, 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:3030 g10/keygen.c:3158 g10/sign.c:292
+#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
 #, 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:3039 g10/keygen.c:3169
+#: g10/keygen.c:3047 g10/keygen.c:3177
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "ПРЕДУПРЕЖДАЮ: создание подключа для ключей v3 не совместимо с OpenPGP\n"
 
-#: g10/keygen.c:3078 g10/keygen.c:3202
+#: g10/keygen.c:3086 g10/keygen.c:3210
 msgid "Really create? (y/N) "
 msgstr "Действительно создать? (y/N)"
 
-#: g10/keygen.c:3355
+#: g10/keygen.c:3363
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "сбой сохранения ключа на карту: %s\n"
 
-#: g10/keygen.c:3402
+#: g10/keygen.c:3410
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "не могу создать резервную копию, файл `%s': %s\n"
 
-#: g10/keygen.c:3428
+#: g10/keygen.c:3436
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "ЗАМЕТЬТЕ: архивная копия ключа на карте сохранена в `%s'\n"
 
-#: g10/keygen.c:3508
-#, c-format
-msgid "length of RSA modulus is not %d\n"
-msgstr "длина модуля RSA не %d\n"
-
-#: g10/keygen.c:3514
-msgid "public exponent too large (more than 32 bits)\n"
-msgstr "открытая экспонента слишком велика (более 32 бит)\n"
-
-#: g10/keygen.c:3520 g10/keygen.c:3526
-#, c-format
-msgid "length of an RSA prime is not %d\n"
-msgstr "длина простого числа в RSA не %d\n"
-
-#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
+#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
 msgid "never     "
 msgstr "никогда   "
 
-#: g10/keylist.c:264
+#: g10/keylist.c:265
 msgid "Critical signature policy: "
 msgstr "Критические правила для подписи: "
 
-#: g10/keylist.c:266
+#: g10/keylist.c:267
 msgid "Signature policy: "
 msgstr "Политика подписи: "
 
 # check it
-#: g10/keylist.c:305
+#: g10/keylist.c:306
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:354 g10/keylist.c:398
+#: g10/keylist.c:355 g10/keylist.c:399
 msgid "WARNING: invalid notation data found\n"
 msgstr "ВНИМАНИЕ: найдена недопустимая форма записи данных\n"
 
-#: g10/keylist.c:372
+#: g10/keylist.c:373
 msgid "Critical signature notation: "
 msgstr "Критическое примечание к подписи: "
 
-#: g10/keylist.c:374
+#: g10/keylist.c:375
 msgid "Signature notation: "
 msgstr "Примечание к подписи"
 
-#: g10/keylist.c:385
+#: g10/keylist.c:386
 msgid "not human readable"
 msgstr "нечитаемо для человека"
 
-#: g10/keylist.c:486
+#: g10/keylist.c:487
 msgid "Keyring"
 msgstr "Таблица ключей"
 
-#: g10/keylist.c:792
+#: g10/keylist.c:793
 #, c-format
 msgid "expired: %s)"
 msgstr "просрочен с: %s)"
 
-#: g10/keylist.c:1488
+#: g10/keylist.c:1489
 msgid "Primary key fingerprint:"
 msgstr " Отпечаток главного ключа:"
 
-#: g10/keylist.c:1490
+#: g10/keylist.c:1491
 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:1497
+#: g10/keylist.c:1498
 msgid " Primary key fingerprint:"
 msgstr " Отпечаток главного ключа:"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1500
 msgid "      Subkey fingerprint:"
 msgstr "         Отпечаток подключа:"
 
-#: g10/keylist.c:1503 g10/keylist.c:1507
+#: g10/keylist.c:1504 g10/keylist.c:1508
 msgid "      Key fingerprint ="
 msgstr "Отпечаток ключа ="
 
-#: g10/keylist.c:1574
+#: g10/keylist.c:1575
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1245
+#: g10/keyring.c:1246
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "при переименовании `%s' в `%s' произошел сбой: %s\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1252
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ВНИМАНИЕ: Существуют 2 файла с конфиденциальной информацией.\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s осталось без изменений\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1255
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s новых\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1256
 msgid "Please fix this possible security flaw\n"
 msgstr "Исправьте эту прореху безопасности\n"
 
-#: g10/keyring.c:1375
+#: g10/keyring.c:1376
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "кеширую связки ключей `%s'\n"
 
-#: g10/keyring.c:1421
+#: g10/keyring.c:1422
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu ключей закешировано за это время (%lu подписей)\n"
 
-#: g10/keyring.c:1433
+#: g10/keyring.c:1434
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu ключей закешированно (%lu подписей)\n"
 
-#: g10/keyring.c:1504
+#: g10/keyring.c:1505
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: таблица ключей создана\n"
 
-#: g10/keyserver.c:107
+#: g10/keyserver.c:105
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "ВНИМАНИЕ: параметр сервера ключей `%s' не используется на данной платформе\n"
 
-#: g10/keyserver.c:434
+#: g10/keyserver.c:433
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:635
+#: g10/keyserver.c:634
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Введите число(а), N) Следующий или Q) Выход> "
 
 # test it
-#: g10/keyserver.c:718 g10/keyserver.c:1238
+#: g10/keyserver.c:717 g10/keyserver.c:1267
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "invalid keyserver protocol (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:808
+#: g10/keyserver.c:815
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "ключ \"%s\" не найден на сервере ключей\n"
 
-#: g10/keyserver.c:810
+#: g10/keyserver.c:817
 msgid "key not found on keyserver\n"
 msgstr "ключ не найден на сервере ключей\n"
 
-#: g10/keyserver.c:985
+#: g10/keyserver.c:1014
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "запрашиваю ключ %s с %s сервера %s\n"
 
-#: g10/keyserver.c:989
+#: g10/keyserver.c:1018
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "получение ключа %s с %s\n"
 
-#: g10/keyserver.c:1141
+#: g10/keyserver.c:1170
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "отправляю ключ %s на %s сервер %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1174
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "отправка ключа %s на %s\n"
 
-#: g10/keyserver.c:1188
+#: g10/keyserver.c:1217
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "поиск \"%s\" на %s сервере %s\n"
 
-#: g10/keyserver.c:1191
+#: g10/keyserver.c:1220
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "поиск \"%s\" на %s\n"
 
 # test it
-#: g10/keyserver.c:1198 g10/keyserver.c:1293
+#: g10/keyserver.c:1227 g10/keyserver.c:1322
 msgid "no keyserver action!\n"
 msgstr ""
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1275
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "ВНИМАНИЕ: обработчик сервера ключей от другой версии GnuPG (%s)\n"
 
-#: g10/keyserver.c:1255
+#: g10/keyserver.c:1284
 msgid "keyserver did not send VERSION\n"
 msgstr "сервер ключей не прислал VERSION\n"
 
-#: g10/keyserver.c:1314
+#: g10/keyserver.c:1343
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "не заданы серверы ключей (используйте --keyserver)\n"
 
-#: g10/keyserver.c:1320
+#: g10/keyserver.c:1349
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1361
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "нет обработчика для схемы сервера ключей `%s'\n"
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1366
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "действие `%s' не поддерживается серверами ключей `%s'\n"
 
-#: g10/keyserver.c:1345
-#, c-format
-msgid "gpgkeys_%s does not support handler version %d\n"
+#: g10/keyserver.c:1374
+#, fuzzy, c-format
+msgid "%s does not support handler version %d\n"
 msgstr "gpgkeys_%s не поддерживает версию обработчика %d\n"
 
-#: g10/keyserver.c:1351
+#: g10/keyserver.c:1381
 msgid "keyserver timed out\n"
 msgstr "превышено время ожидания сервера ключей\n"
 
-#: g10/keyserver.c:1356
+#: g10/keyserver.c:1386
 msgid "keyserver internal error\n"
 msgstr "ошибка сервера ключей\n"
 
-#: g10/keyserver.c:1365
+#: g10/keyserver.c:1395
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "ошибка связи с сервером ключей: %s\n"
 
-#: g10/keyserver.c:1390 g10/keyserver.c:1424
+#: g10/keyserver.c:1420 g10/keyserver.c:1454
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" не идентификатор ключа: пропущен\n"
 
-#: g10/keyserver.c:1681
+#: g10/keyserver.c:1711
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "ВНИМАНИЕ: невозможно обновить ключ %s с %s: %s\n"
 
-#: g10/keyserver.c:1703
+#: g10/keyserver.c:1733
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "обновление 1 ключа из %s\n"
 
-#: g10/keyserver.c:1705
+#: g10/keyserver.c:1735
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "обновление %d ключей из %s\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:249
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "странный размер зашифрованного сеансового ключа (%d)\n"
 
-#: g10/mainproc.c:262
-#, c-format
-msgid "bad passphrase or unknown cipher algorithm (%d)\n"
-msgstr "плохой пароль или незнакомый алгоритм шифрования (%d)\n"
-
-#: g10/mainproc.c:299
+#: g10/mainproc.c:300
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "сеансовый ключ зашифрован %s \n"
 
-#: g10/mainproc.c:309
+#: g10/mainproc.c:310
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "пароль создан с незнакомой хеш-фкнкцией %d\n"
 
-#: g10/mainproc.c:375
+#: g10/mainproc.c:376
 #, c-format
 msgid "public key is %s\n"
 msgstr "открытый ключ %s\n"
 
-#: g10/mainproc.c:430
+#: g10/mainproc.c:431
 msgid "public key encrypted data: good DEK\n"
 msgstr "данные зашифрованы открытым ключом: правильный DEK\n"
 
-#: g10/mainproc.c:463
+#: g10/mainproc.c:464
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "зашифровано %u-битным ключом %s, с ID %s, созданным %s\n"
 
-#: g10/mainproc.c:467 g10/pkclist.c:218
+#: g10/mainproc.c:468 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:472
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "зашифровано ключом %s с ID %s\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "сбой расшифрования с открытым ключом: %s\n"
 
-#: g10/mainproc.c:499
+#: g10/mainproc.c:500
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "зашифровано с %lu паролями\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:502
 msgid "encrypted with 1 passphrase\n"
 msgstr "зашифровано с 1 паролем\n"
 
-#: g10/mainproc.c:529 g10/mainproc.c:551
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "принятие %s зашифрованных данных\n"
 
-#: g10/mainproc.c:537
+#: g10/mainproc.c:538
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "шифр IDEA недоступен, попробуйте использовать взамен %s\n"
 
-#: g10/mainproc.c:569
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr "Расшифровано\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:574
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ВНИМАНИЕ: целостность сообщения не защищена\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ВНИМАНИЕ: зашифрованное сообщение было изменено!\n"
 
-#: g10/mainproc.c:592
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "сбой расшифрования: %s\n"
@@ -4176,304 +4255,293 @@ msgstr "ЗАМЕТЬТЕ: отправитель требует \"только �
 msgid "original file name='%.*s'\n"
 msgstr "оригинальное имя файла='%.*s'\n"
 
-#: g10/mainproc.c:786
+#: g10/mainproc.c:803
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "самостоятельный сертификат отзыва: \"gpg --import\" для применения\n"
 
-#: g10/mainproc.c:1290
+#: g10/mainproc.c:1307
 msgid "signature verification suppressed\n"
 msgstr "проверка подписи подавлена\n"
 
-#: g10/mainproc.c:1332 g10/mainproc.c:1342
+#: g10/mainproc.c:1349 g10/mainproc.c:1359
 msgid "can't handle these multiple signatures\n"
 msgstr "не могу обработать эти множественные подписи\n"
 
-#: g10/mainproc.c:1352
+#: g10/mainproc.c:1369
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Подпись сделана %s\n"
 
-#: g10/mainproc.c:1353
+#: g10/mainproc.c:1370
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               ключом %s с ID %s\n"
 
-#: g10/mainproc.c:1357
+#: g10/mainproc.c:1374
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Подпись создана %s ключом %s с ID %s\n"
 
-#: g10/mainproc.c:1377
+#: g10/mainproc.c:1394
 msgid "Key available at: "
 msgstr "Ключ доступен на:"
 
-#: g10/mainproc.c:1482 g10/mainproc.c:1530
+#: g10/mainproc.c:1499 g10/mainproc.c:1547
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ПЛОХАЯ подпись от  \"%s\""
 
-#: g10/mainproc.c:1484 g10/mainproc.c:1532
+#: g10/mainproc.c:1501 g10/mainproc.c:1549
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Просроченная подпись от \"%s\""
 
-#: g10/mainproc.c:1486 g10/mainproc.c:1534
+#: g10/mainproc.c:1503 g10/mainproc.c:1551
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Действительная подпись от \"%s\""
 
-#: g10/mainproc.c:1538
+#: g10/mainproc.c:1555
 msgid "[uncertain]"
 msgstr "[сомнительно]"
 
-#: g10/mainproc.c:1570
+#: g10/mainproc.c:1587
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \"%s\""
 
-#: g10/mainproc.c:1664
+#: g10/mainproc.c:1681
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Подпись просрочена %s\n"
 
-#: g10/mainproc.c:1669
+#: g10/mainproc.c:1686
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Подпись действительна до %s\n"
 
-#: g10/mainproc.c:1672
+#: g10/mainproc.c:1689
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s подпись, хэш-функция %s\n"
 
-#: g10/mainproc.c:1673
+#: g10/mainproc.c:1690
 msgid "binary"
 msgstr "двоичный"
 
-#: g10/mainproc.c:1674
+#: g10/mainproc.c:1691
 msgid "textmode"
 msgstr "текстовый"
 
-#: g10/mainproc.c:1674 g10/trustdb.c:530
+#: g10/mainproc.c:1691 g10/trustdb.c:531
 msgid "unknown"
 msgstr "неизвестно"
 
-#: g10/mainproc.c:1694
+#: g10/mainproc.c:1711
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Не могу проверить подпись: %s\n"
 
-#: g10/mainproc.c:1762 g10/mainproc.c:1778 g10/mainproc.c:1864
+#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
 msgid "not a detached signature\n"
 msgstr "не отделенная подпись\n"
 
-#: g10/mainproc.c:1805
+#: g10/mainproc.c:1822
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "ВНИМАНИЕ: обнаружено множество подписей.  Только первая будет проверена.\n"
 
-#: g10/mainproc.c:1813
+#: g10/mainproc.c:1830
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "самостоятельная подпись класса 0x%02x\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1887
 msgid "old style (PGP 2.x) signature\n"
 msgstr "старый (PGP 2.x) стиль подписи\n"
 
-#: g10/mainproc.c:1880
+#: g10/mainproc.c:1897
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "обнаружен недопустимый корневой пакет в proc_tree()\n"
 
-#: g10/misc.c:121
+#: g10/misc.c:122
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "не могу отключить создание файла копии образа памяти: %s\n"
 
-#: g10/misc.c:141 g10/misc.c:169 g10/misc.c:241
+#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr ""
 
-#: g10/misc.c:206
+#: g10/misc.c:207
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr ""
 
-#: g10/misc.c:315
+#: g10/misc.c:316
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr ""
 "ВНИМАНИЕ: используется экспериментальный алгоритм %s шифрования с открытым "
 "ключом\n"
 
-#: g10/misc.c:330
+#: g10/misc.c:331
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr ""
 "ВНИМАНИЕ: используется экспериментальный алгоритм симметричного шифрования %"
 "s\n"
 
-#: g10/misc.c:345
+#: g10/misc.c:346
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "ВНИМАНИЕ: используется экспериментальная хеш-функция %s\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:351
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "ВНИМАНИЕ: хеш-функция %s считается устаревшей\n"
 
-#: g10/misc.c:446
+#: g10/misc.c:447
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "модуль поддержки шифра IDEA не обнаружен\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:448
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr "смотрите подробности на http://www.gnupg.org/why-not-idea.html\n"
 
-#: g10/misc.c:680
+#: g10/misc.c:681
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: не рекомендуемая опция \"%s\"\n"
 
-#: g10/misc.c:684
+#: g10/misc.c:685
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ВНИМАНИЕ: \"%s\" не рекомендуемая опция\n"
 
-#: g10/misc.c:686
+#: g10/misc.c:687
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "используйте \"%s%s\" взамен\n"
 
-#: g10/misc.c:697
+#: g10/misc.c:694
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
+msgstr "ВНИМАНИЕ: \"%s\" не рекомендуемая опция\n"
+
+#: g10/misc.c:707
 msgid "Uncompressed"
 msgstr "Без сжатия"
 
-#: g10/misc.c:722
+#: g10/misc.c:732
 msgid "uncompressed|none"
 msgstr ""
 
-#: g10/misc.c:832
+#: g10/misc.c:842
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "данное сообщение может быть не пригодно для %s\n"
 
-#: g10/misc.c:989
+#: g10/misc.c:999
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "двусмысленный параметр `%s'\n"
 
-#: g10/misc.c:1014
+#: g10/misc.c:1024
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "неизвестный параметр `%s'\n"
 
-#: g10/openfile.c:84
+#: g10/openfile.c:86
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Файл `%s' существует. "
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 msgid "Overwrite? (y/N) "
 msgstr "Перезаписать (y/N)? "
 
-#: g10/openfile.c:119
+#: g10/openfile.c:121
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: неизвестное окончание\n"
 
-#: g10/openfile.c:141
+#: g10/openfile.c:143
 msgid "Enter new filename"
 msgstr "Введите новое имя файла"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:188
 msgid "writing to stdout\n"
 msgstr "Вывод в stdout\n"
 
-#: g10/openfile.c:296
+#: g10/openfile.c:300
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "принятие подписанных данных в `%s'\n"
 
-#: g10/openfile.c:375
+#: g10/openfile.c:379
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "создан новый файл настроек `%s'\n"
 
-#: g10/openfile.c:377
+#: g10/openfile.c:381
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "ВНИМАНИЕ: параметры в `%s' еще не активны при этом запуске\n"
 
-#: g10/openfile.c:409
+#: g10/openfile.c:413
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "создан каталог `%s'\n"
 
-#: g10/parse-packet.c:137
+#: g10/parse-packet.c:138
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "не могу использовать алгоритм с открытым ключом %d\n"
 
-#: g10/parse-packet.c:707
+#: g10/parse-packet.c:708
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "ВНИМАНИЕ: потенциально небезопасный сеансовый ключ, зашифрованный "
 "симметричным шифром\n"
 
-#: g10/parse-packet.c:1132
+#: g10/parse-packet.c:1145
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "подпакет типа %d имеет выставленный критический бит\n"
 
-#: g10/passphrase.c:478 g10/passphrase.c:525
+#: g10/passphrase.c:305
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent недоступен в данной сессии\n"
 
-#: g10/passphrase.c:486
-msgid "can't set client pid for the agent\n"
-msgstr "не могу установить pid для агента\n"
-
-#: g10/passphrase.c:494
-msgid "can't get server read FD for the agent\n"
-msgstr "не могу получить дескриптор чтения для агента\n"
-
-#: g10/passphrase.c:501
-msgid "can't get server write FD for the agent\n"
-msgstr "не могу получить дескриптор записи для агента\n"
-
-#: g10/passphrase.c:534
+#: g10/passphrase.c:317
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "неправильная переменная окружения GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:547
+#: g10/passphrase.c:332
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "протокол gpg-agent версии %d не поддерживается\n"
 
-#: g10/passphrase.c:568
+#: g10/passphrase.c:345
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "не могу подключиться к `%s': %s\n"
 
-#: g10/passphrase.c:590
-msgid "communication problem with gpg-agent\n"
-msgstr "коммуникационный проблемы с gpg-agent\n"
-
-#: g10/passphrase.c:597 g10/passphrase.c:937 g10/passphrase.c:1049
+#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
 msgid "problem with the agent - disabling agent use\n"
 msgstr "проблема с агентом - использование агента отключено\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1209
+#: g10/passphrase.c:511 g10/passphrase.c:890
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (главный ключ ID %s)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:525
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4484,61 +4552,48 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-бит %s ключ, ID %s, создан %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:550
 msgid "Repeat passphrase\n"
 msgstr "Повторите пароль\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:552
 msgid "Enter passphrase\n"
 msgstr "Введите пароль\n"
 
-#: g10/passphrase.c:781
-msgid "passphrase too long\n"
-msgstr "пароль слишком длинный\n"
-
-#: g10/passphrase.c:794
-msgid "invalid response from agent\n"
-msgstr "неверный ответ от агента\n"
-
-#: g10/passphrase.c:810 g10/passphrase.c:931
+#: g10/passphrase.c:628
 msgid "cancelled by user\n"
 msgstr "прервано пользователем\n"
 
-#: g10/passphrase.c:815 g10/passphrase.c:1020
-#, c-format
-msgid "problem with the agent: agent returns 0x%lx\n"
-msgstr "проблема с агентом: агент вернул 0x%lx\n"
-
-#: g10/passphrase.c:1100 g10/passphrase.c:1263
+#: g10/passphrase.c:781 g10/passphrase.c:944
 msgid "can't query passphrase in batch mode\n"
 msgstr "не могу получить пароль в пакетном режиме\n"
 
-#: g10/passphrase.c:1107 g10/passphrase.c:1268
+#: g10/passphrase.c:788 g10/passphrase.c:949
 msgid "Enter passphrase: "
 msgstr "Введите пароль: "
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:871
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
 "user: \"%s\"\n"
 msgstr "Необходим пароль для доступа к секретному ключу пользователя: \"%s\"\n"
 
-#: g10/passphrase.c:1196
+#: g10/passphrase.c:877
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-бит %s ключ, ID %s, создан %s"
 
-#: g10/passphrase.c:1205
+#: g10/passphrase.c:886
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1272
+#: g10/passphrase.c:953
 msgid "Repeat passphrase: "
 msgstr "Повторите пароль: "
 
-#: g10/photoid.c:66
+#: g10/photoid.c:67
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4552,114 +4607,114 @@ msgstr ""
 "с Вашим открытым ключом и увеличит его размер, т.е. не следует брать очень\n"
 "большое изображение. Рекомендуемый размер около 240x288.\n"
 
-#: g10/photoid.c:80
+#: g10/photoid.c:81
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Введите имя JPEG файла для Фото ID: "
 
-#: g10/photoid.c:94
+#: g10/photoid.c:95
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "Не могу открыть JPEG файл `%s': %s\n"
 
-#: g10/photoid.c:102
+#: g10/photoid.c:103
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Этот JPEG очень велик (%d байт)!\n"
 
-#: g10/photoid.c:104
+#: g10/photoid.c:105
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Вы действительно хотите использовать его? (y/N)"
 
-#: g10/photoid.c:119
+#: g10/photoid.c:120
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "`%s' - не JPEG файл\n"
 
-#: g10/photoid.c:136
+#: g10/photoid.c:137
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Данное фото правильное (y/N/q)? "
 
-#: g10/photoid.c:338
+#: g10/photoid.c:339
 msgid "unable to display photo ID!\n"
 msgstr "не могу отобразить Фото ID!\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:580
+#: g10/pkclist.c:62 g10/revoke.c:581
 msgid "No reason specified"
 msgstr "Без указания причины"
 
-#: g10/pkclist.c:63 g10/revoke.c:582
+#: g10/pkclist.c:64 g10/revoke.c:583
 msgid "Key is superseded"
 msgstr "Ключ заменён другим"
 
-#: g10/pkclist.c:65 g10/revoke.c:581
+#: g10/pkclist.c:66 g10/revoke.c:582
 msgid "Key has been compromised"
 msgstr "Ключ был скомпрометирован"
 
-#: g10/pkclist.c:67 g10/revoke.c:583
+#: g10/pkclist.c:68 g10/revoke.c:584
 msgid "Key is no longer used"
 msgstr "Ключ больше не используется"
 
-#: g10/pkclist.c:69 g10/revoke.c:584
+#: g10/pkclist.c:70 g10/revoke.c:585
 msgid "User ID is no longer valid"
 msgstr "User ID больше не действителен"
 
-#: g10/pkclist.c:73
+#: g10/pkclist.c:74
 msgid "reason for revocation: "
 msgstr "причина отзыва: "
 
-#: g10/pkclist.c:90
+#: g10/pkclist.c:91
 msgid "revocation comment: "
 msgstr "прокомментируйте отзыв: "
 
-#: g10/pkclist.c:205
+#: g10/pkclist.c:206
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:213
+#: g10/pkclist.c:214
 msgid "No trust value assigned to:\n"
 msgstr "Не задано значение доверия для:\n"
 
-#: g10/pkclist.c:245
+#: g10/pkclist.c:246
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "  aka \"%s\"\n"
 
 # test it
-#: g10/pkclist.c:255
+#: g10/pkclist.c:256
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr ""
 "Насколько Вы уверены, что данный ключ принадлежит пользователю указанному в "
 "User ID ключа?\n"
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:271
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = Не знаю или не буду отвечать\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = Не доверяю\n"
 
-#: g10/pkclist.c:278
+#: g10/pkclist.c:279
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Абсолютно доверяю\n"
 
-#: g10/pkclist.c:284
+#: g10/pkclist.c:285
 msgid "  m = back to the main menu\n"
 msgstr " m = вернуться в главное меню\n"
 
-#: g10/pkclist.c:287
+#: g10/pkclist.c:288
 msgid "  s = skip this key\n"
 msgstr " s = пропустить этот ключ\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 msgid "  q = quit\n"
 msgstr " q = выход\n"
 
-#: g10/pkclist.c:292
+#: g10/pkclist.c:293
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
@@ -4668,22 +4723,22 @@ msgstr ""
 "Минимальный уровень доверия данному ключу: %s\n"
 "\n"
 
-#: g10/pkclist.c:298 g10/revoke.c:609
+#: g10/pkclist.c:299 g10/revoke.c:610
 msgid "Your decision? "
 msgstr "Ваше решение (?-подробнее)? "
 
-#: g10/pkclist.c:319
+#: g10/pkclist.c:320
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr ""
 "Вы действительно хотите установить АБСОЛЮТНОЕ доверие владельцу данного "
 "ключа? (y/N)"
 
-#: g10/pkclist.c:333
+#: g10/pkclist.c:334
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Сертификаты, приводящие к абсолютно доверяемому ключу:\n"
 
 # test it
-#: g10/pkclist.c:418
+#: g10/pkclist.c:419
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
@@ -4691,7 +4746,7 @@ msgstr ""
 "указанному в User ID ключа\n"
 
 # test it
-#: g10/pkclist.c:423
+#: g10/pkclist.c:424
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
@@ -4699,15 +4754,15 @@ msgstr ""
 "указанному в User ID ключа\n"
 
 # test it
-#: g10/pkclist.c:429
+#: g10/pkclist.c:430
 msgid "This key probably belongs to the named user\n"
 msgstr "Этот ключ вероятно принадлежит названному владельцу\n"
 
-#: g10/pkclist.c:434
+#: g10/pkclist.c:435
 msgid "This key belongs to us\n"
 msgstr "Данный ключ принадлежит нам\n"
 
-#: g10/pkclist.c:460
+#: g10/pkclist.c:461
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -4717,88 +4772,88 @@ msgstr ""
 "в User ID ключа.  Если Вы ТОЧНО знаете, что Вы делаете,\n"
 "можете ответить на следующий вопрос утвердительно.\n"
 
-#: g10/pkclist.c:467
+#: g10/pkclist.c:468
 msgid "Use this key anyway? (y/N) "
 msgstr "Все равно использовать данный ключ? (y/N)"
 
-#: g10/pkclist.c:501
+#: g10/pkclist.c:502
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ВНИМАНИЕ: Использование недоверяемого ключа!\n"
 
-#: g10/pkclist.c:508
+#: g10/pkclist.c:509
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "ВНИМАНИЕ: возможно данный ключ отозван (ключ отзыва отсутвтует)\n"
 
-#: g10/pkclist.c:517
+#: g10/pkclist.c:518
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "ВНИМАНИЕ: Данный ключ отозван ключом назначенным отзывающим!\n"
 
-#: g10/pkclist.c:520
+#: g10/pkclist.c:521
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ВНИМАНИЕ: Данный ключ отозван его владельцем!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Это может означать, что подпись поддельная.\n"
 
-#: g10/pkclist.c:527
+#: g10/pkclist.c:528
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ВНИМАНИЕ: Данный подключ был отозван его владельцем!\n"
 
-#: g10/pkclist.c:532
+#: g10/pkclist.c:533
 msgid "Note: This key has been disabled.\n"
 msgstr "Замечание: Данный ключ отключен.\n"
 
-#: g10/pkclist.c:537
+#: g10/pkclist.c:538
 msgid "Note: This key has expired!\n"
 msgstr "Замечание: Данный ключ просрочен!\n"
 
-#: g10/pkclist.c:548
+#: g10/pkclist.c:549
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "ВНИМАНИЕ: Данный ключ не заверен доверенной подписью!\n"
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:551
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         Нет указаний на то, что подпись принадлежит владельцу.\n"
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:559
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ВНИМАНИЕ: НЕТ ДОВЕРИЯ данному ключу!\n"
 
-#: g10/pkclist.c:559
+#: g10/pkclist.c:560
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Возможно, что подпись ПОДДЕЛАНА.\n"
 
-#: g10/pkclist.c:567
+#: g10/pkclist.c:568
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ВНИМАНИЕ: Этот ключ не заверен достаточным количеством доверяемых подписей!\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:570
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Нет уверенности в том, что подпись принадлежит владельцу.\n"
 
-#: g10/pkclist.c:734 g10/pkclist.c:767 g10/pkclist.c:936 g10/pkclist.c:996
+#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: пропущено: %s\n"
 
-#: g10/pkclist.c:744 g10/pkclist.c:968
+#: g10/pkclist.c:745 g10/pkclist.c:969
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: пропущено: открытый ключ уже существует\n"
 
-#: g10/pkclist.c:786
+#: g10/pkclist.c:787
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Не задан User ID. (можете использовать \"-r\")\n"
 
-#: g10/pkclist.c:802
+#: g10/pkclist.c:803
 msgid "Current recipients:\n"
 msgstr "Текущие получатели:\n"
 
-#: g10/pkclist.c:828
+#: g10/pkclist.c:829
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -4806,168 +4861,168 @@ msgstr ""
 "\n"
 "Введите User ID.  Пустая строка для завершения: "
 
-#: g10/pkclist.c:844
+#: g10/pkclist.c:845
 msgid "No such user ID.\n"
 msgstr "Нет такого User ID.\n"
 
-#: g10/pkclist.c:849 g10/pkclist.c:911
+#: g10/pkclist.c:850 g10/pkclist.c:912
 msgid "skipped: public key already set as default recipient\n"
 msgstr "пропущено: открытый ключ уже установлен для получателя по умолчанию\n"
 
-#: g10/pkclist.c:867
+#: g10/pkclist.c:868
 msgid "Public key is disabled.\n"
 msgstr "Открытый ключ отключен.\n"
 
-#: g10/pkclist.c:874
+#: g10/pkclist.c:875
 msgid "skipped: public key already set\n"
 msgstr "пропущено: открытый ключ уже установлен\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:904
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "неизвестный получатель по умолчанию \"%s\"\n"
 
-#: g10/pkclist.c:948
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: пропущено: открытый ключ отключен\n"
 
-#: g10/pkclist.c:1003
+#: g10/pkclist.c:1004
 msgid "no valid addressees\n"
 msgstr "нет действительных адресов\n"
 
-#: g10/plaintext.c:90
+#: g10/plaintext.c:91
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "данные не сохранены; используйте \"--output\" для сохранения\n"
 
-#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
+#: g10/plaintext.c:136 g10/plaintext.c:141 g10/plaintext.c:159
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "ошибка создания `%s': %s\n"
 
-#: g10/plaintext.c:446
+#: g10/plaintext.c:447
 msgid "Detached signature.\n"
 msgstr "Отделенная подпись.\n"
 
-#: g10/plaintext.c:450
+#: g10/plaintext.c:452
 msgid "Please enter name of data file: "
 msgstr "Введите имя файла с данными: "
 
-#: g10/plaintext.c:478
+#: g10/plaintext.c:481
 msgid "reading stdin ...\n"
 msgstr "читаю stdin ...\n"
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:515
 msgid "no signed data\n"
 msgstr "не подписанные данные\n"
 
-#: g10/plaintext.c:526
+#: g10/plaintext.c:529
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "не могу открыть подписанные данные `%s'\n"
 
-#: g10/pubkey-enc.c:103
+#: g10/pubkey-enc.c:104
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "анонимный получатель; пробую секретный ключ %s ...\n"
 
-#: g10/pubkey-enc.c:119
+#: g10/pubkey-enc.c:120
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "Отлично, мы анонимный получатель.\n"
 
-#: g10/pubkey-enc.c:207
+#: g10/pubkey-enc.c:208
 msgid "old encoding of the DEK is not supported\n"
 msgstr "старое шифрование DEK не поддерживается\n"
 
-#: g10/pubkey-enc.c:228
+#: g10/pubkey-enc.c:229
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "алгоритм шифрования %d%s неизвестен или отключен\n"
 
-#: g10/pubkey-enc.c:266
+#: g10/pubkey-enc.c:267
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 "ВНИМАНИЕ: алгоритм шифрования %s не найден в списке предпочтений получателя\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:287
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "ЗАМЕТЬТЕ: секретный ключ %s просрочен с %s\n"
 
-#: g10/pubkey-enc.c:292
+#: g10/pubkey-enc.c:293
 msgid "NOTE: key has been revoked"
 msgstr "ЗАМЕТЬТЕ: ключ был отозван"
 
-#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:545
+#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
+#: g10/revoke.c:188 g10/revoke.c:546
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr ""
 
-#: g10/revoke.c:146
+#: g10/revoke.c:147
 #, c-format
 msgid "key %s has no user IDs\n"
 msgstr "ключ %s не имеет User ID\n"
 
-#: g10/revoke.c:272
+#: g10/revoke.c:273
 msgid "To be revoked by:\n"
 msgstr "Будет отозван:\n"
 
 # check it
-#: g10/revoke.c:276
+#: g10/revoke.c:277
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Это - sensitive ключ отзыва)\n"
 
-#: g10/revoke.c:280
+#: g10/revoke.c:281
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Создать сертификат отзыва данного ключа? (y/N)"
 
-#: g10/revoke.c:293 g10/revoke.c:511
+#: g10/revoke.c:294 g10/revoke.c:512
 msgid "ASCII armored output forced.\n"
 msgstr "Для вывода использован ASCII формат.\n"
 
-#: g10/revoke.c:307 g10/revoke.c:525
+#: g10/revoke.c:308 g10/revoke.c:526
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr ""
 
-#: g10/revoke.c:370
+#: g10/revoke.c:371
 msgid "Revocation certificate created.\n"
 msgstr "Сертификат отзыва создан.\n"
 
-#: g10/revoke.c:376
+#: g10/revoke.c:377
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "ключи отзыва для \"%s\" не найдены\n"
 
-#: g10/revoke.c:432
+#: g10/revoke.c:433
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "секретный ключ \"%s\" не найден: %s\n"
 
-#: g10/revoke.c:461
+#: g10/revoke.c:462
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "нет соотвествующего открытого ключа: %s\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:473
 msgid "public key does not match secret key!\n"
 msgstr "открытый ключ не соотвествует секретному!\n"
 
-#: g10/revoke.c:479
+#: g10/revoke.c:480
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Создать сертификат отзыва данного ключа? (y/N)"
 
-#: g10/revoke.c:496
+#: g10/revoke.c:497
 msgid "unknown protection algorithm\n"
 msgstr "неизвестный алгоритм защиты\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 msgid "NOTE: This key is not protected!\n"
 msgstr "ЗАМЕЧАНИЕ: Данный ключ не защищен!\n"
 
-#: g10/revoke.c:551
+#: g10/revoke.c:552
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -4986,110 +5041,110 @@ msgstr ""
 "носитель будет повреждён, но будьте осторожны: система печати\n"
 "Вашей машины может сохранить данные и сделать их доступными для других!\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid "Please select the reason for the revocation:\n"
 msgstr "Укажите причину отзыва:\n"
 
-#: g10/revoke.c:602
+#: g10/revoke.c:603
 msgid "Cancel"
 msgstr "Отмена"
 
-#: g10/revoke.c:604
+#: g10/revoke.c:605
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Возможно Вы хотите выбрать здесь %d)\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:646
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Введите необязательное пояснение; закончите пустой строкой:\n"
 
-#: g10/revoke.c:673
+#: g10/revoke.c:674
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Причина отзыва: %s\n"
 
-#: g10/revoke.c:675
+#: g10/revoke.c:676
 msgid "(No description given)\n"
 msgstr "(Пояснения отсутствуют)\n"
 
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 msgid "Is this okay? (y/N) "
 msgstr "Все правильно? (y/N) "
 
-#: g10/seckey-cert.c:54
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "секретная часть ключ не доступна\n"
 
-#: g10/seckey-cert.c:60
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "метод защиты %d%s не поддерживается\n"
 
-#: g10/seckey-cert.c:71
+#: g10/seckey-cert.c:72
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "метод защиты %d не поддерживается\n"
 
-#: g10/seckey-cert.c:265
+#: g10/seckey-cert.c:266
 msgid "Invalid passphrase; please try again"
 msgstr "Неверный пароль; попробуйте еще раз"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:267
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:326
+#: g10/seckey-cert.c:327
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "ВНИМАНИЕ: обнаружен слабый ключ - смените пароль еще раз.\n"
 
-#: g10/seckey-cert.c:364
+#: g10/seckey-cert.c:365
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "создание нерекомендуемой 16-битной контрольной суммы для защиты ключа\n"
 
-#: g10/seskey.c:52
+#: g10/seskey.c:53
 msgid "weak key created - retrying\n"
 msgstr "создан слабый ключ - повторение\n"
 
-#: g10/seskey.c:57
+#: g10/seskey.c:58
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "невозможно избежать слабого ключа для симметричного шифра; %d попыток!\n"
 
-#: g10/seskey.c:213
+#: g10/seskey.c:214
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA требует использования 160 битной хэш-функции\n"
 
-#: g10/sig-check.c:75
+#: g10/sig-check.c:76
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "ВНИМАНИЕ: конфликт хэшей подписей в сообщении\n"
 
-#: g10/sig-check.c:99
+#: g10/sig-check.c:100
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 "ВНИМАНИЕ: подписываемый подключ %s не имеет перекрестной сертификации\n"
 
-#: g10/sig-check.c:102
+#: g10/sig-check.c:103
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "ВНИМАНИЕ: подписываемый подключ %s имеет недостоверную перекрестную "
 "сертификацию\n"
 
-#: g10/sig-check.c:168
+#: g10/sig-check.c:169
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "открытый ключ %s на %lu секунд моложе подписи\n"
 
-#: g10/sig-check.c:169
+#: g10/sig-check.c:170
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "открытый ключ %s на %lu секунд моложе подписи\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:181
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5097,7 +5152,7 @@ msgstr ""
 "ключ %s был создан на %lu секунд в будущем (time warp или проблемы с "
 "часами)\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:183
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5105,49 +5160,49 @@ msgstr ""
 "ключ %s был создан на %lu секунд в будущем (time warp или проблемы с "
 "часами)\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:193
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "ЗАМЕТЬТЕ: подписавший ключ %s - просрочен %s\n"
 
-#: g10/sig-check.c:275
+#: g10/sig-check.c:276
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "принята плохая подпись ключа %s с неизвестным критическим битом\n"
 
-#: g10/sig-check.c:532
+#: g10/sig-check.c:533
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "ключ %s: нет подключа для подключа отзывающей подписи\n"
 
-#: g10/sig-check.c:558
+#: g10/sig-check.c:559
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "ключ %s: нет подключа для подписи связи подключей\n"
 
-#: g10/sign.c:85
+#: g10/sign.c:86
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr "невозможно добавить примечение в v3 (PGP 2.x стиля) подпись\n"
 
-#: g10/sign.c:93
+#: g10/sign.c:94
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr "невозможно добавить примечание в v3 (PGP 2.x стиля) подпись ключа\n"
 
-#: g10/sign.c:112
+#: g10/sign.c:113
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "ВНИМАНИЕ: не могу развернуть %% запись (длинный). Использую неразвернутым.\n"
 
-#: g10/sign.c:138
+#: g10/sign.c:139
 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:146
+#: g10/sign.c:147
 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:159
+#: g10/sign.c:160
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5155,7 +5210,7 @@ msgstr ""
 "ВНИМАНИЕ: не могу развернуть %% url правил (длинный). Использую "
 "неразвернутым.\n"
 
-#: g10/sign.c:187
+#: g10/sign.c:188
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5164,21 +5219,21 @@ msgstr ""
 "ВНИМАНИЕ: невозможно развернуть %% URL предпочитаемого сервера ключей "
 "(слишком длинно). Использую неразвернутым.\n"
 
-#: g10/sign.c:364
+#: g10/sign.c:365
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "сбой проверки созданной подписи: %s\n"
 
-#: g10/sign.c:373
+#: g10/sign.c:374
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s подпись от: \"%s\"\n"
 
-#: g10/sign.c:741
+#: g10/sign.c:761
 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:808
+#: g10/sign.c:830
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5186,49 +5241,49 @@ msgstr ""
 "ВНИМАНИЕ: использование хэш-функции %s (%d) нарушает предпочтения "
 "получателя\n"
 
-#: g10/sign.c:900
+#: g10/sign.c:922
 msgid "signing:"
 msgstr "подпись:"
 
-#: g10/sign.c:1007
+#: g10/sign.c:1034
 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:1180
+#: g10/sign.c:1212
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "будет использовано %s шифрование\n"
 
-#: g10/skclist.c:126 g10/skclist.c:190
+#: g10/skclist.c:127 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "ключ не помечен как ненадежный - не могу использовать его с ненадёжным RNG!\n"
 
-#: g10/skclist.c:157
+#: g10/skclist.c:158
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "пропущено \"%s\": дубликат\n"
 
-#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "пропущено \"%s\": %s\n"
 
-#: g10/skclist.c:170
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "пропущено: секретный ключ уже имеется\n"
 
-#: g10/skclist.c:185
+#: g10/skclist.c:186
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "это созданный PGP ElGamal ключ, не обеспечивающий безопасность подписи!"
 
-#: g10/tdbdump.c:59 g10/trustdb.c:365
+#: g10/tdbdump.c:60 g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "запись о доверии %lu, тип %d: ошибка записи: %s\n"
 
-#: g10/tdbdump.c:104
+#: g10/tdbdump.c:105
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5237,346 +5292,346 @@ msgstr ""
 "# Список присвоенных значений доверия создан %s\n"
 "# (Используйте \"gpg --import-ownertrust\" для их восстановления)\n"
 
-#: g10/tdbdump.c:159 g10/tdbdump.c:167 g10/tdbdump.c:172 g10/tdbdump.c:177
+#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
 #, c-format
 msgid "error in `%s': %s\n"
 msgstr "ошибка в `%s': %s\n"
 
-#: g10/tdbdump.c:159
+#: g10/tdbdump.c:160
 msgid "line too long"
 msgstr "строка слишком длинная"
 
-#: g10/tdbdump.c:167
+#: g10/tdbdump.c:168
 msgid "colon missing"
 msgstr "пропущено двоеточие"
 
-#: g10/tdbdump.c:173
+#: g10/tdbdump.c:174
 msgid "invalid fingerprint"
 msgstr "неверный отпечаток"
 
-#: g10/tdbdump.c:178
+#: g10/tdbdump.c:179
 msgid "ownertrust value missing"
 msgstr "пропущено значение степени доверия владельцу"
 
-#: g10/tdbdump.c:214
+#: g10/tdbdump.c:215
 #, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "ошибка при поиске записи о доверии в `%s': %s\n"
 
-#: g10/tdbdump.c:218
+#: g10/tdbdump.c:219
 #, c-format
 msgid "read error in `%s': %s\n"
 msgstr "ошибка чтения в `%s': %s\n"
 
-#: g10/tdbdump.c:227 g10/trustdb.c:380
+#: g10/tdbdump.c:228 g10/trustdb.c:381
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:128 g10/tdbio.c:1440
+#: g10/tdbio.c:129 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:134 g10/tdbio.c:1447
+#: g10/tdbio.c:135 g10/tdbio.c:1448
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:244
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr ""
 
-#: g10/tdbio.c:497
+#: g10/tdbio.c:498
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "нет доступа к `%s': %s\n"
 
-#: g10/tdbio.c:512
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: каталог не существует!\n"
 
-#: g10/tdbio.c:522 g10/tdbio.c:545 g10/tdbio.c:588
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "невозможно создать блокировку для `%s'\n"
 
-#: g10/tdbio.c:524 g10/tdbio.c:591
+#: g10/tdbio.c:525 g10/tdbio.c:592
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "невозможно заблокировать `%s'\n"
 
-#: g10/tdbio.c:550
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: сбой создания записи о версии: %s"
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: создана недействительная таблица доверий\n"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: создана таблица доверий\n"
 
-#: g10/tdbio.c:597
+#: g10/tdbio.c:598
 msgid "NOTE: trustdb not writable\n"
 msgstr "ЗАМЕТЬТЕ: таблица доверий доступна только для чтения\n"
 
-#: g10/tdbio.c:614
+#: g10/tdbio.c:615
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: недействительная таблица доверий\n"
 
-#: g10/tdbio.c:646
+#: g10/tdbio.c:647
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: сбой создания таблицы хэшей: %s\n"
 
-#: g10/tdbio.c:654
+#: g10/tdbio.c:655
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: ошибка обновления записи о версии: %s\n"
 
-#: g10/tdbio.c:671 g10/tdbio.c:691 g10/tdbio.c:707 g10/tdbio.c:721
-#: g10/tdbio.c:751 g10/tdbio.c:1373 g10/tdbio.c:1400
+#: g10/tdbio.c:672 g10/tdbio.c:692 g10/tdbio.c:708 g10/tdbio.c:722
+#: g10/tdbio.c:752 g10/tdbio.c:1374 g10/tdbio.c:1401
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: ошибка чтения записи о версии: %s\n"
 
-#: g10/tdbio.c:730
+#: g10/tdbio.c:731
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: ошибка сохранения записи о версии: %s\n"
 
-#: g10/tdbio.c:1169
+#: g10/tdbio.c:1170
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1177
+#: g10/tdbio.c:1178
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1198
+#: g10/tdbio.c:1199
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: не является файлом таблицы доверий\n"
 
-#: g10/tdbio.c:1216
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: запись о версии с номером записи %lu\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1222
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: неправильная версия файла %d\n"
 
-#: g10/tdbio.c:1406
+#: g10/tdbio.c:1407
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: ошибка чтения свободной записи: %s\n"
 
-#: g10/tdbio.c:1414
+#: g10/tdbio.c:1415
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: ошибка внесения записи каталога: %s\n"
 
-#: g10/tdbio.c:1424
+#: g10/tdbio.c:1425
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: сбой обнуления записи: %s\n"
 
-#: g10/tdbio.c:1454
+#: g10/tdbio.c:1455
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: сбой добавления записи: %s\n"
 
-#: g10/tdbio.c:1499
+#: g10/tdbio.c:1500
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "таблица доверий повреждена; запустите \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:147
+#: g10/textfilter.c:148
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "не могу обработать строки текста длиннее %d символов\n"
 
-#: g10/textfilter.c:244
+#: g10/textfilter.c:245
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "строка ввода длиннее %d символов\n"
 
-#: g10/trustdb.c:226
+#: g10/trustdb.c:227
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' не является допустимым длинным ID ключа\n"
 
-#: g10/trustdb.c:257
+#: g10/trustdb.c:258
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "ключ %s: принят как доверяемый ключ\n"
 
-#: g10/trustdb.c:295
+#: g10/trustdb.c:296
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "ключ %s встречается более одного раза в таблице доверий\n"
 
-#: g10/trustdb.c:310
+#: g10/trustdb.c:311
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "ключ %s: нет открытого ключа для доверяемого ключа - пропущен\n"
 
-#: g10/trustdb.c:320
+#: g10/trustdb.c:321
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "ключ %s помечен как абсолютно доверяемый.\n"
 
-#: g10/trustdb.c:344
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "запись о доверии %lu, тип запроса %d: сбой чтения: %s\n"
 
-#: g10/trustdb.c:350
+#: g10/trustdb.c:351
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "запись о доверии %lu не запрашиваемого типа %d\n"
 
 # check it
-#: g10/trustdb.c:446
+#: g10/trustdb.c:447
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "не могу использовать неизвестную модель (%d) - использую %s модель доверий\n"
 
 # check it
-#: g10/trustdb.c:452
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr "использую %s модель доверий\n"
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:506
+#: g10/trustdb.c:507
 msgid "[ revoked]"
 msgstr "[ отозван]"
 
-#: g10/trustdb.c:508 g10/trustdb.c:513
+#: g10/trustdb.c:509 g10/trustdb.c:514
 msgid "[ expired]"
 msgstr "[просрочн]"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 msgid "[ unknown]"
 msgstr "[неизвстн]"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr "[неопредл]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr "[ограничн]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr "[ полное ]"
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr "[абсолютн]"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr "неопределено"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 msgid "never"
 msgstr "никогда"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr "ограниченно"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:536
 msgid "full"
 msgstr "полное"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr "абсолютное"
 
-#: g10/trustdb.c:576
+#: g10/trustdb.c:577
 msgid "no need for a trustdb check\n"
 msgstr "нет необходимости в проверке таблицы доверий\n"
 
-#: g10/trustdb.c:582 g10/trustdb.c:2157
+#: g10/trustdb.c:583 g10/trustdb.c:2309
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "срок следующей проверки таблицы доверий %s\n"
 
-#: g10/trustdb.c:591
+#: g10/trustdb.c:592
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "нет необходимости проверять таблицу доверий при `%s' модели доверий\n"
 
-#: g10/trustdb.c:606
+#: g10/trustdb.c:607
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "нет необходимости обновлять таблицу доверий при '%s' модели доверий\n"
 
-#: g10/trustdb.c:838 g10/trustdb.c:1276
+#: 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:1033
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr "выполните --check-trustdb, пожалуйста\n"
 
-#: g10/trustdb.c:1037
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "проверка таблицы доверий\n"
 
-#: g10/trustdb.c:1901
+#: g10/trustdb.c:2053
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d ключей обработано (%d дейсвующих записей очищено)\n"
 
-#: g10/trustdb.c:1965
+#: g10/trustdb.c:2117
 msgid "no ultimately trusted keys found\n"
 msgstr "не найдено абсолютно доверяемых ключей\n"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:2131
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "открытый ключ для абсолютно доверяемого ключа %s не найден\n"
 
 # check it
-#: g10/trustdb.c:2002
+#: g10/trustdb.c:2154
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 "%d ограниченных необходимо, %d выполненных необходимо, %s модель доверия\n"
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2240
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2163
+#: g10/trustdb.c:2315
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 "невозможно обновить запись о версии таблицы доверий: ошибка записи: %s\n"
 
-#: g10/verify.c:116
+#: g10/verify.c:117
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -5586,299 +5641,335 @@ msgstr ""
 "Файл подписи (.sig или .asc) должен быть\n"
 "первым указан в командной строке.\n"
 
-#: g10/verify.c:189
+#: g10/verify.c:190
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "входная строка %u слишком длинная или пропущен LF\n"
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "глобальная ошибка"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "неизвестный тип пакета"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "неизвестная версия"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "неизвестный алгоритм с открытым ключом"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "неизвестная хэш-функция"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "неправильный открытый ключ"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "неправильный секретный ключ"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "подпись неверна"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "несоответствие контрольной сумме"
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "неправильный пароль"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "открытый ключ не найден"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "неизвестный алгоритм шифрования"
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "не могу открыть таблицу ключей"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "неправильный пакет"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "неправильный ASCII формат"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "нет такого User ID"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "секретный ключ не найден"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "использован неправильный секретный ключ"
 
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "не поддерживается"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "неправильный ключ"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "ошибка чтения файла"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "ошибка записи файла"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "неизвестный алгоритм сжатия"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "ошибка открытия файла"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "ошибка создания файла"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "неправильный пароль"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "нереализованный алгоритм с открытым ключом"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "нереализованный алгоритм шифрования"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "неизвестный класс подписи"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "ошибка в таблице доверий"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "неверный MPI"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "нехватка ресурсов"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "неправильная связка ключей"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "неправильный сертификат"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "деформированный User ID"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "ошибка закрытия файла"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "ошибка переименования файла"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "ошибка удаления файла"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "неожидавшиеся данные"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "конфликт с меткой времени"
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "неприменимый алгоритм открытого ключа"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "файл существует"
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "слабый ключ"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "недопустимый аргумент"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "плохой URI"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "неподдерживаемый URI"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "ошибка сети"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "не зашифровано"
 
-#: util/errors.c:103
+#: util/errors.c:104
 msgid "not processed"
 msgstr "не выполнено"
 
-#: util/errors.c:105
+#: util/errors.c:106
 msgid "unusable public key"
 msgstr "непригодный открытый ключ"
 
-#: util/errors.c:106
+#: util/errors.c:107
 msgid "unusable secret key"
 msgstr "непригодный закрытый ключ"
 
-#: util/errors.c:107
+#: util/errors.c:108
 msgid "keyserver error"
 msgstr "ошибка сервера ключей"
 
-#: util/errors.c:108
+#: util/errors.c:109
 msgid "canceled"
 msgstr "отменено"
 
-#: util/errors.c:109
+#: util/errors.c:110
 msgid "no card"
 msgstr "нет карты"
 
-#: util/logger.c:157
+#: util/logger.c:158
 msgid "ERROR: "
 msgstr "ОШИБКА:"
 
-#: util/logger.c:160
+#: util/logger.c:161
 msgid "WARNING: "
 msgstr "ВНИМАНИЕ:"
 
-#: util/logger.c:223
+#: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr " ... это ошибка (%s:%d:%s)\n"
 
-#: util/logger.c:229
+#: util/logger.c:230
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Вы нашли ошибку ... (%s:%d)\n"
 
-#: util/miscutil.c:336 util/miscutil.c:373
+#: util/miscutil.c:330 util/miscutil.c:367
 msgid "yes"
 msgstr "да"
 
-#: util/miscutil.c:337 util/miscutil.c:378
+#: util/miscutil.c:331 util/miscutil.c:372
 msgid "yY"
 msgstr "yY"
 
-#: util/miscutil.c:339 util/miscutil.c:375
+#: util/miscutil.c:333 util/miscutil.c:369
 msgid "no"
 msgstr "нет"
 
-#: util/miscutil.c:340 util/miscutil.c:379
+#: util/miscutil.c:334 util/miscutil.c:373
 msgid "nN"
 msgstr ""
 
-#: util/miscutil.c:377
+#: util/miscutil.c:371
 msgid "quit"
 msgstr "quit"
 
-#: util/miscutil.c:380
+#: util/miscutil.c:374
 msgid "qQ"
 msgstr ""
 
-#: util/miscutil.c:413
+#: util/miscutil.c:407
 msgid "okay|okay"
 msgstr ""
 
-#: util/miscutil.c:415
+#: util/miscutil.c:409
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:416
+#: util/miscutil.c:410
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:417
+#: util/miscutil.c:411
 msgid "cC"
 msgstr ""
 
-#: util/secmem.c:90
+#: util/secmem.c:91
 msgid "WARNING: using insecure memory!\n"
 msgstr "ВНИМАНИЕ: используется незащищенная память!\n"
 
-#: util/secmem.c:91
+#: util/secmem.c:92
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "Для дополнительной информации см. http://www.gnupg.org/faq.html\n"
 
-#: util/secmem.c:343
+#: util/secmem.c:344
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "операция невозможна без инициализации защищенной памяти\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:345
 msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 "(возможно, Вы используете неподходящее программное обеспечение\n"
 "для данной задачи)\n"
+
+#~ msgid "error getting serial number: %s\n"
+#~ msgstr "ошибка при получении серийного номера: %s\n"
+
+#~ msgid "Hint: Select the user IDs to sign\n"
+#~ msgstr "Подсказка: Выберите User IDs для подписи\n"
+
+#~ msgid "length of RSA modulus is not %d\n"
+#~ msgstr "длина модуля RSA не %d\n"
+
+#~ msgid "length of an RSA prime is not %d\n"
+#~ msgstr "длина простого числа в RSA не %d\n"
+
+#~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+#~ msgstr "плохой пароль или незнакомый алгоритм шифрования (%d)\n"
+
+#~ msgid "can't set client pid for the agent\n"
+#~ msgstr "не могу установить pid для агента\n"
+
+#~ msgid "can't get server read FD for the agent\n"
+#~ msgstr "не могу получить дескриптор чтения для агента\n"
+
+#~ msgid "can't get server write FD for the agent\n"
+#~ msgstr "не могу получить дескриптор записи для агента\n"
+
+#~ msgid "communication problem with gpg-agent\n"
+#~ msgstr "коммуникационный проблемы с gpg-agent\n"
+
+#~ msgid "passphrase too long\n"
+#~ msgstr "пароль слишком длинный\n"
+
+#~ msgid "invalid response from agent\n"
+#~ msgstr "неверный ответ от агента\n"
+
+#~ msgid "problem with the agent: agent returns 0x%lx\n"
+#~ msgstr "проблема с агентом: агент вернул 0x%lx\n"
diff --git a/po/sk.po b/po/sk.po
index 38bfe459a..dafcf0e40 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: 2005-03-15 16:35+0100\n"
+"POT-Creation-Date: 2005-05-31 10:05+0200\n"
 "PO-Revision-Date: 2004-07-20 15:52+0200\n"
 "Last-Translator: Michal Majer <[email protected]>\n"
 "Language-Team: Slovak <[email protected]>\n"
@@ -13,80 +13,80 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:120
+#: cipher/primegen.c:121
 #, fuzzy, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr "nem��em vytvori� prvo��slo s d�kou menej ako %d bitov\n"
 
-#: cipher/primegen.c:311
+#: cipher/primegen.c:312
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "nem��em vytvori� prvo��slo s d�kou menej ako %d bitov\n"
 
-#: cipher/random.c:163
+#: cipher/random.c:164
 msgid "no entropy gathering module detected\n"
 msgstr "nebol detekovan� �iadny modul na z�skanie entropie\n"
 
-#: cipher/random.c:387 g10/card-util.c:656 g10/card-util.c:725
-#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2255
-#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
-#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
-#: g10/tdbio.c:600
+#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
+#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
+#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
+#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
+#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/tdbio.c:601
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nem��em otvori� `%s': %s\n"
 
-#: cipher/random.c:391
+#: cipher/random.c:392
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "nem��em pou�i� pr�kaz stat na `%s': %s\n"
 
-#: cipher/random.c:396
+#: cipher/random.c:397
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' nie je norm�lny s�bor - ignorovan�\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:402
 msgid "note: random_seed file is empty\n"
 msgstr "pozn�mka: s�bor random_seed je pr�zdny\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:408
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "varovanie: neplatn� ve�kos� random_seed - s�bor nepou�it�\n"
 
-#: cipher/random.c:415
+#: cipher/random.c:416
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "nem��em ��ta� `%s': %s\n"
 
-#: cipher/random.c:453
+#: cipher/random.c:454
 msgid "note: random_seed file not updated\n"
 msgstr "pozn�mka: s�bor random_seed nie je aktualizovan�\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2723
-#: g10/keygen.c:2753 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
-#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nem��em vytvori� `%s': %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:481
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "nem��em zapisova� do `%s': %s\n"
 
-#: cipher/random.c:483
+#: cipher/random.c:484
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "nem��em zavrie� `%s': %s\n"
 
-#: cipher/random.c:728
+#: cipher/random.c:729
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "VAROVANIE: pou�it� gener�tor n�hodn�ch ��sel nie je bezpe�n�!!\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:730
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -100,7 +100,7 @@ msgstr ""
 "NEPOU��VAJTE �IADNE D�TA VYTVOREN� T�MTO PROGRAMOM!!\n"
 "\n"
 
-#: cipher/rndegd.c:204
+#: cipher/rndegd.c:205
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -109,7 +109,7 @@ msgstr ""
 "Pros�m �akajte, z�skava sa entropia. Robte zatia� nejak� in� pr�cu\n"
 "aby ste sa nenudili a zv��ite t�m kvalitu entropie.\n"
 
-#: cipher/rndlinux.c:134
+#: cipher/rndlinux.c:135
 #, c-format
 msgid ""
 "\n"
@@ -120,45 +120,62 @@ msgstr ""
 "Nedostatok n�hodn�ch bajtov. Pros�m, pracujte s opera�n�m syst�mom, aby\n"
 "ste mu umo�nili z�ska� viac entropie (je potrebn�ch %d bajtov).\n"
 
-#: g10/app-openpgp.c:547
+#: g10/app-openpgp.c:596
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: g10/app-openpgp.c:560
+#: g10/app-openpgp.c:609
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "zlyhalo obnovenie vyrovn�vacej pam�ti k���ov: %s\n"
 
-#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
+#: g10/app-openpgp.c:977
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
+
+#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+msgid "response does not contain the public key data\n"
+msgstr ""
+
+#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
-#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
+#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
+#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "nepodarilo posla� k��� na server: %s\n"
 
-#: g10/app-openpgp.c:836
+#: g10/app-openpgp.c:1310
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:857
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:862
+#: g10/app-openpgp.c:1336
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -166,354 +183,359 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:869
+#: g10/app-openpgp.c:1343
 msgid "|A|Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1018
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:1492
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1018
+#: g10/app-openpgp.c:1492
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1022
+#: g10/app-openpgp.c:1496
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
+#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "chyba pri ��tan� bloku k���a: %s\n"
 
-#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
+#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: chyba pri ��tan� vo�n�ho z�znamu: %s\n"
 
-#: g10/app-openpgp.c:1104
+#: g10/app-openpgp.c:1562
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' je u� skomprimovan�\n"
 
-#: g10/app-openpgp.c:1108
+#: g10/app-openpgp.c:1566
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1110
+#: g10/app-openpgp.c:1568
 #, fuzzy
 msgid "generating new key\n"
 msgstr "vytvori� nov� p�r k���ov"
 
-#: g10/app-openpgp.c:1120
+#: g10/app-openpgp.c:1735
+msgid "creation timestamp missing\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1742
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1749
+#, c-format
+msgid "RSA public exponent missing or largerr than %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1827
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "nem��em inicializova� datab�zu d�very: %s\n"
+
+#: g10/app-openpgp.c:1886
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1135
+#: g10/app-openpgp.c:1901
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1904
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
 
-#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
-msgid "response does not contain the public key data\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
-msgid "response does not contain the RSA modulus\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
-msgid "response does not contain the RSA public exponent\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1195
+#: g10/app-openpgp.c:1961
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1356
+#: g10/app-openpgp.c:2130
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1364
+#: g10/app-openpgp.c:2138
 #, c-format
-msgid "PIN [sigs done: %lu]"
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
+#: g10/app-openpgp.c:2399
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
 
-#: g10/app-openpgp.c:1731
-#, fuzzy, c-format
-msgid "error getting serial number: %s\n"
-msgstr "chyba pri vytv�ran� hesla: %s\n"
-
-#: g10/app-openpgp.c:1826
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "nem��em inicializova� datab�zu d�very: %s\n"
-
-#: g10/app-openpgp.c:1868
-#, fuzzy
-msgid "reading the key failed\n"
-msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
-
-#: g10/armor.c:317
+#: g10/armor.c:318
 #, c-format
 msgid "armor: %s\n"
 msgstr "ASCII k�dovanie: %s\n"
 
-#: g10/armor.c:346
+#: g10/armor.c:347
 msgid "invalid armor header: "
 msgstr "neplatn� hlavi�ka ASCII k�dovania: "
 
-#: g10/armor.c:353
+#: g10/armor.c:354
 msgid "armor header: "
 msgstr "ASCII hlavi�ka: "
 
-#: g10/armor.c:364
+#: g10/armor.c:365
 msgid "invalid clearsig header\n"
 msgstr "neplatn� hlavi�ka podpisu v �itate�nom form�te\n"
 
-#: g10/armor.c:416
+#: g10/armor.c:417
 msgid "nested clear text signatures\n"
 msgstr "vnoren� podpisy v �itate�nom form�tu\n"
 
-#: g10/armor.c:551
+#: g10/armor.c:552
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "neo�ak�van� k�dovanie ASCII:"
 
-#: g10/armor.c:563
+#: g10/armor.c:564
 msgid "invalid dash escaped line: "
 msgstr "nespr�vne ozna�enie riadku m�nusmi: "
 
-#: g10/armor.c:715 g10/armor.c:1322
+#: g10/armor.c:716 g10/armor.c:1323
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "neplatn� znak vo form�te radix64 %02x bol presko�en�\n"
 
-#: g10/armor.c:758
+#: g10/armor.c:759
 msgid "premature eof (no CRC)\n"
 msgstr "pred�asn� koniec s�boru (�iadne CRC)\n"
 
-#: g10/armor.c:792
+#: g10/armor.c:793
 msgid "premature eof (in CRC)\n"
 msgstr "pred�asn� koniec s�boru (v CRC)\n"
 
-#: g10/armor.c:800
+#: g10/armor.c:801
 msgid "malformed CRC\n"
 msgstr "nespr�vny form�t CRC\n"
 
-#: g10/armor.c:804 g10/armor.c:1359
+#: g10/armor.c:805 g10/armor.c:1360
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Chyba CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:824
+#: g10/armor.c:825
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "pred�asn� koniec s�boru (v p�ti�ke)\n"
 
-#: g10/armor.c:828
+#: g10/armor.c:829
 msgid "error in trailer line\n"
 msgstr "chyba v p�ti�ke\n"
 
-#: g10/armor.c:1137
+#: g10/armor.c:1138
 msgid "no valid OpenPGP data found.\n"
 msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
 
-#: g10/armor.c:1142
+#: g10/armor.c:1143
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "neplatn� k�dovanie ASCII: riadok je dlh�� ako %d znakov\n"
 
-#: g10/armor.c:1146
+#: g10/armor.c:1147
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "neplatn� znak (quoted-printable) v ASCII k�dovan� - pravdepodobne bol "
 "pou�it� nespr�vny MTA\n"
 
-#: g10/card-util.c:58 g10/card-util.c:295
+#: g10/card-util.c:63 g10/card-util.c:303
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "tajn� k��� nie je dostupn�"
 
-#: g10/card-util.c:63
+#: g10/card-util.c:68
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1329 g10/delkey.c:127 g10/keyedit.c:1430
-#: g10/keygen.c:2439 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1510
+#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "nemo�no previes� v d�vkovom m�de\n"
 
-#: g10/card-util.c:97 g10/card-util.c:1108 g10/card-util.c:1191
-#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
-#: g10/keygen.c:1365
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
+#: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "V� v�ber? "
 
-#: g10/card-util.c:206 g10/card-util.c:256
+#: g10/card-util.c:213 g10/card-util.c:263
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:391
+#: g10/card-util.c:410
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 #, fuzzy
 msgid "unspecified"
 msgstr "D�vod nebol �pecifikovan�"
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 #, fuzzy
 msgid "not forced"
 msgstr "nespracovan�"
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:497
+#: g10/card-util.c:516
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:499
+#: g10/card-util.c:518
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:501
+#: g10/card-util.c:520
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:518
+#: g10/card-util.c:537
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:539
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:538
+#: g10/card-util.c:557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:559
+#: g10/card-util.c:578
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "�iadny zodpovedaj�ci verejn� k���: %s\n"
 
-#: g10/card-util.c:567
+#: g10/card-util.c:586
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:665 g10/card-util.c:734 g10/import.c:261
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:692
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:683
+#: g10/card-util.c:702
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:742
+#: g10/card-util.c:761
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:752
+#: g10/card-util.c:771
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:772
+#: g10/card-util.c:791
 #, fuzzy
 msgid "Language preferences: "
 msgstr "aktualizova� predvo�by"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:799
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "neplatn� znak v re�azci s predvo�bami\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:808
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "neplatn� znak v re�azci s predvo�bami\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:829
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:824
+#: g10/card-util.c:843
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "chyba: neplatn� odtla�ok\n"
 
-#: g10/card-util.c:845
+#: g10/card-util.c:864
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "vyp�sa� fingerprint"
 
-#: g10/card-util.c:868
+#: g10/card-util.c:887
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "chyba: neplatn� odtla�ok\n"
 
-#: g10/card-util.c:916
+#: g10/card-util.c:935
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
 
-#: g10/card-util.c:917
+#: g10/card-util.c:936
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
 
-#: g10/card-util.c:926
+#: g10/card-util.c:945
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1030
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1030 g10/card-util.c:1039
+#: g10/card-util.c:1051 g10/card-util.c:1060
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1051
+#: g10/card-util.c:1072
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1060
+#: g10/card-util.c:1081
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -521,281 +543,285 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1099
+#: g10/card-util.c:1120
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Pros�m, vyberte druh k���a, ktor� chcete:\n"
 
-#: g10/card-util.c:1101 g10/card-util.c:1182
+#: g10/card-util.c:1122 g10/card-util.c:1203
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Platnos� podpisu vypr�ala %s\n"
 
-#: g10/card-util.c:1102 g10/card-util.c:1184
+#: g10/card-util.c:1123 g10/card-util.c:1205
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (len na �ifrovanie)\n"
 
-#: g10/card-util.c:1103 g10/card-util.c:1186
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1119 g10/card-util.c:1202 g10/keyedit.c:908
-#: g10/keygen.c:1404 g10/revoke.c:642
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
+#: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "Neplatn� v�ber.\n"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1200
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Pros�m v�berte d�vod na revok�ciu:\n"
 
-#: g10/card-util.c:1214
+#: g10/card-util.c:1235
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "nezn�my ochrann� algoritmus\n"
 
-#: g10/card-util.c:1219
+#: g10/card-util.c:1240
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
 
-#: g10/card-util.c:1224
+#: g10/card-util.c:1245
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
 
-#: g10/card-util.c:1294 g10/keyedit.c:1317
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "ukon�i� toto menu"
 
-#: g10/card-util.c:1296
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "show admin commands"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/card-util.c:1297 g10/keyedit.c:1320
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "uk�za� t�to pomoc"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "list all available data"
 msgstr "K��� k dispoz�cii na: "
 
-#: g10/card-util.c:1302
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1303
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1304
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1305
+#: g10/card-util.c:1327
 #, fuzzy
 msgid "change the login name"
 msgstr "zmeni� dobu platnosti"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the language preferences"
 msgstr "zmeni� d�veryhodnos� vlastn�ka k���a"
 
-#: g10/card-util.c:1307
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1308
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "vyp�sa� fingerprint"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1310
+#: g10/card-util.c:1332
 #, fuzzy
 msgid "generate new keys"
 msgstr "vytvori� nov� p�r k���ov"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1377 g10/keyedit.c:1526
+#: g10/card-util.c:1334
+msgid "verify the PIN and list all data"
+msgstr ""
+
+#: g10/card-util.c:1454 g10/keyedit.c:1609
 msgid "Command> "
 msgstr "Pr�kaz> "
 
-#: g10/card-util.c:1412
+#: g10/card-util.c:1492
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/card-util.c:1430
+#: g10/card-util.c:1525
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/card-util.c:1499 g10/keyedit.c:2104
+#: g10/card-util.c:1599 g10/keyedit.c:2210
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� pr�kaz (sk�ste \"help\")\n"
 
-#: g10/cardglue.c:287
+#: g10/cardglue.c:396
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:519
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:380
+#: g10/cardglue.c:527
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:852
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:853
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:854
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:691
+#: g10/cardglue.c:855
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:705
+#: g10/cardglue.c:872
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Opakujte heslo: "
 
-#: g10/cardglue.c:719
+#: g10/cardglue.c:886
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "heslo nie je zopakovan� spr�vne; sk�ste to znovu"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
-#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nemo�no otvori� `%s'\n"
 
-#: g10/decrypt.c:104 g10/encode.c:859
+#: g10/decrypt.c:105 g10/encode.c:846
 msgid "--output doesn't work for this command\n"
 msgstr "--output pre tento pr�kaz nefunguje\n"
 
-#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3167 g10/keyserver.c:1511
-#: g10/revoke.c:226
+#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3346 g10/keyserver.c:1541
+#: g10/revoke.c:227
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "k��� `%s' nebol n�jden�: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2300 g10/keyserver.c:1525
-#: g10/revoke.c:232 g10/revoke.c:439
+#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "chyba pri ��tan� bloku k���a: %s\n"
 
-#: g10/delkey.c:128 g10/delkey.c:135
+#: g10/delkey.c:129 g10/delkey.c:136
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(pokia� neur��te k��� jeho fingerprintom)\n"
 
-#: g10/delkey.c:134
+#: g10/delkey.c:135
 #, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "bez parametra \"--yes\" to nemo�no v d�vkovom m�de previes�\n"
 
-#: g10/delkey.c:146
+#: g10/delkey.c:147
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Zmaza� tento k��� zo s�boru k���ov? "
 
-#: g10/delkey.c:154
+#: g10/delkey.c:155
 #, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Toto je tajn� k���! - skuto�ne zmaza�? "
 
-#: g10/delkey.c:164
+#: g10/delkey.c:165
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: g10/delkey.c:174
+#: g10/delkey.c:175
 msgid "ownertrust information cleared\n"
 msgstr "inform�cie o d�veryhodnosti vlastn�ka k���a vymazan�\n"
 
-#: g10/delkey.c:205
+#: g10/delkey.c:206
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "existuje tajn� k��� pre tento verejn� k��� \"%s\"!\n"
 
-#: g10/delkey.c:207
+#: g10/delkey.c:208
 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:210 g10/sign.c:1186
+#: g10/encode.c:211 g10/sign.c:1218
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: g10/encode.c:215
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "v m�de S2K nemo�no pou�i� symetrick� ESK paket\n"
 
-#: g10/encode.c:228
+#: g10/encode.c:229
 #, c-format
 msgid "using cipher %s\n"
 msgstr "pou�it� �ifra %s\n"
 
-#: g10/encode.c:238 g10/encode.c:558
+#: g10/encode.c:239 g10/encode.c:545
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' je u� skomprimovan�\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
+#: g10/encode.c:302 g10/encode.c:591 g10/sign.c:566
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VAROVANIE: s�bor `%s' je pr�zdny\n"
 
-#: g10/encode.c:472
+#: g10/encode.c:466
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "v m�de --pgp2 m��ete �ifrova� len RSA k���om s d�kou 2048 bitov a menej\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:488
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "��tam z `%s'\n"
 
-#: g10/encode.c:530
+#: g10/encode.c:517
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "algoritmus IDEA nemo�no pou�i� na v�etky k���e, pre ktor� �ifrujete.\n"
 
-#: g10/encode.c:540
+#: g10/encode.c:527
 #, fuzzy, c-format
 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:648 g10/sign.c:877
+#: g10/encode.c:635 g10/sign.c:899
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -803,128 +829,128 @@ msgid ""
 msgstr ""
 "vy�iadan� kompresn� algoritmus %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
 
-#: g10/encode.c:735
+#: g10/encode.c:722
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "vy�iadan� symetrick� �ifra %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
 
-#: g10/encode.c:805 g10/pkclist.c:721 g10/pkclist.c:757
+#: g10/encode.c:792 g10/pkclist.c:722 g10/pkclist.c:758
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr ""
 "pou�itie %s nie je v m�de %s dovolen�\n"
 "\n"
 
-#: g10/encode.c:832
+#: g10/encode.c:819
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s za�ifrovan� pre: %s\n"
 
-#: g10/encr-data.c:66 g10/mainproc.c:301
+#: g10/encr-data.c:67 g10/mainproc.c:302
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s za�ifrovan� d�ta\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:305
+#: g10/encr-data.c:69 g10/mainproc.c:306
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "za�ifrovan� nezn�mym algoritmom %d\n"
 
-#: g10/encr-data.c:92
+#: g10/encr-data.c:93
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "VAROVANIE: spr�va bola za�ifrovan� slab�m k���om v symetrickej �ifre.\n"
 
-#: g10/encr-data.c:103
+#: g10/encr-data.c:104
 msgid "problem handling encrypted packet\n"
 msgstr "probl�m so za�ifrovan�m paketom\n"
 
-#: g10/exec.c:48
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "�iadne vzialen� vykon�vanie programu nie je podporovan�\n"
 
-#: g10/exec.c:184 g10/openfile.c:406
+#: g10/exec.c:173 g10/openfile.c:410
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nem��em vytvori� adres�r `%s': %s\n"
 
-#: g10/exec.c:325
+#: g10/exec.c:314
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "volanie extern�ho programu zru�en� kv�li nebezpe�n�m pr�vam s�boru "
 "nastaven�\n"
 
-#: g10/exec.c:355
+#: g10/exec.c:344
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "t�to platforma potrebuje do�asn� s�bory na spustenie extern�ho programu\n"
 
-#: g10/exec.c:433
+#: g10/exec.c:422
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "nemo�no spusti� %s \"%s\": %s\n"
 
-#: g10/exec.c:436
+#: g10/exec.c:425
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "nemo�no spusti� %s \"%s\": %s\n"
 
-#: g10/exec.c:521
+#: g10/exec.c:510
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "syst�mov� chyba pri volan� extern�ho programu: %s\n"
 
-#: g10/exec.c:532 g10/exec.c:598
+#: g10/exec.c:521 g10/exec.c:587
 msgid "unnatural exit of external program\n"
 msgstr "nekorektn� ukon�enie extern�ho programu\n"
 
-#: g10/exec.c:547
+#: g10/exec.c:536
 msgid "unable to execute external program\n"
 msgstr "nemo�no spusti� extern� program\n"
 
-#: g10/exec.c:563
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "nemo�no c�ta� odozvu extern�ho programu: %s\n"
 
-#: g10/exec.c:609 g10/exec.c:616
+#: g10/exec.c:598 g10/exec.c:605
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
 
-#: g10/exec.c:621
+#: g10/exec.c:610
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "VAROVANIE: nem��em vymaza� do�asn� adres�r `%s': %s\n"
 
-#: g10/export.c:183
+#: g10/export.c:184
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/export.c:212
+#: g10/export.c:213
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "k��� %08lX: nie je chr�nen� - presko�en�\n"
 
-#: g10/export.c:220
+#: g10/export.c:221
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "k��� %08lX: PGP 2.x k��� - presko�en�\n"
 
-#: g10/export.c:395
+#: g10/export.c:398
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "VAROVANIE: tajn� k��� %08lX nem� jednoduch� SK kontroln� s��et\n"
 
-#: g10/export.c:427
+#: g10/export.c:430
 msgid "WARNING: nothing exported\n"
 msgstr "VAROVANIE: ni� nebolo vyexportovan�\n"
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid ""
 "@Commands:\n"
 " "
@@ -932,128 +958,128 @@ msgstr ""
 "@Pr�kazy:\n"
 " "
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "|[file]|make a signature"
 msgstr "|[s�bor]|vytvori� podpis"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "|[file]|make a clear text signature"
 msgstr "|[s�bor]|vytvori� podpis v �itate�nom dokumente"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "make a detached signature"
 msgstr "vytvori� podpis oddelen� od dokumentu"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encrypt data"
 msgstr "�ifrova� d�ta"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "encryption only with symmetric cipher"
 msgstr "�ifrovanie len so symetrickou �ifrou"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "decrypt data (default)"
 msgstr "de�ifrova� d�ta (implicitne)"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "verify a signature"
 msgstr "verifikova� podpis"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys"
 msgstr "vyp�sa� zoznam k���ov"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and signatures"
 msgstr "vyp�sa� zoznam k���ov a podpisov"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "skontrolova� podpisy k���ov"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "list keys and fingerprints"
 msgstr "vyp�sa� zoznam k���ov a fingerprintov"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "list secret keys"
 msgstr "vyp�sa� zoznam tajn�ch k���ov"
 
-#: g10/g10.c:379
+#: g10/g10.c:381
 msgid "generate a new key pair"
 msgstr "vytvori� nov� p�r k���ov"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the public keyring"
 msgstr "odstr�ni� k��� zo s�boru verejn�ch k���ov"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "remove keys from the secret keyring"
 msgstr "odstr�ni� k��� zo s�boru tajn�ch k���ov"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign a key"
 msgstr "podp�sa� k���"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "sign a key locally"
 msgstr "podp�sa� k��� lok�lne"
 
-#: g10/g10.c:385
+#: g10/g10.c:387
 msgid "sign or edit a key"
 msgstr "podp�sa� alebo modifikova� k���"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "generate a revocation certificate"
 msgstr "vytvori� revoka�n� certifik�t"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "export keys"
 msgstr "exportova� k���e"
 
-#: g10/g10.c:389
+#: g10/g10.c:391
 msgid "export keys to a key server"
 msgstr "exportova� k���e na server k���ov"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "import keys from a key server"
 msgstr "importova� k���e zo servera k���ov"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "search for keys on a key server"
 msgstr "vyh�ada� k���e na serveri k���ov"
 
-#: g10/g10.c:394
+#: g10/g10.c:396
 msgid "update all keys from a keyserver"
 msgstr "aktualizova� v�etky k���e zo servera k���ov"
 
-#: g10/g10.c:397
+#: g10/g10.c:399
 msgid "import/merge keys"
 msgstr "importova�/zl��i� k���e"
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "print the card status"
 msgstr ""
 
-#: g10/g10.c:401
+#: g10/g10.c:403
 msgid "change data on a card"
 msgstr ""
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/g10.c:410
+#: g10/g10.c:412
 msgid "update the trust database"
 msgstr "aktualizova� datab�zu d�very"
 
-#: g10/g10.c:417
+#: g10/g10.c:419
 msgid "|algo [files]|print message digests"
 msgstr "|algo [s�bory]|vyp�� hash"
 
-#: g10/g10.c:421 g10/gpgv.c:66
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1063,55 +1089,55 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "create ascii armored output"
 msgstr "vytvor v�stup zak�dovan� pomocou ASCII"
 
-#: g10/g10.c:425
+#: g10/g10.c:427
 msgid "|NAME|encrypt for NAME"
 msgstr "|MENO|�ifrova� pre MENO"
 
-#: g10/g10.c:436
+#: g10/g10.c:438
 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/g10.c:437
+#: g10/g10.c:439
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|nastavi� �rove� komprim�cie N (0 - �iadna\n"
 " komprim�cia)"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "use canonical text mode"
 msgstr "pou�i� k�nonick� textov� m�d"
 
-#: g10/g10.c:452
+#: g10/g10.c:458
 msgid "use as output file"
 msgstr "pou�i� ako v�stupn� s�bor"
 
-#: g10/g10.c:454 g10/gpgv.c:68
+#: g10/g10.c:460 g10/gpgv.c:73
 msgid "verbose"
 msgstr "s dodato�n�mi inform�ciami"
 
-#: g10/g10.c:465
+#: g10/g10.c:471
 msgid "do not make any changes"
 msgstr "nevykona� �iadne zmeny"
 
-#: g10/g10.c:466
+#: g10/g10.c:472
 msgid "prompt before overwriting"
 msgstr "vy�iada� potvrdenie pred prep�san�m"
 
-#: g10/g10.c:507
+#: g10/g10.c:513
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:508
+#: g10/g10.c:514
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:536
+#: g10/g10.c:542
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1120,7 +1146,7 @@ msgstr ""
 "(Pou�ite manu�lov� str�nky pre kompletn� zoznam v�etk�ch pr�kazov a "
 "mo�nost�)\n"
 
-#: g10/g10.c:539
+#: g10/g10.c:545
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1140,17 +1166,17 @@ msgstr ""
 " --list-keys [men�]        vyp�sa� k���e\n"
 " --fingerprint [men�]      vyp�sa� fingerprinty\n"
 
-#: g10/g10.c:720 g10/gpgv.c:93
+#: g10/g10.c:724 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Chyby ozn�mte, pros�m, na adresu <[email protected]>.\n"
 "Pripomienky k prekladu <[email protected]>.\n"
 
-#: g10/g10.c:737
+#: g10/g10.c:741
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: g10/g10.c:740
+#: g10/g10.c:744
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1160,7 +1186,7 @@ msgstr ""
 "podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
 "implicitn� oper�cie z�visia od vstupn�ch d�t\n"
 
-#: g10/g10.c:751
+#: g10/g10.c:755
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1168,468 +1194,478 @@ msgstr ""
 "\n"
 "Podporovan� algoritmy:\n"
 
-#: g10/g10.c:754
+#: g10/g10.c:758
 msgid "Pubkey: "
 msgstr "Verejn� k���e: "
 
-#: g10/g10.c:760 g10/keyedit.c:2141
+#: g10/g10.c:764 g10/keyedit.c:2248
 msgid "Cipher: "
 msgstr "�ifry: "
 
-#: g10/g10.c:766
+#: g10/g10.c:770
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:772 g10/keyedit.c:2187
+#: g10/g10.c:776 g10/keyedit.c:2294
 msgid "Compression: "
 msgstr "Kompresia: "
 
-#: g10/g10.c:855
+#: g10/g10.c:859
 msgid "usage: gpg [options] "
 msgstr "pou�itie: gpg [mo�nosti] "
 
-#: g10/g10.c:1003
+#: g10/g10.c:1007
 msgid "conflicting commands\n"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/g10.c:1021
+#: g10/g10.c:1025
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = podpis n�jden� v defin�cii skupiny \"%s\"\n"
 
-#: g10/g10.c:1218
+#: g10/g10.c:1222
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1221
+#: g10/g10.c:1225
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1224
+#: g10/g10.c:1228
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1230
+#: g10/g10.c:1234
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1233
+#: g10/g10.c:1237
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1240
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1242
+#: g10/g10.c:1246
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1245
+#: g10/g10.c:1249
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1248
+#: g10/g10.c:1252
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1258
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1257
+#: g10/g10.c:1261
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 "VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1260
+#: g10/g10.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1401
+#: g10/g10.c:1405
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nezn�ma polo�ka konfigur�cie \"%s\"\n"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1802
 #, 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/g10.c:1838
+#: g10/g10.c:1844
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "POZN�MKA: neexistuje implicitn� s�bor s mo�nos�ami `%s'\n"
 
-#: g10/g10.c:1842
+#: g10/g10.c:1848
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "s�bor s mo�nos�ami `%s': %s\n"
 
-#: g10/g10.c:1849
+#: g10/g10.c:1855
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��tam mo�nosti z `%s'\n"
 
-#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "POZN�MKA: %s nie je pre norm�lne pou�itie!\n"
 
-#: g10/g10.c:2076
+#: g10/g10.c:2082
 #, 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/g10.c:2293
+#: g10/g10.c:2236 g10/g10.c:2248
+#, fuzzy, c-format
+msgid "`%s' is not a valid signature expiration\n"
+msgstr "%s nie je platn� znakov� sada\n"
+
+#: g10/g10.c:2321
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3683
+#: g10/g10.c:2340 g10/keyedit.c:3862
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2346
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2349
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2356
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2359
 msgid "invalid import options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2366
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2369
 msgid "invalid export options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2376
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2379
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2401
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2404
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2411
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nemo�no nastavi� exec-path na %s\n"
 
-#: g10/g10.c:2573
+#: g10/g10.c:2602
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROVANIE: program m��e vytvori� s�bor core!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2606
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROVANIE: %s prep��e %s\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2615
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie je dovolen� pou��va� %s s %s!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2618
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�va s %s zmysel!\n"
 
-#: g10/g10.c:2603
+#: g10/g10.c:2625
+#, fuzzy, c-format
+msgid "NOTE: %s is not available in this version\n"
+msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
+
+#: g10/g10.c:2640
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/g10.c:2617
+#: g10/g10.c:2654
 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/g10.c:2623
+#: g10/g10.c:2660
 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/g10.c:2629
+#: g10/g10.c:2666
 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/g10.c:2642
+#: g10/g10.c:2679
 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/g10.c:2712 g10/g10.c:2736
+#: g10/g10.c:2746 g10/g10.c:2770
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2718 g10/g10.c:2742
+#: g10/g10.c:2752 g10/g10.c:2776
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2724
+#: g10/g10.c:2758
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2764
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2745
+#: g10/g10.c:2779
 msgid "completes-needed must be greater than 0\n"
 msgstr "polo�ka completes-needed mus� by� v��ia ako 0\n"
 
-#: g10/g10.c:2747
+#: g10/g10.c:2781
 msgid "marginals-needed must be greater than 1\n"
 msgstr "polo�ka marginals-needed mus� by� v��ia ako 1\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2783
 #, 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/g10.c:2751
+#: g10/g10.c:2785
 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/g10.c:2753
+#: g10/g10.c:2787
 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/g10.c:2756
+#: g10/g10.c:2790
 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/g10.c:2760
+#: g10/g10.c:2794
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "neplatn� m�d S2K; mus� by� 0, 1 alebo 3\n"
 
-#: g10/g10.c:2767
+#: g10/g10.c:2801
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� predvo�by\n"
 
-#: g10/g10.c:2776
+#: g10/g10.c:2810
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre �ifrovanie\n"
 
-#: g10/g10.c:2780
+#: g10/g10.c:2814
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre hashovanie\n"
 
-#: g10/g10.c:2784
+#: g10/g10.c:2818
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre kompresiu\n"
 
-#: g10/g10.c:2817
+#: g10/g10.c:2851
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s e�te nepracuje s %s\n"
 
-#: g10/g10.c:2864
+#: g10/g10.c:2898
 #, 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/g10.c:2869
+#: g10/g10.c:2903
 #, 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/g10.c:2874
+#: g10/g10.c:2908
 #, 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/g10.c:2970
+#: g10/g10.c:3004
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: g10/g10.c:2981
+#: g10/g10.c:3015
 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/g10.c:2992
+#: g10/g10.c:3026
 msgid "--store [filename]"
 msgstr "--store [meno s�boru]"
 
-#: g10/g10.c:2999
+#: g10/g10.c:3033
 msgid "--symmetric [filename]"
 msgstr "--symmetric [meno s�boru]"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3035
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "de�ifrovanie zlyhalo: %s\n"
 
-#: g10/g10.c:3011
+#: g10/g10.c:3045
 msgid "--encrypt [filename]"
 msgstr "--encrypt [meno s�boru]"
 
-#: g10/g10.c:3024
+#: g10/g10.c:3058
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3060
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3029
+#: g10/g10.c:3063
 #, 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/g10.c:3047
+#: g10/g10.c:3081
 msgid "--sign [filename]"
 msgstr "--sign [meno s�boru]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3094
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/g10.c:3075
+#: g10/g10.c:3109
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/g10.c:3077
+#: g10/g10.c:3111
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3080
+#: g10/g10.c:3114
 #, 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/g10.c:3100
+#: g10/g10.c:3134
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [meno s�boru]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3143
 msgid "--clearsign [filename]"
 msgstr "--clearsign [meno s�boru]"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3168
 msgid "--decrypt [filename]"
 msgstr "--decrypt [meno s�boru]"
 
-#: g10/g10.c:3142
+#: g10/g10.c:3176
 msgid "--sign-key user-id"
 msgstr "--sign-key id u��vate�a"
 
-#: g10/g10.c:3146
+#: g10/g10.c:3180
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u��vate�a"
 
-#: g10/g10.c:3167
+#: g10/g10.c:3201
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u��vate�a [pr�kazy]"
 
-#: g10/g10.c:3238
+#: g10/g10.c:3272
 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/g10.c:3275
+#: g10/g10.c:3309
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "nepodarilo posla� k��� na server: %s\n"
 
-#: g10/g10.c:3277
+#: g10/g10.c:3311
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3313
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nepodaril sa export k���a: %s\n"
 
-#: g10/g10.c:3290
+#: g10/g10.c:3324
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "nepodarilo sa n�js� server: %s\n"
 
-#: g10/g10.c:3300
+#: g10/g10.c:3334
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aktualiz�cia servera zlyhala: %s\n"
 
-#: g10/g10.c:3341
+#: g10/g10.c:3375
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dovanie z ASCII form�tu zlyhalo: %s\n"
 
-#: g10/g10.c:3349
+#: g10/g10.c:3383
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
 
-#: g10/g10.c:3436
+#: g10/g10.c:3470
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/g10.c:3559
+#: g10/g10.c:3593
 msgid "[filename]"
 msgstr "[meno s�boru]"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3597
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�nite p�sa� svoju spr�vu ...\n"
 
-#: g10/g10.c:3853
+#: g10/g10.c:3887
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1637,79 +1673,84 @@ msgstr ""
 "meno m��e obsahova� len p�smen�, ��slice, bodky, pod�iarn�ky alebo medzery a "
 "kon�i� s '='\n"
 
-#: g10/g10.c:3861
+#: g10/g10.c:3895
 msgid "a user notation name must contain the '@' character\n"
 msgstr "hodnota mus� obsahova� znak '@'\n"
 
-#: g10/g10.c:3871
+#: g10/g10.c:3900
+#, fuzzy
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr "hodnota mus� obsahova� znak '@'\n"
+
+#: g10/g10.c:3911
 msgid "a notation value must not use any control characters\n"
 msgstr "hodnota nesmie obsahova� �iadne kontroln� znaky\n"
 
-#: g10/g10.c:3905
+#: g10/g10.c:3945
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pre certifika�n� politiku je neplatn�\n"
 
-#: g10/g10.c:3907
+#: g10/g10.c:3947
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/g10.c:3940
+#: g10/g10.c:3980
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pr�li� ve�a polo�iek v bufferi verejn�ch k���ov - vypnut�\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2750
+#: g10/getkey.c:187 g10/getkey.c:2757
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[User id not found]"
 
 # c-format
-#: g10/getkey.c:1677
+#: g10/getkey.c:1684
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Neplatn� k��� %08lX zmenen� na platn� pomocou --always-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2228
+#: g10/getkey.c:2235
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "existuje tajn� k��� pre tento verejn� k��� %08lX!\n"
 
-#: g10/getkey.c:2459
+#: g10/getkey.c:2466
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "pou��vam sekund�rny k��� %08lX namiesto prim�rneho k���a %08lX\n"
 
-#: g10/getkey.c:2506
+#: g10/getkey.c:2513
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "k��� %08lX: tajn� k��� bez verejn�ho k���a - presko�en�\n"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:74
 msgid "be somewhat more quiet"
 msgstr "by� o trochu tich��"
 
-#: g10/gpgv.c:70
+#: g10/gpgv.c:75
 msgid "take the keys from this keyring"
 msgstr "Zmaza� tento k��� zo s�boru k���ov? "
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:77
 msgid "make timestamp conflicts only a warning"
 msgstr "konflikt �asov�ho raz�tka"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:78
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zap�sa� inform�cie o stave do tohto FD"
 
-#: g10/gpgv.c:97
+#: g10/gpgv.c:102
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Pou�itie: gpgv [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:105
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1717,7 +1758,7 @@ msgstr ""
 "Syntax: gpg [nastavenia] [s�bory]\n"
 "Skontroluje podpisy oproti zn�mym d�veryhodn�m k���om\n"
 
-#: g10/helptext.c:48
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1728,7 +1769,7 @@ msgstr ""
 "d�very\"; nem� to ni� spolo�n� s (implicitne vytvorenou) \"pavu�inou\n"
 "certifik�tov\"."
 
-#: g10/helptext.c:54
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1740,17 +1781,17 @@ msgstr ""
 "k tajn�m k���om. Odpovedzte \"ano\", aby ste nastavili tieto k���e\n"
 "ako absol�tne d�veryhodn�\n"
 
-#: g10/helptext.c:61
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Pokia� aj tak chcete pou�i� tento ned�veryhodn� k���, odpovedzte \"ano\"."
 
-#: g10/helptext.c:65
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Vlo�te identifik�tor adres�ta, ktor�mu chcete posla� spr�vu."
 
-#: g10/helptext.c:69
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1764,7 +1805,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:83
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -1775,16 +1816,16 @@ msgstr ""
 "Tento algoritmus je vhodn� pou�i� len za ur�it�ch podmienok.\n"
 "Kontaktujte pros�m najprv bezpe�nostn�ho �pecialistu."
 
-#: g10/helptext.c:90
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "Vlo�te d�ku k���a"
 
-#: g10/helptext.c:94 g10/helptext.c:99 g10/helptext.c:111 g10/helptext.c:143
-#: g10/helptext.c:171 g10/helptext.c:176 g10/helptext.c:181
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "Odpovedzte \"ano\" alebo \"nie\""
 
-#: g10/helptext.c:104
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1796,19 +1837,19 @@ msgstr ""
 "spr�vnu chybov� hl�ku - miesto toho syst�m sk�si interpretova�\n"
 "zadan� hodnotu ako interval."
 
-#: g10/helptext.c:116
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "Vlo�te meno dr�ite�a k���a"
 
-#: g10/helptext.c:121
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr "pros�m, vlo�te e-mailov� adresu (nepovinn�, ale ve�mi odpor��an�)"
 
-#: g10/helptext.c:125
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "Pros�m, vlo�te nepovinn� koment�r"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1822,11 +1863,11 @@ msgstr ""
 "O  pre pokra�ovanie generovania k���a.\n"
 "Q  pre ukon�enie generovania k���a."
 
-#: g10/helptext.c:139
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Ak chcete generova� podk���, odpovedzte \"ano\" (alebo len \"a\")."
 
-#: g10/helptext.c:147
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -1900,13 +1941,13 @@ msgstr ""
 "\n"
 "Pokia� neviete, ak� je spr�vna odpove�, odpovedzte \"0\"."
 
-#: g10/helptext.c:185
+#: g10/helptext.c:186
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr ""
 "Pokia� chcete podp�sa� V�ETKY identifik�tory u��vate�ov, odpovedzte \"ano\""
 
-#: g10/helptext.c:189
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -1915,11 +1956,11 @@ msgstr ""
 "\".\n"
 "V�etky certifik�ty bud� tie� straten�!"
 
-#: g10/helptext.c:194
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Odpovedzte \"ano\", pokia� chcete zmaza� podk���"
 
-#: g10/helptext.c:199
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -1929,7 +1970,7 @@ msgstr ""
 "preto�e m��e by� d�le�it� pri vytv�ran� d�very k���a alebo in�ho k���a\n"
 "ceritifikovan�ho t�mto k���om."
 
-#: g10/helptext.c:204
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -1941,13 +1982,13 @@ msgstr ""
 "bol pou�it�, preto�e tento podpisovac� k��� m��e vytvori� d�veru\n"
 "prostredn�ctvom in�ho u� certifikovan�ho k���a."
 
-#: g10/helptext.c:210
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "Podpis je neplatn�. Je rozumn� ho odstr�ni� z V�ho s�boru k���ov."
 
-#: g10/helptext.c:214
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -1960,7 +2001,7 @@ msgstr ""
 "pou��va�. Urobte to len v pr�pade, ke� je tento podpis k���a\n"
 "n�m sam�m z nejak�ho d�vodu neplatn� a ke� je k dispoz�cii in� k���."
 
-#: g10/helptext.c:222
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -1970,24 +2011,24 @@ msgstr ""
 "na aktu�lny zoznam predvolieb. �asov� raz�tka v�etk�ch dotknut�ch podpisov\n"
 "k���ov nimi samotn�mi bud� posunut� o jednu sekundu dopredu.\n"
 
-#: g10/helptext.c:229
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
 
-#: g10/helptext.c:235
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "Pros�m, zopakujte posledn� heslo, aby ste si boli ist�, �o ste nap�sali."
 
-#: g10/helptext.c:239
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "Zadajte n�zov s�boru, ku ktor�mu sa podpis vz�ahuje"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Ak si prajete prep�sanie s�boru, odpovedzte \"ano\""
 
-#: g10/helptext.c:249
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -1995,7 +2036,7 @@ msgstr ""
 "Pros�m, vlo�te nov� n�zov s�boru. Ak len stla��te RETURN, bude\n"
 "pou�it� implicitn� s�bor (ktor� je zobrazen� v z�tvork�ch)."
 
-#: g10/helptext.c:255
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2023,7 +2064,7 @@ msgstr ""
 "      Toto pou�ite, pokia� by sa identifik�tor u��vate�a u� nemal pou��va�;\n"
 "      norm�lne sa pou��va na ozna�enie neplatnej e-mailov� adresy.\n"
 
-#: g10/helptext.c:271
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2033,478 +2074,483 @@ msgstr ""
 "ceritifik�tu. Pros�m, stru�ne. \n"
 "Text kon�� pr�zdnym riadkom.\n"
 
-#: g10/helptext.c:286
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "Pomoc nie je k dispoz�cii"
 
-#: g10/helptext.c:294
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Pomoc nie je dostupn� pre '%s'"
 
-#: g10/import.c:247
+#: g10/import.c:248
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d bol presko�en�\n"
 
-#: g10/import.c:256
+#: g10/import.c:257
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu k���e boli doteraz spracovan�\n"
 
-#: g10/import.c:273
+#: g10/import.c:274
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Celkovo spracovan�ch k���ov: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      presko�en� nov� k���e: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:279
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "        bez identifik�torov: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "              imported: %lu"
 msgstr "                importovan�: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:287
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                  bez zmien: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         nov� id u��vate�ov: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "              nov� podk���e: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "               nov� podpisy: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "      nov� revok�cie k���ov: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      pre��tan� tajn� k���e: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "    importovan� tajn� k���e: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "      tajn� k���e nezmenen�: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "           neimportovan�: %lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:544
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:545
+#: g10/import.c:546
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Podp�sali ste nasleduj�ce identifik�tory u��vate�a:\n"
 
-#: g10/import.c:582
+#: g10/import.c:583
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:594
+#: g10/import.c:595
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s podpis, hashovac� algoritmus %s\n"
 
-#: g10/import.c:606
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:620
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:646
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:694 g10/import.c:1048
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "k��� %08lX: chyba identifik�tor u��vate�a\n"
 
-#: g10/import.c:713
+#: g10/import.c:714
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "k��� %08lX: HKP po�kodenie podk���a opraven�\n"
 
 # c-format
-#: g10/import.c:728
+#: g10/import.c:729
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr ""
 "k��� %08lX: prijat� id u��vate�a '%s', ktor� nie je podp�san� n�m sam�m\n"
 
-#: g10/import.c:734
+#: g10/import.c:735
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "k��� %08lX: ch�ba platn� identifik�tor u��vate�a\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 msgid "this may be caused by a missing self-signature\n"
 msgstr "m��e to by� sp�soben� ch�baj�cim podpisom k���a n�m sam�m\n"
 
-#: g10/import.c:746 g10/import.c:1168
+#: g10/import.c:747 g10/import.c:1169
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "k��� %08lX: verejn� k��� nen�jden�: %s\n"
 
-#: g10/import.c:752
+#: g10/import.c:753
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "k��� %08lX: nov� k��� - presko�en�\n"
 
-#: g10/import.c:761
+#: g10/import.c:762
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "nen�jden� zapisovate�n� s�bor k���ov (keyring): %s\n"
 
-#: g10/import.c:766 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapisujem do '%s'\n"
 
-#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
-#: g10/import.c:2314 g10/import.c:2336
+#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
+#: g10/import.c:2315 g10/import.c:2337
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "chyba pri z�pise s�boru k���ov (keyring)  `%s': %s\n"
 
-#: g10/import.c:791
+#: g10/import.c:792
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "k��� %08lX: verejn� k��� \"%s\" importovan�\n"
 
-#: g10/import.c:815
+#: g10/import.c:816
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "k��� %08lX: nezodpoved� na�ej k�pii\n"
 
-#: g10/import.c:832 g10/import.c:1186
+#: g10/import.c:833 g10/import.c:1187
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "k��� %08lX: nem��em n�js� origin�lny blok k���a: %s\n"
 
-#: g10/import.c:840 g10/import.c:1193
+#: g10/import.c:841 g10/import.c:1194
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "k��� %08lX: nem��em ��ta� origin�lny blok k���a: %s\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "k��� %08lX: \"%s\" 1 nov� identifik�tor u��vate�a\n"
 
-#: g10/import.c:875
+#: g10/import.c:876
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch identifik�torov u��vate�a\n"
 
-#: g10/import.c:878
+#: g10/import.c:879
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "k��� %08lX: \"%s\" 1 nov� podpis\n"
 
-#: g10/import.c:881
+#: g10/import.c:882
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
 
-#: g10/import.c:884
+#: g10/import.c:885
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "k��� %08lX: \"%s\" 1 nov� podk���\n"
 
-#: g10/import.c:887
+#: g10/import.c:888
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch podk���ov\n"
 
-#: g10/import.c:908
+#: g10/import.c:909
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "k��� %08lX: \"%s\" bez zmeny\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1054
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "k��� %08lX: tajn� k��� bez verejn�ho k���a %d - presko�en�\n"
 
-#: g10/import.c:1064
+#: g10/import.c:1065
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/import.c:1081 g10/import.c:2329
+#: g10/import.c:1082 g10/import.c:2330
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nie je nastaven� implicitn� s�bor tajn�ch k���ov %s\n"
 
-#: g10/import.c:1092
+#: g10/import.c:1093
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "k��� %08lX: tajn� k��� importovan�\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1122
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "k��� %08lX: je u� v s�bore tajn�ch k���ov\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1132
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "k��� %08lX: nebol n�jden� tajn� k���: %s\n"
 
-#: g10/import.c:1161
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "k��� %08lX: ch�ba verejn� k��� - nem��em aplikova� revoka�n� certifik�t\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1205
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "k��� %08lX: neplatn� revoka�n� certifik�t: %s - zamietnut�\n"
 
-#: g10/import.c:1236
+#: g10/import.c:1237
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "k��� %08lX: \"%s\" revoka�n� certifik�t importovan�\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1302
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "k��� %08lX: neexistuje id u��vate�a pre podpis\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1317
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "k��� %08lX: nepodporovan� algoritmus verejn�ho k���a u u��vate�sk�ho id \"%s"
 "\"\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr ""
 "k��� %08lX: neplatn� podpis k���a n�m sam�m u u��vate�sk�ho id \"%s\"\n"
 
-#: g10/import.c:1336
+#: g10/import.c:1337
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "k��� %08lX: neexistuje podk��� pre viazanie k���ov\n"
 
-#: g10/import.c:1347 g10/import.c:1397
+#: g10/import.c:1348 g10/import.c:1398
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "k��� %08lX: nepodporovan� algoritmus verejn�ho k���a\n"
 
-#: g10/import.c:1349
+#: g10/import.c:1350
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "k��� %08lX: neplatn� v�zba podk���a\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1365
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "k��� %08lX: zmazan� viacn�sobn� v�zba podk���a\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "k��� %08lX: neexistuje podk��� na revok�ciu k���a\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "k��� %08lX: neplatn� revoka�n� podk���\n"
 
-#: g10/import.c:1414
+#: g10/import.c:1415
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "k��� %08lX: zmazan� viacn�sobn� revok�cia podk���a\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1457
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "k��� %08lX: identifik�tor u��vate�a presko�en� '"
 
-#: g10/import.c:1477
+#: g10/import.c:1478
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "k��� %08lX: podk��� presko�en�\n"
 
-#: g10/import.c:1504
+#: g10/import.c:1505
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "k��� %08lX: podpis nie je exportovate�n� (trieda %02x) - presko�en�\n"
 
-#: g10/import.c:1514
+#: g10/import.c:1515
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "k��� %08lX: revoka�n� certifik�t na zlom mieste - presko�en� \n"
 
-#: g10/import.c:1531
+#: g10/import.c:1532
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "k��� %08lX: neplatn� revoka�n� certifik�t: %s - presko�en�\n"
 
-#: g10/import.c:1545
+#: g10/import.c:1546
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "k��� %08lX: podpis subk���a na zlom mieste - presko�en� \n"
 
-#: g10/import.c:1553
+#: g10/import.c:1554
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "k��� %08lX: neo�ak�van� podpisov� trieda (0x%02X) - presko�en�\n"
 
-#: g10/import.c:1574
+#: g10/import.c:1575
 #, fuzzy, c-format
 msgid "key %s: expired signature from key %s - skipped\n"
 msgstr "k��� %08lX: neo�ak�van� podpisov� trieda (0x%02X) - presko�en�\n"
 
-#: g10/import.c:1677
+#: g10/import.c:1678
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "k��� %08lX: zisten� duplikovan� identifik�tor u��vate�a - zl��en�\n"
 
-#: g10/import.c:1739
+#: g10/import.c:1740
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "VAROVANIE: k��� %08lX m��e by� revokovan�: sk��am z�ska� revoka�n� k��� %"
 "08lX\n"
 
-#: g10/import.c:1753
+#: g10/import.c:1754
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "VAROVANIE: k��� %08lX m��e by� revokovan�: revoka�n� k��� %08lX nen�jden�.\n"
 
-#: g10/import.c:1812
+#: g10/import.c:1813
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "k��� %08lX: pridan� revoka�n� certifik�t \"%s\"\n"
 
-#: g10/import.c:1846
+#: g10/import.c:1847
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "k��� %08lX: podpis k���a n�m sam�m (direct key signature)\n"
 
-#: g10/import.c:2235
+#: g10/import.c:2236
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "verejn� k��� nes�hlas� s tajn�m!\n"
 
-#: g10/import.c:2243
+#: g10/import.c:2244
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
 
-#: g10/import.c:2245
+#: g10/import.c:2246
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
 
-#: g10/keydb.c:167
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
 
-#: g10/keydb.c:174
+#: g10/keydb.c:175
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "s�bor k���ov (keyring) `%s' vytvoren�\n"
 
-#: g10/keydb.c:685
+#: g10/keydb.c:316 g10/keydb.c:319
+#, fuzzy, c-format
+msgid "keyblock resource `%s': %s\n"
+msgstr "chyba pri vytv�ran� `%s': %s\n"
+
+#: g10/keydb.c:698
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "zlyhalo obnovenie vyrovn�vacej pam�ti k���ov: %s\n"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[revok�cia]"
 
-#: g10/keyedit.c:255
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[podpis k���a n�m sam�m]"
 
-#: g10/keyedit.c:333 g10/keylist.c:405
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 zl� podpis\n"
 
-#: g10/keyedit.c:335 g10/keylist.c:407
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d zl�ch podpisov\n"
 
-#: g10/keyedit.c:337 g10/keylist.c:409
+#: g10/keyedit.c:344 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 podpis neoveren�, preto�e ch�ba k���\n"
 
-#: g10/keyedit.c:339 g10/keylist.c:411
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, 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:341 g10/keylist.c:413
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 podpis neoveren�, preto�e vznikla chyba\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:415
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d podpisov neoveren�ch, preto�e vznikli chyby\n"
 
-#: g10/keyedit.c:345
+#: g10/keyedit.c:352
 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:347
+#: g10/keyedit.c:354
 #, 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:403 g10/pkclist.c:262
+#: g10/keyedit.c:410 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2517,53 +2563,63 @@ msgstr ""
 "kontrolou fingerprintov z r�znych zdrojov...)?\n"
 "\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:274
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = D�verujem �iasto�ne\n"
 
-#: g10/keyedit.c:408 g10/pkclist.c:276
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = D�verujem �plne\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:434
 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:443
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
-#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
-#: g10/keyedit.c:858 g10/keyedit.c:1642
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1728
 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:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
-#: g10/keyedit.c:1648
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
+#: g10/keyedit.c:1734
 msgid "  Unable to sign.\n"
 msgstr "  Nemo�no podp�sa�.\n"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:650
 #, 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:676
+#: g10/keyedit.c:678
+#, 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:680
+#, fuzzy
+msgid "Sign it? (y/N) "
+msgstr "Skuto�ne podp�sa�? "
+
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2572,11 +2628,11 @@ msgstr ""
 "Podpis k���a \"%s\" n�m sam�m je\n"
 "podpis vo form�te PGP 2.x.\n"
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:711
 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:699
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2586,11 +2642,11 @@ msgstr ""
 "je len lok�lny.\n"
 "\n"
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:729
 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:724
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2600,54 +2656,54 @@ msgstr ""
 "je len lok�lny.\n"
 "\n"
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:754
 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:749
+#: g10/keyedit.c:775
 #, 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:752
+#: g10/keyedit.c:778
 #, 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:757
+#: g10/keyedit.c:783
 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:779
+#: g10/keyedit.c:805
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Ni� na podp�sanie k���om %08lX\n"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "Platnos� k���a vypr�ala!"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Platnos� k���a vypr�� %s.\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:844
 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:851
+#: g10/keyedit.c:882
 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:853
+#: g10/keyedit.c:884
 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:878
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2657,32 +2713,32 @@ msgstr ""
 "patr� vy��ie uvedenej osobe?\n"
 "Pokia� nepozn�te odpove�, zadajte \"0\".\n"
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Neodpoviem.%s\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:916
 #, 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:887
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) �iasto�ne som to overil(a).%s\n"
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:920
 #, 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:895
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "V� v�ber? ('?' - viac inform�ci�): "
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:950
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2691,28 +2747,28 @@ msgstr ""
 "Ste si ist�, �e chcete podp�sa� tento k���\n"
 "svoj�m k���om: \""
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Ide o podpis k���a n�m sam�m\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:963
 #, 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:940
+#: g10/keyedit.c:971
 #, 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:950
+#: g10/keyedit.c:981
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
@@ -2720,72 +2776,72 @@ msgstr ""
 "Podpis bude ozna�en� ako neexportovate�n�.\n"
 "\n"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:988
 #, 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:964
+#: g10/keyedit.c:995
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "V�bec som tento k��� neoveril.\n"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1000
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "�iasto�ne som overil tento k���.\n"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1005
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Velmi d�kladne som overil tento k���.\n"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1015
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Skuto�ne podp�sa�? "
 
-#: g10/keyedit.c:1029 g10/keyedit.c:4132 g10/keyedit.c:4223 g10/keyedit.c:4287
-#: g10/keyedit.c:4348 g10/sign.c:369
+#: g10/keyedit.c:1060 g10/keyedit.c:4350 g10/keyedit.c:4441 g10/keyedit.c:4505
+#: g10/keyedit.c:4566 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podpisovanie zlyhalo: %s\n"
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1105 g10/keygen.c:3057
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "Tento k��� nie je chr�nen�.\n"
 
-#: g10/keyedit.c:1109 g10/keygen.c:3045
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
 
-#: g10/keyedit.c:1113 g10/keygen.c:3060
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 #, 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:1117 g10/keygen.c:3064
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "k��� je chr�nen�.\n"
 
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Nie je mo�n� editova� tento k���: %s\n"
 
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2793,11 +2849,11 @@ msgstr ""
 "Vlo�te nov� heslo (passphrase) pre tento tajn� k���.\n"
 "\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:1825
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "heslo nie je zopakovan� spr�vne; sk�ste to znovu"
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2805,193 +2861,193 @@ msgstr ""
 "Nechcete heslo - to je *zl�* n�pad!\n"
 "\n"
 
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1195
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Skuto�ne to chcete urobi�? "
 
-#: g10/keyedit.c:1235
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "pres�vam podpis k���a na spr�vne miesto\n"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "ulo�i� a ukon�i�"
 
-#: g10/keyedit.c:1322
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "vyp�sa� fingerprint"
 
-#: g10/keyedit.c:1323
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "vyp�sa� zoznam k���ov a id u��vate�ov"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "vyberte identifik�tor u��vate�a N"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "vyberte identifik�tor u��vate�a N"
 
-#: g10/keyedit.c:1327
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "revokova� podpisy"
 
-#: g10/keyedit.c:1330
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1335
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "podp�sa� k��� lok�lne"
 
-#: g10/keyedit.c:1337
+#: g10/keyedit.c:1369
 #, 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:1339
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1343
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "prida� identifik�tor u��vate�a"
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "prida� fotografick� ID"
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "zmaza� identifik�tor u��vate�a"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "zmaza� sekund�rny k���"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr "prida� revoka�n� k���"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1402
 #, 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:1372
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "ozna�i� u��vate�sk� ID ako prim�rne"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1406
 #, 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:1377
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "vyp�sa� zoznam predvolieb (pre expertov)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "vyp�sa� zoznam predvolieb (podrobne)"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1413
 #, 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:1386
+#: g10/keyedit.c:1418
 #, fuzzy
 msgid "set 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:1388
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "zmeni� heslo"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "zmeni� d�veryhodnos� vlastn�ka k���a"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1426
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Skuto�ne revokova� v�etky vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revokova� identifik�tor u��vate�a"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revokova� sekund�rny k���"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "enable key"
 msgstr "nastavi� k��� ako platn� (enable)"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "disable key"
 msgstr "nastavi� k��� ako neplatn� (disable)"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1436
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "uk�za� fotografick� ID"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1556
 #, 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:1494
+#: g10/keyedit.c:1574
 msgid "Secret key is available.\n"
 msgstr "Tajn� k��� je dostupn�.\n"
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1655
 msgid "Need the secret key to do this.\n"
 msgstr "Na vykonanie tejto oper�cie je potrebn� tajn� k���.\n"
 
-#: g10/keyedit.c:1579
+#: g10/keyedit.c:1663
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Pros�m, najsk�r pou�ite pr�kaz \"toggle\" (prepn��).\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1682
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -2999,236 +3055,241 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1722
 msgid "Key is revoked."
 msgstr "K��� revokovan�."
 
-#: g10/keyedit.c:1657
+#: g10/keyedit.c:1741
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Skuto�ne podp�sa� v�etky id u��vate�a? "
 
-#: g10/keyedit.c:1660
-msgid "Hint: Select the user IDs to sign\n"
-msgstr "N�poveda: Vyberte id u��vate�a na podp�sanie\n"
-
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1748
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "nezn�ma trieda podpisu"
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1771
 #, 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:1713 g10/keyedit.c:1733 g10/keyedit.c:1899
+#: g10/keyedit.c:1793 g10/keyedit.c:1813 g10/keyedit.c:1979
 msgid "You must select at least one user ID.\n"
 msgstr "Mus�te vybra� aspo� jedno id u��vate�a.\n"
 
-#: g10/keyedit.c:1715
+#: g10/keyedit.c:1795
 msgid "You can't delete the last user ID!\n"
 msgstr "Nem��ete zmaza� posledn� id u��vate�a!\n"
 
-#: g10/keyedit.c:1717
+#: g10/keyedit.c:1797
 #, 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:1718
+#: g10/keyedit.c:1798
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Skuto�ne odstr�ni� toto id u��vate�a? "
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1848
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Skuto�ne odstr�ni� toto id u��vate�a? "
 
-#: g10/keyedit.c:1780
+#: g10/keyedit.c:1860
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Mus�te vybra� aspo� jeden k���.\n"
 
-#: g10/keyedit.c:1808
+#: g10/keyedit.c:1888
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1822
+#: g10/keyedit.c:1902
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "nem��em otvori� `%s': %s\n"
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1919
 #, 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:1863
+#: g10/keyedit.c:1943
 msgid "You must select at least one key.\n"
 msgstr "Mus�te vybra� aspo� jeden k���.\n"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1946
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Skuto�ne chcete zmaza� vybran� k���e? "
 
-#: g10/keyedit.c:1867
+#: g10/keyedit.c:1947
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Skuto�ne chcete zmaza� tento k���? "
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1982
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Skuto�ne revokova� v�etky vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1983
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Skuto�ne revokova� toto id u��vate�a? "
 
-#: g10/keyedit.c:1921
+#: g10/keyedit.c:2001
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Skuto�ne chcete revokova� tento k���? "
 
-#: g10/keyedit.c:1932
+#: g10/keyedit.c:2012
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Skuto�ne chcete revokova� vybran� k���e? "
 
-#: g10/keyedit.c:1934
+#: g10/keyedit.c:2014
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Skuto�ne chcete revokova� tento k���? "
 
-#: g10/keyedit.c:1975
+#: g10/keyedit.c:2055
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2007
+#: g10/keyedit.c:2087
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "nastavi� zoznam predvolieb"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2093
 #, 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:2015
+#: g10/keyedit.c:2095
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Skuto�ne aktualizova� predvo�by? "
 
-#: g10/keyedit.c:2065
+#: g10/keyedit.c:2157
+#, fuzzy, c-format
+msgid "Unable to clean `%s'\n"
+msgstr "nemo�no spusti� %s \"%s\": %s\n"
+
+#: g10/keyedit.c:2160
+msgid "Please specify item to clean: `sigs', `uids', or `all'\n"
+msgstr ""
+
+#: g10/keyedit.c:2171
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Ulo�i� zmeny? "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2174
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Ukon�i� bez ulo�enia? "
 
-#: g10/keyedit.c:2078
+#: g10/keyedit.c:2184
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualiz�cia zlyhala: %s\n"
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2191
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualiz�cia tajn�ho k���a zlyhala: %s\n"
 
-#: g10/keyedit.c:2092
+#: g10/keyedit.c:2198
 msgid "Key not changed so no update needed.\n"
 msgstr "k��� nebol zmenen�, tak�e nie je potrebn� ho aktualizova�.\n"
 
-#: g10/keyedit.c:2164
+#: g10/keyedit.c:2271
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2323
 msgid "Features: "
 msgstr "Charakteristiky: "
 
-#: g10/keyedit.c:2227
+#: g10/keyedit.c:2334
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2242 g10/keylist.c:307
+#: g10/keyedit.c:2349 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2473
+#: g10/keyedit.c:2580
 #, 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:2494
+#: g10/keyedit.c:2601
 #, 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:2500
+#: g10/keyedit.c:2607
 #, fuzzy
 msgid "(sensitive)"
 msgstr "(citliv� inform�cia)"
 
-#: g10/keyedit.c:2516 g10/keyedit.c:2572 g10/keyedit.c:2684 g10/keyedit.c:2699
-#: g10/keylist.c:193 g10/keyserver.c:422
+#: g10/keyedit.c:2623 g10/keyedit.c:2679 g10/keyedit.c:2792 g10/keyedit.c:2807
+#: g10/keylist.c:194 g10/keyserver.c:421
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s: nem��em vytvori�: %s\n"
 
-#: g10/keyedit.c:2519 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:931
+#: g10/keyedit.c:2626 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:948
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revokovan�]"
 
-#: g10/keyedit.c:2521 g10/keylist.c:757 g10/keylist.c:886
+#: g10/keyedit.c:2628 g10/keylist.c:758 g10/keylist.c:887
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [platnos� skon��: %s]"
 
-#: g10/keyedit.c:2523 g10/keyedit.c:2574 g10/keyedit.c:2686 g10/keyedit.c:2701
-#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
-#: g10/keylist.c:913 g10/keyserver.c:428 g10/mainproc.c:937
+#: g10/keyedit.c:2630 g10/keyedit.c:2681 g10/keyedit.c:2794 g10/keyedit.c:2809
+#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
+#: g10/keylist.c:914 g10/keyserver.c:427 g10/mainproc.c:954
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [platnos� skon��: %s]"
 
-#: g10/keyedit.c:2525
+#: g10/keyedit.c:2632
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " d�vera: %c/%c"
 
-#: g10/keyedit.c:2540
+#: g10/keyedit.c:2647
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " d�vera: %c/%c"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2651
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2658
 msgid "This key has been disabled"
 msgstr "Tento k��� bol ozna�en� za neplatn� (disabled)"
 
-#: g10/keyedit.c:2579 g10/keylist.c:199
+#: g10/keyedit.c:2686 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2754
 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:2654
+#: g10/keyedit.c:2762
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3236,19 +3297,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:2718 g10/keyserver.c:432 g10/mainproc.c:1577
-#: g10/trustdb.c:1178
+#: g10/keyedit.c:2826 g10/keyedit.c:3201 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1690
 #, fuzzy
 msgid "revoked"
 msgstr "[revokovan�]"
 
-#: g10/keyedit.c:2720 g10/keyserver.c:436 g10/mainproc.c:1579
-#: g10/trustdb.c:531
+#: g10/keyedit.c:2828 g10/keyedit.c:3203 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1692
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2893
 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"
@@ -3256,7 +3317,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:2845
+#: g10/keyedit.c:2953
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3265,45 +3326,75 @@ msgstr ""
 "VAROVANIE: Toto je PGP2 k���. Pridanie fotografick�ho ID m��e v niektor�ch\n"
 "           verzi�ch PGP vies� k odmietnutiu tohto k���a.\n"
 
-#: g10/keyedit.c:2850 g10/keyedit.c:3128
+#: g10/keyedit.c:2958 g10/keyedit.c:3307
 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:2856
+#: g10/keyedit.c:2964
 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:2996
+#: g10/keyedit.c:3104
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Zmaza� tento dobr� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3114
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Zmaza� tento neplatn� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3010
+#: g10/keyedit.c:3118
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Zmaza� tento nezn�my podpis? (a/N/u)"
 
-#: g10/keyedit.c:3016
+#: g10/keyedit.c:3124
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Skuto�ne zmaza� tento podpis podp�san� sebou sam�m? (a/N)"
 
-#: g10/keyedit.c:3030
+#: g10/keyedit.c:3138
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Zmazan� %d podpis.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3139
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Zmazan�ch %d podpisov.\n"
 
-#: g10/keyedit.c:3034
+#: g10/keyedit.c:3142
 msgid "Nothing deleted.\n"
 msgstr "Ni� nebolo zmaznan�.\n"
 
-#: g10/keyedit.c:3123
+#: g10/keyedit.c:3167
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed.\n"
+msgstr "U��vate�sk� ID \"%s\" je revokovan�."
+
+#: g10/keyedit.c:3168
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed.\n"
+msgstr "U��vate�sk� ID \"%s\" je revokovan�."
+
+#: g10/keyedit.c:3173
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean.\n"
+msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
+
+#: g10/keyedit.c:3205 g10/trustdb.c:1694
+#, fuzzy
+msgid "invalid"
+msgstr "neplatn� sp�sob reprezent�cie v ASCII"
+
+#: g10/keyedit.c:3207
+#, fuzzy, c-format
+msgid "User ID \"%s\" removed: %s\n"
+msgstr "U��vate�sk� ID \"%s\" je revokovan�."
+
+#: g10/keyedit.c:3214
+#, fuzzy
+msgid "No user IDs are removable.\n"
+msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
+
+#: g10/keyedit.c:3302
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3312,340 +3403,345 @@ 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:3134
+#: g10/keyedit.c:3313
 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:3154
+#: g10/keyedit.c:3333
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vlo�te identifik�tor u��vate�a poveren�ho revok�ciou: "
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3356
 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:3192
+#: g10/keyedit.c:3371
 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:3214
+#: g10/keyedit.c:3393
 #, 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:3233
+#: g10/keyedit.c:3412
 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:3239
+#: g10/keyedit.c:3418
 #, 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:3300
+#: g10/keyedit.c:3479
 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:3306
+#: g10/keyedit.c:3485
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Pros�m, vyberte najviac jeden sekund�rny k���.\n"
 
-#: g10/keyedit.c:3310
+#: g10/keyedit.c:3489
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Men�m dobu platnosti sekund�rneho k���a.\n"
 
-#: g10/keyedit.c:3313
+#: g10/keyedit.c:3492
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Men�m dobu platnosti prim�rneho k���a.\n"
 
-#: g10/keyedit.c:3359
+#: g10/keyedit.c:3538
 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:3375
+#: g10/keyedit.c:3554
 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:3455
+#: g10/keyedit.c:3634
 msgid "Please select exactly one user ID.\n"
 msgstr "Pros�m, vyberte pr�ve jedno id u��vate�a.\n"
 
-#: g10/keyedit.c:3494 g10/keyedit.c:3604 g10/keyedit.c:3724
+#: g10/keyedit.c:3673 g10/keyedit.c:3783 g10/keyedit.c:3903
 #, 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:3665
+#: g10/keyedit.c:3844
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3745
+#: g10/keyedit.c:3924
 #, 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:3746
+#: g10/keyedit.c:3925
 #, 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:3808
+#: g10/keyedit.c:3987
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
-#: g10/keyedit.c:3854
+#: g10/keyedit.c:4045
+#, 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:4072
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
-#: g10/keyedit.c:3971
+#: g10/keyedit.c:4189
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "id u��vate�a: \""
 
-#: g10/keyedit.c:3974 g10/keyedit.c:4038 g10/keyedit.c:4081
+#: g10/keyedit.c:4192 g10/keyedit.c:4256 g10/keyedit.c:4299
 #, 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:3976 g10/keyedit.c:4040 g10/keyedit.c:4083
+#: g10/keyedit.c:4194 g10/keyedit.c:4258 g10/keyedit.c:4301
 msgid " (non-exportable)"
 msgstr " (nexeportovate�n�)"
 
-#: g10/keyedit.c:3980
+#: g10/keyedit.c:4198
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnos� podpisu vypr�� %s.\n"
 
-#: g10/keyedit.c:3984
+#: g10/keyedit.c:4202
 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:3988
+#: g10/keyedit.c:4206
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? (a/N)"
 
-#: g10/keyedit.c:4015
+#: g10/keyedit.c:4233
 #, 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:4041
+#: g10/keyedit.c:4259
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nexeportovate�n�)"
 
-#: g10/keyedit.c:4048
+#: g10/keyedit.c:4266
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokovan� %08lX v %s\n"
 
-#: g10/keyedit.c:4070
+#: g10/keyedit.c:4288
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chyst�te sa revokova� tieto podpisy:\n"
 
-#: g10/keyedit.c:4090
+#: g10/keyedit.c:4308
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Skuto�ne vytvori� revoka�n� certifik�ty? (a/N) "
 
-#: g10/keyedit.c:4120
+#: g10/keyedit.c:4338
 msgid "no secret key\n"
 msgstr "neexistuje tajn� k���\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4408
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4425
 #, 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:4271
+#: g10/keyedit.c:4489
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:4333
+#: g10/keyedit.c:4551
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4646
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Zobrazujem %s fotografick� ID s ve�kos�ou %ld pre k��� 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:293
+#: g10/keygen.c:258
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "duplicita predvo�by %c%lu\n"
 
-#: g10/keygen.c:300
+#: g10/keygen.c:265
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "pr�li� ve�a `%c' predvolieb\n"
 
-#: g10/keygen.c:302
+#: g10/keygen.c:267
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "pr�li� ve�a `%c' predvolieb\n"
 
-#: g10/keygen.c:304
+#: g10/keygen.c:269
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "pr�li� ve�a `%c' predvolieb\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:394
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "neplatn� znak v re�azci s predvo�bami\n"
 
-#: g10/keygen.c:829
+#: g10/keygen.c:822
 msgid "writing direct signature\n"
 msgstr "zapisujem podpis k���a n�m sam�m (direct signature)\n"
 
-#: g10/keygen.c:868
+#: g10/keygen.c:861
 msgid "writing self signature\n"
 msgstr "zapisujem podpis k���a sebou sam�m\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing key binding signature\n"
 msgstr "zapisujem \"key-binding\" podpis\n"
 
-#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2632
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "neplatn� d�ka k���a; pou�ijem %u bitov\n"
 
-#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2638
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "d�ka k���a zaokr�hlen� na %u bitov\n"
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1239
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1252
+#: g10/keygen.c:1242
 #, fuzzy
 msgid "Encrypt"
 msgstr "�ifrova� d�ta"
 
-#: g10/keygen.c:1255
+#: g10/keygen.c:1245
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1263
+#: g10/keygen.c:1253
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1268
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1282
+#: g10/keygen.c:1272
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1287
+#: g10/keygen.c:1277
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1290
+#: g10/keygen.c:1280
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1293
+#: g10/keygen.c:1283
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1296
+#: g10/keygen.c:1286
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1340
 msgid "Please select what kind of key you want:\n"
 msgstr "Pros�m, vyberte druh k���a, ktor� chcete:\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1342
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA a ElGamal (implicitn�)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1343
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (len na podpis)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1345
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1357
+#: g10/keygen.c:1347
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1348
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (len na podpis)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1350
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1362
+#: g10/keygen.c:1352
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1431 g10/keygen.c:2509
+#: g10/keygen.c:1421 g10/keygen.c:2506
 #, 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:1441
+#: g10/keygen.c:1431
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1438
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Ak� ve�kos� k���a si prajete? (1024) "
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1452
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1468
+#: g10/keygen.c:1458
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Po�adovan� d�ka k���a je %u bitov.\n"
 
-#: g10/keygen.c:1473 g10/keygen.c:1478
+#: g10/keygen.c:1463 g10/keygen.c:1468
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokr�hlen� na %u bitov\n"
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1515
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3661,7 +3757,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:1539
+#: g10/keygen.c:1526
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3677,39 +3773,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:1561
+#: g10/keygen.c:1549
 msgid "Key is valid for? (0) "
 msgstr "K��� je platn� na? (0) "
 
-#: g10/keygen.c:1563
-msgid "Signature is valid for? (0) "
+#: g10/keygen.c:1554
+#, fuzzy, c-format
+msgid "Signature is valid for? (%s) "
 msgstr "Podpis je platn� na? (0) "
 
-#: g10/keygen.c:1568
+#: g10/keygen.c:1572
 msgid "invalid value\n"
 msgstr "neplatn� hodnota\n"
 
-#: g10/keygen.c:1575
+#: g10/keygen.c:1579
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "platnos� %s neskon��\n"
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1580
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "platnos� %s neskon��\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1585
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "platnos� %s skon�� %s\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1586
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Platnos� podpisu vypr�� %s\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1592
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3717,12 +3814,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:1595
+#: g10/keygen.c:1597
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Je to spr�vne (a/n)? "
 
-#: g10/keygen.c:1638
+#: g10/keygen.c:1641
 #, fuzzy
 msgid ""
 "\n"
@@ -3739,44 +3836,44 @@ msgstr ""
 "    \"Jozko Mrkvicka (student) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1651
+#: g10/keygen.c:1654
 msgid "Real name: "
 msgstr "Meno a priezvisko: "
 
-#: g10/keygen.c:1659
+#: g10/keygen.c:1662
 msgid "Invalid character in name\n"
 msgstr "Neplatn� znak ve mene\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1664
 msgid "Name may not start with a digit\n"
 msgstr "Meno nem��e za��na� ��slicou\n"
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1666
 msgid "Name must be at least 5 characters long\n"
 msgstr "Meno mus� by� dlh� aspo� 5 znakov\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1674
 msgid "Email address: "
 msgstr "E-mailov� adresa: "
 
-#: g10/keygen.c:1682
+#: g10/keygen.c:1685
 msgid "Not a valid email address\n"
 msgstr "Neplatn� e-mailov� adresa\n"
 
-#: g10/keygen.c:1690
+#: g10/keygen.c:1693
 msgid "Comment: "
 msgstr "Koment�r: "
 
-#: g10/keygen.c:1696
+#: g10/keygen.c:1699
 msgid "Invalid character in comment\n"
 msgstr "Neplatn� znak v koment�ri\n"
 
-#: g10/keygen.c:1719
+#: g10/keygen.c:1722
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Pou��vate znakov� sadu `%s'.\n"
 
-#: g10/keygen.c:1725
+#: g10/keygen.c:1728
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3787,7 +3884,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1733
 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"
 
@@ -3802,23 +3899,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:1746
+#: g10/keygen.c:1749
 msgid "NnCcEeOoQq"
 msgstr "mMkKeEPpUu"
 
-#: g10/keygen.c:1756
+#: g10/keygen.c:1759
 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:1757
+#: g10/keygen.c:1760
 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:1776
+#: g10/keygen.c:1779
 msgid "Please correct the error first\n"
 msgstr "Najsk�r, pros�m, opravte chybu\n"
 
-#: g10/keygen.c:1816
+#: g10/keygen.c:1819
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3826,12 +3923,12 @@ msgstr ""
 "Na ochranu V�ho tajn�ho k���a mus�te zada� heslo.\n"
 "\n"
 
-#: g10/keygen.c:1826 g10/passphrase.c:1105
+#: g10/keygen.c:1829 g10/passphrase.c:786
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1832
+#: g10/keygen.c:1835
 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"
@@ -3843,7 +3940,7 @@ msgstr ""
 "tohto programu s parametrom \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1857
 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"
@@ -3855,50 +3952,50 @@ msgstr ""
 "pou��va� disky); v�aka tomu m� gener�tor lep�iu �ancu z�ska� dostatok "
 "entropie.\n"
 
-#: g10/keygen.c:2578
+#: g10/keygen.c:2575
 msgid "Key generation canceled.\n"
 msgstr "Vytv�ranie k���a bolo zru�en�.\n"
 
-#: g10/keygen.c:2766 g10/keygen.c:2910
+#: g10/keygen.c:2774 g10/keygen.c:2918
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisujem verejn� k��� do `%s'\n"
 
-#: g10/keygen.c:2768 g10/keygen.c:2913
+#: g10/keygen.c:2776 g10/keygen.c:2921
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/keygen.c:2771 g10/keygen.c:2916
+#: g10/keygen.c:2779 g10/keygen.c:2924
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2907
 #, 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:2905
+#: g10/keygen.c:2913
 #, 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:2923
+#: g10/keygen.c:2931
 #, 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:2930
+#: g10/keygen.c:2938
 #, 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:2953
+#: g10/keygen.c:2961
 msgid "public and secret key created and signed.\n"
 msgstr "verejn� a tajn� k��� boli vytvoren� a podp�san�.\n"
 
-#: g10/keygen.c:2964
+#: g10/keygen.c:2972
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -3907,12 +4004,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:2976 g10/keygen.c:3105 g10/keygen.c:3220
+#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3156 g10/sign.c:290
+#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -3920,7 +4017,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:3030 g10/keygen.c:3158 g10/sign.c:292
+#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -3928,373 +4025,354 @@ 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:3039 g10/keygen.c:3169
+#: g10/keygen.c:3047 g10/keygen.c:3177
 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:3078 g10/keygen.c:3202
+#: g10/keygen.c:3086 g10/keygen.c:3210
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Skuto�ne vytvori�? "
 
-#: g10/keygen.c:3355
+#: g10/keygen.c:3363
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: g10/keygen.c:3402
+#: g10/keygen.c:3410
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nem��em vytvori� `%s': %s\n"
 
-#: g10/keygen.c:3428
+#: g10/keygen.c:3436
 #, 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"
 
-#: g10/keygen.c:3508
-#, c-format
-msgid "length of RSA modulus is not %d\n"
-msgstr ""
-
-#: g10/keygen.c:3514
-msgid "public exponent too large (more than 32 bits)\n"
-msgstr ""
-
-#: g10/keygen.c:3520 g10/keygen.c:3526
-#, c-format
-msgid "length of an RSA prime is not %d\n"
-msgstr ""
-
-#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
+#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
 msgid "never     "
 msgstr "nikdy     "
 
-#: g10/keylist.c:264
+#: g10/keylist.c:265
 msgid "Critical signature policy: "
 msgstr "Kritick� podpisov� politika: "
 
-#: g10/keylist.c:266
+#: g10/keylist.c:267
 msgid "Signature policy: "
 msgstr "Podpisov� politika: "
 
-#: g10/keylist.c:305
+#: g10/keylist.c:306
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:354 g10/keylist.c:398
+#: 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:372
+#: g10/keylist.c:373
 msgid "Critical signature notation: "
 msgstr "Kritick� podpisov� not�cia: "
 
-#: g10/keylist.c:374
+#: g10/keylist.c:375
 msgid "Signature notation: "
 msgstr "Podpisov� not�cia: "
 
-#: g10/keylist.c:385
+#: g10/keylist.c:386
 msgid "not human readable"
 msgstr "nie je v priamo �itate�nom form�te"
 
-#: g10/keylist.c:486
+#: g10/keylist.c:487
 msgid "Keyring"
 msgstr "s�bor k���ov (keyring)"
 
-#: g10/keylist.c:792
+#: g10/keylist.c:793
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr " [platnos� skon��: %s]"
 
-#: g10/keylist.c:1488
+#: g10/keylist.c:1489
 msgid "Primary key fingerprint:"
 msgstr "Prim�rny fingerprint k���a:"
 
-#: g10/keylist.c:1490
+#: g10/keylist.c:1491
 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:1497
+#: g10/keylist.c:1498
 msgid " Primary key fingerprint:"
 msgstr " Prim�rny fingerprint k���a:"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1500
 msgid "      Subkey fingerprint:"
 msgstr "      Fingerprint podk���a:"
 
-#: g10/keylist.c:1503 g10/keylist.c:1507
+#: g10/keylist.c:1504 g10/keylist.c:1508
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "   Fingerprint k���a ="
 
-#: g10/keylist.c:1574
+#: g10/keylist.c:1575
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1245
+#: g10/keyring.c:1246
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1252
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "VAROVANIE: Existuj� dva s�bory s tajn�mi inform�ciami.\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s je bez zmeny\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1255
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s je nov�\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1256
 msgid "Please fix this possible security flaw\n"
 msgstr "Pros�m, opravte tento mo�n� bezpe�nostn� probl�m\n"
 
-#: g10/keyring.c:1375
+#: g10/keyring.c:1376
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "kontrolujem s�bor k���ov (keyring) `%s'\n"
 
-#: g10/keyring.c:1421
+#: g10/keyring.c:1422
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu k���ov skontrolovan�ch (%lu podpisov)\n"
 
-#: g10/keyring.c:1433
+#: g10/keyring.c:1434
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu k���ov skontrolovan�ch (%lu podpisov)\n"
 
-#: g10/keyring.c:1504
+#: g10/keyring.c:1505
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: s�bor k���ov (keyring) vytvoren�\n"
 
-#: g10/keyserver.c:107
+#: g10/keyserver.c:105
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "VAROVANIE: nastavenie v `%s' e�te nie je akt�vne\n"
 
-#: g10/keyserver.c:434
+#: g10/keyserver.c:433
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:635
+#: g10/keyserver.c:634
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:718 g10/keyserver.c:1238
+#: g10/keyserver.c:717 g10/keyserver.c:1267
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/keyserver.c:808
+#: g10/keyserver.c:815
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "k��� `%s' nebol n�jden�: %s\n"
 
-#: g10/keyserver.c:810
+#: g10/keyserver.c:817
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "k��� `%s' nebol n�jden�: %s\n"
 
-#: g10/keyserver.c:985
+#: g10/keyserver.c:1014
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "po�adujem k��� %08lX z %s\n"
 
-#: g10/keyserver.c:989
+#: g10/keyserver.c:1018
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "po�adujem k��� %08lX z %s\n"
 
-#: g10/keyserver.c:1141
+#: g10/keyserver.c:1170
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "podp�san� Va��m k���om %08lX v %s\n"
 
-#: g10/keyserver.c:1188
+#: g10/keyserver.c:1217
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1191
+#: g10/keyserver.c:1220
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1198 g10/keyserver.c:1293
+#: g10/keyserver.c:1227 g10/keyserver.c:1322
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1275
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1255
+#: g10/keyserver.c:1284
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1314
+#: g10/keyserver.c:1343
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1320
+#: g10/keyserver.c:1349
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1361
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1366
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1374
 #, c-format
-msgid "gpgkeys_%s does not support handler version %d\n"
+msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1351
+#: g10/keyserver.c:1381
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "chyba servera k���ov"
 
-#: g10/keyserver.c:1356
+#: g10/keyserver.c:1386
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "chyba servera k���ov"
 
-#: g10/keyserver.c:1365
+#: g10/keyserver.c:1395
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
 
-#: g10/keyserver.c:1390 g10/keyserver.c:1424
+#: g10/keyserver.c:1420 g10/keyserver.c:1454
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1681
+#: g10/keyserver.c:1711
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1703
+#: g10/keyserver.c:1733
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "po�adujem k��� %08lX z %s\n"
 
-#: g10/keyserver.c:1705
+#: g10/keyserver.c:1735
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "po�adujem k��� %08lX z %s\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:249
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "zvl�tna ve�kos� �ifrovacieho k���a pre sedenie (%d)\n"
 
-#: g10/mainproc.c:262
-#, c-format
-msgid "bad passphrase or unknown cipher algorithm (%d)\n"
-msgstr "nespr�vne heslo alebo nezn�my �ifrovac� algoritmus (%d)\n"
-
-#: g10/mainproc.c:299
+#: g10/mainproc.c:300
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s k��� �ifrovan�ho sedenia\n"
 
-#: g10/mainproc.c:309
+#: g10/mainproc.c:310
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "za�ifrovan� nezn�mym algoritmom %d\n"
 
-#: g10/mainproc.c:375
+#: g10/mainproc.c:376
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "verejn� k��� je %08lX\n"
 
-#: g10/mainproc.c:430
+#: g10/mainproc.c:431
 msgid "public key encrypted data: good DEK\n"
 msgstr "d�ta za�ifrovan� verejn�m k���om: spr�vny DEK\n"
 
-#: g10/mainproc.c:463
+#: g10/mainproc.c:464
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "za�ifrovan� %u-bitov�m %s k���om, ID %08lX, vytvoren�m %s\n"
 
-#: g10/mainproc.c:467 g10/pkclist.c:218
+#: g10/mainproc.c:468 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                alias \""
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
 # [kw]
-#: g10/mainproc.c:471
+#: g10/mainproc.c:472
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "za�ifrovan� %s k���om, ID %08lX\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "de�ifrovanie verejn�m k���om zlyhalo: %s\n"
 
-#: g10/mainproc.c:499
+#: g10/mainproc.c:500
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "za�ifrovan� s %lu heslami\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:502
 msgid "encrypted with 1 passphrase\n"
 msgstr "za�ifrovan� jedn�m heslom\n"
 
-#: g10/mainproc.c:529 g10/mainproc.c:551
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "predpoklad�m %s �ifrovan�ch d�t\n"
 
-#: g10/mainproc.c:537
+#: g10/mainproc.c:538
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "algoritmus IDEA nie je dostupn�; optimisticky sa ho pok�sime nahradi� "
 "algoritmom %s\n"
 
-#: g10/mainproc.c:569
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr "de�ifrovanie o.k.\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:574
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VAROVANIE: spr�va nem� ochranu integrity\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROVANIE: so za�ifrovanou spr�vou bolo manipulovan�!\n"
 
-#: g10/mainproc.c:592
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "de�ifrovanie zlyhalo: %s\n"
@@ -4308,305 +4386,294 @@ 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:786
+#: g10/mainproc.c:803
 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:1290
+#: g10/mainproc.c:1307
 msgid "signature verification suppressed\n"
 msgstr "verifik�cia podpisu potla�en�\n"
 
-#: g10/mainproc.c:1332 g10/mainproc.c:1342
+#: g10/mainproc.c:1349 g10/mainproc.c:1359
 msgid "can't handle these multiple signatures\n"
 msgstr "neviem pracova� s t�mito n�sobn�mi podpismi\n"
 
-#: g10/mainproc.c:1352
+#: g10/mainproc.c:1369
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Platnos� podpisu vypr�ala %s\n"
 
-#: g10/mainproc.c:1353
+#: g10/mainproc.c:1370
 #, 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:1357
+#: g10/mainproc.c:1374
 #, 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:1377
+#: g10/mainproc.c:1394
 msgid "Key available at: "
 msgstr "K��� k dispoz�cii na: "
 
-#: g10/mainproc.c:1482 g10/mainproc.c:1530
+#: g10/mainproc.c:1499 g10/mainproc.c:1547
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ZL� podpis od \""
 
-#: g10/mainproc.c:1484 g10/mainproc.c:1532
+#: g10/mainproc.c:1501 g10/mainproc.c:1549
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Podpis s vypr�anou platnos�ou od \""
 
-#: g10/mainproc.c:1486 g10/mainproc.c:1534
+#: g10/mainproc.c:1503 g10/mainproc.c:1551
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Dobr� podpis od \""
 
-#: g10/mainproc.c:1538
+#: g10/mainproc.c:1555
 msgid "[uncertain]"
 msgstr "[neist�]  "
 
-#: g10/mainproc.c:1570
+#: g10/mainproc.c:1587
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \""
 
-#: g10/mainproc.c:1664
+#: g10/mainproc.c:1681
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Platnos� podpisu vypr�ala %s\n"
 
-#: g10/mainproc.c:1669
+#: g10/mainproc.c:1686
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Platnos� podpisu vypr�� %s\n"
 
-#: g10/mainproc.c:1672
+#: g10/mainproc.c:1689
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s podpis, hashovac� algoritmus %s\n"
 
-#: g10/mainproc.c:1673
+#: g10/mainproc.c:1690
 msgid "binary"
 msgstr "bin�rne"
 
-#: g10/mainproc.c:1674
+#: g10/mainproc.c:1691
 msgid "textmode"
 msgstr "textov� m�d"
 
-#: g10/mainproc.c:1674 g10/trustdb.c:530
+#: g10/mainproc.c:1691 g10/trustdb.c:531
 msgid "unknown"
 msgstr "nezn�me"
 
-#: g10/mainproc.c:1694
+#: g10/mainproc.c:1711
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nem��em overi� podpis: %s\n"
 
-#: g10/mainproc.c:1762 g10/mainproc.c:1778 g10/mainproc.c:1864
+#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
 msgid "not a detached signature\n"
 msgstr "toto nie je podpis oddelen� od dokumentu\n"
 
-#: g10/mainproc.c:1805
+#: g10/mainproc.c:1822
 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:1813
+#: g10/mainproc.c:1830
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "samostatn� podpis triedy 0x%02x\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1887
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis star�ho typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:1880
+#: g10/mainproc.c:1897
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "n�jden� neplatn� kore�ov� paket v proc_tree()\n"
 
-#: g10/misc.c:121
+#: g10/misc.c:122
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "nem��em vypn�� vytv�ranie core s�borov: %s\n"
 
-#: g10/misc.c:141 g10/misc.c:169 g10/misc.c:241
+#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "nemo�no otvori� s�bor: %s\n"
 
-#: g10/misc.c:206
+#: g10/misc.c:207
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "datab�za d�very: proced�ra read() (n=%d) zlyhala: %s\n"
 
-#: g10/misc.c:315
+#: g10/misc.c:316
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "nem��em pracova� s algoritmom verejn�ho k���a %d\n"
 
-#: g10/misc.c:330
+#: g10/misc.c:331
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "�ifrovac� algoritmus nie je implementovan�"
 
-#: g10/misc.c:345
+#: g10/misc.c:346
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s podpis, hashovac� algoritmus %s\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:351
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "vy�iadan� hashovac� algoritmus %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
 
-#: g10/misc.c:446
+#: g10/misc.c:447
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA modul pre GnuPG nen�jden�\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:448
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 "viac inform�ci� n�jdete v dokumente http://www.gnupg.cz/why-not-idea.html\n"
 
-#: g10/misc.c:680
+#: g10/misc.c:681
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: pou�itie parametra \"%s\" sa neodpor��a\n"
 
-#: g10/misc.c:684
+#: g10/misc.c:685
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
 
-#: g10/misc.c:686
+#: g10/misc.c:687
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "pou�ite namiesto neho \"%s%s\" \n"
 
-#: g10/misc.c:697
+#: g10/misc.c:694
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
+msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
+
+#: g10/misc.c:707
 msgid "Uncompressed"
 msgstr "Nekomprimovan�"
 
-#: g10/misc.c:722
+#: g10/misc.c:732
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Nekomprimovan�"
 
-#: g10/misc.c:832
+#: g10/misc.c:842
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "t�to spr�va nemus� pou�ite�n� s %s\n"
 
-#: g10/misc.c:989
+#: g10/misc.c:999
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "��tam mo�nosti z `%s'\n"
 
-#: g10/misc.c:1014
+#: g10/misc.c:1024
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "nezn�my implicitn� adres�t `%s'\n"
 
-#: g10/openfile.c:84
+#: g10/openfile.c:86
 #, c-format
 msgid "File `%s' exists. "
 msgstr "S�bor `%s' existuje. "
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Prep�sa� (a/N)? "
 
-#: g10/openfile.c:119
+#: g10/openfile.c:121
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: nezn�ma pr�pona\n"
 
-#: g10/openfile.c:141
+#: g10/openfile.c:143
 msgid "Enter new filename"
 msgstr "Vlo�te nov� n�zov s�boru"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:188
 msgid "writing to stdout\n"
 msgstr "zapisujem na �tandardn� v�stup (stdout)\n"
 
-#: g10/openfile.c:296
+#: g10/openfile.c:300
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "predpoklad�m podp�san� d�ta v `%s'\n"
 
-#: g10/openfile.c:375
+#: g10/openfile.c:379
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "vytvoren� nov� konfigura�n� s�bor `%s'\n"
 
-#: g10/openfile.c:377
+#: g10/openfile.c:381
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "VAROVANIE: nastavenie v `%s' e�te nie je akt�vne\n"
 
-#: g10/openfile.c:409
+#: g10/openfile.c:413
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: adres�r vytvoren�\n"
 
-#: g10/parse-packet.c:137
+#: g10/parse-packet.c:138
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "nem��em pracova� s algoritmom verejn�ho k���a %d\n"
 
-#: g10/parse-packet.c:707
+#: g10/parse-packet.c:708
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "VAROVANIE: pravdepodobne nebezpe�n� symetricky �ifrovan� k��� sedenia\n"
 
-#: g10/parse-packet.c:1132
+#: g10/parse-packet.c:1145
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
 
-#: g10/passphrase.c:478 g10/passphrase.c:525
+#: g10/passphrase.c:305
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
 
-#: g10/passphrase.c:486
-msgid "can't set client pid for the agent\n"
-msgstr "nem��em nastavi� PID klienta pre gpg-agenta\n"
-
-#: g10/passphrase.c:494
-msgid "can't get server read FD for the agent\n"
-msgstr "nemo�no z�ska� server read file descriptor pre agenta\n"
-
-#: g10/passphrase.c:501
-msgid "can't get server write FD for the agent\n"
-msgstr "nemo�no z�ska� server write file descriptor pre agenta\n"
-
-#: g10/passphrase.c:534
+#: g10/passphrase.c:317
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "zl� form�t premennej prostredia GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:547
+#: g10/passphrase.c:332
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent protokol verzie %d nie je podporovan�\n"
 
-#: g10/passphrase.c:568
+#: g10/passphrase.c:345
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nem��em sa pripoji� k `%s': %s\n"
 
-#: g10/passphrase.c:590
-msgid "communication problem with gpg-agent\n"
-msgstr "probl�m v komunik�cii s gpg-agentom\n"
-
-#: g10/passphrase.c:597 g10/passphrase.c:937 g10/passphrase.c:1049
+#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
 msgid "problem with the agent - disabling agent use\n"
 msgstr "probl�m s agentom - pou��vanie agenta vypnut�\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1209
+#: g10/passphrase.c:511 g10/passphrase.c:890
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (hlavn� ID k���a %08lX)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:525
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4617,41 +4684,28 @@ msgstr ""
 "\"%.*s\"\n"
 "k��� s d�kou %u bitov, typ %s, ID %08lX, vytvoren� %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:550
 msgid "Repeat passphrase\n"
 msgstr "Opakova� heslo\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:552
 msgid "Enter passphrase\n"
 msgstr "Vlo�i� heslo\n"
 
-#: g10/passphrase.c:781
-msgid "passphrase too long\n"
-msgstr "heslo je pr�li� dlh�\n"
-
-#: g10/passphrase.c:794
-msgid "invalid response from agent\n"
-msgstr "neplatn� reakcia od agenta\n"
-
-#: g10/passphrase.c:810 g10/passphrase.c:931
+#: g10/passphrase.c:628
 msgid "cancelled by user\n"
 msgstr "zru�en� u��vate�om\n"
 
-#: g10/passphrase.c:815 g10/passphrase.c:1020
-#, c-format
-msgid "problem with the agent: agent returns 0x%lx\n"
-msgstr "probl�m s agentom: agent vracia 0x%lx\n"
-
-#: g10/passphrase.c:1100 g10/passphrase.c:1263
+#: g10/passphrase.c:781 g10/passphrase.c:944
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "v d�vkovom re�ime sa nem��em p�ta� na heslo\n"
 
-#: g10/passphrase.c:1107 g10/passphrase.c:1268
+#: g10/passphrase.c:788 g10/passphrase.c:949
 msgid "Enter passphrase: "
 msgstr "Vlo�te heslo: "
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:871
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4661,21 +4715,21 @@ msgstr ""
 "Mus�te pozna� heslo, aby ste odomkli tajn� k��� pre\n"
 "u��vate�a: \""
 
-#: g10/passphrase.c:1196
+#: g10/passphrase.c:877
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "d�ka %u bitov, typ %s, ID %08lX, vytvoren� %s"
 
-#: g10/passphrase.c:1205
+#: g10/passphrase.c:886
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1272
+#: g10/passphrase.c:953
 msgid "Repeat passphrase: "
 msgstr "Opakujte heslo: "
 
-#: g10/photoid.c:66
+#: g10/photoid.c:67
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4690,160 +4744,160 @@ msgstr ""
 "Ak pou�ijete ve�mi ve�k� obr�zok, k��� bude tie� ve�k�! Odpor��an� ve�kos�\n"
 "obr�zka je okolo 240x288.\n"
 
-#: g10/photoid.c:80
+#: g10/photoid.c:81
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Meno s�bor s fotografiou vo form�te JPEG: "
 
-#: g10/photoid.c:94
+#: g10/photoid.c:95
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "nemo�no otvori� s�bor: %s\n"
 
-#: g10/photoid.c:102
+#: g10/photoid.c:103
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:104
+#: g10/photoid.c:105
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Ste si ist�, �e ho chcete pou�i�? (a/N) "
 
-#: g10/photoid.c:119
+#: g10/photoid.c:120
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\" nie je s�bor JPEG\n"
 
-#: g10/photoid.c:136
+#: g10/photoid.c:137
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Je t�to fotografia spr�vna (a/N/u)? "
 
-#: g10/photoid.c:338
+#: g10/photoid.c:339
 msgid "unable to display photo ID!\n"
 msgstr "nemo�no nastavi� exec-path na %s\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:580
+#: g10/pkclist.c:62 g10/revoke.c:581
 msgid "No reason specified"
 msgstr "D�vod nebol �pecifikovan�"
 
-#: g10/pkclist.c:63 g10/revoke.c:582
+#: g10/pkclist.c:64 g10/revoke.c:583
 msgid "Key is superseded"
 msgstr "K��� je nahraden�"
 
-#: g10/pkclist.c:65 g10/revoke.c:581
+#: g10/pkclist.c:66 g10/revoke.c:582
 msgid "Key has been compromised"
 msgstr "K��� bol skompromitovan�"
 
-#: g10/pkclist.c:67 g10/revoke.c:583
+#: g10/pkclist.c:68 g10/revoke.c:584
 msgid "Key is no longer used"
 msgstr "K��� sa u� nepou��va"
 
-#: g10/pkclist.c:69 g10/revoke.c:584
+#: g10/pkclist.c:70 g10/revoke.c:585
 msgid "User ID is no longer valid"
 msgstr "Identifik�tor u��vate�a u� neplat�"
 
-#: g10/pkclist.c:73
+#: g10/pkclist.c:74
 msgid "reason for revocation: "
 msgstr "d�vod na revok�ciu: "
 
-#: g10/pkclist.c:90
+#: g10/pkclist.c:91
 msgid "revocation comment: "
 msgstr "revoka�n� pozn�mka: "
 
-#: g10/pkclist.c:205
+#: g10/pkclist.c:206
 msgid "iImMqQsS"
 msgstr "iImMuUsS"
 
-#: g10/pkclist.c:213
+#: g10/pkclist.c:214
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "Nie je priraden� �iadna hodnota d�very k:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:245
+#: g10/pkclist.c:246
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "                alias \""
 
-#: g10/pkclist.c:255
+#: g10/pkclist.c:256
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Tento k��� pravdepodobne patr� jeho majite�ovi\n"
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:271
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = Neviem\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = Ned�verujem\n"
 
-#: g10/pkclist.c:278
+#: g10/pkclist.c:279
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = D�verujem absol�tne\n"
 
-#: g10/pkclist.c:284
+#: g10/pkclist.c:285
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = sp� do hlavn�ho menu\n"
 
-#: g10/pkclist.c:287
+#: g10/pkclist.c:288
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " s = presko�i� tento k���\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " u = ukon�i�\n"
 
-#: g10/pkclist.c:292
+#: g10/pkclist.c:293
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:298 g10/revoke.c:609
+#: g10/pkclist.c:299 g10/revoke.c:610
 msgid "Your decision? "
 msgstr "Va�e rozhodnutie? "
 
-#: g10/pkclist.c:319
+#: g10/pkclist.c:320
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Skuto�ne chcete nastavi� pre tento k��� absol�tnu d�veru? "
 
-#: g10/pkclist.c:333
+#: g10/pkclist.c:334
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certifik�ty ved�ce k fin�lnemu d�veryhodn�mu k���u:\n"
 
-#: g10/pkclist.c:418
+#: g10/pkclist.c:419
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Ni� nenazna�uje tomu, �e tento podpis patr� vlastn�kovi k���a.\n"
 
-#: g10/pkclist.c:423
+#: g10/pkclist.c:424
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Ni� nenazna�uje tomu, �e tento podpis patr� vlastn�kovi k���a.\n"
 
-#: g10/pkclist.c:429
+#: g10/pkclist.c:430
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Tento k��� pravdepodobne patr� jeho majite�ovi\n"
 
-#: g10/pkclist.c:434
+#: g10/pkclist.c:435
 msgid "This key belongs to us\n"
 msgstr "Tento k��� patr� n�m (m�me zodpovedaj�ci tajn� k���)\n"
 
-#: g10/pkclist.c:460
+#: g10/pkclist.c:461
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -4855,93 +4909,93 @@ msgstr ""
 "odpoveda� �no\n"
 "\n"
 
-#: g10/pkclist.c:467
+#: g10/pkclist.c:468
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Pou�i� napriek tomu tento k���? "
 
-#: g10/pkclist.c:501
+#: g10/pkclist.c:502
 msgid "WARNING: Using untrusted key!\n"
 msgstr "VAROVANIE: Je pou�it� ned�veryhodn� k���!\n"
 
-#: g10/pkclist.c:508
+#: g10/pkclist.c:509
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "VAROVANIE: k��� m��e by� revokovan� (revoka�n� k��� neexistuje)\n"
 
-#: g10/pkclist.c:517
+#: g10/pkclist.c:518
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "VAROVANIE: Tento k��� bol revokovan� jeho ur�en�m revok�torom/!\n"
 
-#: g10/pkclist.c:520
+#: g10/pkclist.c:521
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "VAROVANIE: Tento k��� bol revokovan� jeho vlastn�kom!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         To m��e znamena�, �e podpis je falo�n�.\n"
 
-#: g10/pkclist.c:527
+#: g10/pkclist.c:528
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "VAROVANIE: Tento podk��� bol revokovan� jeho vlastn�kom!\n"
 
-#: g10/pkclist.c:532
+#: g10/pkclist.c:533
 msgid "Note: This key has been disabled.\n"
 msgstr "Pozn�mka: Tento k��� bol ozna�en� ako neplatn� (disabled).\n"
 
-#: g10/pkclist.c:537
+#: g10/pkclist.c:538
 msgid "Note: This key has expired!\n"
 msgstr "Pozn�mka: Skon�ila platnos� tohto k���a!\n"
 
-#: g10/pkclist.c:548
+#: g10/pkclist.c:549
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "VAROVANIE: Tento k��� nie certifikovan� d�veryhodn�m podpisom!\n"
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:551
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Ni� nenazna�uje tomu, �e tento podpis patr� vlastn�kovi k���a.\n"
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:559
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "VAROVANIE: NEd�verujeme tomuto k���u!\n"
 
-#: g10/pkclist.c:559
+#: g10/pkclist.c:560
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Tento podpis je pravdepodobne FALO�N�.\n"
 
-#: g10/pkclist.c:567
+#: g10/pkclist.c:568
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "VAROVANIE: Tento k��� nie je certifikovan� dostato�ne d�veryhodn�mi "
 "podpismi!\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:570
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Nie je ist�, �e tento podpis patr� vlastn�kovi.\n"
 
-#: g10/pkclist.c:734 g10/pkclist.c:767 g10/pkclist.c:936 g10/pkclist.c:996
+#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: presko�en�: %s\n"
 
-#: g10/pkclist.c:744 g10/pkclist.c:968
+#: g10/pkclist.c:745 g10/pkclist.c:969
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: presko�en�: verejn� k��� je u� obsiahnut� v datab�ze\n"
 
-#: g10/pkclist.c:786
+#: g10/pkclist.c:787
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Ne�pecifikovali ste identifik�tor u��vate�a (user ID). M��ete pou�i� \"-r\"\n"
 
-#: g10/pkclist.c:802
+#: g10/pkclist.c:803
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:828
+#: g10/pkclist.c:829
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -4949,168 +5003,168 @@ msgstr ""
 "\n"
 "Nap��te identifik�tor u��vate�a (user ID). Ukon�ite pr�zdnym riadkom: "
 
-#: g10/pkclist.c:844
+#: g10/pkclist.c:845
 msgid "No such user ID.\n"
 msgstr "Tak�to identifik�tor u��vate�a neexistuje.\n"
 
-#: g10/pkclist.c:849 g10/pkclist.c:911
+#: g10/pkclist.c:850 g10/pkclist.c:912
 msgid "skipped: public key already set as default recipient\n"
 msgstr "presko�en�: verejn� k��� je u� nastaven� pod�a implicitn�ho adres�ta\n"
 
-#: g10/pkclist.c:867
+#: g10/pkclist.c:868
 msgid "Public key is disabled.\n"
 msgstr "Verejn� k��� je neplatn� (disabled).\n"
 
-#: g10/pkclist.c:874
+#: g10/pkclist.c:875
 msgid "skipped: public key already set\n"
 msgstr "presko�en�: verejn� k��� je u� nastaven�\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:904
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "nezn�my implicitn� adres�t `%s'\n"
 
-#: g10/pkclist.c:948
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: presko�en�: verejn� k��� je neplatn� (disabled)\n"
 
-#: g10/pkclist.c:1003
+#: g10/pkclist.c:1004
 msgid "no valid addressees\n"
 msgstr "�iadne platn� adresy\n"
 
-#: g10/plaintext.c:90
+#: g10/plaintext.c:91
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "d�ta neboli ulo�en�; na ich ulo�enie pou�ite prep�na� \"--output\"\n"
 
-#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
+#: g10/plaintext.c:136 g10/plaintext.c:141 g10/plaintext.c:159
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "chyba pri vytv�ran� `%s': %s\n"
 
-#: g10/plaintext.c:446
+#: g10/plaintext.c:447
 msgid "Detached signature.\n"
 msgstr "Podpis oddelen� od dokumentu.\n"
 
-#: g10/plaintext.c:450
+#: g10/plaintext.c:452
 msgid "Please enter name of data file: "
 msgstr "Pros�m, vlo�te n�zov d�tov�ho s�boru: "
 
-#: g10/plaintext.c:478
+#: g10/plaintext.c:481
 msgid "reading stdin ...\n"
 msgstr "��tam �tandardn� vstup (stdin) ...\n"
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:515
 msgid "no signed data\n"
 msgstr "ch�baj� podp�san� d�ta\n"
 
-#: g10/plaintext.c:526
+#: g10/plaintext.c:529
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nem��em otvori� podp�san� d�ta '%s'\n"
 
-#: g10/pubkey-enc.c:103
+#: g10/pubkey-enc.c:104
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "anonymn� adres�t; sk��am tajn� k��� %08lX ...\n"
 
-#: g10/pubkey-enc.c:119
+#: g10/pubkey-enc.c:120
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "o.k., my sme anonymn� adres�t.\n"
 
-#: g10/pubkey-enc.c:207
+#: g10/pubkey-enc.c:208
 msgid "old encoding of the DEK is not supported\n"
 msgstr "star� k�dovanie DEK nie je podporov�n�\n"
 
-#: g10/pubkey-enc.c:228
+#: g10/pubkey-enc.c:229
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "�ifrovac� algoritmus %d%s je neznam� alebo je zak�zan�\n"
 
-#: g10/pubkey-enc.c:266
+#: g10/pubkey-enc.c:267
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "POZN�MKA: v predvo�b�ch nen�jden� �ifrovac� algoritmus %d\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:287
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "POZN�MKA: platnos� tajn�ho k���a %08lX skon�ila %s\n"
 
-#: g10/pubkey-enc.c:292
+#: g10/pubkey-enc.c:293
 msgid "NOTE: key has been revoked"
 msgstr "POZN�MKA: k��� bol revokovan�"
 
-#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:545
+#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
+#: g10/revoke.c:188 g10/revoke.c:546
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet zlyhala: %s\n"
 
-#: g10/revoke.c:146
+#: g10/revoke.c:147
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "k��� %08lX: chyba identifik�tor u��vate�a\n"
 
-#: g10/revoke.c:272
+#: g10/revoke.c:273
 msgid "To be revoked by:\n"
 msgstr "Bude revokovan�:\n"
 
-#: g10/revoke.c:276
+#: g10/revoke.c:277
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Toto je citliv� revoka�n� k���)\n"
 
-#: g10/revoke.c:280
+#: g10/revoke.c:281
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? "
 
-#: g10/revoke.c:293 g10/revoke.c:511
+#: g10/revoke.c:294 g10/revoke.c:512
 msgid "ASCII armored output forced.\n"
 msgstr "Vyn�ten� ASCII textov� v�stup.\n"
 
-#: g10/revoke.c:307 g10/revoke.c:525
+#: g10/revoke.c:308 g10/revoke.c:526
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet zlyhala: %s\n"
 
-#: g10/revoke.c:370
+#: g10/revoke.c:371
 msgid "Revocation certificate created.\n"
 msgstr "Revoka�n� certifik�t bol vytvoren�.\n"
 
-#: g10/revoke.c:376
+#: g10/revoke.c:377
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "�iadne revoka�n� k���e pre `%s' nen�jden�\n"
 
-#: g10/revoke.c:432
+#: g10/revoke.c:433
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "tajn� k��� `%s' nebol n�jden�: %s\n"
 
-#: g10/revoke.c:461
+#: g10/revoke.c:462
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "�iadny zodpovedaj�ci verejn� k���: %s\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:473
 msgid "public key does not match secret key!\n"
 msgstr "verejn� k��� nes�hlas� s tajn�m!\n"
 
-#: g10/revoke.c:479
+#: g10/revoke.c:480
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? "
 
-#: g10/revoke.c:496
+#: g10/revoke.c:497
 msgid "unknown protection algorithm\n"
 msgstr "nezn�my ochrann� algoritmus\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 msgid "NOTE: This key is not protected!\n"
 msgstr "POZN�MKA: Tento k��� nie je chr�nen�!\n"
 
-#: g10/revoke.c:551
+#: g10/revoke.c:552
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5128,110 +5182,110 @@ msgstr ""
 "Ale hroz� nebezpe�enstvo: Tla�ov� syst�m V�ho po��ta�a m��e uklada� d�ta a\n"
 "spr�stupni� ich in�m!\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid "Please select the reason for the revocation:\n"
 msgstr "Pros�m v�berte d�vod na revok�ciu:\n"
 
-#: g10/revoke.c:602
+#: g10/revoke.c:603
 msgid "Cancel"
 msgstr "Zru�i�"
 
-#: g10/revoke.c:604
+#: g10/revoke.c:605
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Pravdepodobne ste chceli vybra� %d)\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:646
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Ak chcete, nap��te popis; ukon�ite pr�zdnym riadkom:\n"
 
-#: g10/revoke.c:673
+#: g10/revoke.c:674
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "D�vod na revok�ciu: %s\n"
 
-#: g10/revoke.c:675
+#: g10/revoke.c:676
 msgid "(No description given)\n"
 msgstr "(�iadny popis)\n"
 
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Je to v poriadku? "
 
-#: g10/seckey-cert.c:54
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "tajn� �asti k���a nie s� dostupn�\n"
 
-#: g10/seckey-cert.c:60
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
 
-#: g10/seckey-cert.c:71
+#: g10/seckey-cert.c:72
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
 
-#: g10/seckey-cert.c:265
+#: g10/seckey-cert.c:266
 msgid "Invalid passphrase; please try again"
 msgstr "Neplatn� heslo; pros�m, sk�ste to znovu"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:267
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:326
+#: g10/seckey-cert.c:327
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "VAROVANIE: Zisten� slab� k��� - zme�te, pros�m, znovu heslo.\n"
 
-#: g10/seckey-cert.c:364
+#: g10/seckey-cert.c:365
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "generujem zastaral� 16 bitov� kontroln� s��et na ochranu tajn�ho k���a\n"
 
-#: g10/seskey.c:52
+#: g10/seskey.c:53
 msgid "weak key created - retrying\n"
 msgstr "vytvoren� slab� k��� - sk��am znovu\n"
 
-#: g10/seskey.c:57
+#: g10/seskey.c:58
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "nem��em sa vyvarova� slab�ho k���a pre symetrick� �ifru; oper�ciu som sk�sil "
 "%d kr�t!\n"
 
-#: g10/seskey.c:213
+#: g10/seskey.c:214
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA po�aduje pou�itie 160 bitov�ho hashovacieho algoritmu\n"
 
-#: g10/sig-check.c:75
+#: g10/sig-check.c:76
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "VAROVANIE: konflikt hashu podpisu v spr�ve\n"
 
-#: g10/sig-check.c:99
+#: g10/sig-check.c:100
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "VAROVANIE: podpisovac� podk��� %08lX nie je kr��ovo certifikovan�\n"
 
-#: g10/sig-check.c:102
+#: g10/sig-check.c:103
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "VAROVANIE: podpisovac� podk��� %08lX m� neplatn� kr��ov� certifik�ciu\n"
 
-#: g10/sig-check.c:168
+#: g10/sig-check.c:169
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "verejn� k��� %08lX je o %lu sekund nov�� ne� podpis\n"
 
-#: g10/sig-check.c:169
+#: g10/sig-check.c:170
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "verejn� k��� %08lX je o %lu sekund nov�� ne� podpis\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:181
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5239,7 +5293,7 @@ msgstr ""
 "k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
 "je probl�m so syst�mov�m �asom)\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:183
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5247,52 +5301,52 @@ msgstr ""
 "k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
 "je probl�m so syst�mov�m �asom)\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:193
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "POZN�MKA: podpisov�mu k���u %08lX skon�ila platnos� %s\n"
 
-#: g10/sig-check.c:275
+#: g10/sig-check.c:276
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "predpoklad�m neplatn� podpis k���om %08lX, preto�e je nastaven� nezn�my "
 "kritick� bit\n"
 
-#: g10/sig-check.c:532
+#: g10/sig-check.c:533
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "k��� %08lX: neexistuje podk��� pre revok�ciu k���a\n"
 
-#: g10/sig-check.c:558
+#: g10/sig-check.c:559
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "k��� %08lX: neexistuje podk��� pre viazanie podk���ov\n"
 
-#: g10/sign.c:85
+#: g10/sign.c:86
 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:93
+#: g10/sign.c:94
 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:112
+#: g10/sign.c:113
 #, 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:138
+#: g10/sign.c:139
 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:146
+#: g10/sign.c:147
 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:159
+#: g10/sign.c:160
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5300,7 +5354,7 @@ msgstr ""
 "VAROVANIE: nem��em %%-expandova� URL politiky (pr�li� dlh�). Pou�it� "
 "neexpandovan�.\n"
 
-#: g10/sign.c:187
+#: g10/sign.c:188
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5309,76 +5363,76 @@ msgstr ""
 "VAROVANIE: nem��em %%-expandova� URL politiky (pr�li� dlh�). Pou�it� "
 "neexpandovan�.\n"
 
-#: g10/sign.c:364
+#: g10/sign.c:365
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
 
-#: g10/sign.c:373
+#: g10/sign.c:374
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s podpis od: \"%s\"\n"
 
-#: g10/sign.c:741
+#: g10/sign.c:761
 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:808
+#: g10/sign.c:830
 #, 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:900
+#: g10/sign.c:922
 msgid "signing:"
 msgstr "podpisujem:"
 
-#: g10/sign.c:1007
+#: g10/sign.c:1034
 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:1180
+#: g10/sign.c:1212
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "bude pou�it� �ifrovanie %s\n"
 
-#: g10/skclist.c:126 g10/skclist.c:190
+#: g10/skclist.c:127 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "k��� nie je ozna�en� ako nedostato�ne bezpe�n� - nem��em ho pou�i� s "
 "falo�n�m RNG!\n"
 
-#: g10/skclist.c:157
+#: g10/skclist.c:158
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "presko�en� `%s': duplikovan�\n"
 
-#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "presko�en� `%s': %s\n"
 
-#: g10/skclist.c:170
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
 
-#: g10/skclist.c:185
+#: g10/skclist.c:186
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "presko�en� `%s': toto je vygenerovan� PGP k��� pod�a algoritmu ElGamal,\n"
 "podpisy vytvoren� t�mto k���om nie s� bezpe�n�!\n"
 
-#: g10/tdbdump.c:59 g10/trustdb.c:365
+#: g10/tdbdump.c:60 g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "z�znam d�very %lu, typ %d: z�pis zlyhal: %s\n"
 
-#: g10/tdbdump.c:104
+#: g10/tdbdump.c:105
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5387,350 +5441,350 @@ msgstr ""
 "# Zoznam pridelen�ch hodn�t d�veryhodnosti, vytvoren� %s\n"
 "# (Pou�ite \"gpg --import-ownertrust\" na obnovenie)\n"
 
-#: g10/tdbdump.c:159 g10/tdbdump.c:167 g10/tdbdump.c:172 g10/tdbdump.c:177
+#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: g10/tdbdump.c:159
+#: g10/tdbdump.c:160
 #, fuzzy
 msgid "line too long"
 msgstr "riadok je pr�li� dlh�\n"
 
-#: g10/tdbdump.c:167
+#: g10/tdbdump.c:168
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:173
+#: g10/tdbdump.c:174
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "chyba: neplatn� odtla�ok\n"
 
-#: g10/tdbdump.c:178
+#: g10/tdbdump.c:179
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr ""
 "importova� hodnoty d�veryhodnosti\n"
 " vlastn�ka k���a"
 
-#: g10/tdbdump.c:214
+#: g10/tdbdump.c:215
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "chyba pri h�adan� z�znamu d�very: %s\n"
 
-#: g10/tdbdump.c:218
+#: g10/tdbdump.c:219
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "chyba pri ��tan�: %s\n"
 
-#: g10/tdbdump.c:227 g10/trustdb.c:380
+#: g10/tdbdump.c:228 g10/trustdb.c:381
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "datab�za d�very: synchroniz�cia zlyhala %s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1440
+#: g10/tdbio.c:129 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "z�znam v datab�ze d�very %lu: lseek() sa nepodaril: %s\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1447
+#: g10/tdbio.c:135 g10/tdbio.c:1448
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "z�znam v datab�ze d�very %lu: z�pis sa nepodaril (n=%d): %s\n"
 
-#: g10/tdbio.c:244
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "transakcia s datab�zou d�very je pr�li� dlh�\n"
 
-#: g10/tdbio.c:497
+#: g10/tdbio.c:498
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "nem��em zavrie� `%s': %s\n"
 
-#: g10/tdbio.c:512
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: adres�r neexistuje!\n"
 
-#: g10/tdbio.c:522 g10/tdbio.c:545 g10/tdbio.c:588
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "nem��em vytvori� `%s': %s\n"
 
-#: g10/tdbio.c:524 g10/tdbio.c:591
+#: g10/tdbio.c:525 g10/tdbio.c:592
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "nemo�no otvori� `%s'\n"
 
-#: g10/tdbio.c:550
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: nepodarilo sa vytvori� z�znam verzie: %s"
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: vytvoren� neplatn� datab�za d�very\n"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: datab�za d�very vytvoren�\n"
 
-#: g10/tdbio.c:597
+#: g10/tdbio.c:598
 msgid "NOTE: trustdb not writable\n"
 msgstr "POZN�MKA: do trustdb nemo�no zapisova�\n"
 
-#: g10/tdbio.c:614
+#: g10/tdbio.c:615
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: neplatn� datab�ze d�very\n"
 
-#: g10/tdbio.c:646
+#: g10/tdbio.c:647
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: nepodarilo sa vytvori� hashovaciu tabu�ku: %s\n"
 
-#: g10/tdbio.c:654
+#: g10/tdbio.c:655
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: chyba pri aktualiz�cii z�znamu verzie: %s\n"
 
-#: g10/tdbio.c:671 g10/tdbio.c:691 g10/tdbio.c:707 g10/tdbio.c:721
-#: g10/tdbio.c:751 g10/tdbio.c:1373 g10/tdbio.c:1400
+#: g10/tdbio.c:672 g10/tdbio.c:692 g10/tdbio.c:708 g10/tdbio.c:722
+#: g10/tdbio.c:752 g10/tdbio.c:1374 g10/tdbio.c:1401
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: chyba pri ��tan� z�znamu verzie: %s\n"
 
-#: g10/tdbio.c:730
+#: g10/tdbio.c:731
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: chyba pri z�pise z�znamu verzie: %s\n"
 
-#: g10/tdbio.c:1169
+#: g10/tdbio.c:1170
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "datab�ze d�very: proced�ra lseek() zlyhala: %s\n"
 
-#: g10/tdbio.c:1177
+#: g10/tdbio.c:1178
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "datab�za d�very: proced�ra read() (n=%d) zlyhala: %s\n"
 
-#: g10/tdbio.c:1198
+#: g10/tdbio.c:1199
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: nie je s�bor datab�zy d�very\n"
 
-#: g10/tdbio.c:1216
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: z�znam verzie s ��slom %lu\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1222
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: neplatn� verzia s�boru %d\n"
 
-#: g10/tdbio.c:1406
+#: g10/tdbio.c:1407
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: chyba pri ��tan� vo�n�ho z�znamu: %s\n"
 
-#: g10/tdbio.c:1414
+#: g10/tdbio.c:1415
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: chyba pri z�pise adres�rov�ho z�znamu: %s\n"
 
-#: g10/tdbio.c:1424
+#: g10/tdbio.c:1425
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: vynulovanie z�znamu zlyhalo: %s\n"
 
-#: g10/tdbio.c:1454
+#: g10/tdbio.c:1455
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: pridanie z�znamu zlyhalo: %s\n"
 
-#: g10/tdbio.c:1499
+#: g10/tdbio.c:1500
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "datab�za d�very je po�koden�; pros�m spustite \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:147
+#: g10/textfilter.c:148
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "nem��em pracova� s riadkami dlh��mi ako %d znakov\n"
 
-#: g10/textfilter.c:244
+#: g10/textfilter.c:245
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "vstupn� riadok je dlh�� ako %d znakov\n"
 
-#: g10/trustdb.c:226
+#: g10/trustdb.c:227
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' nie je platn� dlh� keyID\n"
 
-#: g10/trustdb.c:257
+#: g10/trustdb.c:258
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "k��� %08lX: akceptovan� ako d�veryhodn� k���\n"
 
-#: g10/trustdb.c:295
+#: g10/trustdb.c:296
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "k��� %08lX sa v datab�ze d�very vyskytuje viac ako raz\n"
 
-#: g10/trustdb.c:310
+#: g10/trustdb.c:311
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "k��� %08lX: nen�jden� verejn� k��� k d�veryhodn�mu k���u - presko�en�\n"
 
-#: g10/trustdb.c:320
+#: g10/trustdb.c:321
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "k��� ozna�en� ako absol�tne d�veryhodn�.\n"
 
-#: g10/trustdb.c:344
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "z�znam d�very %lu, typ po�. %d: ��tanie zlyhalo: %s\n"
 
-#: g10/trustdb.c:350
+#: g10/trustdb.c:351
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "z�znam d�very %lu nie je po�adovan�ho typu %d\n"
 
-#: g10/trustdb.c:446
+#: g10/trustdb.c:447
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:452
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:506
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[revokovan�]"
 
-#: g10/trustdb.c:508 g10/trustdb.c:513
+#: g10/trustdb.c:509 g10/trustdb.c:514
 #, fuzzy
 msgid "[ expired]"
 msgstr "[expirovan�]"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 #, fuzzy
 msgid "[ unknown]"
 msgstr "nezn�me"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 #, fuzzy
 msgid "never"
 msgstr "nikdy     "
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:536
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:576
+#: 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:582 g10/trustdb.c:2157
+#: g10/trustdb.c:583 g10/trustdb.c:2309
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "dal�ia kontrola datab�zy d�very %s\n"
 
-#: g10/trustdb.c:591
+#: 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:606
+#: 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:838 g10/trustdb.c:1276
+#: 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:1033
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr "pros�m vykonajte --check-trustdb\n"
 
-#: g10/trustdb.c:1037
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "kontrolujem datab�zu d�very\n"
 
-#: g10/trustdb.c:1901
+#: g10/trustdb.c:2053
 #, 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:1965
+#: g10/trustdb.c:2117
 msgid "no ultimately trusted keys found\n"
 msgstr "neboli n�jden� �iadne absol�tne d�veryhodn� k���e\n"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:2131
 #, 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:2002
+#: g10/trustdb.c:2154
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2240
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2163
+#: g10/trustdb.c:2315
 #, 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"
 
-#: g10/verify.c:116
+#: g10/verify.c:117
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -5740,304 +5794,335 @@ msgstr ""
 "Pros�m, nezab�dajte, �e s�bor s podpisom (.sig alebo .asc)\n"
 "by mal by� prv�m s�borom zadan�m na pr�kazovom riadku.\n"
 
-#: g10/verify.c:189
+#: g10/verify.c:190
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "vstupn� riadok %u je pr�li� dlh� alebo na konci ch�ba znak LF\n"
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "v�eobecn� chyba"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "nezn�my typ paketu"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "nezn�ma verzia"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "nezn�my algoritmus verejn�ho k���a"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "nezn�my hashovac� algoritmus"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "neplatn� verejn� k���"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "neplatn� tajn� k���"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "neplatn� podpis"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "chyba kontroln�ho s��tu"
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "nespr�vne heslo"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "verejn� k��� nen�jden�"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "nezn�my �ifrovac� algoritmus"
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "nem��em otvori� s�bor k���ov"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "neplatn� paket"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "neplatn� sp�sob reprezent�cie v ASCII"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "u��vate� s t�mto id neexistuje"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "tajn� k��� nie je dostupn�"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "bol pou�it� nespr�vny tajn� k���"
 
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "nepodporovan�"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "nespr�vny k���"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "chyba pri ��tan� s�boru"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "chyba pri z�pise s�boru"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "nezn�my kompresn� algoritmus"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "chyba pri otv�ran� s�boru"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "chyba pri vytv�ran� s�boru"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "nespr�vne heslo"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "algoritmus verejn�ho k���a nie je implementovan�"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "�ifrovac� algoritmus nie je implementovan�"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "nezn�ma trieda podpisu"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "chyba v datab�ze d�very"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "nespr�vne MPI"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "obmedzenie zdrojov"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "neplatn� s�bor k���ov"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "nespr�vny certifik�t"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "nespr�vny form�t id u��vate�a"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "chyba pri zatv�ran� s�boru"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "chyba pri premenov�van� s�boru"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "chyba pri mazan� s�boru"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "neo�ak�van� d�ta"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "konflikt �asov�ho raz�tka"
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "nepou�ite�n� algoritmus s verejn�m k���om"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "s�bor existuje"
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "slab� k���"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "neplatn� argument"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "nespr�vne URI"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "toto URI nie je podporovan�"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "chyba siete"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "neza�ifrovan�"
 
-#: util/errors.c:103
+#: util/errors.c:104
 msgid "not processed"
 msgstr "nespracovan�"
 
-#: util/errors.c:105
+#: util/errors.c:106
 msgid "unusable public key"
 msgstr "nepou�ite�n� verejn� k���"
 
-#: util/errors.c:106
+#: util/errors.c:107
 msgid "unusable secret key"
 msgstr "nepou�ite�n� tajn� k���"
 
-#: util/errors.c:107
+#: util/errors.c:108
 msgid "keyserver error"
 msgstr "chyba servera k���ov"
 
-#: util/errors.c:108
+#: util/errors.c:109
 #, fuzzy
 msgid "canceled"
 msgstr "Zru�i�"
 
-#: util/errors.c:109
+#: util/errors.c:110
 #, fuzzy
 msgid "no card"
 msgstr "neza�ifrovan�"
 
-#: util/logger.c:157
+#: util/logger.c:158
 msgid "ERROR: "
 msgstr ""
 
-#: util/logger.c:160
+#: util/logger.c:161
 msgid "WARNING: "
 msgstr ""
 
-#: util/logger.c:223
+#: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... toto je chyba v programe (%s:%d:%s)\n"
 
-#: util/logger.c:229
+#: util/logger.c:230
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "n�jden� chyba v programe ... (%s:%d)\n"
 
-#: util/miscutil.c:336 util/miscutil.c:373
+#: util/miscutil.c:330 util/miscutil.c:367
 msgid "yes"
 msgstr "ano"
 
-#: util/miscutil.c:337 util/miscutil.c:378
+#: util/miscutil.c:331 util/miscutil.c:372
 msgid "yY"
 msgstr "aAyY"
 
-#: util/miscutil.c:339 util/miscutil.c:375
+#: util/miscutil.c:333 util/miscutil.c:369
 msgid "no"
 msgstr "nie"
 
-#: util/miscutil.c:340 util/miscutil.c:379
+#: util/miscutil.c:334 util/miscutil.c:373
 msgid "nN"
 msgstr "nN"
 
-#: util/miscutil.c:377
+#: util/miscutil.c:371
 msgid "quit"
 msgstr "ukon�i�"
 
-#: util/miscutil.c:380
+#: util/miscutil.c:374
 msgid "qQ"
 msgstr "uUqQ"
 
-#: util/miscutil.c:413
+#: util/miscutil.c:407
 msgid "okay|okay"
 msgstr ""
 
-#: util/miscutil.c:415
+#: util/miscutil.c:409
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:416
+#: util/miscutil.c:410
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:417
+#: util/miscutil.c:411
 #, fuzzy
 msgid "cC"
 msgstr "c"
 
-#: util/secmem.c:90
+#: util/secmem.c:91
 msgid "WARNING: using insecure memory!\n"
 msgstr "VAROVANIE: Pou��van� pam� nie je bezpe�n�!\n"
 
-#: util/secmem.c:91
+#: util/secmem.c:92
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "Viac inform�ci� n�jdete na adrese http://www.gnupg.org/faq.html\n"
 
-#: util/secmem.c:343
+#: util/secmem.c:344
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "vykonanie oper�cie nie je mo�n� bez inicializovanej bezpe�nej pam�te\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:345
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(pravdepodobne ste na t�to �lohu pou�ili nespr�vny program)\n"
 
+#, fuzzy
+#~ msgid "error getting serial number: %s\n"
+#~ msgstr "chyba pri vytv�ran� hesla: %s\n"
+
+#~ msgid "Hint: Select the user IDs to sign\n"
+#~ msgstr "N�poveda: Vyberte id u��vate�a na podp�sanie\n"
+
+#~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+#~ msgstr "nespr�vne heslo alebo nezn�my �ifrovac� algoritmus (%d)\n"
+
+#~ msgid "can't set client pid for the agent\n"
+#~ msgstr "nem��em nastavi� PID klienta pre gpg-agenta\n"
+
+#~ msgid "can't get server read FD for the agent\n"
+#~ msgstr "nemo�no z�ska� server read file descriptor pre agenta\n"
+
+#~ msgid "can't get server write FD for the agent\n"
+#~ msgstr "nemo�no z�ska� server write file descriptor pre agenta\n"
+
+#~ msgid "communication problem with gpg-agent\n"
+#~ msgstr "probl�m v komunik�cii s gpg-agentom\n"
+
+#~ msgid "passphrase too long\n"
+#~ msgstr "heslo je pr�li� dlh�\n"
+
+#~ msgid "invalid response from agent\n"
+#~ msgstr "neplatn� reakcia od agenta\n"
+
+#~ msgid "problem with the agent: agent returns 0x%lx\n"
+#~ msgstr "probl�m s agentom: agent vracia 0x%lx\n"
+
 #~ msgid "select secondary key N"
 #~ msgstr "vyberte sekund�rny k��� N"
 
diff --git a/po/sv.po b/po/sv.po
index f73d61457..1b9cd0c89 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: 2005-03-15 16:35+0100\n"
+"POT-Creation-Date: 2005-05-31 10:05+0200\n"
 "PO-Revision-Date: 2004-12-01 17:49+0100\n"
 "Last-Translator: Per Tunedal <[email protected]>\n"
 "Language-Team: Swedish <[email protected]>\n"
@@ -31,80 +31,80 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:120
+#: cipher/primegen.c:121
 #, fuzzy, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr "kan inte skapa ett primtal med mindre än %d bitar\n"
 
-#: cipher/primegen.c:311
+#: cipher/primegen.c:312
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "kan inte skapa ett primtal med mindre än %d bitar\n"
 
-#: cipher/random.c:163
+#: cipher/random.c:164
 msgid "no entropy gathering module detected\n"
 msgstr "ingen demon för entropisamling hittad\n"
 
-#: cipher/random.c:387 g10/card-util.c:656 g10/card-util.c:725
-#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2255
-#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
-#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
-#: g10/tdbio.c:600
+#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
+#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
+#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
+#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
+#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/tdbio.c:601
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan inte öppna \"%s\": %s\n"
 
-#: cipher/random.c:391
+#: cipher/random.c:392
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "kan inte ta status på \"%s\": %s\n"
 
-#: cipher/random.c:396
+#: cipher/random.c:397
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "\"%s\" är inte än vanlig fil - ignorerad\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:402
 msgid "note: random_seed file is empty\n"
 msgstr "Obs: filen random_seed är tom\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:408
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "VARNING: slumpkärnan har en felaktig storlek och används därför inte\n"
 
-#: cipher/random.c:415
+#: cipher/random.c:416
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "kan inte läsa \"%s\": %s\n"
 
-#: cipher/random.c:453
+#: cipher/random.c:454
 msgid "note: random_seed file not updated\n"
 msgstr "Obs: random_seed uppdaterades inte\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2723
-#: g10/keygen.c:2753 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
-#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan inte skapa \"%s\": %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:481
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kan inte skriva till \"%s\": %s\n"
 
-#: cipher/random.c:483
+#: cipher/random.c:484
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kan inte stänga \"%s\": %s\n"
 
-#: cipher/random.c:728
+#: cipher/random.c:729
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "VARNING: använder en osäker slumptalsgenerator!!\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:730
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -119,7 +119,7 @@ msgstr ""
 "ANVÄND INGEN DATA GENERERAD AV DETTA PROGRAM!!\n"
 "\n"
 
-#: cipher/rndegd.c:204
+#: cipher/rndegd.c:205
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -129,7 +129,7 @@ msgstr ""
 "det hindra dig att bli uttråkad, eftersom det förbättrar kvaliteten\n"
 "på entropin.\n"
 
-#: cipher/rndlinux.c:134
+#: cipher/rndlinux.c:135
 #, c-format
 msgid ""
 "\n"
@@ -141,45 +141,62 @@ msgstr ""
 "en stund för att ge operativsystemet en chans att samla mer entropi!\n"
 "(Behöver %d fler byte)\n"
 
-#: g10/app-openpgp.c:547
+#: g10/app-openpgp.c:596
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/app-openpgp.c:560
+#: g10/app-openpgp.c:609
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "misslyckades med att återskapa nyckelringscache: %s\n"
 
-#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
+#: g10/app-openpgp.c:977
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "misslyckades med att radera nyckelblock: %s\n"
+
+#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+msgid "response does not contain the public key data\n"
+msgstr ""
+
+#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
-#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
+#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
+#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Sändning till nyckelservern misslyckades: %s\n"
 
-#: g10/app-openpgp.c:836
+#: g10/app-openpgp.c:1310
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:857
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:862
+#: g10/app-openpgp.c:1336
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -187,181 +204,186 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:869
+#: g10/app-openpgp.c:1343
 msgid "|A|Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1018
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:1492
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1018
+#: g10/app-openpgp.c:1492
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1022
+#: g10/app-openpgp.c:1496
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "Fel vid skapande av `%s': %s\n"
 
-#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
+#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "fel vid läsning av nyckelblock: %s\n"
 
-#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
+#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "fel: ogiltigt fingeravtryck\n"
 
-#: g10/app-openpgp.c:1104
+#: g10/app-openpgp.c:1562
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' är redan komprimerad\n"
 
-#: g10/app-openpgp.c:1108
+#: g10/app-openpgp.c:1566
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1110
+#: g10/app-openpgp.c:1568
 #, fuzzy
 msgid "generating new key\n"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/app-openpgp.c:1120
+#: g10/app-openpgp.c:1735
+msgid "creation timestamp missing\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1742
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1749
+#, c-format
+msgid "RSA public exponent missing or largerr than %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1827
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
+
+#: g10/app-openpgp.c:1886
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1135
+#: g10/app-openpgp.c:1901
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1904
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
-#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
-msgid "response does not contain the public key data\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
-msgid "response does not contain the RSA modulus\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
-msgid "response does not contain the RSA public exponent\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1195
+#: g10/app-openpgp.c:1961
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1356
+#: g10/app-openpgp.c:2130
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1364
+#: g10/app-openpgp.c:2138
 #, c-format
-msgid "PIN [sigs done: %lu]"
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
+#: g10/app-openpgp.c:2399
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1731
-#, fuzzy, c-format
-msgid "error getting serial number: %s\n"
-msgstr "fel vid skapandet av lösenmening: %s\n"
-
-#: g10/app-openpgp.c:1826
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
-
-#: g10/app-openpgp.c:1868
-#, fuzzy
-msgid "reading the key failed\n"
-msgstr "misslyckades med att radera nyckelblock: %s\n"
-
-#: g10/armor.c:317
+#: g10/armor.c:318
 #, c-format
 msgid "armor: %s\n"
 msgstr "ASCII-skal: %s\n"
 
-#: g10/armor.c:346
+#: g10/armor.c:347
 msgid "invalid armor header: "
 msgstr "felaktig rubrikrad i ASCII-skalet: "
 
-#: g10/armor.c:353
+#: g10/armor.c:354
 msgid "armor header: "
 msgstr "rad i ASCII-skalet: "
 
-#: g10/armor.c:364
+#: g10/armor.c:365
 msgid "invalid clearsig header\n"
 msgstr "felaktig rubrikrad i klartextsignatur\n"
 
-#: g10/armor.c:416
+#: g10/armor.c:417
 msgid "nested clear text signatures\n"
 msgstr "flera klartextsignaturer går in i varandra\n"
 
-#: g10/armor.c:551
+#: g10/armor.c:552
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "oväntat ASCII-skal:"
 
 # rader i klartexten som inleds med bindestreck får ett extra bindestreck vid klartextsignatur (för att lättare hitta "---- Begin ..."
-#: g10/armor.c:563
+#: g10/armor.c:564
 msgid "invalid dash escaped line: "
 msgstr "felaktig rad som börjar med bindestreck: "
 
 # överhoppad eller hoppades över?
-#: g10/armor.c:715 g10/armor.c:1322
+#: g10/armor.c:716 g10/armor.c:1323
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "hoppade över felaktigt radix64-tecken %02x \n"
 
 # CRC Cyclic Redundancy Checksum används för att upptäcka fel i ascii-skalet. Används allmänt, trots att det inte höjer säkerheten.
-#: g10/armor.c:758
+#: g10/armor.c:759
 msgid "premature eof (no CRC)\n"
 msgstr "för tidigt filslut (ingen CRC-summa)\n"
 
-#: g10/armor.c:792
+#: g10/armor.c:793
 msgid "premature eof (in CRC)\n"
 msgstr "för tidigt filslut (i CRC-summan)\n"
 
-#: g10/armor.c:800
+#: g10/armor.c:801
 msgid "malformed CRC\n"
 msgstr "felformaterad CRC-summa\n"
 
-#: g10/armor.c:804 g10/armor.c:1359
+#: g10/armor.c:805 g10/armor.c:1360
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC-fel; %06lx - %06lx\n"
 
-#: g10/armor.c:824
+#: g10/armor.c:825
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "för tidigt filslut (i den avslutande raden)\n"
 
-#: g10/armor.c:828
+#: g10/armor.c:829
 msgid "error in trailer line\n"
 msgstr "fel i avslutande rad\n"
 
-#: g10/armor.c:1137
+#: g10/armor.c:1138
 msgid "no valid OpenPGP data found.\n"
 msgstr "hittade ingen giltig OpenPGP-data.\n"
 
-#: g10/armor.c:1142
+#: g10/armor.c:1143
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "felaktigt ASCII-skal: raden är längre än %d tecken\n"
 
-#: g10/armor.c:1146
+#: g10/armor.c:1147
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -369,176 +391,176 @@ msgstr ""
 "beror sannolikt på att en felaktig e-postserver eller e-postklient har "
 "använts\n"
 
-#: g10/card-util.c:58 g10/card-util.c:295
+#: g10/card-util.c:63 g10/card-util.c:303
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "den hemliga nyckeln är inte tillgänglig"
 
-#: g10/card-util.c:63
+#: g10/card-util.c:68
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1329 g10/delkey.c:127 g10/keyedit.c:1430
-#: g10/keygen.c:2439 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1510
+#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
 #, 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:97 g10/card-util.c:1108 g10/card-util.c:1191
-#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
-#: g10/keygen.c:1365
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
+#: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "Vad väljer du? "
 
-#: g10/card-util.c:206 g10/card-util.c:256
+#: g10/card-util.c:213 g10/card-util.c:263
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:391
+#: g10/card-util.c:410
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 #, fuzzy
 msgid "unspecified"
 msgstr "Ingen anledning har angivits"
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 #, fuzzy
 msgid "not forced"
 msgstr "inte behandlade"
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:497
+#: g10/card-util.c:516
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:499
+#: g10/card-util.c:518
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:501
+#: g10/card-util.c:520
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:518
+#: g10/card-util.c:537
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:539
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:538
+#: g10/card-util.c:557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:559
+#: g10/card-util.c:578
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "ingen tillhörande öppen nyckel: %s\n"
 
-#: g10/card-util.c:567
+#: g10/card-util.c:586
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:665 g10/card-util.c:734 g10/import.c:261
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fel vid läsning av \"%s\": %s\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:692
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:683
+#: g10/card-util.c:702
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:742
+#: g10/card-util.c:761
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:752
+#: g10/card-util.c:771
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:772
+#: g10/card-util.c:791
 #, fuzzy
 msgid "Language preferences: "
 msgstr "uppdaterat inställningar"
 
-#: g10/card-util.c:780
+#: g10/card-util.c:799
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "felaktigt tecken i inställningssträngen\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:808
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "felaktigt tecken i inställningssträngen\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:829
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:824
+#: g10/card-util.c:843
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "fel: ogiltigt fingeravtryck\n"
 
-#: g10/card-util.c:845
+#: g10/card-util.c:864
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "visa fingeravtryck"
 
-#: g10/card-util.c:868
+#: g10/card-util.c:887
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "fel: ogiltigt fingeravtryck\n"
 
-#: g10/card-util.c:916
+#: g10/card-util.c:935
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
-#: g10/card-util.c:917
+#: g10/card-util.c:936
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "hittade ingen giltig OpenPGP-data.\n"
 
-#: g10/card-util.c:926
+#: g10/card-util.c:945
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "fel vid skrivning av hemliga nyckelringen \"%s\": %s\n"
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1030
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1030 g10/card-util.c:1039
+#: g10/card-util.c:1051 g10/card-util.c:1060
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1051
+#: g10/card-util.c:1072
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1060
+#: g10/card-util.c:1081
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -546,275 +568,279 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1099
+#: g10/card-util.c:1120
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Välj vilken typ av nyckel du vill ha:\n"
 
-#: g10/card-util.c:1101 g10/card-util.c:1182
+#: g10/card-util.c:1122 g10/card-util.c:1203
 msgid "   (1) Signature key\n"
 msgstr ""
 
-#: g10/card-util.c:1102 g10/card-util.c:1184
+#: g10/card-util.c:1123 g10/card-util.c:1205
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (endast kryptering)\n"
 
-#: g10/card-util.c:1103 g10/card-util.c:1186
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1119 g10/card-util.c:1202 g10/keyedit.c:908
-#: g10/keygen.c:1404 g10/revoke.c:642
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
+#: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "Felaktigt val.\n"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1200
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Välj anledning till att nyckeln spärras:\n"
 
-#: g10/card-util.c:1214
+#: g10/card-util.c:1235
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "okänd krypteringsalgoritm\n"
 
-#: g10/card-util.c:1219
+#: g10/card-util.c:1240
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "De hemliga delarna av den huvudnyckeln är inte tillgängliga.\n"
 
-#: g10/card-util.c:1224
+#: g10/card-util.c:1245
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "hoppade över: hemlig nyckel finns redan\n"
 
-#: g10/card-util.c:1294 g10/keyedit.c:1317
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "avsluta denna meny"
 
-#: g10/card-util.c:1296
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "show admin commands"
 msgstr "motstridiga kommandon\n"
 
-#: g10/card-util.c:1297 g10/keyedit.c:1320
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "visa denna hjälp"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "list all available data"
 msgstr "Nyckeln tillgänglig hos: "
 
-#: g10/card-util.c:1302
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1303
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1304
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1305
+#: g10/card-util.c:1327
 #, fuzzy
 msgid "change the login name"
 msgstr "ändra utgångsdatum"
 
 # originalet borde ha ett value
-#: g10/card-util.c:1306
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the language preferences"
 msgstr "ändra ägartillitsvärdet"
 
-#: g10/card-util.c:1307
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1308
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "visa fingeravtryck"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1310
+#: g10/card-util.c:1332
 #, fuzzy
 msgid "generate new keys"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1377 g10/keyedit.c:1526
+#: g10/card-util.c:1334
+msgid "verify the PIN and list all data"
+msgstr ""
+
+#: g10/card-util.c:1454 g10/keyedit.c:1609
 msgid "Command> "
 msgstr "Kommando> "
 
-#: g10/card-util.c:1412
+#: g10/card-util.c:1492
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "motstridiga kommandon\n"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1523
 msgid "Admin commands are allowed\n"
 msgstr ""
 
-#: g10/card-util.c:1430
+#: g10/card-util.c:1525
 msgid "Admin commands are not allowed\n"
 msgstr ""
 
-#: g10/card-util.c:1499 g10/keyedit.c:2104
+#: g10/card-util.c:1599 g10/keyedit.c:2210
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Felaktigt kommando (försök med \"help\")\n"
 
-#: g10/cardglue.c:287
+#: g10/cardglue.c:396
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:519
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:380
+#: g10/cardglue.c:527
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:852
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:853
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:854
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:691
+#: g10/cardglue.c:855
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:705
+#: g10/cardglue.c:872
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Repetera lösenmeningen: "
 
-#: g10/cardglue.c:719
+#: g10/cardglue.c:886
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "lösenmeningen upprepades inte korrekt; försök igen."
 
 # se förra kommentaren
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
-#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan inte öppna \"%s\"\n"
 
-#: g10/decrypt.c:104 g10/encode.c:859
+#: g10/decrypt.c:105 g10/encode.c:846
 msgid "--output doesn't work for this command\n"
 msgstr "--output kan inte användas för detta kommando\n"
 
-#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3167 g10/keyserver.c:1511
-#: g10/revoke.c:226
+#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3346 g10/keyserver.c:1541
+#: g10/revoke.c:227
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "hittade inte nyckeln  `%s': %s\n"
 
-#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2300 g10/keyserver.c:1525
-#: g10/revoke.c:232 g10/revoke.c:439
+#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "fel vid läsning av nyckelblock: %s\n"
 
-#: g10/delkey.c:128 g10/delkey.c:135
+#: g10/delkey.c:129 g10/delkey.c:136
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(om du inte anger nyckeln med hjälp av fingeravtrycket)\n"
 
-#: g10/delkey.c:134
+#: g10/delkey.c:135
 #, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "kan inte göra så i batch-läge utan flaggan \"--yes\"\n"
 
-#: g10/delkey.c:146
+#: g10/delkey.c:147
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Vill du ta bort denna nyckel från nyckelringen? "
 
-#: g10/delkey.c:154
+#: g10/delkey.c:155
 #, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Detta är en hemlig nyckel! - vill du verkligen ta bort den? "
 
-#: g10/delkey.c:164
+#: g10/delkey.c:165
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "misslyckades med att radera nyckelblock: %s\n"
 
-#: g10/delkey.c:174
+#: g10/delkey.c:175
 msgid "ownertrust information cleared\n"
 msgstr "raderat information om ägartillit\n"
 
-#: g10/delkey.c:205
+#: g10/delkey.c:206
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "det finns en hemlig nyckel tillhörande denna öppna nyckel!\"%s\"!\n"
 
-#: g10/delkey.c:207
+#: g10/delkey.c:208
 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:210 g10/sign.c:1186
+#: g10/encode.c:211 g10/sign.c:1218
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fel vid skapandet av lösenmening: %s\n"
 
-#: g10/encode.c:215
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "kan inte använda symmetriska ESK-paket pga S2K-läge\n"
 
-#: g10/encode.c:228
+#: g10/encode.c:229
 #, c-format
 msgid "using cipher %s\n"
 msgstr "använderchiffer %s\n"
 
-#: g10/encode.c:238 g10/encode.c:558
+#: g10/encode.c:239 g10/encode.c:545
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' är redan komprimerad\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
+#: g10/encode.c:302 g10/encode.c:591 g10/sign.c:566
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VARNING: \"%s\" är en tom fil\n"
 
-#: g10/encode.c:472
+#: g10/encode.c:466
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "du kan endast kryptera till RSA nycklar som är högst 2048 bitar långa i --"
 "pgp2-läge\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:488
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "läser från \"%s\"\n"
 
-#: g10/encode.c:530
+#: g10/encode.c:517
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "kan inte använda IDEA-kryptering för alla nycklar du krypterar till.\n"
 
-#: g10/encode.c:540
+#: g10/encode.c:527
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -822,7 +848,7 @@ msgstr ""
 "att genomdriva symmetrisk kryptering med %s (%d) strider mot mottagarnas "
 "inställningar\n"
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:635 g10/sign.c:899
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -831,130 +857,130 @@ msgstr ""
 "att genomdriva komprimeringsalgoritm %s (%d) strider mot mottagarens "
 "inställningar\n"
 
-#: g10/encode.c:735
+#: g10/encode.c:722
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "att genomdriva symmetrisk kryptering med %s (%d) strider mot mottagarnas "
 "inställningar\n"
 
-#: g10/encode.c:805 g10/pkclist.c:721 g10/pkclist.c:757
+#: g10/encode.c:792 g10/pkclist.c:722 g10/pkclist.c:758
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "du kan inte använda %s när du är i %s läge\n"
 
-#: g10/encode.c:832
+#: g10/encode.c:819
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s krypterad för: \"%s\"\n"
 
-#: g10/encr-data.c:66 g10/mainproc.c:301
+#: g10/encr-data.c:67 g10/mainproc.c:302
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s krypterad data\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:305
+#: g10/encr-data.c:69 g10/mainproc.c:306
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "krypterad med en okänd algoritm %d\n"
 
 # I vissa algoritmer kan svaga nycklar förekomma. Dessa ska inte användas.
-#: g10/encr-data.c:92
+#: g10/encr-data.c:93
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "VARNING: meddelandet krypterades med en svag nyckel\n"
 "i den symmetriska krypteringen.\n"
 
-#: g10/encr-data.c:103
+#: g10/encr-data.c:104
 msgid "problem handling encrypted packet\n"
 msgstr "problem vid hanteringen av krypterat paket\n"
 
-#: g10/exec.c:48
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "ingen körning av fjärrprogram stöds\n"
 
-#: g10/exec.c:184 g10/openfile.c:406
+#: g10/exec.c:173 g10/openfile.c:410
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: kan inte skapa katalog: %s\n"
 
 # Behörighet att komma åt inställningarna, tror jag. Inte behörigheter i inställningsfilen.
-#: g10/exec.c:325
+#: g10/exec.c:314
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "anrop av externa program är avstängt pga osäkra behörigheter för\n"
 "inställningsfilen\n"
 
-#: g10/exec.c:355
+#: g10/exec.c:344
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr "denna plattform kräver temp-filer vid anrop av externa program\n"
 
-#: g10/exec.c:433
+#: g10/exec.c:422
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "Kunde inte köra %s \"%s\": %s\n"
 
-#: g10/exec.c:436
+#: g10/exec.c:425
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "Kunde inte köra %s \"%s\": %s\n"
 
-#: g10/exec.c:521
+#: g10/exec.c:510
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "systemfel när externa program anropades: %s\n"
 
-#: g10/exec.c:532 g10/exec.c:598
+#: g10/exec.c:521 g10/exec.c:587
 msgid "unnatural exit of external program\n"
 msgstr "externa program avslutades felaktigt\n"
 
-#: g10/exec.c:547
+#: g10/exec.c:536
 msgid "unable to execute external program\n"
 msgstr "Kunde inte köra det externa programmet\n"
 
-#: g10/exec.c:563
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "kan inte läsa svaret från det externa programmet: %s\n"
 
-#: g10/exec.c:609 g10/exec.c:616
+#: g10/exec.c:598 g10/exec.c:605
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "VARNING: kan inte ta bort tempfil (%s) `%s': %s\n"
 
-#: g10/exec.c:621
+#: g10/exec.c:610
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "VARNING: kunde inte ta bort temp-katalogen `%s': %s\n"
 
-#: g10/export.c:183
+#: g10/export.c:184
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/export.c:212
+#: g10/export.c:213
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "nyckeln %08lX är inte skyddad - hoppade över den\n"
 
-#: g10/export.c:220
+#: g10/export.c:221
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "nyckeln %08lX: nyckel av PGP 2.x-typ - hoppade över den\n"
 
-#: g10/export.c:395
+#: g10/export.c:398
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "VARNING: hemliga nyckeln %08lX har ingen enkel SK-kontrollsumma\n"
 
-#: g10/export.c:427
+#: g10/export.c:430
 msgid "WARNING: nothing exported\n"
 msgstr "VARNING: exporterade ingenting\n"
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid ""
 "@Commands:\n"
 " "
@@ -962,130 +988,130 @@ msgstr ""
 "@Kommandon:\n"
 " "
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "|[file]|make a signature"
 msgstr "|[fil]|skapa en signatur"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "|[file]|make a clear text signature"
 msgstr "|[fil]|skapa en klartext-signatur"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "make a detached signature"
 msgstr "skapa signatur i en separat fil"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encrypt data"
 msgstr "kryptera data"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 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/g10.c:369
+#: g10/g10.c:371
 msgid "decrypt data (default)"
 msgstr "dekryptera data (standard)"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "verify a signature"
 msgstr "verifiera en signatur"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys"
 msgstr "visa en lista på nycklar"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and signatures"
 msgstr "visa en lista på nycklar och signaturer"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verifiera nyckelsignaturer"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "list keys and fingerprints"
 msgstr "visa en lista på nycklar och fingeravtryck"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "list secret keys"
 msgstr "visa en lista på hemliga nycklar"
 
-#: g10/g10.c:379
+#: g10/g10.c:381
 msgid "generate a new key pair"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the public keyring"
 msgstr "ta bort nycklar från den öppna nyckelringen"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "remove keys from the secret keyring"
 msgstr "ta bort nycklar från den hemliga nyckelringen"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign a key"
 msgstr "signera en nyckel"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "sign a key locally"
 msgstr "signera en nyckel lokalt"
 
-#: g10/g10.c:385
+#: g10/g10.c:387
 msgid "sign or edit a key"
 msgstr "signera eller redigera en nyckel"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "generate a revocation certificate"
 msgstr "generera ett spärrcertifikat"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "export keys"
 msgstr "exportera nycklar"
 
-#: g10/g10.c:389
+#: g10/g10.c:391
 msgid "export keys to a key server"
 msgstr "exportera nycklar till en nyckelserver"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "import keys from a key server"
 msgstr "importera nycklar från en nyckelserver"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "search for keys on a key server"
 msgstr "sök efter nycklar hos en nyckelserver"
 
-#: g10/g10.c:394
+#: g10/g10.c:396
 msgid "update all keys from a keyserver"
 msgstr "uppdatera alla nycklar nycklar från en nyckelserver"
 
-#: g10/g10.c:397
+#: g10/g10.c:399
 msgid "import/merge keys"
 msgstr "importera/slå ihop nycklar"
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "print the card status"
 msgstr ""
 
-#: g10/g10.c:401
+#: g10/g10.c:403
 msgid "change data on a card"
 msgstr ""
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/g10.c:410
+#: g10/g10.c:412
 msgid "update the trust database"
 msgstr "uppdatera tillitsdatabasen"
 
-#: g10/g10.c:417
+#: g10/g10.c:419
 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/g10.c:421 g10/gpgv.c:66
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1095,53 +1121,53 @@ msgstr ""
 "Flaggor:\n"
 " "
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "create ascii armored output"
 msgstr "skapa utdata med ett ascii-skal"
 
-#: g10/g10.c:425
+#: g10/g10.c:427
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMN|kryptera för NAMN"
 
-#: g10/g10.c:436
+#: g10/g10.c:438
 msgid "use this user-id to sign or decrypt"
 msgstr "använd denna användaridentitet för att signera eller dekryptera"
 
-#: g10/g10.c:437
+#: g10/g10.c:439
 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/g10.c:442
+#: g10/g10.c:444
 msgid "use canonical text mode"
 msgstr "använd \"ursprunglig text\"-läget"
 
-#: g10/g10.c:452
+#: g10/g10.c:458
 msgid "use as output file"
 msgstr "använd som fil för utdata"
 
-#: g10/g10.c:454 g10/gpgv.c:68
+#: g10/g10.c:460 g10/gpgv.c:73
 msgid "verbose"
 msgstr "utförlig"
 
-#: g10/g10.c:465
+#: g10/g10.c:471
 msgid "do not make any changes"
 msgstr "gör inga ändringar"
 
-#: g10/g10.c:466
+#: g10/g10.c:472
 msgid "prompt before overwriting"
 msgstr "Fråga före ersättning"
 
-#: g10/g10.c:507
+#: g10/g10.c:513
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:508
+#: g10/g10.c:514
 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/g10.c:536
+#: g10/g10.c:542
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1149,7 +1175,7 @@ msgstr ""
 "@\n"
 "(Se manualsidan för en komplett lista på alla kommandon och flaggor)\n"
 
-#: g10/g10.c:539
+#: g10/g10.c:545
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1169,18 +1195,18 @@ msgstr ""
 "--list-keys [namn]          visa nycklar\n"
 "--fingerprint [namn]        visa fingeravtryck\n"
 
-#: g10/g10.c:720 g10/gpgv.c:93
+#: g10/g10.c:724 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Rapportera gärna fel till <[email protected]>.\n"
 "Rapportera gärna fel eller synpunkter på översättningen till <[email protected]>.\n"
 
-#: g10/g10.c:737
+#: g10/g10.c:741
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
 
 # Om inget kommando anges (decrypt/encrypt etc) väljs åtgärd efter indata.
-#: g10/g10.c:740
+#: g10/g10.c:744
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1190,7 +1216,7 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera\n"
 "vilken operation som utförs beror på programmets indata\n"
 
-#: g10/g10.c:751
+#: g10/g10.c:755
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1198,473 +1224,483 @@ msgstr ""
 "\n"
 "Stödda algoritmer:\n"
 
-#: g10/g10.c:754
+#: g10/g10.c:758
 msgid "Pubkey: "
 msgstr "öppen nyckel: "
 
-#: g10/g10.c:760 g10/keyedit.c:2141
+#: g10/g10.c:764 g10/keyedit.c:2248
 msgid "Cipher: "
 msgstr "Chiffer: "
 
-#: g10/g10.c:766
+#: g10/g10.c:770
 msgid "Hash: "
 msgstr "Kontrollsumma: "
 
-#: g10/g10.c:772 g10/keyedit.c:2187
+#: g10/g10.c:776 g10/keyedit.c:2294
 msgid "Compression: "
 msgstr "Komprimering: "
 
-#: g10/g10.c:855
+#: g10/g10.c:859
 msgid "usage: gpg [options] "
 msgstr "användning: gpg [flaggor] "
 
-#: g10/g10.c:1003
+#: g10/g10.c:1007
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\n"
 
 # Vad betyder detta?
-#: g10/g10.c:1021
+#: g10/g10.c:1025
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = signatur hittad i gruppdefinitionen \"%s\"\n"
 
-#: g10/g10.c:1218
+#: g10/g10.c:1222
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VARNING: %s osäker ägare till %s\n"
 
-#: g10/g10.c:1221
+#: g10/g10.c:1225
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "VARNING: %s osäker ägare till %s\n"
 
-#: g10/g10.c:1224
+#: g10/g10.c:1228
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VARNING: %s osäker ägare till %s\n"
 
-#: g10/g10.c:1230
+#: g10/g10.c:1234
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "WARNING: osäkra befogenheter för %s \"%s\"\n"
 
-#: g10/g10.c:1233
+#: g10/g10.c:1237
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "WARNING: osäkra befogenheter för %s \"%s\"\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1240
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "WARNING: osäkra befogenheter för %s \"%s\"\n"
 
-#: g10/g10.c:1242
+#: g10/g10.c:1246
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "VARNING:  osäkert att infoga katalogägarskap till %s \"%s\"\n"
 
-#: g10/g10.c:1245
+#: g10/g10.c:1249
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "VARNING:  osäkert att infoga katalogägarskap till %s \"%s\"\n"
 
-#: g10/g10.c:1248
+#: g10/g10.c:1252
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "VARNING:  osäkert att infoga katalogägarskap till %s \"%s\"\n"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1258
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "VARNING:  osäkert att infoga katalogägarskap till %s \"%s\"\n"
 
-#: g10/g10.c:1257
+#: g10/g10.c:1261
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "VARNING:  osäkert att infoga katalogägarskap till %s \"%s\"\n"
 
-#: g10/g10.c:1260
+#: g10/g10.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "VARNING:  osäkert att infoga katalogägarskap till %s \"%s\"\n"
 
-#: g10/g10.c:1401
+#: g10/g10.c:1405
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "okänt configurationspost \"%s\"\n"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1802
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "OBS: den gamla inställningsfilen \"%s\" används inte\n"
 
-#: g10/g10.c:1838
+#: g10/g10.c:1844
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "OBS: inställningsfilen \"%s\" saknas\n"
 
-#: g10/g10.c:1842
+#: g10/g10.c:1848
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "inställningsfil \"%s\": %s\n"
 
-#: g10/g10.c:1849
+#: g10/g10.c:1855
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "läser inställningar från \"%s\"\n"
 
-#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "OBS: %s är inte för normal användning!\n"
 
-#: g10/g10.c:2076
+#: g10/g10.c:2082
 #, 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/g10.c:2293
+#: g10/g10.c:2236 g10/g10.c:2248
+#, fuzzy, c-format
+msgid "`%s' is not a valid signature expiration\n"
+msgstr "%s är ingen giltig teckentabell\n"
+
+#: g10/g10.c:2321
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s är ingen giltig teckentabell\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3683
+#: g10/g10.c:2340 g10/keyedit.c:3862
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "kunde inte tolka nyckelserver-URI\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2346
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s: felaktiga exportinställningar %d\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2349
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "felaktiga exportinställningar\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2356
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s: felaktiga importinställningar %d\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2359
 msgid "invalid import options\n"
 msgstr "felaktiga importinställningar\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2366
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s: felaktiga exportinställningar %d\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2369
 msgid "invalid export options\n"
 msgstr "felaktiga exportinställningar\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2376
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s: felaktiga importinställningar %d\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2379
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "felaktiga importinställningar\n"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2401
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s: felaktiga exportinställningar %d\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2404
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "felaktiga exportinställningar\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2411
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunde inte sätta exec-sökvägen till %s\n"
 
 # Programmet skapar en avbildning (image) av minnet för att lättare kunna spåra fel.
-#: g10/g10.c:2573
+#: g10/g10.c:2602
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesutskrift!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2606
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VARNING: %s gäller istället för %s\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2615
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s är inte tillåten tillsammans med %s!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2618
 #, 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/g10.c:2603
+#: g10/g10.c:2625
+#, 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/g10.c:2640
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/g10.c:2617
+#: g10/g10.c:2654
 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/g10.c:2623
+#: g10/g10.c:2660
 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/g10.c:2629
+#: g10/g10.c:2666
 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/g10.c:2642
+#: g10/g10.c:2679
 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/g10.c:2712 g10/g10.c:2736
+#: g10/g10.c:2746 g10/g10.c:2770
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda krypteringsalgoritmen är felaktig\n"
 
-#: g10/g10.c:2718 g10/g10.c:2742
+#: g10/g10.c:2752 g10/g10.c:2776
 msgid "selected digest algorithm is invalid\n"
 msgstr "den valda kontrollsummealgoritmen är felaktig\n"
 
-#: g10/g10.c:2724
+#: g10/g10.c:2758
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "den valda krypteringsalgoritmen är felaktig\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2764
 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/g10.c:2745
+#: g10/g10.c:2779
 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/g10.c:2747
+#: g10/g10.c:2781
 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/g10.c:2749
+#: g10/g10.c:2783
 #, 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/g10.c:2751
+#: g10/g10.c:2785
 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/g10.c:2753
+#: g10/g10.c:2787
 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/g10.c:2756
+#: g10/g10.c:2790
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "OBS: enkelt S2K-läge (0) rekommenderas inte\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2794
 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/g10.c:2767
+#: g10/g10.c:2801
 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/g10.c:2776
+#: g10/g10.c:2810
 msgid "invalid personal cipher preferences\n"
 msgstr "felaktig inställning av vilka krypteringsalgoritmer du föredrar\n"
 
-#: g10/g10.c:2780
+#: g10/g10.c:2814
 msgid "invalid personal digest preferences\n"
 msgstr "felaktig inställning av vilka checksummealgoritmer du föredrar\n"
 
-#: g10/g10.c:2784
+#: g10/g10.c:2818
 msgid "invalid personal compress preferences\n"
 msgstr "felaktig inställning av vilka kompressionsalgoritmer du föredrar\n"
 
-#: g10/g10.c:2817
+#: g10/g10.c:2851
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s fungerar ännu inte med  %s\n"
 
-#: g10/g10.c:2864
+#: g10/g10.c:2898
 #, 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/g10.c:2869
+#: g10/g10.c:2903
 #, 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/g10.c:2874
+#: g10/g10.c:2908
 #, 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/g10.c:2970
+#: g10/g10.c:3004
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/g10.c:2981
+#: g10/g10.c:3015
 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/g10.c:2992
+#: g10/g10.c:3026
 msgid "--store [filename]"
 msgstr "--store [filnamn]"
 
-#: g10/g10.c:2999
+#: g10/g10.c:3033
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3035
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "dekrypteringen misslyckades: %s\n"
 
-#: g10/g10.c:3011
+#: g10/g10.c:3045
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnamn]"
 
-#: g10/g10.c:3024
+#: g10/g10.c:3058
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3060
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3029
+#: g10/g10.c:3063
 #, 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/g10.c:3047
+#: g10/g10.c:3081
 msgid "--sign [filename]"
 msgstr "--sign [filnamn]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3094
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/g10.c:3075
+#: g10/g10.c:3109
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/g10.c:3077
+#: g10/g10.c:3111
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3080
+#: g10/g10.c:3114
 #, 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/g10.c:3100
+#: g10/g10.c:3134
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnamn]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3143
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnamn]"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3168
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnamn]"
 
-#: g10/g10.c:3142
+#: g10/g10.c:3176
 msgid "--sign-key user-id"
 msgstr "--sign-key användaridentitet"
 
-#: g10/g10.c:3146
+#: g10/g10.c:3180
 msgid "--lsign-key user-id"
 msgstr "--lsign-key användaridentitet"
 
-#: g10/g10.c:3167
+#: g10/g10.c:3201
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key användaridentitet [kommandon]"
 
-#: g10/g10.c:3238
+#: g10/g10.c:3272
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [användaridentitet] [nyckelring]"
 
-#: g10/g10.c:3275
+#: g10/g10.c:3309
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Sändning till nyckelservern misslyckades: %s\n"
 
-#: g10/g10.c:3277
+#: g10/g10.c:3311
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Hämtning från nyckelservern misslyckades: %s\n"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3313
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Export av nyckeln misslyckades: %s\n"
 
-#: g10/g10.c:3290
+#: g10/g10.c:3324
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Sökning på nyckelservern misslyckades: %s\n"
 
-#: g10/g10.c:3300
+#: g10/g10.c:3334
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Uppdatering av  nyckeln från en nyckelserver misslyckades: %s\n"
 
-#: g10/g10.c:3341
+#: g10/g10.c:3375
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
 
-#: g10/g10.c:3349
+#: g10/g10.c:3383
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa ASCII-skal: %s\n"
 
-#: g10/g10.c:3436
+#: g10/g10.c:3470
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "felaktig kontrollsummealgoritm `%s'\n"
 
-#: g10/g10.c:3559
+#: g10/g10.c:3593
 msgid "[filename]"
 msgstr "[filnamn]"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3597
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande här ...\n"
 
-#: g10/g10.c:3853
+#: g10/g10.c:3887
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1675,82 +1711,90 @@ msgstr ""
 # user notation name??
 # Werner:
 # That is an OpenPGP notation name not registered with IANA.
-#: g10/g10.c:3861
+#: g10/g10.c:3895
 msgid "a user notation name must contain the '@' character\n"
 msgstr "ett användarnoteringsnamn måste innehålla '@'-tecknet\n"
 
-#: g10/g10.c:3871
+# user notation name??
+# Werner:
+# That is an OpenPGP notation name not registered with IANA.
+#: g10/g10.c:3900
+#, fuzzy
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr "ett användarnoteringsnamn måste innehålla '@'-tecknet\n"
+
+#: g10/g10.c:3911
 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/g10.c:3905
+#: g10/g10.c:3945
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angivna URL som beskriver certifikationspolicy är felaktig\n"
 
-#: g10/g10.c:3907
+#: g10/g10.c:3947
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n"
 
-#: g10/g10.c:3940
+#: g10/g10.c:3980
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "för många poster i pk-cachen - avstängd\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2750
+#: g10/getkey.c:187 g10/getkey.c:2757
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Hittade inte användaridentiteten]"
 
-#: g10/getkey.c:1677
+#: g10/getkey.c:1684
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Ogiltig nyckel %08lX  tvingat giltig med --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2228
+#: g10/getkey.c:2235
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "det finns ingen hemlig undernyckel tillhörande den öppna undernyckeln %08lX "
 "- hoppar över\n"
 
-#: g10/getkey.c:2459
+#: g10/getkey.c:2466
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "använder undernyckeln %08lX istället för huvudnyckeln %08lX\n"
 
-#: g10/getkey.c:2506
+#: g10/getkey.c:2513
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "nyckel %08lX: hemlig nyckel utan öppen nyckel - hoppade över den\n"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:74
 msgid "be somewhat more quiet"
 msgstr "var något tystare"
 
-#: g10/gpgv.c:70
+#: g10/gpgv.c:75
 msgid "take the keys from this keyring"
 msgstr "ta nycklarna från denna nyckelring "
 
 # Med detta kommando ger gnupg enbart en varning när ett meddelande är tidsstämplat i framtiden. Annars avslutas gnupg med ett felmeddelande.
 # Kommandot är avsett att användas i "near online system".
 # Krav från RIPE.
-#: g10/gpgv.c:72
+#: g10/gpgv.c:77
 msgid "make timestamp conflicts only a warning"
 msgstr "utfärda enbart en varning när tidsstämpeln är orimlig"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:78
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinformation till denna FD"
 
-#: g10/gpgv.c:97
+#: g10/gpgv.c:102
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Användning: gpgv [flaggor] [filer] (-h för hjälp)"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:105
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1758,7 +1802,7 @@ msgstr ""
 "Syntax: gpg [flaggor] [filer]\n"
 "Kolla signaturerna mot betrodda nycklar\n"
 
-#: g10/helptext.c:48
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1769,7 +1813,7 @@ msgstr ""
 "\"nätet av tillit\". Det har inget att göra med det (implicit skapade)\n"
 "nätet av certifikat."
 
-#: g10/helptext.c:54
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1781,16 +1825,16 @@ msgstr ""
 "- det är vanligen de nycklar som du disponerar den hemliga nyckeln för.\n"
 "Svara  \"ja\" för att markera att du litar förbehållslöst på denna nyckel.\n"
 
-#: g10/helptext.c:61
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "Om du vill använda denna otillförlitliga nyckel ändå, svara \"ja\"."
 
-#: g10/helptext.c:65
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Ange användaridentiteten till vilken du vill skicka meddelandet."
 
-#: g10/helptext.c:69
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1804,7 +1848,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:83
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -1814,16 +1858,16 @@ msgstr ""
 "och kryptering. Denna algoritm ska endast användas inom särskilda\n"
 "områden. Rådgör med din egen säkerhetsexpert first!"
 
-#: g10/helptext.c:90
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "Ange storleken på nyckeln"
 
-#: g10/helptext.c:94 g10/helptext.c:99 g10/helptext.c:111 g10/helptext.c:143
-#: g10/helptext.c:171 g10/helptext.c:176 g10/helptext.c:181
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "Svara \"ja\" eller \"nej\""
 
-#: g10/helptext.c:104
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1835,19 +1879,19 @@ msgstr ""
 "inte att få något vettigt felmeddelande - istället kommer systemet\n"
 "att försöka tolka det angivna värdet som ett intervall."
 
-#: g10/helptext.c:116
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "Ange namnet på nyckelns ägare"
 
-#: g10/helptext.c:121
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr "ange en e-postadress. Detta är frivilligt, men rekommenderas varmt"
 
-#: g10/helptext.c:125
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "Ange en kommentar (frivilligt)"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1861,11 +1905,11 @@ msgstr ""
 "O  för att fortsätta med nyckelgenerering.\n"
 "Q  för att avsluta nyckelgenereringen."
 
-#: g10/helptext.c:139
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Svara \"ja\" (eller bara \"j\") om du vill generera denna undernyckel."
 
-#: g10/helptext.c:147
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -1947,12 +1991,12 @@ msgstr ""
 "Om du inte vet vad du ska svara, så svara \"0\"."
 
 # felstavat original meddelat till Werner.
-#: g10/helptext.c:185
+#: g10/helptext.c:186
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Svara \"ja\" om du vill signera ALLA användaridentiteter"
 
-#: g10/helptext.c:189
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -1960,11 +2004,11 @@ msgstr ""
 "Svara \"ja\" om du verkligen vill ta bort denna användaridentitet.\n"
 "Alla certifikat kommer att gå förlorade!"
 
-#: g10/helptext.c:194
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Svara \"ja\" om du vill ta bort denna undernyckel"
 
-#: g10/helptext.c:199
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -1975,7 +2019,7 @@ msgstr ""
 "en tillitskoppling till nyckeln eller en annan nyckel som är\n"
 "certifierad av denna nyckel."
 
-#: g10/helptext.c:204
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -1987,7 +2031,7 @@ msgstr ""
 "vet vilken nyckel som användes eftersom den nyckeln kanske upprättar\n"
 "en tillitskoppling genom en annan redan certifierad nyckel."
 
-#: g10/helptext.c:210
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -1996,7 +2040,7 @@ msgstr ""
 "din nyckelring."
 
 # borde inge GnuPG bytas ut mot gpg eller ännu bättre %s?
-#: g10/helptext.c:214
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2010,7 +2054,7 @@ msgstr ""
 "mer. Så gör bara detta om denna egensignatur av någon anledning är\n"
 "ogiltig och det finns en andra signatur som tillgänglig."
 
-#: g10/helptext.c:222
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2022,24 +2066,24 @@ msgstr ""
 "påverkade\n"
 "egensignaturer kommer att flyttas fram en sekund.\n"
 
-#: g10/helptext.c:229
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Ange en lösenmening. Detta är en hemlig mening\n"
 
-#: g10/helptext.c:235
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Reptera lösenmeningen, så du är säker på vad du skrev in."
 
 # # felstavat/ologiskt original
-#: g10/helptext.c:239
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "Ange namnet på den fil signaturen gäller"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Svara \"ja\" om det du vill skriva över filen"
 
-#: g10/helptext.c:249
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2047,7 +2091,7 @@ msgstr ""
 "Ange ett nytt filnamn. Om du bara trycker RETUR kommer standarfilnamnet\n"
 "(som anges i hakparenteser) att användas."
 
-#: g10/helptext.c:255
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2077,7 +2121,7 @@ msgstr ""
 "     skall användas. Detta används normalt för att visa att en e-postadress\n"
 "     är ogiltig.\n"
 
-#: g10/helptext.c:271
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2088,368 +2132,368 @@ msgstr ""
 "och koncis.\n"
 "En tom rad avslutar texten.\n"
 
-#: g10/helptext.c:286
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "Det finns ingen hjälp tillgänglig"
 
-#: g10/helptext.c:294
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Det finns ingen hjälp tillgänglig för \"%s\""
 
-#: g10/import.c:247
+#: g10/import.c:248
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "hoppar över block av typen %d\n"
 
-#: g10/import.c:256
+#: g10/import.c:257
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "har behandlat %lu nycklar hittills\n"
 
-#: g10/import.c:273
+#: g10/import.c:274
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "  Totalt antal behandlade enheter: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "          överhoppade nya nycklar: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:279
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         utan användaridentiteter: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "              imported: %lu"
 msgstr "                      importerade: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:287
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                      oförändrade: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          nya användaridentiteter: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "                 nya undernycklar: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                   nya signaturer: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  nya spärrar av nycklar: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      antal lästa hemliga nycklar: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "antal importerade hemliga nycklar: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "antal oförändrade hemliga nycklar: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "                   inte importerade: %lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:544
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:545
+#: g10/import.c:546
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Du har signerat följande användaridentiteter:\n"
 
-#: g10/import.c:582
+#: g10/import.c:583
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:594
+#: g10/import.c:595
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s signatur, sammandragsalgoritm %s\n"
 
-#: g10/import.c:606
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:620
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:646
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:694 g10/import.c:1048
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "nyckel %08lX: ingen användaridentitet\n"
 
 # Undernyckeln är skadad på HKP-servern. Vanligt fel vid många undernycklar.
-#: g10/import.c:713
+#: g10/import.c:714
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "nyckeln %08lX: HKP-skadad undernyckel har reparerats!\n"
 
 # vad innebär fnutten i slutet?
-#: g10/import.c:728
+#: g10/import.c:729
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr ""
 "nyckel %08lX: accepterade användaridentitet ID '%s' som saknar egensignatur\n"
 
-#: g10/import.c:734
+#: g10/import.c:735
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "nyckel %08lX: inga giltiga användaridentiteter\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 msgid "this may be caused by a missing self-signature\n"
 msgstr "detta kan bero på att det saknas en egensignatur\n"
 
-#: g10/import.c:746 g10/import.c:1168
+#: g10/import.c:747 g10/import.c:1169
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "nyckel %08lX: hittade ingen öppen nyckel: %s\n"
 
-#: g10/import.c:752
+#: g10/import.c:753
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "nyckel %08lX: ny nyckel - hoppade över den\n"
 
-#: g10/import.c:761
+#: g10/import.c:762
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "hittade ingen nyckelring som gick att skriva till: %s\n"
 
-#: g10/import.c:766 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver till \"%s\"\n"
 
-#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
-#: g10/import.c:2314 g10/import.c:2336
+#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
+#: g10/import.c:2315 g10/import.c:2337
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
 
 # fixme: I appended the %s -wk
-#: g10/import.c:791
+#: g10/import.c:792
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "nyckel %08lX: importerade öppen nyckel \"%s\"\n"
 
-#: g10/import.c:815
+#: g10/import.c:816
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "nyckel %08lX: matchar inte vår lokala kopia\n"
 
-#: g10/import.c:832 g10/import.c:1186
+#: g10/import.c:833 g10/import.c:1187
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "nyckel %08lX: kan inte hitta det ursprungliga nyckelblocket: %s\n"
 
-#: g10/import.c:840 g10/import.c:1193
+#: g10/import.c:841 g10/import.c:1194
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "nyckel %08lX: kan inte läsa det ursprungliga nyckelblocket %s\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "nyckel %08lX: \"%s\" 1 ny användaridentitet\n"
 
-#: g10/import.c:875
+#: g10/import.c:876
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "nyckel %08lX: \"%s\" %d nya användar-IDn\n"
 
-#: g10/import.c:878
+#: g10/import.c:879
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "nyckel %08lX: \"%s\" 1 ny signatur\n"
 
-#: g10/import.c:881
+#: g10/import.c:882
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "nyckel %08lX: \"%s\" %d nya signaturer\n"
 
-#: g10/import.c:884
+#: g10/import.c:885
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "nyckel %08lX: \"%s\" 1 ny undernyckel\n"
 
-#: g10/import.c:887
+#: g10/import.c:888
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "nyckel %08lX: \"%s\" %d nya undernycklar\n"
 
-#: g10/import.c:908
+#: g10/import.c:909
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "nyckel %08lX: \"%s\" inte ändrad\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1054
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "nyckel %08lX: hemlig nyckel med ogiltig krypteringsalgoritm %d - hoppade "
 "över den\n"
 
-#: g10/import.c:1064
+#: g10/import.c:1065
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/import.c:1081 g10/import.c:2329
+#: g10/import.c:1082 g10/import.c:2330
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "ingen hemlig nyckelring angiven som standard: %s\n"
 
-#: g10/import.c:1092
+#: g10/import.c:1093
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "nyckel %08lX: den hemliga nyckeln är importerad\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1122
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "nyckel %08lX: finns redan i den hemliga nyckelringen\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1132
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "nyckel %08lX: hittade inte den hemliga nyckeln: %s\n"
 
-#: g10/import.c:1161
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "nyckel %08lX: öppen nyckel saknas - kan inte spärra nyckeln med "
 "spärrcertifikatet\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1205
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "nyckel %08lX: ogiltigt spärrcertifikat: %s - avvisat\n"
 
-#: g10/import.c:1236
+#: g10/import.c:1237
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "nyckel %08lX: \"%s\" spärrcertifikat importerat\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1302
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "nyckel %08lX: ingen användaridentitet för signaturen\n"
 
 # fixme: I appended the %s -wk
-#: g10/import.c:1316
+#: g10/import.c:1317
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "nyckel %08lX: algoritmen för öppna nycklar stöds inte för användar-ID  \"%s"
 "\"\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "nyckel %08lX: ogiltig egensignatur på användar-id \"%s\"\n"
 
-#: g10/import.c:1336
+#: g10/import.c:1337
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "nyckel %08lX: ingen undernyckel för nyckelbindning\n"
 
-#: g10/import.c:1347 g10/import.c:1397
+#: g10/import.c:1348 g10/import.c:1398
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "nyckel %08lX: algoritmen för öppna nycklar stöds inte\n"
 
-#: g10/import.c:1349
+#: g10/import.c:1350
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "nyckel %08lX: ogiltig undernyckelbindning\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1365
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "nyckel %08lX: tog bort multipla bindningar av undernyckel\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "nyckel %08lX: ingen undernyckel för spärr av nyckeln\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "nyckel %08lX: ogiltig spärr av undernyckel\n"
 
-#: g10/import.c:1414
+#: g10/import.c:1415
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "nyckel %08lX: tog bort multipla spärrar av undernyckel\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1457
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "nyckel %08lX: hoppade över användaridentitet '"
 
-#: g10/import.c:1477
+#: g10/import.c:1478
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "nyckel %08lX: hoppade över undernyckel\n"
 
-#: g10/import.c:1504
+#: g10/import.c:1505
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr ""
 "nyckel %08lX: icke exporterbar signatur (klass %02x) - hoppade över den\n"
 
-#: g10/import.c:1514
+#: g10/import.c:1515
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "nyckel %08lX: spärrcertifikat på fel plats - hoppade över certifikatet\n"
 
 # nyckeln eller certifikatet??
-#: g10/import.c:1531
+#: g10/import.c:1532
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "nyckel %08lX: ogiltigt spärrcertifikat: %s - hoppade över det\n"
 
-#: g10/import.c:1545
+#: g10/import.c:1546
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
@@ -2457,120 +2501,125 @@ msgstr ""
 "signaturen\n"
 
 # nyckeln eller klassen?
-#: g10/import.c:1553
+#: g10/import.c:1554
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 "nyckel %08lX: oväntad signaturklass  (0x%02X) - hoppade över signaturen\n"
 
 # nyckeln eller klassen?
-#: g10/import.c:1574
+#: g10/import.c:1575
 #, fuzzy, c-format
 msgid "key %s: expired signature from key %s - skipped\n"
 msgstr ""
 "nyckel %08lX: oväntad signaturklass  (0x%02X) - hoppade över signaturen\n"
 
-#: g10/import.c:1677
+#: g10/import.c:1678
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 "nyckel %08lX: användaridentitet hittades flera gånger - slog ihop till en\n"
 
-#: g10/import.c:1739
+#: g10/import.c:1740
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "VARNING: nyckeln %08lX kan ha spärrats: Hämtar spärrnyckel %08lX\n"
 
-#: g10/import.c:1753
+#: g10/import.c:1754
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "VARNING: nyckeln %08lX kan ha spärrats: Spärrnyckeln %08lX saknas.\n"
 
-#: g10/import.c:1812
+#: g10/import.c:1813
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "nyckel %08lX: \"%s\" spärrcertifikat importerat\n"
 
-#: g10/import.c:1846
+#: g10/import.c:1847
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "nyckel %08lX: lagt till direkt nyckelsignatur\n"
 
-#: g10/import.c:2235
+#: g10/import.c:2236
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "den öppna nyckel passar inte ihop med den hemliga nyckeln!\n"
 
-#: g10/import.c:2243
+#: g10/import.c:2244
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "hoppade över: hemlig nyckel finns redan\n"
 
-#: g10/import.c:2245
+#: g10/import.c:2246
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "hoppade över: hemlig nyckel finns redan\n"
 
-#: g10/keydb.c:167
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "fel vid skapande av nyckelringen \"%s\": %s\n"
 
-#: g10/keydb.c:174
+#: g10/keydb.c:175
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "%s: nyckelring skapad\n"
 
-#: g10/keydb.c:685
+#: g10/keydb.c:316 g10/keydb.c:319
+#, fuzzy, c-format
+msgid "keyblock resource `%s': %s\n"
+msgstr "Fel vid skapande av `%s': %s\n"
+
+#: g10/keydb.c:698
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "misslyckades med att återskapa nyckelringscache: %s\n"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[spärrad]"
 
-#: g10/keyedit.c:255
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[egensignatur]"
 
-#: g10/keyedit.c:333 g10/keylist.c:405
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 felaktig signatur\n"
 
-#: g10/keyedit.c:335 g10/keylist.c:407
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d felaktiga signaturer\n"
 
-#: g10/keyedit.c:337 g10/keylist.c:409
+#: g10/keyedit.c:344 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signatur verifierades inte eftersom nyckeln saknades\n"
 
-#: g10/keyedit.c:339 g10/keylist.c:411
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signaturer verifierades inte eftersom nycklar saknades\n"
 
-#: g10/keyedit.c:341 g10/keylist.c:413
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signatur verifierades inte eftersom ett fel uppstod\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:415
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signaturer verifierades inte eftersom fel uppstod\n"
 
-#: g10/keyedit.c:345
+#: g10/keyedit.c:352
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 användaridentitet utan giltig egensignatur hittades\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:354
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d användaridentiteter utan giltig egensignatur hittades\n"
 
-#: g10/keyedit.c:403 g10/pkclist.c:262
+#: g10/keyedit.c:410 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2584,53 +2633,63 @@ msgstr ""
 "källor...)?\n"
 "\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:274
+#: g10/keyedit.c:414 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:408 g10/pkclist.c:276
+#: g10/keyedit.c:415 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:427
+#: g10/keyedit.c:434
 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:443
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Användar-ID \"%s\" är spärrat."
 
-#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
-#: g10/keyedit.c:858 g10/keyedit.c:1642
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1728
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Vill du verkligen fortfarande signera den? (j/N)"
 
-#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
-#: g10/keyedit.c:1648
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
+#: g10/keyedit.c:1734
 msgid "  Unable to sign.\n"
 msgstr "  Kan inte signera.\n"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Giltighetstiden för nvändar-ID \"%s\" har gått ut.."
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:650
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Användar-ID \"%s\" saknar egensignatur."
 
-#: g10/keyedit.c:676
+#: g10/keyedit.c:678
+#, fuzzy, c-format
+msgid "User ID \"%s\" is signable.  "
+msgstr "Användar-ID \"%s\" saknar egensignatur."
+
+#: g10/keyedit.c:680
+#, fuzzy
+msgid "Sign it? (y/N) "
+msgstr "Vill du verkligen signera? "
+
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2639,11 +2698,11 @@ msgstr ""
 "Egensignaturen på \"%s\"\n"
 "är en signatur av PGP 2.x-typ.\n"
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:711
 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:699
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2652,13 +2711,13 @@ msgstr ""
 "Giltighetstiden för din nuvarande signatur på \"%s\"\n"
 "har gått ut.\n"
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:729
 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:724
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2667,44 +2726,44 @@ msgstr ""
 "Din nuvarande signatur på \"%s\"\n"
 "är en lokal signatur.\n"
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:754
 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:749
+#: g10/keyedit.c:775
 #, 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:752
+#: g10/keyedit.c:778
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" var redan signerad av nyckeln %08lX\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:783
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Vill du verkligen signera den igen ändå?(j/N)"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:805
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Det finns inget att signera med nyckeln %08lX\n"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "Giltighetstiden för denna nyckel har gått ut!"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Denna nyckels giltighetstid går ut vid %s.\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:844
 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:851
+#: g10/keyedit.c:882
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2712,11 +2771,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:853
+#: g10/keyedit.c:884
 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:878
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2725,33 +2784,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:883
+#: g10/keyedit.c:914
 #, 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:885
+#: g10/keyedit.c:916
 #, 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:887
+#: g10/keyedit.c:918
 #, 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:889
+#: g10/keyedit.c:920
 #, 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:895
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Ditt val? (skriv '?' för mer information): "
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:950
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2760,14 +2819,14 @@ msgstr ""
 "Är du verkligen säker på att du vill signera denna nyckel\n"
 "med din nyckel: \""
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Detta kommer att bli en egensignatur\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:963
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
@@ -2775,7 +2834,7 @@ msgstr ""
 "VARNING: signaturen kommer att markeras som exporterbar.\n"
 "\n"
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:971
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
@@ -2783,7 +2842,7 @@ msgstr ""
 "VARNING: Signaturen kommer att markeras som möjlig att spärra.\n"
 "\n"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:981
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
@@ -2791,7 +2850,7 @@ msgstr ""
 "Signaturen kommer att markeras som icke exporterbar.\n"
 "\n"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:988
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
@@ -2799,65 +2858,65 @@ msgstr ""
 "Signaturen kommer att markeras som icke möjlig att återkalla.\n"
 "\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:995
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Jag har inte kontrollerat identiteten alls.\n"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1000
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Jag har gjort viss kontroll av identiteten.\n"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1005
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Jag har gjort en noggrann kontroll av identiteten.\n"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1015
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Vill du verkligen signera? "
 
-#: g10/keyedit.c:1029 g10/keyedit.c:4132 g10/keyedit.c:4223 g10/keyedit.c:4287
-#: g10/keyedit.c:4348 g10/sign.c:369
+#: g10/keyedit.c:1060 g10/keyedit.c:4350 g10/keyedit.c:4441 g10/keyedit.c:4505
+#: g10/keyedit.c:4566 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signeringen misslyckades: %s\n"
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1105 g10/keygen.c:3057
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "Denna nyckel är inte skyddad.\n"
 
-#: g10/keyedit.c:1109 g10/keygen.c:3045
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 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:1113 g10/keygen.c:3060
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 #, 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:1117 g10/keygen.c:3064
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "Nyckeln är skyddad.\n"
 
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan inte redigera denna nyckel: %s\n"
 
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2865,11 +2924,11 @@ msgstr ""
 "Skriv in den nya lösenmening för denna hemliga nyckel.\n"
 "\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:1825
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "lösenmeningen upprepades inte korrekt; försök igen."
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2877,196 +2936,196 @@ msgstr ""
 "Du vill inte ha någon lösenmening - detta är sannolikt en *dålig* idé!\n"
 "\n"
 
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1195
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Vill du verkligen göra detta? "
 
-#: g10/keyedit.c:1235
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "flyttar en nyckelsignatur till den rätta platsen\n"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "spara och avsluta"
 
-#: g10/keyedit.c:1322
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "visa fingeravtryck"
 
-#: g10/keyedit.c:1323
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "visa en lista på nycklar och användaridentiteter"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "välj användaridentitet N"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "välj användaridentitet N"
 
-#: g10/keyedit.c:1327
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "återkalla signaturer"
 
-#: g10/keyedit.c:1330
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1335
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "signera nyckeln lokalt"
 
-#: g10/keyedit.c:1337
+#: g10/keyedit.c:1369
 #, 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:1339
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1343
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "lägg till en användaridentitet"
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "lägg till ett foto som användaridentitet"
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "ta bort en användaridentitet"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "ta bort en undernyckel"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr "lägg till en spärrnyckel"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1400
 #, 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:1370
+#: g10/keyedit.c:1402
 #, 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:1372
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "markera användaridentiteten som huvudidentitet"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1406
 #, 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:1377
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "visa en lista på  inställningar (expertläge)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "visa en lista på inställningar (utförligt)"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1413
 #, 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:1386
+#: g10/keyedit.c:1418
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "kunde inte tolka nyckelserver-URI\n"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "ändra lösenmening"
 
 # originalet borde ha ett value
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "ändra ägartillitsvärdet"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1426
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Vill du verkligen spärra alla valda användaridentiteter? "
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "spärra en användaridentitet"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "spärra en undernyckel"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "enable key"
 msgstr "aktivera en nyckel"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "disable key"
 msgstr "stäng av en nyckel"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1436
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "visa foto-ID"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1556
 #, 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:1494
+#: g10/keyedit.c:1574
 msgid "Secret key is available.\n"
 msgstr "Den hemliga nyckeln finns tillgänglig.\n"
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1655
 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:1579
+#: g10/keyedit.c:1663
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Använd kommandot \"toggle\" först.\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1682
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3074,238 +3133,243 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1722
 msgid "Key is revoked."
 msgstr "Nyckeln är spärrad."
 
-#: g10/keyedit.c:1657
+#: g10/keyedit.c:1741
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Vill du verkligen signera alla användaridentiteter? "
 
-#: g10/keyedit.c:1660
-msgid "Hint: Select the user IDs to sign\n"
-msgstr "Tips: Välj de användarID:n du vill signera\n"
-
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1748
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "okänd signaturklass"
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1771
 #, 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:1713 g10/keyedit.c:1733 g10/keyedit.c:1899
+#: g10/keyedit.c:1793 g10/keyedit.c:1813 g10/keyedit.c:1979
 msgid "You must select at least one user ID.\n"
 msgstr "Du måste välja åtminstone en användaridentitet.\n"
 
-#: g10/keyedit.c:1715
+#: g10/keyedit.c:1795
 msgid "You can't delete the last user ID!\n"
 msgstr "Du kan inte ta bort den sista användaridentiteten!\n"
 
-#: g10/keyedit.c:1717
+#: g10/keyedit.c:1797
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Vill du verkligen ta bort alla valda användaridentiteter? "
 
-#: g10/keyedit.c:1718
+#: g10/keyedit.c:1798
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Vill du verkligen ta bort denna användaridentitet? "
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1848
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Vill du verkligen radera denna egensignatur? (j/N)"
 
-#: g10/keyedit.c:1780
+#: g10/keyedit.c:1860
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Du måste välja åtminstone en nyckel.\n"
 
-#: g10/keyedit.c:1808
+#: g10/keyedit.c:1888
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1822
+#: g10/keyedit.c:1902
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "kan inte öppna \"%s\": %s\n"
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1919
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "fel vid skapande av nyckelringen \"%s\": %s\n"
 
-#: g10/keyedit.c:1863
+#: g10/keyedit.c:1943
 msgid "You must select at least one key.\n"
 msgstr "Du måste välja åtminstone en nyckel.\n"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1946
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Vill du verkligen ta bort valda nycklar? "
 
-#: g10/keyedit.c:1867
+#: g10/keyedit.c:1947
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vill du verkligen ta bort denna nyckel? "
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1982
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Vill du verkligen spärra alla valda användaridentiteter? "
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1983
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Vill du verkligen spärra denna användaridentitet? "
 
-#: g10/keyedit.c:1921
+#: g10/keyedit.c:2001
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Vill du verkligen spärra denna nyckel? "
 
-#: g10/keyedit.c:1932
+#: g10/keyedit.c:2012
 #, 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:1934
+#: g10/keyedit.c:2014
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Vill du verkligen spärra denna nyckel? "
 
-#: g10/keyedit.c:1975
+#: g10/keyedit.c:2055
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2007
+#: g10/keyedit.c:2087
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "ange inställningslista"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2093
 #, 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:2015
+#: g10/keyedit.c:2095
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Vill du verkligen ändra inställningarna?"
 
-#: g10/keyedit.c:2065
+#: g10/keyedit.c:2157
+#, fuzzy, c-format
+msgid "Unable to clean `%s'\n"
+msgstr "Kunde inte köra %s \"%s\": %s\n"
+
+#: g10/keyedit.c:2160
+msgid "Please specify item to clean: `sigs', `uids', or `all'\n"
+msgstr ""
+
+#: g10/keyedit.c:2171
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Spara ändringarna? "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2174
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Avsluta utan att spara? "
 
-#: g10/keyedit.c:2078
+#: g10/keyedit.c:2184
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uppdateringen misslyckades: %s\n"
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2191
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "misslyckades med att uppdatera hemligheten: %s\n"
 
-#: g10/keyedit.c:2092
+#: g10/keyedit.c:2198
 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:2164
+#: g10/keyedit.c:2271
 msgid "Digest: "
 msgstr "Sammandrag: "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2323
 msgid "Features: "
 msgstr "Funktioner: "
 
-#: g10/keyedit.c:2227
+#: g10/keyedit.c:2334
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2242 g10/keylist.c:307
+#: g10/keyedit.c:2349 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2473
+#: g10/keyedit.c:2580
 #, 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:2494
+#: g10/keyedit.c:2601
 #, 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:2500
+#: g10/keyedit.c:2607
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (känsligt)"
 
-#: g10/keyedit.c:2516 g10/keyedit.c:2572 g10/keyedit.c:2684 g10/keyedit.c:2699
-#: g10/keylist.c:193 g10/keyserver.c:422
+#: g10/keyedit.c:2623 g10/keyedit.c:2679 g10/keyedit.c:2792 g10/keyedit.c:2807
+#: g10/keylist.c:194 g10/keyserver.c:421
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "kan inte skapa %s: %s\n"
 
-#: g10/keyedit.c:2519 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:931
+#: g10/keyedit.c:2626 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:948
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[spärrad]"
 
-#: g10/keyedit.c:2521 g10/keylist.c:757 g10/keylist.c:886
+#: g10/keyedit.c:2628 g10/keylist.c:758 g10/keylist.c:887
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[går ut: %s]"
 
-#: g10/keyedit.c:2523 g10/keyedit.c:2574 g10/keyedit.c:2686 g10/keyedit.c:2701
-#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
-#: g10/keylist.c:913 g10/keyserver.c:428 g10/mainproc.c:937
+#: g10/keyedit.c:2630 g10/keyedit.c:2681 g10/keyedit.c:2794 g10/keyedit.c:2809
+#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
+#: g10/keylist.c:914 g10/keyserver.c:427 g10/mainproc.c:954
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[går ut: %s]"
 
-#: g10/keyedit.c:2525
+#: g10/keyedit.c:2632
 #, c-format
 msgid "usage: %s"
 msgstr ""
 
-#: g10/keyedit.c:2540
+#: g10/keyedit.c:2647
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " tillit: %c/%c"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2651
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2658
 msgid "This key has been disabled"
 msgstr "Denna nyckel har stängts av"
 
-#: g10/keyedit.c:2579 g10/keylist.c:199
+#: g10/keyedit.c:2686 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2754
 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:2654
+#: g10/keyedit.c:2762
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3313,19 +3377,19 @@ msgstr ""
 "Obs! Den visade nyckelgiltigheten kan vara felaktig\n"
 "om du inte startar om programmet.\n"
 
-#: g10/keyedit.c:2718 g10/keyserver.c:432 g10/mainproc.c:1577
-#: g10/trustdb.c:1178
+#: g10/keyedit.c:2826 g10/keyedit.c:3201 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1690
 #, fuzzy
 msgid "revoked"
 msgstr "[spärrad]"
 
-#: g10/keyedit.c:2720 g10/keyserver.c:436 g10/mainproc.c:1579
-#: g10/trustdb.c:531
+#: g10/keyedit.c:2828 g10/keyedit.c:3203 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1692
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2893
 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"
@@ -3334,7 +3398,7 @@ msgstr ""
 "Detta kommando kan göra att ett annat användar-ID antas\n"
 "vara huvudidentitet.\n"
 
-#: g10/keyedit.c:2845
+#: g10/keyedit.c:2953
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3344,46 +3408,76 @@ msgstr ""
 "vissa versioner\n"
 "         av PGP avvisa denna nyckel.\n"
 
-#: g10/keyedit.c:2850 g10/keyedit.c:3128
+#: g10/keyedit.c:2958 g10/keyedit.c:3307
 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:2856
+#: g10/keyedit.c:2964
 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:2996
+#: g10/keyedit.c:3104
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Vill du radera denna korrekta signatur? (j/N/a)"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3114
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)"
 
-#: g10/keyedit.c:3010
+#: g10/keyedit.c:3118
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Vill du radera denna okända signatur? (j/N/a)"
 
-#: g10/keyedit.c:3016
+#: g10/keyedit.c:3124
 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:3030
+#: g10/keyedit.c:3138
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Raderade %d signatur.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3139
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Raderade %d signaturer.\n"
 
-#: g10/keyedit.c:3034
+#: g10/keyedit.c:3142
 msgid "Nothing deleted.\n"
 msgstr "Ingenting raderat.\n"
 
-#: g10/keyedit.c:3123
+#: g10/keyedit.c:3167
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed.\n"
+msgstr "Användar-ID \"%s\" är spärrat."
+
+#: g10/keyedit.c:3168
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed.\n"
+msgstr "Användar-ID \"%s\" är spärrat."
+
+#: g10/keyedit.c:3173
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean.\n"
+msgstr "Användar-ID \"%s\" är redan spärrad\n"
+
+#: g10/keyedit.c:3205 g10/trustdb.c:1694
+#, fuzzy
+msgid "invalid"
+msgstr "felaktigt skal"
+
+#: g10/keyedit.c:3207
+#, fuzzy, c-format
+msgid "User ID \"%s\" removed: %s\n"
+msgstr "Användar-ID \"%s\" är spärrat."
+
+#: g10/keyedit.c:3214
+#, fuzzy
+msgid "No user IDs are removable.\n"
+msgstr "Användar-ID \"%s\" är redan spärrad\n"
+
+#: g10/keyedit.c:3302
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3392,33 +3486,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:3134
+#: g10/keyedit.c:3313
 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:3154
+#: g10/keyedit.c:3333
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Ange användar-ID för spärrnyckeln: "
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3356
 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:3192
+#: g10/keyedit.c:3371
 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:3214
+#: g10/keyedit.c:3393
 #, 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:3233
+#: g10/keyedit.c:3412
 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:3239
+#: g10/keyedit.c:3418
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -3426,316 +3520,321 @@ msgstr ""
 "Är du verkligen säker på att du vill utse denna nyckel till spärrnyckel? (j/"
 "N): "
 
-#: g10/keyedit.c:3300
+#: g10/keyedit.c:3479
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Tag bort markeringar från de hemliga nycklarna.\n"
 
-#: g10/keyedit.c:3306
+#: g10/keyedit.c:3485
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Välj som högst en undernyckel.\n"
 
-#: g10/keyedit.c:3310
+#: g10/keyedit.c:3489
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Ändrar giltighetstid för en undernyckel.\n"
 
-#: g10/keyedit.c:3313
+#: g10/keyedit.c:3492
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändrar giltighetstid för huvudnyckeln.\n"
 
-#: g10/keyedit.c:3359
+#: g10/keyedit.c:3538
 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:3375
+#: g10/keyedit.c:3554
 msgid "No corresponding signature in secret ring\n"
 msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n"
 
-#: g10/keyedit.c:3455
+#: g10/keyedit.c:3634
 msgid "Please select exactly one user ID.\n"
 msgstr "Du måste välja bara en användaridentitet.\n"
 
-#: g10/keyedit.c:3494 g10/keyedit.c:3604 g10/keyedit.c:3724
+#: g10/keyedit.c:3673 g10/keyedit.c:3783 g10/keyedit.c:3903
 #, 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:3665
+#: g10/keyedit.c:3844
 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:3745
+#: g10/keyedit.c:3924
 #, 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:3746
+#: g10/keyedit.c:3925
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Vill du verkligen använda det (j/N)?"
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3987
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen användaridentitet med index %d\n"
 
-#: g10/keyedit.c:3854
+#: g10/keyedit.c:4045
+#, fuzzy, c-format
+msgid "No user ID with hash %s\n"
+msgstr "Ingen användaridentitet med index %d\n"
+
+#: g10/keyedit.c:4072
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen användaridentitet med index %d\n"
 
-#: g10/keyedit.c:3971
+#: g10/keyedit.c:4189
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "användaridentitet: \""
 
-#: g10/keyedit.c:3974 g10/keyedit.c:4038 g10/keyedit.c:4081
+#: g10/keyedit.c:4192 g10/keyedit.c:4256 g10/keyedit.c:4299
 #, 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:3976 g10/keyedit.c:4040 g10/keyedit.c:4083
+#: g10/keyedit.c:4194 g10/keyedit.c:4258 g10/keyedit.c:4301
 msgid " (non-exportable)"
 msgstr "  (icke exporterbar)"
 
-#: g10/keyedit.c:3980
+#: g10/keyedit.c:4198
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denna signatur gick ut den %s.\n"
 
 # nyckel? signatur?
-#: g10/keyedit.c:3984
+#: g10/keyedit.c:4202
 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:3988
+#: g10/keyedit.c:4206
 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:4015
+#: g10/keyedit.c:4233
 #, 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:4041
+#: g10/keyedit.c:4259
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "  (icke exporterbar)"
 
-#: g10/keyedit.c:4048
+#: g10/keyedit.c:4266
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   spärrad av %08lX %s\n"
 
-#: g10/keyedit.c:4070
+#: g10/keyedit.c:4288
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du står i begrepp att återkalla dessa signaturer:\n"
 
-#: g10/keyedit.c:4090
+#: g10/keyedit.c:4308
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Vill du verkligen skapa spärrcertifikatet? (y/N) "
 
-#: g10/keyedit.c:4120
+#: g10/keyedit.c:4338
 msgid "no secret key\n"
 msgstr "ingen hemlig nyckel\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4408
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Användar-ID \"%s\" är redan spärrad\n"
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4425
 #, 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:4271
+#: g10/keyedit.c:4489
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Användar-ID \"%s\" är redan spärrad\n"
 
-#: g10/keyedit.c:4333
+#: g10/keyedit.c:4551
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Användar-ID \"%s\" är redan spärrad\n"
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4646
 #, 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"
 
-#: g10/keygen.c:293
+#: g10/keygen.c:258
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "inställningen %c%lu förekommer flera gånger\n"
 
-#: g10/keygen.c:300
+#: g10/keygen.c:265
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "för många `%c' inställningar\n"
 
-#: g10/keygen.c:302
+#: g10/keygen.c:267
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "för många `%c' inställningar\n"
 
-#: g10/keygen.c:304
+#: g10/keygen.c:269
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "för många `%c' inställningar\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:394
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "felaktigt tecken i inställningssträngen\n"
 
-#: g10/keygen.c:829
+#: g10/keygen.c:822
 msgid "writing direct signature\n"
 msgstr "skriver direkt signatur\n"
 
-#: g10/keygen.c:868
+#: g10/keygen.c:861
 msgid "writing self signature\n"
 msgstr "skriver egensignatur\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing key binding signature\n"
 msgstr "skriver signatur knuten till nyckeln\n"
 
-#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2632
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "felaktig nyckelstorlek; använder %u bitar\n"
 
-#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2638
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "nyckelstorleken avrundad uppåt till %u bitar\n"
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1239
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1252
+#: g10/keygen.c:1242
 #, fuzzy
 msgid "Encrypt"
 msgstr "kryptera data"
 
-#: g10/keygen.c:1255
+#: g10/keygen.c:1245
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1263
+#: g10/keygen.c:1253
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1268
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1282
+#: g10/keygen.c:1272
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1287
+#: g10/keygen.c:1277
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1290
+#: g10/keygen.c:1280
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr ""
 
-#: g10/keygen.c:1293
+#: g10/keygen.c:1283
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1296
+#: g10/keygen.c:1286
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1340
 msgid "Please select what kind of key you want:\n"
 msgstr "Välj vilken typ av nyckel du vill ha:\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1342
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA och ElGamal (standardvalet)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1343
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (endast signering)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1345
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (endast signering)\n"
 
-#: g10/keygen.c:1357
+#: g10/keygen.c:1347
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (endast kryptering)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1348
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (endast signering)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1350
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (endast kryptering)\n"
 
-#: g10/keygen.c:1362
+#: g10/keygen.c:1352
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (endast kryptering)\n"
 
-#: g10/keygen.c:1431 g10/keygen.c:2509
+#: g10/keygen.c:1421 g10/keygen.c:2506
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA-nyckelparet kommer att ha 1024 bitar.\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1431
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1438
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Vilken nyckelstorlek vill du ha? (1024) "
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1452
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1468
+#: g10/keygen.c:1458
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Den efterfrågade nyckelstorleken är %u bitar\n"
 
-#: g10/keygen.c:1473 g10/keygen.c:1478
+#: g10/keygen.c:1463 g10/keygen.c:1468
 #, 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:1530
+#: g10/keygen.c:1515
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3752,7 +3851,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:1539
+#: g10/keygen.c:1526
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3768,39 +3867,40 @@ msgstr ""
 "      <n>m = signaturen blir ogiltig efter n månader\n"
 "      <n>y = signaturen blir ogiltig efter n år\n"
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1549
 msgid "Key is valid for? (0) "
 msgstr "För hur lång tid ska nyckeln vara giltig? (0) "
 
-#: g10/keygen.c:1563
-msgid "Signature is valid for? (0) "
+#: g10/keygen.c:1554
+#, fuzzy, c-format
+msgid "Signature is valid for? (%s) "
 msgstr "För hur lång tid ska signaturen vara giltig? (0) "
 
-#: g10/keygen.c:1568
+#: g10/keygen.c:1572
 msgid "invalid value\n"
 msgstr "felaktigt värde\n"
 
-#: g10/keygen.c:1575
+#: g10/keygen.c:1579
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "Giltighetstiden för %s går aldrig ut\n"
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1580
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "Giltighetstiden för %s går aldrig ut\n"
 
-#: g10/keygen.c:1583
+#: g10/keygen.c:1585
 #, 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:1584
+#: g10/keygen.c:1586
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Giltighetstiden för signaturen går ut %s\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1592
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3808,12 +3908,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:1595
+#: g10/keygen.c:1597
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Stämmer detta (j/n)? "
 
-#: g10/keygen.c:1638
+#: g10/keygen.c:1641
 #, fuzzy
 msgid ""
 "\n"
@@ -3830,44 +3930,44 @@ msgstr ""
 "     \"Gustav Vasa (Brutal kung) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1651
+#: g10/keygen.c:1654
 msgid "Real name: "
 msgstr "Namn: "
 
-#: g10/keygen.c:1659
+#: g10/keygen.c:1662
 msgid "Invalid character in name\n"
 msgstr "Felaktigt tecken i namnet\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1664
 msgid "Name may not start with a digit\n"
 msgstr "Namnet får inte börja med en siffra\n"
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1666
 msgid "Name must be at least 5 characters long\n"
 msgstr "Namnet måste vara åtminstone 5 tecken långt\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1674
 msgid "Email address: "
 msgstr "E-postadress: "
 
-#: g10/keygen.c:1682
+#: g10/keygen.c:1685
 msgid "Not a valid email address\n"
 msgstr "E-postadressen är ogiltig\n"
 
-#: g10/keygen.c:1690
+#: g10/keygen.c:1693
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1696
+#: g10/keygen.c:1699
 msgid "Invalid character in comment\n"
 msgstr "Felaktigt tecken i kommentaren\n"
 
-#: g10/keygen.c:1719
+#: g10/keygen.c:1722
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du använder teckenuppsättningen \"%s\"\n"
 
-#: g10/keygen.c:1725
+#: g10/keygen.c:1728
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3878,7 +3978,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1733
 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"
 
@@ -3894,24 +3994,24 @@ msgstr "Ange inte e-postadressen som namn eller kommentar\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1746
+#: g10/keygen.c:1749
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoAa"
 
-#: g10/keygen.c:1756
+#: g10/keygen.c:1759
 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:1757
+#: g10/keygen.c:1760
 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:1776
+#: g10/keygen.c:1779
 msgid "Please correct the error first\n"
 msgstr "Rätta först felet\n"
 
 # fel kapitalisering i originalet?
-#: g10/keygen.c:1816
+#: g10/keygen.c:1819
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3919,12 +4019,12 @@ msgstr ""
 "Du behöver en lösenmening för att skydda din hemliga nyckel\n"
 "\n"
 
-#: g10/keygen.c:1826 g10/passphrase.c:1105
+#: g10/keygen.c:1829 g10/passphrase.c:786
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1832
+#: g10/keygen.c:1835
 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"
@@ -3935,7 +4035,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:1854
+#: g10/keygen.c:1857
 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"
@@ -3947,50 +4047,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:2578
+#: g10/keygen.c:2575
 msgid "Key generation canceled.\n"
 msgstr "Skapandet av nycklar avbröts.\n"
 
-#: g10/keygen.c:2766 g10/keygen.c:2910
+#: g10/keygen.c:2774 g10/keygen.c:2918
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver den öppna nyckeln till \"%s\"\n"
 
-#: g10/keygen.c:2768 g10/keygen.c:2913
+#: g10/keygen.c:2776 g10/keygen.c:2921
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/keygen.c:2771 g10/keygen.c:2916
+#: g10/keygen.c:2779 g10/keygen.c:2924
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2907
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "hittade ingen öppen nyckelring att skriva till: %s\n"
 
-#: g10/keygen.c:2905
+#: g10/keygen.c:2913
 #, 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:2923
+#: g10/keygen.c:2931
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "fel vid skrivning av öppna nyckelringen \"%s\": %s\n"
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2938
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "fel vid skrivning av hemliga nyckelringen \"%s\": %s\n"
 
-#: g10/keygen.c:2953
+#: g10/keygen.c:2961
 msgid "public and secret key created and signed.\n"
 msgstr "den öppna och den  hemliga nyckeln är skapade och signerade.\n"
 
-#: g10/keygen.c:2964
+#: g10/keygen.c:2972
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4000,13 +4100,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:2976 g10/keygen.c:3105 g10/keygen.c:3220
+#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
 # c-format behövs inte i singularis
-#: g10/keygen.c:3028 g10/keygen.c:3156 g10/sign.c:290
+#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4014,7 +4114,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:3030 g10/keygen.c:3158 g10/sign.c:292
+#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4022,375 +4122,356 @@ msgstr ""
 "nyckeln är skapad %lu sekunder in i framtiden (problemet är\n"
 "relaterat till tidsresande eller en felställd klocka)\n"
 
-#: g10/keygen.c:3039 g10/keygen.c:3169
+#: g10/keygen.c:3047 g10/keygen.c:3177
 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:3078 g10/keygen.c:3202
+#: g10/keygen.c:3086 g10/keygen.c:3210
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Vill du verkligen skapa? "
 
-#: g10/keygen.c:3355
+#: g10/keygen.c:3363
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "misslyckades med att radera nyckelblock: %s\n"
 
-#: g10/keygen.c:3402
+#: g10/keygen.c:3410
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "kan inte skapa \"%s\": %s\n"
 
-#: g10/keygen.c:3428
+#: g10/keygen.c:3436
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
 
-#: g10/keygen.c:3508
-#, c-format
-msgid "length of RSA modulus is not %d\n"
-msgstr ""
-
-#: g10/keygen.c:3514
-msgid "public exponent too large (more than 32 bits)\n"
-msgstr ""
-
-#: g10/keygen.c:3520 g10/keygen.c:3526
-#, c-format
-msgid "length of an RSA prime is not %d\n"
-msgstr ""
-
-#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
+#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
 msgid "never     "
 msgstr "aldrig"
 
-#: g10/keylist.c:264
+#: g10/keylist.c:265
 msgid "Critical signature policy: "
 msgstr "Viktig signaturpolicy: "
 
-#: g10/keylist.c:266
+#: g10/keylist.c:267
 msgid "Signature policy: "
 msgstr "Signaturpolicy: "
 
-#: g10/keylist.c:305
+#: g10/keylist.c:306
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:354 g10/keylist.c:398
+#: g10/keylist.c:355 g10/keylist.c:399
 msgid "WARNING: invalid notation data found\n"
 msgstr "VARNING: ogiltig noteringsdata hittades\n"
 
-#: g10/keylist.c:372
+#: g10/keylist.c:373
 msgid "Critical signature notation: "
 msgstr "Viktig signaturnotation: "
 
-#: g10/keylist.c:374
+#: g10/keylist.c:375
 msgid "Signature notation: "
 msgstr "Signaturnotering: "
 
-#: g10/keylist.c:385
+#: g10/keylist.c:386
 msgid "not human readable"
 msgstr "inte möjlig att läsa för människor"
 
-#: g10/keylist.c:486
+#: g10/keylist.c:487
 msgid "Keyring"
 msgstr "Nyckelring"
 
-#: g10/keylist.c:792
+#: g10/keylist.c:793
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr "[går ut: %s]"
 
-#: g10/keylist.c:1488
+#: g10/keylist.c:1489
 msgid "Primary key fingerprint:"
 msgstr "Huvudnyckelns fingeravtryck:"
 
-#: g10/keylist.c:1490
+#: g10/keylist.c:1491
 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:1497
+#: g10/keylist.c:1498
 msgid " Primary key fingerprint:"
 msgstr "Huvudnyckelns fingeravtryck:"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1500
 msgid "      Subkey fingerprint:"
 msgstr "     Undernyckelns fingeravtryck:"
 
-#: g10/keylist.c:1503 g10/keylist.c:1507
+#: g10/keylist.c:1504 g10/keylist.c:1508
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "Nyckelns fingeravtryck ="
 
-#: g10/keylist.c:1574
+#: g10/keylist.c:1575
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1245
+#: g10/keyring.c:1246
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "misslyckades med att skapa ASCII-skal: %s\n"
 
 # Enligt Werner uppstår detta om något går snett när den hemliga nyckeln uppdateras.
-#: g10/keyring.c:1251
+#: g10/keyring.c:1252
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "VARNING: det finns 2 filer med konfidentiell information.\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s är den oförändrade\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1255
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s är den nya\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1256
 msgid "Please fix this possible security flaw\n"
 msgstr "Lös detta potentiella säkerhetsproblem\n"
 
-#: g10/keyring.c:1375
+#: g10/keyring.c:1376
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "kontrollerar nyckelringen `%s'\n"
 
-#: g10/keyring.c:1421
+#: g10/keyring.c:1422
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu nycklar och %lu signaturer har kontrollerats\n"
 
-#: g10/keyring.c:1433
+#: g10/keyring.c:1434
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu nycklar och %lu signaturer har kontrollerats\n"
 
-#: g10/keyring.c:1504
+#: g10/keyring.c:1505
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: nyckelring skapad\n"
 
-#: g10/keyserver.c:107
+#: g10/keyserver.c:105
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "VARNING: inställningar i `%s' är ännu inte aktiva under denna körning\n"
 
-#: g10/keyserver.c:434
+#: g10/keyserver.c:433
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:635
+#: g10/keyserver.c:634
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:718 g10/keyserver.c:1238
+#: g10/keyserver.c:717 g10/keyserver.c:1267
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr ""
 
-#: g10/keyserver.c:808
+#: g10/keyserver.c:815
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "hittade inte nyckeln  `%s': %s\n"
 
-#: g10/keyserver.c:810
+#: g10/keyserver.c:817
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "hittade inte nyckeln  `%s': %s\n"
 
-#: g10/keyserver.c:985
+#: g10/keyserver.c:1014
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "begär nyckel %08lX från %s\n"
 
-#: g10/keyserver.c:989
+#: g10/keyserver.c:1018
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "begär nyckel %08lX från %s\n"
 
-#: g10/keyserver.c:1141
+#: g10/keyserver.c:1170
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "söker \"%s\" från HKP-server %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "begär nyckel %08lX från %s\n"
 
-#: g10/keyserver.c:1188
+#: g10/keyserver.c:1217
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "söker \"%s\" från HKP-server %s\n"
 
-#: g10/keyserver.c:1191
+#: g10/keyserver.c:1220
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "söker \"%s\" från HKP-server %s\n"
 
-#: g10/keyserver.c:1198 g10/keyserver.c:1293
+#: g10/keyserver.c:1227 g10/keyserver.c:1322
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "nyckelserverfel"
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1275
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1255
+#: g10/keyserver.c:1284
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1314
+#: g10/keyserver.c:1343
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1320
+#: g10/keyserver.c:1349
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1361
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1366
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1374
 #, c-format
-msgid "gpgkeys_%s does not support handler version %d\n"
+msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1351
+#: g10/keyserver.c:1381
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "nyckelserverfel"
 
-#: g10/keyserver.c:1356
+#: g10/keyserver.c:1386
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "nyckelserverfel"
 
-#: g10/keyserver.c:1365
+#: g10/keyserver.c:1395
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "Hämtning från nyckelservern misslyckades: %s\n"
 
-#: g10/keyserver.c:1390 g10/keyserver.c:1424
+#: g10/keyserver.c:1420 g10/keyserver.c:1454
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1681
+#: g10/keyserver.c:1711
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VARNING: kan inte ta bort tempfil (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1703
+#: g10/keyserver.c:1733
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "begär nyckel %08lX från %s\n"
 
-#: g10/keyserver.c:1705
+#: g10/keyserver.c:1735
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "begär nyckel %08lX från %s\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:249
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "egendomlig storlek på en krypterad sessionsnyckel (%d)\n"
 
-#: g10/mainproc.c:262
-#, c-format
-msgid "bad passphrase or unknown cipher algorithm (%d)\n"
-msgstr "Fel lösenmening eller okänd krypteringsalgoritm (%d)\n"
-
-#: g10/mainproc.c:299
+#: g10/mainproc.c:300
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s  krypterad sessionsnyckel\n"
 
-#: g10/mainproc.c:309
+#: g10/mainproc.c:310
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "lösenmening skapad  med okänd sammandragsalgoritm %d\n"
 
-#: g10/mainproc.c:375
+#: g10/mainproc.c:376
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "den öppna nyckeln är %08lX\n"
 
 # Men jag ändrade så det blev närmare originalet. Per
-#: g10/mainproc.c:430
+#: g10/mainproc.c:431
 msgid "public key encrypted data: good DEK\n"
 msgstr "Data krypterat till öppen nyckel: Giltig DEK\n"
 
-#: g10/mainproc.c:463
+#: g10/mainproc.c:464
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "krypterad med %u-bitars %s-nyckel, ID %08lX, skapad %s\n"
 
-#: g10/mainproc.c:467 g10/pkclist.c:218
+#: g10/mainproc.c:468 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr ""
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:472
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "krypterad med %s-nyckel, ID %08lX\n"
 
 # Motsatsen till kryptering med symmetrisk nyckel.
-#: g10/mainproc.c:485
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "öppen nyckel-dekryptering misslyckades: %s\n"
 
-#: g10/mainproc.c:499
+#: g10/mainproc.c:500
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "krypterad med %lu lösenmeningar\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:502
 msgid "encrypted with 1 passphrase\n"
 msgstr "krypterad med with 1 lösenmening\n"
 
-#: g10/mainproc.c:529 g10/mainproc.c:551
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "antar att %s krypterade data\n"
 
-#: g10/mainproc.c:537
+#: g10/mainproc.c:538
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "IDEA-kryptering inte installerad. Optimistiskt försök att använda %s "
 "istället\n"
 
-#: g10/mainproc.c:569
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr "dekrypteringen lyckades\n"
 
 # Äldre krypteringalgoritmer skapar ingen mdc dvs. "minisignatur" som skyddar mot att delar av den krypterade texten byts ut/tas bort. Alla nya 128-bitars algoritmer använder mdc: AES, AES192, AES256, BLOWFISH.
-#: g10/mainproc.c:573
+#: g10/mainproc.c:574
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VARNING: detta meddelande var inte integritetsskyddat\n"
 
 # Meddelandet innebär alltså att kontrollen av mdc visade att meddelandet förändrats/manipulerats sedan det krypterades. Block kan ha tagits bort eller bytts ut.
-#: g10/mainproc.c:586
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VARNING: det krypterade meddelandet har ändrats!\n"
 
-#: g10/mainproc.c:592
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekrypteringen misslyckades: %s\n"
@@ -4404,308 +4485,295 @@ 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:786
+#: g10/mainproc.c:803
 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:1290
+#: g10/mainproc.c:1307
 msgid "signature verification suppressed\n"
 msgstr "signaturen verifierades inte\n"
 
-#: g10/mainproc.c:1332 g10/mainproc.c:1342
+#: g10/mainproc.c:1349 g10/mainproc.c:1359
 msgid "can't handle these multiple signatures\n"
 msgstr "kan inte hantera dessa multipla signaturer\n"
 
-#: g10/mainproc.c:1352
+#: g10/mainproc.c:1369
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Giltighetstiden för signaturen har upphört %s\n"
 
-#: g10/mainproc.c:1353
+#: g10/mainproc.c:1370
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "      även känd som \""
 
-#: g10/mainproc.c:1357
+#: g10/mainproc.c:1374
 #, 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:1377
+#: g10/mainproc.c:1394
 msgid "Key available at: "
 msgstr "Nyckeln tillgänglig hos: "
 
-#: g10/mainproc.c:1482 g10/mainproc.c:1530
+#: g10/mainproc.c:1499 g10/mainproc.c:1547
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "FELAKTIG signatur från \""
 
-#: g10/mainproc.c:1484 g10/mainproc.c:1532
+#: g10/mainproc.c:1501 g10/mainproc.c:1549
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Giltighetstiden har upphört för signatur från \""
 
-#: g10/mainproc.c:1486 g10/mainproc.c:1534
+#: g10/mainproc.c:1503 g10/mainproc.c:1551
 #, 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:1538
+#: g10/mainproc.c:1555
 msgid "[uncertain]"
 msgstr "[osäkert]"
 
-#: g10/mainproc.c:1570
+#: g10/mainproc.c:1587
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "      även känd som \""
 
-#: g10/mainproc.c:1664
+#: g10/mainproc.c:1681
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Giltighetstiden för signaturen har upphört %s\n"
 
-#: g10/mainproc.c:1669
+#: g10/mainproc.c:1686
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Giltighetstiden för signaturen går ut %s\n"
 
-#: g10/mainproc.c:1672
+#: g10/mainproc.c:1689
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signatur, sammandragsalgoritm %s\n"
 
-#: g10/mainproc.c:1673
+#: g10/mainproc.c:1690
 msgid "binary"
 msgstr "binär"
 
-#: g10/mainproc.c:1674
+#: g10/mainproc.c:1691
 msgid "textmode"
 msgstr "textläge"
 
-#: g10/mainproc.c:1674 g10/trustdb.c:530
+#: g10/mainproc.c:1691 g10/trustdb.c:531
 msgid "unknown"
 msgstr "okänd"
 
-#: g10/mainproc.c:1694
+#: g10/mainproc.c:1711
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan inte verifiera signaturen: %s\n"
 
-#: g10/mainproc.c:1762 g10/mainproc.c:1778 g10/mainproc.c:1864
+#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
 msgid "not a detached signature\n"
 msgstr "detta är inte någon signatur i en separat fil\n"
 
-#: g10/mainproc.c:1805
+#: g10/mainproc.c:1822
 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:1813
+#: g10/mainproc.c:1830
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "fristående signatur av klassen 0x%02x\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1887
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatur av den gamla (PGP 2.x) typen\n"
 
-#: g10/mainproc.c:1880
+#: g10/mainproc.c:1897
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "felaktigt rotpaket hittades i proc_tree()\n"
 
-#: g10/misc.c:121
+#: g10/misc.c:122
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "kan inte stänga av minnesutskrifter: %s\n"
 
-#: g10/misc.c:141 g10/misc.c:169 g10/misc.c:241
+#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr ""
 
-#: g10/misc.c:206
+#: g10/misc.c:207
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "tillitsdatabas: läsning misslyckades (n=%d): %s\n"
 
-#: g10/misc.c:315
+#: g10/misc.c:316
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "kan inte hantera algoritm %d för öppna nycklar\n"
 
-#: g10/misc.c:330
+#: g10/misc.c:331
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "krypteringsalgorimten är inte införd"
 
-#: g10/misc.c:345
+#: g10/misc.c:346
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s signatur, sammandragsalgoritm %s\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:351
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "VARNING: inställningen \"%s\" är föråldrad\n"
 
-#: g10/misc.c:446
+#: g10/misc.c:447
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "Insticksprogram för IDEA-kryptering är inte installerat\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:448
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr "Mer information finns på: http://www.gnupg.org/why-not-idea.html\n"
 
-#: g10/misc.c:680
+#: g10/misc.c:681
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: alternativet är föråldrat\"%s\"\n"
 
-#: g10/misc.c:684
+#: g10/misc.c:685
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VARNING: inställningen \"%s\" är föråldrad\n"
 
-#: g10/misc.c:686
+#: g10/misc.c:687
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "Använd \"%s%s\" istället\n"
 
-#: g10/misc.c:697
+#: g10/misc.c:694
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
+msgstr "VARNING: inställningen \"%s\" är föråldrad\n"
+
+#: g10/misc.c:707
 msgid "Uncompressed"
 msgstr "Okomprimerad"
 
-#: g10/misc.c:722
+#: g10/misc.c:732
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Okomprimerad"
 
-#: g10/misc.c:832
+#: g10/misc.c:842
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "detta meddelande kanske inte kan användas av %s\n"
 
-#: g10/misc.c:989
+#: g10/misc.c:999
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "läser inställningar från \"%s\"\n"
 
-#: g10/misc.c:1014
+#: g10/misc.c:1024
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "den förvalda mottagaren \"%s\" är okänd\n"
 
-#: g10/openfile.c:84
+#: g10/openfile.c:86
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Filen \"%s\" finns. "
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Skriv över (j/N)? "
 
-#: g10/openfile.c:119
+#: g10/openfile.c:121
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: okänt suffix\n"
 
-#: g10/openfile.c:141
+#: g10/openfile.c:143
 msgid "Enter new filename"
 msgstr "Ange nytt filnamn"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:188
 msgid "writing to stdout\n"
 msgstr "skriver till standard ut\n"
 
-#: g10/openfile.c:296
+#: g10/openfile.c:300
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "antar att signera data finns i filen \"%s\"\n"
 
-#: g10/openfile.c:375
+#: g10/openfile.c:379
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "ny konfigurationsfil `%s'skapad\n"
 
-#: g10/openfile.c:377
+#: g10/openfile.c:381
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 "VARNING: inställningar i `%s' är ännu inte aktiva under denna körning\n"
 
-#: g10/openfile.c:409
+#: g10/openfile.c:413
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: katalog skapad\n"
 
-#: g10/parse-packet.c:137
+#: g10/parse-packet.c:138
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "kan inte hantera algoritm %d för öppna nycklar\n"
 
-#: g10/parse-packet.c:707
+#: g10/parse-packet.c:708
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "VARNING: potentiellt osäker symmetriskt krypterad sessionsnyckel\n"
 
-#: g10/parse-packet.c:1132
+#: g10/parse-packet.c:1145
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "underpaket av typen %d har den bit satt som markerar den som kritisk\n"
 
-#: g10/passphrase.c:478 g10/passphrase.c:525
+#: g10/passphrase.c:305
 msgid "gpg-agent is not available in this session\n"
 msgstr "kunde inte få tillgång till GPG-Agent i denna session\n"
 
-# vad är detta?
-#: g10/passphrase.c:486
-msgid "can't set client pid for the agent\n"
-msgstr "kan inte ange pid för GPG-Agent\n"
-
-# FD?
-#: g10/passphrase.c:494
-msgid "can't get server read FD for the agent\n"
-msgstr "kan inte få server-läs FD för GPG-Agent\n"
-
-#: g10/passphrase.c:501
-msgid "can't get server write FD for the agent\n"
-msgstr "kan inte få server-skriv FD för GPG-Agent\n"
-
-#: g10/passphrase.c:534
+#: g10/passphrase.c:317
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "miljövariabeln GPG_AGENT_INFO är felformaterad\n"
 
-#: g10/passphrase.c:547
+#: g10/passphrase.c:332
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "GPG-Agent protokoll version %d stöds inte\n"
 
-#: g10/passphrase.c:568
+#: g10/passphrase.c:345
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan inte ansluta till \"%s\": %s\n"
 
-#: g10/passphrase.c:590
-msgid "communication problem with gpg-agent\n"
-msgstr "problem vid kommunikation med GPG-Agent\n"
-
-#: g10/passphrase.c:597 g10/passphrase.c:937 g10/passphrase.c:1049
+#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problem med GPG-Agent, stänger av den\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1209
+#: g10/passphrase.c:511 g10/passphrase.c:890
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (huvudnyckelns identitet %08lX)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:525
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4716,41 +4784,28 @@ msgstr ""
 "användaren: \"%.*s\"\n"
 "%u-bitars %s-nyckel, ID %08lX, skapad %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:550
 msgid "Repeat passphrase\n"
 msgstr "Repetera lösenmeningen\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:552
 msgid "Enter passphrase\n"
 msgstr "Ange lösenmening\n"
 
-#: g10/passphrase.c:781
-msgid "passphrase too long\n"
-msgstr "lösenmeningen är för lång\n"
-
-#: g10/passphrase.c:794
-msgid "invalid response from agent\n"
-msgstr "felaktigt svar från GPG-Agent\n"
-
-#: g10/passphrase.c:810 g10/passphrase.c:931
+#: g10/passphrase.c:628
 msgid "cancelled by user\n"
 msgstr "avbruten av användaren\n"
 
-#: g10/passphrase.c:815 g10/passphrase.c:1020
-#, c-format
-msgid "problem with the agent: agent returns 0x%lx\n"
-msgstr "problem med GPG-Agent: programmet svarar 0x%lx\n"
-
-#: g10/passphrase.c:1100 g10/passphrase.c:1263
+#: g10/passphrase.c:781 g10/passphrase.c:944
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "kan inte fråga efter lösenmening i batch-läge\n"
 
-#: g10/passphrase.c:1107 g10/passphrase.c:1268
+#: g10/passphrase.c:788 g10/passphrase.c:949
 msgid "Enter passphrase: "
 msgstr "Ange lösenmening: "
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:871
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4760,21 +4815,21 @@ msgstr ""
 "Du behöver en lösenmening för att låsa upp den hemliga nyckeln för\n"
 "användaren: \""
 
-#: g10/passphrase.c:1196
+#: g10/passphrase.c:877
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bits  %s-nyckel, ID %08lX, skapad %s"
 
-#: g10/passphrase.c:1205
+#: g10/passphrase.c:886
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1272
+#: g10/passphrase.c:953
 msgid "Repeat passphrase: "
 msgstr "Repetera lösenmeningen: "
 
-#: g10/photoid.c:66
+#: g10/photoid.c:67
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4788,87 +4843,87 @@ msgstr ""
 "en mycket stor bild, så blir din nyckel också väldigt stor!\n"
 "Försök att använda en bild som har ungefär  formatet 240x288 pixlar.\n"
 
-#: g10/photoid.c:80
+#: g10/photoid.c:81
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Skriv JPEG-filnamnet för foto-ID: "
 
-#: g10/photoid.c:94
+#: g10/photoid.c:95
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "Kan inte öppna fotot \"%s\": %s\n"
 
-#: g10/photoid.c:102
+#: g10/photoid.c:103
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
 # Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
-#: g10/photoid.c:104
+#: g10/photoid.c:105
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Vill du verkligen använda det (j/N)?"
 
-#: g10/photoid.c:119
+#: g10/photoid.c:120
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\" är inte en  JPEG-fil\n"
 
-#: g10/photoid.c:136
+#: g10/photoid.c:137
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Är detta foto korrekt (j/N/a)? "
 
-#: g10/photoid.c:338
+#: g10/photoid.c:339
 msgid "unable to display photo ID!\n"
 msgstr "kan inte visa foto-ID!\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:580
+#: g10/pkclist.c:62 g10/revoke.c:581
 msgid "No reason specified"
 msgstr "Ingen anledning har angivits"
 
 # tveksam översättning. funderar på "ersatt av något bättre" men det
 # känns inte heller bra. Betyder att nyckeln inte används längre, utan användaren har skapat en ny nyckel som ersätter den gamla.
-#: g10/pkclist.c:63 g10/revoke.c:582
+#: g10/pkclist.c:64 g10/revoke.c:583
 msgid "Key is superseded"
 msgstr "Nyckeln är ersatt"
 
-#: g10/pkclist.c:65 g10/revoke.c:581
+#: g10/pkclist.c:66 g10/revoke.c:582
 msgid "Key has been compromised"
 msgstr "Nyckeln har tappat sin säkerhet"
 
-#: g10/pkclist.c:67 g10/revoke.c:583
+#: g10/pkclist.c:68 g10/revoke.c:584
 msgid "Key is no longer used"
 msgstr "Nyckeln används inte längre"
 
-#: g10/pkclist.c:69 g10/revoke.c:584
+#: g10/pkclist.c:70 g10/revoke.c:585
 msgid "User ID is no longer valid"
 msgstr "Användaridentiteten är inte längre giltig"
 
-#: g10/pkclist.c:73
+#: g10/pkclist.c:74
 msgid "reason for revocation: "
 msgstr "anledning till spärren: "
 
-#: g10/pkclist.c:90
+#: g10/pkclist.c:91
 msgid "revocation comment: "
 msgstr "spärrkommentar: "
 
 # ej kristallklart vad förkortningarna står för
-#: g10/pkclist.c:205
+#: g10/pkclist.c:206
 msgid "iImMqQsS"
 msgstr "iImMaAsS"
 
-#: g10/pkclist.c:213
+#: g10/pkclist.c:214
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "Inget tillitsvärde tilldelat till:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:245
+#: g10/pkclist.c:246
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr ""
 
-#: g10/pkclist.c:255
+#: g10/pkclist.c:256
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
@@ -4876,80 +4931,80 @@ msgstr ""
 "%08lX: Det finns inget som tyder på att signaturen verkligen tillhör "
 "ägaren.\n"
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:271
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = Vet inte\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = Jag litar INTE på denna användare\n"
 
-#: g10/pkclist.c:278
+#: g10/pkclist.c:279
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Jag litar förbehållslöst på denna användare\n"
 
-#: g10/pkclist.c:284
+#: g10/pkclist.c:285
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = gå tillbaka till huvudmenyn\n"
 
-#: g10/pkclist.c:287
+#: g10/pkclist.c:288
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " s = hoppa över denna nyckel\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 #, fuzzy
 msgid "  q = quit\n"
 msgstr "a = avsluta\n"
 
-#: g10/pkclist.c:292
+#: g10/pkclist.c:293
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:298 g10/revoke.c:609
+#: g10/pkclist.c:299 g10/revoke.c:610
 msgid "Your decision? "
 msgstr "Vad väljer du? "
 
-#: g10/pkclist.c:319
+#: g10/pkclist.c:320
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Vill du verkligen ge denna nyckel förbehållslöst förtroende? "
 
-#: g10/pkclist.c:333
+#: g10/pkclist.c:334
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certifikat som leder till en nyckel med förbehållslöst förtroende:\n"
 
-#: g10/pkclist.c:418
+#: g10/pkclist.c:419
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Det finns inget som tyder på att signaturen verkligen tillhör "
 "ägaren.\n"
 
-#: g10/pkclist.c:423
+#: g10/pkclist.c:424
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Det finns inget som tyder på att signaturen verkligen tillhör "
 "ägaren.\n"
 
-#: g10/pkclist.c:429
+#: g10/pkclist.c:430
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Denna nyckel tillhör sannolikt ägaren\n"
 
-#: g10/pkclist.c:434
+#: g10/pkclist.c:435
 msgid "This key belongs to us\n"
 msgstr "Denna nyckel tillhör oss\n"
 
-#: g10/pkclist.c:460
+#: g10/pkclist.c:461
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -4960,94 +5015,94 @@ msgstr ""
 "*verkligen* vet vad du gör, kan du svara ja på nästa fråga\n"
 "\n"
 
-#: g10/pkclist.c:467
+#: g10/pkclist.c:468
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Vill du använda nyckeln trots det? "
 
-#: g10/pkclist.c:501
+#: g10/pkclist.c:502
 msgid "WARNING: Using untrusted key!\n"
 msgstr "VARNING: Använder en nyckel som inte är betrodd!\n"
 
-#: g10/pkclist.c:508
+#: g10/pkclist.c:509
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "VARNING: denna nyckel kan ha spärrats: Spärrnyckeln saknas.\n"
 
-#: g10/pkclist.c:517
+#: g10/pkclist.c:518
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "VARNING: Denna nyckel har spärrats med sin spärrnyckel!\n"
 
-#: g10/pkclist.c:520
+#: g10/pkclist.c:521
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "VARNING: Denna nyckel har spärrats av sin ägare!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Detta kan betyda att signaturen är en förfalskning.\n"
 
-#: g10/pkclist.c:527
+#: g10/pkclist.c:528
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "VARNING: Denna undernyckel har spärrats av sin ägare!\n"
 
-#: g10/pkclist.c:532
+#: g10/pkclist.c:533
 msgid "Note: This key has been disabled.\n"
 msgstr "Obs: Denna nyckel har stängts av.\n"
 
-#: g10/pkclist.c:537
+#: g10/pkclist.c:538
 msgid "Note: This key has expired!\n"
 msgstr "Obs: Giltighetstiden för denna nyckel har gått ut!\n"
 
-#: g10/pkclist.c:548
+#: g10/pkclist.c:549
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "VARNING: Denna nyckel är inte certifierad med en pålitlig signatur!\n"
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:551
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Det finns inget som indikerar att signaturen tillhör ägaren.\n"
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:559
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "VARNING: Vi litar INTE på denna nyckel!\n"
 
-#: g10/pkclist.c:559
+#: g10/pkclist.c:560
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Signaturen är sannolikt en FÖRFALSKNING.\n"
 
-#: g10/pkclist.c:567
+#: g10/pkclist.c:568
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "VARNING: Denna nyckel är inte certifierad med signaturer med ett\n"
 "tillräckligt högt tillitsvärde!\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:570
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Det är inte säkert att signaturen tillhör ägaren.\n"
 
-#: g10/pkclist.c:734 g10/pkclist.c:767 g10/pkclist.c:936 g10/pkclist.c:996
+#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: hoppade över: %s\n"
 
 # överhoppad?
-#: g10/pkclist.c:744 g10/pkclist.c:968
+#: g10/pkclist.c:745 g10/pkclist.c:969
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "hoppade över %s: öppen nyckel finns redan\n"
 
-#: g10/pkclist.c:786
+#: g10/pkclist.c:787
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Du specificerade ingen användaridentitet. (du kan använda \"-r\") för detta\n"
 
-#: g10/pkclist.c:802
+#: g10/pkclist.c:803
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:828
+#: g10/pkclist.c:829
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5055,28 +5110,28 @@ msgstr ""
 "\n"
 "Skriv användar-ID.  Avsluta med en tom rad: "
 
-#: g10/pkclist.c:844
+#: g10/pkclist.c:845
 msgid "No such user ID.\n"
 msgstr "Hittade inte användaridentiteten.\n"
 
-#: g10/pkclist.c:849 g10/pkclist.c:911
+#: g10/pkclist.c:850 g10/pkclist.c:912
 msgid "skipped: public key already set as default recipient\n"
 msgstr "hoppade över: den öppna nyckeln är redan satt som förvald mottagare\n"
 
-#: g10/pkclist.c:867
+#: g10/pkclist.c:868
 msgid "Public key is disabled.\n"
 msgstr "Den öppna nyckeln är avstängd.\n"
 
-#: g10/pkclist.c:874
+#: g10/pkclist.c:875
 msgid "skipped: public key already set\n"
 msgstr "hoppade över: öppen nyckel redan angiven\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:904
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "den förvalda mottagaren \"%s\" är okänd\n"
 
-#: g10/pkclist.c:948
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "hoppade över %s: den öppna nyckeln är avstängd\n"
@@ -5084,94 +5139,94 @@ msgstr "hoppade över %s: den öppna nyckeln är avstängd\n"
 # plural av adressee
 # dvs. den som meddelandet är adresserat till.
 # Åtskillnad görs mellan adressee och receiver.
-#: g10/pkclist.c:1003
+#: g10/pkclist.c:1004
 msgid "no valid addressees\n"
 msgstr "inga giltiga adressater\n"
 
-#: g10/plaintext.c:90
+#: g10/plaintext.c:91
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "data sparades inte, använd flaggan \"--output\" för att spara det\n"
 
-#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
+#: g10/plaintext.c:136 g10/plaintext.c:141 g10/plaintext.c:159
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "Fel vid skapande av `%s': %s\n"
 
-#: g10/plaintext.c:446
+#: g10/plaintext.c:447
 msgid "Detached signature.\n"
 msgstr "Signatur i en separat fil.\n"
 
-#: g10/plaintext.c:450
+#: g10/plaintext.c:452
 msgid "Please enter name of data file: "
 msgstr "Ange namnet på datafilen: "
 
-#: g10/plaintext.c:478
+#: g10/plaintext.c:481
 msgid "reading stdin ...\n"
 msgstr "läser från standard in ...\n"
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:515
 msgid "no signed data\n"
 msgstr "ingen signerad data\n"
 
 # se förra kommentaren
-#: g10/plaintext.c:526
+#: g10/plaintext.c:529
 #, fuzzy, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "kan inte öppna \"%s\"\n"
 
-#: g10/pubkey-enc.c:103
+#: g10/pubkey-enc.c:104
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "anonym mottagare; försöker med den hemliga nyckeln %08lX ...\n"
 
-#: g10/pubkey-enc.c:119
+#: g10/pubkey-enc.c:120
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "ok, vi är den hemliga mottagaren.\n"
 
-#: g10/pubkey-enc.c:207
+#: g10/pubkey-enc.c:208
 msgid "old encoding of the DEK is not supported\n"
 msgstr "gammal kodning av krypteringsnyckeln stöds inte\n"
 
-#: g10/pubkey-enc.c:228
+#: g10/pubkey-enc.c:229
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "krypteringsalgoritmen %d%s är okänd eller avstängd\n"
 
-#: g10/pubkey-enc.c:266
+#: g10/pubkey-enc.c:267
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "OBS: krypteringsalgoritmen %d finns inte i inställningarna\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:287
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "OBS: den hemliga nyckeln %08lX gick ut %s\n"
 
-#: g10/pubkey-enc.c:292
+#: g10/pubkey-enc.c:293
 msgid "NOTE: key has been revoked"
 msgstr "OBS: nyckeln har spärrats"
 
 # Vad?
-#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:545
+#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
+#: g10/revoke.c:188 g10/revoke.c:546
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet misslyckades: %s\n"
 
-#: g10/revoke.c:146
+#: g10/revoke.c:147
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "nyckel %08lX: ingen användaridentitet\n"
 
-#: g10/revoke.c:272
+#: g10/revoke.c:273
 msgid "To be revoked by:\n"
 msgstr "Att spärras av:\n"
 
-#: g10/revoke.c:276
+#: g10/revoke.c:277
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Detta är en känslig spärrnyckel)\n"
 
-#: g10/revoke.c:280
+#: g10/revoke.c:281
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Vill du skapa ett spärrcertifikat för denna nyckel?"
@@ -5181,53 +5236,53 @@ msgstr "Vill du skapa ett spärrcertifikat för denna nyckel?"
 # -do-not-force översatt med:
 # genomdriv inte
 # I detta fall gäller det ett revokeringscertifikat, som gnupg alltid skapar i ASCII-format för att det ska gå att skriva ut.
-#: g10/revoke.c:293 g10/revoke.c:511
+#: g10/revoke.c:294 g10/revoke.c:512
 msgid "ASCII armored output forced.\n"
 msgstr "utdata med ett ascii-skal genomdrivet.\n"
 
 # Vad menas???
-#: g10/revoke.c:307 g10/revoke.c:525
+#: g10/revoke.c:308 g10/revoke.c:526
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet misslyckades: %s\n"
 
-#: g10/revoke.c:370
+#: g10/revoke.c:371
 msgid "Revocation certificate created.\n"
 msgstr "Spärrcertifikat skapat.\n"
 
-#: g10/revoke.c:376
+#: g10/revoke.c:377
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "hittade inga spärrnycklar till `%s'\n"
 
-#: g10/revoke.c:432
+#: g10/revoke.c:433
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "den hemliga nyckeln `%s' hittades inte: %s\n"
 
-#: g10/revoke.c:461
+#: g10/revoke.c:462
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "ingen tillhörande öppen nyckel: %s\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:473
 msgid "public key does not match secret key!\n"
 msgstr "den öppna nyckel passar inte ihop med den hemliga nyckeln!\n"
 
-#: g10/revoke.c:479
+#: g10/revoke.c:480
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Vill du skapa ett spärrcertifikat för denna nyckel?"
 
-#: g10/revoke.c:496
+#: g10/revoke.c:497
 msgid "unknown protection algorithm\n"
 msgstr "okänd krypteringsalgoritm\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 msgid "NOTE: This key is not protected!\n"
 msgstr "OBS: Denna nyckel är oskyddad!\n"
 
-#: g10/revoke.c:551
+#: g10/revoke.c:552
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5245,118 +5300,118 @@ msgstr ""
 "media blir oläsligt.  Men se upp:  Utskriftsfunktionen på\n"
 "din dator kan spara data så att det blir åtkomligt för andra!\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid "Please select the reason for the revocation:\n"
 msgstr "Välj anledning till att nyckeln spärras:\n"
 
-#: g10/revoke.c:602
+#: g10/revoke.c:603
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: g10/revoke.c:604
+#: g10/revoke.c:605
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Troligen vill du välja %d här)\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:646
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Ange en beskrivning (frivilligt); avsluta med en tom rad:\n"
 
-#: g10/revoke.c:673
+#: g10/revoke.c:674
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Anledning till spärren: %s\n"
 
-#: g10/revoke.c:675
+#: g10/revoke.c:676
 msgid "(No description given)\n"
 msgstr "(Ingen beskrivning angiven)\n"
 
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Är detta OK?"
 
-#: g10/seckey-cert.c:54
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "de hemliga nyckeldelarna är inte tillgänliga\n"
 
-#: g10/seckey-cert.c:60
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "skyddsalgoritmen %d%s stöds inte\n"
 
 # Skyddssammandraget låter underligt
 # Kontrollsumma?
-#: g10/seckey-cert.c:71
+#: g10/seckey-cert.c:72
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "skyddssammandraget %d stöds inte\n"
 
-#: g10/seckey-cert.c:265
+#: g10/seckey-cert.c:266
 msgid "Invalid passphrase; please try again"
 msgstr "Fel lösenmening; försök igen!"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:267
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
 # För vissa krypteringsalgoritmer är det känt att vissa svaga nycklar kan förekomma. Dessa ska aldrig användas. GnuPG vill på detta sätt hindra dig från att skapa en sådan nyckel.
-#: g10/seckey-cert.c:326
+#: g10/seckey-cert.c:327
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "VARNING: Upptäckte en svag nyckel - byt lösenmening igen.\n"
 
-#: g10/seckey-cert.c:364
+#: g10/seckey-cert.c:365
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "skapar den föråldrade 16-bit kontrollsumman för skydd av den hemliga "
 "nyckeln\n"
 
-#: g10/seskey.c:52
+#: g10/seskey.c:53
 msgid "weak key created - retrying\n"
 msgstr "skapade en svag nyckel - försöker igen\n"
 
-#: g10/seskey.c:57
+#: g10/seskey.c:58
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "kan inte undvika en svag nyckel för symmetrisk kryptering; försökte\n"
 "%d gånger!\n"
 
-#: g10/seskey.c:213
+#: g10/seskey.c:214
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA kräver att du använder en 160-bitars kontrollsummealgoritm\n"
 
-#: g10/sig-check.c:75
+#: g10/sig-check.c:76
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "VARNING: konflikt mellan signatursammandrag i meddelandet\n"
 
 # Vad betyder det?
-#: g10/sig-check.c:99
+#: g10/sig-check.c:100
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "VARNING: Signeringsundernyckeln %08lX är inte korscertifierad\n"
 
 # cross-certification?
-#: g10/sig-check.c:102
+#: g10/sig-check.c:103
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "VARNING signeringsundernyckel  %08lX har en ogiltig korscertiifiering\n"
 
 # behövs verkligen c-format här?
-#: g10/sig-check.c:168
+#: g10/sig-check.c:169
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "den öppna nyckeln %08lX är %lu sekund nyare än signaturen\n"
 
-#: g10/sig-check.c:169
+#: g10/sig-check.c:170
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "den öppna nyckeln %08lX är %lu sekunder nyare än signaturen\n"
 
 # c-format behövs inte i singularis
-#: g10/sig-check.c:180
+#: g10/sig-check.c:181
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5364,7 +5419,7 @@ msgstr ""
 "nyckeln är skapad %lu sekund in i framtiden (problemet är\n"
 "relaterat till tidsresande eller en felställd klocka)\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:183
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5372,60 +5427,60 @@ msgstr ""
 "nyckeln är skapad %lu sekunder in i framtiden (problemet är\n"
 "relaterat till tidsresande eller en felställd klocka)\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:193
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "OBS: signaturnyckeln %08lX, gick ut vid %s\n"
 
-#: g10/sig-check.c:275
+#: g10/sig-check.c:276
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "antar att signaturen gjord med nyckel %08lX är felaktig eftersom en okänd "
 "kritisk bit är satt\n"
 
-#: g10/sig-check.c:532
+#: g10/sig-check.c:533
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "nyckel %08lX: ingen undernyckel till paket för spärr av undernyckel\n"
 
-#: g10/sig-check.c:558
+#: g10/sig-check.c:559
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
 "nyckel %08lX: ingen undernyckel till signatur för bindning av undernyckel\n"
 
 # notation data?
-#: g10/sign.c:85
+#: g10/sign.c:86
 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:93
+#: g10/sign.c:94
 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:112
+#: g10/sign.c:113
 #, 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:138
+#: g10/sign.c:139
 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:146
+#: g10/sign.c:147
 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:159
+#: g10/sign.c:160
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5433,7 +5488,7 @@ msgstr ""
 "VARNING: kan inte %%-expandera policy-url (för stor).  Använder den utan "
 "expansion.\n"
 
-#: g10/sign.c:187
+#: g10/sign.c:188
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5442,23 +5497,23 @@ msgstr ""
 "VARNING: kan inte %%-expandera policy-url (för stor).  Använder den utan "
 "expansion.\n"
 
-#: g10/sign.c:364
+#: g10/sign.c:365
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "försök att verifiera den skapade signaturen misslyckades: %s\n"
 
-#: g10/sign.c:373
+#: g10/sign.c:374
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s signatur från: \"%s\"\n"
 
-#: g10/sign.c:741
+#: g10/sign.c:761
 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:808
+#: g10/sign.c:830
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5466,55 +5521,55 @@ msgstr ""
 "att genomdriva komprimeringsalgoritm %s (%d) strider mot mottagarens inst?"
 "llningar\n"
 
-#: g10/sign.c:900
+#: g10/sign.c:922
 msgid "signing:"
 msgstr "signerar:"
 
-#: g10/sign.c:1007
+#: g10/sign.c:1034
 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:1180
+#: g10/sign.c:1212
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "krypteringen %s kommer att användas\n"
 
 # Slumptalsgenerator: Random Number Generator
-#: g10/skclist.c:126 g10/skclist.c:190
+#: g10/skclist.c:127 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "nyckeln är inte markerad som osäker - det går inte att använda den med "
 "fejkad slumptalsgenerator!\n"
 
-#: g10/skclist.c:157
+#: g10/skclist.c:158
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "hoppade över \"%s\": förekommer flera gånger\n"
 
-#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "hoppade över  `%s': %s\n"
 
-#: g10/skclist.c:170
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "hoppade över: hemlig nyckel finns redan\n"
 
-#: g10/skclist.c:185
+#: g10/skclist.c:186
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "hoppade över  `%s': detta är en nyckel av ElGamal-typ genererad av PGP\n"
 "som inte är säker för signaturer!\n"
 
-#: g10/tdbdump.c:59 g10/trustdb.c:365
+#: g10/tdbdump.c:60 g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "tillitspost: %lu, typ %d: kunde inte skriva: %s\n"
 
-#: g10/tdbdump.c:104
+#: g10/tdbdump.c:105
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5523,356 +5578,356 @@ msgstr ""
 "# Skapat lista över tilldelade tillitsvärden %s\n"
 "# (Använd \"gpg --import-ownertrust\" för att återställa dem)\n"
 
-#: g10/tdbdump.c:159 g10/tdbdump.c:167 g10/tdbdump.c:172 g10/tdbdump.c:177
+#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "fel vid läsning av \"%s\": %s\n"
 
-#: g10/tdbdump.c:159
+#: g10/tdbdump.c:160
 #, fuzzy
 msgid "line too long"
 msgstr "raden är för lång\n"
 
-#: g10/tdbdump.c:167
+#: g10/tdbdump.c:168
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:173
+#: g10/tdbdump.c:174
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "fel: ogiltigt fingeravtryck\n"
 
-#: g10/tdbdump.c:178
+#: g10/tdbdump.c:179
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr "importera värden som representerar ägartillit"
 
-#: g10/tdbdump.c:214
+#: g10/tdbdump.c:215
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "fel vid sökning av tillitsvärde: %s\n"
 
-#: g10/tdbdump.c:218
+#: g10/tdbdump.c:219
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "läsfel:  %s\n"
 
-#: g10/tdbdump.c:227 g10/trustdb.c:380
+#: g10/tdbdump.c:228 g10/trustdb.c:381
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "tillitsdatabas: synkronisering misslyckades: %s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1440
+#: g10/tdbio.c:129 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "tillitsdatabasposten %lu: lseek misslyckades: %s\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1447
+#: g10/tdbio.c:135 g10/tdbio.c:1448
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "tillitsdatabasposten %lu: skrivning misslyckades (n=%d): %s\n"
 
-#: g10/tdbio.c:244
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "tillitsdatabastransaktion för stor\n"
 
-#: g10/tdbio.c:497
+#: g10/tdbio.c:498
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "kan inte stänga \"%s\": %s\n"
 
-#: g10/tdbio.c:512
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: katalogen finns inte!\n"
 
-#: g10/tdbio.c:522 g10/tdbio.c:545 g10/tdbio.c:588
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "%s: kan inte skapa katalog: %s\n"
 
 # se förra kommentaren
-#: g10/tdbio.c:524 g10/tdbio.c:591
+#: g10/tdbio.c:525 g10/tdbio.c:592
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "kan inte öppna \"%s\"\n"
 
-#: g10/tdbio.c:550
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: misslyckades med att skapa versionspost: %s"
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: ogiltig tillitsdatabas skapad\n"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: tillitsdatabas skapad\n"
 
-#: g10/tdbio.c:597
+#: g10/tdbio.c:598
 msgid "NOTE: trustdb not writable\n"
 msgstr "OBS: det går inte att skriva till tillitsdatabasen\n"
 
-#: g10/tdbio.c:614
+#: g10/tdbio.c:615
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: ogiltig tillitsdatabas\n"
 
-#: g10/tdbio.c:646
+#: g10/tdbio.c:647
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: misslyckades med att skapa kontrollsummetabell: %s\n"
 
-#: g10/tdbio.c:654
+#: g10/tdbio.c:655
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: fel vid uppdatering av versionspost: %s\n"
 
-#: g10/tdbio.c:671 g10/tdbio.c:691 g10/tdbio.c:707 g10/tdbio.c:721
-#: g10/tdbio.c:751 g10/tdbio.c:1373 g10/tdbio.c:1400
+#: g10/tdbio.c:672 g10/tdbio.c:692 g10/tdbio.c:708 g10/tdbio.c:722
+#: g10/tdbio.c:752 g10/tdbio.c:1374 g10/tdbio.c:1401
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: fel vid läsning av versionspost: %s\n"
 
-#: g10/tdbio.c:730
+#: g10/tdbio.c:731
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: fel vid skrivning av versionspost: %s\n"
 
-#: g10/tdbio.c:1169
+#: g10/tdbio.c:1170
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "tillitsdatabas: lseek misslyckades: %s\n"
 
-#: g10/tdbio.c:1177
+#: g10/tdbio.c:1178
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "tillitsdatabas: läsning misslyckades (n=%d): %s\n"
 
-#: g10/tdbio.c:1198
+#: g10/tdbio.c:1199
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: detta är inte en tillitsdatabasfil\n"
 
-#: g10/tdbio.c:1216
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versionspost med postnummer %lu\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1222
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: ogiltig filversion %d\n"
 
-#: g10/tdbio.c:1406
+#: g10/tdbio.c:1407
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: fel vid läsning av ledig post: %s\n"
 
-#: g10/tdbio.c:1414
+#: g10/tdbio.c:1415
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: fel vid läsning av katalogpost: %s\n"
 
-#: g10/tdbio.c:1424
+#: g10/tdbio.c:1425
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: misslyckades med att nollställa en post: %s\n"
 
-#: g10/tdbio.c:1454
+#: g10/tdbio.c:1455
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: misslyckades med att lägga till en post: %s\n"
 
-#: g10/tdbio.c:1499
+#: g10/tdbio.c:1500
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "tillitsdatabasen är trasig, kör \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:147
+#: g10/textfilter.c:148
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "kan inte hantera text med rader längre än %d tecken\n"
 
-#: g10/textfilter.c:244
+#: g10/textfilter.c:245
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "indataraden är längre än %d tecken\n"
 
-#: g10/trustdb.c:226
+#: g10/trustdb.c:227
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "%s ?r ingen giltig teckentabell\n"
 
 # trusted??
-#: g10/trustdb.c:257
+#: g10/trustdb.c:258
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "nyckel %08lX: accepterad som betrodd nyckel\n"
 
-#: g10/trustdb.c:295
+#: g10/trustdb.c:296
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "nyckel %08lX förekommer mer än en gång i tillitsdatabasen\n"
 
 # nyckeln?
-#: g10/trustdb.c:310
+#: g10/trustdb.c:311
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "nyckel %08lX: hittade ingen motsvarande öppen nyckel - överhoppad\n"
 
-#: g10/trustdb.c:320
+#: g10/trustdb.c:321
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "Nyckeln har förbehållslöst förtroende.\n"
 
 # req står för request
 # kollat med Werner. Per
-#: g10/trustdb.c:344
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "tillitspost %lu, begäran av typ %d: kunde inte läsa: %s\n"
 
-#: g10/trustdb.c:350
+#: g10/trustdb.c:351
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "tillitsvärdet %lu är inte av begärd typ %d\n"
 
-#: g10/trustdb.c:446
+#: g10/trustdb.c:447
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:452
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:506
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[spärrad]"
 
-#: g10/trustdb.c:508 g10/trustdb.c:513
+#: g10/trustdb.c:509 g10/trustdb.c:514
 #, fuzzy
 msgid "[ expired]"
 msgstr "[Giltighetstiden har gått ut]"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 #, fuzzy
 msgid "[ unknown]"
 msgstr "okänd"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 #, fuzzy
 msgid "never"
 msgstr "aldrig"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:536
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:576
+#: g10/trustdb.c:577
 msgid "no need for a trustdb check\n"
 msgstr "det behövs ingen kontroll av tillitsdatabasen\n"
 
-#: g10/trustdb.c:582 g10/trustdb.c:2157
+#: g10/trustdb.c:583 g10/trustdb.c:2309
 #, 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:591
+#: 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:606
+#: 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:838 g10/trustdb.c:1276
+#: 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:1033
+#: 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:1037
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "kontrollerar  tillitsdatabasen\n"
 
 # Vad är detta!?
-#: g10/trustdb.c:1901
+#: g10/trustdb.c:2053
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d nycklar behandlade (%d validity counts rensade)\n"
 
-#: g10/trustdb.c:1965
+#: g10/trustdb.c:2117
 msgid "no ultimately trusted keys found\n"
 msgstr "hittade inga nycklar med förbehållslöst förtroende\n"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:2131
 #, 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:2002
+#: g10/trustdb.c:2154
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2240
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2163
+#: g10/trustdb.c:2315
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "tillitspost: %lu, typ %d: kunde inte skriva: %s\n"
 
-#: g10/verify.c:116
+#: g10/verify.c:117
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -5882,305 +5937,338 @@ msgstr ""
 "Kom ihåg att signaturfilen (.sig eller .asc)\n"
 "ska vara den först angivna filen på kommandoraden\n"
 
-#: g10/verify.c:189
+#: g10/verify.c:190
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "raden %u är för lång, eller saknar nyradstecken\n"
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "allmänt fel"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "okänd pakettyp"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "okänd version"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "okänd algoritm för publik nyckel"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "okänd algoritm för beräkning av sammandrag"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "felaktig öppen nyckel"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "felaktig hemlig nyckel"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "felaktig signatur"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "fel vid beräkning av kontrollsumma"
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "felaktig lösenmening"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "hittade inte den öppna nyckeln"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "okänd krypteringsalgoritm"
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "kan inte öppna nyckelringen"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "felaktigt paket"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "felaktigt skal"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "okänd användaridentitet"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "den hemliga nyckeln är inte tillgänglig"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "fel hemlig nyckel har använts"
 
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "inte stödd"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "felaktig nyckel"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "fel vid läsning av fil"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "fel vid skrivning av fil"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "okänd komprimeringsalgoritm"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "fel vid öppnande av fil"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "fel vid skapande av fil"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "fel lösenmening"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "algoritmen för publik nyckel är inte införd"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "krypteringsalgorimten är inte införd"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "okänd signaturklass"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "fel i tillitsdatabasen"
 
 # MPI står för Multiple Precision Integer (tror jag)
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "felaktig MPI"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "resursbegränsning"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "felaktig nyckelring"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "felaktigt certifikat"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "felformaterad användaridentitet"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "fel vid stängning av fil"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "fel vid namnbyte av fil"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "fel vid borttagande av fil"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "oväntad data"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "konflikt mellan tidsstämplar"
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "oanvändbar algoritm för publika nycklar"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "filen finns"
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "svag nyckel"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "felaktigt argument"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "felaktig URI"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "denna URI stöds inte"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "nätverksfel"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "inte krypterad"
 
-#: util/errors.c:103
+#: util/errors.c:104
 msgid "not processed"
 msgstr "inte behandlade"
 
-#: util/errors.c:105
+#: util/errors.c:106
 msgid "unusable public key"
 msgstr "oanvändbar öppen nyckel"
 
-#: util/errors.c:106
+#: util/errors.c:107
 msgid "unusable secret key"
 msgstr "oanvändbar hemlig nyckel"
 
-#: util/errors.c:107
+#: util/errors.c:108
 msgid "keyserver error"
 msgstr "nyckelserverfel"
 
-#: util/errors.c:108
+#: util/errors.c:109
 #, fuzzy
 msgid "canceled"
 msgstr "Avbryt"
 
-#: util/errors.c:109
+#: util/errors.c:110
 #, fuzzy
 msgid "no card"
 msgstr "inte krypterad"
 
-#: util/logger.c:157
+#: util/logger.c:158
 msgid "ERROR: "
 msgstr ""
 
-#: util/logger.c:160
+#: util/logger.c:161
 msgid "WARNING: "
 msgstr ""
 
-#: util/logger.c:223
+#: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... detta är ett fel i programmet (%s:%d:%s)\n"
 
-#: util/logger.c:229
+#: util/logger.c:230
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "du har hittat ett fel i programmet ... (%s:%d)\n"
 
-#: util/miscutil.c:336 util/miscutil.c:373
+#: util/miscutil.c:330 util/miscutil.c:367
 msgid "yes"
 msgstr "ja"
 
-#: util/miscutil.c:337 util/miscutil.c:378
+#: util/miscutil.c:331 util/miscutil.c:372
 msgid "yY"
 msgstr "jJ"
 
-#: util/miscutil.c:339 util/miscutil.c:375
+#: util/miscutil.c:333 util/miscutil.c:369
 msgid "no"
 msgstr "nej"
 
-#: util/miscutil.c:340 util/miscutil.c:379
+#: util/miscutil.c:334 util/miscutil.c:373
 msgid "nN"
 msgstr "nN"
 
-#: util/miscutil.c:377
+#: util/miscutil.c:371
 msgid "quit"
 msgstr "avsluta"
 
-#: util/miscutil.c:380
+#: util/miscutil.c:374
 msgid "qQ"
 msgstr "aA"
 
-#: util/miscutil.c:413
+#: util/miscutil.c:407
 msgid "okay|okay"
 msgstr ""
 
-#: util/miscutil.c:415
+#: util/miscutil.c:409
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:416
+#: util/miscutil.c:410
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:417
+#: util/miscutil.c:411
 #, fuzzy
 msgid "cC"
 msgstr "c"
 
-#: util/secmem.c:90
+#: util/secmem.c:91
 msgid "WARNING: using insecure memory!\n"
 msgstr "Varning: använder osäkert minne!\n"
 
-#: util/secmem.c:91
+#: util/secmem.c:92
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "se http://www.gnupg.org/faq.html för mer information\n"
 
-#: util/secmem.c:343
+#: util/secmem.c:344
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operationen är inte möjlig utan tillgång till säkert minne\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:345
 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"
 
+#, fuzzy
+#~ msgid "error getting serial number: %s\n"
+#~ msgstr "fel vid skapandet av lösenmening: %s\n"
+
+#~ msgid "Hint: Select the user IDs to sign\n"
+#~ msgstr "Tips: Välj de användarID:n du vill signera\n"
+
+#~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+#~ msgstr "Fel lösenmening eller okänd krypteringsalgoritm (%d)\n"
+
+# vad är detta?
+#~ msgid "can't set client pid for the agent\n"
+#~ msgstr "kan inte ange pid för GPG-Agent\n"
+
+# FD?
+#~ msgid "can't get server read FD for the agent\n"
+#~ msgstr "kan inte få server-läs FD för GPG-Agent\n"
+
+#~ msgid "can't get server write FD for the agent\n"
+#~ msgstr "kan inte få server-skriv FD för GPG-Agent\n"
+
+#~ msgid "communication problem with gpg-agent\n"
+#~ msgstr "problem vid kommunikation med GPG-Agent\n"
+
+#~ msgid "passphrase too long\n"
+#~ msgstr "lösenmeningen är för lång\n"
+
+#~ msgid "invalid response from agent\n"
+#~ msgstr "felaktigt svar från GPG-Agent\n"
+
+#~ msgid "problem with the agent: agent returns 0x%lx\n"
+#~ msgstr "problem med GPG-Agent: programmet svarar 0x%lx\n"
+
 #~ msgid "select secondary key N"
 #~ msgstr "välj undernyckel N"
 
diff --git a/po/tr.po b/po/tr.po
index e863df1e5..13b7fd25f 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,14 +1,13 @@
-# 
 # Turkish translations for GnuPG messages.
-# Copyright (C) 2003,2004 Free Software Foundation, Inc.
-# Nilgün Belma Bugüner <[email protected]>, 2001, ...,2003,2004.
+# Copyright (C) 2005 Free Software Foundation, Inc.
+# Nilgün Belma Bugüner <[email protected]>, 2001, ..., 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.2.2\n"
+"Project-Id-Version: gnupg 1.4.1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-03-15 16:35+0100\n"
-"PO-Revision-Date: 2004-07-08 08:10+0300\n"
+"POT-Creation-Date: 2005-05-31 10:05+0200\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"
 "MIME-Version: 1.0\n"
@@ -16,80 +15,80 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: cipher/primegen.c:120
-#, fuzzy, c-format
+#: cipher/primegen.c:121
+#, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
-msgstr "%d bitten daha küçük bir asal sayı üretilemiyor\n"
+msgstr "pbits=%u qbits=%u ile bir asal sayı üretilemez\n"
 
-#: cipher/primegen.c:311
+#: cipher/primegen.c:312
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
-msgstr "%d bitten daha küçük bir asal sayı üretilemiyor\n"
+msgstr "%d bitten daha küçük bir asal sayı ürtilemez\n"
 
-#: cipher/random.c:163
+#: cipher/random.c:164
 msgid "no entropy gathering module detected\n"
 msgstr "rasgele bayt elde etme modülü bulunamadı\n"
 
-#: cipher/random.c:387 g10/card-util.c:656 g10/card-util.c:725
-#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2255
-#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
-#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
-#: g10/tdbio.c:600
+#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
+#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
+#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
+#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
+#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/tdbio.c:601
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' açılamıyor: %s\n"
 
-#: cipher/random.c:391
+#: cipher/random.c:392
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "`%s' durumlanamıyor: %s\n"
 
-#: cipher/random.c:396
+#: cipher/random.c:397
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' düzenli bir dosya değil - görülmedi\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:402
 msgid "note: random_seed file is empty\n"
 msgstr "not: \"random_seed\" dosyası boş\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:408
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "UYARI: random_seed dosyasının boyu hatalı - kullanılmadı\n"
 
-#: cipher/random.c:415
+#: cipher/random.c:416
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "\"%s\" okunamıyor: %s\n"
 
-#: cipher/random.c:453
+#: cipher/random.c:454
 msgid "note: random_seed file not updated\n"
 msgstr "bilgi: \"random_seed\" dosyası güncel değil\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2723
-#: g10/keygen.c:2753 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
-#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "\"%s\" oluşturulamıyor: %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:481
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "\"%s\" yazılamıyor: %s\n"
 
-#: cipher/random.c:483
+#: cipher/random.c:484
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "\"%s\" kapatılamıyor: %s\n"
 
-#: cipher/random.c:728
+#: cipher/random.c:729
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "UYARI: kullanılan rasgele sayı üreteci güvenli değil!!\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:730
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -103,7 +102,7 @@ msgstr ""
 "BU PROGRAMLA ÜRETİLMİŞ HİÇBİR VERİYİ KULLANMAYIN!!\n"
 "\n"
 
-#: cipher/rndegd.c:204
+#: cipher/rndegd.c:205
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -112,7 +111,7 @@ msgstr ""
 "Lütfen bekleyin rasgele baytlar toplanıyor. Bu işlem sırasında başka\n"
 "işlere bakın, çünkü bu anahtarınızın daha kaliteli olmasını sağlayacak.\n"
 
-#: cipher/rndlinux.c:134
+#: cipher/rndlinux.c:135
 #, c-format
 msgid ""
 "\n"
@@ -124,816 +123,804 @@ msgstr ""
 "daha fazla rasgele bayt toplayabilmesi için işletim sistemine\n"
 "yardımcı olun! (%d bayt daha gerekiyor)\n"
 
-#: g10/app-openpgp.c:547
-#, fuzzy, c-format
+#: g10/app-openpgp.c:596
+#, c-format
 msgid "failed to store the fingerprint: %s\n"
-msgstr "\"TrustDB\" güvence veritabanı başlangıç aşamasında başarısız: %s\n"
+msgstr "parmakizinin saklanması başarısız oldu: %s\n"
 
-#: g10/app-openpgp.c:560
-#, fuzzy, c-format
+#: g10/app-openpgp.c:609
+#, c-format
 msgid "failed to store the creation date: %s\n"
-msgstr "anahtar zinciri belleği yeniden oluşturulurken hata: %s\n"
+msgstr "oluşturma tarihinin saklanması başarısız oldu: %s\n"
+
+#: g10/app-openpgp.c:977
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "anahtar okuması başarısız\n"
 
-#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
+#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+msgid "response does not contain the public key data\n"
+msgstr "yanıt genel anahtar verisi içermiyor\n"
+
+#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+msgid "response does not contain the RSA modulus\n"
+msgstr "yanıt RSA modülü içermiyor\n"
+
+#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+msgid "response does not contain the RSA public exponent\n"
+msgstr "yanıt RSA genel bileşenini içermiyor\n"
+
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
 #, c-format
 msgid "PIN callback returned error: %s\n"
-msgstr ""
+msgstr "PIN eylemcisi hata döndürdü: %s\n"
 
-#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
-msgstr ""
+msgstr "CHV%d için PIN çok kısa; asgari uzunluk: %d\n"
 
-#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
-#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
-#, fuzzy, c-format
+#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
+#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
+#, c-format
 msgid "verify CHV%d failed: %s\n"
-msgstr "keyserver send başarısızlığa uğradı: %s\n"
+msgstr "CHV%d doğrulaması başarısız oldu: %s\n"
 
-#: g10/app-openpgp.c:836
+#: g10/app-openpgp.c:1310
 msgid "access to admin commands is not configured\n"
-msgstr ""
+msgstr "yönetici komutlarına erişim yapılandırılmamış\n"
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
 msgid "error retrieving CHV status from card\n"
-msgstr ""
+msgstr "karttan CHV durumu alınırken hata\n"
 
-#: g10/app-openpgp.c:857
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
 msgid "card is permanently locked!\n"
-msgstr ""
+msgstr "kart kalıcı olarak kilitli!\n"
 
-#: g10/app-openpgp.c:862
+#: g10/app-openpgp.c:1336
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
+"kart kalıcı olarak kilitlenmeden önce %d Yönetici PIN kalmasına çalışılıyor\n"
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:869
+#: g10/app-openpgp.c:1343
 msgid "|A|Admin PIN"
-msgstr ""
+msgstr "|A|Yönetici PIN'i"
 
-#: g10/app-openpgp.c:1018
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:1492
 msgid "|AN|New Admin PIN"
-msgstr ""
+msgstr "|AN|Yeni Yönetici PIN'i"
 
-#: g10/app-openpgp.c:1018
+#: g10/app-openpgp.c:1492
 msgid "|N|New PIN"
-msgstr ""
+msgstr "|N|Yeni PIN"
 
-#: g10/app-openpgp.c:1022
-#, fuzzy, c-format
+#: g10/app-openpgp.c:1496
+#, c-format
 msgid "error getting new PIN: %s\n"
-msgstr "anahtar parolası oluşturulurken hata: %s\n"
+msgstr "yeni PIN alınırken hata: %s\n"
 
-#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
-#, fuzzy
+#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
 msgid "error reading application data\n"
-msgstr "anahtar bloğu okunurken hata: %s\n"
+msgstr "uygulama verisi okunurken hata\n"
 
-#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
-#, fuzzy
+#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
 msgid "error reading fingerprint DO\n"
-msgstr "%s: serbest kaydı okuma hatası: %s\n"
+msgstr "parmakizi DO okunurken hata\n"
 
-#: g10/app-openpgp.c:1104
-#, fuzzy
+#: g10/app-openpgp.c:1562
 msgid "key already exists\n"
-msgstr "`%s' zaten sıkıştırılmış\n"
+msgstr "anahtar zaten mevcut\n"
 
-#: g10/app-openpgp.c:1108
+#: g10/app-openpgp.c:1566
 msgid "existing key will be replaced\n"
-msgstr ""
+msgstr "mevcut anahtar konulacak\n"
 
-#: g10/app-openpgp.c:1110
-#, fuzzy
+#: g10/app-openpgp.c:1568
 msgid "generating new key\n"
-msgstr "yeni bir anahtar çifti üretir"
+msgstr "yeni anahtar üretiliyor\n"
 
-#: g10/app-openpgp.c:1120
-msgid "please wait while key is being generated ...\n"
+#: g10/app-openpgp.c:1735
+msgid "creation timestamp missing\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1135
-#, fuzzy
-msgid "generating key failed\n"
-msgstr "anahtar bloğu silinemedi: %s\n"
+#: g10/app-openpgp.c:1742
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1749
 #, fuzzy, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
+msgid "RSA public exponent missing or largerr than %d bits\n"
+msgstr "genel üs çok büyük (32 bitten fazla)\n"
 
-#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
-msgid "response does not contain the public key data\n"
+#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
-msgid "response does not contain the RSA modulus\n"
-msgstr ""
+#: g10/app-openpgp.c:1827
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "anahtarın saklanması başarısız: %s\n"
 
-#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
-msgid "response does not contain the RSA public exponent\n"
-msgstr ""
+#: g10/app-openpgp.c:1886
+msgid "please wait while key is being generated ...\n"
+msgstr "anahtar üretilene kadar lütfen bekleyiniz ....\n"
 
-#: g10/app-openpgp.c:1195
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
-msgstr ""
+#: g10/app-openpgp.c:1901
+msgid "generating key failed\n"
+msgstr "anahtar üretimi başarısızlığa uğradı\n"
 
-#: g10/app-openpgp.c:1356
+#: g10/app-openpgp.c:1904
 #, c-format
-msgid "signatures created so far: %lu\n"
-msgstr ""
+msgid "key generation completed (%d seconds)\n"
+msgstr "anahtar üretimi tamamlandı (%d saniye)\n"
 
-#: g10/app-openpgp.c:1364
-#, c-format
-msgid "PIN [sigs done: %lu]"
-msgstr ""
+#: g10/app-openpgp.c:1961
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr "OpenPGP kartının yapısı geçersiz (DO 0x93)\n"
 
-#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
-#, fuzzy, c-format
-msgid "can't access %s - invalid OpenPGP card?\n"
-msgstr "geçerli OpenPGP verisi yok\n"
+#: g10/app-openpgp.c:2130
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr "şu ana kadar oluşturulan imzalar: %lu\n"
 
-#: g10/app-openpgp.c:1731
+#: g10/app-openpgp.c:2138
 #, fuzzy, c-format
-msgid "error getting serial number: %s\n"
-msgstr "anahtar parolası oluşturulurken hata: %s\n"
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr "PIN [yapılan imza: %lu]"
 
-#: g10/app-openpgp.c:1826
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "\"TrustDB\" güvence veritabanı başlangıç aşamasında başarısız: %s\n"
+#: g10/app-openpgp.c:2399
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1868
-#, fuzzy
-msgid "reading the key failed\n"
-msgstr "anahtar bloğu silinemedi: %s\n"
+#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
+#, c-format
+msgid "can't access %s - invalid OpenPGP card?\n"
+msgstr "%s erişilebilir değil - OpenPGP kartı geçersiz olabilir mi?\n"
 
-#: g10/armor.c:317
+#: g10/armor.c:318
 #, c-format
 msgid "armor: %s\n"
 msgstr "zırh: %s\n"
 
-#: g10/armor.c:346
+#: g10/armor.c:347
 msgid "invalid armor header: "
 msgstr "zırh başlığı geçersiz: "
 
-#: g10/armor.c:353
+#: g10/armor.c:354
 msgid "armor header: "
 msgstr "zırh başlığı: "
 
-#: g10/armor.c:364
+#: g10/armor.c:365
 msgid "invalid clearsig header\n"
 msgstr "açıkça okunabilen imza başlığı geçersiz\n"
 
-#: g10/armor.c:416
+#: g10/armor.c:417
 msgid "nested clear text signatures\n"
 msgstr "açıkça okunabilen imzalar dahil edildi\n"
 
-#: g10/armor.c:551
-#, fuzzy
+#: g10/armor.c:552
 msgid "unexpected armor: "
 msgstr "beklenmeyen zırh: "
 
-#: g10/armor.c:563
+#: g10/armor.c:564
 msgid "invalid dash escaped line: "
 msgstr "araçizgisi escape'lı satır geçersiz: "
 
-#: g10/armor.c:715 g10/armor.c:1322
-#, fuzzy, c-format
+#: g10/armor.c:716 g10/armor.c:1323
+#, c-format
 msgid "invalid radix64 character %02X skipped\n"
-msgstr "geçersiz radix64 karakteri %02x atlandı\n"
+msgstr "geçersiz radix64 karakteri %02X atlandı\n"
 
-#: g10/armor.c:758
+#: g10/armor.c:759
 msgid "premature eof (no CRC)\n"
 msgstr "dosya sonu belirsiz (CRC yok)\n"
 
-#: g10/armor.c:792
+#: g10/armor.c:793
 msgid "premature eof (in CRC)\n"
 msgstr "dosya sonu belirsiz (CRC içinde)\n"
 
-#: g10/armor.c:800
+#: g10/armor.c:801
 msgid "malformed CRC\n"
 msgstr "CRC bozulmuş\n"
 
-#: g10/armor.c:804 g10/armor.c:1359
-#, fuzzy, c-format
+#: g10/armor.c:805 g10/armor.c:1360
+#, c-format
 msgid "CRC error; %06lX - %06lX\n"
-msgstr "CRC hatası; %06lx - %06lx\n"
+msgstr "CRC hatası; %06lX - %06lX\n"
 
-#: g10/armor.c:824
-#, fuzzy
+#: g10/armor.c:825
 msgid "premature eof (in trailer)\n"
 msgstr "dosya sonu belirsiz (kuyruk içinde)\n"
 
-#: g10/armor.c:828
+#: g10/armor.c:829
 msgid "error in trailer line\n"
 msgstr "kuyruk satırında hata\n"
 
-#: g10/armor.c:1137
+#: g10/armor.c:1138
 msgid "no valid OpenPGP data found.\n"
 msgstr "geçerli OpenPGP verisi yok\n"
 
-#: g10/armor.c:1142
+#: g10/armor.c:1143
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "geçersiz zırh: satır %d karakterden uzun\n"
 
-#: g10/armor.c:1146
+#: g10/armor.c:1147
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "zırh içinde uluslararası karakterler - büyük olasılıkla hatalı bir e-posta "
 "sunucusu kullanılmış\n"
 
-#: g10/card-util.c:58 g10/card-util.c:295
-#, fuzzy, c-format
+#: g10/card-util.c:63 g10/card-util.c:303
+#, c-format
 msgid "OpenPGP card not available: %s\n"
-msgstr "gizli anahtar kullanışsız"
+msgstr "OpenPGP anahtarı kullanılabilir değil: %s\n"
 
-#: g10/card-util.c:63
+#: g10/card-util.c:68
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
-msgstr ""
+msgstr "%s numaralı OpenPGP kartı saptandı\n"
 
-#: g10/card-util.c:70 g10/card-util.c:1329 g10/delkey.c:127 g10/keyedit.c:1430
-#: g10/keygen.c:2439 g10/revoke.c:216 g10/revoke.c:417
-#, fuzzy
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1510
+#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
 msgid "can't do this in batch mode\n"
-msgstr "bu önceden belirlenmiş işlemler kipinde (in batchmode) yapılamaz\n"
+msgstr "bu önceden betik kipinde yapılamaz\n"
 
-#: g10/card-util.c:97 g10/card-util.c:1108 g10/card-util.c:1191
-#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
-#: g10/keygen.c:1365
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
+#: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "Seçiminiz? "
 
-#: g10/card-util.c:206 g10/card-util.c:256
+#: g10/card-util.c:213 g10/card-util.c:263
 msgid "[not set]"
-msgstr ""
+msgstr "[belirtilmedi]"
 
-#: g10/card-util.c:391
-#, fuzzy
+#: g10/card-util.c:410
 msgid "male"
-msgstr "enable"
+msgstr "erkek"
 
-#: g10/card-util.c:392
-#, fuzzy
+#: g10/card-util.c:411
 msgid "female"
-msgstr "enable"
+msgstr "dişi"
 
-#: g10/card-util.c:392
-#, fuzzy
+#: g10/card-util.c:411
 msgid "unspecified"
-msgstr "Belirtilmiş bir neden yok"
+msgstr "belirtilmemiş"
 
-#: g10/card-util.c:419
-#, fuzzy
+#: g10/card-util.c:438
 msgid "not forced"
-msgstr "işlenemedi"
+msgstr "zorlanmadı"
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 msgid "forced"
-msgstr ""
+msgstr "zorlandı"
 
-#: g10/card-util.c:497
+#: g10/card-util.c:516
 msgid "Error: Only plain ASCII is currently allowed.\n"
-msgstr ""
+msgstr "Hata: Şimdilik sadece US-ASCII mümkün.\n"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:518
 msgid "Error: The \"<\" character may not be used.\n"
-msgstr ""
+msgstr "Hata: \"<\" karakteri kullanılmamalı.\n"
 
-#: g10/card-util.c:501
+#: g10/card-util.c:520
 msgid "Error: Double spaces are not allowed.\n"
-msgstr ""
+msgstr "Hata: Çift boşluğa izin verilmez.\n"
 
-#: g10/card-util.c:518
+#: g10/card-util.c:537
 msgid "Cardholder's surname: "
-msgstr ""
+msgstr "Kart sahibinin soyadı: "
 
-#: g10/card-util.c:520
+#: g10/card-util.c:539
 msgid "Cardholder's given name: "
-msgstr ""
+msgstr "Kart sahibinin adı: "
 
-#: g10/card-util.c:538
+#: g10/card-util.c:557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
-msgstr ""
+msgstr "Hata: İsimler birlikte çok uzun oluyor (sınır: %d karakter).\n"
 
-#: g10/card-util.c:559
-#, fuzzy
+#: g10/card-util.c:578
 msgid "URL to retrieve public key: "
-msgstr "karşılığı olan genel anahtar yok: `%s\n"
+msgstr "genel anahtarın alınacağı URL: "
 
-#: g10/card-util.c:567
+#: g10/card-util.c:586
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
-msgstr ""
+msgstr "Hata: URL çok uzun (sınır: %d karakter).\n"
 
-#: g10/card-util.c:665 g10/card-util.c:734 g10/import.c:261
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "\"%s\" okunurken hata: %s\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:692
 msgid "Login data (account name): "
-msgstr ""
+msgstr "Oturum açma verisi (hesap adı): "
 
-#: g10/card-util.c:683
+#: g10/card-util.c:702
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
-msgstr ""
+msgstr "Hata: Oturum açma verisi çok uzun (sınır: %d karakter).\n"
 
-#: g10/card-util.c:742
+#: g10/card-util.c:761
 msgid "Private DO data: "
-msgstr ""
+msgstr "Özel DO verisi: "
 
-#: g10/card-util.c:752
+#: g10/card-util.c:771
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
-msgstr ""
+msgstr "Hata: Özel DO çok uzun (sınır: %d karakter).\n"
 
-#: g10/card-util.c:772
-#, fuzzy
+#: g10/card-util.c:791
 msgid "Language preferences: "
-msgstr "güncelenmiş tercihler"
+msgstr "Dil tercihleri: "
 
-#: g10/card-util.c:780
-#, fuzzy
+#: g10/card-util.c:799
 msgid "Error: invalid length of preference string.\n"
-msgstr "tercih dizgesindeki karakter geçersiz\n"
+msgstr "Hata: tercih dizgesinin uzunluğu geçersiz.\n"
 
-#: g10/card-util.c:789
-#, fuzzy
+#: g10/card-util.c:808
 msgid "Error: invalid characters in preference string.\n"
-msgstr "tercih dizgesindeki karakter geçersiz\n"
+msgstr "Hata: tercih dizgesindeki karakterler geçersiz.\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:829
 msgid "Sex ((M)ale, (F)emale or space): "
-msgstr ""
+msgstr "Cinsiyet ((E)rkek, (D)işi veya boşluk): "
 
-#: g10/card-util.c:824
-#, fuzzy
+#: g10/card-util.c:843
 msgid "Error: invalid response.\n"
-msgstr "hata: parmakizi geçersiz\n"
+msgstr "Hata: yanıt geçersiz.\n"
 
-#: g10/card-util.c:845
-#, fuzzy
+#: g10/card-util.c:864
 msgid "CA fingerprint: "
-msgstr " Parmak izi:"
+msgstr "CA parmak izi: "
 
-#: g10/card-util.c:868
-#, fuzzy
+#: g10/card-util.c:887
 msgid "Error: invalid formatted fingerprint.\n"
-msgstr "hata: parmakizi geçersiz\n"
+msgstr "Hata: biçimli parmakizi geçersiz\n"
 
-#: g10/card-util.c:916
-#, fuzzy, c-format
+#: g10/card-util.c:935
+#, c-format
 msgid "key operation not possible: %s\n"
-msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
+msgstr "anahtar işlemi mümkün değil: %s\n"
 
-#: g10/card-util.c:917
-#, fuzzy
+#: g10/card-util.c:936
 msgid "not an OpenPGP card"
-msgstr "geçerli OpenPGP verisi yok\n"
+msgstr "bir OpenPGP kartı değil"
 
-#: g10/card-util.c:926
-#, fuzzy, c-format
+#: g10/card-util.c:945
+#, c-format
 msgid "error getting current key info: %s\n"
-msgstr "`%s' gixli anahtar zincirine yazılırken hata oluştu: %s\n"
+msgstr "geçerli anahtar bilgisi alınırken hata: %s\n"
 
-#: g10/card-util.c:1009
-#, fuzzy
+#: g10/card-util.c:1030
 msgid "Replace existing key? (y/N) "
-msgstr "Gerçekten imzalayacak mısınız? (e/H) "
+msgstr "Mevcut anahtar değiştirilsin mi? (e/H ya da y/N) "
 
-#: g10/card-util.c:1030 g10/card-util.c:1039
+#: g10/card-util.c:1051 g10/card-util.c:1060
 msgid "Make off-card backup of encryption key? (Y/n) "
-msgstr ""
+msgstr "Şifreli anahtarın kartsız yedeği yapılsın mı? (E/h ya da Y/n) "
 
-#: g10/card-util.c:1051
-#, fuzzy
+#: g10/card-util.c:1072
 msgid "Replace existing keys? (y/N) "
-msgstr "Gerçekten imzalayacak mısınız? (e/H) "
+msgstr "Mevcut anahtarlar değiştirilsin mi? (e/H ya da y/N) "
 
-#: g10/card-util.c:1060
+#: g10/card-util.c:1081
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
 "   PIN = `%s'     Admin PIN = `%s'\n"
 "You should change them using the command --change-pin\n"
 msgstr ""
+"Lütfen dikkat edin, PIN'lerin öntanımlı ayarları böyledir:\n"
+"   PIN = `%s'     Admin PIN = `%s'\n"
+"Bunları --change-pin komutunu kullanarak değiştirmelisiniz\n"
 
-#: g10/card-util.c:1099
-#, fuzzy
+#: g10/card-util.c:1120
 msgid "Please select the type of key to generate:\n"
-msgstr "Lütfen istediğiniz anahtarı seçiniz:\n"
+msgstr "Lütfen üretilecek anahtar türünü seçiniz:\n"
 
-#: g10/card-util.c:1101 g10/card-util.c:1182
-#, fuzzy
+#: g10/card-util.c:1122 g10/card-util.c:1203
 msgid "   (1) Signature key\n"
-msgstr "Bu imzanın geçerliliği %s de bitti.\n"
+msgstr "   (1) İmzalama anahtarı\n"
 
-#: g10/card-util.c:1102 g10/card-util.c:1184
-#, fuzzy
+#: g10/card-util.c:1123 g10/card-util.c:1205
 msgid "   (2) Encryption key\n"
-msgstr "   (%d) RSA (sadece şifrelemek için)\n"
+msgstr "   (2) Şifreleme anahtarı\n"
 
-#: g10/card-util.c:1103 g10/card-util.c:1186
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
-msgstr ""
+msgstr "   (3) Kimlik kanıtlama anahtarı\n"
 
-#: g10/card-util.c:1119 g10/card-util.c:1202 g10/keyedit.c:908
-#: g10/keygen.c:1404 g10/revoke.c:642
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
+#: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "Seçim geçersiz.\n"
 
-#: g10/card-util.c:1179
-#, fuzzy
+#: g10/card-util.c:1200
 msgid "Please select where to store the key:\n"
-msgstr "Lütfen bir yürürlükten kaldırma sebebi seçiniz:\n"
+msgstr "Lütfen anahtarın saklanacağı yeri seçiniz:\n"
 
-#: g10/card-util.c:1214
-#, fuzzy
+#: g10/card-util.c:1235
 msgid "unknown key protection algorithm\n"
-msgstr "bilinmeyen sıkıştırma algoritması\n"
+msgstr "bilinmeyen anahtar koruma algoritması\n"
 
-#: g10/card-util.c:1219
-#, fuzzy
+#: g10/card-util.c:1240
 msgid "secret parts of key are not available\n"
-msgstr "Asıl anahtarın gizli parçaları kullanılamaz.\n"
+msgstr "anahtarın gizli parçaları kullanılabilir değil\n"
 
-#: g10/card-util.c:1224
-#, fuzzy
+#: g10/card-util.c:1245
 msgid "secret key already stored on a card\n"
-msgstr "atlandı: gizli anahtar zaten var\n"
+msgstr "gizli anahtar zaten bir kartın üzerinde saklı\n"
 
-#: g10/card-util.c:1294 g10/keyedit.c:1317
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "bu menüden çık"
 
-#: g10/card-util.c:1296
-#, fuzzy
+#: g10/card-util.c:1318
 msgid "show admin commands"
-msgstr "çelişen komutlar\n"
+msgstr "yönetici komutlarını gösterir"
 
-#: g10/card-util.c:1297 g10/keyedit.c:1320
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
-msgstr "bunu gösterir "
+msgstr "bunu gösterir"
 
-#: g10/card-util.c:1299
-#, fuzzy
+#: g10/card-util.c:1321
 msgid "list all available data"
-msgstr "Anahtar burada: "
+msgstr "tüm kullanılabilir veriyi listeler"
 
-#: g10/card-util.c:1302
+#: g10/card-util.c:1324
 msgid "change card holder's name"
-msgstr ""
+msgstr "kart sahibinin ismini değiştirir"
 
-#: g10/card-util.c:1303
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
-msgstr ""
+msgstr "anahtarın alınacağı URL değiştirilir"
 
-#: g10/card-util.c:1304
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
-msgstr ""
+msgstr "kart URL'sinde belirtilmiş anahtarı alır"
 
-#: g10/card-util.c:1305
-#, fuzzy
+#: g10/card-util.c:1327
 msgid "change the login name"
-msgstr "son kullanım tarihini değiştirir"
+msgstr "oturum açma ismini değiştirir"
 
-#: g10/card-util.c:1306
-#, fuzzy
+#: g10/card-util.c:1328
 msgid "change the language preferences"
-msgstr "sahibiningüvencesini değiştirir"
+msgstr "dil tercihlerini değiştirir"
 
-#: g10/card-util.c:1307
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
-msgstr ""
+msgstr "kart sahibinin cinsiyetini değiştirir"
 
-#: g10/card-util.c:1308
-#, fuzzy
+#: g10/card-util.c:1330
 msgid "change a CA fingerprint"
-msgstr "parmak izini gösterir"
+msgstr "bir CA parmakizini değiştirir"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
-msgstr ""
+msgstr "imza zorlama PIN'i bayrağını değiştirir"
 
-#: g10/card-util.c:1310
-#, fuzzy
+#: g10/card-util.c:1332
 msgid "generate new keys"
-msgstr "yeni bir anahtar çifti üretir"
+msgstr "yeni anahtarlar üretir"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
+msgstr "PIN değiştirmek için menü"
+
+#: g10/card-util.c:1334
+msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1377 g10/keyedit.c:1526
+#: g10/card-util.c:1454 g10/keyedit.c:1609
 msgid "Command> "
 msgstr "Komut> "
 
-#: g10/card-util.c:1412
-#, fuzzy
+#: g10/card-util.c:1492
 msgid "Admin-only command\n"
-msgstr "çelişen komutlar\n"
+msgstr "Yöneticiye özel komut\n"
 
-#: g10/card-util.c:1428
-#, fuzzy
+#: g10/card-util.c:1523
 msgid "Admin commands are allowed\n"
-msgstr "çelişen komutlar\n"
+msgstr "Yönetici komutlarına izin verilir\n"
 
-#: g10/card-util.c:1430
-#, fuzzy
+#: g10/card-util.c:1525
 msgid "Admin commands are not allowed\n"
-msgstr "gizli anahtarı `%s'e yazıyor\n"
+msgstr "Yönetici komutlarına izin verilmez\n"
 
-#: g10/card-util.c:1499 g10/keyedit.c:2104
+#: g10/card-util.c:1599 g10/keyedit.c:2210
 msgid "Invalid command  (try \"help\")\n"
-msgstr "Komut geçersiz (\"yardım\" komutunu deneyin)\n"
+msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n"
 
-#: g10/cardglue.c:287
+#: g10/cardglue.c:396
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
+"Lüthen kartı yerleştirdikten sonra ya <enter> ya da iptal için 'c' tuşlayın: "
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:519
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
+"Mevcut kartı kaldırdıktan sonra lütfen seri numarası\n"
+"   %.*s\n"
+"olan kartı yerleştirin.\n"
 
-#: g10/cardglue.c:380
+#: g10/cardglue.c:527
 msgid "Hit return when ready or enter 'c' to cancel: "
-msgstr ""
+msgstr "Hazır olunca <enter> ya da iptal etmek için 'c' tuşlayın: "
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:852
 msgid "Enter New Admin PIN: "
-msgstr ""
+msgstr "Yeni Yönetici PIN'ini girin: "
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:853
 msgid "Enter New PIN: "
-msgstr ""
+msgstr "Yeni PIN'i girin: "
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:854
 msgid "Enter Admin PIN: "
-msgstr ""
+msgstr "Yönetici PIN'ini girin: "
 
-#: g10/cardglue.c:691
+#: g10/cardglue.c:855
 msgid "Enter PIN: "
-msgstr ""
+msgstr "PIN'i girin: "
 
-#: g10/cardglue.c:705
-#, fuzzy
+#: g10/cardglue.c:872
 msgid "Repeat this PIN: "
-msgstr "Tekrar: "
+msgstr "Bu PIN'i tekrarlayın: "
 
-#: g10/cardglue.c:719
-#, fuzzy
+#: g10/cardglue.c:886
 msgid "PIN not correctly repeated; try again"
-msgstr ""
-"ikinci kez yazdığınız anahtar parolası ilkiyle aynı değil; işlem "
-"tekrarlanacak"
+msgstr "PIN doğru tekrarlanmadı; tekrar deneyin"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
-#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' açılamadı\n"
 
-#: g10/decrypt.c:104 g10/encode.c:859
+#: g10/decrypt.c:105 g10/encode.c:846
 msgid "--output doesn't work for this command\n"
 msgstr "--output seçeneği bu komutla çalışmaz\n"
 
-#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3167 g10/keyserver.c:1511
-#: g10/revoke.c:226
-#, fuzzy, c-format
+#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3346 g10/keyserver.c:1541
+#: g10/revoke.c:227
+#, c-format
 msgid "key \"%s\" not found: %s\n"
-msgstr "anahtar `%s' yok: %s\n"
+msgstr "anahtar \"%s\" yok: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2300 g10/keyserver.c:1525
-#: g10/revoke.c:232 g10/revoke.c:439
+#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "anahtar bloğu okunurken hata: %s\n"
 
-#: g10/delkey.c:128 g10/delkey.c:135
+#: g10/delkey.c:129 g10/delkey.c:136
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(anahtarı parmak izi ile belirtmedikçe)\n"
 
-#: g10/delkey.c:134
-#, fuzzy
+#: g10/delkey.c:135
 msgid "can't do this in batch mode without \"--yes\"\n"
-msgstr "önceden belirlenmiş işlemler kipinde \"--yes\" olmaksızın yapılamaz\n"
+msgstr "betik kipinde \"--yes\" olmaksızın bu yapılamaz\n"
 
-#: g10/delkey.c:146
-#, fuzzy
+#: g10/delkey.c:147
 msgid "Delete this key from the keyring? (y/N) "
-msgstr "Bu anahtar, anahtar zincirinden silinsin mi? "
+msgstr "Bu anahtar, anahtar zincirinden silinsin mi? (e/H ya da y/N) "
 
-#: g10/delkey.c:154
-#, fuzzy
+#: g10/delkey.c:155
 msgid "This is a secret key! - really delete? (y/N) "
-msgstr "Bu bir gizli anahtar! - gerçekten silinecek mi? "
+msgstr "Bu bir gizli anahtar! - gerçekten silinecek mi? (e/H veya y/N)"
 
-#: g10/delkey.c:164
+#: g10/delkey.c:165
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "anahtar bloğu silinemedi: %s\n"
 
-#: g10/delkey.c:174
+#: g10/delkey.c:175
 msgid "ownertrust information cleared\n"
 msgstr "sahibinin güvencesi bilgisi temizlendi\n"
 
-#: g10/delkey.c:205
+#: g10/delkey.c:206
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "genel anahtar \"%s\" için bir gizli anahtar var!\n"
 
-#: g10/delkey.c:207
+#: g10/delkey.c:208
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "onu önce \"--delete-secret-keys\" ile silmelisiniz.\n"
 
-#: g10/encode.c:210 g10/sign.c:1186
+#: g10/encode.c:211 g10/sign.c:1218
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "anahtar parolası oluşturulurken hata: %s\n"
 
-#: g10/encode.c:215
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "S2K kipi sayesinde bir simetrik ESK paketi kullanılamıyor\n"
 
-#: g10/encode.c:228
+#: g10/encode.c:229
 #, c-format
 msgid "using cipher %s\n"
-msgstr "%s şifresi kullanılıyor\n"
+msgstr "%s şifrelemesi kullanılıyor\n"
 
-#: g10/encode.c:238 g10/encode.c:558
+#: g10/encode.c:239 g10/encode.c:545
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' zaten sıkıştırılmış\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
+#: g10/encode.c:302 g10/encode.c:591 g10/sign.c:566
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "UYARI: \"%s\" dosyası boş\n"
 
-#: g10/encode.c:472
+#: g10/encode.c:466
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "--pgp2 kipinde sadece 2048 bitlik RSA anahtarları ile şifreleme "
 "yapabilirsiniz\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:488
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "`%s'den okunuyor\n"
 
-#: g10/encode.c:530
+#: g10/encode.c:517
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "tüm anahtarları şifrelemek için IDEA şifresi kullanılamaz.\n"
 
-#: g10/encode.c:540
-#, fuzzy, c-format
+#: g10/encode.c:527
+#, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
-"alıcının tercihleriyle çelişen %s (%d) simetrik şifre kullanımı zorlanıyor\n"
+"UYARI: alıcının tercihleriyle çelişen %s (%d) simetrik şifre kullanımı "
+"zorlanıyor\n"
 
-#: g10/encode.c:648 g10/sign.c:877
-#, fuzzy, c-format
+#: g10/encode.c:635 g10/sign.c:899
+#, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr ""
-"alıcının tercihleriyle çelişen %s (%d) sıkıştırma algoritması kullanılmak "
-"isteniyor\n"
+"UYARI: alıcının tercihleriyle çelişen %s (%d) sıkıştırma algoritması "
+"kullanılmak isteniyor\n"
 
-#: g10/encode.c:735
+#: g10/encode.c:722
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "alıcının tercihleriyle çelişen %s (%d) simetrik şifre kullanımı zorlanıyor\n"
 
-#: g10/encode.c:805 g10/pkclist.c:721 g10/pkclist.c:757
+#: g10/encode.c:792 g10/pkclist.c:722 g10/pkclist.c:758
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
 
-#: g10/encode.c:832
+#: g10/encode.c:819
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s \"%s\" için şifrelendi\n"
 
-#: g10/encr-data.c:66 g10/mainproc.c:301
+#: g10/encr-data.c:67 g10/mainproc.c:302
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s şifreli veri\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:305
+#: g10/encr-data.c:69 g10/mainproc.c:306
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "bilinmeyen algoritma %d ile şifrelenmiş\n"
 
-#: g10/encr-data.c:92
+#: g10/encr-data.c:93
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "UYARI: ileti simetrik şifre içindeki zayıf bir anahtarla şifrelendi.\n"
 
-#: g10/encr-data.c:103
+#: g10/encr-data.c:104
 msgid "problem handling encrypted packet\n"
 msgstr "şifreli paketin elde edilmesinde sorun var\n"
 
-#: g10/exec.c:48
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "uzaktan uygulama çalıştırılması desteklenmiyor\n"
 
-#: g10/exec.c:184 g10/openfile.c:406
+#: g10/exec.c:173 g10/openfile.c:410
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "`%s' dizini oluşturulamıyor: %s\n"
 
-#: g10/exec.c:325
+#: g10/exec.c:314
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "güvensiz options dosyası yetkilerinden dolayı dış program çağrıları iptal\n"
 "edildi\n"
 
-#: g10/exec.c:355
-#, fuzzy
+#: g10/exec.c:344
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "bu platformda, dış uygulamalar çalıştırılırken geçici dosyalar gerekiyor\n"
 
-#: g10/exec.c:433
-#, fuzzy, c-format
+#: g10/exec.c:422
+#, c-format
 msgid "unable to execute program `%s': %s\n"
-msgstr " %s \"%s\" çalıştırılamıyor: %s\n"
+msgstr " '%s' çalıştırılamıyor: %s\n"
 
-#: g10/exec.c:436
-#, fuzzy, c-format
+#: g10/exec.c:425
+#, c-format
 msgid "unable to execute shell `%s': %s\n"
-msgstr " %s \"%s\" çalıştırılamıyor: %s\n"
+msgstr "'%s' kabuğu çalıştırılamıyor: %s\n"
 
-#: g10/exec.c:521
+#: g10/exec.c:510
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "dış uygulama çalıştırılırken sistem hatası: %s\n"
 
-#: g10/exec.c:532 g10/exec.c:598
+#: g10/exec.c:521 g10/exec.c:587
 msgid "unnatural exit of external program\n"
 msgstr "Dış uygulamamnın doğal olmayan çıkışı\n"
 
-#: g10/exec.c:547
+#: g10/exec.c:536
 msgid "unable to execute external program\n"
 msgstr "dış uygulama çalıştırılamıyor\n"
 
-#: g10/exec.c:563
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "dış uygulamanın yanıtı okunamıyor: %s\n"
 
-#: g10/exec.c:609 g10/exec.c:616
+#: g10/exec.c:598 g10/exec.c:605
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "UYARI: geçici dosya silinemiyor (%s) `%s': %s\n"
 
-#: g10/exec.c:621
+#: g10/exec.c:610
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "UYARI: %s geçici dizini silinemiyor: %s\n"
 
-#: g10/export.c:183
-#, fuzzy
+#: g10/export.c:184
 msgid "exporting secret keys not allowed\n"
-msgstr "gizli anahtarı `%s'e yazıyor\n"
+msgstr "gizli anahtarların ihracına izin verilmez\n"
 
-#: g10/export.c:212
-#, fuzzy, c-format
+#: g10/export.c:213
+#, c-format
 msgid "key %s: not protected - skipped\n"
-msgstr "%08lX anahtarı: korunmamış - atlandı\n"
+msgstr "anahtar %s: korunmamış - atlandı\n"
 
-#: g10/export.c:220
-#, fuzzy, c-format
+#: g10/export.c:221
+#, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
-msgstr "%08lX anahtarı: PGP 2.x tarzı bir anahtar - atlandı\n"
+msgstr "anahtar %s: PGP 2.x tarzı bir anahtar - atlandı\n"
 
-#: g10/export.c:395
-#, fuzzy, c-format
+#: g10/export.c:398
+#, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
-msgstr "UYARI: gizli anahtar %08lX basit bir SK sağlamasına sahip değil\n"
+msgstr "UYARI: gizli anahtar %s basit bir SK sağlamasına sahip değil\n"
 
-#: g10/export.c:427
+#: g10/export.c:430
 msgid "WARNING: nothing exported\n"
 msgstr "UYARI: hiçbir şey dışarı aktarılmadı\n"
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid ""
 "@Commands:\n"
 " "
@@ -941,128 +928,127 @@ msgstr ""
 "@Komutlar:\n"
 " "
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "|[file]|make a signature"
 msgstr "|[dosya]|bir imza yapar"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosya]|açıkça okunabilen bir imza yapar"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "make a detached signature"
 msgstr "bağımsız bir imza yapar"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encrypt data"
 msgstr "veriyi şifreler"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "encryption only with symmetric cipher"
 msgstr "sadece simetrik şifre ile şifreler"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "decrypt data (default)"
 msgstr "veri şifresini açar (öntanımlı)"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "verify a signature"
 msgstr "bir imzayı doğrular"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys"
 msgstr "anahtarları listeler"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and signatures"
 msgstr "anahtarları ve imzaları listeler"
 
-#: g10/g10.c:376
-#, fuzzy
+#: g10/g10.c:378
 msgid "list and check key signatures"
-msgstr "anahtar imzalarını kontrol eder"
+msgstr "anahtar imzalarını listeler ve sınar"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "list keys and fingerprints"
 msgstr "anahtarları ve parmak izlerini listeler"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "list secret keys"
 msgstr "gizli anahtarları listeler"
 
-#: g10/g10.c:379
+#: g10/g10.c:381
 msgid "generate a new key pair"
 msgstr "yeni bir anahtar çifti üretir"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the public keyring"
 msgstr "anahtarları genel anahtar zincirinden siler"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "remove keys from the secret keyring"
 msgstr "anahtarları gizli anahtar zincirinden siler"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign a key"
 msgstr "bir anahtarı imzalar"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "sign a key locally"
 msgstr "bir anahtarı yerel olarak imzalar"
 
-#: g10/g10.c:385
+#: g10/g10.c:387
 msgid "sign or edit a key"
 msgstr "bir anahtarı düzenler ve imzalar"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "generate a revocation certificate"
 msgstr "bir yürürlükten kaldırma sertifikası üretir"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "export keys"
 msgstr "anahtarları gönderir"
 
-#: g10/g10.c:389
+#: g10/g10.c:391
 msgid "export keys to a key server"
 msgstr "anahtarları bir anahtar sunucusuna gönderir"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "import keys from a key server"
 msgstr "anahtarları bir anahtar sunucusundan indirir"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "search for keys on a key server"
 msgstr "bir anahtar sunucusunda anahtarları arar"
 
-#: g10/g10.c:394
+#: g10/g10.c:396
 msgid "update all keys from a keyserver"
 msgstr "anahtarları bir anahtar sunucusundan günceller"
 
-#: g10/g10.c:397
+#: g10/g10.c:399
 msgid "import/merge keys"
 msgstr "anahtarları indirir/katıştırır"
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "print the card status"
-msgstr ""
+msgstr "kart durumunu basar"
 
-#: g10/g10.c:401
+#: g10/g10.c:403
 msgid "change data on a card"
-msgstr ""
+msgstr "kart üzerindeki veriyi değiştirir"
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "change a card's PIN"
-msgstr ""
+msgstr "bir kartın PIN'ini değiştirir"
 
-#: g10/g10.c:410
+#: g10/g10.c:412
 msgid "update the trust database"
 msgstr "güvence veritabanını günceller"
 
-#: g10/g10.c:417
+#: g10/g10.c:419
 msgid "|algo [files]|print message digests"
 msgstr "|algo [dosyalar]|ileti özümlemelerini gösterir"
 
-#: g10/g10.c:421 g10/gpgv.c:66
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1072,51 +1058,51 @@ msgstr ""
 "Seçenekler:\n"
 " "
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "create ascii armored output"
 msgstr "ascii zırhlı çıktı oluşturur"
 
-#: g10/g10.c:425
+#: g10/g10.c:427
 msgid "|NAME|encrypt for NAME"
 msgstr "|İSİM|İSİM için şifreleme yapar"
 
-#: g10/g10.c:436
+#: g10/g10.c:438
 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/g10.c:437
+#: g10/g10.c:439
 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/g10.c:442
+#: g10/g10.c:444
 msgid "use canonical text mode"
 msgstr "kurallı metin kipini kullanır"
 
-#: g10/g10.c:452
+#: g10/g10.c:458
 msgid "use as output file"
 msgstr "çıktı dosyası olarak kullanılır"
 
-#: g10/g10.c:454 g10/gpgv.c:68
+#: g10/g10.c:460 g10/gpgv.c:73
 msgid "verbose"
 msgstr "çok detaylı"
 
-#: g10/g10.c:465
+#: g10/g10.c:471
 msgid "do not make any changes"
 msgstr "hiçbir değişiklik yapmaz"
 
-#: g10/g10.c:466
+#: g10/g10.c:472
 msgid "prompt before overwriting"
 msgstr "üzerine yazmadan önce sorar"
 
-#: g10/g10.c:507
+#: g10/g10.c:513
 msgid "use strict OpenPGP behavior"
-msgstr ""
+msgstr "kesin OpenPGP davranışı etkin olur"
 
-#: g10/g10.c:508
+#: g10/g10.c:514
 msgid "generate PGP 2.x compatible messages"
-msgstr ""
+msgstr "PGP 2.x uyumlu iletiler üretilir"
 
-#: g10/g10.c:536
+#: g10/g10.c:542
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1124,7 +1110,7 @@ msgstr ""
 "@\n"
 "(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
 
-#: g10/g10.c:539
+#: g10/g10.c:545
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1144,15 +1130,17 @@ msgstr ""
 " --list-keys [isimler]      anahtarları listeler\n"
 " --fingerprint [isimler]    parmak izlerini gösterir\n"
 
-#: g10/g10.c:720 g10/gpgv.c:93
+#: g10/g10.c:724 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
-msgstr "Yazılım hatalarını lütfen <[email protected]> adresine bildirin.\n"
+msgstr ""
+"Yazılım hatalarını lütfen <[email protected]> adresine,\n"
+"çeviri hatalarını ise <[email protected]> adresine bildiriniz.\n"
 
-#: g10/g10.c:737
+#: g10/g10.c:741
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
 
-#: g10/g10.c:740
+#: g10/g10.c:744
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1162,7 +1150,7 @@ msgstr ""
 "imzalama, kontrol, şifreleme veya çözme\n"
 "öntanımlı işlem girilen veriye bağımlıdır\n"
 
-#: g10/g10.c:751
+#: g10/g10.c:755
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1170,457 +1158,459 @@ msgstr ""
 "\n"
 "Desteklenen algoritmalar:\n"
 
-#: g10/g10.c:754
+#: g10/g10.c:758
 msgid "Pubkey: "
 msgstr "GenAnah: "
 
-#: g10/g10.c:760 g10/keyedit.c:2141
+#: g10/g10.c:764 g10/keyedit.c:2248
 msgid "Cipher: "
 msgstr "Şifre: "
 
-#: g10/g10.c:766
+#: g10/g10.c:770
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:772 g10/keyedit.c:2187
+#: g10/g10.c:776 g10/keyedit.c:2294
 msgid "Compression: "
 msgstr "Sıkıştırma: "
 
-#: g10/g10.c:855
+#: g10/g10.c:859
 msgid "usage: gpg [options] "
 msgstr "kullanımı: gpg [seçenekler] "
 
-#: g10/g10.c:1003
+#: g10/g10.c:1007
 msgid "conflicting commands\n"
 msgstr "çelişen komutlar\n"
 
-#: g10/g10.c:1021
-#, fuzzy, c-format
+#: g10/g10.c:1025
+#, c-format
 msgid "no = sign found in group definition `%s'\n"
-msgstr "grup tanımı \"%s\" içinde = işareti yok\n"
+msgstr "grup tanımı '%s' içinde = işareti yok\n"
 
-#: g10/g10.c:1218
-#, fuzzy, c-format
+#: g10/g10.c:1222
+#, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
-msgstr "UYARI: %s \"%s\" için güvensiz iyelik\n"
+msgstr "UYARI: '%s' evdizininde güvensiz iyelik\n"
 
-#: g10/g10.c:1221
-#, fuzzy, c-format
+#: g10/g10.c:1225
+#, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
-msgstr "UYARI: %s \"%s\" için güvensiz iyelik\n"
+msgstr "UYARI: '%s' yapılandırma dosyasında güvensiz iyelik\n"
 
-#: g10/g10.c:1224
-#, fuzzy, c-format
+#: g10/g10.c:1228
+#, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
-msgstr "UYARI: %s \"%s\" için güvensiz iyelik\n"
+msgstr "UYARI: '%s' eklentisinde güvensiz iyelik\n"
 
-#: g10/g10.c:1230
-#, fuzzy, c-format
+#: g10/g10.c:1234
+#, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
-msgstr "UYARI: %s \"%s\" de güvensiz izinler\n"
+msgstr "UYARI: UYARI: '%s' evdizininde güvensiz izinler\n"
 
-#: g10/g10.c:1233
-#, fuzzy, c-format
+#: g10/g10.c:1237
+#, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
-msgstr "UYARI: %s \"%s\" de güvensiz izinler\n"
+msgstr "UYARI: '%s' yapılandırma dosyasında güvensiz izinler\n"
 
-#: g10/g10.c:1236
-#, fuzzy, c-format
+#: g10/g10.c:1240
+#, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
-msgstr "UYARI: %s \"%s\" de güvensiz izinler\n"
+msgstr "UYARI: '%s' eklentisinde güvensiz izinler\n"
 
-#: g10/g10.c:1242
-#, fuzzy, c-format
+#: g10/g10.c:1246
+#, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
-msgstr "UYARI: %s \"%s\" de güvensiz iliştirilen dizin iyeliği\n"
+msgstr "UYARI: '%s' evdizinindeki ilgili dizinin iyeliği güvensiz\n"
 
-#: g10/g10.c:1245
-#, fuzzy, c-format
+#: g10/g10.c:1249
+#, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
-msgstr "UYARI: %s \"%s\" de güvensiz iliştirilen dizin iyeliği\n"
+msgstr "UYARI: '%s' yapılandırma dosyasını içeren dizinin iyeliği güvensiz\n"
 
-#: g10/g10.c:1248
-#, fuzzy, c-format
+#: g10/g10.c:1252
+#, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
-msgstr "UYARI: %s \"%s\" de güvensiz iliştirilen dizin iyeliği\n"
+msgstr "UYARI: '%s' eklentisini içeren dizinin iyeliği güvensiz\n"
 
-#: g10/g10.c:1254
-#, fuzzy, c-format
+#: g10/g10.c:1258
+#, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
-msgstr "UYARI: %s \"%s\" de güvensiz iliştirilen dizin izinleri\n"
+msgstr "UYARI: '%s' evdizinindeki ilgili dizinin izinleri güvensiz\n"
 
-#: g10/g10.c:1257
-#, fuzzy, c-format
+#: g10/g10.c:1261
+#, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
-msgstr "UYARI: %s \"%s\" de güvensiz iliştirilen dizin izinleri\n"
+msgstr "UYARI: '%s' yapılandırma dosyasını içeren dizinin izinleri güvensiz\n"
 
-#: g10/g10.c:1260
-#, fuzzy, c-format
+#: g10/g10.c:1264
+#, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
-msgstr "UYARI: %s \"%s\" de güvensiz iliştirilen dizin izinleri\n"
+msgstr "UYARI: '%s' eklentisini içeren dizinin izinleri güvensiz\n"
 
-#: g10/g10.c:1401
-#, fuzzy, c-format
+#: g10/g10.c:1405
+#, c-format
 msgid "unknown configuration item `%s'\n"
-msgstr "bilinmeyen yapılandırma öğesi \"%s\"\n"
+msgstr "yapılandırma öğesi '%s' bilinmiyor\n"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1802
 #, 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/g10.c:1838
+#: g10/g10.c:1844
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "BİLGİ: \"%s\" öntanımlı seçenek dosyası yok\n"
 
-#: g10/g10.c:1842
+#: g10/g10.c:1848
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "seçenek dosyası \"%s\": %s\n"
 
-#: g10/g10.c:1849
+#: g10/g10.c:1855
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "\"%s\"den seçenekler okunuyor\n"
 
-#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "BİLGİ: %s normal kullanım için değil!\n"
 
-#: g10/g10.c:2076
-#, fuzzy, c-format
+#: g10/g10.c:2082
+#, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
-msgstr "şifre uzantısı \"%s\" güvensiz izinlerden dolayı yüklenmedi\n"
+msgstr "şifre eklentisi '%s' güvensiz izinlerden dolayı yüklenmedi\n"
 
-#: g10/g10.c:2293
+#: g10/g10.c:2236 g10/g10.c:2248
 #, fuzzy, c-format
+msgid "`%s' is not a valid signature expiration\n"
+msgstr "'%s' geçerli bir karakter kümesi değil\n"
+
+#: g10/g10.c:2321
+#, c-format
 msgid "`%s' is not a valid character set\n"
-msgstr "%s geçerli bir karakter seti değil\n"
+msgstr "'%s' geçerli bir karakter kümesi değil\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3683
-#, fuzzy
+#: g10/g10.c:2340 g10/keyedit.c:3862
 msgid "could not parse keyserver URL\n"
 msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
 
-#: g10/g10.c:2318
-#, fuzzy, c-format
+#: g10/g10.c:2346
+#, c-format
 msgid "%s:%d: invalid keyserver options\n"
-msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
+msgstr "%s:%d: anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/g10.c:2321
-#, fuzzy
+#: g10/g10.c:2349
 msgid "invalid keyserver options\n"
-msgstr "dışsallaştırma seçenekleri geçersiz\n"
+msgstr "anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2356
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2359
 msgid "invalid import options\n"
 msgstr "içselleştirme seçenekleri geçersiz\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2366
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2369
 msgid "invalid export options\n"
 msgstr "dışsallaştırma seçenekleri geçersiz\n"
 
-#: g10/g10.c:2348
-#, fuzzy, c-format
+#: g10/g10.c:2376
+#, c-format
 msgid "%s:%d: invalid list options\n"
-msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
+msgstr "%s:%d: liste seçenekleri geçersiz\n"
 
-#: g10/g10.c:2351
-#, fuzzy
+#: g10/g10.c:2379
 msgid "invalid list options\n"
-msgstr "içselleştirme seçenekleri geçersiz\n"
+msgstr "liste seçenekleri geçersiz\n"
 
-#: g10/g10.c:2373
-#, fuzzy, c-format
+#: g10/g10.c:2401
+#, c-format
 msgid "%s:%d: invalid verify options\n"
-msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
+msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
 
-#: g10/g10.c:2376
-#, fuzzy
+#: g10/g10.c:2404
 msgid "invalid verify options\n"
-msgstr "dışsallaştırma seçenekleri geçersiz\n"
+msgstr "doğrulama seçenekleri geçersiz\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2411
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "çalıştırılabilirlerin patikası %s yapılamıyor\n"
 
-#: g10/g10.c:2573
+#: g10/g10.c:2602
 msgid "WARNING: program may create a core file!\n"
 msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2606
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "UYARI: %s %s'i aşıyor\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2615
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ile %s birlikte kullanılmaz!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2618
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s, %s ile etkisiz olur!\n"
 
-#: g10/g10.c:2603
+#: g10/g10.c:2625
 #, fuzzy, c-format
+msgid "NOTE: %s is not available in this version\n"
+msgstr "gpg-agent bu oturumda kullanılamaz\n"
+
+#: g10/g10.c:2640
+#, c-format
 msgid "will not run with insecure memory due to %s\n"
-msgstr "gizli anahtarı `%s'e yazıyor\n"
+msgstr "%s olmasından dolayı güvensiz bellekle çalıştırılmayacak\n"
 
-#: g10/g10.c:2617
+#: g10/g10.c:2654
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
-msgstr "--pgp2 kipinde sadece ayrık veya sade imzalar yapabilirsiniz\n"
+msgstr "--pgp2 kipindeyken sadece ayrık veya sade imzalar yapabilirsiniz\n"
 
-#: g10/g10.c:2623
+#: g10/g10.c:2660
 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/g10.c:2629
+#: g10/g10.c:2666
 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/g10.c:2642
+#: g10/g10.c:2679
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2 kipinde ileti şifrelemesi IDEA şifresi gerektirir\n"
 
-#: g10/g10.c:2712 g10/g10.c:2736
+#: g10/g10.c:2746 g10/g10.c:2770
 msgid "selected cipher algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/g10.c:2718 g10/g10.c:2742
+#: g10/g10.c:2752 g10/g10.c:2776
 msgid "selected digest algorithm is invalid\n"
 msgstr "seçilen özümleme algoritması geçersiz\n"
 
-#: g10/g10.c:2724
-#, fuzzy
+#: g10/g10.c:2758
 msgid "selected compression algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2764
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "seçilen sertifikalama özümleme algoritması geçersiz\n"
 
-#: g10/g10.c:2745
+#: g10/g10.c:2779
 msgid "completes-needed must be greater than 0\n"
 msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
 
-#: g10/g10.c:2747
+#: g10/g10.c:2781
 msgid "marginals-needed must be greater than 1\n"
 msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
 
-#: g10/g10.c:2749
-#, fuzzy
+#: g10/g10.c:2783
 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/g10.c:2751
+#: g10/g10.c:2785
 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/g10.c:2753
+#: g10/g10.c:2787
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
-msgstr "asgari sertifika seviyesi geçersiz; 0, 1, 2, ya da 3 olabilir\n"
+msgstr "asgari sertifika seviyesi geçersiz; 1, 2, ya da 3 olabilir\n"
 
-#: g10/g10.c:2756
+#: g10/g10.c:2790
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "BİLGİ: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2794
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "S2K kipi geçersiz; 0, 1 veya 3 olmalı\n"
 
-#: g10/g10.c:2767
+#: g10/g10.c:2801
 msgid "invalid default preferences\n"
 msgstr "öntanımlı tercihler geçersiz\n"
 
-#: g10/g10.c:2776
+#: g10/g10.c:2810
 msgid "invalid personal cipher preferences\n"
 msgstr "kişisel şifre tercihleri geçersiz\n"
 
-#: g10/g10.c:2780
+#: g10/g10.c:2814
 msgid "invalid personal digest preferences\n"
 msgstr "kişisel özümleme tercihleri geçersiz\n"
 
-#: g10/g10.c:2784
+#: g10/g10.c:2818
 msgid "invalid personal compress preferences\n"
 msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
 
-#: g10/g10.c:2817
+#: g10/g10.c:2851
 #, c-format
 msgid "%s does not yet work with %s\n"
-msgstr "%s henüz %s ile çalışmıyor\n"
+msgstr "%s, %s ile henüz çalışmıyor\n"
 
-#: g10/g10.c:2864
-#, fuzzy, c-format
+#: g10/g10.c:2898
+#, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
-msgstr "%2$s kipindeyken %1$s şifreleme algoritması kullanılamayabilir.\n"
+msgstr "%2$s kipindeyken '%1$s' şifreleme algoritması kullanılamaz\n"
 
-#: g10/g10.c:2869
-#, fuzzy, c-format
+#: g10/g10.c:2903
+#, 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ılamayabilir.\n"
+msgstr "%2$s kipindeyken '%1$s' özümleme algoritması kullanılamaz\n"
 
-#: g10/g10.c:2874
-#, fuzzy, c-format
+#: g10/g10.c:2908
+#, 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ılamayabilir.\n"
+msgstr "%2$s kipindeyken '%1$s' sıkıştırma algoritması kullanılamaz\n"
 
-#: g10/g10.c:2970
+#: g10/g10.c:3004
 #, 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/g10.c:2981
+#: g10/g10.c:3015
 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/g10.c:2992
+#: g10/g10.c:3026
 msgid "--store [filename]"
 msgstr "--store [dosyaismi]"
 
-#: g10/g10.c:2999
+#: g10/g10.c:3033
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosyaismi]"
 
-#: g10/g10.c:3001
-#, fuzzy, c-format
+#: g10/g10.c:3035
+#, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
-msgstr "şifre çözme başarısız: %s\n"
+msgstr "`%s' için simetrik şifreleme başarısız: %s\n"
 
-#: g10/g10.c:3011
+#: g10/g10.c:3045
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosyaismi]"
 
-#: g10/g10.c:3024
-#, fuzzy
+#: g10/g10.c:3058
 msgid "--symmetric --encrypt [filename]"
-msgstr "--sign --encrypt [dosyaismi]"
+msgstr "--symmetric --encrypt [dosyaismi]"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3060
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
-msgstr ""
+msgstr "--s2k-mode 0 ile  --symmetric --encrypt kullanamazsınız\n"
 
-#: g10/g10.c:3029
-#, fuzzy, c-format
+#: g10/g10.c:3063
+#, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
-msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
+msgstr "%s kipindeyken  --symmetric --encrypt kullanamazsınız\n"
 
-#: g10/g10.c:3047
+#: g10/g10.c:3081
 msgid "--sign [filename]"
 msgstr "--sign [dosyaismi]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3094
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosyaismi]"
 
-#: g10/g10.c:3075
-#, fuzzy
+#: g10/g10.c:3109
 msgid "--symmetric --sign --encrypt [filename]"
-msgstr "--sign --encrypt [dosyaismi]"
+msgstr "--symmetric --sign --encrypt [dosyaismi]"
 
-#: g10/g10.c:3077
+#: g10/g10.c:3111
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
-msgstr ""
+msgstr "--s2k-mode 0 ile --symmetric --sign --encrypt kullanamazsınız\n"
 
-#: g10/g10.c:3080
-#, fuzzy, c-format
+#: g10/g10.c:3114
+#, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
-msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
+msgstr "%s kipindeyken --symmetric --sign --encrypt kullanamazsınız.\n"
 
-#: g10/g10.c:3100
+#: g10/g10.c:3134
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [DOSYA]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3143
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosyaismi]"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3168
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosyaismi]"
 
-#: g10/g10.c:3142
+#: g10/g10.c:3176
 msgid "--sign-key user-id"
 msgstr "--sign-key kullanıcı-kimliği"
 
-#: g10/g10.c:3146
+#: g10/g10.c:3180
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kullanıcı-kimliği"
 
-#: g10/g10.c:3167
+#: g10/g10.c:3201
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kullanıcı-kimliği [komutlar]"
 
-#: g10/g10.c:3238
+#: g10/g10.c:3272
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [kullanıcı-kimliği] [anahtar-zinciri]"
 
-#: g10/g10.c:3275
+#: g10/g10.c:3309
 #, c-format
 msgid "keyserver send failed: %s\n"
-msgstr "keyserver send başarısızlığa uğradı: %s\n"
+msgstr "anahtar sunucusuna gönderim başarısızlığa uğradı: %s\n"
 
-#: g10/g10.c:3277
+#: g10/g10.c:3311
 #, c-format
 msgid "keyserver receive failed: %s\n"
-msgstr "keyserver receive başarısızlığa uğradı: %s\n"
+msgstr "anahtar sunucusundan alım başarısızlığa uğradı: %s\n"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3313
 #, c-format
 msgid "key export failed: %s\n"
-msgstr "key export başarısızlığa uğradı: %s\n"
+msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
 
-#: g10/g10.c:3290
+#: g10/g10.c:3324
 #, c-format
 msgid "keyserver search failed: %s\n"
-msgstr "keyserver search başarısızlığa uğradı: %s\n"
+msgstr "anahtar sunucusunda arama başarısız: %s\n"
 
-#: g10/g10.c:3300
+#: g10/g10.c:3334
 #, c-format
 msgid "keyserver refresh failed: %s\n"
-msgstr "keyserver refresh başarısız: %s\n"
+msgstr "anahtar sunucusunda tazeleme başarısız: %s\n"
 
-#: g10/g10.c:3341
+#: g10/g10.c:3375
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zırhın kaldırılması başarısız: %s\n"
 
-#: g10/g10.c:3349
+#: g10/g10.c:3383
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "zırhlama başarısız: %s\n"
 
-#: g10/g10.c:3436
+#: g10/g10.c:3470
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "`%s' hash algoritması geçersiz\n"
 
-#: g10/g10.c:3559
+#: g10/g10.c:3593
 msgid "[filename]"
 msgstr "[dosyaismi]"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3597
 msgid "Go ahead and type your message ...\n"
 msgstr "İletinizi yazın ...\n"
 
-#: g10/g10.c:3853
+#: g10/g10.c:3887
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1628,80 +1618,82 @@ msgstr ""
 "bir niteleme ismi sadece harfler, rakamlar ve altçizgiler içerebilir ve "
 "sonuna bir '=' gelir.\n"
 
-#: g10/g10.c:3861
+#: g10/g10.c:3895
 msgid "a user notation name must contain the '@' character\n"
 msgstr "bir kullanıcı niteleme ismi '@' karakteri içermeli\n"
 
-#: g10/g10.c:3871
+#: g10/g10.c:3900
+#, fuzzy
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr "bir kullanıcı niteleme ismi '@' karakteri içermeli\n"
+
+#: g10/g10.c:3911
 msgid "a notation value must not use any control characters\n"
 msgstr "bir niteleme değerinde kontrol karakterleri kullanılamaz\n"
 
-#: g10/g10.c:3905
+#: g10/g10.c:3945
 msgid "the given certification policy URL is invalid\n"
 msgstr "belirtilen sertifika güvence adresi geçersiz\n"
 
-#: g10/g10.c:3907
+#: g10/g10.c:3947
 msgid "the given signature policy URL is invalid\n"
 msgstr "belirtilen imza güvence adresi geçersiz\n"
 
-#: g10/g10.c:3940
-#, fuzzy
+#: g10/g10.c:3980
 msgid "the given preferred keyserver URL is invalid\n"
-msgstr "belirtilen imza güvence adresi geçersiz\n"
+msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk belleğinde çok fazla girdi - iptal edildi\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2750
-#, fuzzy
+#: g10/getkey.c:187 g10/getkey.c:2757
 msgid "[User ID not found]"
-msgstr "[Kullanıcı kimliği bulunamadı]"
+msgstr "[Kullanıcı kimliği yok]"
 
-#: g10/getkey.c:1677
-#, fuzzy, c-format
+#: g10/getkey.c:1684
+#, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
-"Geçersiz %08lX anahtarı --allow-non-selfsigned-uid kullanılarak geçerli "
-"oldu\n"
+"Geçersiz %s anahtarı --allow-non-selfsigned-uid kullanılarak geçerli oldu\n"
 
-#: g10/getkey.c:2228
-#, fuzzy, c-format
+#: g10/getkey.c:2235
+#, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
-"yardımcı genel anahtar %08lX için bir gizli anahtar yok - yoksayılıyor\n"
+"yardımcı genel anahtar %s için gizli yardımcı anahtar yok - yoksayılıyor\n"
 
-#: g10/getkey.c:2459
-#, fuzzy, c-format
+#: g10/getkey.c:2466
+#, c-format
 msgid "using subkey %s instead of primary key %s\n"
-msgstr "yardımcı anahtar %08lX, asıl anahtar %08lX yerine kullanılıyor\n"
+msgstr "yardımcı anahtar %s, asıl anahtar %s yerine kullanılıyor\n"
 
-#: g10/getkey.c:2506
-#, fuzzy, c-format
+#: g10/getkey.c:2513
+#, c-format
 msgid "key %s: secret key without public key - skipped\n"
-msgstr "%08lX anahtarı: genel anahtarsız gizli anahtar - atlandı\n"
+msgstr "anahtar %s: genel anahtarsız gizli anahtar - atlandı\n"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:74
 msgid "be somewhat more quiet"
 msgstr "daha az detaylı"
 
-#: g10/gpgv.c:70
+#: g10/gpgv.c:75
 msgid "take the keys from this keyring"
 msgstr "anahtarlar bu anahtarlıktan alınır"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:77
 msgid "make timestamp conflicts only a warning"
 msgstr "zaman damgası çelişkilerini uyarı olarak bildirir"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:78
 msgid "|FD|write status info to this FD"
 msgstr "|FD|durum bilgisini bu FD'ye yazar"
 
-#: g10/gpgv.c:97
+#: g10/gpgv.c:102
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Kullanımı: gpgv [seçenekler] [dosyalar] (yardım için -h)"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:105
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1709,7 +1701,7 @@ msgstr ""
 "Kullanımı: gpg [seçenekler] [dosyalar]\n"
 "Bilinen güvenli anahtarlara göre imzaları kontrol eder\n"
 
-#: g10/helptext.c:48
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1720,7 +1712,7 @@ msgstr ""
 "bunun (açıkça belirtilmeden oluşturulmuş) sertifikalar ağıyla\n"
 "hiçbir alakası yok."
 
-#: g10/helptext.c:54
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1733,18 +1725,18 @@ msgstr ""
 "bildirilmesi gerekir. \"evet\" yanıtı bu anahtarın son derece güvenli\n"
 "olduğunun belirtilmesi için yeterlidir.\n"
 
-#: g10/helptext.c:61
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Bu güvencesiz anahtarı yine de kullanmak istiyorsanız cevap olarak\n"
 " \"evet\" yazın."
 
-#: g10/helptext.c:65
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Bu iletiyi göndereceğiniz adresin kullanıcı kimliğini giriniz."
 
-#: g10/helptext.c:69
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1757,8 +1749,18 @@ msgid ""
 "\n"
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
+"Kullanılacak algoritmayı seçiniz.\n"
+"\n"
+"DSA (nam-ı diğer DSS) Sayısal İmza Algortimasıdır ve\n"
+"sadece imzalar için kullanılabilir.\n"
+"\n"
+"Elgamal sadece şifreleme amacıyla kullanılabilen bir algoritmadır.\n"
+"\n"
+"RSA hem imzalamak hem de şifrelemek amacıyla kullanılabilir.\n"
+"\n"
+"İlk (asıl) anahtar daima imzalama yeteneğine sahip bir anahtar olmalıdır."
 
-#: g10/helptext.c:83
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -1768,16 +1770,16 @@ msgstr ""
 "değildir. Bu algoritma sadece belli alanlarda kullanılabilir.\n"
 "Lütfen güvenlik uzmanınıza danışın."
 
-#: g10/helptext.c:90
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "Anahtar uzunluğunu giriniz"
 
-#: g10/helptext.c:94 g10/helptext.c:99 g10/helptext.c:111 g10/helptext.c:143
-#: g10/helptext.c:171 g10/helptext.c:176 g10/helptext.c:181
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "Cevap \"evet\" ya da \"hayır\""
 
-#: g10/helptext.c:104
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1788,20 +1790,20 @@ msgstr ""
 "iyi bir hata cevabı alamazsınız -- onun yerine sistem verilen değeri\n"
 "bir zaman aralığı olarak çözümlemeyi dener."
 
-#: g10/helptext.c:116
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "Anahtar tutucunun ismini giriniz"
 
-#: g10/helptext.c:121
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr ""
 "lütfen bir E-posta adresi girin (isteğe bağlı ancak kuvvetle tavsiye edilir)"
 
-#: g10/helptext.c:125
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "Lütfen önbilgi girin (isteğe bağlı)"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1815,11 +1817,11 @@ msgstr ""
 "D anahtar üretimine Devam etmek için.\n"
 "K anahtar üretiminden çıKmak için."
 
-#: g10/helptext.c:139
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Yardımcı anahtarı üretmek istiyorsanız \"evet\" ya da \"e\" girin."
 
-#: g10/helptext.c:147
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -1881,12 +1883,13 @@ msgstr ""
 "kontroller arasındaki ayrıma siz karar vereceksiniz.\n"
 "Bu kararı verebilecek durumda değilseniz \"0\" cevabını verin."
 
-#: g10/helptext.c:185
-#, fuzzy
+#: g10/helptext.c:186
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
-msgstr "Kullanıcı kimliklerinin TÜMünü imzalamak istiyorsanız \"evet\" girin"
+msgstr ""
+"Kullanıcı kimliklerinin TÜMünü imzalamak istiyorsanız \"evet\" ya da \"yes\" "
+"yazın"
 
-#: g10/helptext.c:189
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -1894,11 +1897,11 @@ msgstr ""
 "Bu kullanıcı kimliğini gerçekten silmek istiyorsanız \"evet\" girin.\n"
 "Böylece bütün sertifikaları kaybedeceksiniz!"
 
-#: g10/helptext.c:194
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Bu yardımcı anahtarı silme izni vermek istiyorsanız \"evet\" girin"
 
-#: g10/helptext.c:199
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -1908,7 +1911,7 @@ msgstr ""
 "sertifikalanmış bir diğer anahtara bir güvence bağlantısı sağlamakta\n"
 "önemli olabileceğinden normalde bu imzayı silmek istemezsiniz."
 
-#: g10/helptext.c:204
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -1920,13 +1923,13 @@ msgstr ""
 "ertelemelisiniz çünkü bu imzalama anahtarı başka bir sertifikalı\n"
 "anahtar vasıtası ile bir güvence bağlantısı sağlayabilir."
 
-#: g10/helptext.c:210
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "İmza geçersiz. Onu anahtar zincirinizden kaldırmak uygun olacak."
 
-#: g10/helptext.c:214
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -1939,7 +1942,7 @@ msgstr ""
 "Bunu sadece, eğer bu öz-imza bazı durumlarda geçerli değilse ya da\n"
 "kullanılabilir bir ikincisi var ise yapın."
 
-#: g10/helptext.c:222
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -1949,23 +1952,23 @@ msgstr ""
 "listesine çevirir. Tüm etkilenen öz-imzaların zaman damgaları bir sonraki\n"
 "tarafından öne alınacaktır.\n"
 
-#: g10/helptext.c:229
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Lütfen bir anahtar parolası giriniz; yazdıklarınız görünmeyecek\n"
 
-#: g10/helptext.c:235
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Lütfen son parolayı tekrarlayarak ne yazdığınızdan emin olun."
 
-#: g10/helptext.c:239
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "İmzanın uygulanacağı dosyanın ismini verin"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Dosyanın üzerine yazılacaksa lütfen \"evet\" yazın"
 
-#: g10/helptext.c:249
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -1973,7 +1976,7 @@ msgstr ""
 "Lütfen yeni dosya ismini girin. Dosya ismini yazmadan RETURN tuşlarsanız\n"
 "parantez içinde gösterilen öntanımlı dosya kullanılacak."
 
-#: g10/helptext.c:255
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2001,7 +2004,7 @@ msgstr ""
 "\tKullanıcı kimliği artık kullanılamayacak durumdaysa bunu\n"
 "\tseçin; genelde Eposta adresi geçersiz olduğunda kullanılır.\n"
 
-#: g10/helptext.c:271
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2011,540 +2014,553 @@ msgstr ""
 "verdiğinizi açıklayan bir metin girebilirsiniz.\n"
 "Lütfen bu metin kısa olsun. Bir boş satır metni bitirir.\n"
 
-#: g10/helptext.c:286
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "yardım mevcut değil"
 
-#: g10/helptext.c:294
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "\"%s\" için yardım mevcut değil"
 
-#: g10/import.c:247
+#: g10/import.c:248
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "%d. tür blok atlandı\n"
 
-#: g10/import.c:256
-#, fuzzy, c-format
+#: g10/import.c:257
+#, c-format
 msgid "%lu keys processed so far\n"
-msgstr "şu ana kadar herşey yolunda giderek %lu anahtar işlenmiş\n"
+msgstr "şu ana kadar %lu anahtar işlendi\n"
 
-#: g10/import.c:273
+#: g10/import.c:274
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "İşlenmiş toplam miktar: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "     yeni anahtarlar atlandı: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:279
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         kullanıcı kimliksiz: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "              imported: %lu"
 msgstr "                      alınan: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:287
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                   değişmedi: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      yeni kullanıcı kimliği: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "    yeni yardımcı anahtarlar: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                yeni imzalar: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "      yeni anahtar iptalleri: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     gizli anahtarlar okundu: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  gizli anahtarlar indirildi: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "  gizli anahtarlar değişmedi: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "             alınamadı: %lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:544
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
-msgstr ""
+msgstr "UYARI: anahtar %s kullanılabilir olmayan tercihler içeriyor\n"
 
-#: g10/import.c:545
-#, fuzzy
+#: g10/import.c:546
 msgid "algorithms on these user IDs:\n"
-msgstr "Bu kullanıcı kimliklerini imzalamışsınız:\n"
+msgstr "Bu kullanıcı kimlikler için algoritmalar:\n"
 
-#: g10/import.c:582
+#: g10/import.c:583
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
-msgstr ""
+msgstr "         \"%s\": şifreleme algoritması %s için tercih edilir\n"
 
-#: g10/import.c:594
-#, fuzzy, c-format
+#: g10/import.c:595
+#, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
-msgstr "%s imzası, %s özümleme algoritması\n"
+msgstr "         \"%s\": özümleme algoritması %s için tercih edilir\n"
 
-#: g10/import.c:606
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
+"         \"%s\": sıkıştırma algoritması %s için tercih edilir\n"
+"\n"
 
-#: g10/import.c:619
+#: g10/import.c:620
 msgid "it is strongly suggested that you update your preferences and\n"
-msgstr ""
+msgstr "tercihlerinizi güncellemenizi ve\n"
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
+"olası algoritma uyuşmazlığı sorunlarından kaçınmak için bu anahtarı\n"
+"tekrar dağıtmanızı şiddetle öneririz.\n"
 
-#: g10/import.c:645
+#: g10/import.c:646
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
+"tercihlerinizi böyle güncelleyemezsiniz: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:693 g10/import.c:1047
-#, fuzzy, c-format
+#: g10/import.c:694 g10/import.c:1048
+#, c-format
 msgid "key %s: no user ID\n"
-msgstr "anahtar %08lX: kullanıcı kimliği yok\n"
+msgstr "anahtar %s: kullanıcı kimliği yok\n"
 
-#: g10/import.c:713
-#, fuzzy, c-format
+#: g10/import.c:714
+#, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
-msgstr "anahtar %08lX: HKP yardımcı anahtar bozulması giderildi\n"
+msgstr "anahtar %s: PKS yardımcı anahtar bozulması giderildi\n"
 
-#: g10/import.c:728
-#, fuzzy, c-format
+#: g10/import.c:729
+#, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
-msgstr "anahtar %08lX: öz-imzalı olmayan kullanıcı kimliği '%s' kabul edildi\n"
+msgstr "anahtar %s: öz-imzalı olmayan kullanıcı kimliği \"%s\" kabul edildi\n"
 
-#: g10/import.c:734
-#, fuzzy, c-format
+#: g10/import.c:735
+#, c-format
 msgid "key %s: no valid user IDs\n"
-msgstr "anahtar %08lX: kullanıcı kimliği geçersiz\n"
+msgstr "anahtar %s: geçerli kullanıcı kimliği yok\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 msgid "this may be caused by a missing self-signature\n"
 msgstr "bu kayıp bir öz-imza yüzünden meydana gelebilir\n"
 
-#: g10/import.c:746 g10/import.c:1168
-#, fuzzy, c-format
+#: g10/import.c:747 g10/import.c:1169
+#, c-format
 msgid "key %s: public key not found: %s\n"
-msgstr "anahtar %08lX: genel anahtar bulunamadı: %s\n"
+msgstr "anahtar %s: genel anahtar yok: %s\n"
 
-#: g10/import.c:752
-#, fuzzy, c-format
+#: g10/import.c:753
+#, c-format
 msgid "key %s: new key - skipped\n"
-msgstr "anahtar %08lX: yeni anahtar - atlandı\n"
+msgstr "anahtar %s: yeni anahtar - atlandı\n"
 
-#: g10/import.c:761
+#: g10/import.c:762
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "yazılabilir bir anahtar zinciri yok: %s\n"
 
-#: g10/import.c:766 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "\"%s\"e yazıyor\n"
 
-#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
-#: g10/import.c:2314 g10/import.c:2336
+#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
+#: g10/import.c:2315 g10/import.c:2337
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "\"%s\" anahtar zincirine yazarken hata oluştu: %s\n"
 
-#: g10/import.c:791
-#, fuzzy, c-format
+#: g10/import.c:792
+#, c-format
 msgid "key %s: public key \"%s\" imported\n"
-msgstr "anahtar %08lX: genel anahtar \"%s\" alındı\n"
+msgstr "anahtar %s: genel anahtar \"%s\" alındı\n"
 
-#: g10/import.c:815
-#, fuzzy, c-format
+#: g10/import.c:816
+#, c-format
 msgid "key %s: doesn't match our copy\n"
-msgstr "anahtar %08lX: bizim kopyamızla eşleşmiyor\n"
+msgstr "anahtar %s: bizim kopyamızla eşleşmiyor\n"
 
-#: g10/import.c:832 g10/import.c:1186
-#, fuzzy, c-format
+#: g10/import.c:833 g10/import.c:1187
+#, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
-msgstr "anahtar %08lX: özgün anahtar bloku bulunamadı: %s\n"
+msgstr "anahtar %s: özgün anahtar bloku bulunamadı: %s\n"
 
-#: g10/import.c:840 g10/import.c:1193
-#, fuzzy, c-format
+#: g10/import.c:841 g10/import.c:1194
+#, c-format
 msgid "key %s: can't read original keyblock: %s\n"
-msgstr "anahtar %08lX: özgün anahtar bloku okunamadı: %s\n"
+msgstr "anahtar %s: özgün anahtar bloku okunamadı: %s\n"
 
-#: g10/import.c:872
-#, fuzzy, c-format
+#: g10/import.c:873
+#, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
-msgstr "anahtar %08lX: \"%s\" 1 yeni kullanıcı kimliği\n"
+msgstr "anahtar %s: \"%s\" 1 yeni kullanıcı kimliği\n"
 
-#: g10/import.c:875
-#, fuzzy, c-format
+#: g10/import.c:876
+#, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
-msgstr "anahtar %08lX: \"%s\" %d yeni kullanıcı kimliği\n"
+msgstr "anahtar %s: \"%s\" %d yeni kullanıcı kimliği\n"
 
-#: g10/import.c:878
-#, fuzzy, c-format
+#: g10/import.c:879
+#, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
-msgstr "anahtar %08lX: \"%s\" 1 yeni imza\n"
+msgstr "anahtar %s: \"%s\" 1 yeni imza\n"
 
-#: g10/import.c:881
-#, fuzzy, c-format
+#: g10/import.c:882
+#, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
-msgstr "anahtar %08lX: \"%s\" %d yeni imza\n"
+msgstr "anahtar %s: \"%s\" %d yeni imza\n"
 
-#: g10/import.c:884
-#, fuzzy, c-format
+#: g10/import.c:885
+#, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
-msgstr "anahtar %08lX: %s 1 yeni yardımcı anahtar\n"
+msgstr "anahtar %s: %s 1 yeni yardımcı anahtar\n"
 
-#: g10/import.c:887
-#, fuzzy, c-format
+#: g10/import.c:888
+#, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
-msgstr "anahtar %08lX: \"%s\" %d yeni yardımcı anahtar\n"
+msgstr "anahtar %s: \"%s\" %d yeni yardımcı anahtar\n"
 
-#: g10/import.c:908
-#, fuzzy, c-format
+#: g10/import.c:909
+#, c-format
 msgid "key %s: \"%s\" not changed\n"
-msgstr "anahtar %08lX: \"%s\" değişmedi\n"
+msgstr "anahtar %s: \"%s\" değişmedi\n"
 
-#: g10/import.c:1053
-#, fuzzy, c-format
+#: g10/import.c:1054
+#, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
-msgstr "%08lX anahtarı: geçersiz şifreli (%d) gizli anahtar - atlandı\n"
+msgstr "anahtar %s: geçersiz şifreli (%d) gizli anahtar - atlandı\n"
 
-#: g10/import.c:1064
-#, fuzzy
+#: g10/import.c:1065
 msgid "importing secret keys not allowed\n"
-msgstr "gizli anahtarı `%s'e yazıyor\n"
+msgstr "gizli anahtarı alımına izin verilmez\n"
 
-#: g10/import.c:1081 g10/import.c:2329
+#: g10/import.c:1082 g10/import.c:2330
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "öntanımlı gizli anahtar zinciri yok: %s\n"
 
-#: g10/import.c:1092
-#, fuzzy, c-format
+#: g10/import.c:1093
+#, c-format
 msgid "key %s: secret key imported\n"
-msgstr "anahtar %08lX: gizli anahtar indirildi\n"
+msgstr "anahtar %s: gizli anahtar alındı\n"
 
-#: g10/import.c:1121
-#, fuzzy, c-format
+#: g10/import.c:1122
+#, c-format
 msgid "key %s: already in secret keyring\n"
-msgstr "anahtar %08lX: zaten gizli anahtar zincirinde\n"
+msgstr "anahtar %s: zaten gizli anahtar zincirinde\n"
 
-#: g10/import.c:1131
-#, fuzzy, c-format
+#: g10/import.c:1132
+#, c-format
 msgid "key %s: secret key not found: %s\n"
-msgstr "anahtar %08lX: gizli anahtar bulunamadı: %s\n"
+msgstr "anahtar %s: gizli anahtar yok: %s\n"
 
-#: g10/import.c:1161
-#, fuzzy, c-format
+#: g10/import.c:1162
+#, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
-"anahtar %08lX: genel anahtar değil - yürürlükten kaldırma sertifikası "
+"anahtar %s: genel anahtar değil - yürürlükten kaldırma sertifikası "
 "uygulanamaz\n"
 
-#: g10/import.c:1204
-#, fuzzy, c-format
+#: g10/import.c:1205
+#, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr ""
-"anahtar %08lX: yürürlükten kaldırma sertifikası geçersiz: %s - reddedildi\n"
+"anahtar %s: yürürlükten kaldırma sertifikası geçersiz: %s - reddedildi\n"
 
-#: g10/import.c:1236
-#, fuzzy, c-format
+#: g10/import.c:1237
+#, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
-msgstr "anahtar %08lX: \"%s\" yürürlükten kaldırma sertifikası alındı\n"
+msgstr "anahtar %s: \"%s\" yürürlükten kaldırma sertifikası alındı\n"
 
-#: g10/import.c:1301
-#, fuzzy, c-format
+#: g10/import.c:1302
+#, c-format
 msgid "key %s: no user ID for signature\n"
-msgstr "anahtar %08lX: imza için kullanıcı kimliği yok\n"
+msgstr "anahtar %s: imza için kullanıcı kimliği yok\n"
 
-#: g10/import.c:1316
-#, fuzzy, c-format
+#: g10/import.c:1317
+#, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
-"anahtar %08lX: genel anahtar algoritması, kullanıcı kimliği \"%s\" için "
+"anahtar %s: genel anahtar algoritması, kullanıcı kimliği \"%s\" için "
 "desteklenmiyor\n"
 
-#: g10/import.c:1318
-#, fuzzy, c-format
+#: g10/import.c:1319
+#, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
-msgstr "anahtar %08lX: kullanıcı kimliği \"%s\" için öz-imza geçersiz\n"
+msgstr "anahtar %s: kullanıcı kimliği \"%s\" için öz-imza geçersiz\n"
 
-#: g10/import.c:1336
-#, fuzzy, c-format
+#: g10/import.c:1337
+#, c-format
 msgid "key %s: no subkey for key binding\n"
-msgstr "anahtar %08lX: anahtarı garantilemek için yardımcı anahtar yok\n"
+msgstr "anahtar %s: anahtarı garantilemek için yardımcı anahtar yok\n"
 
-#: g10/import.c:1347 g10/import.c:1397
-#, fuzzy, c-format
+#: g10/import.c:1348 g10/import.c:1398
+#, c-format
 msgid "key %s: unsupported public key algorithm\n"
-msgstr "anahtar %08lX: genel anahtar algoritması desteklenmiyor\n"
+msgstr "anahtar %s: genel anahtar algoritması desteklenmiyor\n"
 
-#: g10/import.c:1349
-#, fuzzy, c-format
+#: g10/import.c:1350
+#, c-format
 msgid "key %s: invalid subkey binding\n"
-msgstr "anahtar %08lX: yardımcı anahtar garantileme geçersiz\n"
+msgstr "anahtar %s: yardımcı anahtar garantileme geçersiz\n"
 
-#: g10/import.c:1364
-#, fuzzy, c-format
+#: g10/import.c:1365
+#, c-format
 msgid "key %s: removed multiple subkey binding\n"
-msgstr "anahtar %08lX: çok sayıda yardımcı anahtar bağlantısı silindi\n"
+msgstr "anahtar %s: çok sayıda yardımcı anahtar bağlantısı silindi\n"
 
-#: g10/import.c:1386
-#, fuzzy, c-format
+#: g10/import.c:1387
+#, c-format
 msgid "key %s: no subkey for key revocation\n"
-msgstr ""
-"anahtar %08lX: anahtarı yürürlükten kaldırılacak yardımcı anahtar yok\n"
+msgstr "anahtar %s: anahtarı yürürlükten kaldırılacak yardımcı anahtar yok\n"
 
-#: g10/import.c:1399
-#, fuzzy, c-format
+#: g10/import.c:1400
+#, c-format
 msgid "key %s: invalid subkey revocation\n"
-msgstr "anahtar %08lX: yardımcı anahtar yürürlükten kaldırması geçersiz\n"
+msgstr "anahtar %s: yardımcı anahtar yürürlükten kaldırması geçersiz\n"
 
-#: g10/import.c:1414
-#, fuzzy, c-format
+#: g10/import.c:1415
+#, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr ""
-"anahtar %08lX: çok sayıda yardımcı anahtar yürürlükten kaldırması silindi\n"
+"anahtar %s: çok sayıda yardımcı anahtar yürürlükten kaldırması silindi\n"
 
-#: g10/import.c:1456
-#, fuzzy, c-format
+#: g10/import.c:1457
+#, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
-msgstr "anahtar %08lX: kullanıcı kimliği atlandı: '"
+msgstr "anahtar %s: kullanıcı kimliği \"%s\" atlandı\n"
 
-#: g10/import.c:1477
-#, fuzzy, c-format
+#: g10/import.c:1478
+#, c-format
 msgid "key %s: skipped subkey\n"
-msgstr "anahtar %08lX: yardımcı anahtar atlandı\n"
+msgstr "anahtar %s: yardımcı anahtar atlandı\n"
 
-#: g10/import.c:1504
-#, fuzzy, c-format
+#: g10/import.c:1505
+#, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
-msgstr "anahtar %08lX: imza gönderilebilir değil (%02x sınıfı) - atlandı\n"
+msgstr "anahtar %s: imza gönderilebilir değil (0x%02X sınıfı) - atlandı\n"
 
-#: g10/import.c:1514
-#, fuzzy, c-format
+#: g10/import.c:1515
+#, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
-msgstr ""
-"anahtar %08lX: yürürlükten kaldırma sertifikası yanlış yerde - atlandı\n"
+msgstr "anahtar %s: yürürlükten kaldırma sertifikası yanlış yerde - atlandı\n"
 
-#: g10/import.c:1531
-#, fuzzy, c-format
+#: g10/import.c:1532
+#, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
-msgstr ""
-"anahtar %08lX: yürürlükten kaldırma sertifikası geçersiz: %s - atlandı\n"
+msgstr "anahtar %s: yürürlükten kaldırma sertifikası geçersiz: %s - atlandı\n"
 
-#: g10/import.c:1545
-#, fuzzy, c-format
+#: g10/import.c:1546
+#, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
-msgstr "anahtar %08lX: yardımcı anahtar imzası yanlış yerde - atlandı\n"
+msgstr "anahtar %s: yardımcı anahtar imzası yanlış yerde - atlandı\n"
 
-#: g10/import.c:1553
-#, fuzzy, c-format
+#: g10/import.c:1554
+#, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
-msgstr "anahtar %08lX: umulmayan imza sınıfı (0x%02X) - atlandı\n"
+msgstr "anahtar %s: umulmayan imza sınıfı (0x%02X) - atlandı\n"
 
-#: g10/import.c:1574
-#, fuzzy, c-format
+#: g10/import.c:1575
+#, c-format
 msgid "key %s: expired signature from key %s - skipped\n"
-msgstr "anahtar %08lX: umulmayan imza sınıfı (0x%02X) - atlandı\n"
+msgstr "anahtar %s: %s anahatarındaki imza zamanaşımına uğramış - atlandı\n"
 
-#: g10/import.c:1677
-#, fuzzy, c-format
+#: g10/import.c:1678
+#, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
-msgstr "anahtar %08lX: çift kullanıcı kimliği saptandı - katıştırıldı\n"
+msgstr "anahtar %s: çift kullanıcı kimliği saptandı - birleştirildi\n"
 
-#: g10/import.c:1739
-#, fuzzy, c-format
+#: g10/import.c:1740
+#, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
-"UYARI: anahtar %08lX yürürlükten kaldırılmış olmalı: yürürlükten kaldırma "
-"anahtarı %08lX alınıyor\n"
+"UYARI: anahtar %s yürürlükten kaldırılmış olmalı: yürürlükten kaldırma "
+"anahtarı %s alınıyor\n"
 
-#: g10/import.c:1753
-#, fuzzy, c-format
+#: g10/import.c:1754
+#, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
-"UYARI: anahtar %08lX yürürlükten kaldırılmış olabilir: yürürlükten kaldırma "
-"anahtarı %08lX mevcut değil.\n"
+"UYARI: anahtar %s yürürlükten kaldırılmış olabilir: yürürlükten kaldırma "
+"anahtarı %s mevcut değil.\n"
 
-#: g10/import.c:1812
-#, fuzzy, c-format
+#: g10/import.c:1813
+#, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
-msgstr "anahtar %08lX: \"%s\" yürürlükten kaldırma sertifikası eklendi\n"
+msgstr "anahtar %s: \"%s\" yürürlükten kaldırma sertifikası eklendi\n"
 
-#: g10/import.c:1846
-#, fuzzy, c-format
+#: g10/import.c:1847
+#, c-format
 msgid "key %s: direct key signature added\n"
-msgstr "anahtar %08lX: doğrudan anahtar imzası eklendi\n"
+msgstr "anahtar %s: doğrudan anahtar imzası eklendi\n"
 
-#: g10/import.c:2235
-#, fuzzy
+#: g10/import.c:2236
 msgid "NOTE: a key's S/N does not match the card's one\n"
-msgstr "genel anahtar gizli anahtarla uyuşmuyor!\n"
+msgstr "BİLGİ: bir anahtarın seri numarası kartlardan biriyle uyuşmuyor\n"
 
-#: g10/import.c:2243
-#, fuzzy
+#: g10/import.c:2244
 msgid "NOTE: primary key is online and stored on card\n"
-msgstr "atlandı: gizli anahtar zaten var\n"
+msgstr "BİLGİ: asıl anahtar kart üzerinde saklı ve kullanılabilir\n"
 
-#: g10/import.c:2245
-#, fuzzy
+#: g10/import.c:2246
 msgid "NOTE: secondary key is online and stored on card\n"
-msgstr "atlandı: gizli anahtar zaten var\n"
+msgstr "BİLGİ: ikincil anahtar kart üzerinde saklı ve kullanılabilir\n"
 
-#: g10/keydb.c:167
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "`%s' anahtar zinciri oluşturulurken hata: %s\n"
 
-#: g10/keydb.c:174
+#: g10/keydb.c:175
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "`%s' anahtar zinciri oluşturuldu\n"
 
-#: g10/keydb.c:685
+#: g10/keydb.c:316 g10/keydb.c:319
+#, fuzzy, c-format
+msgid "keyblock resource `%s': %s\n"
+msgstr "`%s' oluşturulurken hata: %s\n"
+
+#: g10/keydb.c:698
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "anahtar zinciri belleği yeniden oluşturulurken hata: %s\n"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[yürürlükten kaldırma]"
 
-#: g10/keyedit.c:255
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[öz-imza]"
 
-#: g10/keyedit.c:333 g10/keylist.c:405
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 kötü imza\n"
 
-#: g10/keyedit.c:335 g10/keylist.c:407
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d kötü imza\n"
 
-#: g10/keyedit.c:337 g10/keylist.c:409
+#: g10/keyedit.c:344 g10/keylist.c:410
 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:339 g10/keylist.c:411
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, 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:341 g10/keylist.c:413
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 imza bir hata yüzünden kontrol edilmedi\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:415
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d imza hatalardan dolayı kontrol edilmedi\n"
 
-#: g10/keyedit.c:345
+#: g10/keyedit.c:352
 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:347
+#: g10/keyedit.c:354
 #, 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:403 g10/pkclist.c:262
-#, fuzzy
+#: g10/keyedit.c:410 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
 "(by looking at passports, checking fingerprints from different sources, "
 "etc.)\n"
 msgstr ""
-"Diğer kullanıcıları anahtarların doğrulayacak\n"
-"bu kullanıcının güven derecesine lütfen karar verin.\n"
-"(pasportuna mı bakarsınız yoksa farklı kaynaklardan\n"
-"parmakizlerini mi kontrol edersiniz...)? kararınızı verin\n"
+"Diğer kullanıcıların anahtarlarını doğrulayacak bu kullanıcının güven\n"
+"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:407 g10/pkclist.c:274
-#, fuzzy, c-format
+#: g10/keyedit.c:414 g10/pkclist.c:275
+#, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Şöyle böyle güveniyorum\n"
 
-#: g10/keyedit.c:408 g10/pkclist.c:276
-#, fuzzy, c-format
+#: g10/keyedit.c:415 g10/pkclist.c:277
+#, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Tamamen güveniyorum\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:434
 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 ""
+"Lütfen bu güvence imzasının derinliğini belirtin.\n"
+"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:443
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
-msgstr ""
+msgstr "Bu imzayı kısıtlayacak bir etki alanı girin, yoksa <enter> tuşlayın.\n"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
 
-#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
-#: g10/keyedit.c:858 g10/keyedit.c:1642
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1728
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Onu yine de imzalamak istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
-#: g10/keyedit.c:1648
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
+#: g10/keyedit.c:1734
 msgid "  Unable to sign.\n"
 msgstr "  İmzalanamıyor.\n"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Kullanıcı kimliği \"%s\" zamanaşımına uğradı."
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:650
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Kullanıcı kimliği \"%s\" öz-imzalı değil."
 
-#: g10/keyedit.c:676
+#: g10/keyedit.c:678
+#, fuzzy, c-format
+msgid "User ID \"%s\" is signable.  "
+msgstr "Kullanıcı kimliği \"%s\" öz-imzalı değil."
+
+#: g10/keyedit.c:680
+#, fuzzy
+msgid "Sign it? (y/N) "
+msgstr "Gerçekten imzalayacak mısınız? (e/H) "
+
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2553,11 +2569,11 @@ msgstr ""
 "\"%s\" üzerindeki öz-imza\n"
 "bir PGP 2.x tarzı imza.\n"
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:711
 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:699
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2566,12 +2582,12 @@ msgstr ""
 "\"%s\" üzerindeki imzanızın\n"
 "kullanım süresi dolmuş.\n"
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:729
 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:724
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2580,44 +2596,44 @@ msgstr ""
 "\"%s\" üzerindeki imzanız\n"
 "dahili bir imza.\n"
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:754
 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:749
-#, fuzzy, c-format
+#: g10/keyedit.c:775
+#, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
-msgstr "\"%s\" zaten %08lX anahtarıyla yerel olarak imzalanmış\n"
+msgstr "\"%s\" zaten %s anahtarıyla yerel olarak imzalanmış\n"
 
-#: g10/keyedit.c:752
-#, fuzzy, c-format
+#: g10/keyedit.c:778
+#, c-format
 msgid "\"%s\" was already signed by key %s\n"
-msgstr "\"%s\" zaten %08lX anahtarıyla imzalanmış\n"
+msgstr "\"%s\" zaten %s anahtarıyla imzalanmış\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:783
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Onu yine de imzalamak istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:779
-#, fuzzy, c-format
+#: g10/keyedit.c:805
+#, c-format
 msgid "Nothing to sign with key %s\n"
-msgstr "%08lX anahtarı ile imzalanacak hiçbir şey yok\n"
+msgstr "%s anahtarı ile imzalanacak hiçbir şey yok\n"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "Bu anahtarın kullanım süresi dolmuş!"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:840
 #, 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:818
+#: g10/keyedit.c:844
 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:851
+#: g10/keyedit.c:882
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2625,11 +2641,11 @@ msgstr ""
 "--pgp2 kipinde bir PGP 2.x anahtarlara bir OpenPGP imzası "
 "uygulanamayabilir.\n"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:884
 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:878
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2638,133 +2654,110 @@ 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:883
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Cevabı bilmiyorum. %s\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Tamamen kontrol edildi.%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) İlişkisel denetim yaptım.%s\n"
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:920
 #, 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:895
-#, fuzzy
+#: g10/keyedit.c:926
 msgid "Your selection? (enter `?' for more information): "
-msgstr "Seçiminiz? (bilgi için '?' giriniz): "
+msgstr "Seçiminiz? (daha fazla bilgi için: '?'): "
 
-#: g10/keyedit.c:919
-#, fuzzy, c-format
+#: g10/keyedit.c:950
+#, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
 "key \"%s\" (%s)\n"
 msgstr ""
-"Bu anahtarı kendi anahtarınızla imzalamak istediğinize gerçekten\n"
-"emin misiniz?: \""
+"Bu anahtarı kendi \"%s\" (%s) anahtarınızla imzalamak istediğinize "
+"gerçekten\n"
+"emin misiniz?\n"
 
-#: g10/keyedit.c:926
-#, fuzzy
+#: g10/keyedit.c:957
 msgid "This will be a self-signature.\n"
-msgstr ""
-"\n"
-"Bu bir öz-imza olacak.\n"
+msgstr "Bu bir öz-imza olacak.\n"
 
-#: g10/keyedit.c:932
-#, fuzzy
+#: g10/keyedit.c:963
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
-msgstr ""
-"\n"
-"UYARI: imza dışarı gönderilemez olarak imlenmeyecek.\n"
+msgstr "UYARI: imza dışarı gönderilemez olarak imlenmeyecek.\n"
 
-#: g10/keyedit.c:940
-#, fuzzy
+#: g10/keyedit.c:971
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
-msgstr ""
-"\n"
-"UYARI: imza yürürlükten kaldırılamaz olarak imlenmeyecek.\n"
+msgstr "UYARI: imza yürürlükten kaldırılamaz olarak imlenmeyecek.\n"
 
-#: g10/keyedit.c:950
-#, fuzzy
+#: g10/keyedit.c:981
 msgid "The signature will be marked as non-exportable.\n"
-msgstr ""
-"\n"
-"İmza dışarı gönderilemez olarak imlenecek.\n"
+msgstr "İmza dışarı gönderilemez olarak imlenecek.\n"
 
-#: g10/keyedit.c:957
-#, fuzzy
+#: g10/keyedit.c:988
 msgid "The signature will be marked as non-revocable.\n"
-msgstr ""
-"\n"
-"İmza yürürlükten kaldırılamaz olarak imlenecek.\n"
+msgstr "İmza yürürlükten kaldırılamaz olarak imlenecek.\n"
 
-#: g10/keyedit.c:964
-#, fuzzy
+#: g10/keyedit.c:995
 msgid "I have not checked this key at all.\n"
-msgstr ""
-"\n"
-"Her şeyiyle bu anahtarı kontrol edemedim.\n"
+msgstr "Her şeyiyle bu anahtarı sınayamadım.\n"
 
-#: g10/keyedit.c:969
-#, fuzzy
+#: g10/keyedit.c:1000
 msgid "I have checked this key casually.\n"
-msgstr ""
-"\n"
-"Bu anahtarı karşılaştırmalı kontrol ettim.\n"
+msgstr "Bu anahtarı karşılaştırmalı olarak sınadım.\n"
 
-#: g10/keyedit.c:974
-#, fuzzy
+#: g10/keyedit.c:1005
 msgid "I have checked this key very carefully.\n"
-msgstr ""
-"\n"
-"Bu anahtarı çok dikkatli kontrol ettim.\n"
+msgstr "Bu anahtarı çok dikkatle sınadım.\n"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1015
 msgid "Really sign? (y/N) "
 msgstr "Gerçekten imzalayacak mısınız? (e/H) "
 
-#: g10/keyedit.c:1029 g10/keyedit.c:4132 g10/keyedit.c:4223 g10/keyedit.c:4287
-#: g10/keyedit.c:4348 g10/sign.c:369
+#: g10/keyedit.c:1060 g10/keyedit.c:4350 g10/keyedit.c:4441 g10/keyedit.c:4505
+#: g10/keyedit.c:4566 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "imzalama başarısız: %s\n"
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1125
 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:1105 g10/keygen.c:3057
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "Bu anahtar korunmamış.\n"
 
-#: g10/keyedit.c:1109 g10/keygen.c:3045
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Asıl anahtarın gizli parçaları kullanılamaz.\n"
 
-#: g10/keyedit.c:1113 g10/keygen.c:3060
-#, fuzzy
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 msgid "Secret parts of primary key are stored on-card.\n"
-msgstr "Asıl anahtarın gizli parçaları kullanılamaz.\n"
+msgstr "Asıl anahtarın gizli parçaları kart üzerinde saklı.\n"
 
-#: g10/keyedit.c:1117 g10/keygen.c:3064
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "Anahtar korunmuş.\n"
 
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Bu anahtar üzerinde düzenleme yapılamaz: %s\n"
 
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2772,13 +2765,13 @@ msgstr ""
 "Bu gizli anahtar için yeni anahtar parolasını giriniz.\n"
 "\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:1825
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 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:1161
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2786,438 +2779,423 @@ msgstr ""
 "Bir anahtar parolası vermediniz - bu çok *kötü* bir fikir!\n"
 "\n"
 
-#: g10/keyedit.c:1164
-#, fuzzy
+#: g10/keyedit.c:1195
 msgid "Do you really want to do this? (y/N) "
-msgstr "Gerçekten bunu yapmak istiyor musunuz? "
+msgstr "Gerçekten bunu yapmak istiyor musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:1235
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "bir anahtar imzası doğru yere taşınıyor\n"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "kaydet ve çık"
 
-#: g10/keyedit.c:1322
-#, fuzzy
+#: g10/keyedit.c:1354
 msgid "show key fingerprint"
-msgstr "parmak izini gösterir"
+msgstr "parmakizini gösterir"
 
-#: g10/keyedit.c:1323
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "anahtarı ve kullanıcı kimliğini gösterir"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "N kullanıcı kimliğini seçer"
 
-#: g10/keyedit.c:1326
-#, fuzzy
+#: g10/keyedit.c:1358
 msgid "select subkey N"
-msgstr "N kullanıcı kimliğini seçer"
+msgstr "N yardımcı anahtarını"
 
-#: g10/keyedit.c:1327
-#, fuzzy
+#: g10/keyedit.c:1359
 msgid "check signatures"
-msgstr "imzaları yürürlükten kaldırır"
+msgstr "imzaları sınar"
 
-#: g10/keyedit.c:1330
+#: g10/keyedit.c:1362
 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:1335
-#, fuzzy
+#: g10/keyedit.c:1367
 msgid "sign selected user IDs locally"
-msgstr "anahtarı yerel olarak imzala"
+msgstr "kullanıcı kimlikleri yerel olarak imzalar"
 
-#: g10/keyedit.c:1337
-#, fuzzy
+#: g10/keyedit.c:1369
 msgid "sign selected user IDs with a trust signature"
-msgstr "İpucu: İmzalamak için bir kullanıcı kimliği seçiniz\n"
+msgstr "seçili kullanıcı kimlikleri bir güvence imzasıyla imzalar"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1371
 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:1343
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "bir kullanıcı kimliği ekler"
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "bir foto kimliği ekler"
 
-#: g10/keyedit.c:1347
-#, fuzzy
+#: g10/keyedit.c:1379
 msgid "delete selected user IDs"
-msgstr "kullanıcı kimliğini siler"
+msgstr "seçili kullanıcı kimlikleri siler"
 
-#: g10/keyedit.c:1352
-#, fuzzy
+#: g10/keyedit.c:1384
 msgid "add a subkey"
-msgstr "addkey"
+msgstr "bir yardımcı anahtar ekler"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
-msgstr ""
+msgstr "bir akıllı karta bir anahtar ekler"
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
-msgstr ""
+msgstr "bir akıllı karttan bir anahtarı taşır"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
-msgstr ""
+msgstr "bir akıllı karttan bir yedekleme anahtarını taşır"
 
-#: g10/keyedit.c:1364
-#, fuzzy
+#: g10/keyedit.c:1396
 msgid "delete selected subkeys"
-msgstr "bir yardımcı anahtar siler"
+msgstr "seçili yardımcı anahtarları siler"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr "bir yürürlükten kaldırma anahtarı ekler"
 
-#: g10/keyedit.c:1368
-#, fuzzy
+#: g10/keyedit.c:1400
 msgid "delete signatures from the selected user IDs"
-msgstr ""
-"Seçilen kullanıcı kimlik için tercihleri gerçekten güncellemek istiyor "
-"musunuz? "
+msgstr "seçili kullanıcı kimliklerden imzaları siler"
 
-#: g10/keyedit.c:1370
-#, fuzzy
+#: g10/keyedit.c:1402
 msgid "change the expiration date for the key or selected subkeys"
-msgstr "Bir v3 anahtarının son kullanma tarihini değiştiremezsiniz\n"
+msgstr ""
+"anahtar için ya da seçili yardımcı anahtarlar için zamanaşımı tarihini "
+"değiştirir"
 
-#: g10/keyedit.c:1372
-#, fuzzy
+#: g10/keyedit.c:1404
 msgid "flag the selected user ID as primary"
-msgstr "kullanıcı kimliğini asıl olarak imler"
+msgstr "seçili kullanıcı kimliğini asıl olarak imler"
 
-#: g10/keyedit.c:1374
-#, fuzzy
+#: g10/keyedit.c:1406
 msgid "toggle between the secret and public key listings"
 msgstr "genel ve gizli anahtar listeleri arasında yer değiştirir"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "tercihleri listeler (uzman)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "tercihleri listeler (ayrıntılı)"
 
-#: g10/keyedit.c:1381
-#, fuzzy
+#: g10/keyedit.c:1413
 msgid "set preference list for the selected user IDs"
-msgstr ""
-"Seçilen kullanıcı kimlik için tercihleri gerçekten güncellemek istiyor "
-"musunuz? "
+msgstr "Seçili kullanıcı kimlikler için tercih listesini belirler "
 
-#: g10/keyedit.c:1386
-#, fuzzy
+#: g10/keyedit.c:1418
 msgid "set preferred keyserver URL for the selected user IDs"
-msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
+msgstr ""
+"Seçili kullanıcı kimlikler için tercih edilen anahtar sunucu adresini "
+"belirler"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "anahtar parolasını değiştirir"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "sahibiningüvencesini değiştirir"
 
-#: g10/keyedit.c:1394
-#, fuzzy
+#: g10/keyedit.c:1426
 msgid "revoke signatures on the selected user IDs"
-msgstr "Seçilen tüm kullanıcı kimlikleri gerçekten iptal edilecek mi? "
+msgstr "Seçili tüm kullanıcı kimliklerdeki imzaları yürürlükten kaldırır"
 
-#: g10/keyedit.c:1396
-#, fuzzy
+#: g10/keyedit.c:1428
 msgid "revoke selected user IDs"
-msgstr "bir kullanıcı kimliği yürürlükten kaldırır"
+msgstr "Seçili tüm kullanıcı kimlikleri yürürlükten kaldırır"
 
-#: g10/keyedit.c:1401
-#, fuzzy
+#: g10/keyedit.c:1433
 msgid "revoke key or selected subkeys"
-msgstr "bir yardımcı anahtarı yürürlükten kaldırır"
+msgstr "anahtarı ya da seçili yardımcı anahtarları yürürlükten kaldırır"
 
-#: g10/keyedit.c:1402
-#, fuzzy
+#: g10/keyedit.c:1434
 msgid "enable key"
-msgstr "bir anahtarı kullanıma sokar"
+msgstr "anahtarı kullanıma sokar"
 
-#: g10/keyedit.c:1403
-#, fuzzy
+#: g10/keyedit.c:1435
 msgid "disable key"
-msgstr "bir anahtarı iptal eder"
+msgstr "anahtarı iptal eder"
 
-#: g10/keyedit.c:1404
-#, fuzzy
+#: g10/keyedit.c:1436
 msgid "show selected photo IDs"
-msgstr "foto kimliğini gösterir"
+msgstr "seçili foto kimlikleri gösterir"
 
-#: g10/keyedit.c:1476
-#, fuzzy, c-format
+#: g10/keyedit.c:1556
+#, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
-msgstr "gizli anahtar bloğu `%s' okunurken hata oluştu: %s\n"
+msgstr "gizli anahtar bloğu \"%s\" okunurken hata oluştu: %s\n"
 
-#: g10/keyedit.c:1494
+#: g10/keyedit.c:1574
 msgid "Secret key is available.\n"
 msgstr "Gizli anahtar mevcut.\n"
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1655
 msgid "Need the secret key to do this.\n"
 msgstr "Bunu yapmak için gizli anahtar gerekli.\n"
 
-#: g10/keyedit.c:1579
+#: g10/keyedit.c:1663
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "lütfen önce \"seçmece\" komutunu kullanın.\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1682
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
 "  a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
+"* `sign' komutu şu harflerden bir veya birkaçı ile başlayabilir:\n"
+"  güvence imzaları için 't' (tsign), yürürlükten kaldırılmayan imzalar\n"
+"  için 'nr', yerel imzalar için 'l' (lsign) veya buların karışımı   olarak "
+"(ltsign, tnrsign gibi).\n"
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1722
 msgid "Key is revoked."
 msgstr "Anahtar yürürlükten kaldırıldı."
 
-#: g10/keyedit.c:1657
-#, fuzzy
+#: g10/keyedit.c:1741
 msgid "Really sign all user IDs? (y/N) "
-msgstr "Tüm kullanıcı kimlikleri gerçekten imzalanacak mı? "
-
-#: g10/keyedit.c:1660
-msgid "Hint: Select the user IDs to sign\n"
-msgstr "İpucu: İmzalamak için bir kullanıcı kimliği seçiniz\n"
+msgstr "Tüm kullanıcı kimlikler gerçekten imzalanacak mı? (e/H ya da y/N)"
 
-#: g10/keyedit.c:1668
-#, fuzzy, c-format
+#: g10/keyedit.c:1748
+#, c-format
 msgid "Unknown signature type `%s'\n"
-msgstr "bilinmeyen imza sınıfı"
+msgstr "imza türü `%s' bilinmiyor\n"
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1771
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%s kipindeyken bu komut kullanılamaz.\n"
 
-#: g10/keyedit.c:1713 g10/keyedit.c:1733 g10/keyedit.c:1899
+#: g10/keyedit.c:1793 g10/keyedit.c:1813 g10/keyedit.c:1979
 msgid "You must select at least one user ID.\n"
 msgstr "En az bir kullanıcı kimliği seçmelisiniz.\n"
 
-#: g10/keyedit.c:1715
+#: g10/keyedit.c:1795
 msgid "You can't delete the last user ID!\n"
 msgstr "Son kullanıcı kimliğini silemezsiniz!\n"
 
-#: g10/keyedit.c:1717
-#, fuzzy
+#: g10/keyedit.c:1797
 msgid "Really remove all selected user IDs? (y/N) "
-msgstr "Seçilen tüm kullanıcı kimlikleri gerçekten silinecek mi? "
+msgstr ""
+"Seçilen tüm kullanıcı kimlikler gerçekten silinecek mi? (e/H ya da y/N) "
 
-#: g10/keyedit.c:1718
-#, fuzzy
+#: g10/keyedit.c:1798
 msgid "Really remove this user ID? (y/N) "
-msgstr "Bu kullanıcı kimliği gerçekten silinecek mi? "
+msgstr "Bu kullanıcı kimliği gerçekten silinecek mi? (e/H ya da y/N) "
 
-#: g10/keyedit.c:1768
-#, fuzzy
+#: g10/keyedit.c:1848
 msgid "Really move the primary key? (y/N) "
-msgstr "Bu kullanıcı kimliği gerçekten silinecek mi? "
+msgstr "Bu öz-imza gerçekten taşınacak mı?  (e/H ya da y/N) "
 
-#: g10/keyedit.c:1780
-#, fuzzy
+#: g10/keyedit.c:1860
 msgid "You must select exactly one key.\n"
-msgstr "En az bir anahtar seçmelisiniz.\n"
+msgstr "Sadece ve sadece bir anahtar seçmelisiniz.\n"
 
-#: g10/keyedit.c:1808
+#: g10/keyedit.c:1888
 msgid "Command expects a filename argument\n"
-msgstr ""
+msgstr "Komut argüman olarak bir dosya ismi gerektiriyor\n"
 
-#: g10/keyedit.c:1822
-#, fuzzy, c-format
+#: g10/keyedit.c:1902
+#, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "`%s' açılamıyor: %s\n"
 
-#: g10/keyedit.c:1839
-#, fuzzy, c-format
+#: g10/keyedit.c:1919
+#, c-format
 msgid "Error reading backup key from `%s': %s\n"
-msgstr "`%s' anahtar zinciri oluşturulurken hata: %s\n"
+msgstr "yedekleme anahtarı `%s' den okunurken hata oluştu: %s\n"
 
-#: g10/keyedit.c:1863
+#: g10/keyedit.c:1943
 msgid "You must select at least one key.\n"
 msgstr "En az bir anahtar seçmelisiniz.\n"
 
-#: g10/keyedit.c:1866
-#, fuzzy
+#: g10/keyedit.c:1946
 msgid "Do you really want to delete the selected keys? (y/N) "
-msgstr "Seçilen anahtarları gerçekten silmek istiyor musunuz? "
+msgstr "Seçilen anahtarları gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:1867
-#, fuzzy
+#: g10/keyedit.c:1947
 msgid "Do you really want to delete this key? (y/N) "
-msgstr "Bu anahtarı gerçekten silmek istiyor musunuz? "
+msgstr "Bu anahtarı gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:1902
-#, fuzzy
+#: g10/keyedit.c:1982
 msgid "Really revoke all selected user IDs? (y/N) "
-msgstr "Seçilen tüm kullanıcı kimlikleri gerçekten iptal edilecek mi? "
+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:1903
-#, fuzzy
+#: g10/keyedit.c:1983
 msgid "Really revoke this user ID? (y/N) "
-msgstr "Bu kullanıcı kimliği gerçekten iptal edilecek mi? "
+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:1921
-#, fuzzy
+#: g10/keyedit.c:2001
 msgid "Do you really want to revoke the entire key? (y/N) "
-msgstr "Bu anahtarı gerçekten yürürlükten kaldırmak istiyor musunuz? "
+msgstr ""
+"Anahtarın tamamını yürürlükten kaldırmayı gerçekten istiyor musunuz? (e/H ya "
+"da y/N) "
 
-#: g10/keyedit.c:1932
-#, fuzzy
+#: g10/keyedit.c:2012
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
-msgstr "Seçilen anahtarları gerçekten yürürlükten kaldırmak istiyor musunuz? "
+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:1934
-#, fuzzy
+#: g10/keyedit.c:2014
 msgid "Do you really want to revoke this subkey? (y/N) "
-msgstr "Bu anahtarı gerçekten yürürlükten kaldırmak istiyor musunuz? "
+msgstr ""
+"Bu yardımcı anahtarı gerçekten yürürlükten kaldırmak istiyor musunuz? (e/H "
+"ya da y/N) "
 
-#: g10/keyedit.c:1975
+#: g10/keyedit.c:2055
 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:2007
-#, fuzzy
+#: g10/keyedit.c:2087
 msgid "Set preference list to:\n"
-msgstr "tercih listesi oluşturmak için"
+msgstr "Belirlenecek tercih listesi:\n"
 
-#: g10/keyedit.c:2013
-#, fuzzy
+#: g10/keyedit.c:2093
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
-"Seçilen kullanıcı kimlik için tercihleri gerçekten güncellemek istiyor "
-"musunuz? "
+"Seçili kullanıcı kimlikler için tercihleri gerçekten güncellemek istiyor "
+"musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2015
-#, fuzzy
+#: g10/keyedit.c:2095
 msgid "Really update the preferences? (y/N) "
-msgstr "Tercihleri gerçekten güncellemek istiyor musunuz? "
+msgstr "Tercihleri gerçekten güncellemek istiyor musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2065
-#, fuzzy
+#: g10/keyedit.c:2157
+#, fuzzy, c-format
+msgid "Unable to clean `%s'\n"
+msgstr " '%s' çalıştırılamıyor: %s\n"
+
+#: g10/keyedit.c:2160
+msgid "Please specify item to clean: `sigs', `uids', or `all'\n"
+msgstr ""
+
+#: g10/keyedit.c:2171
 msgid "Save changes? (y/N) "
-msgstr "Değişiklikler kaydedilecek mi? "
+msgstr "Değişiklikler kaydedilecek mi? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2068
-#, fuzzy
+#: g10/keyedit.c:2174
 msgid "Quit without saving? (y/N) "
-msgstr "Kaydetmeden çıkılsın mı? "
+msgstr "Kaydetmeden çıkılsın mı? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2078
+#: g10/keyedit.c:2184
 #, c-format
 msgid "update failed: %s\n"
 msgstr "güncelleme başarısız: %s\n"
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2191
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gizliyi güncelleme başarısız: %s\n"
 
-#: g10/keyedit.c:2092
+#: g10/keyedit.c:2198
 msgid "Key not changed so no update needed.\n"
 msgstr "Güncelleme gereği olmadığından anahtar değişmedi.\n"
 
-#: g10/keyedit.c:2164
+#: g10/keyedit.c:2271
 msgid "Digest: "
 msgstr "Özümlenen: "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2323
 msgid "Features: "
 msgstr "Özellikler: "
 
-#: g10/keyedit.c:2227
+#: g10/keyedit.c:2334
 msgid "Keyserver no-modify"
-msgstr ""
+msgstr "Anahtar sunucusu değişmez"
 
-#: g10/keyedit.c:2242 g10/keylist.c:307
+#: g10/keyedit.c:2349 g10/keylist.c:308
 msgid "Preferred keyserver: "
-msgstr ""
+msgstr "Tercih edilen anahtar sunucusu: "
 
-#: g10/keyedit.c:2473
-#, fuzzy, c-format
+#: g10/keyedit.c:2580
+#, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr ""
-"Bu anahtar %s tarafından şu anahtarla yürürlükten kaldırılmış olabilir: "
+"Bu anahtar %2$s tarafından %3$s anahtarıyla %1$s üzerinde yürürlükten "
+"kaldırılmış\n"
 
-#: g10/keyedit.c:2494
-#, fuzzy, c-format
+#: g10/keyedit.c:2601
+#, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr ""
-"Bu anahtar %s tarafından şu anahtarla yürürlükten kaldırılmış olabilir: "
+"Bu anahtar %s tarafından %s anahtarıyla yürürlükten kaldırılmış olabilir"
 
-#: g10/keyedit.c:2500
-#, fuzzy
+#: g10/keyedit.c:2607
 msgid "(sensitive)"
-msgstr " (duyarlı)"
+msgstr "(duyarlı)"
 
-#: g10/keyedit.c:2516 g10/keyedit.c:2572 g10/keyedit.c:2684 g10/keyedit.c:2699
-#: g10/keylist.c:193 g10/keyserver.c:422
-#, fuzzy, c-format
+#: g10/keyedit.c:2623 g10/keyedit.c:2679 g10/keyedit.c:2792 g10/keyedit.c:2807
+#: g10/keylist.c:194 g10/keyserver.c:421
+#, c-format
 msgid "created: %s"
-msgstr "%s oluşturulamıyor: %s\n"
+msgstr "oluşturuldu: %s"
 
-#: g10/keyedit.c:2519 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:931
-#, fuzzy, c-format
+#: g10/keyedit.c:2626 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:948
+#, c-format
 msgid "revoked: %s"
-msgstr "[yürürlükten kaldırıldı] "
+msgstr "yürürlükten kaldırıldı: %s"
 
-#: g10/keyedit.c:2521 g10/keylist.c:757 g10/keylist.c:886
-#, fuzzy, c-format
+#: g10/keyedit.c:2628 g10/keylist.c:758 g10/keylist.c:887
+#, c-format
 msgid "expired: %s"
-msgstr "[son kullanma tarihi: %s]"
+msgstr "son kullanma tarihi: %s"
 
-#: g10/keyedit.c:2523 g10/keyedit.c:2574 g10/keyedit.c:2686 g10/keyedit.c:2701
-#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
-#: g10/keylist.c:913 g10/keyserver.c:428 g10/mainproc.c:937
-#, fuzzy, c-format
+#: g10/keyedit.c:2630 g10/keyedit.c:2681 g10/keyedit.c:2794 g10/keyedit.c:2809
+#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
+#: g10/keylist.c:914 g10/keyserver.c:427 g10/mainproc.c:954
+#, c-format
 msgid "expires: %s"
-msgstr "[son kullanma tarihi: %s]"
+msgstr "son kullanma tarihi: %s"
 
-#: g10/keyedit.c:2525
-#, fuzzy, c-format
+#: g10/keyedit.c:2632
+#, c-format
 msgid "usage: %s"
-msgstr " güvencesi: %c/%c"
+msgstr "kullanımı: %s"
 
-#: g10/keyedit.c:2540
-#, fuzzy, c-format
+#: g10/keyedit.c:2647
+#, c-format
 msgid "trust: %s"
-msgstr " güvencesi: %c/%c"
+msgstr "güvencesi: %s"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2651
 #, c-format
 msgid "validity: %s"
-msgstr ""
+msgstr "geçerliliği: %s"
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2658
 msgid "This key has been disabled"
 msgstr "Bu anahtar iptal edilmişti"
 
-#: g10/keyedit.c:2579 g10/keylist.c:199
+#: g10/keyedit.c:2686 g10/keylist.c:200
 msgid "card-no: "
-msgstr ""
+msgstr "kart-no: "
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2754
 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:2654
+#: g10/keyedit.c:2762
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3225,28 +3203,26 @@ 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:2718 g10/keyserver.c:432 g10/mainproc.c:1577
-#: g10/trustdb.c:1178
-#, fuzzy
+#: g10/keyedit.c:2826 g10/keyedit.c:3201 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1690
 msgid "revoked"
-msgstr "[yürürlükten kaldırıldı] "
+msgstr "yürürlükten kaldırıldı"
 
-#: g10/keyedit.c:2720 g10/keyserver.c:436 g10/mainproc.c:1579
-#: g10/trustdb.c:531
-#, fuzzy
+#: g10/keyedit.c:2828 g10/keyedit.c:3203 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1692
 msgid "expired"
-msgstr "expire"
+msgstr "zamanaşımına uğradı"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2893
 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 ""
-"UYARI: birincil olarak imli bir kullanıcı kimliği yok. Bu komut\n"
-"       başka bir kullanıcı kimliğinin birincil varsayılmasına sebep "
-"olabilir.\n"
+"UYARI: birincil olarak imlenmiş bir kullanıcı kimlik yok. Bu komutla\n"
+"       farklı bir kullanıcı kimliğin birincil kullanıcı kimlik olarak\n"
+"       kabul edilmesini sağlayabilirsiniz.\n"
 
-#: g10/keyedit.c:2845
+#: g10/keyedit.c:2953
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3255,45 +3231,75 @@ msgstr ""
 "UYARI: Bu PGP-2 tarzı bir anahtar. Bir foto kimliği eklenmesi bu anahtarın\n"
 "       bazı PGP sürümleri tarafından reddedilmesi ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:2850 g10/keyedit.c:3128
+#: g10/keyedit.c:2958 g10/keyedit.c:3307
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Onu yine de eklemek istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:2856
+#: g10/keyedit.c:2964
 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:2996
+#: g10/keyedit.c:3104
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Bu doğru imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3114
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Bu geçersiz imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:3010
+#: g10/keyedit.c:3118
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Bu bilinmeyen imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:3016
+#: g10/keyedit.c:3124
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Bu öz-imza gerçekten silinecek mi? (e/H)"
 
-#: g10/keyedit.c:3030
+#: g10/keyedit.c:3138
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3139
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:3034
+#: g10/keyedit.c:3142
 msgid "Nothing deleted.\n"
 msgstr "Hiçbir şey silinmedi.\n"
 
-#: g10/keyedit.c:3123
+#: g10/keyedit.c:3167
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed.\n"
+msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
+
+#: g10/keyedit.c:3168
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed.\n"
+msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
+
+#: g10/keyedit.c:3173
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean.\n"
+msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
+
+#: g10/keyedit.c:3205 g10/trustdb.c:1694
+#, fuzzy
+msgid "invalid"
+msgstr "geçersiz zırh"
+
+#: g10/keyedit.c:3207
+#, fuzzy, c-format
+msgid "User ID \"%s\" removed: %s\n"
+msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
+
+#: g10/keyedit.c:3214
+#, fuzzy
+msgid "No user IDs are removable.\n"
+msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
+
+#: g10/keyedit.c:3302
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3303,354 +3309,347 @@ msgstr ""
 "       eklenmesi bu anahtarın bazı PGP sürümleri tarafından reddedilmesi\n"
 "       ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:3134
+#: g10/keyedit.c:3313
 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:3154
+#: g10/keyedit.c:3333
 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:3177
+#: g10/keyedit.c:3356
 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:3192
+#: g10/keyedit.c:3371
 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:3214
-#, fuzzy
+#: g10/keyedit.c:3393
 msgid "this key has already been designated as a revoker\n"
-msgstr "UYARI: Bu anahtar sahibi tarafından yürürlükten kaldırılmıştı!\n"
+msgstr "bu anahtar zaten onu üreten tarafından yürürlükten kaldırılmıştı\n"
 
-#: g10/keyedit.c:3233
+#: g10/keyedit.c:3412
 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:3239
-#, fuzzy
+#: g10/keyedit.c:3418
 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): "
+"misiniz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:3300
+#: g10/keyedit.c:3479
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Lütfen gizli anahtarlardan seçilenleri silin.\n"
 
-#: g10/keyedit.c:3306
-#, fuzzy
+#: g10/keyedit.c:3485
 msgid "Please select at most one subkey.\n"
 msgstr "Lütfen en fazla bir yardımcı anahtar seçin.\n"
 
-#: g10/keyedit.c:3310
-#, fuzzy
+#: g10/keyedit.c:3489
 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:3313
+#: g10/keyedit.c:3492
 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:3359
+#: g10/keyedit.c:3538
 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:3375
+#: g10/keyedit.c:3554
 msgid "No corresponding signature in secret ring\n"
 msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
 
-#: g10/keyedit.c:3455
+#: g10/keyedit.c:3634
 msgid "Please select exactly one user ID.\n"
 msgstr "Lütfen sadece ve sadece bir kullanıcı kimlik seçiniz.\n"
 
-#: g10/keyedit.c:3494 g10/keyedit.c:3604 g10/keyedit.c:3724
-#, fuzzy, c-format
+#: g10/keyedit.c:3673 g10/keyedit.c:3783 g10/keyedit.c:3903
+#, 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:3665
+#: g10/keyedit.c:3844
 msgid "Enter your preferred keyserver URL: "
-msgstr ""
+msgstr "Tercih ettiğiniz sunucunun adresini girin: "
 
-#: g10/keyedit.c:3745
-#, fuzzy
+#: g10/keyedit.c:3924
 msgid "Are you sure you want to replace it? (y/N) "
-msgstr "Onu kullanmak istediğinizden emin misiniz? (e/H) "
+msgstr "Onu değiştirmek istediğinizden emin misiniz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:3746
-#, fuzzy
+#: g10/keyedit.c:3925
 msgid "Are you sure you want to delete it? (y/N) "
-msgstr "Onu kullanmak istediğinizden emin misiniz? (e/H) "
+msgstr "Onu silmek istediğinizden emin misiniz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3987
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:3854
+#: g10/keyedit.c:4045
 #, fuzzy, c-format
-msgid "No subkey with index %d\n"
+msgid "No user ID with hash %s\n"
 msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:3971
-#, fuzzy, c-format
+#: g10/keyedit.c:4072
+#, c-format
+msgid "No subkey with index %d\n"
+msgstr "%d indisli bir yardımcı anahtar yok\n"
+
+#: g10/keyedit.c:4189
+#, c-format
 msgid "user ID: \"%s\"\n"
-msgstr "Kullanıcı kimliği: \""
+msgstr "Kullanıcı kimliği: \"%s\"\n"
 
-#: g10/keyedit.c:3974 g10/keyedit.c:4038 g10/keyedit.c:4081
-#, fuzzy, c-format
+#: g10/keyedit.c:4192 g10/keyedit.c:4256 g10/keyedit.c:4299
+#, c-format
 msgid "signed by your key %s on %s%s%s\n"
-msgstr "   %08lX ile %s%s%s de imzalanmış\n"
+msgstr "%s anahtarınızla %s%s%s de imzalandı\n"
 
-#: g10/keyedit.c:3976 g10/keyedit.c:4040 g10/keyedit.c:4083
+#: g10/keyedit.c:4194 g10/keyedit.c:4258 g10/keyedit.c:4301
 msgid " (non-exportable)"
 msgstr " (dışarda geçersiz)"
 
-#: g10/keyedit.c:3980
+#: g10/keyedit.c:4198
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Bu anahtarın geçerliliği %s de bitti.\n"
 
-#: g10/keyedit.c:3984
+#: g10/keyedit.c:4202
 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:3988
+#: g10/keyedit.c:4206
 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:4015
-#, fuzzy, c-format
+#: g10/keyedit.c:4233
+#, c-format
 msgid "You have signed these user IDs on key %s:\n"
-msgstr "Bu kullanıcı kimliklerini imzalamışsınız:\n"
+msgstr "Bu kullanıcı kimliklerini %s anahtarı üzerinde imzalamışsınız:\n"
 
-#: g10/keyedit.c:4041
-#, fuzzy
+#: g10/keyedit.c:4259
 msgid " (non-revocable)"
-msgstr " (dışarda geçersiz)"
+msgstr " (yürülükten kaldırılmaz)"
 
-#: g10/keyedit.c:4048
-#, fuzzy, c-format
+#: g10/keyedit.c:4266
+#, c-format
 msgid "revoked by your key %s on %s\n"
-msgstr "   %08lX tarafından %s de yürürlükten kaldırılmış\n"
+msgstr "%s tarafından %s de yürürlükten kaldırılmış\n"
 
-#: g10/keyedit.c:4070
+#: g10/keyedit.c:4288
 msgid "You are about to revoke these signatures:\n"
 msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n"
 
-#: g10/keyedit.c:4090
+#: g10/keyedit.c:4308
 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:4120
+#: g10/keyedit.c:4338
 msgid "no secret key\n"
 msgstr "gizli anahtar yok\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4408
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4425
 #, 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:4271
-#, fuzzy, c-format
+#: g10/keyedit.c:4489
+#, c-format
 msgid "Key %s is already revoked.\n"
-msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
+msgstr "Anahtar %s zaten yürürlükten kaldırılmış.\n"
 
-#: g10/keyedit.c:4333
-#, fuzzy, c-format
+#: g10/keyedit.c:4551
+#, c-format
 msgid "Subkey %s is already revoked.\n"
-msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
+msgstr "Yardımcı anahtar %s zaten yürürlükten kaldırılmış.\n"
 
-#: g10/keyedit.c:4428
-#, fuzzy, c-format
+#: g10/keyedit.c:4646
+#, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
-"Anahtar 0x%3$08lX (kull-kiml %4$d) için %2$ld uzunluktaki %1$s foto kimliği "
+"Anahtar 0x%3$s (kull-kiml %4$d) için %2$ld uzunluktaki %1$s foto kimliği "
 "gösteriliyor\n"
 
-#: g10/keygen.c:293
-#, fuzzy, c-format
+#: g10/keygen.c:258
+#, c-format
 msgid "preference `%s' duplicated\n"
-msgstr "%c%lu tercihi yinelendi\n"
+msgstr "'%s' tercihi yinelendi\n"
 
-#: g10/keygen.c:300
-#, fuzzy
+#: g10/keygen.c:265
 msgid "too many cipher preferences\n"
-msgstr "`%c' tercih çok fazla\n"
+msgstr "çok fazla şifreleme tercihi\n"
 
-#: g10/keygen.c:302
-#, fuzzy
+#: g10/keygen.c:267
 msgid "too many digest preferences\n"
-msgstr "`%c' tercih çok fazla\n"
+msgstr "çok fazla özümleme tercihi\n"
 
-#: g10/keygen.c:304
-#, fuzzy
+#: g10/keygen.c:269
 msgid "too many compression preferences\n"
-msgstr "`%c' tercih çok fazla\n"
+msgstr "çok fazla sıkıştırma tercihi\n"
 
-#: g10/keygen.c:401
-#, fuzzy, c-format
+#: g10/keygen.c:394
+#, c-format
 msgid "invalid item `%s' in preference string\n"
-msgstr "tercih dizgesindeki karakter geçersiz\n"
+msgstr "tercih dizgesindeki '%s' öğesi geçersiz\n"
 
-#: g10/keygen.c:829
+#: g10/keygen.c:822
 msgid "writing direct signature\n"
 msgstr "doğrudan imza yazılıyor\n"
 
-#: g10/keygen.c:868
+#: g10/keygen.c:861
 msgid "writing self signature\n"
 msgstr "öz-imza yazılıyor\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing key binding signature\n"
 msgstr "anahtarı garantileyen imzayı yazıyor\n"
 
-#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2632
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "anahtar uzunluğu geçersiz; %u bit kullanılıyor\n"
 
-#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2638
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "anahtar uzunluğu %u bite yuvarlandı\n"
 
-#: g10/keygen.c:1249
-#, fuzzy
+#: g10/keygen.c:1239
 msgid "Sign"
-msgstr "sign"
+msgstr "İmzalama"
 
-#: g10/keygen.c:1252
-#, fuzzy
+#: g10/keygen.c:1242
 msgid "Encrypt"
-msgstr "veriyi şifreler"
+msgstr "Şifreleme"
 
-#: g10/keygen.c:1255
+#: g10/keygen.c:1245
 msgid "Authenticate"
-msgstr ""
+msgstr "Kimlik kanıtlama"
 
-#: g10/keygen.c:1263
+#: g10/keygen.c:1253
 msgid "SsEeAaQq"
-msgstr ""
+msgstr "İiŞşKkçÇ"
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1268
 #, c-format
 msgid "Possible actions for a %s key: "
-msgstr ""
+msgstr "bir %s anahtarı için olası eylemler: "
 
-#: g10/keygen.c:1282
+#: g10/keygen.c:1272
 msgid "Current allowed actions: "
-msgstr ""
+msgstr "Şimdilik mümkün eylemler: "
 
-#: g10/keygen.c:1287
+#: g10/keygen.c:1277
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
-msgstr ""
+msgstr "   (%c) İmzalama yeteneğini açar/kapar\n"
 
-#: g10/keygen.c:1290
-#, fuzzy, c-format
+#: g10/keygen.c:1280
+#, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
-msgstr "   (%d) ElGamal (yalnız şifrelemek için)\n"
+msgstr "   (%c) Şifreleme yeteneğini açar/kapar\n"
 
-#: g10/keygen.c:1293
+#: g10/keygen.c:1283
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
-msgstr ""
+msgstr "   (%c) Kimlik kanıtlama yeteneğini açar/kapar\n"
 
-#: g10/keygen.c:1296
+#: g10/keygen.c:1286
 #, c-format
 msgid "   (%c) Finished\n"
-msgstr ""
+msgstr "   (%c) Bitti\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1340
 msgid "Please select what kind of key you want:\n"
 msgstr "Lütfen istediğiniz anahtarı seçiniz:\n"
 
-#: g10/keygen.c:1352
-#, fuzzy, c-format
+#: g10/keygen.c:1342
+#, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
-msgstr "   (%d) DSA ve ElGamal (öntanımlı)\n"
+msgstr "  (%d) DSA ve ElGamal (öntanımlı)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1343
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (yalnız imzalamak için)\n"
 
-#: g10/keygen.c:1355
-#, fuzzy, c-format
+#: g10/keygen.c:1345
+#, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) RSA (sadece şifrelemek için)\n"
+msgstr "   (%d) DSA (yeteneklerini belirtin)\n"
 
-#: g10/keygen.c:1357
-#, fuzzy, c-format
+#: g10/keygen.c:1347
+#, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (yalnız şifrelemek için)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1348
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (sadece imzalamak için)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1350
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (sadece şifrelemek için)\n"
 
-#: g10/keygen.c:1362
-#, fuzzy, c-format
+#: g10/keygen.c:1352
+#, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
-msgstr "   (%d) RSA (sadece şifrelemek için)\n"
+msgstr "   (%d) RSA (yeteneklerini belirtin)\n"
 
-#: g10/keygen.c:1431 g10/keygen.c:2509
-#, fuzzy, c-format
+#: g10/keygen.c:1421 g10/keygen.c:2506
+#, c-format
 msgid "DSA keypair will have %u bits.\n"
-msgstr "DSA anahtar çifti 1024 bit olacak.\n"
+msgstr "DSA anahtar çifti %u bit olacak.\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1431
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
-msgstr ""
+msgstr "%s anahtarları %u bit ile %u bit arasında olmalı.\n"
 
-#: g10/keygen.c:1448
-#, fuzzy, c-format
+#: g10/keygen.c:1438
+#, c-format
 msgid "What keysize do you want? (%u) "
-msgstr "İstediğiniz anahtar uzunluğu nedir? (1024) "
+msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1452
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
-msgstr ""
+msgstr "%s anahtar uzunlukları %u-%u aralığında olmalı\n"
 
-#: g10/keygen.c:1468
+#: g10/keygen.c:1458
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "İstenen anahtar uzunluğu: %u bit\n"
 
-#: g10/keygen.c:1473 g10/keygen.c:1478
+#: g10/keygen.c:1463 g10/keygen.c:1468
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%u bite yuvarlandı\n"
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1515
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3666,7 +3665,7 @@ msgstr ""
 "      <n>m = anahtar n ay geçerli\n"
 "      <n>y = anahtar n yıl geçerli\n"
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1526
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3682,39 +3681,38 @@ msgstr ""
 "      <n>m = imza n ay geçerli\n"
 "      <n>y = imza n yıl geçerli\n"
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1549
 msgid "Key is valid for? (0) "
 msgstr "Anahtar ne kadar geçerli olacak? (0) "
 
-#: g10/keygen.c:1563
-msgid "Signature is valid for? (0) "
+#: g10/keygen.c:1554
+#, fuzzy, c-format
+msgid "Signature is valid for? (%s) "
 msgstr "İmza ne kadar geçerli olacak? (0) "
 
-#: g10/keygen.c:1568
+#: g10/keygen.c:1572
 msgid "invalid value\n"
 msgstr "değer hatalı\n"
 
-#: g10/keygen.c:1575
-#, fuzzy
+#: g10/keygen.c:1579
 msgid "Key does not expire at all\n"
-msgstr "%s hep geçerli olacak\n"
+msgstr "Anahtar hep geçerli olacak\n"
 
-#: g10/keygen.c:1576
-#, fuzzy
+#: g10/keygen.c:1580
 msgid "Signature does not expire at all\n"
-msgstr "%s hep geçerli olacak\n"
+msgstr "İmza hep geçerli olacak\n"
 
-#: g10/keygen.c:1583
-#, fuzzy, c-format
+#: g10/keygen.c:1585
+#, c-format
 msgid "Key expires at %s\n"
-msgstr "%s %s sonra geçersiz olacak\n"
+msgstr "Anahtarın geçerliliği %s de bitecek.\n"
 
-#: g10/keygen.c:1584
-#, fuzzy, c-format
+#: g10/keygen.c:1586
+#, c-format
 msgid "Signature expires at %s\n"
-msgstr "Bu imzanın geçerliliği %s de bitecek.\n"
+msgstr "İmzanın geçerliliği %s de bitecek.\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1592
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3722,13 +3720,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:1595
-#, fuzzy
+#: g10/keygen.c:1597
 msgid "Is this correct? (y/N) "
-msgstr "Bu doğru mu? (e/h)? "
+msgstr "Bu doğru mu? (e/H ya da y/N) "
 
-#: g10/keygen.c:1638
-#, fuzzy
+#: g10/keygen.c:1641
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3740,48 +3736,48 @@ msgstr ""
 "\n"
 "Anahtarınızın size ait olduğunu belirten bir Kullanıcı-Kimliği olmalı;\n"
 "Kullanıcı-Kimliği, Gerçek İsminiz, Bir Önbilgi ve e-Posta Adresiniz\n"
-"alanlarının bir birleşiminden oluşur. Örneğin:\n"
+"alanlarının birleşiminden oluşur. Örneğin:\n"
 "\t\"Fatih Sultan Mehmed (Padisah) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1651
+#: g10/keygen.c:1654
 msgid "Real name: "
 msgstr "Adınız ve Soyadınız: "
 
-#: g10/keygen.c:1659
+#: g10/keygen.c:1662
 msgid "Invalid character in name\n"
 msgstr "Ad ve soyadınızda geçersiz karakter var\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1664
 msgid "Name may not start with a digit\n"
 msgstr "Ad ve soyadınız bir rakamla başlamamalı\n"
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1666
 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:1671
+#: g10/keygen.c:1674
 msgid "Email address: "
 msgstr "E-posta adresiniz: "
 
-#: g10/keygen.c:1682
+#: g10/keygen.c:1685
 msgid "Not a valid email address\n"
 msgstr "geçerli bir E-posta adresi değil\n"
 
-#: g10/keygen.c:1690
+#: g10/keygen.c:1693
 msgid "Comment: "
 msgstr "Önbilgi: "
 
-#: g10/keygen.c:1696
+#: g10/keygen.c:1699
 msgid "Invalid character in comment\n"
 msgstr "Önbilgi alanında geçersiz karakter var\n"
 
-#: g10/keygen.c:1719
+#: g10/keygen.c:1722
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "`%s' karakter kümesini kullanıyorsunuz.\n"
 
-#: g10/keygen.c:1725
+#: g10/keygen.c:1728
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3792,7 +3788,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1733
 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"
@@ -3808,24 +3804,24 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1746
+#: g10/keygen.c:1749
 msgid "NnCcEeOoQq"
 msgstr "AaYyEeTtKk"
 
-#: g10/keygen.c:1756
+#: g10/keygen.c:1759
 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:1757
+#: g10/keygen.c:1760
 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:1776
+#: g10/keygen.c:1779
 msgid "Please correct the error first\n"
 msgstr "Lütfen önce hatayı düzeltin\n"
 
-#: g10/keygen.c:1816
+#: g10/keygen.c:1819
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3833,12 +3829,12 @@ msgstr ""
 "Gizli anahtarınızı korumak için bir Anahtar Parolanız olmalı.\n"
 "\n"
 
-#: g10/keygen.c:1826 g10/passphrase.c:1105
+#: g10/keygen.c:1829 g10/passphrase.c:786
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1832
+#: g10/keygen.c:1835
 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"
@@ -3850,7 +3846,7 @@ msgstr ""
 "seçeneği ile kullanarak her zaman değiştirebilirsiniz.\n"
 "\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1857
 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"
@@ -3863,71 +3859,70 @@ msgstr ""
 "iyi olacaktır; bu yeterli rasgele bayt kazanmak için rasgele sayı\n"
 "üretecine yardımcı olur. \n"
 
-#: g10/keygen.c:2578
+#: g10/keygen.c:2575
 msgid "Key generation canceled.\n"
 msgstr "Anahtar üretimi durduruldu.\n"
 
-#: g10/keygen.c:2766 g10/keygen.c:2910
+#: g10/keygen.c:2774 g10/keygen.c:2918
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "genel anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:2768 g10/keygen.c:2913
-#, fuzzy, c-format
+#: g10/keygen.c:2776 g10/keygen.c:2921
+#, c-format
 msgid "writing secret key stub to `%s'\n"
-msgstr "gizli anahtarı `%s'e yazıyor\n"
+msgstr "gizli anahtar koçanı `%s'e yazılıyor\n"
 
-#: g10/keygen.c:2771 g10/keygen.c:2916
+#: g10/keygen.c:2779 g10/keygen.c:2924
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "gizli anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2907
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "yazılabilir bir genel anahtar zinciri yok: %s\n"
 
-#: g10/keygen.c:2905
+#: g10/keygen.c:2913
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "yazılabilir bir gizli anahtar zinciri yok: %s\n"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2931
 #, 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:2930
+#: g10/keygen.c:2938
 #, 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:2953
+#: g10/keygen.c:2961
 msgid "public and secret key created and signed.\n"
 msgstr "genel ve gizli anahtar üretildi ve imzalandı.\n"
 
-#: g10/keygen.c:2964
-#, fuzzy
+#: g10/keygen.c:2972
 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 ""
-"Bu anahtar şifreleme için kullanılamaz. Şifreleme için ikinci bir anahtarı\n"
+"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:2976 g10/keygen.c:3105 g10/keygen.c:3220
+#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3156 g10/sign.c:290
+#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
 #, 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:3030 g10/keygen.c:3158 g10/sign.c:292
+#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -3935,374 +3930,345 @@ msgstr ""
 "anahtar bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
 "problemi)\n"
 
-#: g10/keygen.c:3039 g10/keygen.c:3169
+#: g10/keygen.c:3047 g10/keygen.c:3177
 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:3078 g10/keygen.c:3202
-#, fuzzy
+#: g10/keygen.c:3086 g10/keygen.c:3210
 msgid "Really create? (y/N) "
-msgstr "Gerçekten oluşturulsun mu? "
+msgstr "Gerçekten oluşturulsun mu? (e/H ya da y/N) "
 
-#: g10/keygen.c:3355
-#, fuzzy, c-format
+#: g10/keygen.c:3363
+#, c-format
 msgid "storing key onto card failed: %s\n"
-msgstr "anahtar bloğu silinemedi: %s\n"
-
-#: g10/keygen.c:3402
-#, fuzzy, c-format
-msgid "can't create backup file `%s': %s\n"
-msgstr "\"%s\" oluşturulamıyor: %s\n"
-
-#: g10/keygen.c:3428
-#, fuzzy, c-format
-msgid "NOTE: backup of card key saved to `%s'\n"
-msgstr "BİLGİ: %08lX gizli anahtarının %s tarihinde kullanım süresi doldu\n"
+msgstr "anahtarın kart üzerinde saklanması başarısız: %s\n"
 
-#: g10/keygen.c:3508
+#: g10/keygen.c:3410
 #, c-format
-msgid "length of RSA modulus is not %d\n"
-msgstr ""
-
-#: g10/keygen.c:3514
-msgid "public exponent too large (more than 32 bits)\n"
-msgstr ""
+msgid "can't create backup file `%s': %s\n"
+msgstr "'%s' yedek dosyası oluşturulamıyor: %s\n"
 
-#: g10/keygen.c:3520 g10/keygen.c:3526
+#: g10/keygen.c:3436
 #, c-format
-msgid "length of an RSA prime is not %d\n"
-msgstr ""
+msgid "NOTE: backup of card key saved to `%s'\n"
+msgstr "BİLGİ: kart anahtarının yedeklemesi '%s' e kaydedildi\n"
 
-#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
+#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
 msgid "never     "
 msgstr "asla    "
 
-#: g10/keylist.c:264
+#: g10/keylist.c:265
 msgid "Critical signature policy: "
 msgstr "Kritik imza guvencesi: "
 
-#: g10/keylist.c:266
+#: g10/keylist.c:267
 msgid "Signature policy: "
 msgstr "imza guvencesi: "
 
-#: g10/keylist.c:305
+#: g10/keylist.c:306
 msgid "Critical preferred keyserver: "
-msgstr ""
+msgstr "Kritik tercihli anahtar sunucusu: "
 
-#: g10/keylist.c:354 g10/keylist.c:398
+#: 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:372
+#: g10/keylist.c:373
 msgid "Critical signature notation: "
 msgstr "Kritik imza niteleyici: "
 
-#: g10/keylist.c:374
+#: g10/keylist.c:375
 msgid "Signature notation: "
 msgstr "imza niteleyici: "
 
-#: g10/keylist.c:385
+#: g10/keylist.c:386
 msgid "not human readable"
 msgstr "insan okuyabilir değil"
 
-#: g10/keylist.c:486
+#: g10/keylist.c:487
 msgid "Keyring"
 msgstr "Anahtar Zinciri"
 
-#: g10/keylist.c:792
-#, fuzzy, c-format
+#: g10/keylist.c:793
+#, c-format
 msgid "expired: %s)"
 msgstr "[son kullanma tarihi: %s]"
 
-#: g10/keylist.c:1488
+#: g10/keylist.c:1489
 msgid "Primary key fingerprint:"
 msgstr "Birincil anahtar parmak izi:"
 
-#: g10/keylist.c:1490
+#: g10/keylist.c:1491
 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:1497
+#: g10/keylist.c:1498
 msgid " Primary key fingerprint:"
 msgstr "Birincil anahtar parmak izi:"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1500
 msgid "      Subkey fingerprint:"
 msgstr "Yardımcı anahtar parmak izi:"
 
-#: g10/keylist.c:1503 g10/keylist.c:1507
-#, fuzzy
+#: g10/keylist.c:1504 g10/keylist.c:1508
 msgid "      Key fingerprint ="
-msgstr "     Anahtar parmak izi ="
+msgstr "     Anahtar parmakizi ="
 
-#: g10/keylist.c:1574
+#: g10/keylist.c:1575
 msgid "      Card serial no. ="
-msgstr ""
+msgstr "      Kart seri no. ="
 
-#: g10/keyring.c:1245
-#, fuzzy, c-format
+#: g10/keyring.c:1246
+#, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
-msgstr "zırhlama başarısız: %s\n"
+msgstr "`%s' > `%s' isim değişikliği başarısız: %s\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1252
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "UYARI: gizli bilgi içeren 2 dosya mevcut.\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s değişmeyenlerden\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1255
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s yenilerden\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1256
 msgid "Please fix this possible security flaw\n"
 msgstr "Lütfen bu güvenlik çatlağını giderin\n"
 
-#: g10/keyring.c:1375
-#, fuzzy, c-format
+#: g10/keyring.c:1376
+#, c-format
 msgid "caching keyring `%s'\n"
-msgstr "`%s' anahtar zinciri denetleniyor\n"
+msgstr "%s' anahtar zinciri arabellekleniyor\n"
 
-#: g10/keyring.c:1421
-#, fuzzy, c-format
+#: g10/keyring.c:1422
+#, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
-msgstr "%lu anahtar denetlendi (%lu imza)\n"
+msgstr "şimdiye kadar %lu anahtar arabelleklendi (%lu imza)\n"
 
-#: g10/keyring.c:1433
-#, fuzzy, c-format
+#: g10/keyring.c:1434
+#, c-format
 msgid "%lu keys cached (%lu signatures)\n"
-msgstr "%lu anahtar denetlendi (%lu imza)\n"
+msgstr "%lu anahtar arabelleklendi (%lu imza)\n"
 
-#: g10/keyring.c:1504
+#: g10/keyring.c:1505
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: anahtar zinciri oluşturuldu\n"
 
-#: g10/keyserver.c:107
-#, fuzzy, c-format
+#: g10/keyserver.c:105
+#, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
-msgstr ""
-"UYARI: `%s' deki seçenekler bu çalıştırma sırasında henüz etkin değil\n"
+msgstr "UYARI: anahtar sunucusu seçeneği `%s' bu platformda kullanımda değil\n"
 
-#: g10/keyserver.c:434
-#, fuzzy
+#: g10/keyserver.c:433
 msgid "disabled"
-msgstr "disable"
+msgstr "iptal edildi"
 
-#: g10/keyserver.c:635
+#: g10/keyserver.c:634
 msgid "Enter number(s), N)ext, or Q)uit > "
-msgstr ""
+msgstr "Sayıyı/sayıları girin veya S)onraki ya da Ç)ık >"
 
-#: g10/keyserver.c:718 g10/keyserver.c:1238
-#, fuzzy, c-format
+#: g10/keyserver.c:717 g10/keyserver.c:1267
+#, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
-msgstr "dışsallaştırma seçenekleri geçersiz\n"
+msgstr "anahtar sunucu protokolü geçersiz (bizimki %d!=eylemci %d)\n"
 
-#: g10/keyserver.c:808
-#, fuzzy, c-format
+#: g10/keyserver.c:815
+#, c-format
 msgid "key \"%s\" not found on keyserver\n"
-msgstr "anahtar `%s' yok: %s\n"
+msgstr "anahtar \"%s\" anahtar sunucusunda yok\n"
 
-#: g10/keyserver.c:810
-#, fuzzy
+#: g10/keyserver.c:817
 msgid "key not found on keyserver\n"
-msgstr "anahtar `%s' yok: %s\n"
+msgstr "anahtar, anahtar sunucusunda yok\n"
 
-#: g10/keyserver.c:985
-#, fuzzy, c-format
+#: g10/keyserver.c:1014
+#, c-format
 msgid "requesting key %s from %s server %s\n"
-msgstr "%08lX anahtarı %s adresinden isteniyor\n"
+msgstr "%1$s anahtarı %3$s sunucusunun %2$s adresinden isteniyor\n"
 
-#: g10/keyserver.c:989
-#, fuzzy, c-format
+#: g10/keyserver.c:1018
+#, c-format
 msgid "requesting key %s from %s\n"
-msgstr "%08lX anahtarı %s adresinden isteniyor\n"
+msgstr "%s anahtarı %s adresinden isteniyor\n"
 
-#: g10/keyserver.c:1141
-#, fuzzy, c-format
+#: g10/keyserver.c:1170
+#, c-format
 msgid "sending key %s to %s server %s\n"
-msgstr "HKP sunucusunun %2$s adresinde \"%1$s\" aranıyor\n"
+msgstr "anahtar %1$s, %3$s sunucusunun %2$s adresine gönderiliyor\n"
 
-#: g10/keyserver.c:1145
-#, fuzzy, c-format
+#: g10/keyserver.c:1174
+#, c-format
 msgid "sending key %s to %s\n"
-msgstr ""
-"\"\n"
-" %08lX anahtarınızla %s de imzalandı\n"
+msgstr "%s anahtarı %s adresine gönderiliyor\n"
 
-#: g10/keyserver.c:1188
-#, fuzzy, c-format
+#: g10/keyserver.c:1217
+#, c-format
 msgid "searching for \"%s\" from %s server %s\n"
-msgstr "HKP sunucusunun %2$s adresinde \"%1$s\" aranıyor\n"
+msgstr "%3$s sunucusunun %2$s adresinde \"%1$s\" aranıyor\n"
 
-#: g10/keyserver.c:1191
-#, fuzzy, c-format
+#: g10/keyserver.c:1220
+#, c-format
 msgid "searching for \"%s\" from %s\n"
-msgstr "HKP sunucusunun %2$s adresinde \"%1$s\" aranıyor\n"
+msgstr "%2$s adresinde \"%1$s\" aranıyor\n"
 
-#: g10/keyserver.c:1198 g10/keyserver.c:1293
-#, fuzzy
+#: g10/keyserver.c:1227 g10/keyserver.c:1322
 msgid "no keyserver action!\n"
-msgstr "dışsallaştırma seçenekleri geçersiz\n"
+msgstr "bir anahtar sunucusu eylemi yok!\n"
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1275
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
-msgstr ""
+msgstr "UYARI: GnuPG'nin başka bir sürümünün anahtar sunucusu eylemcisi (%s)\n"
 
-#: g10/keyserver.c:1255
+#: g10/keyserver.c:1284
 msgid "keyserver did not send VERSION\n"
-msgstr ""
+msgstr "anahtar sunucusu VERSION göndermiyor\n"
 
-#: g10/keyserver.c:1314
+#: g10/keyserver.c:1343
 msgid "no keyserver known (use option --keyserver)\n"
-msgstr ""
+msgstr "bilinen bir anahtar sunucusu yok (--keyserver seçeneğini kullanın)\n"
 
-#: g10/keyserver.c:1320
+#: g10/keyserver.c:1349
 msgid "external keyserver calls are not supported in this build\n"
-msgstr ""
+msgstr "harici anahtar sunucusu çağrıları bu kurulumda desteklenmiyor\n"
 
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1361
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
-msgstr ""
+msgstr "`%s' anahtar sunucusu şeması için eylemci yok\n"
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1366
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
-msgstr ""
+msgstr "`%s' eylemi `%s' anahtar sunucusu şeması ile desteklenmiyor\n"
 
-#: g10/keyserver.c:1345
-#, c-format
-msgid "gpgkeys_%s does not support handler version %d\n"
-msgstr ""
+#: g10/keyserver.c:1374
+#, fuzzy, c-format
+msgid "%s does not support handler version %d\n"
+msgstr "gpgkeys_%s  %d sürümü eylemciyi desteklemiyor\n"
 
-#: g10/keyserver.c:1351
-#, fuzzy
+#: g10/keyserver.c:1381
 msgid "keyserver timed out\n"
-msgstr "anahtar sunucusu hatası"
+msgstr "anahtar sunucusu zamanaşımına uğradı\n"
 
-#: g10/keyserver.c:1356
-#, fuzzy
+#: g10/keyserver.c:1386
 msgid "keyserver internal error\n"
-msgstr "anahtar sunucusu hatası"
+msgstr "anahtar sunucusu iç hatası\n"
 
-#: g10/keyserver.c:1365
-#, fuzzy, c-format
+#: g10/keyserver.c:1395
+#, c-format
 msgid "keyserver communications error: %s\n"
-msgstr "keyserver receive başarısızlığa uğradı: %s\n"
+msgstr "anahtar sunucusuyla iletişim hatası: %s\n"
 
-#: g10/keyserver.c:1390 g10/keyserver.c:1424
+#: g10/keyserver.c:1420 g10/keyserver.c:1454
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
-msgstr ""
+msgstr "\"%s\" bir anahtar kimliği değil: atlanıyor\n"
 
-#: g10/keyserver.c:1681
-#, fuzzy, c-format
+#: g10/keyserver.c:1711
+#, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
-msgstr "UYARI: geçici dosya silinemiyor (%s) `%s': %s\n"
+msgstr "UYARI: %s anahtarı %s üzerinden tazelenemiyor: %s\n"
 
-#: g10/keyserver.c:1703
-#, fuzzy, c-format
+#: g10/keyserver.c:1733
+#, c-format
 msgid "refreshing 1 key from %s\n"
-msgstr "%08lX anahtarı %s adresinden isteniyor\n"
+msgstr "1 anahtar %s adresinden tazeleniyor\n"
 
-#: g10/keyserver.c:1705
-#, fuzzy, c-format
+#: g10/keyserver.c:1735
+#, c-format
 msgid "refreshing %d keys from %s\n"
-msgstr "%08lX anahtarı %s adresinden isteniyor\n"
+msgstr "%d anahtar %s adresinden tazeleniyor\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:249
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "bir şifreli oturum anahtarı (%d) için tuhaf uzunluk\n"
 
-#: g10/mainproc.c:262
-#, c-format
-msgid "bad passphrase or unknown cipher algorithm (%d)\n"
-msgstr "anahtar parolası yanlış ya da bilinmeyen şifre algoritması (%d)\n"
-
-#: g10/mainproc.c:299
+#: g10/mainproc.c:300
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s şifreli oturum anahtarı\n"
 
-#: g10/mainproc.c:309
-#, fuzzy, c-format
+#: g10/mainproc.c:310
+#, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
-msgstr "bilinmeyen algoritma %d ile şifrelenmiş\n"
+msgstr "bilinmeyen özümleme algoritması ile üretilmiş anahtar parolası %d\n"
 
-#: g10/mainproc.c:375
-#, fuzzy, c-format
+#: g10/mainproc.c:376
+#, c-format
 msgid "public key is %s\n"
-msgstr "genel anahtar: %08lX\n"
+msgstr "genel anahtar: %s\n"
 
-#: g10/mainproc.c:430
+#: g10/mainproc.c:431
 msgid "public key encrypted data: good DEK\n"
 msgstr "genel anahtarla şifreli veri: doğru DEK\n"
 
-#: g10/mainproc.c:463
-#, fuzzy, c-format
+#: g10/mainproc.c:464
+#, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr ""
-"%u bitlik %s anahtarı ve kullanıcı kimliği\n"
-"%08lX ile şifrelendi, %s oluşturuldu\n"
+"%u bitlik %s anahtarı ve %s kullanıcı kimliği ile şifrelendi, %s tarihinde "
+"oluşturuldu\n"
 
-#: g10/mainproc.c:467 g10/pkclist.c:218
-#, fuzzy, c-format
+#: g10/mainproc.c:468 g10/pkclist.c:219
+#, c-format
 msgid "      \"%s\"\n"
-msgstr "                den \""
+msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:471
-#, fuzzy, c-format
+#: g10/mainproc.c:472
+#, c-format
 msgid "encrypted with %s key, ID %s\n"
-msgstr "%s anahtarı ve %08lX kullanıcı kimliği ile şifrelendi\n"
+msgstr "%s anahtarı ve %s kullanıcı kimliği ile şifrelenmiş\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "genel anahtar şifre çözümü başarısız: %s\n"
 
-#: g10/mainproc.c:499
+#: g10/mainproc.c:500
 #, c-format
 msgid "encrypted with %lu passphrases\n"
-msgstr "%lu anahtar parolası ile şifreli\n"
+msgstr "%lu anahtar parolası ile şifrelenmiş\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:502
 msgid "encrypted with 1 passphrase\n"
-msgstr "1 anahtar parolası ile şifreli\n"
+msgstr "1 anahtar parolası ile şifrelenmiş\n"
 
-#: g10/mainproc.c:529 g10/mainproc.c:551
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s şifreli veri varsayılıyor\n"
 
-#: g10/mainproc.c:537
+#: g10/mainproc.c:538
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "IDEA şifre kullanışsız, iyimserlikle yerine %s kullanılmaya çalışılıyor\n"
 
-#: g10/mainproc.c:569
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr "Şifre çözme tamam\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:574
 msgid "WARNING: message was not integrity protected\n"
 msgstr "UYARI: ileti bütünlük korumalı değildi\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "UYARI: şifreli ileti tahrip edilmiş!\n"
 
-#: g10/mainproc.c:592
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "şifre çözme başarısız: %s\n"
@@ -4316,158 +4282,156 @@ 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:786
+#: g10/mainproc.c:803
 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:1290
+#: g10/mainproc.c:1307
 msgid "signature verification suppressed\n"
 msgstr "imza doğrulama engellendi\n"
 
-#: g10/mainproc.c:1332 g10/mainproc.c:1342
+#: g10/mainproc.c:1349 g10/mainproc.c:1359
 msgid "can't handle these multiple signatures\n"
 msgstr "bu çoklu imzalar elde edilemiyor\n"
 
-#: g10/mainproc.c:1352
-#, fuzzy, c-format
+#: g10/mainproc.c:1369
+#, c-format
 msgid "Signature made %s\n"
-msgstr "Bu imzanın geçerliliği %s de bitti.\n"
+msgstr "İmza %s de\n"
 
-#: g10/mainproc.c:1353
-#, fuzzy, c-format
+#: g10/mainproc.c:1370
+#, c-format
 msgid "               using %s key %s\n"
-msgstr "                den \""
+msgstr "               %s kullanılarak anahtar %s ile yapılmış\n"
 
-#: g10/mainproc.c:1357
-#, fuzzy, c-format
+#: g10/mainproc.c:1374
+#, c-format
 msgid "Signature made %s using %s key ID %s\n"
-msgstr "%.*s imzası, %s anahtarı ve %08lX kullanıcı kimliği ile yapılmış\n"
+msgstr "%s imzası, %s anahtarı ve %s kullanıcı kimliği ile yapılmış\n"
 
-#: g10/mainproc.c:1377
+#: g10/mainproc.c:1394
 msgid "Key available at: "
-msgstr "Anahtar burada: "
+msgstr "Anahtar burada:"
 
-#: g10/mainproc.c:1482 g10/mainproc.c:1530
-#, fuzzy, c-format
+#: g10/mainproc.c:1499 g10/mainproc.c:1547
+#, c-format
 msgid "BAD signature from \"%s\""
-msgstr "KÖTÜ imza: \""
+msgstr "\"%s\" deki imza KÖTÜ"
 
-#: g10/mainproc.c:1484 g10/mainproc.c:1532
-#, fuzzy, c-format
+#: g10/mainproc.c:1501 g10/mainproc.c:1549
+#, c-format
 msgid "Expired signature from \"%s\""
-msgstr "Kullanım tarihi geçmiş imza: \""
+msgstr "\"%s\" deki imza zamanaşımına uğramış"
 
-#: g10/mainproc.c:1486 g10/mainproc.c:1534
-#, fuzzy, c-format
+#: g10/mainproc.c:1503 g10/mainproc.c:1551
+#, c-format
 msgid "Good signature from \"%s\""
-msgstr "Kullanıcı kimliği: \""
+msgstr "\"%s\" deki imza iyi"
 
-#: g10/mainproc.c:1538
+#: g10/mainproc.c:1555
 msgid "[uncertain]"
 msgstr "[şüpheli]"
 
-#: g10/mainproc.c:1570
-#, fuzzy, c-format
+#: g10/mainproc.c:1587
+#, c-format
 msgid "                aka \"%s\""
-msgstr "                den \""
+msgstr "                nam-ı diğer \"%s\""
 
-#: g10/mainproc.c:1664
+#: g10/mainproc.c:1681
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Bu imzanın geçerliliği %s de bitti.\n"
 
-#: g10/mainproc.c:1669
+#: g10/mainproc.c:1686
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Bu imzanın geçerliliği %s de bitecek.\n"
 
-#: g10/mainproc.c:1672
+#: g10/mainproc.c:1689
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s imzası, %s özümleme algoritması\n"
 
-#: g10/mainproc.c:1673
+#: g10/mainproc.c:1690
 msgid "binary"
 msgstr "ikili"
 
-#: g10/mainproc.c:1674
+#: g10/mainproc.c:1691
 msgid "textmode"
 msgstr "metinkipi"
 
-#: g10/mainproc.c:1674 g10/trustdb.c:530
+#: g10/mainproc.c:1691 g10/trustdb.c:531
 msgid "unknown"
 msgstr "bilinmeyen"
 
-#: g10/mainproc.c:1694
+#: g10/mainproc.c:1711
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "İmza kontrol edilemedi: %s\n"
 
-#: g10/mainproc.c:1762 g10/mainproc.c:1778 g10/mainproc.c:1864
+#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
 msgid "not a detached signature\n"
 msgstr "bir bağımsız imza değil\n"
 
-#: g10/mainproc.c:1805
+#: g10/mainproc.c:1822
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "UYARI: çoklu imzalar saptandı. Sadece ilki denetlenecek.\n"
 
-#: g10/mainproc.c:1813
+#: g10/mainproc.c:1830
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "0x%02x sınıfı tek başına imza\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1887
 msgid "old style (PGP 2.x) signature\n"
 msgstr "eski stil (PGP 2.x) imza\n"
 
-#: g10/mainproc.c:1880
+#: g10/mainproc.c:1897
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() içinde geçersiz kök paket saptandı\n"
 
-#: g10/misc.c:121
+#: g10/misc.c:122
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "\"core\" oluşumu iptal edilemedi: %s\n"
 
-#: g10/misc.c:141 g10/misc.c:169 g10/misc.c:241
-#, fuzzy, c-format
+#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
-msgstr "dosya açılamadı: %s\n"
+msgstr "`%s' için %s de durum bilgisi alınamıyor: %s\n"
 
-#: g10/misc.c:206
-#, fuzzy, c-format
+#: g10/misc.c:207
+#, c-format
 msgid "fstat(%d) failed in %s: %s\n"
-msgstr "güvence veritabanı: okuma başarısız (n=%d): %s\n"
+msgstr "fstat(%d) %s de başarısız: %s\n"
 
-#: g10/misc.c:315
-#, fuzzy, c-format
+#: g10/misc.c:316
+#, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
-msgstr "%d genel anahtar algoritması kullanılamadı\n"
+msgstr "UYARI: deneysel %s genel anahtar algoritması kullanılıyor\n"
 
-#: g10/misc.c:330
-#, fuzzy, c-format
+#: g10/misc.c:331
+#, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
-msgstr "tamamlanmamış şifre algoritması"
+msgstr "UYARI: deneysel %s şifreleme algoritması kullanılıyor\n"
 
-#: g10/misc.c:345
-#, fuzzy, c-format
+#: g10/misc.c:346
+#, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
-msgstr "%s imzası, %s özümleme algoritması\n"
+msgstr "UYARI: deneysel %s özümleme algoritması kullanılıyor\n"
 
-#: g10/misc.c:350
-#, fuzzy, c-format
+#: g10/misc.c:351
+#, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
-msgstr ""
-"alıcının tercihleriyle çelişen %s (%d) özümleme algoritması kullanılmak "
-"isteniyor\n"
+msgstr "UYARI: %s özümleme algoritması artık önerilmiyor.\n"
 
-#: g10/misc.c:446
+#: g10/misc.c:447
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA şifre eklentisi yok\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:448
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
@@ -4475,148 +4439,135 @@ msgstr ""
 "adresine\n"
 "bakınız.\n"
 
-#: g10/misc.c:680
+#: g10/misc.c:681
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: \"%s\" seçeneği kullanımdan kaldırılmak üzere.\n"
 
-#: g10/misc.c:684
+#: g10/misc.c:685
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "UYARI: %s seçeneği kullanımdan kaldırılmak üzere.\n"
 
-#: g10/misc.c:686
+#: g10/misc.c:687
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "lütfen yerine \"%s%s\" kullanınız\n"
 
-#: g10/misc.c:697
+#: g10/misc.c:694
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
+msgstr "UYARI: %s seçeneği kullanımdan kaldırılmak üzere.\n"
+
+#: g10/misc.c:707
 msgid "Uncompressed"
 msgstr "Sıkıştırılmamış"
 
-#: g10/misc.c:722
-#, fuzzy
+#: g10/misc.c:732
 msgid "uncompressed|none"
-msgstr "Sıkıştırılmamış"
+msgstr "Sıkıştırılmamış|yok"
 
-#: g10/misc.c:832
+#: g10/misc.c:842
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "bu ileti %s tarafından kullanılamayabilir\n"
 
-#: g10/misc.c:989
-#, fuzzy, c-format
+#: g10/misc.c:999
+#, c-format
 msgid "ambiguous option `%s'\n"
-msgstr "\"%s\"den seçenekler okunuyor\n"
+msgstr "`%s' seçeneği belirsiz\n"
 
-#: g10/misc.c:1014
-#, fuzzy, c-format
+#: g10/misc.c:1024
+#, c-format
 msgid "unknown option `%s'\n"
-msgstr "öntanımlı alıcı `%s' bilinmiyor\n"
+msgstr "`%s' seçeneği bilinmiyor\n"
 
-#: g10/openfile.c:84
+#: g10/openfile.c:86
 #, c-format
 msgid "File `%s' exists. "
 msgstr "\"%s\" dosyası var. "
 
-#: g10/openfile.c:86
-#, fuzzy
+#: g10/openfile.c:88
 msgid "Overwrite? (y/N) "
-msgstr "Üzerine yazılsın mı? (e/H)? "
+msgstr "Üzerine yazılsın mı? (e/H ya da y/N) "
 
-#: g10/openfile.c:119
+#: g10/openfile.c:121
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: bilinmeyen sonek\n"
 
-#: g10/openfile.c:141
+#: g10/openfile.c:143
 msgid "Enter new filename"
 msgstr "Yeni dosya ismini giriniz"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:188
 msgid "writing to stdout\n"
 msgstr "standart çıktıya yazıyor\n"
 
-#: g10/openfile.c:296
+#: g10/openfile.c:300
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "\"%s\" içindeki veri imzalı kabul ediliyor\n"
 
-#: g10/openfile.c:375
+#: g10/openfile.c:379
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "yeni yapılandırma dosyası `%s' oluşturuldu\n"
 
-#: g10/openfile.c:377
+#: g10/openfile.c:381
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 "UYARI: `%s' deki seçenekler bu çalıştırma sırasında henüz etkin değil\n"
 
-#: g10/openfile.c:409
-#, fuzzy, c-format
+#: g10/openfile.c:413
+#, c-format
 msgid "directory `%s' created\n"
-msgstr "%s: dizin oluşturuldu\n"
+msgstr "dizin `%s' oluşturuldu\n"
 
-#: g10/parse-packet.c:137
+#: g10/parse-packet.c:138
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "%d genel anahtar algoritması kullanılamadı\n"
 
-#: g10/parse-packet.c:707
+#: g10/parse-packet.c:708
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "UYARI: simetrik şifreli oturum anahtarı potansiyel olarak güvensiz\n"
 
-#: g10/parse-packet.c:1132
+#: g10/parse-packet.c:1145
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d tipi alt paket kritik bit kümesine sahip\n"
 
-#: g10/passphrase.c:478 g10/passphrase.c:525
+#: g10/passphrase.c:305
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent bu oturumda kullanılamaz\n"
 
-#: g10/passphrase.c:486
-msgid "can't set client pid for the agent\n"
-msgstr "istemci pid'i belirlenemiyor\n"
-
-#: g10/passphrase.c:494
-msgid "can't get server read FD for the agent\n"
-msgstr "sunucu okuma dosya tanıtıcısı alınamadı\n"
-
-#: g10/passphrase.c:501
-msgid "can't get server write FD for the agent\n"
-msgstr "sunucu yazma dosya tanıtıcısı alınamadı\n"
-
-#: g10/passphrase.c:534
+#: g10/passphrase.c:317
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO çevre değişkeni hatalı\n"
 
-#: g10/passphrase.c:547
+#: g10/passphrase.c:332
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent protokolü sürüm %d desteklenmiyor\n"
 
-#: g10/passphrase.c:568
+#: g10/passphrase.c:345
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "\"%s\" sunucusuna bağlanılamadı: %s\n"
 
-#: g10/passphrase.c:590
-msgid "communication problem with gpg-agent\n"
-msgstr "gpg-agent ile haberleşme problemi\n"
-
-#: g10/passphrase.c:597 g10/passphrase.c:937 g10/passphrase.c:1049
+#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
 msgid "problem with the agent - disabling agent use\n"
 msgstr "vekil ile problem - vekil kullanımı iptal ediliyor\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1209
-#, fuzzy, c-format
+#: g10/passphrase.c:511 g10/passphrase.c:890
+#, c-format
 msgid " (main key ID %s)"
-msgstr " (asıl anahtar kimliği %08lX)"
+msgstr " (asıl anahtar kimliği %s)"
 
-#: g10/passphrase.c:714
-#, fuzzy, c-format
+#: g10/passphrase.c:525
+#, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
 "\"%.*s\"\n"
@@ -4624,69 +4575,52 @@ msgid ""
 msgstr ""
 "\"%.*s\"\n"
 "kullanıcısının gizli anahtarını açacak bir anahtar parolasına ihtiyaç var.\n"
-"%u bitlik %s anahtarı, kimlik %08lX, oluşturulan %s%s\n"
+"%u bitlik %s anahtarı, kimlik %s, oluşturma tarihi %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:550
 msgid "Repeat passphrase\n"
 msgstr "Parolayı tekrar yazınız\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:552
 msgid "Enter passphrase\n"
 msgstr "Anahtar parolasını giriniz\n"
 
-#: g10/passphrase.c:781
-msgid "passphrase too long\n"
-msgstr "Parola çok uzun\n"
-
-#: g10/passphrase.c:794
-msgid "invalid response from agent\n"
-msgstr "yanıt geçersiz\n"
-
-#: g10/passphrase.c:810 g10/passphrase.c:931
+#: g10/passphrase.c:628
 msgid "cancelled by user\n"
 msgstr "kullanıcı tarafından durduruldu\n"
 
-#: g10/passphrase.c:815 g10/passphrase.c:1020
-#, c-format
-msgid "problem with the agent: agent returns 0x%lx\n"
-msgstr "vekil ile sorun var: vekil 0x%lx ile sonuçlandı\n"
-
-#: g10/passphrase.c:1100 g10/passphrase.c:1263
-#, fuzzy
+#: g10/passphrase.c:781 g10/passphrase.c:944
 msgid "can't query passphrase in batch mode\n"
-msgstr "önceden tanımlanmış işlemler kipinde (batchmode) parola sorgulanamaz\n"
+msgstr "betik kipinde parola sorgulanamaz\n"
 
-#: g10/passphrase.c:1107 g10/passphrase.c:1268
+#: g10/passphrase.c:788 g10/passphrase.c:949
 msgid "Enter passphrase: "
 msgstr "Anahtar parolasını girin: "
 
-#: g10/passphrase.c:1190
-#, fuzzy, c-format
+#: g10/passphrase.c:871
+#, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
 "user: \"%s\"\n"
 msgstr ""
-"\n"
 "Gizli anahtarın kilidini açmak için bir anahtar parolasına ihtiyacınız var.\n"
-"Anahtarın sahibi: \""
+"Anahtarın sahibi: \"%s\"\n"
 
-#: g10/passphrase.c:1196
-#, fuzzy, c-format
+#: g10/passphrase.c:877
+#, c-format
 msgid "%u-bit %s key, ID %s, created %s"
-msgstr ""
-"%u bitlik %s anahtarı, %08lX kimliği ile\n"
-"%s tarihinde üretilmiş"
+msgstr "%u bitlik %s anahtarı, %s kimliği ile %s tarihinde üretilmiş"
 
-#: g10/passphrase.c:1205
+#: g10/passphrase.c:886
 #, c-format
 msgid "         (subkey on main key ID %s)"
-msgstr ""
+msgstr "         (asıl anahtar kimliği %s üzerinde yardımcı anahtar)"
 
-#: g10/passphrase.c:1272
+#: g10/passphrase.c:953
 msgid "Repeat passphrase: "
 msgstr "Tekrar: "
 
-#: g10/photoid.c:66
+#: g10/photoid.c:67
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4700,162 +4634,157 @@ msgstr ""
 "bir resim kullanırsanız genel anahtarınız da çok büyük olacaktır. Resim\n"
 "boyutlarının 240x288 civarında seçilmesi uygun olacaktır.\n"
 
-#: g10/photoid.c:80
+#: g10/photoid.c:81
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Foto kimliği için JPEG dosya ismini giriniz: "
 
-#: g10/photoid.c:94
-#, fuzzy, c-format
+#: g10/photoid.c:95
+#, c-format
 msgid "unable to open JPEG file `%s': %s\n"
-msgstr "dosya açılamadı: %s\n"
+msgstr "JPEG dosyası `%s' açılamıyor: %s\n"
 
-#: g10/photoid.c:102
+#: g10/photoid.c:103
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
-msgstr ""
+msgstr "Bu JPEG gerçekten büyük (%d bayt)!\n"
 
-#: g10/photoid.c:104
-#, fuzzy
+#: g10/photoid.c:105
 msgid "Are you sure you want to use it? (y/N) "
-msgstr "Onu kullanmak istediğinizden emin misiniz? (e/H) "
+msgstr "Onu kullanmak istediğinizden emin misiniz? (e/H ya da y/N)  "
 
-#: g10/photoid.c:119
-#, fuzzy, c-format
+#: g10/photoid.c:120
+#, c-format
 msgid "`%s' is not a JPEG file\n"
-msgstr "\"%s\" bir JPEG dosyası değil\n"
+msgstr "'%s' bir JPEG dosyası değil\n"
 
-#: g10/photoid.c:136
+#: g10/photoid.c:137
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Bu foto doğru mu? (e/H/ç)? "
 
-#: g10/photoid.c:338
+#: g10/photoid.c:339
 msgid "unable to display photo ID!\n"
 msgstr "foto kimliği gösterilemiyor!\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:580
+#: g10/pkclist.c:62 g10/revoke.c:581
 msgid "No reason specified"
 msgstr "Belirtilmiş bir neden yok"
 
-#: g10/pkclist.c:63 g10/revoke.c:582
+#: g10/pkclist.c:64 g10/revoke.c:583
 msgid "Key is superseded"
 msgstr "Anahtarın yerine başkası konulmuş ve iptal edilmiştir"
 
-#: g10/pkclist.c:65 g10/revoke.c:581
+#: g10/pkclist.c:66 g10/revoke.c:582
 msgid "Key has been compromised"
 msgstr "Anahtar tehlikede"
 
-#: g10/pkclist.c:67 g10/revoke.c:583
+#: g10/pkclist.c:68 g10/revoke.c:584
 msgid "Key is no longer used"
 msgstr "Anahtar artık kullanılmayacak"
 
-#: g10/pkclist.c:69 g10/revoke.c:584
+#: g10/pkclist.c:70 g10/revoke.c:585
 msgid "User ID is no longer valid"
 msgstr "Kullanıcı kimliği artık geçersiz"
 
-#: g10/pkclist.c:73
+#: g10/pkclist.c:74
 msgid "reason for revocation: "
 msgstr "yürürlükten kaldırma sebebi: "
 
-#: g10/pkclist.c:90
+#: g10/pkclist.c:91
 msgid "revocation comment: "
 msgstr "yürürlükten kaldırma açıklaması: "
 
-#: g10/pkclist.c:205
+#: g10/pkclist.c:206
 msgid "iImMqQsS"
 msgstr "bBmMaAkK"
 
-#: g10/pkclist.c:213
-#, fuzzy
+#: g10/pkclist.c:214
 msgid "No trust value assigned to:\n"
-msgstr ""
-"Güven derecesi belirtilmemiş:\n"
-"%4u%c/%08lX %s \""
+msgstr "Güven değeri belirtilmemiş:\n"
 
-#: g10/pkclist.c:245
-#, fuzzy, c-format
+#: g10/pkclist.c:246
+#, c-format
 msgid "  aka \"%s\"\n"
-msgstr "                den \""
+msgstr "  namı-diğer \"%s\"\n"
 
-#: g10/pkclist.c:255
-#, fuzzy
+#: g10/pkclist.c:256
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
-msgstr "Bu anahtarın sahibine ait olduğu umuluyor\n"
+msgstr ""
+"%s: Bu anahtarın gerçekten sahibine ait olduğuna dair bir belirti yok\n"
 
-#: g10/pkclist.c:270
-#, fuzzy, c-format
+#: g10/pkclist.c:271
+#, c-format
 msgid "  %d = I don't know or won't say\n"
-msgstr " %d = bilmiyorum\n"
+msgstr " %d = bilmiyorum, kem küm\n"
 
-#: g10/pkclist.c:272
-#, fuzzy, c-format
+#: g10/pkclist.c:273
+#, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = güvence vermem\n"
 
-#: g10/pkclist.c:278
-#, fuzzy, c-format
+#: g10/pkclist.c:279
+#, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Son derece güveniyorum\n"
 
-#: g10/pkclist.c:284
-#, fuzzy
+#: g10/pkclist.c:285
 msgid "  m = back to the main menu\n"
 msgstr " m = ana menüye dön\n"
 
-#: g10/pkclist.c:287
-#, fuzzy
+#: g10/pkclist.c:288
 msgid "  s = skip this key\n"
 msgstr " a = bu anahtarı atla\n"
 
-#: g10/pkclist.c:288
-#, fuzzy
+#: g10/pkclist.c:289
 msgid "  q = quit\n"
-msgstr " k = çık\n"
+msgstr " ç = çık\n"
 
-#: g10/pkclist.c:292
+#: g10/pkclist.c:293
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
+"Bu anahtar için asgari güvence seviyesi: %s\n"
+"\n"
 
-#: g10/pkclist.c:298 g10/revoke.c:609
+#: g10/pkclist.c:299 g10/revoke.c:610
 msgid "Your decision? "
 msgstr "Kararınız? "
 
-#: g10/pkclist.c:319
-#, fuzzy
+#: g10/pkclist.c:320
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr ""
-"Bu anahtara gerçekten en yüksek güven derecesini vermek istiyor musunuz?"
+"Bu anahtarı gerçekten son derece güvenli yapmak istiyor musunuz?  (e/H ya da "
+"y/N) "
 
-#: g10/pkclist.c:333
+#: g10/pkclist.c:334
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Son derece güvenli bir anahtarla sonuçlanan sertifikalar:\n"
 
-#: g10/pkclist.c:418
-#, fuzzy, c-format
+#: g10/pkclist.c:419
+#, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
-"%08lX: Bu anahtarın gerçekten sahibine ait olduğuna dair bir belirti yok\n"
+"%s: Bu anahtarın gerçekten ismi belirtilen şahsa ait olduğuna dair bir "
+"belirti yok\n"
 
-#: g10/pkclist.c:423
-#, fuzzy, c-format
+#: g10/pkclist.c:424
+#, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
-"%08lX: Bu anahtarın gerçekten sahibine ait olduğuna dair bir belirti yok\n"
+"%s: Bu anahtarın gerçekten ismi belirtilen şahsa ait olduğuna dair sınırlı "
+"bir belirti var\n"
 
-#: g10/pkclist.c:429
-#, fuzzy
+#: g10/pkclist.c:430
 msgid "This key probably belongs to the named user\n"
-msgstr "Bu anahtarın sahibine ait olduğu umuluyor\n"
+msgstr "Bu anahtarın ismi belirtilen şahsa ait olduğu umuluyor\n"
 
-#: g10/pkclist.c:434
+#: g10/pkclist.c:435
 msgid "This key belongs to us\n"
 msgstr "Bu anahtar bizim\n"
 
-#: g10/pkclist.c:460
-#, fuzzy
+#: g10/pkclist.c:461
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -4865,94 +4794,92 @@ msgstr ""
 "olduğu kesin DEĞİL. *Gerçekten* ne yaptığınızı biliyorsanız,\n"
 "sonraki soruya da evet cevabı verebilirsiniz.\n"
 
-#: g10/pkclist.c:467
-#, fuzzy
+#: g10/pkclist.c:468
 msgid "Use this key anyway? (y/N) "
-msgstr "Bu anahtar yine de kullanılsın mı? "
+msgstr "Bu anahtar yine de kullanılsın mı? (e/H ya da y/N) "
 
-#: g10/pkclist.c:501
+#: g10/pkclist.c:502
 msgid "WARNING: Using untrusted key!\n"
 msgstr "UYARI: Güven derecesiz anahtar kullanılıyor!\n"
 
-#: g10/pkclist.c:508
+#: g10/pkclist.c:509
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
-"UYARI: bu anahtar yürürlükten kaldırılmış olabilir (yürürlükten kaldırma "
+"UYARI: bu anahtar yürürlükten kaldırılmamış olabilir (yürürlükten kaldırma "
 "anahtarı mevcut değil)\n"
 
-#: g10/pkclist.c:517
+#: g10/pkclist.c:518
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
-msgstr "UYARI: Bu anahtar sahibi tarafından yürürlükten kaldırılmıştı!\n"
+msgstr "UYARI: Bu anahtar onu üreten tarafından yürürlükten kaldırılmıştı!\n"
 
-#: g10/pkclist.c:520
+#: g10/pkclist.c:521
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "UYARI: Bu anahtar sahibi tarafından yürürlükten kaldırılmıştı!\n"
 
-#: g10/pkclist.c:521
-#, fuzzy
+#: g10/pkclist.c:522
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Bu imza sahte anlamına gelebilir.\n"
 
-#: g10/pkclist.c:527
+#: g10/pkclist.c:528
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr ""
 "UYARI: Bu yardımcı anahtar sahibi tarafından yürürlükten kaldırılmıştı!\n"
 
-#: g10/pkclist.c:532
+#: g10/pkclist.c:533
 msgid "Note: This key has been disabled.\n"
 msgstr "Bilgi: Bu anahtar iptal edildi.\n"
 
-#: g10/pkclist.c:537
+#: g10/pkclist.c:538
 msgid "Note: This key has expired!\n"
 msgstr "Bilgi: Bu anahtarın kullanım süresi dolmuştu!\n"
 
-#: g10/pkclist.c:548
+#: g10/pkclist.c:549
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "UYARI: Bu anahtar güven dereceli bir imza ile sertifikalanmamış!\n"
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:551
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         Bu imzanın sahibine ait olduğuna dair bir belirti yok.\n"
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:559
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "UYARI: Bu anahtara güven-mi-yoruz!\n"
 
-#: g10/pkclist.c:559
+#: g10/pkclist.c:560
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Bu imza SAHTE olabilir.\n"
 
-#: g10/pkclist.c:567
+#: g10/pkclist.c:568
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "UYARI: Bu anahtar yeterli güven derecesine sahip imzalarla "
 "sertifikalanmamış!\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:570
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Bu imzanın sahibine ait olduğu kesin değil.\n"
 
-#: g10/pkclist.c:734 g10/pkclist.c:767 g10/pkclist.c:936 g10/pkclist.c:996
+#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: atlandı: %s\n"
 
-#: g10/pkclist.c:744 g10/pkclist.c:968
+#: g10/pkclist.c:745 g10/pkclist.c:969
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: atlandı: genel anahtar zaten var\n"
 
-#: g10/pkclist.c:786
+#: g10/pkclist.c:787
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Bir kullanıcı kimliği belirtmediniz. (\"-r\" kullanabilirsiniz)\n"
 
-#: g10/pkclist.c:802
+#: g10/pkclist.c:803
 msgid "Current recipients:\n"
-msgstr ""
+msgstr "Şimdiki alıcılar:\n"
 
-#: g10/pkclist.c:828
+#: g10/pkclist.c:829
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -4960,168 +4887,170 @@ msgstr ""
 "\n"
 "Kullanıcı kimliğini girin. Boş bir satır işlemi sonlandırır:"
 
-#: g10/pkclist.c:844
+#: g10/pkclist.c:845
 msgid "No such user ID.\n"
 msgstr "Böyle bir kullanıcı kimliği yok.\n"
 
-#: g10/pkclist.c:849 g10/pkclist.c:911
+#: g10/pkclist.c:850 g10/pkclist.c:912
 msgid "skipped: public key already set as default recipient\n"
 msgstr "atlandı: genel anahtar zaten öntanımlı alıcı olarak ayarlanmış\n"
 
-#: g10/pkclist.c:867
+#: g10/pkclist.c:868
 msgid "Public key is disabled.\n"
 msgstr "Genel anahtar iptal edildi.\n"
 
-#: g10/pkclist.c:874
+#: g10/pkclist.c:875
 msgid "skipped: public key already set\n"
 msgstr "atlandı: genel anahtar zaten belirtilmiş\n"
 
-#: g10/pkclist.c:903
-#, fuzzy, c-format
+#: g10/pkclist.c:904
+#, c-format
 msgid "unknown default recipient \"%s\"\n"
-msgstr "öntanımlı alıcı `%s' bilinmiyor\n"
+msgstr "öntanımlı alıcı \"%s\" bilinmiyor\n"
 
-#: g10/pkclist.c:948
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: atlandı: genel anahtar iptal edildi\n"
 
-#: g10/pkclist.c:1003
+#: g10/pkclist.c:1004
 msgid "no valid addressees\n"
 msgstr "geçerli adresler yok\n"
 
-#: g10/plaintext.c:90
+#: g10/plaintext.c:91
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "veri kaydedilmedi; kaydetmek için \"--output\" seçeneğini kullanın\n"
 
-#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
+#: g10/plaintext.c:136 g10/plaintext.c:141 g10/plaintext.c:159
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "`%s' oluşturulurken hata: %s\n"
 
-#: g10/plaintext.c:446
+#: g10/plaintext.c:447
 msgid "Detached signature.\n"
 msgstr "Bağımsız imza.\n"
 
-#: g10/plaintext.c:450
+#: g10/plaintext.c:452
 msgid "Please enter name of data file: "
 msgstr "Lütfen veri dosyasının ismini girin: "
 
-#: g10/plaintext.c:478
+#: g10/plaintext.c:481
 msgid "reading stdin ...\n"
 msgstr "standart girdiden okuyor ...\n"
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:515
 msgid "no signed data\n"
 msgstr "imzalı veri yok\n"
 
-#: g10/plaintext.c:526
+#: g10/plaintext.c:529
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imzalı veri '%s'  açılamadı\n"
 
-#: g10/pubkey-enc.c:103
-#, fuzzy, c-format
+#: g10/pubkey-enc.c:104
+#, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
-msgstr "anonim alıcı: %08lX gizli anahtarı deneniyor ...\n"
+msgstr "anonim alıcı: %s gizli anahtarı deneniyor ...\n"
 
-#: g10/pubkey-enc.c:119
+#: g10/pubkey-enc.c:120
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "tamam, biz anonim alıcıyız.\n"
 
-#: g10/pubkey-enc.c:207
+#: g10/pubkey-enc.c:208
 msgid "old encoding of the DEK is not supported\n"
 msgstr "DEK'in eski kodlaması desteklenmiyor\n"
 
-#: g10/pubkey-enc.c:228
+#: g10/pubkey-enc.c:229
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "şifre algoritması %d%s bilinmiyor ya da iptal edilmiş\n"
 
-#: g10/pubkey-enc.c:266
-#, fuzzy, c-format
+#: g10/pubkey-enc.c:267
+#, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
-msgstr "BİLGİ: %d şifre algoritması tercihlerde bulunamadı\n"
+msgstr "UYARI: %s şifre algoritması alıcı tercihlerinde yok\n"
 
-#: g10/pubkey-enc.c:286
-#, fuzzy, c-format
+#: g10/pubkey-enc.c:287
+#, c-format
 msgid "NOTE: secret key %s expired at %s\n"
-msgstr "BİLGİ: %08lX gizli anahtarının %s tarihinde kullanım süresi doldu\n"
+msgstr "BİLGİ: %s gizli anahtarının %s tarihinde kullanım süresi doldu\n"
 
-#: g10/pubkey-enc.c:292
+#: g10/pubkey-enc.c:293
 msgid "NOTE: key has been revoked"
 msgstr "BİLGİ: anahtar yürürlükten kaldırılmıştı"
 
-#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:545
+#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
+#: g10/revoke.c:188 g10/revoke.c:546
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet başarısız: %s\n"
 
-#: g10/revoke.c:146
-#, fuzzy, c-format
+#: g10/revoke.c:147
+#, c-format
 msgid "key %s has no user IDs\n"
-msgstr "anahtar %08lX: kullanıcı kimliği yok\n"
+msgstr "anahtar %s: kullanıcı kimliği yok\n"
 
-#: g10/revoke.c:272
+#: g10/revoke.c:273
 msgid "To be revoked by:\n"
 msgstr "Yürürlükten kaldıran:\n"
 
-#: g10/revoke.c:276
+#: g10/revoke.c:277
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Bu bir duyarlı yürürlükten kaldırma anahtarı)\n"
 
-#: g10/revoke.c:280
-#, fuzzy
+#: g10/revoke.c:281
 msgid "Create a designated revocation certificate for this key? (y/N) "
-msgstr "Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? "
+msgstr ""
+"Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H ya "
+"da y/N) "
 
-#: g10/revoke.c:293 g10/revoke.c:511
+#: g10/revoke.c:294 g10/revoke.c:512
 msgid "ASCII armored output forced.\n"
 msgstr "ASCII zırhlı çıktı istendi.\n"
 
-#: g10/revoke.c:307 g10/revoke.c:525
+#: g10/revoke.c:308 g10/revoke.c:526
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet başarısız: %s\n"
 
-#: g10/revoke.c:370
+#: g10/revoke.c:371
 msgid "Revocation certificate created.\n"
 msgstr "Yürürlükten kaldırma sertifikası üretildi.\n"
 
-#: g10/revoke.c:376
-#, fuzzy, c-format
+#: g10/revoke.c:377
+#, c-format
 msgid "no revocation keys found for \"%s\"\n"
-msgstr "`%s' için yürürlükten kaldırma anahtarı yok\n"
+msgstr "\"%s\" için yürürlükten kaldırma anahtarları yok\n"
 
-#: g10/revoke.c:432
-#, fuzzy, c-format
+#: g10/revoke.c:433
+#, c-format
 msgid "secret key \"%s\" not found: %s\n"
-msgstr "gizli anahtar `%s' yok: %s\n"
+msgstr "gizli anahtar \"%s\" yok: %s\n"
 
-#: g10/revoke.c:461
+#: g10/revoke.c:462
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "karşılığı olan genel anahtar yok: `%s\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:473
 msgid "public key does not match secret key!\n"
 msgstr "genel anahtar gizli anahtarla uyuşmuyor!\n"
 
-#: g10/revoke.c:479
-#, fuzzy
+#: g10/revoke.c:480
 msgid "Create a revocation certificate for this key? (y/N) "
-msgstr "Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? "
+msgstr ""
+"Bu anahtar için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H "
+"ya da y/N) "
 
-#: g10/revoke.c:496
+#: g10/revoke.c:497
 msgid "unknown protection algorithm\n"
 msgstr "bilinmeyen sıkıştırma algoritması\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 msgid "NOTE: This key is not protected!\n"
 msgstr "BİLGİ: Bu anahtar korunmamış!\n"
 
-#: g10/revoke.c:551
+#: g10/revoke.c:552
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5139,259 +5068,257 @@ msgstr ""
 "Sertifika kısa olacağından isterseniz, bir yazıcı çıktısı olarak alıp\n"
 "bir kasada da muhafaza edebilirsiniz.\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid "Please select the reason for the revocation:\n"
 msgstr "Lütfen bir yürürlükten kaldırma sebebi seçiniz:\n"
 
-#: g10/revoke.c:602
+#: g10/revoke.c:603
 msgid "Cancel"
 msgstr "İptal"
 
-#: g10/revoke.c:604
+#: g10/revoke.c:605
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Burada %d seçtiğiniz varsayılıyor)\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:646
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "İsteğe bağlı açıklamayı girebilirsiniz; Boş bir satır işlemi sonlandırır:\n"
 
-#: g10/revoke.c:673
+#: g10/revoke.c:674
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Yürürlükten kaldırma sebebi: %s\n"
 
-#: g10/revoke.c:675
+#: g10/revoke.c:676
 msgid "(No description given)\n"
 msgstr "(açıklama verilmedi)\n"
 
-#: g10/revoke.c:680
-#, fuzzy
+#: g10/revoke.c:681
 msgid "Is this okay? (y/N) "
-msgstr "Bu tamam mı? "
+msgstr "Bu tamam mı? (e/H ya da y/N) "
 
-#: g10/seckey-cert.c:54
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "gizli anahtar parçaları kullanım dışı\n"
 
-#: g10/seckey-cert.c:60
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "koruma algoritması %d%s desteklenmiyor\n"
 
-#: g10/seckey-cert.c:71
-#, fuzzy, c-format
+#: g10/seckey-cert.c:72
+#, c-format
 msgid "protection digest %d is not supported\n"
-msgstr "koruma algoritması %d%s desteklenmiyor\n"
+msgstr "koruma algoritması %d desteklenmiyor\n"
 
-#: g10/seckey-cert.c:265
+#: g10/seckey-cert.c:266
 msgid "Invalid passphrase; please try again"
 msgstr "Anahtar parolası geçersiz; lütfen tekrar deneyin"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:267
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:326
+#: g10/seckey-cert.c:327
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "UYARI: Zayıf anahtar saptandı - lütfen anahtar parolasını tekrar "
 "değiştirin.\n"
 
-#: g10/seckey-cert.c:364
+#: g10/seckey-cert.c:365
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "gizli anahtarın güvenliği için eski tarz 16 bitlik sağlama toplamı "
 "üretiliyor\n"
 
-#: g10/seskey.c:52
+#: g10/seskey.c:53
 msgid "weak key created - retrying\n"
 msgstr "zayıf anahtar oluşturuldu - yeniden deneniyor\n"
 
-#: g10/seskey.c:57
+#: g10/seskey.c:58
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "simetrik şifre için zayıf anahtarın önlenmesi mümkün olamadı: %d kere "
 "denendi!\n"
 
-#: g10/seskey.c:213
+#: g10/seskey.c:214
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA, 160 bitlik bir hash algoritması kullanılmasını gerektiriyor\n"
 
-#: g10/sig-check.c:75
+#: g10/sig-check.c:76
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "UYARI: iletideki imza özümlemesi çelişkili\n"
 
-#: g10/sig-check.c:99
-#, fuzzy, c-format
+#: g10/sig-check.c:100
+#, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
-msgstr "UYARI: %08lX imzalama alt anahtarı çapraz sertifikalı değil\n"
+msgstr "UYARI: yardımcı imzalama anahtarı %s çapraz sertifikalı değil\n"
 
-#: g10/sig-check.c:102
-#, fuzzy, c-format
+#: g10/sig-check.c:103
+#, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
-msgstr "UYARI: %08lX imzalama alt anahtarının çapraz sertifikası geçersiz\n"
+msgstr ""
+"UYARI: yardımcı imzalama anahtarı %s geçersiz çapraz sertifikalamaya sahip\n"
 
-#: g10/sig-check.c:168
-#, fuzzy, c-format
+#: g10/sig-check.c:169
+#, c-format
 msgid "public key %s is %lu second newer than the signature\n"
-msgstr "genel anahtar %08lX imzadan %lu saniye daha yeni\n"
+msgstr "genel anahtar %s imzadan %lu saniye daha yeni\n"
 
-#: g10/sig-check.c:169
-#, fuzzy, c-format
+#: g10/sig-check.c:170
+#, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
-msgstr "genel anahtar %08lX imzadan %lu saniye daha yeni.\n"
+msgstr "genel anahtar %s imzadan %lu saniye daha yeni.\n"
 
-#: g10/sig-check.c:180
-#, fuzzy, c-format
+#: g10/sig-check.c:181
+#, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
-"anahtar %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
+"anahtar %s %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
 
-#: g10/sig-check.c:182
-#, fuzzy, c-format
+#: g10/sig-check.c:183
+#, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr ""
-"anahtar bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
+"anahtar %s bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
 "problemi)\n"
 
-#: g10/sig-check.c:192
-#, fuzzy, c-format
+#: g10/sig-check.c:193
+#, c-format
 msgid "NOTE: signature key %s expired %s\n"
-msgstr "BİLGİ: %08lX imza anahtarının kullanım süresi %s sularında dolmuş\n"
+msgstr "BİLGİ: %s imza anahtarının kullanım süresi %s sularında dolmuş\n"
 
-#: g10/sig-check.c:275
-#, fuzzy, c-format
+#: g10/sig-check.c:276
+#, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
-"hatalı imzanın bilinmeyen bir kritik bitten dolayı %08lX anahtarından "
+"hatalı imzanın bilinmeyen bir kritik bitten dolayı %s anahtarından "
 "kaynaklandığı sanılıyor\n"
 
-#: g10/sig-check.c:532
-#, fuzzy, c-format
+#: g10/sig-check.c:533
+#, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
-"anahtar %08lX: anahtarı yürürlükten kaldıracak yardımcı anahtar paketi yok\n"
+"anahtar %s: anahtarı yürürlükten kaldırma imzası için yardımcı anahtar yok\n"
 
-#: g10/sig-check.c:558
-#, fuzzy, c-format
+#: g10/sig-check.c:559
+#, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
-msgstr "anahtar %08lX: yardımcı anahtarı bağlamak için yardımcı anahtar yok\n"
+msgstr ""
+"anahtar %s: yardımcı anahtarı garantileme imzası için yardımcı anahtar yok\n"
 
-#: g10/sign.c:85
+#: g10/sign.c:86
 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:93
+#: g10/sign.c:94
 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:112
+#: g10/sign.c:113
 #, 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:138
+#: g10/sign.c:139
 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:146
+#: g10/sign.c:147
 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:159
-#, fuzzy, c-format
+#: g10/sign.c:160
+#, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr ""
-"UYARI: güvence adresinin uzatılması imkansız (çok büyük).\n"
+"UYARI: güvence adresi için %%lik uzatma imkansız (çok büyük).\n"
 "Uzatılmadan kullanılıyor.\n"
 
-#: g10/sign.c:187
-#, fuzzy, c-format
+#: g10/sign.c:188
+#, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr ""
-"UYARI: güvence adresinin uzatılması imkansız (çok büyük).\n"
-"Uzatılmadan kullanılıyor.\n"
+"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:364
+#: g10/sign.c:365
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "oluşturulan imzanın denetimi başarısız: %s\n"
 
-#: g10/sign.c:373
-#, fuzzy, c-format
+#: g10/sign.c:374
+#, c-format
 msgid "%s/%s signature from: \"%s\"\n"
-msgstr "%s imza: \"%s\"den\n"
+msgstr "%s/%s imza: \"%s\" den\n"
 
-#: g10/sign.c:741
+#: g10/sign.c:761
 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:808
-#, fuzzy, c-format
+#: g10/sign.c:830
+#, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
-"alıcının tercihleriyle çelişen %s (%d) özümleme algoritması kullanılmak "
-"isteniyor\n"
+"UYARI: alıcının tercihleriyle çelişen %s (%d) özümleme algoritması "
+"kullanılmak isteniyor\n"
 
-#: g10/sign.c:900
+#: g10/sign.c:922
 msgid "signing:"
 msgstr "imzalanıyor:"
 
-#: g10/sign.c:1007
+#: g10/sign.c:1034
 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:1180
+#: g10/sign.c:1212
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s şifrelemesi kullanılmayacak\n"
 
-#: g10/skclist.c:126 g10/skclist.c:190
+#: g10/skclist.c:127 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "anahtar güvenli olarak imlenmemiş - onu sahte RSÜ ile kullanmayın!\n"
 
-#: g10/skclist.c:157
-#, fuzzy, c-format
+#: g10/skclist.c:158
+#, c-format
 msgid "skipped \"%s\": duplicated\n"
-msgstr "`%s' atlandı: tekrarlanmış\n"
+msgstr "\"%s\" atlandı: tekrarlanmış\n"
 
-#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
-#, fuzzy, c-format
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "\"%s\" atlandı: %s\n"
 
-#: g10/skclist.c:170
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "atlandı: gizli anahtar zaten var\n"
 
-#: g10/skclist.c:185
-#, fuzzy
+#: g10/skclist.c:186
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
-msgstr ""
-"`%s' atlandı:\n"
-"Bu, imzalar için güvenli olmayan PGP üretimi bir ElGamal anahtarı!\n"
+msgstr "bu, imzalar için güvenli olmayan PGP üretimi bir ElGamal anahtarı!"
 
-#: g10/tdbdump.c:59 g10/trustdb.c:365
+#: g10/tdbdump.c:60 g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "güvence veritabanının %lu. kaydı, %d türünde: yazma başarısız: %s\n"
 
-#: g10/tdbdump.c:104
+#: g10/tdbdump.c:105
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5400,348 +5327,346 @@ msgstr ""
 "# Atanan güvencedeğerlerinin listesi %s oluşturuldu\n"
 "# (Eski haline getirmek için \"gpg --import-ownertrust\" kullanın\n"
 
-#: g10/tdbdump.c:159 g10/tdbdump.c:167 g10/tdbdump.c:172 g10/tdbdump.c:177
-#, fuzzy, c-format
+#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#, c-format
 msgid "error in `%s': %s\n"
-msgstr "\"%s\" okunurken hata: %s\n"
+msgstr "'%s' de hata: %s\n"
 
-#: g10/tdbdump.c:159
-#, fuzzy
+#: g10/tdbdump.c:160
 msgid "line too long"
-msgstr "satır çok uzun\n"
+msgstr "satır çok uzun"
 
-#: g10/tdbdump.c:167
+#: g10/tdbdump.c:168
 msgid "colon missing"
-msgstr ""
+msgstr ": imi eksik"
 
-#: g10/tdbdump.c:173
-#, fuzzy
+#: g10/tdbdump.c:174
 msgid "invalid fingerprint"
-msgstr "hata: parmakizi geçersiz\n"
+msgstr "parmakizi geçersiz"
 
-#: g10/tdbdump.c:178
-#, fuzzy
+#: g10/tdbdump.c:179
 msgid "ownertrust value missing"
-msgstr "sahibiningüvencesi değerlerini indirir"
+msgstr "sahibiningüvencesi değeri kayıp"
 
-#: g10/tdbdump.c:214
-#, fuzzy, c-format
+#: g10/tdbdump.c:215
+#, c-format
 msgid "error finding trust record in `%s': %s\n"
-msgstr "güvence kaydını ararken hata: %s\n"
+msgstr "`%s' deki güvence kaydını ararken hata: %s\n"
 
-#: g10/tdbdump.c:218
-#, fuzzy, c-format
+#: g10/tdbdump.c:219
+#, c-format
 msgid "read error in `%s': %s\n"
-msgstr "okuma hatası: %s\n"
+msgstr "`%s' için okuma hatası: %s\n"
 
-#: g10/tdbdump.c:227 g10/trustdb.c:380
+#: g10/tdbdump.c:228 g10/trustdb.c:381
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "güvence veritabanı: eşzamanlama başarısız: %s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1440
+#: g10/tdbio.c:129 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "güvence veritabanı %lu kaydı: erişim başarısız: %s\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1447
+#: g10/tdbio.c:135 g10/tdbio.c:1448
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "güvence veritabanı %lu kaydı: yazma başarısız (n=%d): %s\n"
 
-#: g10/tdbio.c:244
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "güvence veritabanı işlemi çok uzun\n"
 
-#: g10/tdbio.c:497
-#, fuzzy, c-format
+#: g10/tdbio.c:498
+#, c-format
 msgid "can't access `%s': %s\n"
-msgstr "\"%s\" kapatılamıyor: %s\n"
+msgstr "'%s' erişilemiyor: %s\n"
 
-#: g10/tdbio.c:512
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: dizin yok!\n"
 
-#: g10/tdbio.c:522 g10/tdbio.c:545 g10/tdbio.c:588
-#, fuzzy, c-format
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#, c-format
 msgid "can't create lock for `%s'\n"
-msgstr "\"%s\" oluşturulamıyor: %s\n"
+msgstr "`%s' için kilit oluşturulamıyor\n"
 
-#: g10/tdbio.c:524 g10/tdbio.c:591
-#, fuzzy, c-format
+#: g10/tdbio.c:525 g10/tdbio.c:592
+#, c-format
 msgid "can't lock `%s'\n"
-msgstr "`%s' açılamadı\n"
+msgstr "`%s' kiltlenemedi\n"
 
-#: g10/tdbio.c:550
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: sürüm kaydı oluşturmada başarısız: %s"
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: geçersiz güvence veritabanı oluşturuldu\n"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: güvence veritabanı oluşturuldu\n"
 
-#: g10/tdbio.c:597
+#: g10/tdbio.c:598
 msgid "NOTE: trustdb not writable\n"
 msgstr "BİLGİ: güvence veritabanına yazılamıyor\n"
 
-#: g10/tdbio.c:614
+#: g10/tdbio.c:615
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: güvence veritabanı geçersiz\n"
 
-#: g10/tdbio.c:646
+#: g10/tdbio.c:647
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: nitelemeli tablo oluşturulamadı: %s\n"
 
-#: g10/tdbio.c:654
+#: g10/tdbio.c:655
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: sürüm kaydının güncellenmesinde hata: %s\n"
 
-#: g10/tdbio.c:671 g10/tdbio.c:691 g10/tdbio.c:707 g10/tdbio.c:721
-#: g10/tdbio.c:751 g10/tdbio.c:1373 g10/tdbio.c:1400
+#: g10/tdbio.c:672 g10/tdbio.c:692 g10/tdbio.c:708 g10/tdbio.c:722
+#: g10/tdbio.c:752 g10/tdbio.c:1374 g10/tdbio.c:1401
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: sürüm kaydının okunmasında hata: %s\n"
 
-#: g10/tdbio.c:730
+#: g10/tdbio.c:731
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: sürüm kaydının yazılmasında hata: %s\n"
 
-#: g10/tdbio.c:1169
+#: g10/tdbio.c:1170
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "güvence veritabanı: erişim başarısız: %s\n"
 
-#: g10/tdbio.c:1177
+#: g10/tdbio.c:1178
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "güvence veritabanı: okuma başarısız (n=%d): %s\n"
 
-#: g10/tdbio.c:1198
+#: g10/tdbio.c:1199
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: bir güvence veritabanı dosyası değil\n"
 
-#: g10/tdbio.c:1216
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: %lu kayıt numarası ile sürüm kaydı\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1222
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: dosya sürümü %d geçersiz\n"
 
-#: g10/tdbio.c:1406
+#: g10/tdbio.c:1407
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: serbest kaydı okuma hatası: %s\n"
 
-#: g10/tdbio.c:1414
+#: g10/tdbio.c:1415
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: dizin kaydını yazma hatası: %s\n"
 
-#: g10/tdbio.c:1424
+#: g10/tdbio.c:1425
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: kayıt sıfırlama başarısız: %s\n"
 
-#: g10/tdbio.c:1454
+#: g10/tdbio.c:1455
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: kayıt ekleme başarısız: %s\n"
 
-#: g10/tdbio.c:1499
+#: g10/tdbio.c:1500
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "güvence veritabanı bozulmuş; lütfen \"gpg --fix-trustdb\" çalıştırın.\n"
 
-#: g10/textfilter.c:147
+#: g10/textfilter.c:148
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "%d karakterden daha uzun metin satırları okunamıyor\n"
 
-#: g10/textfilter.c:244
+#: g10/textfilter.c:245
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "girdi satırı %d karakterden daha uzun\n"
 
-#: g10/trustdb.c:226
+#: g10/trustdb.c:227
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' geçerli bir anahtar kimliği değil\n"
 
-#: g10/trustdb.c:257
-#, fuzzy, c-format
+#: g10/trustdb.c:258
+#, c-format
 msgid "key %s: accepted as trusted key\n"
-msgstr "%08lX anahtarı: güvenli anahtar olarak kabul edildi\n"
+msgstr "anahtar %s: güvenli anahtar olarak kabul edildi\n"
 
-#: g10/trustdb.c:295
-#, fuzzy, c-format
+#: g10/trustdb.c:296
+#, c-format
 msgid "key %s occurs more than once in the trustdb\n"
-msgstr "%08lX anahtarı güvence veritabanında birden fazla kayıtta bulundu\n"
+msgstr "anahtar %s güvence veritabanında birden fazla görünüyor\n"
 
-#: g10/trustdb.c:310
-#, fuzzy, c-format
+#: g10/trustdb.c:311
+#, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
-msgstr "%08lX anahtarı: güvenli anahtar için genel anahtar yok - atlandı\n"
+msgstr "anahtar %s: güvenli anahtar için genel anahtar yok - atlandı\n"
 
-#: g10/trustdb.c:320
-#, fuzzy, c-format
+#: g10/trustdb.c:321
+#, c-format
 msgid "key %s marked as ultimately trusted\n"
-msgstr "anahtar son derece güvenli olarak imlendi.\n"
+msgstr "anahtar %s son derece güvenli olarak imlendi.\n"
 
-#: g10/trustdb.c:344
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "güvence veritabanı kaydı %lu, istek tipi %d: okuma başarısız: %s\n"
 
-#: g10/trustdb.c:350
+#: g10/trustdb.c:351
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "güvence veritabanının %lu. kaydı %d istek türünde değil\n"
 
-#: g10/trustdb.c:446
+#: g10/trustdb.c:447
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
+"bilinmeyen güvence modeli (%d) kullanılamıyor - %s güvence modeli "
+"varsayılıyor\n"
 
-#: g10/trustdb.c:452
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
-msgstr ""
+msgstr "%s güvence modeli kullanılıyor\n"
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:506
-#, fuzzy
+#: g10/trustdb.c:507
 msgid "[ revoked]"
 msgstr "[yürürlükten kaldırıldı] "
 
-#: g10/trustdb.c:508 g10/trustdb.c:513
-#, fuzzy
+#: g10/trustdb.c:509 g10/trustdb.c:514
 msgid "[ expired]"
 msgstr "[süresi doldu] "
 
-#: g10/trustdb.c:512
-#, fuzzy
+#: g10/trustdb.c:513
 msgid "[ unknown]"
-msgstr "bilinmeyen"
+msgstr "[bilinmeyen]"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  undef ]"
-msgstr ""
+msgstr "[tanımsız]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 msgid "[marginal]"
-msgstr ""
+msgstr "[şöyle böyle]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:517
 msgid "[  full  ]"
-msgstr ""
+msgstr "[tamamen]"
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:518
 msgid "[ultimate]"
-msgstr ""
+msgstr "[son derece]"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "undefined"
-msgstr ""
+msgstr "tanımsız"
 
-#: g10/trustdb.c:533
-#, fuzzy
+#: g10/trustdb.c:534
 msgid "never"
 msgstr "asla    "
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "marginal"
-msgstr ""
+msgstr "şöyle böyle"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:536
 msgid "full"
-msgstr ""
+msgstr "tamamen"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:537
 msgid "ultimate"
-msgstr ""
+msgstr "son derece"
 
-#: g10/trustdb.c:576
+#: g10/trustdb.c:577
 msgid "no need for a trustdb check\n"
 msgstr "bir güvence veritabanı denetimi gereksiz\n"
 
-#: g10/trustdb.c:582 g10/trustdb.c:2157
+#: g10/trustdb.c:583 g10/trustdb.c:2309
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "sonraki güvence veritabanı denetimi %s de\n"
 
-#: g10/trustdb.c:591
-#, fuzzy, c-format
+#: g10/trustdb.c:592
+#, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
-msgstr "bir güvence veritabanı denetimi gereksiz\n"
+msgstr "`%s' güvence modelli güvence veritabanı sınaması için gereksiz\n"
 
-#: g10/trustdb.c:606
-#, fuzzy, c-format
+#: g10/trustdb.c:607
+#, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
-msgstr "bir güvence veritabanı denetimi gereksiz\n"
+msgstr "`%s' güvence modelli güvence veritabanı güncellemesi için gereksiz\n"
 
-#: g10/trustdb.c:838 g10/trustdb.c:1276
-#, fuzzy, c-format
+#: g10/trustdb.c:839 g10/trustdb.c:1277
+#, c-format
 msgid "public key %s not found: %s\n"
-msgstr "%08lX genel anahtarı yok: %s\n"
+msgstr "genel anahtar %s yok: %s\n"
 
-#: g10/trustdb.c:1033
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr "lütfen bir --check-trustdb yapın\n"
 
-#: g10/trustdb.c:1037
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "güvence veritabanı denetleniyor\n"
 
-#: g10/trustdb.c:1901
+#: g10/trustdb.c:2053
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d anahtar işlendi (%d doğrulama temizlendi)\n"
 
-#: g10/trustdb.c:1965
+#: g10/trustdb.c:2117
 msgid "no ultimately trusted keys found\n"
 msgstr "son derece güvenli bir anahtar yok\n"
 
-#: g10/trustdb.c:1979
-#, fuzzy, c-format
+#: g10/trustdb.c:2131
+#, c-format
 msgid "public key of ultimately trusted key %s not found\n"
-msgstr "son derece güvenli %08lX genel anahtarı yok\n"
+msgstr "son derece güvenli %s için genel anahtar yok\n"
 
-#: g10/trustdb.c:2002
+#: g10/trustdb.c:2154
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
-msgstr ""
+msgstr "%d şöyle böyle gerekli, %d tamamen gerekli, %s güvence modeli\n"
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2240
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
+"derinlik: %d  geçerli: %3d  imzalı: %3d  güvenilir: %d-, %dq, %dn, %dm, %df, "
+"%du\n"
 
-#: g10/trustdb.c:2163
-#, fuzzy, c-format
+#: g10/trustdb.c:2315
+#, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
-msgstr "güvence veritabanının %lu. kaydı, %d türünde: yazma başarısız: %s\n"
+msgstr ""
+"güvence veritabanının sürüm kaydı güncellenemedi: yazma başarısız: %s\n"
 
-#: g10/verify.c:116
+#: g10/verify.c:117
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -5751,708 +5676,346 @@ msgstr ""
 "İmza dosyasının (.sig veya .asc) komut satırında verilecek\n"
 "ilk dosya olması gerektiğini lütfen hatırlayın.\n"
 
-#: g10/verify.c:189
+#: g10/verify.c:190
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "girdi satırı %u ya çok uzun ya da sonunda satırsonu karakteri yok\n"
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "genel hata"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "bilinmeyen paket tipi"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "bilinmeyen sürüm"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "bilinmeyen genel anahtar algoritması"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "bilinmeyen özümleme algoritması"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "genel anahtar hatalı"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "gizli anahtar hatalı"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "imza hatalı"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "\"checksum\" hatası"
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "anahtar parolası hatalı"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "genel anahtar bulunamadı"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "bilinmeyen şifre algoritması"
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "anahtar zinciri açılamadı"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "geçersiz paket"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "geçersiz zırh"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "böyle bir kullanıcı kimliği yok"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "gizli anahtar kullanışsız"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "yanlış gizli anahtar kullanılmış"
 
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "desteklenmiyor"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "anahtar hatalı"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "dosya okuma hatası"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "dosya yazma hatası"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "bilinmeyen sıkıştırma algoritması"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "dosya açma hatası"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "dosya oluşturma hatası"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "anahtar parolası geçersiz"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "tamamlanmamış genel anahtar algoritması"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "tamamlanmamış şifre algoritması"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "bilinmeyen imza sınıfı"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "güvence veritabanı hatası"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "MPI hatalı"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "iç kaynak sınırı"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "anahtar zinciri geçersiz"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "sertifika hatalı"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "kullanıcı kimliği bozuk"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "dosya kapama hatası"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "dosya isim değiştirme hatası"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "dosya silme hatası"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "beklenmeyen veri"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "zaman damgası çelişkili"
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "genel anahtar algoritması kullanışsız"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "dosya mevcut"
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "anahtar zayıf"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "geçersiz argüman"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "URI hatalı"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "desteklenmeyen URI"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "ağ hatası"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "şifrelenemedi"
 
-#: util/errors.c:103
+#: util/errors.c:104
 msgid "not processed"
 msgstr "işlenemedi"
 
-#: util/errors.c:105
+#: util/errors.c:106
 msgid "unusable public key"
 msgstr "genel anahtar kullanımdışı"
 
-#: util/errors.c:106
+#: util/errors.c:107
 msgid "unusable secret key"
 msgstr "gizli anahtar kullanımdışı"
 
-#: util/errors.c:107
+#: util/errors.c:108
 msgid "keyserver error"
 msgstr "anahtar sunucusu hatası"
 
-#: util/errors.c:108
-#, fuzzy
+#: util/errors.c:109
 msgid "canceled"
-msgstr "İptal"
+msgstr "iptal edildi"
 
-#: util/errors.c:109
-#, fuzzy
+#: util/errors.c:110
 msgid "no card"
-msgstr "şifrelenemedi"
+msgstr "kat yok"
 
-#: util/logger.c:157
+#: util/logger.c:158
 msgid "ERROR: "
-msgstr ""
+msgstr "HATA: "
 
-#: util/logger.c:160
+#: util/logger.c:161
 msgid "WARNING: "
-msgstr ""
+msgstr "UYARI: "
 
-#: util/logger.c:223
+#: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... bu bir yazılım hatası (%s:%d:%s)\n"
 
-#: util/logger.c:229
+#: util/logger.c:230
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "bir yazılım hatası buldunuz ... (%s:%d)\n"
 
-#: util/miscutil.c:336 util/miscutil.c:373
+#: util/miscutil.c:330 util/miscutil.c:367
 msgid "yes"
 msgstr "evet"
 
-#: util/miscutil.c:337 util/miscutil.c:378
+#: util/miscutil.c:331 util/miscutil.c:372
 msgid "yY"
 msgstr "eE"
 
-#: util/miscutil.c:339 util/miscutil.c:375
+#: util/miscutil.c:333 util/miscutil.c:369
 msgid "no"
 msgstr "hayır"
 
-#: util/miscutil.c:340 util/miscutil.c:379
+#: util/miscutil.c:334 util/miscutil.c:373
 msgid "nN"
 msgstr "hH"
 
-#: util/miscutil.c:377
+#: util/miscutil.c:371
 msgid "quit"
-msgstr "quit"
+msgstr "çık"
 
-#: util/miscutil.c:380
+#: util/miscutil.c:374
 msgid "qQ"
 msgstr "çÇ"
 
-#: util/miscutil.c:413
+#: util/miscutil.c:407
 msgid "okay|okay"
-msgstr ""
+msgstr "tamam|tamam"
 
-#: util/miscutil.c:415
+#: util/miscutil.c:409
 msgid "cancel|cancel"
-msgstr ""
+msgstr "iptal|iptal"
 
-#: util/miscutil.c:416
+#: util/miscutil.c:410
 msgid "oO"
-msgstr ""
+msgstr "tT"
 
-#: util/miscutil.c:417
-#, fuzzy
+#: util/miscutil.c:411
 msgid "cC"
-msgstr "k"
+msgstr "iİ"
 
-#: util/secmem.c:90
+#: util/secmem.c:91
 msgid "WARNING: using insecure memory!\n"
 msgstr "UYARI: kullanılan bellek güvenli değil!\n"
 
-#: util/secmem.c:91
+#: util/secmem.c:92
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr ""
 "Daha geniş bilgi edinmek için http://www.gnupg.org/faq.html adresine "
 "bakınız\n"
 
-#: util/secmem.c:343
+#: util/secmem.c:344
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "güvenli bellek hazırlanmadan işlem yapmak mümkün değil\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:345
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(bu görev için yanlış program kullanmış olabilirsiniz)\n"
 
-#~ msgid "select secondary key N"
-#~ msgstr "N yardımcı anahtarını seçer"
+#~ msgid "error getting serial number: %s\n"
+#~ msgstr "seri numarası alınırken hata: %s\n"
 
-#~ msgid "list signatures"
-#~ msgstr "imzaları listeler"
+#~ msgid "Hint: Select the user IDs to sign\n"
+#~ msgstr "İpucu: İmzalamak için bir kullanıcı kimliği seçiniz\n"
 
-#~ msgid "sign the key"
-#~ msgstr "anahtarı imzalar"
+#~ msgid "length of RSA modulus is not %d\n"
+#~ msgstr "RSA modülünün uzunluğu %d değildir\n"
 
-#~ msgid "add a secondary key"
-#~ msgstr "bir yardımcı anahtar ekler"
+#~ msgid "length of an RSA prime is not %d\n"
+#~ msgstr "bir RSA asal sayısının uzunluğu %d değildir\n"
 
-#~ msgid "delete signatures"
-#~ msgstr "imzaları siler"
+#~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+#~ msgstr "ya anahtar parosı yanlış ya da şifre algoritması bilinmiyor (%d)\n"
 
-#~ msgid "change the expire date"
-#~ msgstr "son kullanım tarihini değiştirir"
+#~ msgid "can't set client pid for the agent\n"
+#~ msgstr "istemci pid'i belirlenemiyor\n"
 
-#~ msgid "set preference list"
-#~ msgstr "tercih listesi oluşturmak için"
+#~ msgid "can't get server read FD for the agent\n"
+#~ msgstr "sunucu okuma dosya tanıtıcısı alınamadı\n"
 
-#~ msgid "updated preferences"
-#~ msgstr "güncelenmiş tercihler"
+#~ msgid "can't get server write FD for the agent\n"
+#~ msgstr "sunucu yazma dosya tanıtıcısı alınamadı\n"
 
-#~ msgid "No secondary key with index %d\n"
-#~ msgstr "%d endeksine sahip yardımcı anahtar yok\n"
+#~ msgid "communication problem with gpg-agent\n"
+#~ msgstr "gpg-agent ile haberleşme problemi\n"
 
-#~ msgid "--nrsign-key user-id"
-#~ msgstr "--nrsign-key KULL-KML"
+#~ msgid "passphrase too long\n"
+#~ msgstr "Parola çok uzun\n"
 
-#~ msgid "--nrlsign-key user-id"
-#~ msgstr "--nrlsign-key KULL-KML"
+#~ msgid "invalid response from agent\n"
+#~ msgstr "yanıt geçersiz\n"
 
-#, fuzzy
-#~ msgid "make a trust signature"
-#~ msgstr "bağımsız bir imza yapar"
-
-#~ msgid "sign the key non-revocably"
-#~ msgstr "yürürlükten kaldırılamayan imza yapar"
-
-#~ msgid "sign the key locally and non-revocably"
-#~ msgstr "yürürlükten kaldırılamayan yerel imza yapar"
-
-#~ msgid "q"
-#~ msgstr "k"
-
-#~ msgid "help"
-#~ msgstr "help"
-
-#~ msgid "list"
-#~ msgstr "list"
-
-#~ msgid "l"
-#~ msgstr "l"
-
-#~ msgid "debug"
-#~ msgstr "debug"
-
-#, fuzzy
-#~ msgid "name"
-#~ msgstr "enable"
-
-#, fuzzy
-#~ msgid "login"
-#~ msgstr "lsign"
-
-#, fuzzy
-#~ msgid "cafpr"
-#~ msgstr "fpr"
-
-#, fuzzy
-#~ msgid "forcesig"
-#~ msgstr "revsig"
-
-#, fuzzy
-#~ msgid "generate"
-#~ msgstr "genel hata"
-
-#~ msgid "passwd"
-#~ msgstr "passwd"
-
-#~ msgid "save"
-#~ msgstr "save"
-
-#~ msgid "fpr"
-#~ msgstr "fpr"
-
-#~ msgid "uid"
-#~ msgstr "uid"
-
-#~ msgid "key"
-#~ msgstr "key"
-
-#~ msgid "check"
-#~ msgstr "check"
-
-#~ msgid "c"
-#~ msgstr "k"
-
-#~ msgid "sign"
-#~ msgstr "sign"
-
-#~ msgid "s"
-#~ msgstr "i"
-
-#, fuzzy
-#~ msgid "tsign"
-#~ msgstr "sign"
-
-#~ msgid "lsign"
-#~ msgstr "lsign"
-
-#~ msgid "nrsign"
-#~ msgstr "nrsign"
-
-#~ msgid "nrlsign"
-#~ msgstr "nrlsign"
-
-#~ msgid "adduid"
-#~ msgstr "adduid"
-
-#~ msgid "addphoto"
-#~ msgstr "addphoto"
-
-#~ msgid "deluid"
-#~ msgstr "deluid"
-
-#~ msgid "delphoto"
-#~ msgstr "delphoto"
-
-#, fuzzy
-#~ msgid "addcardkey"
-#~ msgstr "addkey"
-
-#~ msgid "delkey"
-#~ msgstr "delkey"
-
-#~ msgid "addrevoker"
-#~ msgstr "addrevoker"
-
-#~ msgid "delsig"
-#~ msgstr "delsig"
-
-#~ msgid "expire"
-#~ msgstr "expire"
-
-#~ msgid "primary"
-#~ msgstr "primary"
-
-#~ msgid "toggle"
-#~ msgstr "toggle"
-
-#~ msgid "t"
-#~ msgstr "b"
-
-#~ msgid "pref"
-#~ msgstr "pref"
-
-#~ msgid "showpref"
-#~ msgstr "showpref"
-
-#~ msgid "setpref"
-#~ msgstr "setpref"
-
-#~ msgid "updpref"
-#~ msgstr "updpref"
-
-#, fuzzy
-#~ msgid "keyserver"
-#~ msgstr "anahtar sunucusu hatası"
-
-#~ msgid "trust"
-#~ msgstr "trust"
-
-#~ msgid "revsig"
-#~ msgstr "revsig"
-
-#~ msgid "revuid"
-#~ msgstr "revuid"
-
-#~ msgid "revkey"
-#~ msgstr "revkey"
-
-#~ msgid "disable"
-#~ msgstr "disable"
-
-#~ msgid "enable"
-#~ msgstr "enable"
-
-#~ msgid "showphoto"
-#~ msgstr "showphoto"
+#~ msgid "problem with the agent: agent returns 0x%lx\n"
+#~ msgstr "vekil ile sorun var: vekil 0x%lx ile sonuçlandı\n"
 
 #~ msgid "digest algorithm `%s' is read-only in this release\n"
 #~ msgstr "bu dağıtımda özümleme algoritması %s salt-okunurdur\n"
 
 #~ msgid ""
-#~ "About to generate a new %s keypair.\n"
-#~ "              minimum keysize is  768 bits\n"
-#~ "              default keysize is 1024 bits\n"
-#~ "    highest suggested keysize is 2048 bits\n"
-#~ msgstr ""
-#~ "Yeni bir %s anahtar çifti üretmek üzeresiniz.\n"
-#~ "                   en küçük anahtar uzunluğu:  768 bit\n"
-#~ "                  öntanımlı anahtar uzunluğu: 1024 bit\n"
-#~ "    önerilebilecek en büyük anahtar uzunluğu: 2048 bit\n"
-
-#~ msgid "DSA only allows keysizes from 512 to 1024\n"
-#~ msgstr "DSA anahtarının uzunluğu 512 ile 1024 bit arasında olabilir\n"
-
-#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-#~ msgstr ""
-#~ "anahtar uzunluğu çok küçük; RSA anahtarı için en küçük uzunluk: 1024 bit\n"
-
-#~ msgid "keysize too small; 768 is smallest value allowed.\n"
-#~ msgstr ""
-#~ "anahtar uzunluğu çok küçük; en küçük anahtar uzunluğu 768 bit'tir.\n"
-
-#~ msgid "keysize too large; %d is largest value allowed.\n"
-#~ msgstr "anahtar uzunluğu çok büyük; izin verilen en büyük değer: %d bit\n"
-
-#~ msgid ""
-#~ "Keysizes larger than 2048 are not suggested because\n"
-#~ "computations take REALLY long!\n"
-#~ msgstr ""
-#~ "Hesaplama EPEYCE UZUN zaman alacağından anahtar uzunluklarında\n"
-#~ "2048 bitten fazlası tavsiye edilmez.\n"
-
-#, fuzzy
-#~ msgid "Are you sure that you want this keysize? (y/N) "
-#~ msgstr "Bu anahtar uzunluğunu istediğinizden emin misiniz? "
-
-#~ msgid ""
-#~ "Okay, but keep in mind that your monitor and keyboard radiation is also "
-#~ "very vulnerable to attacks!\n"
-#~ msgstr ""
-#~ "Tamam, ama saldırılara çok duyarlı olan monitör ve klavye ışınımlarından "
-#~ "kendinizi uzak tutun! (ne demekse...)\n"
-
-#~ msgid "Experimental algorithms should not be used!\n"
-#~ msgstr "Deneysel algoritmalar kullanılmamalı!\n"
-
-#~ msgid ""
-#~ "this cipher algorithm is deprecated; please use a more standard one!\n"
-#~ msgstr ""
-#~ "bu şifre algoritması standart dışı; lütfen daha standart birini "
-#~ "kullanın!\n"
-
-#, fuzzy
-#~ msgid "writing to file `%s'\n"
-#~ msgstr "\"%s\"e yazıyor\n"
-
-#~ msgid "sorry, can't do this in batch mode\n"
-#~ msgstr "pardon, bu betik kipinde yapılamaz\n"
-
-#~ msgid "key `%s' not found: %s\n"
-#~ msgstr "anahtar `%s' yok: %s\n"
-
-#, fuzzy
-#~ msgid "can't create file `%s': %s\n"
-#~ msgstr "\"%s\" oluşturulamıyor: %s\n"
-
-#, fuzzy
-#~ msgid "can't open file `%s': %s\n"
-#~ msgstr "dosya açılamadı: %s\n"
-
-#, fuzzy
-#~ msgid "          \""
-#~ msgstr "                den \""
-
-#~ msgid " i = please show me more information\n"
-#~ msgstr " b = Daha fazla bilgi gerekli\n"
-
-#~ msgid "key %08lX: key has been revoked!\n"
-#~ msgstr "anahtar %08lX: anahtar yürürlükten kaldırılmıştı!\n"
-
-#~ msgid "key %08lX: subkey has been revoked!\n"
-#~ msgstr "anahtar %08lX: yardımcı anahtar yürürlükten kaldırılmıştı!\n"
-
-#~ msgid "%08lX: key has expired\n"
-#~ msgstr "%08lX: anahtarın kullanım süresi dolmuş\n"
-
-#~ msgid "%08lX: We do NOT trust this key\n"
-#~ msgstr "%08lX: Bu anahtara güven-mi-yoruz\n"
-
-#~ msgid "   (%d) RSA (sign and encrypt)\n"
-#~ msgstr "   (%d) RSA (imzalamak ve şifrelemek için)\n"
-
-#, fuzzy
-#~ msgid "   (%d) RSA (auth only)\n"
-#~ msgstr "   (%d) RSA (sadece imzalamak için)\n"
-
-#, fuzzy
-#~ msgid "   (%d) RSA (sign and auth)\n"
-#~ msgstr "   (%d) RSA (imzalamak ve şifrelemek için)\n"
-
-#, fuzzy
-#~ msgid "   (%d) RSA (encrypt and auth)\n"
-#~ msgstr "   (%d) RSA (sadece şifrelemek için)\n"
-
-#, fuzzy
-#~ msgid "  (%d) RSA (sign, encrypt and auth)\n"
-#~ msgstr "   (%d) RSA (imzalamak ve şifrelemek için)\n"
-
-#~ msgid "%s: can't open: %s\n"
-#~ msgstr "%s: açılamıyor: %s\n"
-
-#~ msgid "%s: WARNING: empty file\n"
-#~ msgstr "%s: UYARI: dosya boş\n"
-
-#~ msgid "can't open %s: %s\n"
-#~ msgstr "%s açılamadı: %s\n"
-
-#, fuzzy
-#~ msgid "   (%d) I trust marginally\n"
-#~ msgstr " %d = Şöyle böyle güveniyorum\n"
-
-#, fuzzy
-#~ msgid "   (%d) I trust fully\n"
-#~ msgstr " %d = Tamamen güveniyorum\n"
-
-#~ msgid "Really sign? "
-#~ msgstr "Gerçekten imzalayacak mısınız? "
-
-#, fuzzy
-#~ msgid "expires"
-#~ msgstr "expire"
-
-#, fuzzy
-#~ msgid ""
-#~ "\"\n"
-#~ "locally signed with your key %s at %s\n"
-#~ msgstr ""
-#~ "\"\n"
-#~ "%08lX anahtarınızla %s de yerel olarak imzalı\n"
-
-#, fuzzy
-#~ msgid "   signed by %s on %s%s\n"
-#~ msgstr "   %08lX ile %s%s de imzalanmış\n"
-
-#~ msgid "%s: can't access: %s\n"
-#~ msgstr "%s: erişilemedi: %s\n"
-
-#~ msgid "%s: can't create lock\n"
-#~ msgstr "%s: kilit oluşturulamadı\n"
-
-#~ msgid "%s: can't make lock\n"
-#~ msgstr "%s: kilitleme yapılamadı\n"
-
-#~ msgid "%s: can't create: %s\n"
-#~ msgstr "%s: oluşturulamadı: %s\n"
-
-#~ msgid "%s: can't create directory: %s\n"
-#~ msgstr "%s: dizin oluşturulamıyor: %s\n"
-
-#~ msgid "If you want to use this revoked key anyway, answer \"yes\"."
-#~ msgstr ""
-#~ "Bu yürürlükten kaldırılmış anahtarı yine de kullanmak istiyorsanız\n"
-#~ "cevap olarak \"evet\" yazın."
-
-#~ msgid "Unable to open photo \"%s\": %s\n"
-#~ msgstr "\"%s\" resmi açılamıyor: %s\n"
-
-#~ msgid "can't open file: %s\n"
-#~ msgstr "dosya açılamadı: %s\n"
-
-#~ msgid "error: missing colon\n"
-#~ msgstr "hata: \":\" eksik\n"
-
-#~ msgid "error: no ownertrust value\n"
-#~ msgstr "hata: hiç sahibiningüvencesi değeri yok\n"
-
-#~ msgid " (main key ID %08lX)"
-#~ msgstr " (asıl anahtar kimliği %08lX)"
-
-#~ msgid "rev! subkey has been revoked: %s\n"
-#~ msgstr "yürkal! yardımcı anahtar yürürlülükten kaldırıldı: %s\n"
-
-#~ msgid "rev- faked revocation found\n"
-#~ msgstr "yürkal- sahte yürürlükten kaldırma sertifikası bulundu\n"
-
-#~ msgid "rev? problem checking revocation: %s\n"
-#~ msgstr "yürkal? Yürürlükten kaldırma denetlenirken problem: %s\n"
-
-#, fuzzy
-#~ msgid " [expired: %s]"
-#~ msgstr "[son kullanma tarihi: %s]"
-
-#~ msgid " [expires: %s]"
-#~ msgstr "[son kullanma tarihi: %s]"
-
-#, fuzzy
-#~ msgid " [revoked: %s]"
-#~ msgstr "[yürürlükten kaldırıldı] "
-
-#~ msgid "can't create %s: %s\n"
-#~ msgstr "%s oluşturulamıyor: %s\n"
-
-#~ msgid ""
 #~ "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
 #~ msgstr ""
-#~ "Uyarı: özümleme algoritması `%s' OpenPGP'nin parçası değildir. "
-#~ "Kullanırsanız, riski size ait!\n"
+#~ "UYARI: `%s' özümleyici OpenPGP'ye ait değil. Kullanmak riskli olabilir!\n"
 
 #~ msgid "|[files]|encrypt files"
 #~ msgstr "|[dosyalar]|dosyalar şifrelenir"
@@ -6604,6 +6167,30 @@ msgstr "(bu görev için yanlış program kullanmış olabilirsiniz)\n"
 #~ msgid "compress algorithm must be in range %d..%d\n"
 #~ msgstr "sıkıştırma algoritması %d..%d aralığında olmalı\n"
 
+#~ msgid "--nrsign-key user-id"
+#~ msgstr "--nrsign-key KULL-KML"
+
+#~ msgid "--nrlsign-key user-id"
+#~ msgstr "--nrlsign-key KULL-KML"
+
+#~ msgid "can't open %s: %s\n"
+#~ msgstr "%s açılamadı: %s\n"
+
+#~ msgid " i = please show me more information\n"
+#~ msgstr " b = Daha fazla bilgi gerekli\n"
+
+#~ msgid "key %08lX: key has been revoked!\n"
+#~ msgstr "anahtar %08lX: anahtar yürürlükten kaldırılmıştı!\n"
+
+#~ msgid "key %08lX: subkey has been revoked!\n"
+#~ msgstr "anahtar %08lX: yardımcı anahtar yürürlükten kaldırılmıştı!\n"
+
+#~ msgid "%08lX: key has expired\n"
+#~ msgstr "%08lX: anahtarın kullanım süresi dolmuş\n"
+
+#~ msgid "%08lX: We do NOT trust this key\n"
+#~ msgstr "%08lX: Bu anahtara güven-mi-yoruz\n"
+
 #~ msgid ""
 #~ "%08lX: It is not sure that this key really belongs to the owner\n"
 #~ "but it is accepted anyway\n"
@@ -6614,6 +6201,57 @@ msgstr "(bu görev için yanlış program kullanmış olabilirsiniz)\n"
 #~ msgid "preference %c%lu is not valid\n"
 #~ msgstr "%c%lu tercihi geçersiz\n"
 
+#~ msgid "   (%d) RSA (sign and encrypt)\n"
+#~ msgstr "   (%d) RSA (imzalamak ve şifrelemek için)\n"
+
+#~ msgid ""
+#~ "About to generate a new %s keypair.\n"
+#~ "              minimum keysize is  768 bits\n"
+#~ "              default keysize is 1024 bits\n"
+#~ "    highest suggested keysize is 2048 bits\n"
+#~ msgstr ""
+#~ "Yeni bir %s anahtar çifti üretmek üzeresiniz.\n"
+#~ "                   en küçük anahtar uzunluğu:  768 bit\n"
+#~ "                  öntanımlı anahtar uzunluğu: 1024 bit\n"
+#~ "    önerilebilecek en büyük anahtar uzunluğu: 2048 bit\n"
+
+#~ msgid "DSA only allows keysizes from 512 to 1024\n"
+#~ msgstr "DSA anahtarının uzunluğu 512 ile 1024 bit arasında olabilir\n"
+
+#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+#~ msgstr ""
+#~ "anahtar uzunluğu çok küçük; RSA anahtarı için en küçük uzunluk: 1024 bit\n"
+
+#~ msgid "keysize too small; 768 is smallest value allowed.\n"
+#~ msgstr ""
+#~ "anahtar uzunluğu çok küçük; en küçük anahtar uzunluğu 768 bit'tir.\n"
+
+#~ msgid "keysize too large; %d is largest value allowed.\n"
+#~ msgstr "anahtar uzunluğu çok büyük; izin verilen en büyük değer: %d bit\n"
+
+#~ msgid ""
+#~ "Keysizes larger than 2048 are not suggested because\n"
+#~ "computations take REALLY long!\n"
+#~ msgstr ""
+#~ "Hesaplama EPEYCE UZUN zaman alacağından anahtar uzunluklarında\n"
+#~ "2048 bitten fazlası tavsiye edilmez.\n"
+
+#~ msgid "Are you sure that you want this keysize? "
+#~ msgstr "Bu anahtar uzunluğunu istediğinizden emin misiniz? "
+
+#~ msgid ""
+#~ "Okay, but keep in mind that your monitor and keyboard radiation is also "
+#~ "very vulnerable to attacks!\n"
+#~ msgstr ""
+#~ "Tamam, ama saldırılara çok duyarlı olan monitör ve klavye ışınımlarından "
+#~ "kendinizi uzak tutun! (ne demekse...)\n"
+
+#~ msgid "%s: can't open: %s\n"
+#~ msgstr "%s: açılamıyor: %s\n"
+
+#~ msgid "%s: WARNING: empty file\n"
+#~ msgstr "%s: UYARI: dosya boş\n"
+
 #~ msgid "key %08lX: not a rfc2440 key - skipped\n"
 #~ msgstr "%08lX anahtarı: bir RFC2440 anahtarı değil - atlandı\n"
 
@@ -6625,15 +6263,178 @@ msgstr "(bu görev için yanlış program kullanmış olabilirsiniz)\n"
 #~ msgid " (default)"
 #~ msgstr " (öntanımlı)"
 
+#~ msgid "Really sign? "
+#~ msgstr "Gerçekten imzalayacak mısınız? "
+
+#~ msgid "q"
+#~ msgstr "k"
+
+#~ msgid "save"
+#~ msgstr "save"
+
+#~ msgid "help"
+#~ msgstr "help"
+
+#~ msgid "fpr"
+#~ msgstr "fpr"
+
+#~ msgid "list"
+#~ msgstr "list"
+
+#~ msgid "l"
+#~ msgstr "l"
+
+#~ msgid "uid"
+#~ msgstr "uid"
+
+#~ msgid "key"
+#~ msgstr "key"
+
+#~ msgid "select secondary key N"
+#~ msgstr "N yardımcı anahtarını seçer"
+
+#~ msgid "check"
+#~ msgstr "check"
+
+#~ msgid "list signatures"
+#~ msgstr "imzaları listeler"
+
+#~ msgid "sign the key"
+#~ msgstr "anahtarı imzalar"
+
+#~ msgid "s"
+#~ msgstr "i"
+
+#~ msgid "lsign"
+#~ msgstr "lsign"
+
+#~ msgid "nrsign"
+#~ msgstr "nrsign"
+
+#~ msgid "sign the key non-revocably"
+#~ msgstr "yürürlükten kaldırılamayan imza yapar"
+
+#~ msgid "nrlsign"
+#~ msgstr "nrlsign"
+
+#~ msgid "sign the key locally and non-revocably"
+#~ msgstr "yürürlükten kaldırılamayan yerel imza yapar"
+
+#~ msgid "debug"
+#~ msgstr "debug"
+
+#~ msgid "adduid"
+#~ msgstr "adduid"
+
+#~ msgid "addphoto"
+#~ msgstr "addphoto"
+
+#~ msgid "deluid"
+#~ msgstr "deluid"
+
+#~ msgid "delphoto"
+#~ msgstr "delphoto"
+
+#~ msgid "add a secondary key"
+#~ msgstr "bir yardımcı anahtar ekler"
+
+#~ msgid "delkey"
+#~ msgstr "delkey"
+
+#~ msgid "addrevoker"
+#~ msgstr "addrevoker"
+
+#~ msgid "delsig"
+#~ msgstr "delsig"
+
+#~ msgid "delete signatures"
+#~ msgstr "imzaları siler"
+
+#~ msgid "primary"
+#~ msgstr "primary"
+
+#~ msgid "toggle"
+#~ msgstr "toggle"
+
+#~ msgid "t"
+#~ msgstr "b"
+
+#~ msgid "pref"
+#~ msgstr "pref"
+
+#~ msgid "showpref"
+#~ msgstr "showpref"
+
+#~ msgid "setpref"
+#~ msgstr "setpref"
+
+#~ msgid "updpref"
+#~ msgstr "updpref"
+
+#~ msgid "passwd"
+#~ msgstr "passwd"
+
+#~ msgid "trust"
+#~ msgstr "trust"
+
+#~ msgid "revsig"
+#~ msgstr "revsig"
+
+#~ msgid "revoke signatures"
+#~ msgstr "imzaları yürürlükten kaldırır"
+
+#~ msgid "revuid"
+#~ msgstr "revuid"
+
+#~ msgid "revoke a user ID"
+#~ msgstr "bir kullanıcı kimliği yürürlükten kaldırır"
+
+#~ msgid "revkey"
+#~ msgstr "revkey"
+
+#~ msgid "showphoto"
+#~ msgstr "showphoto"
+
 #~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 #~ msgstr "%s%c %4u%c/%08lX  üretildi: %s zamanaşımı: %s"
 
+#~ msgid "rev! subkey has been revoked: %s\n"
+#~ msgstr "yürkal! yardımcı anahtar yürürlülükten kaldırıldı: %s\n"
+
+#~ msgid "rev- faked revocation found\n"
+#~ msgstr "yürkal- sahte yürürlükten kaldırma sertifikası bulundu\n"
+
+#~ msgid "rev? problem checking revocation: %s\n"
+#~ msgstr "yürkal? Yürürlükten kaldırma denetlenirken problem: %s\n"
+
+#~ msgid ""
+#~ "\"\n"
+#~ "locally signed with your key %08lX at %s\n"
+#~ msgstr ""
+#~ "\"\n"
+#~ "%08lX anahtarınızla %s de yerel olarak imzalı\n"
+
+#~ msgid "   signed by %08lX at %s%s%s\n"
+#~ msgstr "   %08lX ile %s%s%s de imzalanmış\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: "
 
+#~ msgid "Experimental algorithms should not be used!\n"
+#~ msgstr "Deneysel algoritmalar kullanılmamalı!\n"
+
+#~ msgid ""
+#~ "this cipher algorithm is deprecated; please use a more standard one!\n"
+#~ msgstr ""
+#~ "bu şifre algoritması standart dışı; lütfen daha standart birini "
+#~ "kullanın!\n"
+
 #~ msgid "can't get key from keyserver: %s\n"
 #~ msgstr "anahtar sunucusunun %s adresinden anahtar alınamadı\n"
 
@@ -6647,7 +6448,7 @@ msgstr "(bu görev için yanlış program kullanmış olabilirsiniz)\n"
 #~ msgstr "\"%s\" adresine gönderme işlemi başarısız (durum=%u)\n"
 
 #~ msgid "this keyserver does not support --search-keys\n"
-#~ msgstr "bu anahtar sunucusu --search-keys seçeneğini desteklemiyor\n"
+#~ msgstr "bu anahtar sunucusu --search-keys işlemini desteklemiyor\n"
 
 #~ msgid "can't search keyserver: %s\n"
 #~ msgstr "anahtar sunucusu aranamıyor: %s\n"
@@ -6673,20 +6474,42 @@ msgstr "(bu görev için yanlış program kullanmış olabilirsiniz)\n"
 #~ "%08lX anahtarı %lu saniye gelecekte üretilmiş (zaman sapması veya saat "
 #~ "problemi)\n"
 
+#~ msgid "%s: can't access: %s\n"
+#~ msgstr "%s: erişilemedi: %s\n"
+
+#~ msgid "%s: can't create lock\n"
+#~ msgstr "%s: kilit oluşturulamadı\n"
+
+#~ msgid "%s: can't make lock\n"
+#~ msgstr "%s: kilitleme yapılamadı\n"
+
+#~ msgid "%s: can't create: %s\n"
+#~ msgstr "%s: oluşturulamadı: %s\n"
+
 #~ msgid "key %08lX marked as ultimately trusted\n"
 #~ msgstr "anahtar %08lX son derece güvenli olarak imlendi.\n"
 
 #~ msgid "signature from Elgamal signing key %08lX to %08lX skipped\n"
-#~ msgstr "%08lX Elgamal imzalama anahtarından  %08lX'e  imza atlandı\n"
+#~ msgstr ""
+#~ "%08lX Elgamal imzalama anahtarından %08lX anahtarına imzalama atlandı\n"
 
 #~ msgid "signature from %08lX to Elgamal signing key %08lX skipped\n"
-#~ msgstr "%08lX den  %08lX Elgamal imzalama anahtarına imza atlandı\n"
+#~ msgstr ""
+#~ "%08lX anahtarından %08lX Elgamal imzalama anahtarına imzalama atlandı\n"
 
 #~ msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 #~ msgstr ""
 #~ "denetim %d derinlikte yapılıyor: signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/"
 #~ "%d\n"
 
+#~ msgid "%s: can't create directory: %s\n"
+#~ msgstr "%s: dizin oluşturulamıyor: %s\n"
+
+#~ msgid "If you want to use this revoked key anyway, answer \"yes\"."
+#~ msgstr ""
+#~ "Bu yürürlükten kaldırılmış anahtarı yine de kullanmak istiyorsanız\n"
+#~ "cevap olarak \"evet\" yazın."
+
 #~ msgid ""
 #~ "Select the algorithm to use.\n"
 #~ "\n"
@@ -6748,9 +6571,17 @@ msgstr "(bu görev için yanlış program kullanmış olabilirsiniz)\n"
 #~ msgid "key %08lX incomplete\n"
 #~ msgstr "anahtar %08lX: içi boş\n"
 
-#, fuzzy
-#~ msgid "quit|quit"
-#~ msgstr "quit"
+#~ msgid "sorry, can't do this in batch mode\n"
+#~ msgstr "pardon, bu betik kipinde yapılamaz\n"
+
+#~ msgid "can't open file: %s\n"
+#~ msgstr "dosya açılamadı: %s\n"
+
+#~ msgid "error: missing colon\n"
+#~ msgstr "hata: \":\" eksik\n"
+
+#~ msgid "error: no ownertrust value\n"
+#~ msgstr "hata: hiç sahibiningüvencesi değeri yok\n"
 
 #~ msgid "   (%d) ElGamal (sign and encrypt)\n"
 #~ msgstr "   (%d) ElGamal (imzalamak ve şifrelemek için)\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a23e5aa1b..36f550da8 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,94 +1,98 @@
 # Simplified Chinese(zh-CN) messages for GnuPG
 # Copyright (C) 2002 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gnupg package.
+# This file is distributed under the same license as the PACKAGE package.
 # Meng Jie <[email protected]>, 2004.
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.4.0\n"
+"Project-Id-Version: gnupg 1.4.1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-03-15 16:35+0100\n"
-"PO-Revision-Date: 2004-11-08 21:30+0800\n"
+"POT-Creation-Date: 2005-05-31 10:05+0200\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Chinese\n"
+"X-Poedit-Country: CHINA\n"
+"X-Poedit-SourceCharset: iso-8859-1\n"
+"X-Poedit-Basepath: d:\\msys\\source\\gnupg-1.4.1\n"
 
-#: cipher/primegen.c:120
+#: cipher/primegen.c:121
 #, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr "当 pbits=%u 而 qbits=%u 时不能生成质数\n"
 
-#: cipher/primegen.c:311
+#: cipher/primegen.c:312
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "少于 %d 位时不能生成质数\n"
 
-#: cipher/random.c:163
+#: cipher/random.c:164
 msgid "no entropy gathering module detected\n"
-msgstr "检测不到熵数搜集模块\n"
+msgstr "检测不到熵搜集模块\n"
 
-#: cipher/random.c:387 g10/card-util.c:656 g10/card-util.c:725
-#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2255
-#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
-#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
-#: g10/tdbio.c:600
+#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
+#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
+#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
+#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
+#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/tdbio.c:601
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "无法打开‘%s’： %s\n"
 
-#: cipher/random.c:391
+#: cipher/random.c:392
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "无法获得文件‘%s’的信息： %s\n"
 
-#: cipher/random.c:396
+#: cipher/random.c:397
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
-msgstr "‘%s’不是一个合乎标准的文件――已忽略\n"
+msgstr "‘%s’不是一个普通文件――已忽略\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:402
 msgid "note: random_seed file is empty\n"
 msgstr "注意：随机数种子文件为空\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:408
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "警告：随机数种子文件大小无效――未使用\n"
 
-#: cipher/random.c:415
+#: cipher/random.c:416
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "无法读取‘%s’：%s\n"
 
-#: cipher/random.c:453
+#: cipher/random.c:454
 msgid "note: random_seed file not updated\n"
 msgstr "注意：随机数种子文件未被更新\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2723
-#: g10/keygen.c:2753 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
-#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "无法建立‘%s’：%s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:481
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "无法写入‘%s’：%s\n"
 
-#: cipher/random.c:483
+#: cipher/random.c:484
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "无法关闭‘%s’：%s\n"
 
-#: cipher/random.c:728
+#: cipher/random.c:729
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "警告：正在使用不安全的随机数发生器！！\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:730
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -96,22 +100,22 @@ msgid ""
 "DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n"
 "\n"
 msgstr ""
-"这个随机数字发生器根本就是大杂烩──它根本就不是强有\n"
-"力的随机数发生器！\n"
+"使用这个随机数字发生器纯粹是为了使程序编译通过──它\n"
+"根本就不是真正意义上的强随机数发生器！\n"
 "\n"
-"绝对不要使用这个程序产生的任何数据！！\n"
+"绝对不要在现实世界中使用这个程序产生的任何数据！！\n"
 "\n"
 
-#: cipher/rndegd.c:204
+#: cipher/rndegd.c:205
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
 "of the entropy.\n"
 msgstr ""
-"请稍待片刻，系统此时正在搜集熵数。如果您会觉得无聊的话，不妨做些\n"
-"别的事，实际上这甚至能够让熵数的品质更好。\n"
+"请稍待片刻，系统此时正在搜集熵。如果您觉得无聊的话，不妨做些\n"
+"别的事——事实上这甚至能够让熵数的品质更好。\n"
 
-#: cipher/rndlinux.c:134
+#: cipher/rndlinux.c:135
 #, c-format
 msgid ""
 "\n"
@@ -119,48 +123,65 @@ msgid ""
 "the OS a chance to collect more entropy! (Need %d more bytes)\n"
 msgstr ""
 "\n"
-"随机字节不够多。请再做一些其他的琐事，以使操作系统能搜集到更多的熵数！\n"
+"随机字节不够多。请再做一些其他的琐事，以使操作系统能搜集到更多的熵！\n"
 "(还需要%d字节)\n"
 
-#: g10/app-openpgp.c:547
+#: g10/app-openpgp.c:596
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "无法存储指纹：%s\n"
 
-#: g10/app-openpgp.c:560
+#: g10/app-openpgp.c:609
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "无法存储创建日期：%s\n"
 
-#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
+#: g10/app-openpgp.c:977
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "无法读出密钥\n"
+
+#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+msgid "response does not contain the public key data\n"
+msgstr "响应未包含公钥数据\n"
+
+#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+msgid "response does not contain the RSA modulus\n"
+msgstr "响应未包含 RSA 余数\n"
+
+#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+msgid "response does not contain the RSA public exponent\n"
+msgstr "响应未包含 RSA 公钥指数\n"
+
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN 回调返回错误：%s\n"
 
-#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "CHV%d 的 PIN 太短；最小长度为 %d\n"
 
-#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
-#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
+#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
+#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "验证 CHV%d 失败：%s\n"
 
-#: g10/app-openpgp.c:836
+#: g10/app-openpgp.c:1310
 msgid "access to admin commands is not configured\n"
 msgstr "尚未配置管理员命令的权限\n"
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
 msgid "error retrieving CHV status from card\n"
 msgstr "从卡中获取 CHV 状态时出错\n"
 
-#: g10/app-openpgp.c:857
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
 msgid "card is permanently locked!\n"
 msgstr "卡被永久锁定！\n"
 
-#: g10/app-openpgp.c:862
+#: g10/app-openpgp.c:1336
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "尝试管理员 PIN %d 次后，卡将被永久锁定！\n"
@@ -168,333 +189,337 @@ msgstr "尝试管理员 PIN %d 次后，卡将被永久锁定！\n"
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:869
+#: g10/app-openpgp.c:1343
 msgid "|A|Admin PIN"
 msgstr "|A|管理员 PIN"
 
-#: g10/app-openpgp.c:1018
-#, fuzzy
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:1492
 msgid "|AN|New Admin PIN"
-msgstr "|A|新的管理员 PIN"
+msgstr "|AN|新的管理员 PIN"
 
-#: g10/app-openpgp.c:1018
-#, fuzzy
+#: g10/app-openpgp.c:1492
 msgid "|N|New PIN"
 msgstr "新的 PIN"
 
-#: g10/app-openpgp.c:1022
+#: g10/app-openpgp.c:1496
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "获取新 PIN 时出错：%s\n"
 
-#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
+#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
 msgid "error reading application data\n"
 msgstr "读取应用程序数据时出错\n"
 
-#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
+#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
 msgid "error reading fingerprint DO\n"
 msgstr "读取指纹 D0 出错\n"
 
-#: g10/app-openpgp.c:1104
+#: g10/app-openpgp.c:1562
 msgid "key already exists\n"
 msgstr "密钥已存在\n"
 
-#: g10/app-openpgp.c:1108
+#: g10/app-openpgp.c:1566
 msgid "existing key will be replaced\n"
 msgstr "现有的密钥将被替换\n"
 
-#: g10/app-openpgp.c:1110
+#: g10/app-openpgp.c:1568
 msgid "generating new key\n"
 msgstr "生成新密钥\n"
 
-#: g10/app-openpgp.c:1120
+#: g10/app-openpgp.c:1735
+msgid "creation timestamp missing\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1742
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1749
+#, fuzzy, c-format
+msgid "RSA public exponent missing or largerr than %d bits\n"
+msgstr "公钥指数太大(超过 32 位)\n"
+
+#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1827
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "无法存储密钥：%s\n"
+
+#: g10/app-openpgp.c:1886
 msgid "please wait while key is being generated ...\n"
 msgstr "请稍候，正在生成密钥……\n"
 
-#: g10/app-openpgp.c:1135
+#: g10/app-openpgp.c:1901
 msgid "generating key failed\n"
 msgstr "生成密钥失败\n"
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1904
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "密钥已生成(耗时 %d 秒)\n"
 
-#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
-msgid "response does not contain the public key data\n"
-msgstr "响应未包含公钥数据\n"
-
-#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
-msgid "response does not contain the RSA modulus\n"
-msgstr "响应未包含 RSA 余数\n"
-
-#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
-msgid "response does not contain the RSA public exponent\n"
-msgstr "响应未包含 RSA 公共指数\n"
-
-#: g10/app-openpgp.c:1195
+#: g10/app-openpgp.c:1961
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "无效的 OpenPGP 卡结构(D0 0x93)\n"
 
-#: g10/app-openpgp.c:1356
+#: g10/app-openpgp.c:2130
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "目前已创建的签字：%lu\n"
 
-#: g10/app-openpgp.c:1364
-#, c-format
-msgid "PIN [sigs done: %lu]"
+#: g10/app-openpgp.c:2138
+#, fuzzy, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "PIN [完成签字：%lu]"
 
-#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
+#: g10/app-openpgp.c:2399
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "不能存取 %s――无效的 OpenPGP 卡？\n"
 
-#: g10/app-openpgp.c:1731
-#, c-format
-msgid "error getting serial number: %s\n"
-msgstr "取得序列号时出错：%s\n"
-
-#: g10/app-openpgp.c:1826
-#, c-format
-msgid "failed to store the key: %s\n"
-msgstr "无法存储密钥：%s\n"
-
-#: g10/app-openpgp.c:1868
-msgid "reading the key failed\n"
-msgstr "无法读出密钥\n"
-
-#: g10/armor.c:317
+#: g10/armor.c:318
 #, c-format
 msgid "armor: %s\n"
 msgstr "ASCII 封装：%s\n"
 
-#: g10/armor.c:346
+#: g10/armor.c:347
 msgid "invalid armor header: "
 msgstr "无效的 ASCII 封装头："
 
-#: g10/armor.c:353
+#: g10/armor.c:354
 msgid "armor header: "
 msgstr "ASCII 封装头："
 
-#: g10/armor.c:364
+#: g10/armor.c:365
 msgid "invalid clearsig header\n"
 msgstr "无效的明文签字头\n"
 
-#: g10/armor.c:416
+#: g10/armor.c:417
 msgid "nested clear text signatures\n"
 msgstr "多层明文签字\n"
 
-#: g10/armor.c:551
+#: g10/armor.c:552
 msgid "unexpected armor: "
 msgstr "与预期不符的 ASCII 封装："
 
-#: g10/armor.c:563
+#: g10/armor.c:564
 msgid "invalid dash escaped line: "
 msgstr "以连字符开头的行格式错误："
 
-#: g10/armor.c:715 g10/armor.c:1322
+#: g10/armor.c:716 g10/armor.c:1323
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "跳过无效的 64 进制字符 %02x\n"
 
-#: g10/armor.c:758
+#: g10/armor.c:759
 msgid "premature eof (no CRC)\n"
 msgstr "文件先于预期结束(没有 CRC 部分)\n"
 
-#: g10/armor.c:792
+#: g10/armor.c:793
 msgid "premature eof (in CRC)\n"
 msgstr "文件先于预期结束(CRC 部分未结束)\n"
 
-#: g10/armor.c:800
+#: g10/armor.c:801
 msgid "malformed CRC\n"
 msgstr "异常的 CRC\n"
 
-#: g10/armor.c:804 g10/armor.c:1359
+#: g10/armor.c:805 g10/armor.c:1360
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC 错误：%06lx - %06lx\n"
 
-#: g10/armor.c:824
+#: g10/armor.c:825
 msgid "premature eof (in trailer)\n"
 msgstr "文件先于预期结束(于结尾处)\n"
 
-#: g10/armor.c:828
+#: g10/armor.c:829
 msgid "error in trailer line\n"
 msgstr "结尾行有问题\n"
 
-#: g10/armor.c:1137
+#: g10/armor.c:1138
 msgid "no valid OpenPGP data found.\n"
 msgstr "找不到有效的 OpenPGP 数据。\n"
 
-#: g10/armor.c:1142
+#: g10/armor.c:1143
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "无效的 ASCII 封装：一行超过 %d 字符\n"
 
-#: g10/armor.c:1146
+#: g10/armor.c:1147
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr "封装里出现括上的可打印字符――可能是有缺陷的信件传输程序造成的\n"
 
-#: g10/card-util.c:58 g10/card-util.c:295
+#: g10/card-util.c:63 g10/card-util.c:303
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP 卡不可用：%s\n"
 
-#: g10/card-util.c:63
+#: g10/card-util.c:68
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "检测到 OpenPGP 卡号 %s\n"
 
-#: g10/card-util.c:70 g10/card-util.c:1329 g10/delkey.c:127 g10/keyedit.c:1430
-#: g10/keygen.c:2439 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1510
+#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
 msgid "can't do this in batch mode\n"
 msgstr "在批处理模式中无法完成此操作\n"
 
-#: g10/card-util.c:97 g10/card-util.c:1108 g10/card-util.c:1191
-#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
-#: g10/keygen.c:1365
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
+#: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "您的选择？ "
 
-#: g10/card-util.c:206 g10/card-util.c:256
+#: g10/card-util.c:213 g10/card-util.c:263
 msgid "[not set]"
 msgstr "[未设定]"
 
-#: g10/card-util.c:391
+#: g10/card-util.c:410
 msgid "male"
 msgstr "男性"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 msgid "female"
 msgstr "女性"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 msgid "unspecified"
 msgstr "未定义"
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 msgid "not forced"
 msgstr "可选"
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 msgid "forced"
 msgstr "必须"
 
-#: g10/card-util.c:497
+#: g10/card-util.c:516
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "错误：目前只允许使用 ASCII 字符。\n"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:518
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "错误：不能使用字符“<”。\n"
 
-#: g10/card-util.c:501
+#: g10/card-util.c:520
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "错误：不允许出现两个空格。\n"
 
-#: g10/card-util.c:518
+#: g10/card-util.c:537
 msgid "Cardholder's surname: "
 msgstr "卡持有人的姓："
 
-#: g10/card-util.c:520
+#: g10/card-util.c:539
 msgid "Cardholder's given name: "
 msgstr "卡持有人的名："
 
-#: g10/card-util.c:538
+#: g10/card-util.c:557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "错误：合成的姓名太长(至多 %d 个字符)。\n"
 
-#: g10/card-util.c:559
+#: g10/card-util.c:578
 msgid "URL to retrieve public key: "
 msgstr "获取公钥的 URL："
 
-#: g10/card-util.c:567
+#: g10/card-util.c:586
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "错误：URL 太长(至多 %d 个字符)\n"
 
-#: g10/card-util.c:665 g10/card-util.c:734 g10/import.c:261
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:692
 msgid "Login data (account name): "
 msgstr "登录数据(帐号名)："
 
-#: g10/card-util.c:683
+#: g10/card-util.c:702
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "错误：登录数据太长(至多 %d 个字符)。\n"
 
-#: g10/card-util.c:742
+#: g10/card-util.c:761
 msgid "Private DO data: "
-msgstr ""
+msgstr "个人 DO 数据："
 
-#: g10/card-util.c:752
-#, fuzzy, c-format
+#: g10/card-util.c:771
+#, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
-msgstr "错误：URL 太长(至多 %d 个字符)\n"
+msgstr "错误：个人 DO 太长(至多 %d 个字符)。\n"
 
-#: g10/card-util.c:772
+#: g10/card-util.c:791
 msgid "Language preferences: "
 msgstr "首选语言："
 
-#: g10/card-util.c:780
+#: g10/card-util.c:799
 msgid "Error: invalid length of preference string.\n"
 msgstr "错误：首选项字符串长度无效。\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:808
 msgid "Error: invalid characters in preference string.\n"
 msgstr "错误：首选项字符串里有无效字符。\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:829
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "性别(男性输入 M，女性输入 F，不指定输入空格)："
 
-#: g10/card-util.c:824
+#: g10/card-util.c:843
 msgid "Error: invalid response.\n"
 msgstr "错误：无效的响应。\n"
 
-#: g10/card-util.c:845
+#: g10/card-util.c:864
 msgid "CA fingerprint: "
 msgstr "CA 指纹："
 
-#: g10/card-util.c:868
+#: g10/card-util.c:887
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "错误：指纹格式无效。\n"
 
-#: g10/card-util.c:916
+#: g10/card-util.c:935
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "针对密钥的操作无法实现：%s\n"
 
-#: g10/card-util.c:917
+#: g10/card-util.c:936
 msgid "not an OpenPGP card"
 msgstr "不是一个 OpenPGP 卡"
 
-#: g10/card-util.c:926
+#: g10/card-util.c:945
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "取得当前密钥信息时出错：%s\n"
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1030
 msgid "Replace existing key? (y/N) "
 msgstr "替换已有的密钥？(y/N)"
 
-#: g10/card-util.c:1030 g10/card-util.c:1039
+#: g10/card-util.c:1051 g10/card-util.c:1060
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "是否为加密密钥创建卡外的备份？(Y/n)"
 
-#: g10/card-util.c:1051
+#: g10/card-util.c:1072
 msgid "Replace existing keys? (y/N) "
 msgstr "替换已有的密钥？(y/N)"
 
-#: g10/card-util.c:1060
+#: g10/card-util.c:1081
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -505,124 +530,128 @@ msgstr ""
 "  PIN = ‘%s’    管理员 PIN = ‘%s’\n"
 "您应当使用 --change-pin 命令来更改它们\n"
 
-#: g10/card-util.c:1099
+#: g10/card-util.c:1120
 msgid "Please select the type of key to generate:\n"
 msgstr "请选择您要使用的密钥种类：\n"
 
-#: g10/card-util.c:1101 g10/card-util.c:1182
+#: g10/card-util.c:1122 g10/card-util.c:1203
 msgid "   (1) Signature key\n"
 msgstr "  (1) 签字密钥\n"
 
-#: g10/card-util.c:1102 g10/card-util.c:1184
+#: g10/card-util.c:1123 g10/card-util.c:1205
 msgid "   (2) Encryption key\n"
-msgstr "  (1) 加密密钥\n"
+msgstr "  (2) 加密密钥\n"
 
-#: g10/card-util.c:1103 g10/card-util.c:1186
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
-msgstr "  (1) 认证密钥\n"
+msgstr "  (3) 认证密钥\n"
 
-#: g10/card-util.c:1119 g10/card-util.c:1202 g10/keyedit.c:908
-#: g10/keygen.c:1404 g10/revoke.c:642
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
+#: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "无效的选择。\n"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1200
 msgid "Please select where to store the key:\n"
 msgstr "请选择在哪里存储密钥：\n"
 
-#: g10/card-util.c:1214
+#: g10/card-util.c:1235
 msgid "unknown key protection algorithm\n"
 msgstr "不支持的密钥保护算法\n"
 
-#: g10/card-util.c:1219
+#: g10/card-util.c:1240
 msgid "secret parts of key are not available\n"
 msgstr "私钥部分不可用\n"
 
-#: g10/card-util.c:1224
+#: g10/card-util.c:1245
 msgid "secret key already stored on a card\n"
 msgstr "私钥已存储在卡上\n"
 
-#: g10/card-util.c:1294 g10/keyedit.c:1317
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "离开这个菜单"
 
-#: g10/card-util.c:1296
+#: g10/card-util.c:1318
 msgid "show admin commands"
 msgstr "显示管理员命令"
 
-#: g10/card-util.c:1297 g10/keyedit.c:1320
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "显示这份在线说明"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1321
 msgid "list all available data"
 msgstr "列出所有可用数据"
 
-#: g10/card-util.c:1302
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr "更改卡持有人的姓名"
 
-#: g10/card-util.c:1303
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr "更改获取密钥的 URL"
 
-#: g10/card-util.c:1304
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr "根据卡中指定的 URL 获取密钥"
 
-#: g10/card-util.c:1305
+#: g10/card-util.c:1327
 msgid "change the login name"
 msgstr "更改登录名"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1328
 msgid "change the language preferences"
 msgstr "更改首选语言首选"
 
-#: g10/card-util.c:1307
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr "更改卡持有人的性别"
 
-#: g10/card-util.c:1308
+#: g10/card-util.c:1330
 msgid "change a CA fingerprint"
 msgstr "更改一个 CA 指纹"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr "设定 PIN 签字是否必须"
 
-#: g10/card-util.c:1310
+#: g10/card-util.c:1332
 msgid "generate new keys"
 msgstr "生成新的密钥"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr "更改或解锁 PIN 的菜单"
 
-#: g10/card-util.c:1377 g10/keyedit.c:1526
+#: g10/card-util.c:1334
+msgid "verify the PIN and list all data"
+msgstr ""
+
+#: g10/card-util.c:1454 g10/keyedit.c:1609
 msgid "Command> "
 msgstr "命令> "
 
-#: g10/card-util.c:1412
+#: g10/card-util.c:1492
 msgid "Admin-only command\n"
 msgstr "仅供管理员使用的命令\n"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1523
 msgid "Admin commands are allowed\n"
 msgstr "允许使用管理员命令\n"
 
-#: g10/card-util.c:1430
+#: g10/card-util.c:1525
 msgid "Admin commands are not allowed\n"
 msgstr "不允许使用管理员命令\n"
 
-#: g10/card-util.c:1499 g10/keyedit.c:2104
+#: g10/card-util.c:1599 g10/keyedit.c:2210
 msgid "Invalid command  (try \"help\")\n"
 msgstr "无效的指令(尝试“help”)\n"
 
-#: g10/cardglue.c:287
+#: g10/cardglue.c:396
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr "请插入卡并回车，或输入‘c’来取消："
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:519
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -631,258 +660,256 @@ msgstr ""
 "请取出当前的卡，并插入有下列序列号的卡：\n"
 "  %.*s\n"
 
-#: g10/cardglue.c:380
+#: g10/cardglue.c:527
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "就绪后请回车，或输入‘c’取消"
 
-#: g10/cardglue.c:688
-#, fuzzy
+#: g10/cardglue.c:852
 msgid "Enter New Admin PIN: "
-msgstr "输入管理员 PIN："
+msgstr "输入新的管理员 PIN："
 
-#: g10/cardglue.c:689
-#, fuzzy
+#: g10/cardglue.c:853
 msgid "Enter New PIN: "
-msgstr "输入 PIN："
+msgstr "输入新的 PIN："
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:854
 msgid "Enter Admin PIN: "
 msgstr "输入管理员 PIN："
 
-#: g10/cardglue.c:691
+#: g10/cardglue.c:855
 msgid "Enter PIN: "
 msgstr "输入 PIN："
 
-#: g10/cardglue.c:705
+#: g10/cardglue.c:872
 msgid "Repeat this PIN: "
 msgstr "再次输入此 PIN："
 
-#: g10/cardglue.c:719
+#: g10/cardglue.c:886
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN 再次输入时与首次输入不符；请再试一次"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
-#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "无法打开‘%s’\n"
 
-#: g10/decrypt.c:104 g10/encode.c:859
+#: g10/decrypt.c:105 g10/encode.c:846
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在这个命令中不起作用\n"
 
-#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3167 g10/keyserver.c:1511
-#: g10/revoke.c:226
+#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3346 g10/keyserver.c:1541
+#: g10/revoke.c:227
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "密钥‘%s’找不到：%s\n"
 
-#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2300 g10/keyserver.c:1525
-#: g10/revoke.c:232 g10/revoke.c:439
+#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "读取密钥区块时发生错误：%s\n"
 
-#: g10/delkey.c:128 g10/delkey.c:135
+#: g10/delkey.c:129 g10/delkey.c:136
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(除非您用指纹指定密钥)\n"
 
-#: g10/delkey.c:134
+#: g10/delkey.c:135
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "在批处理模式中，没有“--yes”就无法这么做\n"
 
-#: g10/delkey.c:146
+#: g10/delkey.c:147
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "要从钥匙环里删除这把密钥吗？(y/N)"
 
-#: g10/delkey.c:154
+#: g10/delkey.c:155
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "这是一把私钥！――真的要删除吗？(y/N)"
 
-#: g10/delkey.c:164
+#: g10/delkey.c:165
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "删除密钥区块时失败：%s\n"
 
-#: g10/delkey.c:174
+#: g10/delkey.c:175
 msgid "ownertrust information cleared\n"
 msgstr "信任度信息已被清除\n"
 
-#: g10/delkey.c:205
+#: g10/delkey.c:206
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "公钥“%s”有对应的私钥！\n"
 
-#: g10/delkey.c:207
+#: g10/delkey.c:208
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "请先使用“--delete-secret-keys”选项来删除它。\n"
 
-#: g10/encode.c:210 g10/sign.c:1186
+#: g10/encode.c:211 g10/sign.c:1218
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "生成密码的时候发生错误：%s\n"
 
-#: g10/encode.c:215
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "在此 S2K 模式下无法使用对称的 ESK 包\n"
 
-#: g10/encode.c:228
+#: g10/encode.c:229
 #, c-format
 msgid "using cipher %s\n"
 msgstr "使用对称加密算法 %s\n"
 
-#: g10/encode.c:238 g10/encode.c:558
+#: g10/encode.c:239 g10/encode.c:545
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "‘%s’已被压缩\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
+#: g10/encode.c:302 g10/encode.c:591 g10/sign.c:566
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "警告：‘%s’是一个空文件\n"
 
-#: g10/encode.c:472
+#: g10/encode.c:466
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "在 --pgp2 模式中，您只能使用 2048 位及以下的 RSA 密钥加密\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:488
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "正在从‘%s’读取\n"
 
-#: g10/encode.c:530
+#: g10/encode.c:517
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "您正要用来加密的所有密钥都不能使用 IDEA 算法。\n"
 
-#: g10/encode.c:540
+#: g10/encode.c:527
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "警告：强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:635 g10/sign.c:899
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "警告：强行使用的 %s (%d)压缩算法不在收件者的首选项中\n"
 
-#: g10/encode.c:735
+#: g10/encode.c:722
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
 
-#: g10/encode.c:805 g10/pkclist.c:721 g10/pkclist.c:757
+#: g10/encode.c:792 g10/pkclist.c:722 g10/pkclist.c:758
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "您不该将 %s 用于 %s 模式中\n"
 
-#: g10/encode.c:832
+#: g10/encode.c:819
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s 已经加密给：“%s”\n"
 
-#: g10/encr-data.c:66 g10/mainproc.c:301
+#: g10/encr-data.c:67 g10/mainproc.c:302
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s 加密过的数据\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:305
+#: g10/encr-data.c:69 g10/mainproc.c:306
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "以未知的算法 %d 加密\n"
 
-#: g10/encr-data.c:92
+#: g10/encr-data.c:93
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "警告：报文被使用对称加密算法的弱密钥加密。\n"
 
-#: g10/encr-data.c:103
+#: g10/encr-data.c:104
 msgid "problem handling encrypted packet\n"
 msgstr "处理加密包有问题\n"
 
-#: g10/exec.c:48
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "不支持远程调用\n"
 
-#: g10/exec.c:184 g10/openfile.c:406
+#: g10/exec.c:173 g10/openfile.c:410
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "无法建立目录‘%s’：%s\n"
 
-#: g10/exec.c:325
+#: g10/exec.c:314
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr "由于配置文件权限不安全，外部程序调用被禁用\n"
 
-#: g10/exec.c:355
+#: g10/exec.c:344
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr "在这个操作平台上调用外部程序时需要临时文件\n"
 
-#: g10/exec.c:433
+#: g10/exec.c:422
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "无法执行程序‘%s’：%s\n"
 
-#: g10/exec.c:436
+#: g10/exec.c:425
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "无法在命令解释环境中执行‘%s’：%s\n"
 
-#: g10/exec.c:521
+#: g10/exec.c:510
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "调用外部程序时发生系统错误：%s\n"
 
-#: g10/exec.c:532 g10/exec.c:598
+#: g10/exec.c:521 g10/exec.c:587
 msgid "unnatural exit of external program\n"
 msgstr "外部程序异常退出\n"
 
-#: g10/exec.c:547
+#: g10/exec.c:536
 msgid "unable to execute external program\n"
 msgstr "无法执行外部程序\n"
 
-#: g10/exec.c:563
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "无法读取外部程序响应：%s\n"
 
-#: g10/exec.c:609 g10/exec.c:616
+#: g10/exec.c:598 g10/exec.c:605
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "警告：无法删除临时文件(%s)‘%s’：%s\n"
 
-#: g10/exec.c:621
+#: g10/exec.c:610
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "警告：无法删除临时目录‘%s’：%s\n"
 
-#: g10/export.c:183
+#: g10/export.c:184
 msgid "exporting secret keys not allowed\n"
 msgstr "不允许导出私钥\n"
 
-#: g10/export.c:212
+#: g10/export.c:213
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "密钥 %s：未被保护――已跳过\n"
 
-#: g10/export.c:220
+#: g10/export.c:221
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "密钥 %s：PGP 2.x 样式的密钥――已跳过\n"
 
 #  I hope this warning doesn't confuse people.
-#: g10/export.c:395
+#: g10/export.c:398
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "警告：私钥 %s 不存在简单 SK 检验和\n"
 
-#: g10/export.c:427
+#: g10/export.c:430
 msgid "WARNING: nothing exported\n"
 msgstr "警告：没有导出任何东西\n"
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid ""
 "@Commands:\n"
 " "
@@ -890,127 +917,127 @@ msgstr ""
 "@指令：\n"
 " "
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "|[file]|make a signature"
 msgstr "|[文件名]|生成一份签字"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "|[file]|make a clear text signature"
 msgstr "|[文件名]|生成一份明文签字"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "make a detached signature"
 msgstr "生成一份分离的签字"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encrypt data"
 msgstr "加密数据"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "encryption only with symmetric cipher"
 msgstr "仅使用对称加密"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "decrypt data (default)"
 msgstr "解密数据(默认)"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "verify a signature"
 msgstr "验证签字"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys"
 msgstr "列出密钥"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and signatures"
 msgstr "列出密钥和签字"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 msgid "list and check key signatures"
 msgstr "列出并检查密钥签字"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "list keys and fingerprints"
 msgstr "列出密钥和指纹"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "list secret keys"
 msgstr "列出私钥"
 
-#: g10/g10.c:379
+#: g10/g10.c:381
 msgid "generate a new key pair"
 msgstr "生成一副新的密钥对"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the public keyring"
 msgstr "从公钥钥匙环里删除密钥"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "remove keys from the secret keyring"
 msgstr "从私钥钥匙环里删除密钥"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign a key"
 msgstr "为某把密钥添加签字"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "sign a key locally"
 msgstr "为某把密钥添加本地签字"
 
-#: g10/g10.c:385
+#: g10/g10.c:387
 msgid "sign or edit a key"
 msgstr "编辑某把密钥或为其添加签字"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "generate a revocation certificate"
 msgstr "生成一份吊销证书"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "export keys"
 msgstr "导出密钥"
 
-#: g10/g10.c:389
+#: g10/g10.c:391
 msgid "export keys to a key server"
 msgstr "把密钥导出到某个公钥服务器上"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "import keys from a key server"
 msgstr "从公钥服务器上导入密钥"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "search for keys on a key server"
 msgstr "在公钥服务器上搜寻密钥"
 
-#: g10/g10.c:394
+#: g10/g10.c:396
 msgid "update all keys from a keyserver"
 msgstr "从公钥服务器更新所有的本地密钥"
 
-#: g10/g10.c:397
+#: g10/g10.c:399
 msgid "import/merge keys"
 msgstr "导入/合并密钥"
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "print the card status"
 msgstr "打印卡状态"
 
-#: g10/g10.c:401
+#: g10/g10.c:403
 msgid "change data on a card"
 msgstr "更改卡上的数据"
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "change a card's PIN"
 msgstr "更改卡的 PIN"
 
-#: g10/g10.c:410
+#: g10/g10.c:412
 msgid "update the trust database"
 msgstr "更新信任度数据库"
 
-#: g10/g10.c:417
+#: g10/g10.c:419
 msgid "|algo [files]|print message digests"
 msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
 
-#: g10/g10.c:421 g10/gpgv.c:66
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1020,51 +1047,51 @@ msgstr ""
 "选项：\n"
 " "
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "create ascii armored output"
 msgstr "输出经 ASCII 封装"
 
-#: g10/g10.c:425
+#: g10/g10.c:427
 msgid "|NAME|encrypt for NAME"
 msgstr "|某甲|为收件者“某甲”加密"
 
-#: g10/g10.c:436
+#: g10/g10.c:438
 msgid "use this user-id to sign or decrypt"
 msgstr "使用这个用户标识来签字或解密"
 
-#: g10/g10.c:437
+#: g10/g10.c:439
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|设定压缩等级为 N (0 表示不压缩)"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "use canonical text mode"
 msgstr "使用标准的文本模式"
 
-#: g10/g10.c:452
+#: g10/g10.c:458
 msgid "use as output file"
 msgstr "指定输出文件"
 
-#: g10/g10.c:454 g10/gpgv.c:68
+#: g10/g10.c:460 g10/gpgv.c:73
 msgid "verbose"
 msgstr "详细模式"
 
-#: g10/g10.c:465
+#: g10/g10.c:471
 msgid "do not make any changes"
 msgstr "不做任何改变"
 
-#: g10/g10.c:466
+#: g10/g10.c:472
 msgid "prompt before overwriting"
 msgstr "覆盖前先询问"
 
-#: g10/g10.c:507
+#: g10/g10.c:513
 msgid "use strict OpenPGP behavior"
 msgstr "行为严格遵循 OpenPGP 定义"
 
-#: g10/g10.c:508
+#: g10/g10.c:514
 msgid "generate PGP 2.x compatible messages"
 msgstr "生成与 PGP 2.x 兼容的报文"
 
-#: g10/g10.c:536
+#: g10/g10.c:542
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1072,7 +1099,7 @@ msgstr ""
 "@\n"
 "(请参考在线说明以获得所有命令和选项的完整清单)\n"
 
-#: g10/g10.c:539
+#: g10/g10.c:545
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1092,17 +1119,17 @@ msgstr ""
 " --list-keys [某甲]           显示密钥\n"
 " --fingerprint [某甲]         显示指纹\n"
 
-#: g10/g10.c:720 g10/gpgv.c:93
+#: g10/g10.c:724 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "请向 <[email protected]> 报告程序缺陷。\n"
 "请向 <[email protected]> 反映简体中文翻译的问题。\n"
 
-#: g10/g10.c:737
+#: g10/g10.c:741
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: g10/g10.c:740
+#: g10/g10.c:744
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1112,7 +1139,7 @@ msgstr ""
 "签字、检查、加密或解密\n"
 "默认的操作依输入数据而定\n"
 
-#: g10/g10.c:751
+#: g10/g10.c:755
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1120,522 +1147,537 @@ msgstr ""
 "\n"
 "支持的算法：\n"
 
-#: g10/g10.c:754
+#: g10/g10.c:758
 msgid "Pubkey: "
 msgstr "公钥："
 
-#: g10/g10.c:760 g10/keyedit.c:2141
+#: g10/g10.c:764 g10/keyedit.c:2248
 msgid "Cipher: "
 msgstr "对称加密："
 
-#: g10/g10.c:766
+#: g10/g10.c:770
 msgid "Hash: "
 msgstr "散列："
 
-#: g10/g10.c:772 g10/keyedit.c:2187
+#: g10/g10.c:776 g10/keyedit.c:2294
 msgid "Compression: "
 msgstr "压缩："
 
-#: g10/g10.c:855
+#: g10/g10.c:859
 msgid "usage: gpg [options] "
 msgstr "用法：gpg [选项] "
 
-#: g10/g10.c:1003
+#: g10/g10.c:1007
 msgid "conflicting commands\n"
 msgstr "冲突的指令\n"
 
-#: g10/g10.c:1021
+#: g10/g10.c:1025
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "在‘%s’组定义里找不到等号(=)\n"
 
-#: g10/g10.c:1218
+#: g10/g10.c:1222
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’所有权不安全\n"
 
-#: g10/g10.c:1221
+#: g10/g10.c:1225
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’所有权不安全\n"
 
-#: g10/g10.c:1224
+#: g10/g10.c:1228
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’所有权不安全\n"
 
-#: g10/g10.c:1230
+#: g10/g10.c:1234
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’权限不安全\n"
 
-#: g10/g10.c:1233
+#: g10/g10.c:1237
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’权限不安全\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1240
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’权限不安全\n"
 
-#: g10/g10.c:1242
+#: g10/g10.c:1246
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’的关闭目录所有权不安全\n"
 
-#: g10/g10.c:1245
+#: g10/g10.c:1249
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’的关闭目录所有权不安全\n"
 
-#: g10/g10.c:1248
+#: g10/g10.c:1252
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’的关闭目录所有权不安全\n"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1258
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’的关闭目录权限不安全\n"
 
-#: g10/g10.c:1257
+#: g10/g10.c:1261
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’的关闭目录权限不安全\n"
 
-#: g10/g10.c:1260
+#: g10/g10.c:1264
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’的关闭目录权限不安全\n"
 
-#: g10/g10.c:1401
+#: g10/g10.c:1405
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "未知的配置项‘%s’\n"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1802
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "注意：旧式的默认配置文件‘%s’已被忽略\n"
 
-#: g10/g10.c:1838
+#: g10/g10.c:1844
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "注意：没有默认配置文件‘%s’\n"
 
-#: g10/g10.c:1842
+#: g10/g10.c:1848
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "配置文件‘%s’：%s\n"
 
-#: g10/g10.c:1849
+#: g10/g10.c:1855
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "从‘%s’读取选项\n"
 
-#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "注意：一般情况下不会用到 %s！\n"
 
-#: g10/g10.c:2076
+#: g10/g10.c:2082
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "对称加算密法扩展模块‘%s’因为权限不安全而未被载入\n"
 
-#: g10/g10.c:2293
+#: g10/g10.c:2236 g10/g10.c:2248
+#, fuzzy, c-format
+msgid "`%s' is not a valid signature expiration\n"
+msgstr "‘%s’不是一个有效的字符集\n"
+
+#: g10/g10.c:2321
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "‘%s’不是一个有效的字符集\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3683
+#: g10/g10.c:2340 g10/keyedit.c:3862
 msgid "could not parse keyserver URL\n"
 msgstr "无法解析公钥服务器 URL\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2346
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s：%d：无效的公钥服务器选项\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2349
 msgid "invalid keyserver options\n"
 msgstr "无效的公钥服务器选项\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2356
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s：%d：无效的导入选项\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2359
 msgid "invalid import options\n"
 msgstr "无效的导入选项\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2366
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s：%d：无效的导出选项\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2369
 msgid "invalid export options\n"
 msgstr "无效的导出选项\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2376
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s：%d：无效的列表选项\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2379
 msgid "invalid list options\n"
 msgstr "无效的列表选项\n"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2401
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s：%d：无效的校验选项\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2404
 msgid "invalid verify options\n"
 msgstr "无效的校验选项\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2411
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "无法把运行路径设成 %s\n"
 
-#: g10/g10.c:2573
+#: g10/g10.c:2602
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告：程序可能会创建核心内存转储！\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2606
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告：%s 会使得 %s 失效\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2615
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不可与 %s 并用\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2618
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 与 %s 并用无意义！\n"
 
-#: g10/g10.c:2603
+#: g10/g10.c:2625
 #, fuzzy, c-format
+msgid "NOTE: %s is not available in this version\n"
+msgstr "gpg-agent 在此次舍话中无法使用\n"
+
+#: g10/g10.c:2640
+#, c-format
 msgid "will not run with insecure memory due to %s\n"
-msgstr "向‘%s’写入私钥占位符\n"
+msgstr "不会在内存不安全的情况下运行，原因是 %s\n"
 
-#: g10/g10.c:2617
+#: g10/g10.c:2654
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "您只有在 --pgp2 模式下才能做分离式或明文签字\n"
 
-#: g10/g10.c:2623
+#: g10/g10.c:2660
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "您在 --pgp2 模式下时，不能同时签字和加密\n"
 
-#: g10/g10.c:2629
+#: g10/g10.c:2666
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "启用 --pgp2 时您应该只使用文件，而非管道\n"
 
-#: g10/g10.c:2642
+#: g10/g10.c:2679
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
 
-#: g10/g10.c:2712 g10/g10.c:2736
+#: g10/g10.c:2746 g10/g10.c:2770
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所选的对称加密算法无效\n"
 
-#: g10/g10.c:2718 g10/g10.c:2742
+#: g10/g10.c:2752 g10/g10.c:2776
 msgid "selected digest algorithm is invalid\n"
 msgstr "所选的散列算法无效\n"
 
-#: g10/g10.c:2724
+#: g10/g10.c:2758
 msgid "selected compression algorithm is invalid\n"
 msgstr "所选的压缩算法无效\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2764
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所选的证书散列算法无效\n"
 
-#: g10/g10.c:2745
+#: g10/g10.c:2779
 msgid "completes-needed must be greater than 0\n"
 msgstr "需要的完全可信签字数一定要大于 0\n"
 
-#: g10/g10.c:2747
+#: g10/g10.c:2781
 msgid "marginals-needed must be greater than 1\n"
 msgstr "需要的勉强可信签字数一定要大于 1\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2783
 msgid "max-cert-depth must be in the range from 1 to 255\n"
-msgstr "最大认证深度一定要介于 1 和 255 之间\n"
+msgstr "最大验证深度一定要介于 1 和 255 之间\n"
 
-#: g10/g10.c:2751
+#: g10/g10.c:2785
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "无效的默认验证级别；一定要是 0，1，2 或 3\n"
 
-#: g10/g10.c:2753
+#: g10/g10.c:2787
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "无效的最小验证级别；一定要是 1，2 或 3\n"
 
-#: g10/g10.c:2756
+#: g10/g10.c:2790
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "注意：强烈不建议使用简单的 S2K 模式(0)\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2794
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "无效的 S2K 模式；必须是 0，1 或 3\n"
 
-#: g10/g10.c:2767
+#: g10/g10.c:2801
 msgid "invalid default preferences\n"
 msgstr "无效的默认首选项\n"
 
-#: g10/g10.c:2776
+#: g10/g10.c:2810
 msgid "invalid personal cipher preferences\n"
 msgstr "无效的个人对称加密算法首选项\n"
 
-#: g10/g10.c:2780
+#: g10/g10.c:2814
 msgid "invalid personal digest preferences\n"
 msgstr "无效的个人散列算法首选项\n"
 
-#: g10/g10.c:2784
+#: g10/g10.c:2818
 msgid "invalid personal compress preferences\n"
 msgstr "无效的个人压缩算法首选项\n"
 
-#: g10/g10.c:2817
+#: g10/g10.c:2851
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 尚不能和 %s 并用\n"
 
-#: g10/g10.c:2864
+#: g10/g10.c:2898
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n"
 
-#: g10/g10.c:2869
+#: g10/g10.c:2903
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’散列算法\n"
 
-#: g10/g10.c:2874
+#: g10/g10.c:2908
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n"
 
-#: g10/g10.c:2970
+#: g10/g10.c:3004
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "初始化信任度数据库失败：%s\n"
 
-#: g10/g10.c:2981
+#: g10/g10.c:3015
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告：给定了收件人(-r)但并未使用公钥加密\n"
 
-#: g10/g10.c:2992
+#: g10/g10.c:3026
 msgid "--store [filename]"
 msgstr "--store [文件名]"
 
-#: g10/g10.c:2999
+#: g10/g10.c:3033
 msgid "--symmetric [filename]"
 msgstr "--symmetric [文件名]"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3035
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "对称加密‘%s’失败：%s\n"
 
-#: g10/g10.c:3011
+#: g10/g10.c:3045
 msgid "--encrypt [filename]"
 msgstr "--encrypt [文件名]"
 
-#: g10/g10.c:3024
+#: g10/g10.c:3058
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [文件名]"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3060
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/g10.c:3029
+#: g10/g10.c:3063
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
 
-#: g10/g10.c:3047
+#: g10/g10.c:3081
 msgid "--sign [filename]"
 msgstr "--sign [文件名]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3094
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [文件名]"
 
-#: g10/g10.c:3075
+#: g10/g10.c:3109
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [文件名]"
 
-#: g10/g10.c:3077
+#: g10/g10.c:3111
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/g10.c:3080
+#: g10/g10.c:3114
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
 
-#: g10/g10.c:3100
+#: g10/g10.c:3134
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [文件名]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3143
 msgid "--clearsign [filename]"
 msgstr "--clearsign [文件名]"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3168
 msgid "--decrypt [filename]"
 msgstr "--decrypt [文件名]"
 
-#: g10/g10.c:3142
+#: g10/g10.c:3176
 msgid "--sign-key user-id"
 msgstr "--sign-key 用户标识"
 
-#: g10/g10.c:3146
+#: g10/g10.c:3180
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 用户标识"
 
-#: g10/g10.c:3167
+#: g10/g10.c:3201
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 用户标识 [指令]"
 
-#: g10/g10.c:3238
+#: g10/g10.c:3272
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [用户标识] [钥匙环]"
 
-#: g10/g10.c:3275
+#: g10/g10.c:3309
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "上传至公钥服务器失败：%s\n"
 
-#: g10/g10.c:3277
+#: g10/g10.c:3311
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "从公钥服务器接收失败：%s\n"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3313
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "导出密钥失败：%s\n"
 
-#: g10/g10.c:3290
+#: g10/g10.c:3324
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "搜寻公钥服务器失败：%s\n"
 
-#: g10/g10.c:3300
+#: g10/g10.c:3334
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "从公钥服务器更新失败：%s\n"
 
-#: g10/g10.c:3341
+#: g10/g10.c:3375
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解开 ASCII 封装失败：%s\n"
 
-#: g10/g10.c:3349
+#: g10/g10.c:3383
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "进行 ASCII 封装失败：%s\n"
 
-#: g10/g10.c:3436
+#: g10/g10.c:3470
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "无效的‘%s’散列算法\n"
 
-#: g10/g10.c:3559
+#: g10/g10.c:3593
 msgid "[filename]"
 msgstr "[文件名]"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3597
 msgid "Go ahead and type your message ...\n"
 msgstr "请开始键入您的报文……\n"
 
-#: g10/g10.c:3853
+#: g10/g10.c:3887
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr "标记名称必须只含有可打印的字符或空格，并以一个“=”来结尾\n"
 
-#: g10/g10.c:3861
+#: g10/g10.c:3895
 msgid "a user notation name must contain the '@' character\n"
 msgstr "用户标记名称一定要含有“@”字符\n"
 
-#: g10/g10.c:3871
+#: g10/g10.c:3900
+#, fuzzy
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr "用户标记名称一定要含有“@”字符\n"
+
+#: g10/g10.c:3911
 msgid "a notation value must not use any control characters\n"
 msgstr "标记值一定不能使用任何的控制字符\n"
 
-#: g10/g10.c:3905
+#: g10/g10.c:3945
 msgid "the given certification policy URL is invalid\n"
 msgstr "给定的的验证策略 URL 无效\n"
 
-#: g10/g10.c:3907
+#: g10/g10.c:3947
 msgid "the given signature policy URL is invalid\n"
 msgstr "给定的签字策略 URL 无效\n"
 
-#: g10/g10.c:3940
+#: g10/g10.c:3980
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "给定的首选公钥服务器 URL 无效\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk 缓存里项目太多――已禁用\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2750
+#: g10/getkey.c:187 g10/getkey.c:2757
 msgid "[User ID not found]"
 msgstr "[找不到用户标识]"
 
-#: g10/getkey.c:1677
+#: g10/getkey.c:1684
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uid 使无效密钥 %s 生效\n"
 
-#: g10/getkey.c:2228
+#: g10/getkey.c:2235
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "公钥 %s 没有相对应的私钥――忽略\n"
 
-#: g10/getkey.c:2459
-#, fuzzy, c-format
+#: g10/getkey.c:2466
+#, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "使用子钥 %s 而非主钥 %s\n"
 
-#: g10/getkey.c:2506
+#: g10/getkey.c:2513
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "密钥 %s：无相应公钥的私钥――已跳过\n"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:74
 msgid "be somewhat more quiet"
 msgstr "尽量减少提示信息"
 
-#: g10/gpgv.c:70
+#: g10/gpgv.c:75
 msgid "take the keys from this keyring"
 msgstr "从这个钥匙环里取用密钥"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:77
 msgid "make timestamp conflicts only a warning"
 msgstr "把时间戳矛盾仅视为警告"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:78
 msgid "|FD|write status info to this FD"
 msgstr "|FD|把状态信息写入文件描述符 FD"
 
-#: g10/gpgv.c:97
+#: g10/gpgv.c:102
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "用法：gpgv [选项] [文件] (用 -h 求助)"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:105
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1643,7 +1685,7 @@ msgstr ""
 "语法：gpg [选项] [文件]\n"
 "用已知的受信任密钥来检查签字\n"
 
-#: g10/helptext.c:48
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1652,7 +1694,7 @@ msgstr ""
 "在这里指定的数值完全由您自己决定；这些数值永远不会被输出给任何第三方。\n"
 "我们需要它来实现“信任网络”；这跟隐含建立起来的“验证网络”无关。"
 
-#: g10/helptext.c:54
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1662,16 +1704,16 @@ msgstr ""
 "要建立起信任网络，GnuPG 需要知道哪些密钥是可绝对信任的――通常\n"
 "就是您拥有私钥的那些密钥。回答“yes”将此密钥设成可绝对信任的\n"
 
-#: g10/helptext.c:61
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "如果您无论如何要使用这把未被信任的密钥，请回答“yes”。"
 
-#: g10/helptext.c:65
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "输入您要递送的报文的接收者的用户标识。"
 
-#: g10/helptext.c:69
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1694,7 +1736,7 @@ msgstr ""
 "\n"
 "第一把密钥(主钥)必须具有签字的能力。"
 
-#: g10/helptext.c:83
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -1703,16 +1745,16 @@ msgstr ""
 "通常来说用同一把密钥签字及加密并不是个好主意。这个算法只在特定的情况\n"
 "下使用。请先咨询安全方面的专家。"
 
-#: g10/helptext.c:90
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "请输入密钥的尺寸"
 
-#: g10/helptext.c:94 g10/helptext.c:99 g10/helptext.c:111 g10/helptext.c:143
-#: g10/helptext.c:171 g10/helptext.c:176 g10/helptext.c:181
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "请回答“yes”或“no”"
 
-#: g10/helptext.c:104
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1720,22 +1762,22 @@ msgid ""
 "the given value as an interval."
 msgstr ""
 "请输入提示所要求的数值。\n"
-"您可以输入 ISO 日期格式(YYYY-MM-DD)，但是出错时您不会得到友好的响应――\n"
-"系统会尝试将给定值解释为时间间隔。"
+"您可以输入 ISO 日期格式(YYYY-MM-DD)，但是出错时您不会得到友好的响应\n"
+"――系统会尝试将给定值解释为时间间隔。"
 
-#: g10/helptext.c:116
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "请输入密钥持有人的名字"
 
-#: g10/helptext.c:121
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr "请输入电子邮件地址(可选项，但强烈推荐使用)"
 
-#: g10/helptext.c:125
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "请输入注释(可选项)"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1749,11 +1791,11 @@ msgstr ""
 "O  继续产生密钥。\n"
 "Q  中止产生密钥。"
 
-#: g10/helptext.c:139
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "如果您允许生成子钥，请回答“yes”(或者“y”)。"
 
-#: g10/helptext.c:147
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -1815,11 +1857,11 @@ msgstr ""
 "\n"
 "如果您不知道应该选什么答案的话，就选“0”。"
 
-#: g10/helptext.c:185
+#: g10/helptext.c:186
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "如果您想要为所有用户标识签字的话就选“yes”"
 
-#: g10/helptext.c:189
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -1827,11 +1869,11 @@ msgstr ""
 "如果您真的想要删除这个用户标识的话就回答“yes”。\n"
 "所有相关认证在此之后也会丢失！"
 
-#: g10/helptext.c:194
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "如果可以删除这把子钥，请回答“yes”"
 
-#: g10/helptext.c:199
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -1841,7 +1883,7 @@ msgstr ""
 "因为要与这把密钥或拥有这把密钥的签字的密钥建立认证关系可能\n"
 "相当重要。"
 
-#: g10/helptext.c:204
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -1852,13 +1894,13 @@ msgstr ""
 "直到您知道此签字使用了哪一把密钥；因为用来签字的密钥可能与\n"
 "其他已经验证的密钥存在信任关系。"
 
-#: g10/helptext.c:210
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "这份签字无效。应当把它从您的钥匙环里删除。"
 
-#: g10/helptext.c:214
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -1871,32 +1913,32 @@ msgstr ""
 "只有在这把密钥的第一个自身签字因某些原因失效，而有第二个自身签\n"
 "字可用的情况下才这么做。"
 
-#: g10/helptext.c:222
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
 "self-signatures will be advanced by one second.\n"
 msgstr ""
-"用现有的首选项更新所有(或被选取的)用户标识的首选项。所有受影响的自身签\n"
+"用现有的首选项更新所有(或选定的)用户标识的首选项。所有受影响的自身签\n"
 "字的时间戳都会增加一秒钟。\n"
 
-#: g10/helptext.c:229
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "请输入密码：这是一个秘密的句子 \n"
 
-#: g10/helptext.c:235
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "请再次输入上次的密码，以确定您到底键入了些什么。"
 
-#: g10/helptext.c:239
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "请给定要添加签字的文件名"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "如果可以覆盖这个文件，请回答“yes”"
 
-#: g10/helptext.c:249
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -1904,7 +1946,7 @@ msgstr ""
 "请输入一个新的文件名。如果您直接按下了回车，那么就会使用显示在括\n"
 "号中的默认的文件名。"
 
-#: g10/helptext.c:255
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -1931,7 +1973,7 @@ msgstr ""
 "      如果这个用户标识不再被使用了，请选此项；这通常用表明某个电子邮\n"
 "      件地址已不再有效。\n"
 
-#: g10/helptext.c:271
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -1941,332 +1983,332 @@ msgstr ""
 "字简明扼要。\n"
 "键入一空行以结束输入。\n"
 
-#: g10/helptext.c:286
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "没有可用的帮助"
 
-#: g10/helptext.c:294
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "‘%s’没有可用的帮助"
 
-#: g10/import.c:247
+#: g10/import.c:248
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "跳过 %d 样式的区块\n"
 
-#: g10/import.c:256
+#: g10/import.c:257
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "目前已处理 %lu 把密钥\n"
 
-#: g10/import.c:273
+#: g10/import.c:274
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "合计被处理的数量：%lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "  已跳过的新密钥：%lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:279
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "    遗失用户标识：%lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "              imported: %lu"
 msgstr "          已导入：%lu"
 
-#: g10/import.c:286
+#: g10/import.c:287
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "          未改变：%lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      新用户标识：%lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "        新的子钥：%lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        新的签字：%lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "    新的密钥吊销：%lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      读取的私钥：%lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "      导入的私钥：%lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "    未改变的私钥：%lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "        未被导入：%lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:544
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr "警告：密钥 %s 下列用户标识的首选项中包含不可用的\n"
 
-#: g10/import.c:545
+#: g10/import.c:546
 msgid "algorithms on these user IDs:\n"
 msgstr "算法：\n"
 
-#: g10/import.c:582
+#: g10/import.c:583
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         “%s”：对称加密算法 %s 对应首选项\n"
 
-#: g10/import.c:594
+#: g10/import.c:595
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         “%s”：散列算法 %s 对应首选项\n"
 
-#: g10/import.c:606
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         “%s”：压缩算法 %s 对应首选项\n"
 
-#: g10/import.c:619
+#: g10/import.c:620
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "强烈建议您更新您的首选项并重新分发这把密钥，\n"
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr "以避免可能的算法不匹配问题\n"
 
-#: g10/import.c:645
+#: g10/import.c:646
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "您可以这样更新您的首选项：gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:694 g10/import.c:1048
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "密钥 %s：没有用户标识\n"
 
-#: g10/import.c:713
+#: g10/import.c:714
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "密钥 %s：PKS 子钥破损已修复\n"
 
-#: g10/import.c:728
+#: g10/import.c:729
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "密钥 %s：已接受不含自身签字的用户标识“%s”\n"
 
-#: g10/import.c:734
+#: g10/import.c:735
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "密钥 %s：没有有效的用户标识\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 msgid "this may be caused by a missing self-signature\n"
 msgstr "这可能由于遗失自身签字所致\n"
 
-#: g10/import.c:746 g10/import.c:1168
+#: g10/import.c:747 g10/import.c:1169
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "密钥 %s：找不到公钥：%s\n"
 
-#: g10/import.c:752
+#: g10/import.c:753
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "密钥 %s：新密钥――已跳过\n"
 
-#: g10/import.c:761
+#: g10/import.c:762
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "找不到可写的钥匙环：%s\n"
 
-#: g10/import.c:766 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "正在写入‘%s’\n"
 
-#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
-#: g10/import.c:2314 g10/import.c:2336
+#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
+#: g10/import.c:2315 g10/import.c:2337
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "写入钥匙环‘%s’时出错： %s\n"
 
-#: g10/import.c:791
+#: g10/import.c:792
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "密钥 %s：公钥“%s”已导入\n"
 
-#: g10/import.c:815
+#: g10/import.c:816
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "密钥 %s：与我们的副本不吻合\n"
 
-#: g10/import.c:832 g10/import.c:1186
+#: g10/import.c:833 g10/import.c:1187
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "密钥 %s：无法定位原始的密钥区块：%s\n"
 
-#: g10/import.c:840 g10/import.c:1193
+#: g10/import.c:841 g10/import.c:1194
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "密钥 %s：无法读取原始的密钥区块： %s\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "密钥 %s：“%s”一个新的用户标识\n"
 
-#: g10/import.c:875
+#: g10/import.c:876
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "密钥 %s：“%s”%d 个新的用户标识\n"
 
-#: g10/import.c:878
+#: g10/import.c:879
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "密钥 %s：“%s”1 个新的签字\n"
 
-#: g10/import.c:881
+#: g10/import.c:882
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "密钥 %s：“%s”%d 个新的签字\n"
 
-#: g10/import.c:884
+#: g10/import.c:885
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "密钥 %s：“%s”1 个新的子钥\n"
 
-#: g10/import.c:887
+#: g10/import.c:888
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "密钥 %s：“%s”%d 个新的子钥\n"
 
-#: g10/import.c:908
+#: g10/import.c:909
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "密钥 %s：“%s”未改变\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1054
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "密钥 %s：私钥使用了无效的加密算法 %d――已跳过\n"
 
-#: g10/import.c:1064
+#: g10/import.c:1065
 msgid "importing secret keys not allowed\n"
 msgstr "不允许导入私钥\n"
 
-#: g10/import.c:1081 g10/import.c:2329
+#: g10/import.c:1082 g10/import.c:2330
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "没有默认的私钥钥匙环： %s\n"
 
-#: g10/import.c:1092
+#: g10/import.c:1093
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "密钥 %s：私钥已导入\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1122
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "密钥 %s：已在私钥钥匙环中\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1132
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "密钥 %s：找不到私钥：%s\n"
 
-#: g10/import.c:1161
+#: g10/import.c:1162
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "密钥 %s：没有公钥――无法应用吊销证书\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1205
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "密钥 %s：无效的吊销证书：%s――已拒绝\n"
 
-#: g10/import.c:1236
+#: g10/import.c:1237
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "密钥 %s：“%s”吊销证书已被导入\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1302
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "密钥 %s：签字没有用户标识\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1317
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "密钥 %s：用户标识“%s”使用了不支持的公钥算法\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "密钥 %s：用户标识“%s”自身签字无效\n"
 
-#: g10/import.c:1336
+#: g10/import.c:1337
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "密钥 %s：没有可供绑定的子钥\n"
 
-#: g10/import.c:1347 g10/import.c:1397
+#: g10/import.c:1348 g10/import.c:1398
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "密钥 %s：不支持的公钥算法\n"
 
-#: g10/import.c:1349
+#: g10/import.c:1350
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "密钥 %s：无效的子钥绑定\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1365
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "密钥 %s：已删除多重子钥绑定\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "密钥 %s：没有用于密钥吊销的子钥\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "密钥 %s：无效的子钥吊销\n"
 
-#: g10/import.c:1414
+#: g10/import.c:1415
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "密钥 %s：已删除多重子钥吊销\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1457
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "密钥 %s：已跳过用户标识“%s”\n"
 
-#: g10/import.c:1477
+#: g10/import.c:1478
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "密钥 %s：已跳过子钥\n"
@@ -2275,136 +2317,138 @@ msgstr "密钥 %s：已跳过子钥\n"
 #  * to import non-exportable signature when we have the
 #  * the secret key used to create this signature - it
 #  * seems that this makes sense
-#: g10/import.c:1504
+#: g10/import.c:1505
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "密钥 %s：不可导出的签字(验证级别 0x%02X)――已跳过\n"
 
-#: g10/import.c:1514
+#: g10/import.c:1515
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "密钥 %s：吊销证书位置错误――已跳过\n"
 
-#: g10/import.c:1531
+#: g10/import.c:1532
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "密钥 %s：无效的吊销证书：%s――已跳过\n"
 
-#: g10/import.c:1545
+#: g10/import.c:1546
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "密钥 %s：子钥签字位置错误――已跳过\n"
 
-#: g10/import.c:1553
+#: g10/import.c:1554
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "密钥 %s：与预期不符的签字验证级别(0x%02X)――已跳过\n"
 
-#: g10/import.c:1574
-#, fuzzy, c-format
+#: g10/import.c:1575
+#, c-format
 msgid "key %s: expired signature from key %s - skipped\n"
-msgstr "密钥 %s：与预期不符的签字验证级别(0x%02X)――已跳过\n"
+msgstr "密钥 %s：来自密钥 %s 的已过期签字――已跳过\n"
 
-#: g10/import.c:1677
+#: g10/import.c:1678
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "密钥 %s：检测到重复的用户标识――已合并\n"
 
-#: g10/import.c:1739
+#: g10/import.c:1740
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "警告：密钥 %s 可能已被吊销：正在取回吊销密钥 %s\n"
 
-#: g10/import.c:1753
+#: g10/import.c:1754
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "警告：密钥 %s 可能已被吊销：吊销密钥 %s 不存在。\n"
 
-#: g10/import.c:1812
+#: g10/import.c:1813
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "密钥 %s：已新增吊销证书“%s”\n"
 
-#: g10/import.c:1846
+#: g10/import.c:1847
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "密钥 %s：已新增直接密钥签字\n"
 
-#: g10/import.c:2235
-#, fuzzy
+#: g10/import.c:2236
 msgid "NOTE: a key's S/N does not match the card's one\n"
-msgstr "公钥与私钥不吻合！\n"
+msgstr "注意：密钥的序列号与卡的不符\n"
 
-#: g10/import.c:2243
-#, fuzzy
+#: g10/import.c:2244
 msgid "NOTE: primary key is online and stored on card\n"
-msgstr "私钥已存储在卡上\n"
+msgstr "注意：主钥在线，存储在卡上\n"
 
-#: g10/import.c:2245
-#, fuzzy
+#: g10/import.c:2246
 msgid "NOTE: secondary key is online and stored on card\n"
-msgstr "私钥已存储在卡上\n"
+msgstr "注意：子钥在线，存储在卡上\n"
 
-#: g10/keydb.c:167
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "建立钥匙环‘%s’时发生错误：%s\n"
 
-#: g10/keydb.c:174
+#: g10/keydb.c:175
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "钥匙环‘%s’已建立\n"
 
-#: g10/keydb.c:685
+#: g10/keydb.c:316 g10/keydb.c:319
+#, fuzzy, c-format
+msgid "keyblock resource `%s': %s\n"
+msgstr "建立‘%s’时发生错误：%s\n"
+
+#: g10/keydb.c:698
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "重新建立钥匙环缓存失败： %s\n"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[吊销]"
 
-#: g10/keyedit.c:255
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[自身签字]"
 
-#: g10/keyedit.c:333 g10/keylist.c:405
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 个损坏的签字\n"
 
-#: g10/keyedit.c:335 g10/keylist.c:407
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d 个损坏的签字\n"
 
-#: g10/keyedit.c:337 g10/keylist.c:409
+#: g10/keyedit.c:344 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "有 1 份签字因为遗失密钥而未被检查\n"
 
-#: g10/keyedit.c:339 g10/keylist.c:411
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "有 %d 份签字因为遗失密钥而未被检查\n"
 
-#: g10/keyedit.c:341 g10/keylist.c:413
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "有 1 份签字因为某个错误而未被检查\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:415
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "有 %d 份签字因为某些错误而未被检查\n"
 
-#: g10/keyedit.c:345
+#: g10/keyedit.c:352
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "检测到 1 个没有有效自身签字的用户标识\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:354
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "检测到 %d 个没有有效自身签字的用户标识\n"
 
-#: g10/keyedit.c:403 g10/pkclist.c:262
+#: g10/keyedit.c:410 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2415,17 +2459,17 @@ msgstr ""
 "查\n"
 "指纹等)？\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:274
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
-msgstr " %d = 我勉强相信\n"
+msgstr "  %d = 我勉强相信\n"
 
-#: g10/keyedit.c:408 g10/pkclist.c:276
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
-msgstr " %d = 我完全相信\n"
+msgstr "  %d = 我完全相信\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:434
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2434,117 +2478,123 @@ msgstr ""
 "请输入这份信任签字的深度。\n"
 "深度若大于 1 则您将签字的这把密钥将可以以您的名义做出信任签字。\n"
 
-#: g10/keyedit.c:443
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "请输入这份签字的限制域，如果没有请按回车。\n"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "用户标识“%s”已被吊销。"
 
-#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
-#: g10/keyedit.c:858 g10/keyedit.c:1642
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1728
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "您仍然想要为它签字吗？(y/N)"
 
-#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
-#: g10/keyedit.c:1648
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
+#: g10/keyedit.c:1734
 msgid "  Unable to sign.\n"
 msgstr "  无法添加签字。\n"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "用户标识“%s”已过期。"
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:650
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "警告：用户标识“%s”不含自身签字。"
 
-#: g10/keyedit.c:676
+#: g10/keyedit.c:678
+#, fuzzy, c-format
+msgid "User ID \"%s\" is signable.  "
+msgstr "警告：用户标识“%s”不含自身签字。"
+
+#: g10/keyedit.c:680
+#, fuzzy
+msgid "Sign it? (y/N) "
+msgstr "真的要签字吗？(y/N)"
+
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
-"“%s”里的自身签字\n"
-"是 PGP 2.x 样式的签字。\n"
+"“%s”的自身签字是 PGP 2.x 样\n"
+"式的签字。\n"
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:711
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "您是否想要将它升级成 OpenPGP 的自身签字？(y/N)"
 
-#: g10/keyedit.c:699
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
-msgstr ""
-"您目前为“%s”的签字\n"
-"已经过期了。\n"
+msgstr "您目前为“%s”的签字已经过期了。\n"
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:729
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "您想要发布一份新的签字来取代已过期的那一个吗？(y/N)"
 
-#: g10/keyedit.c:724
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
-msgstr ""
-"您目前在“%s”的签字\n"
-"是一份本地签字。\n"
+msgstr "您目前为“%s”的签字是一份本地签字。\n"
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:754
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
-msgstr "您是否想要把他升级成可以完全导出的签字？(y/N)"
+msgstr "您是否想要把它升级成可以完全导出的签字？(y/N)"
 
-#: g10/keyedit.c:749
+#: g10/keyedit.c:775
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "“%s”已由密钥 %s 在本地签字\n"
 
-#: g10/keyedit.c:752
+#: g10/keyedit.c:778
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "“%s”已由密钥 %s 签字\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:783
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "您仍然想要为它再次签字吗？(y/N)"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:805
 #, c-format
 msgid "Nothing to sign with key %s\n"
-msgstr "没有东西可以让密钥 %s签字\n"
+msgstr "没有东西可以让密钥 %s 签字\n"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "这把密钥已经过期！"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "这把密钥将在 %s 过期。\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:844
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "您想要让您的签字也同时过期吗？ (Y/n) "
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:882
 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:853
+#: g10/keyedit.c:884
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "这会让这把密钥在 PGP 2.x 模式下不可使用。\n"
 
-#: g10/keyedit.c:878
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2553,32 +2603,31 @@ msgstr ""
 "您是否谨慎地检查过，确认正要签字的密钥的确属于以上它所声称的所有者呢？\n"
 "如果您不知道这个问题的答案，请输入“0”。\n"
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) 我不作答。 %s\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) 我根本没有检查过。 %s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) 我随意检查过。 %s\n"
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) 我非常小心地检查过。 %s\n"
 
-#: g10/keyedit.c:895
-#, fuzzy
+#: g10/keyedit.c:926
 msgid "Your selection? (enter `?' for more information): "
 msgstr "您的选择？(输入‘?’以获得更多的信息)："
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:950
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2587,75 +2636,74 @@ msgstr ""
 "您真的确定要签字这把密钥，使用您的密钥\n"
 "“%s”(%s)\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:957
 msgid "This will be a self-signature.\n"
 msgstr "这将是一个自身签字。\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:963
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "警告：这份签字不会被标记为不可导出。\n"
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:971
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "警告：这份签字不会被标记成不可吊销。\n"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:981
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "这份签字会被标记成不可导出。\n"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:988
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "这份签字会被标记成不可吊销。\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:995
 msgid "I have not checked this key at all.\n"
 msgstr "我根本没有检查过这把密钥。\n"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1000
 msgid "I have checked this key casually.\n"
 msgstr "我随意检查过这把密钥。\n"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1005
 msgid "I have checked this key very carefully.\n"
 msgstr "我非常小心地检查过这把密钥。\n"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1015
 msgid "Really sign? (y/N) "
 msgstr "真的要签字吗？(y/N)"
 
-#: g10/keyedit.c:1029 g10/keyedit.c:4132 g10/keyedit.c:4223 g10/keyedit.c:4287
-#: g10/keyedit.c:4348 g10/sign.c:369
+#: g10/keyedit.c:1060 g10/keyedit.c:4350 g10/keyedit.c:4441 g10/keyedit.c:4505
+#: g10/keyedit.c:4566 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "签字时失败： %s\n"
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
-msgstr ""
+msgstr "只有占位密钥，或者密钥存储在卡上——没有密码可以更改。\n"
 
-#: g10/keyedit.c:1105 g10/keygen.c:3057
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "这把密钥没有被保护。\n"
 
-#: g10/keyedit.c:1109 g10/keygen.c:3045
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主钥的私钥部分无法取用。\n"
 
-#: g10/keyedit.c:1113 g10/keygen.c:3060
-#, fuzzy
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 msgid "Secret parts of primary key are stored on-card.\n"
-msgstr "主钥的私钥部分无法取用。\n"
+msgstr "主钥的私钥部分存储在卡上。\n"
 
-#: g10/keyedit.c:1117 g10/keygen.c:3064
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "密钥受保护。\n"
 
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "无法编辑这把密钥： %s\n"
 
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2663,11 +2711,11 @@ msgstr ""
 "输入要给这把私钥用的新密码。\n"
 "\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:1825
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "密码再次输入时与首次输入不符；请再试一次"
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2675,438 +2723,422 @@ msgstr ""
 "您不想要用密码――这大概是个坏主意！\n"
 "\n"
 
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1195
 msgid "Do you really want to do this? (y/N) "
 msgstr "您真的想要这么做吗？(y/N)"
 
-#: g10/keyedit.c:1235
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "正在把密钥的签字移动到正确的位置去\n"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "保存并离开"
 
-#: g10/keyedit.c:1322
-#, fuzzy
+#: g10/keyedit.c:1354
 msgid "show key fingerprint"
-msgstr "显示指纹"
+msgstr "显示密钥指纹"
 
-#: g10/keyedit.c:1323
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "列出密钥和用户标识"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "选择用户标识 N"
 
-#: g10/keyedit.c:1326
-#, fuzzy
+#: g10/keyedit.c:1358
 msgid "select subkey N"
-msgstr "选择用户标识 N"
+msgstr "选择子钥 N"
 
-#: g10/keyedit.c:1327
-#, fuzzy
+#: g10/keyedit.c:1359
 msgid "check signatures"
-msgstr "吊销签字"
+msgstr "检查签字"
 
-#: g10/keyedit.c:1330
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
-msgstr ""
+msgstr "为所选用户标识添加签字[* 参见下面的相关命令]"
 
-#: g10/keyedit.c:1335
-#, fuzzy
+#: g10/keyedit.c:1367
 msgid "sign selected user IDs locally"
-msgstr "为密钥添加本地签字"
+msgstr "为所选用户标识添加本地签字"
 
-#: g10/keyedit.c:1337
-#, fuzzy
+#: g10/keyedit.c:1369
 msgid "sign selected user IDs with a trust signature"
-msgstr "提示：选择要添加签字的用户标识\n"
+msgstr "为所选用户标识添加信任签字"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
-msgstr ""
+msgstr "为所选用户标识添加不可吊销签字"
 
-#: g10/keyedit.c:1343
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "增加一个用户标识"
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "增加一个照片标识"
 
-#: g10/keyedit.c:1347
-#, fuzzy
+#: g10/keyedit.c:1379
 msgid "delete selected user IDs"
-msgstr "删除一个用户/照片标识"
+msgstr "删除选定的用户标识"
 
-#: g10/keyedit.c:1352
-#, fuzzy
+#: g10/keyedit.c:1384
 msgid "add a subkey"
-msgstr "addkey"
+msgstr "添加一个子钥"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr "在智能卡上添加一把密钥"
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr "将一把密钥移动到智能卡上"
 
-#: g10/keyedit.c:1360
-#, fuzzy
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
-msgstr "将一把密钥移动到智能卡上"
+msgstr "将备份密钥转移到卡上"
 
-#: g10/keyedit.c:1364
-#, fuzzy
+#: g10/keyedit.c:1396
 msgid "delete selected subkeys"
-msgstr "删除一把子钥"
+msgstr "删除选定的子钥"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr "增加一把吊销密钥"
 
-#: g10/keyedit.c:1368
-#, fuzzy
+#: g10/keyedit.c:1400
 msgid "delete signatures from the selected user IDs"
-msgstr "真的要更新被选择用户标识的首选项吗？(y/N)"
+msgstr "删除所选用户标识上的签字"
 
-#: g10/keyedit.c:1370
-#, fuzzy
+#: g10/keyedit.c:1402
 msgid "change the expiration date for the key or selected subkeys"
-msgstr "您不能变更v3密钥的使用期限\n"
+msgstr "变更密钥或所选子钥的使用期限"
 
-#: g10/keyedit.c:1372
-#, fuzzy
+#: g10/keyedit.c:1404
 msgid "flag the selected user ID as primary"
-msgstr "设定首选用户标识"
+msgstr "将所选的用户标识设为首选用户标识"
 
-#: g10/keyedit.c:1374
-#, fuzzy
+#: g10/keyedit.c:1406
 msgid "toggle between the secret and public key listings"
 msgstr "在私钥和公钥清单间切换"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "列出首选项(专家模式)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "列出首选项(详细模式)"
 
-#: g10/keyedit.c:1381
-#, fuzzy
+#: g10/keyedit.c:1413
 msgid "set preference list for the selected user IDs"
-msgstr "真的要更新被选择用户标识的首选项吗？(y/N)"
+msgstr "设定所选用户标识的首选项"
 
-#: g10/keyedit.c:1386
-#, fuzzy
+#: g10/keyedit.c:1418
 msgid "set preferred keyserver URL for the selected user IDs"
-msgstr "设定首选公钥服务器的 URL"
+msgstr "设定所选用户标识的首选公钥服务器的 URL"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "更改密码"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "更改信任度"
 
-#: g10/keyedit.c:1394
-#, fuzzy
+#: g10/keyedit.c:1426
 msgid "revoke signatures on the selected user IDs"
-msgstr "真的要吊销所有被选择的用户标识吗？(y/N)"
+msgstr "吊销所选用户标识上的签字"
 
-#: g10/keyedit.c:1396
-#, fuzzy
+#: g10/keyedit.c:1428
 msgid "revoke selected user IDs"
-msgstr "吊销一个用户标识"
+msgstr "吊销选定的用户标识"
 
-#: g10/keyedit.c:1401
-#, fuzzy
+#: g10/keyedit.c:1433
 msgid "revoke key or selected subkeys"
-msgstr "吊销一把子钥"
+msgstr "吊销密钥或选定的子钥"
 
-#: g10/keyedit.c:1402
-#, fuzzy
+#: g10/keyedit.c:1434
 msgid "enable key"
-msgstr "启用一把密钥"
+msgstr "启用密钥"
 
-#: g10/keyedit.c:1403
-#, fuzzy
+#: g10/keyedit.c:1435
 msgid "disable key"
-msgstr "禁用一把密钥"
+msgstr "禁用密钥"
 
-#: g10/keyedit.c:1404
-#, fuzzy
+#: g10/keyedit.c:1436
 msgid "show selected photo IDs"
-msgstr "显示照片标识"
+msgstr "显示选定的照片标识"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1556
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "读取私钥区块“%s”时出错：%s\n"
 
-#: g10/keyedit.c:1494
+#: g10/keyedit.c:1574
 msgid "Secret key is available.\n"
 msgstr "私钥可用。\n"
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1655
 msgid "Need the secret key to do this.\n"
 msgstr "要有私钥才能这么做。\n"
 
-#: g10/keyedit.c:1579
+#: g10/keyedit.c:1663
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "请先使用“toggle”指令。\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1682
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
 "  a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
+"* ‘sign’命令可以带‘l’前缀(lsign)以添加本地签字，或‘t’前缀(tsign)以添加\n"
+"  信任签字，或‘nr’前缀(nrsign)以添加不可吊销签字，或者以上三种前缀的任何组\n"
+"  合(ltsign、tnrsign 等)。\n"
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1722
 msgid "Key is revoked."
 msgstr "密钥已被吊销。"
 
-#: g10/keyedit.c:1657
+#: g10/keyedit.c:1741
 msgid "Really sign all user IDs? (y/N) "
 msgstr "真的为所有的用户标识签字吗？(y/N)"
 
-#: g10/keyedit.c:1660
-msgid "Hint: Select the user IDs to sign\n"
-msgstr "提示：选择要添加签字的用户标识\n"
-
-#: g10/keyedit.c:1668
-#, fuzzy, c-format
+#: g10/keyedit.c:1748
+#, c-format
 msgid "Unknown signature type `%s'\n"
-msgstr "未知的签字等级"
+msgstr "未知的签字类型‘%s’\n"
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1771
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "在 %s 模式中不允许使用这个指令。\n"
 
-#: g10/keyedit.c:1713 g10/keyedit.c:1733 g10/keyedit.c:1899
+#: g10/keyedit.c:1793 g10/keyedit.c:1813 g10/keyedit.c:1979
 msgid "You must select at least one user ID.\n"
 msgstr "您至少得选择一个用户标识。\n"
 
-#: g10/keyedit.c:1715
+#: g10/keyedit.c:1795
 msgid "You can't delete the last user ID!\n"
 msgstr "您不能删除最后一个用户标识！\n"
 
-#: g10/keyedit.c:1717
+#: g10/keyedit.c:1797
 msgid "Really remove all selected user IDs? (y/N) "
-msgstr "真的要删除所有被选择的用户标识吗？(y/N)"
+msgstr "真的要删除所有选定的用户标识吗？(y/N)"
 
-#: g10/keyedit.c:1718
+#: g10/keyedit.c:1798
 msgid "Really remove this user ID? (y/N) "
 msgstr "真的要删除这个用户标识吗？(y/N)"
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1848
 msgid "Really move the primary key? (y/N) "
 msgstr "真的要删除主钥吗？(y/N)"
 
-#: g10/keyedit.c:1780
+#: g10/keyedit.c:1860
 msgid "You must select exactly one key.\n"
 msgstr "您必须指定一把密钥。\n"
 
-#: g10/keyedit.c:1808
+#: g10/keyedit.c:1888
 msgid "Command expects a filename argument\n"
-msgstr ""
+msgstr "命令需要一个文件名作为参数\n"
 
-#: g10/keyedit.c:1822
-#, fuzzy, c-format
+#: g10/keyedit.c:1902
+#, c-format
 msgid "Can't open `%s': %s\n"
-msgstr "无法打开‘%s’： %s\n"
+msgstr "无法打开‘%s’：%s\n"
 
-#: g10/keyedit.c:1839
-#, fuzzy, c-format
+#: g10/keyedit.c:1919
+#, c-format
 msgid "Error reading backup key from `%s': %s\n"
-msgstr "建立钥匙环‘%s’时发生错误：%s\n"
+msgstr "从‘%s’读取备份密钥时出错：%s\n"
 
-#: g10/keyedit.c:1863
+#: g10/keyedit.c:1943
 msgid "You must select at least one key.\n"
 msgstr "您必须选择至少一把密钥。\n"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1946
 msgid "Do you really want to delete the selected keys? (y/N) "
-msgstr "您真的想要删除被选择的密钥吗？(y/N)"
+msgstr "您真的想要删除选定的密钥吗？(y/N)"
 
-#: g10/keyedit.c:1867
+#: g10/keyedit.c:1947
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "您真的要删除这把密钥吗？(y/N)"
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1982
 msgid "Really revoke all selected user IDs? (y/N) "
-msgstr "真的要吊销所有被选择的用户标识吗？(y/N)"
+msgstr "真的要吊销所有选定的用户标识吗？(y/N)"
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1983
 msgid "Really revoke this user ID? (y/N) "
 msgstr "真的要吊销这个用户标识吗？(y/N)"
 
-#: g10/keyedit.c:1921
-#, fuzzy
+#: g10/keyedit.c:2001
 msgid "Do you really want to revoke the entire key? (y/N) "
-msgstr "您真的想要吊销这把密钥吗？(y/N)"
+msgstr "您真的要吊销整把密钥吗？(y/N)"
 
-#: g10/keyedit.c:1932
-#, fuzzy
+#: g10/keyedit.c:2012
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
-msgstr "您真的想要吊销被选择的密钥吗？(y/N)"
+msgstr "您真的要吊销选定的子钥吗？(y/N)"
 
-#: g10/keyedit.c:1934
-#, fuzzy
+#: g10/keyedit.c:2014
 msgid "Do you really want to revoke this subkey? (y/N) "
-msgstr "您真的想要吊销这把密钥吗？(y/N)"
+msgstr "您真的要吊销这把子钥吗？(y/N)"
 
-#: g10/keyedit.c:1975
+#: g10/keyedit.c:2055
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr "使用用户提供的信任度数据库时信任度可能并未被设定\n"
 
-#: g10/keyedit.c:2007
+#: g10/keyedit.c:2087
 msgid "Set preference list to:\n"
 msgstr "设为首选项列表为：\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2093
 msgid "Really update the preferences for the selected user IDs? (y/N) "
-msgstr "真的要更新被选择用户标识的首选项吗？(y/N)"
+msgstr "真的要更新所选用户标识的首选项吗？(y/N)"
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2095
 msgid "Really update the preferences? (y/N) "
 msgstr "真的要更新首选项吗？(y/N)"
 
-#: g10/keyedit.c:2065
+#: g10/keyedit.c:2157
+#, fuzzy, c-format
+msgid "Unable to clean `%s'\n"
+msgstr "无法执行程序‘%s’：%s\n"
+
+#: g10/keyedit.c:2160
+msgid "Please specify item to clean: `sigs', `uids', or `all'\n"
+msgstr ""
+
+#: g10/keyedit.c:2171
 msgid "Save changes? (y/N) "
 msgstr "要保存变动吗？(y/N)"
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2174
 msgid "Quit without saving? (y/N) "
 msgstr "要不保存而离开吗？(y/N)"
 
-#: g10/keyedit.c:2078
+#: g10/keyedit.c:2184
 #, c-format
 msgid "update failed: %s\n"
 msgstr "更新失败：%s\n"
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2191
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "更新私钥失败：%s\n"
 
-#: g10/keyedit.c:2092
+#: g10/keyedit.c:2198
 msgid "Key not changed so no update needed.\n"
 msgstr "密钥没有变动所以不需要更新。\n"
 
-#: g10/keyedit.c:2164
+#: g10/keyedit.c:2271
 msgid "Digest: "
 msgstr "散列："
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2323
 msgid "Features: "
 msgstr "特点："
 
-#: g10/keyedit.c:2227
+#: g10/keyedit.c:2334
 msgid "Keyserver no-modify"
 msgstr "公钥服务器不可变造"
 
-#: g10/keyedit.c:2242 g10/keylist.c:307
+#: g10/keyedit.c:2349 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "首选公钥服务器："
 
-#: g10/keyedit.c:2473
-#, fuzzy, c-format
+#: g10/keyedit.c:2580
+#, c-format
 msgid "This key was revoked on %s by %s key %s\n"
-msgstr "这把密钥可被 %s 密钥 %s 吊销"
+msgstr "此密钥已于 %s 被 %s 密钥 %s 所吊销\n"
 
-#: g10/keyedit.c:2494
+#: g10/keyedit.c:2601
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "这把密钥可被 %s 密钥 %s 吊销"
 
-#: g10/keyedit.c:2500
+#: g10/keyedit.c:2607
 msgid "(sensitive)"
 msgstr " (敏感的)"
 
-#: g10/keyedit.c:2516 g10/keyedit.c:2572 g10/keyedit.c:2684 g10/keyedit.c:2699
-#: g10/keylist.c:193 g10/keyserver.c:422
+#: g10/keyedit.c:2623 g10/keyedit.c:2679 g10/keyedit.c:2792 g10/keyedit.c:2807
+#: g10/keylist.c:194 g10/keyserver.c:421
 #, c-format
 msgid "created: %s"
 msgstr "创建于：%s"
 
-#: g10/keyedit.c:2519 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:931
+#: g10/keyedit.c:2626 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:948
 #, c-format
 msgid "revoked: %s"
 msgstr "已吊销：%s"
 
-#: g10/keyedit.c:2521 g10/keylist.c:757 g10/keylist.c:886
+#: g10/keyedit.c:2628 g10/keylist.c:758 g10/keylist.c:887
 #, c-format
 msgid "expired: %s"
 msgstr "已过期：%s"
 
-#: g10/keyedit.c:2523 g10/keyedit.c:2574 g10/keyedit.c:2686 g10/keyedit.c:2701
-#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
-#: g10/keylist.c:913 g10/keyserver.c:428 g10/mainproc.c:937
+#: g10/keyedit.c:2630 g10/keyedit.c:2681 g10/keyedit.c:2794 g10/keyedit.c:2809
+#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
+#: g10/keylist.c:914 g10/keyserver.c:427 g10/mainproc.c:954
 #, c-format
 msgid "expires: %s"
 msgstr "有效至：%s"
 
-#: g10/keyedit.c:2525
+#: g10/keyedit.c:2632
 #, c-format
 msgid "usage: %s"
 msgstr "可用于：%s"
 
-#: g10/keyedit.c:2540
+#: g10/keyedit.c:2647
 #, c-format
 msgid "trust: %s"
 msgstr "信任度：%s"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2651
 #, c-format
 msgid "validity: %s"
 msgstr "有效性：%s"
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2658
 msgid "This key has been disabled"
 msgstr "这把密钥已经被禁用"
 
-#: g10/keyedit.c:2579 g10/keylist.c:199
+#: g10/keyedit.c:2686 g10/keylist.c:200
 msgid "card-no: "
 msgstr "卡号："
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2754
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x 样式的用户标识没有首选项。\n"
 
-#: g10/keyedit.c:2654
+#: g10/keyedit.c:2762
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr "请注意，在您重启程序之前，显示的密钥有效性未必正确，\n"
 
-#: g10/keyedit.c:2718 g10/keyserver.c:432 g10/mainproc.c:1577
-#: g10/trustdb.c:1178
+#: g10/keyedit.c:2826 g10/keyedit.c:3201 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1690
 msgid "revoked"
 msgstr "已吊销"
 
-#: g10/keyedit.c:2720 g10/keyserver.c:436 g10/mainproc.c:1579
-#: g10/trustdb.c:531
+#: g10/keyedit.c:2828 g10/keyedit.c:3203 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1692
 msgid "expired"
 msgstr "已过期"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2893
 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:2845
+#: g10/keyedit.c:2953
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3115,382 +3147,415 @@ msgstr ""
 "警告：这是一把 PGP2 样式的密钥。\n"
 "      增加照片标识可能会导致某些版本的 PGP 不能识别这把密钥。\n"
 
-#: g10/keyedit.c:2850 g10/keyedit.c:3128
+#: g10/keyedit.c:2958 g10/keyedit.c:3307
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "您确定仍然想要增加吗？(y/N)"
 
-#: g10/keyedit.c:2856
+#: g10/keyedit.c:2964
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "您不可以把照片标识增加到 PGP2 样式的密钥里。\n"
 
-#: g10/keyedit.c:2996
+#: g10/keyedit.c:3104
 msgid "Delete this good signature? (y/N/q)"
 msgstr "删除这个完好的签字吗？(y/N/q)"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3114
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "删除这个无效的签字吗？(y/N/q)"
 
-#: g10/keyedit.c:3010
+#: g10/keyedit.c:3118
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "删除这个未知的签字吗？(y/N/q)"
 
-#: g10/keyedit.c:3016
+#: g10/keyedit.c:3124
 msgid "Really delete this self-signature? (y/N)"
 msgstr "真的要删除这个自身签字吗？(y/N)"
 
-#: g10/keyedit.c:3030
+#: g10/keyedit.c:3138
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "已经删除了 %d 个签字。\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3139
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "已经删除了 %d 个签字。\n"
 
-#: g10/keyedit.c:3034
+#: g10/keyedit.c:3142
 msgid "Nothing deleted.\n"
 msgstr "没有东西被删除。\n"
 
-#: g10/keyedit.c:3123
+#: g10/keyedit.c:3167
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed.\n"
+msgstr "用户标识“%s”已被吊销。"
+
+#: g10/keyedit.c:3168
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed.\n"
+msgstr "用户标识“%s”已被吊销。"
+
+#: g10/keyedit.c:3173
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean.\n"
+msgstr "用户标识“%s”已经被吊销。\n"
+
+#: g10/keyedit.c:3205 g10/trustdb.c:1694
+#, fuzzy
+msgid "invalid"
+msgstr "无效的 ASCII 封装格式"
+
+#: g10/keyedit.c:3207
+#, fuzzy, c-format
+msgid "User ID \"%s\" removed: %s\n"
+msgstr "用户标识“%s”已被吊销。"
+
+#: g10/keyedit.c:3214
+#, fuzzy
+msgid "No user IDs are removable.\n"
+msgstr "用户标识“%s”已经被吊销。\n"
+
+#: g10/keyedit.c:3302
 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 ""
 "警告：这是一把 PGP2 样式的密钥。\n"
-"     增加指定吊销者可能会导致某些版本的 PGP 无法识别这把密钥。\n"
+"      增加指定吊销者可能会导致某些版本的 PGP 无法识别这把密钥。\n"
 
-#: g10/keyedit.c:3134
+#: g10/keyedit.c:3313
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "您不可以为 PGP 2.x 样式的密钥添加指定吊销者。\n"
 
-#: g10/keyedit.c:3154
+#: g10/keyedit.c:3333
 msgid "Enter the user ID of the designated revoker: "
 msgstr "输入指定吊销者的用户标识："
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3356
 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:3192
+#: g10/keyedit.c:3371
 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:3214
+#: g10/keyedit.c:3393
 msgid "this key has already been designated as a revoker\n"
 msgstr "这把密钥已被指定为一个吊销者\n"
 
-#: g10/keyedit.c:3233
+#: g10/keyedit.c:3412
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告：将某把密钥指派为指定吊销者的操作无法撤销！\n"
 
-#: g10/keyedit.c:3239
+#: g10/keyedit.c:3418
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "您确定要将这把密钥设为指定吊销者吗？(y/N)："
 
-#: g10/keyedit.c:3300
+#: g10/keyedit.c:3479
 msgid "Please remove selections from the secret keys.\n"
 msgstr "请从私钥中删除选择。\n"
 
-#: g10/keyedit.c:3306
-#, fuzzy
+#: g10/keyedit.c:3485
 msgid "Please select at most one subkey.\n"
-msgstr "请至多选择一把子钥。\n"
+msgstr "请至多选择一个子钥。\n"
 
-#: g10/keyedit.c:3310
-#, fuzzy
+#: g10/keyedit.c:3489
 msgid "Changing expiration time for a subkey.\n"
-msgstr "正在变更子钥的使用期限。\n"
+msgstr "将要变更子钥的使用期限。\n"
 
-#: g10/keyedit.c:3313
+#: g10/keyedit.c:3492
 msgid "Changing expiration time for the primary key.\n"
-msgstr "正在变更主钥的使用期限。\n"
+msgstr "将要变更主钥的使用期限。\n"
 
-#: g10/keyedit.c:3359
+#: g10/keyedit.c:3538
 msgid "You can't change the expiration date of a v3 key\n"
-msgstr "您不能变更v3密钥的使用期限\n"
+msgstr "您不能变更 v3 密钥的使用期限\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3554
 msgid "No corresponding signature in secret ring\n"
-msgstr "在私钥环里没有一致的签字\n"
+msgstr "在私钥环里没有相应的签字\n"
 
-#: g10/keyedit.c:3455
+#: g10/keyedit.c:3634
 msgid "Please select exactly one user ID.\n"
 msgstr "请精确地选择一个用户标识。\n"
 
-#: g10/keyedit.c:3494 g10/keyedit.c:3604 g10/keyedit.c:3724
+#: g10/keyedit.c:3673 g10/keyedit.c:3783 g10/keyedit.c:3903
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "跳过用户标识“%s”的 v3 自身签字\n"
 
-#: g10/keyedit.c:3665
+#: g10/keyedit.c:3844
 msgid "Enter your preferred keyserver URL: "
 msgstr "输入您首选的公钥服务器的 URL："
 
-#: g10/keyedit.c:3745
+#: g10/keyedit.c:3924
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "您确定要替换它吗？(y/N)"
 
-#: g10/keyedit.c:3746
+#: g10/keyedit.c:3925
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "您确定要删除它吗？(y/N)"
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3987
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "没有索引为 %d 的用户标识\n"
 
-#: g10/keyedit.c:3854
+#: g10/keyedit.c:4045
 #, fuzzy, c-format
-msgid "No subkey with index %d\n"
+msgid "No user ID with hash %s\n"
 msgstr "没有索引为 %d 的用户标识\n"
 
-#: g10/keyedit.c:3971
+#: g10/keyedit.c:4072
+#, c-format
+msgid "No subkey with index %d\n"
+msgstr "没有索引为 %d 的子钥\n"
+
+#: g10/keyedit.c:4189
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "用户标识：“%s”\n"
 
-#: g10/keyedit.c:3974 g10/keyedit.c:4038 g10/keyedit.c:4081
+#: g10/keyedit.c:4192 g10/keyedit.c:4256 g10/keyedit.c:4299
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
-msgstr "由您的密钥 %s 于 %s%s(%s) 签字\n"
+msgstr "由您的密钥 %s 于 %s%s%s 签字\n"
 
-#: g10/keyedit.c:3976 g10/keyedit.c:4040 g10/keyedit.c:4083
+#: g10/keyedit.c:4194 g10/keyedit.c:4258 g10/keyedit.c:4301
 msgid " (non-exportable)"
 msgstr " (不可导出)"
 
-#: g10/keyedit.c:3980
+#: g10/keyedit.c:4198
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "这份签字已在 %s 过期。\n"
 
-#: g10/keyedit.c:3984
+#: g10/keyedit.c:4202
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "您确定您仍然想要吊销它吗？(y/N)"
 
-#: g10/keyedit.c:3988
+#: g10/keyedit.c:4206
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "要为这份签字生成一份吊销证书吗？(y/N)"
 
-#: g10/keyedit.c:4015
+#: g10/keyedit.c:4233
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "您已经为这些密钥 %s 上的这些用户标识添加签字：\n"
 
-#: g10/keyedit.c:4041
+#: g10/keyedit.c:4259
 msgid " (non-revocable)"
 msgstr " (不可吊销)"
 
-#: g10/keyedit.c:4048
+#: g10/keyedit.c:4266
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "由您的密钥 %s 于 %s 吊销\n"
 
-#: g10/keyedit.c:4070
+#: g10/keyedit.c:4288
 msgid "You are about to revoke these signatures:\n"
 msgstr "您正在吊销这些签字：\n"
 
-#: g10/keyedit.c:4090
+#: g10/keyedit.c:4308
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "真的要生成吊销证书吗？(y/N)"
 
-#: g10/keyedit.c:4120
+#: g10/keyedit.c:4338
 msgid "no secret key\n"
 msgstr "没有私钥\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4408
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "用户标识“%s”已经被吊销。\n"
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4425
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告：有一份用户标识签字的日期标记为 %d 秒后的未来\n"
 
-#: g10/keyedit.c:4271
-#, fuzzy, c-format
+#: g10/keyedit.c:4489
+#, c-format
 msgid "Key %s is already revoked.\n"
-msgstr "用户标识“%s”已经被吊销。\n"
+msgstr "密钥 %s 已被吊销。\n"
 
-#: g10/keyedit.c:4333
-#, fuzzy, c-format
+#: g10/keyedit.c:4551
+#, c-format
 msgid "Subkey %s is already revoked.\n"
-msgstr "用户标识“%s”已经被吊销。\n"
+msgstr "子钥 %s 已被吊销。\n"
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4646
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在显示 %s 照片标识(大小为 %ld，属于密钥 %s，用户标识 %d)\n"
 
-#: g10/keygen.c:293
+#: g10/keygen.c:258
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "首选项‘%s’重复\n"
 
-#: g10/keygen.c:300
+#: g10/keygen.c:265
 msgid "too many cipher preferences\n"
 msgstr "太多对称加密算法首选项\n"
 
-#: g10/keygen.c:302
+#: g10/keygen.c:267
 msgid "too many digest preferences\n"
 msgstr "太多散列算法首选项\n"
 
-#: g10/keygen.c:304
+#: g10/keygen.c:269
 msgid "too many compression preferences\n"
 msgstr "太多首选压缩算法\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:394
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "首选项字符串里有无效项‘%s’\n"
 
-#: g10/keygen.c:829
+#: g10/keygen.c:822
 msgid "writing direct signature\n"
 msgstr "正在写入直接签字\n"
 
-#: g10/keygen.c:868
+#: g10/keygen.c:861
 msgid "writing self signature\n"
 msgstr "正在写入自身签字\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing key binding signature\n"
 msgstr "正在写入密钥绑定签字\n"
 
-#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2632
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "密钥尺寸无效：改用 %u 位\n"
 
-#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2638
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "密钥尺寸舍入到 %u 位\n"
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1239
 msgid "Sign"
 msgstr "签字"
 
-#: g10/keygen.c:1252
+#: g10/keygen.c:1242
 msgid "Encrypt"
 msgstr "加密"
 
-#: g10/keygen.c:1255
+#: g10/keygen.c:1245
 msgid "Authenticate"
 msgstr "认证"
 
-#: g10/keygen.c:1263
+#: g10/keygen.c:1253
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1268
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "%s 密钥可能的操作："
 
-#: g10/keygen.c:1282
+#: g10/keygen.c:1272
 msgid "Current allowed actions: "
 msgstr "目前允许的操作："
 
-#: g10/keygen.c:1287
+#: g10/keygen.c:1277
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
-msgstr "  (%c) 选择是否用于签字\n"
+msgstr "   (%c) 选择是否用于签字\n"
 
-#: g10/keygen.c:1290
+#: g10/keygen.c:1280
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
-msgstr "  (%c) 选择是否用于加密\n"
+msgstr "   (%c) 选择是否用于加密\n"
 
-#: g10/keygen.c:1293
+#: g10/keygen.c:1283
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
-msgstr "  (%c) 选择是否用于认证\n"
+msgstr "   (%c) 选择是否用于认证\n"
 
-#: g10/keygen.c:1296
+#: g10/keygen.c:1286
 #, c-format
 msgid "   (%c) Finished\n"
-msgstr "  (%c) 已完成\n"
+msgstr "   (%c) 已完成\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1340
 msgid "Please select what kind of key you want:\n"
 msgstr "请选择您要使用的密钥种类：\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1342
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA 和 ElGamal (默认)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1343
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (仅用于签字)\n"
 
-#: g10/keygen.c:1355
-#, fuzzy, c-format
+#: g10/keygen.c:1345
+#, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) RSA (自定义用途)\n"
+msgstr "   (%d) DSA (自定义用途)\n"
 
-#: g10/keygen.c:1357
+#: g10/keygen.c:1347
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (仅用于加密)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1348
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (仅用于签字)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1350
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (仅用于加密)\n"
 
-#: g10/keygen.c:1362
+#: g10/keygen.c:1352
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (自定义用途)\n"
 
-#: g10/keygen.c:1431 g10/keygen.c:2509
-#, fuzzy, c-format
+#: g10/keygen.c:1421 g10/keygen.c:2506
+#, c-format
 msgid "DSA keypair will have %u bits.\n"
-msgstr "DSA 密钥对会有 1024 位。\n"
+msgstr "DSA 密钥对会有 %u 位。\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1431
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
-msgstr ""
+msgstr "%s 密钥长度应在 %u 位与 %u 位之间。\n"
 
-#: g10/keygen.c:1448
-#, fuzzy, c-format
+#: g10/keygen.c:1438
+#, c-format
 msgid "What keysize do you want? (%u) "
-msgstr "您想要用多大的密钥尺寸？(1024)"
+msgstr "您想要用多大的密钥尺寸？(%u)"
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1452
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
-msgstr ""
+msgstr "%s 密钥尺寸必须在 %u 与 %u 间\n"
 
-#: g10/keygen.c:1468
+#: g10/keygen.c:1458
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "您所要求的密钥尺寸是 %u 位\n"
 
-#: g10/keygen.c:1473 g10/keygen.c:1478
+#: g10/keygen.c:1463 g10/keygen.c:1468
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "舍入到 %u 位\n"
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1515
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3506,7 +3571,7 @@ msgstr ""
 "      <n>m = 密钥在 n 月后过期\n"
 "      <n>y = 密钥在 n 年后过期\n"
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1526
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3522,39 +3587,38 @@ msgstr ""
 "      <n>m = 签字在 n 月后过期\n"
 "      <n>y = 签字在 n 年后过期\n"
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1549
 msgid "Key is valid for? (0) "
 msgstr "密钥的有效期限是？(0) "
 
-#: g10/keygen.c:1563
-msgid "Signature is valid for? (0) "
+#: g10/keygen.c:1554
+#, fuzzy, c-format
+msgid "Signature is valid for? (%s) "
 msgstr "签字的有效期限是多久？(0) "
 
-#: g10/keygen.c:1568
+#: g10/keygen.c:1572
 msgid "invalid value\n"
 msgstr "无效的数值\n"
 
-#: g10/keygen.c:1575
-#, fuzzy
+#: g10/keygen.c:1579
 msgid "Key does not expire at all\n"
-msgstr "%s 永远不会过期\n"
+msgstr "密钥永远不会过期\n"
 
-#: g10/keygen.c:1576
-#, fuzzy
+#: g10/keygen.c:1580
 msgid "Signature does not expire at all\n"
-msgstr "%s 永远不会过期\n"
+msgstr "签字永远不会过期\n"
 
-#: g10/keygen.c:1583
-#, fuzzy, c-format
+#: g10/keygen.c:1585
+#, c-format
 msgid "Key expires at %s\n"
-msgstr "%s 将在 %s 过期\n"
+msgstr "密钥于 %s 过期\n"
 
-#: g10/keygen.c:1584
-#, fuzzy, c-format
+#: g10/keygen.c:1586
+#, c-format
 msgid "Signature expires at %s\n"
-msgstr "这份签字在 %s 过期。\n"
+msgstr "签字于 %s 过期\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1592
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3562,11 +3626,11 @@ msgstr ""
 "您的系统无法显示 2038 年以后的日期。\n"
 "不过，它可以正确处理 2106 年之前的年份。\n"
 
-#: g10/keygen.c:1595
+#: g10/keygen.c:1597
 msgid "Is this correct? (y/N) "
 msgstr "以上正确吗？(y/n)"
 
-#: g10/keygen.c:1638
+#: g10/keygen.c:1641
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3582,55 +3646,55 @@ msgstr ""
 "    “Heinrich Heine (Der Dichter) <[email protected]>”\n"
 "\n"
 
-#: g10/keygen.c:1651
+#: g10/keygen.c:1654
 msgid "Real name: "
 msgstr "真实姓名："
 
-#: g10/keygen.c:1659
+#: g10/keygen.c:1662
 msgid "Invalid character in name\n"
 msgstr "姓名含有无效的字符\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1664
 msgid "Name may not start with a digit\n"
 msgstr "姓名不可以用数字开头\n"
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1666
 msgid "Name must be at least 5 characters long\n"
 msgstr "姓名至少要有五个字符长\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1674
 msgid "Email address: "
 msgstr "电子邮件地址："
 
-#: g10/keygen.c:1682
+#: g10/keygen.c:1685
 msgid "Not a valid email address\n"
 msgstr "电子邮件地址无效\n"
 
-#: g10/keygen.c:1690
+#: g10/keygen.c:1693
 msgid "Comment: "
 msgstr "注释："
 
-#: g10/keygen.c:1696
+#: g10/keygen.c:1699
 msgid "Invalid character in comment\n"
 msgstr "注释含有无效的字符\n"
 
-#: g10/keygen.c:1719
+#: g10/keygen.c:1722
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "您正在使用‘%s’字符集。\n"
 
-#: g10/keygen.c:1725
+#: g10/keygen.c:1728
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
 "    \"%s\"\n"
 "\n"
 msgstr ""
-"您选择了这个用户标识：\n"
+"您选定了这个用户标识：\n"
 "    “%s”\n"
 "\n"
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1733
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
 
@@ -3645,23 +3709,23 @@ msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1746
+#: g10/keygen.c:1749
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1756
+#: g10/keygen.c:1759
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或退出(Q)？"
 
-#: g10/keygen.c:1757
+#: g10/keygen.c:1760
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或确定(O)/退出(Q)？"
 
-#: g10/keygen.c:1776
+#: g10/keygen.c:1779
 msgid "Please correct the error first\n"
 msgstr "请先改正错误\n"
 
-#: g10/keygen.c:1816
+#: g10/keygen.c:1819
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3669,12 +3733,12 @@ msgstr ""
 "您需要一个密码来保护您的私钥。\n"
 "\n"
 
-#: g10/keygen.c:1826 g10/passphrase.c:1105
+#: g10/keygen.c:1829 g10/passphrase.c:786
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1832
+#: g10/keygen.c:1835
 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"
@@ -3686,7 +3750,7 @@ msgstr ""
 "再次执行这个程序，并且使用“--edit-key”选项即可。\n"
 "\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1857
 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"
@@ -3696,51 +3760,50 @@ msgstr ""
 "我们需要生成大量的随机字节。这个时候您可以多做些琐事(像是敲打键盘、移动\n"
 "鼠标、读写硬盘之类的)，这会让随机数字发生器有更好的机会获得足够的熵数。\n"
 
-#: g10/keygen.c:2578
+#: g10/keygen.c:2575
 msgid "Key generation canceled.\n"
 msgstr "密钥生成已取消。\n"
 
-#: g10/keygen.c:2766 g10/keygen.c:2910
+#: g10/keygen.c:2774 g10/keygen.c:2918
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "正在将公钥写至`%s'\n"
 
-#: g10/keygen.c:2768 g10/keygen.c:2913
+#: g10/keygen.c:2776 g10/keygen.c:2921
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "向‘%s’写入私钥占位符\n"
 
-#: g10/keygen.c:2771 g10/keygen.c:2916
+#: g10/keygen.c:2779 g10/keygen.c:2924
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "正在将私钥写至`%s'\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2907
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "找不到可写的公钥钥匙环：%s\n"
 
-#: g10/keygen.c:2905
+#: g10/keygen.c:2913
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "找不到可写的私钥钥匙环：%s\n"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2931
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "写入公钥钥匙环‘%s’时发生错误： %s\n"
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2938
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "写入私钥钥匙环‘%s’时发生错误： %s\n"
 
-#: g10/keygen.c:2953
+#: g10/keygen.c:2961
 msgid "public and secret key created and signed.\n"
 msgstr "公钥和私钥已经生成并经签字。\n"
 
-#: g10/keygen.c:2964
-#, fuzzy
+#: g10/keygen.c:2972
 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"
@@ -3748,378 +3811,359 @@ msgstr ""
 "请注意这把密钥还不能用来加密，您必须先用“--edit-key”指令\n"
 "生成用于加密的子钥。\n"
 
-#: g10/keygen.c:2976 g10/keygen.c:3105 g10/keygen.c:3220
+#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "生成密钥失败：%s\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3156 g10/sign.c:290
+#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
-#: g10/keygen.c:3030 g10/keygen.c:3158 g10/sign.c:292
+#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
-#: g10/keygen.c:3039 g10/keygen.c:3169
+#: g10/keygen.c:3047 g10/keygen.c:3177
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "注意：为 v3 密钥生成子钥会失去 OpenPGP 兼容性\n"
 
-#: g10/keygen.c:3078 g10/keygen.c:3202
+#: g10/keygen.c:3086 g10/keygen.c:3210
 msgid "Really create? (y/N) "
 msgstr "真的要建立吗？(y/N)"
 
-#: g10/keygen.c:3355
+#: g10/keygen.c:3363
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "向卡上存储密钥时失败：%s\n"
 
-#: g10/keygen.c:3402
+#: g10/keygen.c:3410
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "不能创建备份文件‘%s’：%s\n"
 
-#: g10/keygen.c:3428
+#: g10/keygen.c:3436
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "注意：卡密钥的备份已保存到‘%s’\n"
 
-#: g10/keygen.c:3508
-#, c-format
-msgid "length of RSA modulus is not %d\n"
-msgstr "RSA 余数的长度不为 %d\n"
-
-#: g10/keygen.c:3514
-msgid "public exponent too large (more than 32 bits)\n"
-msgstr "公钥指数太大(超过 32 位)\n"
-
-#: g10/keygen.c:3520 g10/keygen.c:3526
-#, c-format
-msgid "length of an RSA prime is not %d\n"
-msgstr "RSA 质数的长度不为 %d\n"
-
-#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
+#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
 msgid "never     "
 msgstr "永不过期"
 
-#: g10/keylist.c:264
+#: g10/keylist.c:265
 msgid "Critical signature policy: "
 msgstr "关键签字策略："
 
-#: g10/keylist.c:266
+#: g10/keylist.c:267
 msgid "Signature policy: "
 msgstr "签字策略："
 
-#: g10/keylist.c:305
+#: g10/keylist.c:306
 msgid "Critical preferred keyserver: "
 msgstr "关键首选公钥服务器："
 
-#: g10/keylist.c:354 g10/keylist.c:398
+#: g10/keylist.c:355 g10/keylist.c:399
 msgid "WARNING: invalid notation data found\n"
 msgstr "警告：找到无效的标记数据\n"
 
-#: g10/keylist.c:372
+#: g10/keylist.c:373
 msgid "Critical signature notation: "
 msgstr "关键签字标记："
 
-#: g10/keylist.c:374
+#: g10/keylist.c:375
 msgid "Signature notation: "
 msgstr "签字标记："
 
-#: g10/keylist.c:385
+#: g10/keylist.c:386
 msgid "not human readable"
 msgstr "不是人类能读懂的"
 
-#: g10/keylist.c:486
+#: g10/keylist.c:487
 msgid "Keyring"
 msgstr "钥匙环"
 
-#: g10/keylist.c:792
+#: g10/keylist.c:793
 #, c-format
 msgid "expired: %s)"
 msgstr "已过期：%s)"
 
-#: g10/keylist.c:1488
+#: g10/keylist.c:1489
 msgid "Primary key fingerprint:"
 msgstr "主钥指纹："
 
-#: g10/keylist.c:1490
+#: g10/keylist.c:1491
 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:1497
+#: g10/keylist.c:1498
 msgid " Primary key fingerprint:"
 msgstr " 主钥指纹："
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1500
 msgid "      Subkey fingerprint:"
 msgstr " 子钥指纹："
 
 #  use tty
-#: g10/keylist.c:1503 g10/keylist.c:1507
+#: g10/keylist.c:1504 g10/keylist.c:1508
 msgid "      Key fingerprint ="
-msgstr "              密钥指纹 ="
+msgstr "密钥指纹 ="
 
-#: g10/keylist.c:1574
+#: g10/keylist.c:1575
 msgid "      Card serial no. ="
-msgstr "     卡序列号 ="
+msgstr "卡序列号 ="
 
-#: g10/keyring.c:1245
+#: g10/keyring.c:1246
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "将‘%s’重命名为‘%s’时失败：%s\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1252
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "警告：两个文件存在有互相矛盾的信息。\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s 是没有改变的那一个\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1255
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s 是新的那一个\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1256
 msgid "Please fix this possible security flaw\n"
 msgstr "请修补这个可能的安全性漏洞\n"
 
-#: g10/keyring.c:1375
+#: g10/keyring.c:1376
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "缓存钥匙环‘%s’\n"
 
-#: g10/keyring.c:1421
+#: g10/keyring.c:1422
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "目前已缓存 %lu 把密钥(%lu 份签字)\n"
 
-#: g10/keyring.c:1433
+#: g10/keyring.c:1434
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "缓存了 %lu 把密钥(%lu 份签字)\n"
 
-#: g10/keyring.c:1504
+#: g10/keyring.c:1505
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s：钥匙环已建立\n"
 
-#: g10/keyserver.c:107
+#: g10/keyserver.c:105
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "警告：公钥服务器选项‘%s’在此平台上没有被使用\n"
 
-#: g10/keyserver.c:434
+#: g10/keyserver.c:433
 msgid "disabled"
 msgstr "已禁用"
 
-#: g10/keyserver.c:635
+#: g10/keyserver.c:634
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "输入数字以选择，输入 N 翻页，输入 Q 退出 >"
 
-#: g10/keyserver.c:718 g10/keyserver.c:1238
+#: g10/keyserver.c:717 g10/keyserver.c:1267
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "无效的公钥服务器协议(us %d!=handler %d)\n"
 
-#: g10/keyserver.c:808
+#: g10/keyserver.c:815
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "在公钥服务器上找不到密钥“%s”\n"
 
-#: g10/keyserver.c:810
+#: g10/keyserver.c:817
 msgid "key not found on keyserver\n"
 msgstr "在公钥服务器上找不到密钥\n"
 
-#: g10/keyserver.c:985
+#: g10/keyserver.c:1014
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "下载密钥‘%s’，从 %s 服务器 %s\n"
 
-#: g10/keyserver.c:989
+#: g10/keyserver.c:1018
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "下载密钥 %s，从 %s\n"
 
-#: g10/keyserver.c:1141
+#: g10/keyserver.c:1170
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "将密钥‘%s’上传到 %s 服务器 %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1174
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "将密钥‘%s’上传到 %s\n"
 
-#: g10/keyserver.c:1188
+#: g10/keyserver.c:1217
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "搜索“%s”，在 %s 服务器 %s 上\n"
 
-#: g10/keyserver.c:1191
+#: g10/keyserver.c:1220
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "搜索“%s”，在 %s 上\n"
 
-#: g10/keyserver.c:1198 g10/keyserver.c:1293
+#: g10/keyserver.c:1227 g10/keyserver.c:1322
 msgid "no keyserver action!\n"
 msgstr "公钥服务器无动作！\n"
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1275
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "警告：处理公钥服务器的程序来自不同版本的 GnuPG (%s)\n"
 
-#: g10/keyserver.c:1255
+#: g10/keyserver.c:1284
 msgid "keyserver did not send VERSION\n"
 msgstr "公钥服务器未发送 VERSION\n"
 
-#: g10/keyserver.c:1314
+#: g10/keyserver.c:1343
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "未给出公钥服务器(使用 --keyserver 选项)\n"
 
-#: g10/keyserver.c:1320
+#: g10/keyserver.c:1349
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "这一编译版本不支持外部调用公钥服务器\n"
 
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1361
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "没有处理‘%s’公钥服务器的程序\n"
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1366
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "‘%s’操作不为‘%s’公钥服务器所支持\n"
 
-#: g10/keyserver.c:1345
-#, c-format
-msgid "gpgkeys_%s does not support handler version %d\n"
+#: g10/keyserver.c:1374
+#, fuzzy, c-format
+msgid "%s does not support handler version %d\n"
 msgstr "gpgkeys_%s 不支持对版本 %d 的处理\n"
 
-#: g10/keyserver.c:1351
+#: g10/keyserver.c:1381
 msgid "keyserver timed out\n"
 msgstr "公钥服务器超时\n"
 
-#: g10/keyserver.c:1356
+#: g10/keyserver.c:1386
 msgid "keyserver internal error\n"
 msgstr "公钥服务器内部错误\n"
 
-#: g10/keyserver.c:1365
+#: g10/keyserver.c:1395
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "公钥服务器通讯错误：%s\n"
 
-#: g10/keyserver.c:1390 g10/keyserver.c:1424
+#: g10/keyserver.c:1420 g10/keyserver.c:1454
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "“%s”不是一个用户标识：跳过\n"
 
-#: g10/keyserver.c:1681
+#: g10/keyserver.c:1711
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "警告：无法更新密钥 %s，通过 %s：%s\n"
 
-#: g10/keyserver.c:1703
+#: g10/keyserver.c:1733
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "1 个密钥正从 %s 得到更新\n"
 
-#: g10/keyserver.c:1705
+#: g10/keyserver.c:1735
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "%d 个密钥正从 %s 得到更新\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:249
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "加密过的会话密钥尺寸(%d)诡异\n"
 
-#: g10/mainproc.c:262
-#, c-format
-msgid "bad passphrase or unknown cipher algorithm (%d)\n"
-msgstr "密码不正确或未知的对称加密算法(%d)\n"
-
-#: g10/mainproc.c:299
+#: g10/mainproc.c:300
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s 加密过的会话密钥\n"
 
-#: g10/mainproc.c:309
+#: g10/mainproc.c:310
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "密码由未知的散列算法 %d 生成\n"
 
-#: g10/mainproc.c:375
+#: g10/mainproc.c:376
 #, c-format
 msgid "public key is %s\n"
 msgstr "公钥是 %s\n"
 
-#: g10/mainproc.c:430
+#: g10/mainproc.c:431
 msgid "public key encrypted data: good DEK\n"
 msgstr "公钥加密过的数据：完好的数据加密密钥\n"
 
-#: g10/mainproc.c:463
+#: g10/mainproc.c:464
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "由 %u 位的 %s 密钥加密，钥匙号为 %s、生成于 %s\n"
 
-#: g10/mainproc.c:467 g10/pkclist.c:218
+#: g10/mainproc.c:468 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      “%s”\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:472
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "由 %s 密钥加密、钥匙号为 %s\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "公钥解密失败：%s\n"
 
-#: g10/mainproc.c:499
+#: g10/mainproc.c:500
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "以 %lu 个密码加密\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:502
 msgid "encrypted with 1 passphrase\n"
 msgstr "以 1 个密码加密\n"
 
-#: g10/mainproc.c:529 g10/mainproc.c:551
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "假定 %s 为加密过的数据\n"
 
-#: g10/mainproc.c:537
+#: g10/mainproc.c:538
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA 算法不可用，试以 %s 代替\n"
 
-#: g10/mainproc.c:569
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr "解密成功\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:574
 msgid "WARNING: message was not integrity protected\n"
 msgstr "警告：报文未受到完整的保护\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "警告：加密过的报文已经变造！\n"
 
-#: g10/mainproc.c:592
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "解密失败：%s\n"
@@ -4133,297 +4177,286 @@ msgstr "注意：发件者要求您“只阅读不存盘”\n"
 msgid "original file name='%.*s'\n"
 msgstr "原始文件名 =‘%.*s’\n"
 
-#: g10/mainproc.c:786
+#: g10/mainproc.c:803
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "独立的吊销证书――请用“gpg --import”来应用\n"
 
-#: g10/mainproc.c:1290
+#: g10/mainproc.c:1307
 msgid "signature verification suppressed\n"
 msgstr "签字验证已被抑制\n"
 
-#: g10/mainproc.c:1332 g10/mainproc.c:1342
+#: g10/mainproc.c:1349 g10/mainproc.c:1359
 msgid "can't handle these multiple signatures\n"
 msgstr "无法处理这些多重签字\n"
 
-#: g10/mainproc.c:1352
+#: g10/mainproc.c:1369
 #, c-format
 msgid "Signature made %s\n"
 msgstr "签字建立于 %s\n"
 
-#: g10/mainproc.c:1353
+#: g10/mainproc.c:1370
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "              使用 %s 密钥 %s\n"
 
-#: g10/mainproc.c:1357
+#: g10/mainproc.c:1374
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "于 %s 创建的签字，使用 %s，钥匙号 %s\n"
 
-#: g10/mainproc.c:1377
+#: g10/mainproc.c:1394
 msgid "Key available at: "
 msgstr "可用的密钥在："
 
-#: g10/mainproc.c:1482 g10/mainproc.c:1530
+#: g10/mainproc.c:1499 g10/mainproc.c:1547
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "已损坏的签字，来自于“%s”"
 
-#: g10/mainproc.c:1484 g10/mainproc.c:1532
+#: g10/mainproc.c:1501 g10/mainproc.c:1549
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "过期的签字，来自于“%s”"
 
-#: g10/mainproc.c:1486 g10/mainproc.c:1534
+#: g10/mainproc.c:1503 g10/mainproc.c:1551
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "完好的签字，来自于“%s”"
 
-#: g10/mainproc.c:1538
+#: g10/mainproc.c:1555
 msgid "[uncertain]"
 msgstr "[不确定]"
 
-#: g10/mainproc.c:1570
+#: g10/mainproc.c:1587
 #, c-format
 msgid "                aka \"%s\""
 msgstr "              亦即“%s”"
 
-#: g10/mainproc.c:1664
+#: g10/mainproc.c:1681
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "这份签字已于 %s 过期。\n"
 
-#: g10/mainproc.c:1669
+#: g10/mainproc.c:1686
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "这份签字在 %s 过期。\n"
 
-#: g10/mainproc.c:1672
+#: g10/mainproc.c:1689
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
-msgstr "%s签字，散列算法 %s\n"
+msgstr "%s 签字，散列算法 %s\n"
 
-#: g10/mainproc.c:1673
+#: g10/mainproc.c:1690
 msgid "binary"
 msgstr "二进制"
 
-#: g10/mainproc.c:1674
+#: g10/mainproc.c:1691
 msgid "textmode"
 msgstr "文本模式"
 
-#: g10/mainproc.c:1674 g10/trustdb.c:530
+#: g10/mainproc.c:1691 g10/trustdb.c:531
 msgid "unknown"
 msgstr "未知"
 
-#: g10/mainproc.c:1694
+#: g10/mainproc.c:1711
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "无法检查签字：%s\n"
 
-#: g10/mainproc.c:1762 g10/mainproc.c:1778 g10/mainproc.c:1864
+#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
 msgid "not a detached signature\n"
 msgstr "不是一份分离的签字\n"
 
-#: g10/mainproc.c:1805
+#: g10/mainproc.c:1822
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "警告：检测到多重签字。只检查第一个签字。\n"
 
-#: g10/mainproc.c:1813
+#: g10/mainproc.c:1830
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "等级 0x%02x 的独立签字\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1887
 msgid "old style (PGP 2.x) signature\n"
 msgstr "旧式(PGP 2.x)签字\n"
 
-#: g10/mainproc.c:1880
+#: g10/mainproc.c:1897
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "在 proc_tree() 中检测到无效的根包\n"
 
-#: g10/misc.c:121
+#: g10/misc.c:122
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "无法禁用核心内存转储：%s\n"
 
-#: g10/misc.c:141 g10/misc.c:169 g10/misc.c:241
+#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "‘%s’的 fstat 在 %s 中出错：%s\n"
 
-#: g10/misc.c:206
+#: g10/misc.c:207
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) 在 %s 中出错：%s\n"
 
-#: g10/misc.c:315
-#, fuzzy, c-format
+#: g10/misc.c:316
+#, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
-msgstr "无法操作公钥算法 %d\n"
+msgstr "警告: 使用试验性质的公钥算法 %s\n"
 
-#: g10/misc.c:330
-#, fuzzy, c-format
+#: g10/misc.c:331
+#, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
-msgstr "尚未实现的对称加密算法"
+msgstr "警告：使用试验性质的对称加密算法 %s\n"
 
-#: g10/misc.c:345
-#, fuzzy, c-format
+#: g10/misc.c:346
+#, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
-msgstr "%s签字，散列算法 %s\n"
+msgstr "警告：使用试验性质的散列算法 %s\n"
 
-#: g10/misc.c:350
-#, fuzzy, c-format
+#: g10/misc.c:351
+#, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
-msgstr "警告：强行使用的 %s (%d)散列算法不在收件者的首选项中\n"
+msgstr "警告：不建议使用散列算法 %s\n"
 
-#: g10/misc.c:446
+#: g10/misc.c:447
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA 算法插件不存在\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:448
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr "请访问 http://www.gnupg.org/why-not-idea.html 以获得更详细的信息\n"
 
-#: g10/misc.c:680
+#: g10/misc.c:681
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d：不建议使用该选项“%s”\n"
 
-#: g10/misc.c:684
+#: g10/misc.c:685
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "警告：“%s”选项已不建议使用\n"
 
-#: g10/misc.c:686
+#: g10/misc.c:687
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "请以“%s%s”代替\n"
 
-#: g10/misc.c:697
+#: g10/misc.c:694
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
+msgstr "警告：“%s”选项已不建议使用\n"
+
+#: g10/misc.c:707
 msgid "Uncompressed"
 msgstr "不压缩"
 
-#: g10/misc.c:722
+#: g10/misc.c:732
 msgid "uncompressed|none"
 msgstr "未压缩|无"
 
-#: g10/misc.c:832
+#: g10/misc.c:842
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "%s 也许不能使用这个报文\n"
 
-#: g10/misc.c:989
+#: g10/misc.c:999
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "有歧义的选项‘%s’\n"
 
-#: g10/misc.c:1014
+#: g10/misc.c:1024
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "未知的选项 '%s'\n"
 
-#: g10/openfile.c:84
+#: g10/openfile.c:86
 #, c-format
 msgid "File `%s' exists. "
 msgstr "文件‘%s’已存在。 "
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 msgid "Overwrite? (y/N) "
 msgstr "是否覆盖？(y/N)"
 
-#: g10/openfile.c:119
+#: g10/openfile.c:121
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s：未知的后缀名\n"
 
-#: g10/openfile.c:141
+#: g10/openfile.c:143
 msgid "Enter new filename"
 msgstr "请输入新的文件名"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:188
 msgid "writing to stdout\n"
 msgstr "正在写入到标准输出\n"
 
-#: g10/openfile.c:296
+#: g10/openfile.c:300
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "假定被签字的数据是‘%s’\n"
 
-#: g10/openfile.c:375
+#: g10/openfile.c:379
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "新的配置文件‘%s’已建立\n"
 
-#: g10/openfile.c:377
+#: g10/openfile.c:381
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "警告：在‘%s’里的选项于此次运行期间未被使用\n"
 
-#: g10/openfile.c:409
+#: g10/openfile.c:413
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "已创建目录‘%s’\n"
 
-#: g10/parse-packet.c:137
+#: g10/parse-packet.c:138
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "无法操作公钥算法 %d\n"
 
-#: g10/parse-packet.c:707
+#: g10/parse-packet.c:708
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "警告：潜在不安全的对称加密会话密钥\n"
 
-#: g10/parse-packet.c:1132
+#: g10/parse-packet.c:1145
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d 类别的子包设定了关键位\n"
 
-#: g10/passphrase.c:478 g10/passphrase.c:525
+#: g10/passphrase.c:305
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent 在此次舍话中无法使用\n"
 
-#: g10/passphrase.c:486
-msgid "can't set client pid for the agent\n"
-msgstr "无法设定代理程序客户端的进程标识\n"
-
-#: g10/passphrase.c:494
-msgid "can't get server read FD for the agent\n"
-msgstr "无法取得代理程序所需的服务器读取文件描述符\n"
-
-#: g10/passphrase.c:501
-msgid "can't get server write FD for the agent\n"
-msgstr "无法取得代理程序所需的服务器写入文件描述符\n"
-
-#: g10/passphrase.c:534
+#: g10/passphrase.c:317
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO 环境变量格式错误\n"
 
-#: g10/passphrase.c:547
+#: g10/passphrase.c:332
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "不支持 gpg-agent 协议版本 %d\n"
 
-#: g10/passphrase.c:568
+#: g10/passphrase.c:345
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "无法连接至‘%s’：%s\n"
 
-#: g10/passphrase.c:590
-msgid "communication problem with gpg-agent\n"
-msgstr "与 gpg-agent 通讯有问题\n"
-
-#: g10/passphrase.c:597 g10/passphrase.c:937 g10/passphrase.c:1049
+#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
 msgid "problem with the agent - disabling agent use\n"
-msgstr "代理程序的问题――正在停用代理程序\n"
+msgstr "代理程序有问题――正在停用代理程序\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1209
+#: g10/passphrase.c:511 g10/passphrase.c:890
 #, c-format
 msgid " (main key ID %s)"
-msgstr "(主钥匙号 %s)"
+msgstr " (主钥匙号 %s)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:525
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4434,61 +4467,48 @@ msgstr ""
 "“%.*s”\n"
 "%u 位的 %s 密钥，钥匙号 %s，建立于 %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:550
 msgid "Repeat passphrase\n"
 msgstr "请再输入一次密码\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:552
 msgid "Enter passphrase\n"
 msgstr "请输入密码\n"
 
-#: g10/passphrase.c:781
-msgid "passphrase too long\n"
-msgstr "密码太长\n"
-
-#: g10/passphrase.c:794
-msgid "invalid response from agent\n"
-msgstr "代理程序响应无效\n"
-
-#: g10/passphrase.c:810 g10/passphrase.c:931
+#: g10/passphrase.c:628
 msgid "cancelled by user\n"
 msgstr "用户取消\n"
 
-#: g10/passphrase.c:815 g10/passphrase.c:1020
-#, c-format
-msgid "problem with the agent: agent returns 0x%lx\n"
-msgstr "代理程序的问题：代理程序返回 0x%lx\n"
-
-#: g10/passphrase.c:1100 g10/passphrase.c:1263
+#: g10/passphrase.c:781 g10/passphrase.c:944
 msgid "can't query passphrase in batch mode\n"
 msgstr "在批处理模式中无法查询密码\n"
 
-#: g10/passphrase.c:1107 g10/passphrase.c:1268
+#: g10/passphrase.c:788 g10/passphrase.c:949
 msgid "Enter passphrase: "
 msgstr "请输入密码："
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:871
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
 "user: \"%s\"\n"
 msgstr "您需要输入密码，才能解开这个用户的私钥：“%s”\n"
 
-#: g10/passphrase.c:1196
+#: g10/passphrase.c:877
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u 位的 %s 密钥，钥匙号 %s，建立于 %s"
 
-#: g10/passphrase.c:1205
+#: g10/passphrase.c:886
 #, c-format
 msgid "         (subkey on main key ID %s)"
-msgstr "        (主钥 %s 的子钥)"
+msgstr "         (主钥 %s 的子钥)"
 
-#: g10/passphrase.c:1272
+#: g10/passphrase.c:953
 msgid "Repeat passphrase: "
 msgstr "请再输入一次密码："
 
-#: g10/photoid.c:66
+#: g10/photoid.c:67
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4501,112 +4521,112 @@ msgstr ""
 "片会被存放在您的公钥里。如果您挑了非常大的图片的话，您的密钥也会变得非\n"
 "常大！请尽量把图片尺寸控制在240x288左右，这是个理想的尺寸。\n"
 
-#: g10/photoid.c:80
+#: g10/photoid.c:81
 msgid "Enter JPEG filename for photo ID: "
 msgstr "输入要当作相片标识的JPEG文件名： "
 
-#: g10/photoid.c:94
+#: g10/photoid.c:95
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "无法打开 JPEG 文件‘%s’：%s\n"
 
-#: g10/photoid.c:102
+#: g10/photoid.c:103
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "这个 JPEG 文件太大了(%d 字节)！\n"
 
-#: g10/photoid.c:104
+#: g10/photoid.c:105
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "您确定要用它吗？(y/N)"
 
-#: g10/photoid.c:119
+#: g10/photoid.c:120
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "“%s”不是一个 JPEG 文件\n"
 
-#: g10/photoid.c:136
+#: g10/photoid.c:137
 msgid "Is this photo correct (y/N/q)? "
 msgstr "这张照片正确吗？(y/N/q)"
 
-#: g10/photoid.c:338
+#: g10/photoid.c:339
 msgid "unable to display photo ID!\n"
 msgstr "无法显示照片标识！\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:580
+#: g10/pkclist.c:62 g10/revoke.c:581
 msgid "No reason specified"
 msgstr "未指定原因"
 
-#: g10/pkclist.c:63 g10/revoke.c:582
+#: g10/pkclist.c:64 g10/revoke.c:583
 msgid "Key is superseded"
 msgstr "密钥被替换"
 
-#: g10/pkclist.c:65 g10/revoke.c:581
+#: g10/pkclist.c:66 g10/revoke.c:582
 msgid "Key has been compromised"
 msgstr "密钥已泄漏"
 
-#: g10/pkclist.c:67 g10/revoke.c:583
+#: g10/pkclist.c:68 g10/revoke.c:584
 msgid "Key is no longer used"
 msgstr "密钥不再使用"
 
-#: g10/pkclist.c:69 g10/revoke.c:584
+#: g10/pkclist.c:70 g10/revoke.c:585
 msgid "User ID is no longer valid"
 msgstr "用户标识不再有效"
 
-#: g10/pkclist.c:73
+#: g10/pkclist.c:74
 msgid "reason for revocation: "
 msgstr "吊销原因："
 
-#: g10/pkclist.c:90
+#: g10/pkclist.c:91
 msgid "revocation comment: "
 msgstr "吊销注释："
 
 #  a string with valid answers
-#: g10/pkclist.c:205
+#: g10/pkclist.c:206
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:213
+#: g10/pkclist.c:214
 msgid "No trust value assigned to:\n"
 msgstr "下列项目没有指定信任度：\n"
 
-#: g10/pkclist.c:245
+#: g10/pkclist.c:246
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "  亦即“%s”\n"
 
-#: g10/pkclist.c:255
+#: g10/pkclist.c:256
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "您是否相信这把密钥属于它所声称的持有者？\n"
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:271
 #, c-format
 msgid "  %d = I don't know or won't say\n"
-msgstr " %d = 我不知道或我不作答\n"
+msgstr "  %d = 我不知道或我不作答\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, c-format
 msgid "  %d = I do NOT trust\n"
-msgstr " %d = 我不相信\n"
+msgstr "  %d = 我不相信\n"
 
-#: g10/pkclist.c:278
+#: g10/pkclist.c:279
 #, c-format
 msgid "  %d = I trust ultimately\n"
-msgstr " %d = 我绝对相信\n"
+msgstr "  %d = 我绝对相信\n"
 
-#: g10/pkclist.c:284
+#: g10/pkclist.c:285
 msgid "  m = back to the main menu\n"
-msgstr " m = 回到主菜单\n"
+msgstr "  m = 回到主菜单\n"
 
-#: g10/pkclist.c:287
+#: g10/pkclist.c:288
 msgid "  s = skip this key\n"
-msgstr " s = 跳过这把密钥\n"
+msgstr "  s = 跳过这把密钥\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 msgid "  q = quit\n"
 msgstr "  q = 退出\n"
 
-#: g10/pkclist.c:292
+#: g10/pkclist.c:293
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
@@ -4615,37 +4635,37 @@ msgstr ""
 "这把密钥的最小信任等级为：%s\n"
 "\n"
 
-#: g10/pkclist.c:298 g10/revoke.c:609
+#: g10/pkclist.c:299 g10/revoke.c:610
 msgid "Your decision? "
 msgstr "您的决定是什么？"
 
-#: g10/pkclist.c:319
+#: g10/pkclist.c:320
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "您真的要把这把密钥设成绝对信任？(y/N)"
 
-#: g10/pkclist.c:333
+#: g10/pkclist.c:334
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "被绝对信任的密钥的证书：\n"
 
-#: g10/pkclist.c:418
+#: g10/pkclist.c:419
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr "%s：没有证据表明这把密钥真的属于它所声称的持有者\n"
 
-#: g10/pkclist.c:423
+#: g10/pkclist.c:424
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr "%s：只有有限的证据表明这把密钥属于它所声称的持有者\n"
 
-#: g10/pkclist.c:429
+#: g10/pkclist.c:430
 msgid "This key probably belongs to the named user\n"
 msgstr "这把密钥有可能属于它所声称的持有者\n"
 
-#: g10/pkclist.c:434
+#: g10/pkclist.c:435
 msgid "This key belongs to us\n"
 msgstr "这把密钥是属于我们的\n"
 
-#: g10/pkclist.c:460
+#: g10/pkclist.c:461
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -4654,87 +4674,87 @@ msgstr ""
 "这把密钥并不一定属于用户标识声称的那个人。如果您真的知道自\n"
 "己在做什么，您可以在下一个问题回答 yes。\n"
 
-#: g10/pkclist.c:467
+#: g10/pkclist.c:468
 msgid "Use this key anyway? (y/N) "
 msgstr "无论如何还是使用这把密钥吗？(y/N)"
 
-#: g10/pkclist.c:501
+#: g10/pkclist.c:502
 msgid "WARNING: Using untrusted key!\n"
 msgstr "警告：正在使用不被信任的密钥！\n"
 
-#: g10/pkclist.c:508
+#: g10/pkclist.c:509
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "警告：此密钥可能已被吊销(吊销密钥不存在)\n"
 
-#: g10/pkclist.c:517
+#: g10/pkclist.c:518
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "警告：这把密钥已经被它的指定吊销者吊销了！\n"
 
-#: g10/pkclist.c:520
+#: g10/pkclist.c:521
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "警告：这把密钥已经被它的持有者吊销了！\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 msgid "         This could mean that the signature is forged.\n"
-msgstr "         这表明这个签字有可能是伪造的。\n"
+msgstr "      这表明这个签字有可能是伪造的。\n"
 
-#: g10/pkclist.c:527
+#: g10/pkclist.c:528
 msgid "WARNING: This subkey has been revoked by its owner!\n"
-msgstr "警告：这把子钥已经被它的持有人吊销了！\n"
+msgstr "警告：这把子钥已经被它的持有者吊销了！\n"
 
-#: g10/pkclist.c:532
+#: g10/pkclist.c:533
 msgid "Note: This key has been disabled.\n"
 msgstr "注意：这把密钥已经被禁用了。\n"
 
-#: g10/pkclist.c:537
+#: g10/pkclist.c:538
 msgid "Note: This key has expired!\n"
 msgstr "注意：这把密钥已经过期了！\n"
 
-#: g10/pkclist.c:548
+#: g10/pkclist.c:549
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "警告：这把密钥未经受信任的签字认证！\n"
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:551
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "      没有证据表明这个签字属于它所声称的持有者。\n"
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:559
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "警告：我们不信任这把密钥！\n"
 
-#: g10/pkclist.c:559
+#: g10/pkclist.c:560
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "      这个签字很有可能是伪造的。\n"
 
-#: g10/pkclist.c:567
+#: g10/pkclist.c:568
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "警告：这把密钥未经有足够信任度的签字所认证。\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:570
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "      这份签字并不一定属于它所声称的持有者\n"
 
-#: g10/pkclist.c:734 g10/pkclist.c:767 g10/pkclist.c:936 g10/pkclist.c:996
+#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s：已跳过：%s\n"
 
-#: g10/pkclist.c:744 g10/pkclist.c:968
+#: g10/pkclist.c:745 g10/pkclist.c:969
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: 已跳过：公钥已存在\n"
 
-#: g10/pkclist.c:786
+#: g10/pkclist.c:787
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "您没有指定用户标识。(您可以在命令行中用“-r”指定)\n"
 
-#: g10/pkclist.c:802
+#: g10/pkclist.c:803
 msgid "Current recipients:\n"
 msgstr "当前收件人：\n"
 
-#: g10/pkclist.c:828
+#: g10/pkclist.c:829
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -4742,166 +4762,166 @@ msgstr ""
 "\n"
 "输入用户标识。以空白行结束："
 
-#: g10/pkclist.c:844
+#: g10/pkclist.c:845
 msgid "No such user ID.\n"
 msgstr "没有这个用户标识。\n"
 
-#: g10/pkclist.c:849 g10/pkclist.c:911
+#: g10/pkclist.c:850 g10/pkclist.c:912
 msgid "skipped: public key already set as default recipient\n"
 msgstr "已跳过：公钥已被设为默认收件者\n"
 
-#: g10/pkclist.c:867
+#: g10/pkclist.c:868
 msgid "Public key is disabled.\n"
 msgstr "公钥被禁用。\n"
 
-#: g10/pkclist.c:874
+#: g10/pkclist.c:875
 msgid "skipped: public key already set\n"
 msgstr "已跳过：公钥已被设定\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:904
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "未知的默认收件者“%s”\n"
 
-#: g10/pkclist.c:948
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s：已跳过：公钥已被禁用\n"
 
-#: g10/pkclist.c:1003
+#: g10/pkclist.c:1004
 msgid "no valid addressees\n"
 msgstr "没有有效的地址\n"
 
-#: g10/plaintext.c:90
+#: g10/plaintext.c:91
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "数据未被保存；请用“--output”选项来保存它们\n"
 
-#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
+#: g10/plaintext.c:136 g10/plaintext.c:141 g10/plaintext.c:159
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "建立‘%s’时发生错误：%s\n"
 
-#: g10/plaintext.c:446
+#: g10/plaintext.c:447
 msgid "Detached signature.\n"
 msgstr "分离的签字。\n"
 
-#: g10/plaintext.c:450
+#: g10/plaintext.c:452
 msgid "Please enter name of data file: "
 msgstr "请输入数据文件的名称： "
 
-#: g10/plaintext.c:478
+#: g10/plaintext.c:481
 msgid "reading stdin ...\n"
 msgstr "正在从标准输入读取 ...\n"
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:515
 msgid "no signed data\n"
 msgstr "不含签字的数据\n"
 
-#: g10/plaintext.c:526
+#: g10/plaintext.c:529
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "无法打开有签字的数据‘%s’\n"
 
-#: g10/pubkey-enc.c:103
+#: g10/pubkey-enc.c:104
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "匿名收件者；正在尝试使用私钥 %s ……\n"
 
-#: g10/pubkey-enc.c:119
+#: g10/pubkey-enc.c:120
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "很好，我们就是匿名收件者。\n"
 
-#: g10/pubkey-enc.c:207
+#: g10/pubkey-enc.c:208
 msgid "old encoding of the DEK is not supported\n"
 msgstr "不支持旧式的 DEK 编码\n"
 
-#: g10/pubkey-enc.c:228
+#: g10/pubkey-enc.c:229
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "对称加密算法 %d%s 未知或已停用\n"
 
-#: g10/pubkey-enc.c:266
+#: g10/pubkey-enc.c:267
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "注意：收件人的首选项中找不到加密算法 %s\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:287
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "注意：私钥 %s 已于 %s 过期\n"
 
-#: g10/pubkey-enc.c:292
+#: g10/pubkey-enc.c:293
 msgid "NOTE: key has been revoked"
 msgstr "注意：密钥已被吊销"
 
-#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:545
+#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
+#: g10/revoke.c:188 g10/revoke.c:546
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet 失败：%s\n"
 
-#: g10/revoke.c:146
+#: g10/revoke.c:147
 #, c-format
 msgid "key %s has no user IDs\n"
 msgstr "密钥 %s：没有有效的用户标识\n"
 
-#: g10/revoke.c:272
+#: g10/revoke.c:273
 msgid "To be revoked by:\n"
 msgstr "将被吊销，吊销者：\n"
 
-#: g10/revoke.c:276
+#: g10/revoke.c:277
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(这是一把敏感的吊销密钥)\n"
 
-#: g10/revoke.c:280
+#: g10/revoke.c:281
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "要为这把密钥建立一份指定吊销者证书吗？(y/N)"
 
-#: g10/revoke.c:293 g10/revoke.c:511
+#: g10/revoke.c:294 g10/revoke.c:512
 msgid "ASCII armored output forced.\n"
 msgstr "已强行使用 ASCII 封装过的输出。\n"
 
-#: g10/revoke.c:307 g10/revoke.c:525
+#: g10/revoke.c:308 g10/revoke.c:526
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet 失败： %s\n"
 
-#: g10/revoke.c:370
+#: g10/revoke.c:371
 msgid "Revocation certificate created.\n"
 msgstr "已建立吊销证书。\n"
 
-#: g10/revoke.c:376
+#: g10/revoke.c:377
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "没有找到“%s”的吊销密钥\n"
 
-#: g10/revoke.c:432
+#: g10/revoke.c:433
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "找不到私钥“%s”：%s\n"
 
-#: g10/revoke.c:461
+#: g10/revoke.c:462
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "没有相对应的公钥：%s\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:473
 msgid "public key does not match secret key!\n"
 msgstr "公钥与私钥不吻合！\n"
 
-#: g10/revoke.c:479
+#: g10/revoke.c:480
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "要为这把密钥建立一份吊销证书吗？(y/N)"
 
-#: g10/revoke.c:496
+#: g10/revoke.c:497
 msgid "unknown protection algorithm\n"
 msgstr "未知的保护算法\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 msgid "NOTE: This key is not protected!\n"
 msgstr "注意：这把密钥没有被保护！\n"
 
-#: g10/revoke.c:551
+#: g10/revoke.c:552
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -4919,231 +4939,231 @@ msgstr ""
 "小心：您的机器上的打印系统可能会在打印过程中把这些数据临时在某个其他\n"
 "人也能够看得到的地方！\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid "Please select the reason for the revocation:\n"
 msgstr "请选择吊销的原因：\n"
 
-#: g10/revoke.c:602
+#: g10/revoke.c:603
 msgid "Cancel"
 msgstr "取消"
 
-#: g10/revoke.c:604
+#: g10/revoke.c:605
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(也许您会想要在这里选择 %d)\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:646
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "请输入描述(可选)；以空白行结束：\n"
 
-#: g10/revoke.c:673
+#: g10/revoke.c:674
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "吊销原因：%s\n"
 
-#: g10/revoke.c:675
+#: g10/revoke.c:676
 msgid "(No description given)\n"
 msgstr "(不给定描述)\n"
 
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 msgid "Is this okay? (y/N) "
-msgstr "这样可以吗？ "
+msgstr "这样可以吗？ (y/N)"
 
-#: g10/seckey-cert.c:54
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "私钥部分不可用\n"
 
-#: g10/seckey-cert.c:60
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "保护算法 %d%s 未被支持\n"
 
-#: g10/seckey-cert.c:71
+#: g10/seckey-cert.c:72
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "不支持保护散列 %d\n"
 
-#: g10/seckey-cert.c:265
+#: g10/seckey-cert.c:266
 msgid "Invalid passphrase; please try again"
 msgstr "无效的密码；请再试一次"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:267
 #, c-format
 msgid "%s ...\n"
 msgstr "%s……\n"
 
-#: g10/seckey-cert.c:326
+#: g10/seckey-cert.c:327
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "警告：检测到弱密钥――请更换密码。\n"
 
-#: g10/seckey-cert.c:364
+#: g10/seckey-cert.c:365
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr "正在产生私钥保护使用的旧式 16 位校验和\n"
 
-#: g10/seskey.c:52
+#: g10/seskey.c:53
 msgid "weak key created - retrying\n"
 msgstr "建立了弱密钥――正在重试\n"
 
-#: g10/seskey.c:57
+#: g10/seskey.c:58
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr "对称加密无法避免生成弱密钥；已经尝试 %d 次！\n"
 
-#: g10/seskey.c:213
+#: g10/seskey.c:214
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA 要求使用 160 位的散列算法\n"
 
-#: g10/sig-check.c:75
+#: g10/sig-check.c:76
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "警告：签字散列值与报文不一致\n"
 
-#: g10/sig-check.c:99
+#: g10/sig-check.c:100
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "警告：正要签字的子钥 %s 未经交叉验证\n"
 
-#: g10/sig-check.c:102
+#: g10/sig-check.c:103
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "警告：正要签字的子钥 %s 交叉验证无效\n"
 
-#: g10/sig-check.c:168
+#: g10/sig-check.c:169
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "公钥 %s 在其签字后 %lu 秒生成\n"
 
-#: g10/sig-check.c:169
+#: g10/sig-check.c:170
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "公钥 %s 在其签字后 %lu 秒生成\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:181
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr "密钥 %s 是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:183
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr "密钥 %s 是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:193
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "注意：签字密钥 %s 已于 %s 过期\n"
 
-#: g10/sig-check.c:275
+#: g10/sig-check.c:276
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "假定密钥 %s 的签字由于某个未知的关键位出错而损坏\n"
 
-#: g10/sig-check.c:532
+#: g10/sig-check.c:533
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "密钥 %s：没有子钥吊销签字所需的子钥\n"
 
-#: g10/sig-check.c:558
+#: g10/sig-check.c:559
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "密钥 %s：没有子钥绑定签字所需的子钥\n"
 
-#: g10/sign.c:85
+#: g10/sign.c:86
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr "无法在 v3 (PGP 2.x样式)的签字内放入标记数据\n"
 
-#: g10/sign.c:93
+#: g10/sign.c:94
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr "无法在 v3 (PGP 2.x样式)的密钥签字内放入标记数据\n"
 
-#: g10/sign.c:112
+#: g10/sign.c:113
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr "警告：标记 %% 无法扩展(太大了)。现在使用未扩展的。\n"
 
-#: g10/sign.c:138
+#: g10/sign.c:139
 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:146
+#: g10/sign.c:147
 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:159
+#: g10/sign.c:160
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr "警告：无法 %%-扩展策略 URL (太大了)。现在使用未扩展的。\n"
 
-#: g10/sign.c:187
+#: g10/sign.c:188
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr "警告：无法 %%-扩展首选公钥服务器 URL (太大了)。现在使用未扩展的。\n"
 
-#: g10/sign.c:364
+#: g10/sign.c:365
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "检查已建立的签字时发生错误： %s\n"
 
-#: g10/sign.c:373
+#: g10/sign.c:374
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s 签字来自：“%s”\n"
 
-#: g10/sign.c:741
+#: g10/sign.c:761
 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:808
+#: g10/sign.c:830
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "警告：强行使用的 %s (%d)散列算法不在收件者的首选项中\n"
 
-#: g10/sign.c:900
+#: g10/sign.c:922
 msgid "signing:"
 msgstr "正在签字："
 
-#: g10/sign.c:1007
+#: g10/sign.c:1034
 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:1180
+#: g10/sign.c:1212
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s 加密将被采用\n"
 
-#: g10/skclist.c:126 g10/skclist.c:190
+#: g10/skclist.c:127 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "密钥未被标示为不安全――不能与假的随机数发生器共同使用！\n"
 
-#: g10/skclist.c:157
+#: g10/skclist.c:158
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "“%s”已跳过：重复\n"
 
-#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "“%s”已跳过：%s\n"
 
-#: g10/skclist.c:170
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "已跳过：私钥已存在\n"
 
-#: g10/skclist.c:185
+#: g10/skclist.c:186
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr "这是一把由 PGP 生成的 ElGamal 密钥，用于签字不安全！"
 
-#: g10/tdbdump.c:59 g10/trustdb.c:365
+#: g10/tdbdump.c:60 g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "信任记录 %lu，类别 %d：写入失败：%s\n"
 
-#: g10/tdbdump.c:104
+#: g10/tdbdump.c:105
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5152,346 +5172,341 @@ msgstr ""
 "# 已指定的信任度的清单，建立于 %s \n"
 "# (请用“gpg --import-ownertrust”导入这些信任度)\n"
 
-#: g10/tdbdump.c:159 g10/tdbdump.c:167 g10/tdbdump.c:172 g10/tdbdump.c:177
+#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
 #, c-format
 msgid "error in `%s': %s\n"
 msgstr "‘%s’中出错：%s\n"
 
-#: g10/tdbdump.c:159
+#: g10/tdbdump.c:160
 msgid "line too long"
 msgstr "列太长"
 
-#: g10/tdbdump.c:167
+#: g10/tdbdump.c:168
 msgid "colon missing"
 msgstr "冒号缺失"
 
-#: g10/tdbdump.c:173
+#: g10/tdbdump.c:174
 msgid "invalid fingerprint"
 msgstr "指纹无效"
 
-#: g10/tdbdump.c:178
+#: g10/tdbdump.c:179
 msgid "ownertrust value missing"
 msgstr "没有信任度"
 
-#: g10/tdbdump.c:214
+#: g10/tdbdump.c:215
 #, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
 
-#: g10/tdbdump.c:218
+#: g10/tdbdump.c:219
 #, c-format
 msgid "read error in `%s': %s\n"
 msgstr "读取‘%s’错误：%s\n"
 
-#: g10/tdbdump.c:227 g10/trustdb.c:380
+#: g10/tdbdump.c:228 g10/trustdb.c:381
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "信任度数据库：同步失败：%s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1440
+#: g10/tdbio.c:129 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
-msgstr "信任度数据库记录 %lu：本地搜索失败：%s\n"
+msgstr "信任度数据库记录 %lu：lseek 失败：%s\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1447
+#: g10/tdbio.c:135 g10/tdbio.c:1448
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
-msgstr "信任度数据库记录 %lu：写入失败 (n=%d): %s\n"
+msgstr "信任度数据库记录 %lu：write 失败 (n=%d): %s\n"
 
-#: g10/tdbio.c:244
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "信任度数据库处理量过大\n"
 
-#: g10/tdbio.c:497
+#: g10/tdbio.c:498
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "无法存取‘%s’：%s\n"
 
-#: g10/tdbio.c:512
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s：目录不存在！\n"
 
-#: g10/tdbio.c:522 g10/tdbio.c:545 g10/tdbio.c:588
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "不能为‘%s’创建锁定\n"
 
-#: g10/tdbio.c:524 g10/tdbio.c:591
+#: g10/tdbio.c:525 g10/tdbio.c:592
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "无法锁定‘%s’\n"
 
-#: g10/tdbio.c:550
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s：建立版本记录失败：%s"
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s：建立了无效的信任度数据库\n"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s：建立了信任度数据库\n"
 
-#: g10/tdbio.c:597
+#: g10/tdbio.c:598
 msgid "NOTE: trustdb not writable\n"
 msgstr "注意：信任度数据库不可写入\n"
 
-#: g10/tdbio.c:614
+#: g10/tdbio.c:615
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s：无效的信任度数据库\n"
 
-#: g10/tdbio.c:646
+#: g10/tdbio.c:647
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s：建立散列表失败：%s\n"
 
-#: g10/tdbio.c:654
+#: g10/tdbio.c:655
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s：更新版本记录时出错： %s\n"
 
-#: g10/tdbio.c:671 g10/tdbio.c:691 g10/tdbio.c:707 g10/tdbio.c:721
-#: g10/tdbio.c:751 g10/tdbio.c:1373 g10/tdbio.c:1400
+#: g10/tdbio.c:672 g10/tdbio.c:692 g10/tdbio.c:708 g10/tdbio.c:722
+#: g10/tdbio.c:752 g10/tdbio.c:1374 g10/tdbio.c:1401
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s：读取版本记录时出错： %s\n"
 
-#: g10/tdbio.c:730
+#: g10/tdbio.c:731
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s：写入版本记录时出错：%s\n"
 
-#: g10/tdbio.c:1169
+#: g10/tdbio.c:1170
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
-msgstr "信任度数据库：本地搜索失败：%s\n"
+msgstr "信任度数据库：lseek 失败：%s\n"
 
-#: g10/tdbio.c:1177
+#: g10/tdbio.c:1178
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
-msgstr "信任度数据库：读取失败(n=%d)：%s\n"
+msgstr "信任度数据库：read 失败(n=%d)：%s\n"
 
-#: g10/tdbio.c:1198
+#: g10/tdbio.c:1199
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s：不是一个信任度数据库文件\n"
 
-#: g10/tdbio.c:1216
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s：记录编号为%lu的版本记录\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1222
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s：无效的文件版本%d\n"
 
-#: g10/tdbio.c:1406
+#: g10/tdbio.c:1407
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s：读取自由记录时出错：%s\n"
 
-#: g10/tdbio.c:1414
+#: g10/tdbio.c:1415
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s：写入目录记录时出错：%s\n"
 
-#: g10/tdbio.c:1424
+#: g10/tdbio.c:1425
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s：记录归零时失败：%s\n"
 
-#: g10/tdbio.c:1454
+#: g10/tdbio.c:1455
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s：附加记录时失败：%s\n"
 
-#: g10/tdbio.c:1499
+#: g10/tdbio.c:1500
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "信任度数据库已损坏；请执行“gpg --fix-trustdb”。\n"
 
-#: g10/textfilter.c:147
+#: g10/textfilter.c:148
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "无法处理长于 %d 字符的文本行\n"
 
-#: g10/textfilter.c:244
+#: g10/textfilter.c:245
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "输入行长度超过 %d 字符\n"
 
-#: g10/trustdb.c:226
+#: g10/trustdb.c:227
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "‘%s’不是一个有效的长式钥匙号\n"
 
-#: g10/trustdb.c:257
+#: g10/trustdb.c:258
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "密钥 %s：受信任，已接受\n"
 
-#: g10/trustdb.c:295
+#: g10/trustdb.c:296
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "密钥 %s 在信任度数据库中重复出现\n"
 
-#: g10/trustdb.c:310
+#: g10/trustdb.c:311
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "密钥 %s：受信任的密钥没有公钥――已跳过\n"
 
-#: g10/trustdb.c:320
+#: g10/trustdb.c:321
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "密钥 %s 被标记为绝对信任\n"
 
-#: g10/trustdb.c:344
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "信任记录 %lu，请求类别 %d：读取失败：%s\n"
 
-#: g10/trustdb.c:350
+#: g10/trustdb.c:351
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "信任记录 %lu 不属于所请求的类别 %d\n"
 
-#: g10/trustdb.c:446
+#: g10/trustdb.c:447
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr "无法使用未知的信任模型(%d)――假定使用 %s 信任模型\n"
 
-#: g10/trustdb.c:452
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr "使用 %s 信任模型\n"
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
-msgstr ""
+msgstr "10 translator see trustdb.c:uid_trust_string_fixed"
 
-#: g10/trustdb.c:506
-#, fuzzy
+#: g10/trustdb.c:507
 msgid "[ revoked]"
-msgstr "已吊销"
+msgstr "[已吊销]"
 
-#: g10/trustdb.c:508 g10/trustdb.c:513
-#, fuzzy
+#: g10/trustdb.c:509 g10/trustdb.c:514
 msgid "[ expired]"
-msgstr "已过期"
+msgstr "[已过期]"
 
-#: g10/trustdb.c:512
-#, fuzzy
+#: g10/trustdb.c:513
 msgid "[ unknown]"
-msgstr "未知"
+msgstr "[ 未知 ]"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  undef ]"
-msgstr ""
+msgstr "[未定义]"
 
-#: g10/trustdb.c:515
-#, fuzzy
+#: g10/trustdb.c:516
 msgid "[marginal]"
-msgstr "勉强"
+msgstr "[ 勉强 ]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:517
 msgid "[  full  ]"
-msgstr ""
+msgstr "[ 完全 ]"
 
-#: g10/trustdb.c:517
-#, fuzzy
+#: g10/trustdb.c:518
 msgid "[ultimate]"
-msgstr "绝对"
+msgstr "[ 绝对 ]"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr "未定义"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 msgid "never"
 msgstr "从不"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr "勉强"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:536
 msgid "full"
 msgstr "完全"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr "绝对"
 
-#: g10/trustdb.c:576
+#: g10/trustdb.c:577
 msgid "no need for a trustdb check\n"
 msgstr "不需要检查信任度数据库\n"
 
-#: g10/trustdb.c:582 g10/trustdb.c:2157
+#: g10/trustdb.c:583 g10/trustdb.c:2309
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "下次信任度数据库检查将于 %s 进行\n"
 
-#: g10/trustdb.c:591
+#: g10/trustdb.c:592
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "使用‘%s’信任模型时不需要检查信任度数据库\n"
 
-#: g10/trustdb.c:606
+#: g10/trustdb.c:607
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "使用‘%s’信任模型时不需要更新信任度数据库\n"
 
-#: g10/trustdb.c:838 g10/trustdb.c:1276
+#: 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:1033
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr "请执行一次 --check-trustdb\n"
 
-#: g10/trustdb.c:1037
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "正在检查信任度数据库\n"
 
-#: g10/trustdb.c:1901
+#: g10/trustdb.c:2053
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "已经处理了 %d 把密钥(共计已解决了 %d 份的有效性)\n"
 
-#: g10/trustdb.c:1965
+#: g10/trustdb.c:2117
 msgid "no ultimately trusted keys found\n"
 msgstr "没有找到任何绝对信任的密钥\n"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:2131
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "绝对信任的密钥 %s 的公钥未被找到\n"
 
-#: g10/trustdb.c:2002
+#: g10/trustdb.c:2154
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "需要 %d 份勉强信任和 %d 份完全信任，%s 信任模型\n"
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2240
 #, 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:2163
+#: g10/trustdb.c:2315
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "无法更新信任度数据库版本记录：写入失败：%s\n"
 
-#: g10/verify.c:116
+#: g10/verify.c:117
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -5501,550 +5516,333 @@ msgstr ""
 "请记住签字文件(.sig或.asc)\n"
 "应该是在命令行中给定的第一个文件。\n"
 
-#: g10/verify.c:189
+#: g10/verify.c:190
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "输入行 %u 太长或者行末的换行符 LF 遗失\n"
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "常规错误"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "未知的包类型"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "未知的版本"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "未知的公钥算法"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "未知的散列算法"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "公钥已经损坏"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "私钥已经损坏"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "签字已经损坏"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "校验和错误"
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "错误的密码"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "找不到公钥"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "未知的对称加密算法"
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "无法打开钥匙环"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "无效包"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "无效的 ASCII 封装格式"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "没有这个用户标识"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "私钥不可用"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "使用了错误的私钥"
 
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "未被支持"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "密钥已损坏"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "文件读取错误"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "文件写入错误"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "未知的压缩算法"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "文件打开错误"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "文件建立错误"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "无效的密码"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
-msgstr "尚未实现的公钥算法"
+msgstr "未实现的公钥算法"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
-msgstr "尚未实现的对称加密算法"
+msgstr "未实现的对称加密算法"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "未知的签字等级"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "信任度数据库错误"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "损坏的多精度整数(MPI)"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "资源限制"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "无效的钥匙环"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "证书已损坏"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "被变造过的用户标识"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "文件关闭错误"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "文件重命名错误"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "文件删除错误"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
-msgstr "未预期的数据"
+msgstr "非预期的数据"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
-msgstr "时间戳有矛盾"
+msgstr "时间戳冲突"
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "无法使用的公钥算法"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "文件已存在"
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "弱密钥"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "无效的参数"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "URI 已损坏"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "未被支持的 URI"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "网络错误"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "未被加密"
 
-#: util/errors.c:103
+#: util/errors.c:104
 msgid "not processed"
 msgstr "未被处理"
 
-#: util/errors.c:105
+#: util/errors.c:106
 msgid "unusable public key"
 msgstr "不可用的公钥"
 
-#: util/errors.c:106
+#: util/errors.c:107
 msgid "unusable secret key"
 msgstr "不可用的私钥"
 
-#: util/errors.c:107
+#: util/errors.c:108
 msgid "keyserver error"
 msgstr "公钥服务器错误"
 
-#: util/errors.c:108
+#: util/errors.c:109
 msgid "canceled"
 msgstr "已取消"
 
-#: util/errors.c:109
+#: util/errors.c:110
 msgid "no card"
 msgstr "没有卡"
 
-#: util/logger.c:157
+#: util/logger.c:158
 msgid "ERROR: "
 msgstr "错误："
 
-#: util/logger.c:160
+#: util/logger.c:161
 msgid "WARNING: "
 msgstr "警告："
 
-#: util/logger.c:223
+#: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "……这是个程序缺陷(%s:%d:%s)\n"
 
-#: util/logger.c:229
+#: util/logger.c:230
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "您找到一个程序缺陷了……(%s:%d)\n"
 
-#: util/miscutil.c:336 util/miscutil.c:373
+#: util/miscutil.c:330 util/miscutil.c:367
 msgid "yes"
 msgstr "yes"
 
-#: util/miscutil.c:337 util/miscutil.c:378
+#: util/miscutil.c:331 util/miscutil.c:372
 msgid "yY"
 msgstr "yY"
 
-#: util/miscutil.c:339 util/miscutil.c:375
+#: util/miscutil.c:333 util/miscutil.c:369
 msgid "no"
 msgstr "no"
 
-#: util/miscutil.c:340 util/miscutil.c:379
+#: util/miscutil.c:334 util/miscutil.c:373
 msgid "nN"
 msgstr "nN"
 
-#: util/miscutil.c:377
+#: util/miscutil.c:371
 msgid "quit"
 msgstr "quit"
 
-#: util/miscutil.c:380
+#: util/miscutil.c:374
 msgid "qQ"
 msgstr "qQ"
 
-#: util/miscutil.c:413
+#: util/miscutil.c:407
 msgid "okay|okay"
 msgstr "okay|ok"
 
-#: util/miscutil.c:415
+#: util/miscutil.c:409
 msgid "cancel|cancel"
 msgstr "cancel|cancel"
 
-#: util/miscutil.c:416
+#: util/miscutil.c:410
 msgid "oO"
 msgstr "oO"
 
-#: util/miscutil.c:417
+#: util/miscutil.c:411
 msgid "cC"
 msgstr "cC"
 
-#: util/secmem.c:90
+#: util/secmem.c:91
 msgid "WARNING: using insecure memory!\n"
 msgstr "警告：正在使用不安全的内存！\n"
 
-#: util/secmem.c:91
+#: util/secmem.c:92
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "请访问 http://www.gnupg.org/faq.html 以获得更详细的信息\n"
 
-#: util/secmem.c:343
+#: util/secmem.c:344
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "安全内存未初始化，不能进行操作\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:345
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(您可能使用了错误的程序来完成此项任务)\n"
 
-#~ msgid "select secondary key N"
-#~ msgstr "选择子钥 N"
-
-#~ msgid "list signatures"
-#~ msgstr "列出签字"
-
-#~ msgid "sign the key"
-#~ msgstr "为密钥添加签字"
-
-#~ msgid "add a secondary key"
-#~ msgstr "增加一把子钥"
-
-#~ msgid "delete signatures"
-#~ msgstr "删除签字"
-
-#~ msgid "change the expire date"
-#~ msgstr "更改使用期限"
-
-#~ msgid "set preference list"
-#~ msgstr "设定首选项"
-
-#~ msgid "updated preferences"
-#~ msgstr "更新过的首选项"
-
-#~ msgid "No secondary key with index %d\n"
-#~ msgstr "没有索引为 %d 的子钥\n"
-
-#~ msgid "--nrsign-key user-id"
-#~ msgstr "--nrsign-key 用户标识"
-
-#~ msgid "--nrlsign-key user-id"
-#~ msgstr "--nrlsign-key 用户标识"
-
-#~ msgid "make a trust signature"
-#~ msgstr "生成一份信任的签字"
-
-#~ msgid "sign the key non-revocably"
-#~ msgstr "为密钥添加不可吊销签字"
-
-#~ msgid "sign the key locally and non-revocably"
-#~ msgstr "为密钥添加不可吊销的本地签字"
-
-#~ msgid "q"
-#~ msgstr "q"
-
-#~ msgid "admin"
-#~ msgstr "admin"
-
-#~ msgid "help"
-#~ msgstr "help"
-
-#~ msgid "list"
-#~ msgstr "list"
-
-#~ msgid "l"
-#~ msgstr "l"
-
-#~ msgid "debug"
-#~ msgstr "debug"
-
-#~ msgid "name"
-#~ msgstr "name"
-
-#~ msgid "url"
-#~ msgstr "url"
-
-#~ msgid "fetch"
-#~ msgstr "fetch"
-
-#~ msgid "login"
-#~ msgstr "login"
-
-#~ msgid "lang"
-#~ msgstr "lang"
-
-#~ msgid "sex"
-#~ msgstr "性别"
-
-#~ msgid "cafpr"
-#~ msgstr "cafpr"
-
-#~ msgid "forcesig"
-#~ msgstr "forcesig"
-
-#~ msgid "generate"
-#~ msgstr "generate"
-
-#~ msgid "passwd"
-#~ msgstr "passwd"
-
-#~ msgid "save"
-#~ msgstr "save"
-
-#~ msgid "fpr"
-#~ msgstr "fpr"
-
-#~ msgid "uid"
-#~ msgstr "uid"
-
-#~ msgid "key"
-#~ msgstr "key"
-
-#~ msgid "check"
-#~ msgstr "check"
-
-#~ msgid "c"
-#~ msgstr "c"
-
-#~ msgid "sign"
-#~ msgstr "sign"
-
-#~ msgid "s"
-#~ msgstr "s"
-
-#~ msgid "tsign"
-#~ msgstr "tsign"
-
-#~ msgid "lsign"
-#~ msgstr "lsign"
-
-#~ msgid "nrsign"
-#~ msgstr "nrsign"
-
-#~ msgid "nrlsign"
-#~ msgstr "nrlsign"
-
-#~ msgid "adduid"
-#~ msgstr "adduid"
-
-#~ msgid "addphoto"
-#~ msgstr "addphoto"
-
-#~ msgid "deluid"
-#~ msgstr "deluid"
-
-#~ msgid "delphoto"
-#~ msgstr "delphoto"
-
-#~ msgid "addcardkey"
-#~ msgstr "addcardkey"
-
-#~ msgid "keytocard"
-#~ msgstr "卡密钥"
-
-#~ msgid "delkey"
-#~ msgstr "delkey"
-
-#~ msgid "addrevoker"
-#~ msgstr "addrevoker"
-
-#~ msgid "delsig"
-#~ msgstr "delsig"
-
-#~ msgid "expire"
-#~ msgstr "expire"
-
-#~ msgid "primary"
-#~ msgstr "primary"
-
-#~ msgid "toggle"
-#~ msgstr "toggle"
-
-#~ msgid "t"
-#~ msgstr "t"
-
-#~ msgid "pref"
-#~ msgstr "pref"
-
-#~ msgid "showpref"
-#~ msgstr "showpref"
-
-#~ msgid "setpref"
-#~ msgstr "setpref"
-
-#~ msgid "updpref"
-#~ msgstr "updpref"
-
-#~ msgid "keyserver"
-#~ msgstr "keyserver"
-
-#~ msgid "trust"
-#~ msgstr "trust"
-
-#~ msgid "revsig"
-#~ msgstr "revsig"
-
-#~ msgid "revuid"
-#~ msgstr "revuid"
-
-#~ msgid "revkey"
-#~ msgstr "revkey"
-
-#~ msgid "disable"
-#~ msgstr "disable"
-
-#~ msgid "enable"
-#~ msgstr "enable"
-
-#~ msgid "showphoto"
-#~ msgstr "showphoto"
-
-#~ msgid "digest algorithm `%s' is read-only in this release\n"
-#~ msgstr "‘%s’散列算法在本发行版本中只读\n"
+#~ msgid "error getting serial number: %s\n"
+#~ msgstr "取得序列号时出错：%s\n"
 
-#~ msgid "[%8.8s] "
-#~ msgstr "[%4.4s]"
+#~ msgid "Hint: Select the user IDs to sign\n"
+#~ msgstr "提示：选择要添加签字的用户标识\n"
 
-#~ msgid ""
-#~ "About to generate a new %s keypair.\n"
-#~ "              minimum keysize is  768 bits\n"
-#~ "              default keysize is 1024 bits\n"
-#~ "    highest suggested keysize is 2048 bits\n"
-#~ msgstr ""
-#~ "将要生成一副新的%s密钥对。\n"
-#~ "        最小的密钥尺寸是  768 位\n"
-#~ "        默认的密钥尺寸是 1024 位\n"
-#~ "    推荐的最大密钥尺寸是 2048 位\n"
+#~ msgid "length of RSA modulus is not %d\n"
+#~ msgstr "RSA 余数的长度不为 %d\n"
 
-#~ msgid "DSA only allows keysizes from 512 to 1024\n"
-#~ msgstr "DSA 的密钥尺寸只能介于 512 和 1024 之间\n"
+#~ msgid "length of an RSA prime is not %d\n"
+#~ msgstr "RSA 质数的长度不为 %d\n"
 
-#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-#~ msgstr "密钥尺寸太小：RSA 密钥尺寸至少要有 1024。\n"
+#~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+#~ msgstr "密码不正确或未知的对称加密算法(%d)\n"
 
-#~ msgid "keysize too small; 768 is smallest value allowed.\n"
-#~ msgstr "密钥尺寸太小；至少要有 768。\n"
+#~ msgid "can't set client pid for the agent\n"
+#~ msgstr "无法设定代理程序客户端的进程标识\n"
 
-#~ msgid "keysize too large; %d is largest value allowed.\n"
-#~ msgstr "密钥尺寸太大；最大只能够用到 %d。\n"
+#~ msgid "can't get server read FD for the agent\n"
+#~ msgstr "无法取得代理程序所需的服务器读取文件描述符\n"
 
-#~ msgid ""
-#~ "Keysizes larger than 2048 are not suggested because\n"
-#~ "computations take REALLY long!\n"
-#~ msgstr ""
-#~ "不建议使用尺寸大于 2048 的密钥，\n"
-#~ "因为计算真的会花去很多时间！\n"
+#~ msgid "can't get server write FD for the agent\n"
+#~ msgstr "无法取得代理程序所需的服务器写入文件描述符\n"
 
-#~ msgid "Are you sure that you want this keysize? (y/N) "
-#~ msgstr "您确定要用这个密钥尺寸吗？(y/N)"
+#~ msgid "communication problem with gpg-agent\n"
+#~ msgstr "与 gpg-agent 通讯有问题\n"
 
-#~ msgid ""
-#~ "Okay, but keep in mind that your monitor and keyboard radiation is also "
-#~ "very vulnerable to attacks!\n"
-#~ msgstr ""
-#~ "好吧，但是请记住，您的屏幕和键盘所发出的无线电波也是可以被侦测的！\n"
+#~ msgid "passphrase too long\n"
+#~ msgstr "密码太长\n"
 
-#~ msgid "Experimental algorithms should not be used!\n"
-#~ msgstr "不应使用实验性的算法！\n"
+#~ msgid "invalid response from agent\n"
+#~ msgstr "代理程序响应无效\n"
 
-#~ msgid ""
-#~ "this cipher algorithm is deprecated; please use a more standard one!\n"
-#~ msgstr "不推荐使用这个加密算法；请换用更符合标准的算法！\n"
+#~ msgid "problem with the agent: agent returns 0x%lx\n"
+#~ msgstr "代理程序的问题：代理程序返回 0x%lx\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index bef6720b9..f6d6703cf 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,96 +1,96 @@
 # Traditional Chinese(zh-tw) messages for GnuPG
 # Copyright (C) 2002 Free Software Foundation, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# Jedi <[email protected]>, 2003, 2004.
+# Jedi <[email protected]>, 2003, 2004, 2005.
 # 
 # Special thanks to "Autrijus Tang <[email protected]>".
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.4.0\n"
+"Project-Id-Version: gnupg 1.4.1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-03-15 16:35+0100\n"
-"PO-Revision-Date: 2005-02-03 03:45+0800\n"
+"POT-Creation-Date: 2005-05-31 10:05+0200\n"
+"PO-Revision-Date: 2005-03-16 12:22+0800\n"
 "Last-Translator: Jedi <[email protected]>\n"
 "Language-Team: Chinese (traditional) <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:120
+#: cipher/primegen.c:121
 #, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr "無法以 %u 位元長的 p 以及 %u 位元長的 q 產生質數\n"
 
-#: cipher/primegen.c:311
+#: cipher/primegen.c:312
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "無法產生少於 %d 位元的質數\n"
 
-#: cipher/random.c:163
+#: cipher/random.c:164
 msgid "no entropy gathering module detected\n"
 msgstr "偵測不到亂數蒐集模組\n"
 
-#: cipher/random.c:387 g10/card-util.c:656 g10/card-util.c:725
-#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2255
-#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
-#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
-#: g10/tdbio.c:600
+#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
+#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
+#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
+#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
+#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/tdbio.c:601
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "無法開啟 `%s': %s\n"
 
-#: cipher/random.c:391
+#: cipher/random.c:392
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "無法取得檔案 `%s' 的資訊: %s\n"
 
-#: cipher/random.c:396
+#: cipher/random.c:397
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' 不是一個標準的檔案 - 已略過\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:402
 msgid "note: random_seed file is empty\n"
 msgstr "請注意: random_seed 檔案是空的\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:408
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "警告: random_seed 檔案大小無效 - 不予採用\n"
 
-#: cipher/random.c:415
+#: cipher/random.c:416
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "無法讀取 `%s': %s\n"
 
-#: cipher/random.c:453
+#: cipher/random.c:454
 msgid "note: random_seed file not updated\n"
 msgstr "請注意: random_seed 檔案未被更新\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2723
-#: g10/keygen.c:2753 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
-#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "無法建立 `%s': %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:481
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "無法寫入 `%s': %s\n"
 
-#: cipher/random.c:483
+#: cipher/random.c:484
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "無法關閉 `%s': %s\n"
 
-#: cipher/random.c:728
+#: cipher/random.c:729
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "警告: 正在使用不安全的隨機數字產生器!!\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:730
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -104,7 +104,7 @@ msgstr ""
 "*** 絕對不要把這個程式產生的任何資料拿來用!! ***\n"
 "\n"
 
-#: cipher/rndegd.c:204
+#: cipher/rndegd.c:205
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -113,7 +113,7 @@ msgstr ""
 "請稍待片刻, 系統此時正在蒐集亂數. 如果妳會覺得無聊的話,\n"
 "不妨做些別的事, 這樣子甚至能夠讓亂數的品質更好.\n"
 
-#: cipher/rndlinux.c:134
+#: cipher/rndlinux.c:135
 #, c-format
 msgid ""
 "\n"
@@ -124,45 +124,62 @@ msgstr ""
 "隨機位元組不夠多. 請多做一些有的沒的事情, \n"
 "這樣作業系統纔能蒐集到更多的亂數! (還需要 %d 位元組)\n"
 
-#: g10/app-openpgp.c:547
+#: g10/app-openpgp.c:596
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "存放指紋失敗: %s\n"
 
-#: g10/app-openpgp.c:560
+#: g10/app-openpgp.c:609
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "存放創生資料失敗: %s\n"
 
-#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
+#: g10/app-openpgp.c:977
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "讀取金鑰時失敗\n"
+
+#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+msgid "response does not contain the public key data\n"
+msgstr "回應中未包含公鑰資料\n"
+
+#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+msgid "response does not contain the RSA modulus\n"
+msgstr "回應中未包含 RSA 系數\n"
+
+#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+msgid "response does not contain the RSA public exponent\n"
+msgstr "回應中未包含 RSA 公用指數\n"
+
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "個人識別碼 (PIN) 收回時傳回錯誤: %s\n"
 
-#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "用於 CHV %d 的個人識別碼 (PIN) 太短; 長度最少要有 %d\n"
 
-#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
-#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
+#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
+#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "驗證 CHV %d 失敗: %s\n"
 
-#: g10/app-openpgp.c:836
+#: g10/app-openpgp.c:1310
 msgid "access to admin commands is not configured\n"
 msgstr "取用管理者指令尚未被組態過\n"
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
 msgid "error retrieving CHV status from card\n"
 msgstr "從卡片取回 CHV 狀態時出錯\n"
 
-#: g10/app-openpgp.c:857
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
 msgid "card is permanently locked!\n"
 msgstr "卡片已被永久鎖住了!!\n"
 
-#: g10/app-openpgp.c:862
+#: g10/app-openpgp.c:1336
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "%d 管理者個人識別碼 (PIN) 試圖在卡片被永久鎖定前遺留下來\n"
@@ -170,331 +187,337 @@ msgstr "%d 管理者個人識別碼 (PIN) 試圖在卡片被永久鎖定前遺�
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:869
+#: g10/app-openpgp.c:1343
 msgid "|A|Admin PIN"
 msgstr "|A|Admin PIN"
 
-#: g10/app-openpgp.c:1018
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:1492
 msgid "|AN|New Admin PIN"
 msgstr "|AN|New Admin PIN"
 
-#: g10/app-openpgp.c:1018
+#: g10/app-openpgp.c:1492
 msgid "|N|New PIN"
 msgstr "|N|New PIN"
 
-#: g10/app-openpgp.c:1022
+#: g10/app-openpgp.c:1496
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "取得新的個人識別碼 (PIN) 時出錯: %s\n"
 
-#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
+#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
 msgid "error reading application data\n"
 msgstr "讀取應用程式資料時出錯\n"
 
-#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
+#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
 msgid "error reading fingerprint DO\n"
 msgstr "讀取指紋 DO 時出錯\n"
 
-#: g10/app-openpgp.c:1104
+#: g10/app-openpgp.c:1562
 msgid "key already exists\n"
 msgstr "金鑰已存在\n"
 
-#: g10/app-openpgp.c:1108
+#: g10/app-openpgp.c:1566
 msgid "existing key will be replaced\n"
 msgstr "既有的金鑰將被取代\n"
 
-#: g10/app-openpgp.c:1110
+#: g10/app-openpgp.c:1568
 msgid "generating new key\n"
 msgstr "正在產生新的金鑰\n"
 
-#: g10/app-openpgp.c:1120
+#: g10/app-openpgp.c:1735
+msgid "creation timestamp missing\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1742
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1749
+#, fuzzy, c-format
+msgid "RSA public exponent missing or largerr than %d bits\n"
+msgstr "公用指數太大 (超過 32 位元)\n"
+
+#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1827
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "存放金鑰失敗: %s\n"
+
+#: g10/app-openpgp.c:1886
 msgid "please wait while key is being generated ...\n"
 msgstr "公鑰正被產生中, 請稍候 ...\n"
 
-#: g10/app-openpgp.c:1135
+#: g10/app-openpgp.c:1901
 msgid "generating key failed\n"
 msgstr "產生金鑰時失敗\n"
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1904
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "金鑰產生已完工 (%d 秒)\n"
 
-#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
-msgid "response does not contain the public key data\n"
-msgstr "回應中未包含公鑰資料\n"
-
-#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
-msgid "response does not contain the RSA modulus\n"
-msgstr "回應中未包含 RSA 系數\n"
-
-#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
-msgid "response does not contain the RSA public exponent\n"
-msgstr "回應中未包含 RSA 公用指數\n"
-
-#: g10/app-openpgp.c:1195
+#: g10/app-openpgp.c:1961
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "OpenPGP 卡片的格式無效 (DO 0x93)\n"
 
-#: g10/app-openpgp.c:1356
+#: g10/app-openpgp.c:2130
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "目前建立的簽章: %lu\n"
 
-#: g10/app-openpgp.c:1364
-#, c-format
-msgid "PIN [sigs done: %lu]"
+#: g10/app-openpgp.c:2138
+#, fuzzy, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "PIN [簽署完成: %lu]"
 
-#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
+#: g10/app-openpgp.c:2399
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
+
+#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "無法存取 %s - 無效的 OpenPGP 卡片?\n"
 
-#: g10/app-openpgp.c:1731
-#, c-format
-msgid "error getting serial number: %s\n"
-msgstr "取得序號時出錯: %s\n"
-
-#: g10/app-openpgp.c:1826
-#, c-format
-msgid "failed to store the key: %s\n"
-msgstr "存放金鑰失敗: %s\n"
-
-#: g10/app-openpgp.c:1868
-msgid "reading the key failed\n"
-msgstr "讀取金鑰時失敗\n"
-
-#: g10/armor.c:317
+#: g10/armor.c:318
 #, c-format
 msgid "armor: %s\n"
 msgstr "封裝: %s\n"
 
-#: g10/armor.c:346
+#: g10/armor.c:347
 msgid "invalid armor header: "
 msgstr "無效的封裝檔頭: "
 
-#: g10/armor.c:353
+#: g10/armor.c:354
 msgid "armor header: "
 msgstr "封裝檔頭: "
 
-#: g10/armor.c:364
+#: g10/armor.c:365
 msgid "invalid clearsig header\n"
 msgstr "無效的明文簽章檔頭\n"
 
-#: g10/armor.c:416
+#: g10/armor.c:417
 msgid "nested clear text signatures\n"
 msgstr "多層明文簽章\n"
 
-#: g10/armor.c:551
+#: g10/armor.c:552
 msgid "unexpected armor: "
 msgstr "未預期的封裝: "
 
-#: g10/armor.c:563
+#: g10/armor.c:564
 msgid "invalid dash escaped line: "
 msgstr "無效的破折號逸出列: "
 
-#: g10/armor.c:715 g10/armor.c:1322
+#: g10/armor.c:716 g10/armor.c:1323
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "無效的 64 進位字符 %02x 被跳過了\n"
 
-#: g10/armor.c:758
+#: g10/armor.c:759
 msgid "premature eof (no CRC)\n"
-msgstr "檔案未預期的結束(沒有 CRC 的部分)\n"
+msgstr "檔案未預期的結束 (沒有 CRC 的部分)\n"
 
-#: g10/armor.c:792
+#: g10/armor.c:793
 msgid "premature eof (in CRC)\n"
-msgstr "檔案未預期的結束(CRC 的部分未結束)\n"
+msgstr "檔案未預期的結束 (CRC 的部分未結束)\n"
 
-#: g10/armor.c:800
+#: g10/armor.c:801
 msgid "malformed CRC\n"
 msgstr "CRC 被變造過\n"
 
-#: g10/armor.c:804 g10/armor.c:1359
+#: g10/armor.c:805 g10/armor.c:1360
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC 錯誤; %06lX - %06lX\n"
 
-#: g10/armor.c:824
+#: g10/armor.c:825
 msgid "premature eof (in trailer)\n"
 msgstr "檔案未預期的結束 (於結尾處)\n"
 
-#: g10/armor.c:828
+#: g10/armor.c:829
 msgid "error in trailer line\n"
 msgstr "結尾列有問題\n"
 
-#: g10/armor.c:1137
+#: g10/armor.c:1138
 msgid "no valid OpenPGP data found.\n"
 msgstr "找不到有效的 OpenPGP 資料.\n"
 
-#: g10/armor.c:1142
+#: g10/armor.c:1143
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "無效的封裝: 列長超出 %d 字符\n"
 
-#: g10/armor.c:1146
+#: g10/armor.c:1147
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr "封裝裡出現被引號括住的可列印字符 - 可能是有瑕疵的送信程式造成的\n"
 
-#: g10/card-util.c:58 g10/card-util.c:295
+#: g10/card-util.c:63 g10/card-util.c:303
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "沒有可用的 OpenPGP 卡片: %s\n"
 
-#: g10/card-util.c:63
+#: g10/card-util.c:68
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "偵測到 OpenPGP 卡片編號 %s\n"
 
-#: g10/card-util.c:70 g10/card-util.c:1329 g10/delkey.c:127 g10/keyedit.c:1430
-#: g10/keygen.c:2439 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1510
+#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
 msgid "can't do this in batch mode\n"
 msgstr "無法在批次模式中這樣做\n"
 
-#: g10/card-util.c:97 g10/card-util.c:1108 g10/card-util.c:1191
-#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
-#: g10/keygen.c:1365
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
+#: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "妳要選哪一個? "
 
-#: g10/card-util.c:206 g10/card-util.c:256
+#: g10/card-util.c:213 g10/card-util.c:263
 msgid "[not set]"
 msgstr "[未設定]"
 
-#: g10/card-util.c:391
+#: g10/card-util.c:410
 msgid "male"
 msgstr "男性"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 msgid "female"
 msgstr "女性"
 
-#: g10/card-util.c:392
+#: g10/card-util.c:411
 msgid "unspecified"
 msgstr "未特定"
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 msgid "not forced"
 msgstr "不強迫使用"
 
-#: g10/card-util.c:419
+#: g10/card-util.c:438
 msgid "forced"
 msgstr "強迫使用"
 
-#: g10/card-util.c:497
+#: g10/card-util.c:516
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "錯誤: 目前祇允許使用單純的 ASCII 字元.\n"
 
-#: g10/card-util.c:499
+#: g10/card-util.c:518
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "錯誤: 不能使用 \"<\" 字元.\n"
 
-#: g10/card-util.c:501
+#: g10/card-util.c:520
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "錯誤: 並不允許使用連續兩個以上的空格.\n"
 
-#: g10/card-util.c:518
+#: g10/card-util.c:537
 msgid "Cardholder's surname: "
 msgstr "卡片持有者的姓氏: "
 
-#: g10/card-util.c:520
+#: g10/card-util.c:539
 msgid "Cardholder's given name: "
 msgstr "卡片持有者的教名: "
 
-#: g10/card-util.c:538
+#: g10/card-util.c:557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "錯誤: 合併後的名字太長 (上限是 %d 個字元).\n"
 
-#: g10/card-util.c:559
+#: g10/card-util.c:578
 msgid "URL to retrieve public key: "
 msgstr "取回公鑰的 URL: "
 
-#: g10/card-util.c:567
+#: g10/card-util.c:586
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "錯誤: URL 太長 (上限是 %d 個字元).\n"
 
-#: g10/card-util.c:665 g10/card-util.c:734 g10/import.c:261
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "讀取 `%s' 時發生錯誤: %s\n"
 
-#: g10/card-util.c:673
+#: g10/card-util.c:692
 msgid "Login data (account name): "
 msgstr " 登入資料 (帳號名稱): "
 
-#: g10/card-util.c:683
+#: g10/card-util.c:702
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "錯誤: 登入資料太長 (上限是 %d 個字元).\n"
 
-#: g10/card-util.c:742
+#: g10/card-util.c:761
 msgid "Private DO data: "
-msgstr "私人的 PO 資料: "
+msgstr "私人的 DO 資料: "
 
-#: g10/card-util.c:752
+#: g10/card-util.c:771
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "錯誤: 私人的 DO 太長 (上限是 %d 個字元).\n"
 
-#: g10/card-util.c:772
+#: g10/card-util.c:791
 msgid "Language preferences: "
 msgstr "介面語言偏好設定: "
 
-#: g10/card-util.c:780
+#: g10/card-util.c:799
 msgid "Error: invalid length of preference string.\n"
 msgstr "錯誤: 偏好設定字串的長度無效\n"
 
-#: g10/card-util.c:789
+#: g10/card-util.c:808
 msgid "Error: invalid characters in preference string.\n"
 msgstr "錯誤: 偏好設定字串中含有無效的字元\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:829
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "性別 ((M)ale, (F)emale 或留空): "
 
-#: g10/card-util.c:824
+#: g10/card-util.c:843
 msgid "Error: invalid response.\n"
 msgstr "錯誤: 無效的回應.\n"
 
-#: g10/card-util.c:845
+#: g10/card-util.c:864
 msgid "CA fingerprint: "
 msgstr "憑證中心 (CA) 指紋: "
 
-#: g10/card-util.c:868
+#: g10/card-util.c:887
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "錯誤: 指紋格式化無效.\n"
 
-#: g10/card-util.c:916
+#: g10/card-util.c:935
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "不可能進行金鑰操作: %s\n"
 
-#: g10/card-util.c:917
+#: g10/card-util.c:936
 msgid "not an OpenPGP card"
 msgstr "這不是 OpenPGP 卡片"
 
-#: g10/card-util.c:926
+#: g10/card-util.c:945
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "取得現用金鑰資訊時發生錯誤: %s\n"
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1030
 msgid "Replace existing key? (y/N) "
 msgstr "是否要取代既有的金鑰? (y/N) "
 
-#: g10/card-util.c:1030 g10/card-util.c:1039
+#: g10/card-util.c:1051 g10/card-util.c:1060
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "是否要為加密用金鑰建立卡外備份? (Y/n) "
 
-#: g10/card-util.c:1051
+#: g10/card-util.c:1072
 msgid "Replace existing keys? (y/N) "
 msgstr "是否要取代既有的金鑰? (y/N) "
 
-#: g10/card-util.c:1060
+#: g10/card-util.c:1081
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -505,124 +528,128 @@ msgstr ""
 "   PIN = `%s'     管理者 (Admin) PIN = `%s'\n"
 "妳應該用 --change-pin 指令來加以變更\n"
 
-#: g10/card-util.c:1099
+#: g10/card-util.c:1120
 msgid "Please select the type of key to generate:\n"
 msgstr "請選擇妳要產生的金鑰種類:\n"
 
-#: g10/card-util.c:1101 g10/card-util.c:1182
+#: g10/card-util.c:1122 g10/card-util.c:1203
 msgid "   (1) Signature key\n"
 msgstr "   (1) 簽署用金鑰\n"
 
-#: g10/card-util.c:1102 g10/card-util.c:1184
+#: g10/card-util.c:1123 g10/card-util.c:1205
 msgid "   (2) Encryption key\n"
 msgstr "   (2) 加密用金鑰\n"
 
-#: g10/card-util.c:1103 g10/card-util.c:1186
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr "   (3) 憑證用金鑰\n"
 
-#: g10/card-util.c:1119 g10/card-util.c:1202 g10/keyedit.c:908
-#: g10/keygen.c:1404 g10/revoke.c:642
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
+#: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "無效的選擇.\n"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1200
 msgid "Please select where to store the key:\n"
 msgstr "請選擇要把金鑰存放在哪裡:\n"
 
-#: g10/card-util.c:1214
+#: g10/card-util.c:1235
 msgid "unknown key protection algorithm\n"
 msgstr "未知的金鑰保護演算法\n"
 
-#: g10/card-util.c:1219
+#: g10/card-util.c:1240
 msgid "secret parts of key are not available\n"
 msgstr "私鑰部分無法取用\n"
 
-#: g10/card-util.c:1224
+#: g10/card-util.c:1245
 msgid "secret key already stored on a card\n"
 msgstr "私鑰已經存放於卡片上了\n"
 
-#: g10/card-util.c:1294 g10/keyedit.c:1317
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "離開這個選單"
 
-#: g10/card-util.c:1296
+#: g10/card-util.c:1318
 msgid "show admin commands"
 msgstr "顯示管理者指令"
 
-#: g10/card-util.c:1297 g10/keyedit.c:1320
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "顯示這份線上說明"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1321
 msgid "list all available data"
 msgstr "列出所有可用的資料"
 
-#: g10/card-util.c:1302
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr "變更卡片持有人的名字"
 
-#: g10/card-util.c:1303
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr "變更要取回金鑰的 URL"
 
-#: g10/card-util.c:1304
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr "從卡片 URL 取回指定的金鑰"
 
-#: g10/card-util.c:1305
+#: g10/card-util.c:1327
 msgid "change the login name"
 msgstr "變更登入姓名"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1328
 msgid "change the language preferences"
 msgstr "變更介面語言偏好設定"
 
-#: g10/card-util.c:1307
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr "變更卡片持有者的性別"
 
-#: g10/card-util.c:1308
+#: g10/card-util.c:1330
 msgid "change a CA fingerprint"
 msgstr "變更某個憑證中心 (CA) 指紋"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr "切換簽章強制個人識別碼 (PIN) 的旗標"
 
-#: g10/card-util.c:1310
+#: g10/card-util.c:1332
 msgid "generate new keys"
 msgstr "產生新的金鑰"
 
-#: g10/card-util.c:1311
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr "變更或解凍個人識別碼 (PIN) 的選單"
 
-#: g10/card-util.c:1377 g10/keyedit.c:1526
+#: g10/card-util.c:1334
+msgid "verify the PIN and list all data"
+msgstr ""
+
+#: g10/card-util.c:1454 g10/keyedit.c:1609
 msgid "Command> "
 msgstr "指令> "
 
-#: g10/card-util.c:1412
+#: g10/card-util.c:1492
 msgid "Admin-only command\n"
 msgstr "限管理者使用的指令\n"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1523
 msgid "Admin commands are allowed\n"
 msgstr "允許使用管理者指令\n"
 
-#: g10/card-util.c:1430
+#: g10/card-util.c:1525
 msgid "Admin commands are not allowed\n"
 msgstr "未允許使用管理者指令\n"
 
-#: g10/card-util.c:1499 g10/keyedit.c:2104
+#: g10/card-util.c:1599 g10/keyedit.c:2210
 msgid "Invalid command  (try \"help\")\n"
 msgstr "無效的指令  (試試看 \"help\")\n"
 
-#: g10/cardglue.c:287
+#: g10/cardglue.c:396
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr "請插入卡片並按下 [Enter], 或者輸入 'c' 以取消: "
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:519
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -631,255 +658,256 @@ msgstr ""
 "請移除現用中的卡片並插入下列序號的卡片:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:380
+#: g10/cardglue.c:527
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "準備好時請按下 [Enter], 或者輸入 'c' 以取消: "
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:852
 msgid "Enter New Admin PIN: "
 msgstr "請輸入新的管理者個人識別碼 (PIN): "
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:853
 msgid "Enter New PIN: "
 msgstr "請輸入新的個人識別碼 (PIN): "
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:854
 msgid "Enter Admin PIN: "
 msgstr "請輸入管理者個人識別碼 (PIN): "
 
-#: g10/cardglue.c:691
+#: g10/cardglue.c:855
 msgid "Enter PIN: "
 msgstr "請輸入個人識別碼 (PIN): "
 
-#: g10/cardglue.c:705
+#: g10/cardglue.c:872
 msgid "Repeat this PIN: "
 msgstr "請再次輸入個人識別碼 (PIN): "
 
-#: g10/cardglue.c:719
+#: g10/cardglue.c:886
 msgid "PIN not correctly repeated; try again"
 msgstr "個人識別碼 (PIN) 再次輸入時沒有正確重複; 請再試一次"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
-#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "無法開啟 `%s'\n"
 
-#: g10/decrypt.c:104 g10/encode.c:859
+#: g10/decrypt.c:105 g10/encode.c:846
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在這個命令中沒有作用\n"
 
-#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3167 g10/keyserver.c:1511
-#: g10/revoke.c:226
+#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3346 g10/keyserver.c:1541
+#: g10/revoke.c:227
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "金鑰 \"%s\" 找不到: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2300 g10/keyserver.c:1525
-#: g10/revoke.c:232 g10/revoke.c:439
+#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "讀取金鑰區塊時發生錯誤: %s\n"
 
-#: g10/delkey.c:128 g10/delkey.c:135
+#: g10/delkey.c:129 g10/delkey.c:136
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(除非妳用指紋指定了金鑰)\n"
 
-#: g10/delkey.c:134
+#: g10/delkey.c:135
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "沒有 \"--yes\" 就沒辦法在批次模式中這麼做\n"
 
-#: g10/delkey.c:146
+#: g10/delkey.c:147
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "要從鑰匙圈裡刪除這把金鑰嗎? (y/N) "
 
-#: g10/delkey.c:154
+#: g10/delkey.c:155
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "這是一把私鑰! - 真的要刪除嗎? (y/N) "
 
-#: g10/delkey.c:164
+#: g10/delkey.c:165
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "刪除金鑰區塊時失敗了: %s\n"
 
-#: g10/delkey.c:174
+#: g10/delkey.c:175
 msgid "ownertrust information cleared\n"
 msgstr "主觀信任資訊已經被清除\n"
 
-#: g10/delkey.c:205
+#: g10/delkey.c:206
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "公鑰 \"%s\" 有相對應的私鑰!\n"
 
-#: g10/delkey.c:207
+#: g10/delkey.c:208
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "請先以 \"--delete-secret-keys\" 選項來刪除它.\n"
 
-#: g10/encode.c:210 g10/sign.c:1186
+#: g10/encode.c:211 g10/sign.c:1218
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "建立密語的時候發生錯誤: %s\n"
 
-#: g10/encode.c:215
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "因為處於 S2K 模式下而無法使用對稱式 ESK 封包\n"
 
-#: g10/encode.c:228
+#: g10/encode.c:229
 #, c-format
 msgid "using cipher %s\n"
 msgstr "正在使用編密法 %s\n"
 
-#: g10/encode.c:238 g10/encode.c:558
+#: g10/encode.c:239 g10/encode.c:545
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' 已經被壓縮了\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
+#: g10/encode.c:302 g10/encode.c:591 g10/sign.c:566
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
-msgstr "警告： `%s' 是一個空檔案\n"
+msgstr "警告: `%s' 是一個空檔案\n"
 
-#: g10/encode.c:472
+#: g10/encode.c:466
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
-msgstr "在 --pgp2 模式中，妳祇能以 2048 位元以下的 RSA 金鑰加密\n"
+msgstr "在 --pgp2 模式中, 妳祇能以 2048 位元以下的 RSA 金鑰加密\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:488
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "正在從 `%s' 讀取中\n"
 
-#: g10/encode.c:530
+#: g10/encode.c:517
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "妳正要用來加密的所有金鑰都不能使用 IDEA 編密法.\n"
 
-#: g10/encode.c:540
+#: g10/encode.c:527
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "警告: 強迫使用對稱式編密法 %s (%d) 會違反收件者偏好設定\n"
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:635 g10/sign.c:899
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "警告: 強迫使用壓縮演算法 %s (%d) 會違反收件者偏好設定\n"
 
-#: g10/encode.c:735
+#: g10/encode.c:722
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
 
-#: g10/encode.c:805 g10/pkclist.c:721 g10/pkclist.c:757
+#: g10/encode.c:792 g10/pkclist.c:722 g10/pkclist.c:758
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "妳不能夠將 %s 用於 %s 模式中\n"
 
-#: g10/encode.c:832
+#: g10/encode.c:819
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s 已經加密給: \"%s\"\n"
 
-#: g10/encr-data.c:66 g10/mainproc.c:301
+#: g10/encr-data.c:67 g10/mainproc.c:302
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s 加密過的資料\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:305
+#: g10/encr-data.c:69 g10/mainproc.c:306
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "以未知的演算法 %d 加密過\n"
 
-#: g10/encr-data.c:92
+#: g10/encr-data.c:93
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "警告: 訊息被以對稱式編密法的弱金鑰加密了.\n"
 
-#: g10/encr-data.c:103
+#: g10/encr-data.c:104
 msgid "problem handling encrypted packet\n"
 msgstr "處理加密的封包有問題\n"
 
-#: g10/exec.c:48
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "沒有已支援的遠端程式執行\n"
 
-#: g10/exec.c:184 g10/openfile.c:406
+#: g10/exec.c:173 g10/openfile.c:410
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "無法建立目錄 `%s': %s\n"
 
-#: g10/exec.c:325
+#: g10/exec.c:314
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr "因為不安全的檔案權限選項, 而禁用了外部程式叫用\n"
 
-#: g10/exec.c:355
+#: g10/exec.c:344
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr "在這個作業平台上叫用外部程式時需要暫存檔\n"
 
-#: g10/exec.c:433
+#: g10/exec.c:422
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "無法執行程式 `%s': %s\n"
 
-#: g10/exec.c:436
+#: g10/exec.c:425
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "無法執行 shell `%s': %s\n"
 
-#: g10/exec.c:521
+#: g10/exec.c:510
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "叫用外部程式時發生系統錯誤: %s\n"
 
-#: g10/exec.c:532 g10/exec.c:598
+#: g10/exec.c:521 g10/exec.c:587
 msgid "unnatural exit of external program\n"
 msgstr "外部程式不自然地離開\n"
 
-#: g10/exec.c:547
+#: g10/exec.c:536
 msgid "unable to execute external program\n"
 msgstr "無法執行外部程式\n"
 
-#: g10/exec.c:563
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "無法讀取外部程式回應: %s\n"
 
-#: g10/exec.c:609 g10/exec.c:616
+#: g10/exec.c:598 g10/exec.c:605
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "警告: 無法移除暫存檔 (%s) `%s': %s\n"
 
-#: g10/exec.c:621
+#: g10/exec.c:610
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "警告: 無法移除暫存目錄 `%s': %s\n"
 
-#: g10/export.c:183
+#: g10/export.c:184
 msgid "exporting secret keys not allowed\n"
 msgstr "未被允許匯出私鑰\n"
 
-#: g10/export.c:212
+#: g10/export.c:213
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "金鑰 %s: 未被保護 - 已跳過\n"
 
-#: g10/export.c:220
+#: g10/export.c:221
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "金鑰 %s: PGP 2.x 樣式的金鑰 - 已跳過\n"
 
-#: g10/export.c:395
+#  I hope this warning doesn't confuse people.
+#: g10/export.c:398
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "警告: 私鑰 %s 並沒有任的何單一 SK 加總檢查\n"
 
-#: g10/export.c:427
+#: g10/export.c:430
 msgid "WARNING: nothing exported\n"
 msgstr "警告: 沒有匯出任何東西\n"
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid ""
 "@Commands:\n"
 " "
@@ -887,127 +915,127 @@ msgstr ""
 "@指令:\n"
 " "
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "|[file]|make a signature"
 msgstr "|[檔案]|建立一份簽章"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "|[file]|make a clear text signature"
 msgstr "|[檔案]|建立一份明文簽章"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "make a detached signature"
 msgstr "建立一份分離式簽章"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encrypt data"
 msgstr "加密資料"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "encryption only with symmetric cipher"
 msgstr "僅使用對稱式編密法來加密"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "decrypt data (default)"
 msgstr "資料解密 (預設)"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "verify a signature"
 msgstr "驗證某份簽章"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys"
 msgstr "列出金鑰"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and signatures"
 msgstr "列出金鑰和簽章"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 msgid "list and check key signatures"
 msgstr "列出並檢查金鑰簽章"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "list keys and fingerprints"
 msgstr "列出金鑰和指紋"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "list secret keys"
 msgstr "列出私鑰"
 
-#: g10/g10.c:379
+#: g10/g10.c:381
 msgid "generate a new key pair"
 msgstr "產生一份新的金鑰對"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the public keyring"
 msgstr "從公鑰鑰匙圈裡移去金鑰"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "remove keys from the secret keyring"
 msgstr "從私鑰鑰匙圈裡移去金鑰"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign a key"
 msgstr "簽署某把金鑰"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "sign a key locally"
 msgstr "僅在本地簽署某把金鑰"
 
-#: g10/g10.c:385
+#: g10/g10.c:387
 msgid "sign or edit a key"
 msgstr "簽署或編輯某把金鑰"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "generate a revocation certificate"
 msgstr "產生一份撤銷憑證"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "export keys"
 msgstr "匯出金鑰"
 
-#: g10/g10.c:389
+#: g10/g10.c:391
 msgid "export keys to a key server"
 msgstr "把金鑰匯出至某個金鑰伺服器上"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "import keys from a key server"
 msgstr "從某個金鑰伺服器上匯入金鑰"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "search for keys on a key server"
 msgstr "在某個金鑰伺服器上搜尋金鑰"
 
-#: g10/g10.c:394
+#: g10/g10.c:396
 msgid "update all keys from a keyserver"
 msgstr "從某個金鑰伺服器上更新所有的金鑰"
 
-#: g10/g10.c:397
+#: g10/g10.c:399
 msgid "import/merge keys"
 msgstr "匯入/合併金鑰"
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "print the card status"
 msgstr "列印卡片狀態"
 
-#: g10/g10.c:401
+#: g10/g10.c:403
 msgid "change data on a card"
 msgstr "變更卡片上的資料"
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "change a card's PIN"
 msgstr "變更某張卡片的個人識別碼 (PIN)"
 
-#: g10/g10.c:410
+#: g10/g10.c:412
 msgid "update the trust database"
 msgstr "更新信任資料庫"
 
-#: g10/g10.c:417
+#: g10/g10.c:419
 msgid "|algo [files]|print message digests"
 msgstr "|演算法 [檔案]|印出訊息摘要"
 
-#: g10/g10.c:421 g10/gpgv.c:66
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1017,51 +1045,51 @@ msgstr ""
 "選項:\n"
 " "
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "create ascii armored output"
 msgstr "建立以 ASCII 封裝過的輸出"
 
-#: g10/g10.c:425
+#: g10/g10.c:427
 msgid "|NAME|encrypt for NAME"
 msgstr "|名字|以「名字」作為加密對象"
 
-#: g10/g10.c:436
+#: g10/g10.c:438
 msgid "use this user-id to sign or decrypt"
 msgstr "使用這個使用者 ID 來簽署或解密"
 
-#: g10/g10.c:437
+#: g10/g10.c:439
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|設定壓縮等級為 N (0 表示不壓縮)"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "use canonical text mode"
 msgstr "使用標準的文字模式"
 
-#: g10/g10.c:452
+#: g10/g10.c:458
 msgid "use as output file"
 msgstr "當作輸出檔案來使用"
 
-#: g10/g10.c:454 g10/gpgv.c:68
+#: g10/g10.c:460 g10/gpgv.c:73
 msgid "verbose"
 msgstr "囉唆模式"
 
-#: g10/g10.c:465
+#: g10/g10.c:471
 msgid "do not make any changes"
 msgstr "不要做任何改變"
 
-#: g10/g10.c:466
+#: g10/g10.c:472
 msgid "prompt before overwriting"
 msgstr "覆寫前先詢問"
 
-#: g10/g10.c:507
+#: g10/g10.c:513
 msgid "use strict OpenPGP behavior"
 msgstr "使用嚴謹的 OpenPGP 行為"
 
-#: g10/g10.c:508
+#: g10/g10.c:514
 msgid "generate PGP 2.x compatible messages"
 msgstr "產生 PGP 2.x 相容性訊息"
 
-#: g10/g10.c:536
+#: g10/g10.c:542
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1069,7 +1097,7 @@ msgstr ""
 "@\n"
 "(請參照線上說明頁面來取得所有命令和選項的完整清單)\n"
 
-#: g10/g10.c:539
+#: g10/g10.c:545
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1089,15 +1117,15 @@ msgstr ""
 " --list-keys [名字]         顯示金鑰\n"
 " --fingerprint [名字]       顯示指紋\n"
 
-#: g10/g10.c:720 g10/gpgv.c:93
+#: g10/g10.c:724 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "請向 <[email protected]> 回報程式瑕疵.\n"
 
-#: g10/g10.c:737
+#: g10/g10.c:741
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
 
-#: g10/g10.c:740
+#: g10/g10.c:744
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1107,7 +1135,7 @@ msgstr ""
 "簽署, 檢查, 加密或解密\n"
 "預設的操作會依輸入資料而定\n"
 
-#: g10/g10.c:751
+#: g10/g10.c:755
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1115,522 +1143,537 @@ msgstr ""
 "\n"
 "已被支援的演算法:\n"
 
-#: g10/g10.c:754
+#: g10/g10.c:758
 msgid "Pubkey: "
 msgstr "公鑰: "
 
-#: g10/g10.c:760 g10/keyedit.c:2141
+#: g10/g10.c:764 g10/keyedit.c:2248
 msgid "Cipher: "
 msgstr "編密法: "
 
-#: g10/g10.c:766
+#: g10/g10.c:770
 msgid "Hash: "
 msgstr "雜湊: "
 
-#: g10/g10.c:772 g10/keyedit.c:2187
+#: g10/g10.c:776 g10/keyedit.c:2294
 msgid "Compression: "
 msgstr "壓縮: "
 
-#: g10/g10.c:855
+#: g10/g10.c:859
 msgid "usage: gpg [options] "
 msgstr "用法: gpg [選項] "
 
-#: g10/g10.c:1003
+#: g10/g10.c:1007
 msgid "conflicting commands\n"
 msgstr "指令彼此矛盾\n"
 
-#: g10/g10.c:1021
+#: g10/g10.c:1025
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "在群組定義 `%s' 裡找不到 = 記號\n"
 
-#: g10/g10.c:1218
+#: g10/g10.c:1222
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的所有權並不安全\n"
 
-#: g10/g10.c:1221
+#: g10/g10.c:1225
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的所有權並不安全\n"
 
-#: g10/g10.c:1224
+#: g10/g10.c:1228
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的所有權並不安全\n"
 
-#: g10/g10.c:1230
+#: g10/g10.c:1234
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的權限並不安全\n"
 
-#: g10/g10.c:1233
+#: g10/g10.c:1237
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的權限並不安全\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1240
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的權限並不安全\n"
 
-#: g10/g10.c:1242
+#: g10/g10.c:1246
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/g10.c:1245
+#: g10/g10.c:1249
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/g10.c:1248
+#: g10/g10.c:1252
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1258
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/g10.c:1257
+#: g10/g10.c:1261
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/g10.c:1260
+#: g10/g10.c:1264
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/g10.c:1401
+#: g10/g10.c:1405
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "未知的組態項目 `%s'\n"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1802
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "請注意: 舊有的預設選項檔 `%s' 已被忽略\n"
 
-#: g10/g10.c:1838
+#: g10/g10.c:1844
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "請注意: 沒有預設選項檔 `%s'\n"
 
-#: g10/g10.c:1842
+#: g10/g10.c:1848
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "選項檔 `%s': %s\n"
 
-#: g10/g10.c:1849
+#: g10/g10.c:1855
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "從 `%s' 讀取選項\n"
 
-#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "請注意: 一般情況下不會用到 %s!\n"
 
-#: g10/g10.c:2076
+#: g10/g10.c:2082
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "編密法延伸模組 `%s' 因為權限不安全而未被載入\n"
 
-#: g10/g10.c:2293
+#: g10/g10.c:2236 g10/g10.c:2248
+#, fuzzy, c-format
+msgid "`%s' is not a valid signature expiration\n"
+msgstr "`%s' 不是一個有效的字元集\n"
+
+#: g10/g10.c:2321
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' 不是一個有效的字元集\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3683
+#: g10/g10.c:2340 g10/keyedit.c:3862
 msgid "could not parse keyserver URL\n"
 msgstr "無法剖析金鑰伺服器 URI\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2346
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: 無效的金鑰伺服器選項\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2349
 msgid "invalid keyserver options\n"
 msgstr "無效的金鑰伺服器選項\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2356
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: 無效的匯入選項\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2359
 msgid "invalid import options\n"
 msgstr "無效的匯入選項\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2366
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: 無效的匯出選項\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2369
 msgid "invalid export options\n"
 msgstr "無效的匯出選項\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2376
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: 無效的清單選項\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2379
 msgid "invalid list options\n"
 msgstr "無效的清單選項\n"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2401
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: 無效的驗證選項\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2404
 msgid "invalid verify options\n"
 msgstr "無效的驗證選項\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2411
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "無法把執行檔路徑設成 %s\n"
 
-#: g10/g10.c:2573
+#: g10/g10.c:2602
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告: 程式可能會傾印出核心檔!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2606
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告: %s 會使得 %s 失效\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2615
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不被允許跟 %s 併用\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2618
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 跟 %s 放在一起沒有意義!\n"
 
-#: g10/g10.c:2603
+#: g10/g10.c:2625
 #, fuzzy, c-format
+msgid "NOTE: %s is not available in this version\n"
+msgstr "gpg-agent 在此階段無法使用\n"
+
+#: g10/g10.c:2640
+#, c-format
 msgid "will not run with insecure memory due to %s\n"
-msgstr "因為 %s 而不會在不安全的記憶體中執行"
+msgstr "因為 %s 而不會在不安全的記憶體中執行\n"
 
-#: g10/g10.c:2617
+#: g10/g10.c:2654
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "妳祇有在 --pgp2 模式下纔能做出分離式或明文簽章\n"
 
-#: g10/g10.c:2623
+#: g10/g10.c:2660
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "妳在 --pgp2 模式下時, 不能同時簽署和加密\n"
 
-#: g10/g10.c:2629
+#: g10/g10.c:2666
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "啟用 --pgp2 時妳祇應該使用檔案, 而非管道\n"
 
-#: g10/g10.c:2642
+#: g10/g10.c:2679
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密訊息需要 IDEA 編密法\n"
 
-#: g10/g10.c:2712 g10/g10.c:2736
+#: g10/g10.c:2746 g10/g10.c:2770
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所選的編密演算法無效\n"
 
-#: g10/g10.c:2718 g10/g10.c:2742
+#: g10/g10.c:2752 g10/g10.c:2776
 msgid "selected digest algorithm is invalid\n"
 msgstr "所選的摘要演算法無效\n"
 
-#: g10/g10.c:2724
+#: g10/g10.c:2758
 msgid "selected compression algorithm is invalid\n"
 msgstr "所選的壓縮演算法無效\n"
 
-#: g10/g10.c:2730
+#: g10/g10.c:2764
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所選的憑證摘要演算法無效\n"
 
-#: g10/g10.c:2745
+#: g10/g10.c:2779
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed 一定要大於 0\n"
 
-#: g10/g10.c:2747
+#: g10/g10.c:2781
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed 一定要大於 1\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2783
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth 一定要介於 1 和 255 之間\n"
 
-#: g10/g10.c:2751
+#: g10/g10.c:2785
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "無效的 default-cert-level; 一定要是 0, 1, 2 或 3\n"
 
-#: g10/g10.c:2753
+#: g10/g10.c:2787
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "無效的 min-cert-level; 一定要是 1, 2 或 3\n"
 
-#: g10/g10.c:2756
+#: g10/g10.c:2790
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "請注意: 強烈不建議使用單純的 S2K 模式 (0)\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2794
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "無效的 S2K 模式; 一定要是 0, 1 或 3\n"
 
-#: g10/g10.c:2767
+#: g10/g10.c:2801
 msgid "invalid default preferences\n"
 msgstr "無效的預設偏好\n"
 
-#: g10/g10.c:2776
+#: g10/g10.c:2810
 msgid "invalid personal cipher preferences\n"
 msgstr "無效的個人編密法偏好\n"
 
-#: g10/g10.c:2780
+#: g10/g10.c:2814
 msgid "invalid personal digest preferences\n"
 msgstr "無效的個人摘要偏好\n"
 
-#: g10/g10.c:2784
+#: g10/g10.c:2818
 msgid "invalid personal compress preferences\n"
 msgstr "無效的個人壓縮偏好\n"
 
-#: g10/g10.c:2817
+#: g10/g10.c:2851
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 還沒辦法跟 %s 一起運作\n"
 
-#: g10/g10.c:2864
+#: g10/g10.c:2898
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "妳不該將編密演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/g10.c:2869
+#: g10/g10.c:2903
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "妳不該將摘要演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/g10.c:2874
+#: g10/g10.c:2908
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "妳不該將壓縮演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/g10.c:2970
+#: g10/g10.c:3004
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "信任資料庫啟始失敗: %s\n"
 
-#: g10/g10.c:2981
+#: g10/g10.c:3015
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
 
-#: g10/g10.c:2992
+#: g10/g10.c:3026
 msgid "--store [filename]"
 msgstr "--store [檔名]"
 
-#: g10/g10.c:2999
+#: g10/g10.c:3033
 msgid "--symmetric [filename]"
 msgstr "--symmetric [檔名]"
 
-#: g10/g10.c:3001
+#: g10/g10.c:3035
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "`%s' 的對稱式加密失敗: %s\n"
 
-#: g10/g10.c:3011
+#: g10/g10.c:3045
 msgid "--encrypt [filename]"
 msgstr "--encrypt [檔名]"
 
-#: g10/g10.c:3024
+#: g10/g10.c:3058
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [檔名]"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3060
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "妳不能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
 
-#: g10/g10.c:3029
+#: g10/g10.c:3063
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "妳不能在 %s 模式中使用 --symmetric --encrypt\n"
 
-#: g10/g10.c:3047
+#: g10/g10.c:3081
 msgid "--sign [filename]"
 msgstr "--sign [檔名]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3094
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [檔名]"
 
-#: g10/g10.c:3075
+#: g10/g10.c:3109
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [檔名]"
 
-#: g10/g10.c:3077
+#: g10/g10.c:3111
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "妳不能在 --s2k-mode 0 中使用 --symmetric --sign --encrypt\n"
 
-#: g10/g10.c:3080
+#: g10/g10.c:3114
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "妳不能在 %s 模式中使用 --symmetric --sign --encrypt\n"
 
-#: g10/g10.c:3100
+#: g10/g10.c:3134
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [檔名]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3143
 msgid "--clearsign [filename]"
 msgstr "--clearsign [檔名]"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3168
 msgid "--decrypt [filename]"
 msgstr "--decrypt [檔名]"
 
-#: g10/g10.c:3142
+#: g10/g10.c:3176
 msgid "--sign-key user-id"
 msgstr "--sign-key 使用者ID"
 
-#: g10/g10.c:3146
+#: g10/g10.c:3180
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 使用者ID"
 
-#: g10/g10.c:3167
+#: g10/g10.c:3201
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 使用者ID [指令]"
 
-#: g10/g10.c:3238
+#: g10/g10.c:3272
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [使用者ID] [鑰匙圈]"
 
-#: g10/g10.c:3275
+#: g10/g10.c:3309
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "送至金鑰伺服器時失敗: %s\n"
 
-#: g10/g10.c:3277
+#: g10/g10.c:3311
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "從金鑰伺服器接收時失敗: %s\n"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3313
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "金鑰匯出時失敗: %s\n"
 
-#: g10/g10.c:3290
+#: g10/g10.c:3324
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "從金鑰伺服器中搜尋時失敗: %s\n"
 
-#: g10/g10.c:3300
+#: g10/g10.c:3334
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "從金鑰伺服器更新時失敗: %s\n"
 
-#: g10/g10.c:3341
+#: g10/g10.c:3375
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解開封裝失敗: %s\n"
 
-#: g10/g10.c:3349
+#: g10/g10.c:3383
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "進行封裝失敗: %s\n"
 
-#: g10/g10.c:3436
+#: g10/g10.c:3470
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "無效的 `%s' 雜湊演算法\n"
 
-#: g10/g10.c:3559
+#: g10/g10.c:3593
 msgid "[filename]"
 msgstr "[檔名]"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3597
 msgid "Go ahead and type your message ...\n"
 msgstr "請開始鍵入妳的訊息 ...\n"
 
-#: g10/g10.c:3853
+#: g10/g10.c:3887
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr "標記名稱一定要採用可印出的字符或空白, 並以一個 '=' 來結尾\n"
 
-#: g10/g10.c:3861
+#: g10/g10.c:3895
 msgid "a user notation name must contain the '@' character\n"
 msgstr "使用者標記名稱一定要含有 '@' 字符\n"
 
-#: g10/g10.c:3871
+#: g10/g10.c:3900
+#, fuzzy
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr "使用者標記名稱一定要含有 '@' 字符\n"
+
+#: g10/g10.c:3911
 msgid "a notation value must not use any control characters\n"
 msgstr "標記值一定不能使用任何的控制字符\n"
 
-#: g10/g10.c:3905
+#: g10/g10.c:3945
 msgid "the given certification policy URL is invalid\n"
 msgstr "給定的的憑證原則 URL 無效\n"
 
-#: g10/g10.c:3907
+#: g10/g10.c:3947
 msgid "the given signature policy URL is invalid\n"
 msgstr "給定的簽章原則 URL 無效\n"
 
-#: g10/g10.c:3940
+#: g10/g10.c:3980
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
-msgstr "pk 快取裡有太多項目 ─ 已禁用\n"
+msgstr "pk 快取裡有太多項目 - 已禁用\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2750
+#: g10/getkey.c:187 g10/getkey.c:2757
 msgid "[User ID not found]"
 msgstr "[找不到使用者 ID]"
 
-#: g10/getkey.c:1677
+#: g10/getkey.c:1684
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "無效的金鑰 %s 可以藉由 --allow-non-selfsigned-uid 而生效\n"
 
-#: g10/getkey.c:2228
+#: g10/getkey.c:2235
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "公鑰 %s 沒有相對應的私鑰 - 正在忽略\n"
 
-#: g10/getkey.c:2459
-#, fuzzy, c-format
+#: g10/getkey.c:2466
+#, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "正在使用次鑰 %s 來替換主鑰 %s\n"
 
-#: g10/getkey.c:2506
+#: g10/getkey.c:2513
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "金鑰 %s: 祇有私鑰而沒有公鑰 - 已跳過\n"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:74
 msgid "be somewhat more quiet"
 msgstr "盡量安靜些"
 
-#: g10/gpgv.c:70
+#: g10/gpgv.c:75
 msgid "take the keys from this keyring"
 msgstr "從這個鑰匙圈裡取用金鑰"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:77
 msgid "make timestamp conflicts only a warning"
 msgstr "僅把時間戳印矛盾視為警告"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:78
 msgid "|FD|write status info to this FD"
 msgstr "|檔案描述|把狀態資訊寫入此檔案描述"
 
-#: g10/gpgv.c:97
+#: g10/gpgv.c:102
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "用法: gpgv [選項] [檔案] (或用 -h 求助)"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:105
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1638,7 +1681,7 @@ msgstr ""
 "語法: gpg [選項] [檔案]\n"
 "用已知的受信任金鑰來檢查簽章\n"
 
-#: g10/helptext.c:48
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1647,7 +1690,7 @@ msgstr ""
 "在這裡指派的數值完全是看妳自己決定; 這些數值永遠不會被匯出給其他人.\n"
 "我們需要它來實施信任網絡; 這跟 (自動建立起的) 憑證網絡一點關係也沒有."
 
-#: g10/helptext.c:54
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1658,16 +1701,16 @@ msgstr ""
 "那些金鑰通常就是妳有辦法存取到私鑰的. 回答 \"yes\" 來將這些\n"
 "金鑰設成被徹底信任的\n"
 
-#: g10/helptext.c:61
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "如果妳無論如何想要使用這把未被信任的金鑰, 請回答 \"yes\"."
 
-#: g10/helptext.c:65
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "輸入妳要遞送的訊息接收者的使用者 ID."
 
-#: g10/helptext.c:69
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1691,7 +1734,7 @@ msgstr ""
 "\n"
 "第一把 (主要的) 金鑰一定要含有能用於簽署的金鑰."
 
-#: g10/helptext.c:83
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -1699,18 +1742,18 @@ msgid ""
 msgstr ""
 "通常來說用同一把金鑰簽署及加密並不是個好主意.\n"
 "這個演算法應該祇被用於特定的情況下.\n"
-"請先聯絡妳的安全專家。"
+"請先聯絡妳的安全專家."
 
-#: g10/helptext.c:90
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "請輸入金鑰的尺寸"
 
-#: g10/helptext.c:94 g10/helptext.c:99 g10/helptext.c:111 g10/helptext.c:143
-#: g10/helptext.c:171 g10/helptext.c:176 g10/helptext.c:181
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "請回答 \"yes\" 或 \"no\""
 
-#: g10/helptext.c:104
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1721,19 +1764,19 @@ msgstr ""
 "妳可以輸入 ISO 日期格式 (YYYY-MM-DD), 但是不會得到良好的錯誤回應 -\n"
 "反之, 系統會試著把給定的數值中斷成若干片段."
 
-#: g10/helptext.c:116
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "請輸入金鑰持有人的名字"
 
-#: g10/helptext.c:121
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr "請輸入選用 (但強烈建議使用) 的電子郵件位址"
 
-#: g10/helptext.c:125
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "請輸入選用的註釋"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1747,11 +1790,11 @@ msgstr ""
 "O  繼續產生金鑰.\n"
 "Q  中止產生金鑰."
 
-#: g10/helptext.c:139
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "如果妳覺得產生子鑰可以的話, 就回答 \"yes\" (或者祇要 \"y\")."
 
-#: g10/helptext.c:147
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -1791,7 +1834,7 @@ msgid ""
 "\n"
 "If you don't know what the right answer is, answer \"0\"."
 msgstr ""
-"當妳在某把金鑰上簽署某個使用者 ID ，妳首先必須先驗證那把\n"
+"當妳在某把金鑰上簽署某個使用者 ID, 妳首先必須先驗證那把\n"
 "金鑰確實屬於那個使用者 ID 上叫那個名字的人. 這對那些知道\n"
 "妳多小心驗證的人來說很有用.\n"
 "\n"
@@ -1809,7 +1852,7 @@ msgstr ""
 "\n"
 "\"3\" 表示妳真的做了大規模的驗證金鑰工作.\n"
 "    例如說, 這能表示妳向金鑰持有人驗證了金鑰指紋,\n"
-"    而且妳透過附帶照片而難以偽造的文件 (像是護照) \n"
+"    而且妳透過附帶照片而難以偽造的文件 (像是護照)\n"
 "    確認了金鑰持有人的姓名與金鑰上使用者 ID 的一致,\n"
 "    最後妳還 (透過電子郵件往來) 驗證了金鑰上的\n"
 "    電子郵件位址確實屬於金鑰持有人.\n"
@@ -1820,11 +1863,11 @@ msgstr ""
 "\n"
 "如果妳不知道應該選甚麼答案的話, 就選 \"0\"."
 
-#: g10/helptext.c:185
+#: g10/helptext.c:186
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "如果妳想要簽署 *所有* 使用者 ID 的話就回答 \"yes\""
 
-#: g10/helptext.c:189
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -1832,11 +1875,11 @@ msgstr ""
 "如果妳真的想要刪除這個使用者 ID 的話就回答 \"yes\".\n"
 "所有的憑證在那之後也都會失去!"
 
-#: g10/helptext.c:194
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "如果刪除這把子鑰沒問題的話就回答 \"yes\""
 
-#: g10/helptext.c:199
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -1846,7 +1889,7 @@ msgstr ""
 "因為要跟別的金鑰建立起信任連結, 或由這把金鑰所簽署的金鑰憑證\n"
 "會是一件相當重要的事."
 
-#: g10/helptext.c:204
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -1857,13 +1900,13 @@ msgstr ""
 "直到妳知道哪一把金鑰被使用了; 因為這把來簽署的金鑰可能透過\n"
 "其他已經驗證的金鑰建立了一個信任連結."
 
-#: g10/helptext.c:210
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
-msgstr "這份簽章並非有效. 把它從妳的鑰匙圈裡移去相當合理."
+msgstr "這份簽章無效. 把它從妳的鑰匙圈裡移去相當合理."
 
-#: g10/helptext.c:214
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -1872,12 +1915,12 @@ msgid ""
 "a second one is available."
 msgstr ""
 "這是一份和這個金鑰使用者 ID 相繫的簽章. 通常\n"
-"把這樣的簽章移除不會是個好點子. 事實上 GnuPG \n"
+"把這樣的簽章移除不會是個好點子. 事實上 GnuPG\n"
 "可能從此就不能再使用這把金鑰了. 所以祇有在這\n"
 "把金鑰的第一個自我簽章因某些原因無效, 而第二\n"
 "個還可用的情況下纔這麼做."
 
-#: g10/helptext.c:222
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -1886,23 +1929,23 @@ msgstr ""
 "變更所有 (或祇有被選取的那幾個) 使用者 ID 的偏好成現用的偏好清單.\n"
 "所有受到影響的自我簽章的時間戳記都會增加一秒鐘.\n"
 
-#: g10/helptext.c:229
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "請輸入密語; 這是一個秘密的句子 \n"
 
-#: g10/helptext.c:235
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "請再次輸入最後的密語, 以確定妳到底鍵進了些甚麼."
 
-#: g10/helptext.c:239
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "請給定簽章所要套用的檔案名稱"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "如果覆寫這個檔案沒有問題的話就回答 \"yes\""
 
-#: g10/helptext.c:249
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -1910,7 +1953,7 @@ msgstr ""
 "請輸入一個新的檔名. 如果妳直接按下了 Enter, 那麼\n"
 "就會使用預設的檔案 (顯示在括號中)."
 
-#: g10/helptext.c:255
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -1926,7 +1969,7 @@ msgid ""
 "      this is normally used to mark an email address invalid.\n"
 msgstr ""
 "妳應該為這份憑證指定一個原因.\n"
-"根據情境的不同，妳應該可以從這個清單中選出一項:\n"
+"根據情境的不同, 妳應該可以從這個清單中選出一項:\n"
 "  \"金鑰已經被洩漏了\"\n"
 "      如果妳相信有某個未經許可的傢伙取得了妳的私鑰的話,\n"
 "      就選這個.\n"
@@ -1938,7 +1981,7 @@ msgstr ""
 "      如果這個使用者 ID 不再被使用了, 就選這個;\n"
 "      這通常用來表示某個電子郵件位址不再有效了.\n"
 
-#: g10/helptext.c:271
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -1948,466 +1991,472 @@ msgstr ""
 "請讓這段文字保持簡明扼要.\n"
 "鍵入空白列以結束這段文字.\n"
 
-#: g10/helptext.c:286
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "沒有可用的說明"
 
-#: g10/helptext.c:294
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "`%s' 沒有可用的說明"
 
-#: g10/import.c:247
+#: g10/import.c:248
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "正在跳過 %d 型態的區塊\n"
 
-#: g10/import.c:256
+#: g10/import.c:257
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "已有 %lu 把金鑰被處理了\n"
 
-#: g10/import.c:273
+#: g10/import.c:274
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "總共被處理的數量: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "      skipped new keys: %lu\n"
-msgstr "       已跳過的新金鑰: %lu\n"
+msgstr "        已跳過的新金鑰: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:279
 #, c-format
 msgid "          w/o user IDs: %lu\n"
-msgstr "      沒有使用者的 ID: %lu\n"
+msgstr "       沒有使用者的 ID: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "              imported: %lu"
-msgstr "               已匯入: %lu"
+msgstr "                已匯入: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:287
 #, c-format
 msgid "             unchanged: %lu\n"
-msgstr "             未改變的: %lu\n"
+msgstr "              未改變的: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "          new user IDs: %lu\n"
-msgstr "        新的使用者 ID: %lu\n"
+msgstr "         新的使用者 ID: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "           new subkeys: %lu\n"
-msgstr "             新的子鑰: %lu\n"
+msgstr "              新的子鑰: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "        new signatures: %lu\n"
-msgstr "             新的簽章: %lu\n"
+msgstr "              新的簽章: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "   new key revocations: %lu\n"
-msgstr "         新的金鑰撤銷: %lu\n"
+msgstr "          新的金鑰撤銷: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "      secret keys read: %lu\n"
-msgstr "         被讀取的私鑰: %lu\n"
+msgstr "          被讀取的私鑰: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "  secret keys imported: %lu\n"
-msgstr "         已匯入的私鑰: %lu\n"
+msgstr "          已匯入的私鑰: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid " secret keys unchanged: %lu\n"
-msgstr "         未改變的私鑰: %lu\n"
+msgstr "          未改變的私鑰: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid "          not imported: %lu\n"
-msgstr "             未被匯入: %lu\n"
+msgstr "              未被匯入: %lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:544
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr "警告: 金鑰 %s 含有不可用的偏好設定\n"
 
-#: g10/import.c:545
+#: g10/import.c:546
 msgid "algorithms on these user IDs:\n"
 msgstr "這些使用者 ID 上的演算法:\n"
 
-#: g10/import.c:582
+#: g10/import.c:583
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": 編密演算法 %s 的偏好設定\n"
 
-#: g10/import.c:594
+#: g10/import.c:595
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": 摘要演算法 %s 的偏好設定\n"
 
-#: g10/import.c:606
+#: g10/import.c:607
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": 壓縮演算法 %s 的偏好設定\n"
 
-#: g10/import.c:619
+#: g10/import.c:620
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "我們強烈建議妳更新妳的偏好設定, 並\n"
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr "重新散佈此金鑰, 以避免潛在的演算法不一致問題.\n"
 
-#: g10/import.c:645
+#: g10/import.c:646
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "妳可以像這樣更新妳的偏好設定: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:694 g10/import.c:1048
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "金鑰 %s: 沒有使用者 ID\n"
 
-#: g10/import.c:713
+#: g10/import.c:714
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "金鑰 %s: PKS 子鑰的訛誤已被修復\n"
 
-#: g10/import.c:728
+#: g10/import.c:729
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "金鑰 %s: 非自我簽署的使用者 ID \"%s\" 已被接受\n"
 
-#: g10/import.c:734
+#: g10/import.c:735
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "金鑰 %s: 沒有有效的使用者 ID\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 msgid "this may be caused by a missing self-signature\n"
 msgstr "這可能是由於遺失自我簽章所導致的後果\n"
 
-#: g10/import.c:746 g10/import.c:1168
+#: g10/import.c:747 g10/import.c:1169
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "金鑰 %s: 找不到公鑰: %s\n"
 
-#: g10/import.c:752
+#: g10/import.c:753
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "金鑰 %s: 新的金鑰 - 已跳過\n"
 
-#: g10/import.c:761
+#: g10/import.c:762
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "找不到可寫的鑰匙圈: %s\n"
 
-#: g10/import.c:766 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "正在寫到 `%s'\n"
 
-#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
-#: g10/import.c:2314 g10/import.c:2336
+#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
+#: g10/import.c:2315 g10/import.c:2337
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "寫到鑰匙圈 `%s' 時發生錯誤: %s\n"
 
-#: g10/import.c:791
+#: g10/import.c:792
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "金鑰 %s: 公鑰 \"%s\" 已被匯入\n"
 
-#: g10/import.c:815
+#: g10/import.c:816
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "金鑰 %s: 跟我們的副本不吻合\n"
 
-#: g10/import.c:832 g10/import.c:1186
+#: g10/import.c:833 g10/import.c:1187
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "金鑰 %s: 無法定位原始的金鑰區塊: %s\n"
 
-#: g10/import.c:840 g10/import.c:1193
+#: g10/import.c:841 g10/import.c:1194
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "金鑰 %s: 無法讀取原始的金鑰區塊: %s\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "金鑰 %s: \"%s\" 1 個新的使用者 ID\n"
 
-#: g10/import.c:875
+#: g10/import.c:876
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "金鑰 %s: \"%s\" %d 個新的使用者 ID\n"
 
-#: g10/import.c:878
+#: g10/import.c:879
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "金鑰 %s: \"%s\" 1 個新的簽章\n"
 
-#: g10/import.c:881
+#: g10/import.c:882
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "金鑰 %s: \"%s\" %d 個新的簽章\n"
 
-#: g10/import.c:884
+#: g10/import.c:885
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "金鑰 %s: \"%s\" 1 個新的子鑰\n"
 
-#: g10/import.c:887
+#: g10/import.c:888
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "金鑰 %s: \"%s\" %d 個新的子鑰\n"
 
-#: g10/import.c:908
+#: g10/import.c:909
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "金鑰 %s: \"%s\" 沒有被改變\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1054
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "金鑰 %s: 私鑰使用了無效的編密法 %d - 已跳過\n"
 
-#: g10/import.c:1064
+#: g10/import.c:1065
 msgid "importing secret keys not allowed\n"
 msgstr "未被允許匯入私鑰\n"
 
-#: g10/import.c:1081 g10/import.c:2329
+#: g10/import.c:1082 g10/import.c:2330
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "沒有預設的私鑰鑰匙圈: %s\n"
 
-#: g10/import.c:1092
+#: g10/import.c:1093
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "金鑰 %s: 私鑰被匯入了\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1122
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "金鑰 %s: 已經在私鑰鑰匙圈中了\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1132
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "金鑰 %s: 找不到私鑰: %s\n"
 
-#: g10/import.c:1161
+#: g10/import.c:1162
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "金鑰 %s: 沒有公鑰 - 無法套用撤銷憑證\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1205
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已駁回\n"
 
-#: g10/import.c:1236
+#: g10/import.c:1237
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "金鑰 %s: \"%s\" 撤銷憑證已被匯入\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1302
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "金鑰 %s: 簽章沒有使用者 ID\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1317
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "金鑰 %s: 使用者 ID \"%s\" 使用了未被支援的公鑰演算法\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "金鑰 %s: 使用者 ID \"%s\" 有無效的自我簽章\n"
 
-#: g10/import.c:1336
+#: g10/import.c:1337
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "金鑰 %s: 沒有子鑰可供附帶\n"
 
-#: g10/import.c:1347 g10/import.c:1397
+#: g10/import.c:1348 g10/import.c:1398
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "金鑰 %s: 未被支援的公鑰演算法\n"
 
-#: g10/import.c:1349
+#: g10/import.c:1350
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "金鑰 %s: 無效的附帶子鑰\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1365
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "金鑰 %s: 多重附帶子鑰已被移除\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "金鑰 %s: 沒有子鑰可供金鑰撤銷\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "金鑰 %s: 無效的子鑰撤銷\n"
 
-#: g10/import.c:1414
+#: g10/import.c:1415
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "金鑰 %s: 多重子鑰撤銷已移除\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1457
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "金鑰 %s: 使用者 ID \"%s\" 已跳過\n"
 
-#: g10/import.c:1477
+#: g10/import.c:1478
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "金鑰 %s: 子鑰已跳過\n"
 
-#: g10/import.c:1504
+#  here we violate the rfc a bit by still allowing
+#  * to import non-exportable signature when we have the
+#  * the secret key used to create this signature - it
+#  * seems that this makes sense
+#: g10/import.c:1505
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "金鑰 %s: 不可匯出的簽章 (等級 %02X) - 已跳過\n"
 
-#: g10/import.c:1514
+#: g10/import.c:1515
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "金鑰 %s: 撤銷憑證在錯誤的地方 - 已跳過\n"
 
-#: g10/import.c:1531
+#: g10/import.c:1532
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已跳過\n"
 
-#: g10/import.c:1545
+#: g10/import.c:1546
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "金鑰 %s: 子鑰簽章在錯誤的地方 - 已跳過\n"
 
-#: g10/import.c:1553
+#: g10/import.c:1554
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "金鑰 %s: 非預期的簽章等級 (0x%02X) - 已跳過\n"
 
-#: g10/import.c:1574
-#, fuzzy, c-format
+#: g10/import.c:1575
+#, c-format
 msgid "key %s: expired signature from key %s - skipped\n"
-msgstr "金鑰 %s: 非預期的簽章等級 (0x%02X) - 已跳過\n"
+msgstr "金鑰 %s: 來自金鑰 %s 的簽章過期了 - 已跳過\n"
 
-#: g10/import.c:1677
+#: g10/import.c:1678
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "金鑰 %s: 偵測到重複的使用者 ID - 已合併\n"
 
-#: g10/import.c:1739
+#: g10/import.c:1740
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "警告: 金鑰 %s 可能被撤銷了: 正在取回撤銷金鑰 %s\n"
 
-#: g10/import.c:1753
+#: g10/import.c:1754
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "警告: 金鑰 %s 可能被撤銷了: 撤銷金鑰 %s 未出現.\n"
 
-#: g10/import.c:1812
+#: g10/import.c:1813
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "金鑰 %s: 已新增 \"%s\" 撤銷憑證\n"
 
-#: g10/import.c:1846
+#: g10/import.c:1847
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "金鑰 %s: 已新增直接金鑰簽章\n"
 
-#: g10/import.c:2235
-#, fuzzy
+#: g10/import.c:2236
 msgid "NOTE: a key's S/N does not match the card's one\n"
-msgstr "公鑰與私鑰並不吻合!\n"
+msgstr "請注意: 某份金鑰的序號 (S/N) 與卡片的序號並不吻合\n"
 
-#: g10/import.c:2243
-#, fuzzy
+#: g10/import.c:2244
 msgid "NOTE: primary key is online and stored on card\n"
-msgstr "私鑰已經存放於卡片上了\n"
+msgstr "請注意: 主鑰在線上且已存放於卡片上了\n"
 
-#: g10/import.c:2245
-#, fuzzy
+#: g10/import.c:2246
 msgid "NOTE: secondary key is online and stored on card\n"
-msgstr "私鑰已經存放於卡片上了\n"
+msgstr "請注意: 次鑰在線上且已存放於卡片上了\n"
 
-#: g10/keydb.c:167
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "建立鑰匙圈 `%s' 時發生錯誤: %s\n"
 
-#: g10/keydb.c:174
+#: g10/keydb.c:175
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "鑰匙圈 `%s' 已建立\n"
 
-#: g10/keydb.c:685
+#: g10/keydb.c:316 g10/keydb.c:319
+#, fuzzy, c-format
+msgid "keyblock resource `%s': %s\n"
+msgstr "建立 `%s' 時發生錯誤: %s\n"
+
+#: g10/keydb.c:698
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "重新建立鑰匙圈快取失敗: %s\n"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[撤銷]"
 
-#: g10/keyedit.c:255
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[自我簽章]"
 
-#: g10/keyedit.c:333 g10/keylist.c:405
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 個損壞的簽章\n"
 
-#: g10/keyedit.c:335 g10/keylist.c:407
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d 個損壞的簽章\n"
 
-#: g10/keyedit.c:337 g10/keylist.c:409
+#: g10/keyedit.c:344 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "有 1 份簽章因為遺失金鑰而未被檢查\n"
 
-#: g10/keyedit.c:339 g10/keylist.c:411
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "有 %d 份簽章因為遺失金鑰而未被檢查\n"
 
-#: g10/keyedit.c:341 g10/keylist.c:413
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "有 1 份簽章因為某個錯誤而未被檢查\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:415
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "有 %d 份簽章因為某些錯誤而未被檢查\n"
 
-#: g10/keyedit.c:345
+#: g10/keyedit.c:352
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "偵測到 1 個沒有有效自我簽章的使用者 ID\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:354
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "偵測到 %d 個沒有有效自我簽章的使用者 ID\n"
 
-#: g10/keyedit.c:403 g10/pkclist.c:262
+#: g10/keyedit.c:410 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2417,17 +2466,17 @@ msgstr ""
 "請判斷妳有多信任這位使用者確實驗證其他使用者的金鑰\n"
 "(像是查對身份證, 或從不同的來源檢查指紋等...）的能力\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:274
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = 我勉強信任\n"
 
-#: g10/keyedit.c:408 g10/pkclist.c:276
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = 我完全信任\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:434
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2437,36 +2486,46 @@ msgstr ""
 "深度大於 1 的話就表示妳信任這把正被簽署的金鑰,\n"
 "同時也信任這把金鑰所簽署的信任簽章.\n"
 
-#: g10/keyedit.c:443
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "請輸入約束此簽章的網域, 若無請直接按下 [Enter].\n"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "使用者 ID \"%s\" 已經被撤銷了."
 
-#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
-#: g10/keyedit.c:858 g10/keyedit.c:1642
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1728
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "妳仍然想要簽署它嗎? (y/N) "
 
-#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
-#: g10/keyedit.c:1648
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
+#: g10/keyedit.c:1734
 msgid "  Unable to sign.\n"
 msgstr "  無法簽署.\n"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "使用者 ID \"%s\" 已經過期了."
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:650
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "使用者 ID \"%s\" 未經自我簽署."
 
-#: g10/keyedit.c:676
+#: g10/keyedit.c:678
+#, fuzzy, c-format
+msgid "User ID \"%s\" is signable.  "
+msgstr "使用者 ID \"%s\" 未經自我簽署."
+
+#: g10/keyedit.c:680
+#, fuzzy
+msgid "Sign it? (y/N) "
+msgstr "真的要簽署嗎? (y/N)"
+
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2475,11 +2534,11 @@ msgstr ""
 "\"%s\" 裡的自我簽章\n"
 "是 PGP 2.x 型態的簽章.\n"
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:711
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "妳是否想要將它升級成 OpenPGP 自我簽章? (y/N) "
 
-#: g10/keyedit.c:699
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2488,11 +2547,11 @@ msgstr ""
 "妳目前在 \"%s\" 的簽章\n"
 "已經過期了.\n"
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:729
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "妳想要發佈一份新的簽章來取代已過期的那一個嗎? (y/N) "
 
-#: g10/keyedit.c:724
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2501,53 +2560,53 @@ msgstr ""
 "妳目前在 \"%s\" 的簽章\n"
 "是一份本地簽章.\n"
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:754
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "妳是否想要把他升級成可以完全匯出的簽章? (y/N) "
 
-#: g10/keyedit.c:749
+#: g10/keyedit.c:775
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" 已經被金鑰 %s 在本地簽署了\n"
 
-#: g10/keyedit.c:752
+#: g10/keyedit.c:778
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" 已經被金鑰 %s 簽署了\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:783
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "妳仍然想要再次簽署它嗎? (y/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:805
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "沒有東西可以讓金鑰 %s 簽署\n"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "這把金鑰已經過期了!"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "這把金鑰將在 %s 過期.\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:844
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "妳想要讓妳的簽章也在同一個時候過期嗎? (Y/n) "
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:882
 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:853
+#: g10/keyedit.c:884
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "這會讓這把金鑰在 PGP 2.x 模式下不可使用.\n"
 
-#: g10/keyedit.c:878
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2556,31 +2615,31 @@ msgstr ""
 "妳有多謹慎檢查正要簽署的金鑰確實屬於上面那個人的名字呢?\n"
 "如果妳不知道這個問題的答案, 請輸入 \"0\".\n"
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
-msgstr "   (0) 我不作答. %s\n"
+msgstr "   (0) 我不作答.%s\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
-msgstr "   (1) 我根本沒有檢查過. %s\n"
+msgstr "   (1) 我根本沒有檢查過.%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
-msgstr "   (2) 我隨意檢查過了. %s\n"
+msgstr "   (2) 我隨意檢查過了.%s\n"
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
-msgstr "   (3) 我非常小心地檢查過了. %s\n"
+msgstr "   (3) 我非常小心地檢查過了.%s\n"
 
-#: g10/keyedit.c:895
+#: g10/keyedit.c:926
 msgid "Your selection? (enter `?' for more information): "
 msgstr "妳的選擇是? (輸入 `?' 以取得更多資訊): "
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:950
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2589,75 +2648,74 @@ msgstr ""
 "妳真的確定要用妳的金鑰 \"%s\" (%s)\n"
 "來簽署這把金鑰嗎\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:957
 msgid "This will be a self-signature.\n"
 msgstr "這將會是一份自我簽章.\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:963
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "警告: 這份簽章不會被標記為不可匯出.\n"
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:971
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "警告: 這份簽章不會被標記成不可撤銷.\n"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:981
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "這份簽章會被標記成不可匯出.\n"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:988
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "這份簽章會被標記成不可撤銷.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:995
 msgid "I have not checked this key at all.\n"
 msgstr "我根本沒有檢查過這把金鑰.\n"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1000
 msgid "I have checked this key casually.\n"
 msgstr "我隨意檢查過這把金鑰了.\n"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1005
 msgid "I have checked this key very carefully.\n"
 msgstr "我非常小心地檢查過這把金鑰了.\n"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1015
 msgid "Really sign? (y/N) "
 msgstr "真的要簽署嗎? (y/N)"
 
-#: g10/keyedit.c:1029 g10/keyedit.c:4132 g10/keyedit.c:4223 g10/keyedit.c:4287
-#: g10/keyedit.c:4348 g10/sign.c:369
+#: g10/keyedit.c:1060 g10/keyedit.c:4350 g10/keyedit.c:4441 g10/keyedit.c:4505
+#: g10/keyedit.c:4566 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "簽署時失敗了: %s\n"
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
-msgstr ""
+msgstr "金鑰祇剩下殘骸或者祇含有卡上 (on-card) 金鑰項目 - 沒有可變更的密語.\n"
 
-#: g10/keyedit.c:1105 g10/keygen.c:3057
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "這把金鑰沒有被保護.\n"
 
-#: g10/keyedit.c:1109 g10/keygen.c:3045
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主鑰的私鑰部分沒辦法取用.\n"
 
-#: g10/keyedit.c:1113 g10/keygen.c:3060
-#, fuzzy
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 msgid "Secret parts of primary key are stored on-card.\n"
-msgstr "主鑰的私鑰部分沒辦法取用.\n"
+msgstr "主鑰的私鑰部分存放於卡上 (on-card).\n"
 
-#: g10/keyedit.c:1117 g10/keygen.c:3064
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "金鑰被保護了.\n"
 
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "無法編輯這把金鑰: %s\n"
 
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2665,11 +2723,11 @@ msgstr ""
 "輸入要給這把私鑰用的新密語.\n"
 "\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:1825
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "密語再次輸入時沒有正確重複; 請再試一次"
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2677,415 +2735,401 @@ msgstr ""
 "妳不想要用密語 - 這大概是個 *糟* 點子!\n"
 "\n"
 
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1195
 msgid "Do you really want to do this? (y/N) "
 msgstr "妳真的想要這麼做嗎? (y/N) "
 
-#: g10/keyedit.c:1235
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "正在把金鑰的簽章搬移到正確的位置去\n"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "儲存並離開"
 
-#: g10/keyedit.c:1322
-#, fuzzy
+#: g10/keyedit.c:1354
 msgid "show key fingerprint"
-msgstr "顯示指紋"
+msgstr "顯示金鑰指紋"
 
-#: g10/keyedit.c:1323
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "列出金鑰和使用者 ID"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "使用者 ID 選了 N"
 
-#: g10/keyedit.c:1326
-#, fuzzy
+#: g10/keyedit.c:1358
 msgid "select subkey N"
-msgstr "使用者 ID 選了 N"
+msgstr "選擇次鑰 N"
 
-#: g10/keyedit.c:1327
-#, fuzzy
+#: g10/keyedit.c:1359
 msgid "check signatures"
-msgstr "撤銷簽章"
+msgstr "檢查簽章"
 
-#: g10/keyedit.c:1330
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
-msgstr ""
+msgstr "簽署所選的使用者 ID [* 請參見底下有關的註解]"
 
-#: g10/keyedit.c:1335
-#, fuzzy
+#: g10/keyedit.c:1367
 msgid "sign selected user IDs locally"
-msgstr "僅在本地簽署金鑰"
+msgstr "僅在本地簽署所選的使用者 ID"
 
-#: g10/keyedit.c:1337
-#, fuzzy
+#: g10/keyedit.c:1369
 msgid "sign selected user IDs with a trust signature"
-msgstr "提示: 選擇要簽署的使用者 ID\n"
+msgstr "用信任簽章來簽署所選的使用者 ID"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
-msgstr ""
+msgstr "用不可撤銷的簽章來簽署所選的使用者 ID"
 
-#: g10/keyedit.c:1343
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "增加一個使用者 ID"
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "增加一個照片 ID"
 
-#: g10/keyedit.c:1347
-#, fuzzy
+#: g10/keyedit.c:1379
 msgid "delete selected user IDs"
-msgstr "刪除一個使用者 ID"
+msgstr "刪除所選的使用者 ID"
 
-#: g10/keyedit.c:1352
-#, fuzzy
+#: g10/keyedit.c:1384
 msgid "add a subkey"
 msgstr "增加一把次鑰"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr "加入某把金鑰至智慧卡"
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr "移動某把金鑰至智慧卡"
 
-#: g10/keyedit.c:1360
-#, fuzzy
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
-msgstr "移動某把金鑰至智慧卡"
+msgstr "移動某把備份金鑰至智慧卡"
 
-#: g10/keyedit.c:1364
-#, fuzzy
+#: g10/keyedit.c:1396
 msgid "delete selected subkeys"
-msgstr "刪除一把次鑰"
+msgstr "刪除所選的次鑰"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr "增加一把撤銷金鑰"
 
-#: g10/keyedit.c:1368
-#, fuzzy
+#: g10/keyedit.c:1400
 msgid "delete signatures from the selected user IDs"
-msgstr "真的要更新所選使用者 ID 的偏好嗎? (y/N) "
+msgstr "從所選的使用者 ID 中刪除簽章"
 
-#: g10/keyedit.c:1370
-#, fuzzy
+#: g10/keyedit.c:1402
 msgid "change the expiration date for the key or selected subkeys"
-msgstr "妳不能變更 v3 金鑰的使用期限\n"
+msgstr "從金鑰或所選的次鑰中變更使用期限"
 
-#: g10/keyedit.c:1372
-#, fuzzy
+#: g10/keyedit.c:1404
 msgid "flag the selected user ID as primary"
-msgstr "把使用者 ID 標記為主要"
+msgstr "把所選的使用者 ID 標為主要"
 
-#: g10/keyedit.c:1374
-#, fuzzy
+#: g10/keyedit.c:1406
 msgid "toggle between the secret and public key listings"
-msgstr "把私鑰和公鑰清單繫在一起"
+msgstr "在私鑰清單和公鑰清單間切換"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "列出偏好 (專家模式)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "列出偏好 (囉唆模式)"
 
-#: g10/keyedit.c:1381
-#, fuzzy
+#: g10/keyedit.c:1413
 msgid "set preference list for the selected user IDs"
-msgstr "真的要更新所選使用者 ID 的偏好嗎? (y/N) "
+msgstr "設定所選使用者 ID 的偏好清單"
 
-#: g10/keyedit.c:1386
-#, fuzzy
+#: g10/keyedit.c:1418
 msgid "set preferred keyserver URL for the selected user IDs"
-msgstr "設定偏好的金鑰伺服器 URI"
+msgstr "設定所選使用者 ID 的偏好金鑰伺服器 URL"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "更改密語"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "更改主觀信任"
 
-#: g10/keyedit.c:1394
-#, fuzzy
+#: g10/keyedit.c:1426
 msgid "revoke signatures on the selected user IDs"
-msgstr "真的要撤銷所有被選擇的使用者 ID 嗎? (y/N) "
+msgstr "從所選的使用者 ID 上撤銷簽章"
 
-#: g10/keyedit.c:1396
-#, fuzzy
+#: g10/keyedit.c:1428
 msgid "revoke selected user IDs"
-msgstr "撤銷一個使用者 ID"
+msgstr "撤銷所選的使用者 ID"
 
-#: g10/keyedit.c:1401
-#, fuzzy
+#: g10/keyedit.c:1433
 msgid "revoke key or selected subkeys"
-msgstr "撤銷一把次鑰"
+msgstr "撤銷金鑰或所選的次鑰"
 
-#: g10/keyedit.c:1402
-#, fuzzy
+#: g10/keyedit.c:1434
 msgid "enable key"
-msgstr "啟用一把金鑰"
+msgstr "啟用金鑰"
 
-#: g10/keyedit.c:1403
-#, fuzzy
+#: g10/keyedit.c:1435
 msgid "disable key"
-msgstr "禁用一把金鑰"
+msgstr "禁用金鑰"
 
-#: g10/keyedit.c:1404
-#, fuzzy
+#: g10/keyedit.c:1436
 msgid "show selected photo IDs"
-msgstr "顯示照片 ID"
+msgstr "顯示所選的照片 ID"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1556
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "讀取私鑰區塊 \"%s\" 時出錯: %s\n"
 
-#: g10/keyedit.c:1494
+#: g10/keyedit.c:1574
 msgid "Secret key is available.\n"
 msgstr "私鑰可用.\n"
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1655
 msgid "Need the secret key to do this.\n"
 msgstr "要有私鑰纔能這麼做.\n"
 
-#: g10/keyedit.c:1579
+#: g10/keyedit.c:1663
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "請先使用 \"toggle\" 指令.\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1682
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
 "  a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
+"* 這個 `sign' 指令也可以在前面加上一個 `l' 字母, 來表示本地簽章 (lsign),\n"
+"  加上 `t' 的話就是信任簽章 (tsign), 加上 `nr' 的話就是不可撤銷簽章\n"
+"  (nrsign), 當然也可以任意組合這些選項 (像是 ltsign, tnrsign 等等.).\n"
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1722
 msgid "Key is revoked."
 msgstr "金鑰已經被撤銷了."
 
-#: g10/keyedit.c:1657
+#: g10/keyedit.c:1741
 msgid "Really sign all user IDs? (y/N) "
 msgstr "真的要簽署所有的使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:1660
-msgid "Hint: Select the user IDs to sign\n"
-msgstr "提示: 選擇要簽署的使用者 ID\n"
-
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1748
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "未知的簽章種類 `%s'\n"
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1771
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "在 %s 模式中不允許使用這個指令.\n"
 
-#: g10/keyedit.c:1713 g10/keyedit.c:1733 g10/keyedit.c:1899
+#: g10/keyedit.c:1793 g10/keyedit.c:1813 g10/keyedit.c:1979
 msgid "You must select at least one user ID.\n"
 msgstr "妳至少得選擇一個使用者 ID.\n"
 
-#: g10/keyedit.c:1715
+#: g10/keyedit.c:1795
 msgid "You can't delete the last user ID!\n"
 msgstr "妳不能刪除最後一個使用者 ID!\n"
 
-#: g10/keyedit.c:1717
+#: g10/keyedit.c:1797
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "真的要移除所有被選擇的使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:1718
+#: g10/keyedit.c:1798
 msgid "Really remove this user ID? (y/N) "
 msgstr "真的要移除這個使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1848
 msgid "Really move the primary key? (y/N) "
 msgstr "真的要移動主要金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:1780
+#: g10/keyedit.c:1860
 msgid "You must select exactly one key.\n"
 msgstr "妳一定祇得選擇一把金鑰.\n"
 
-#: g10/keyedit.c:1808
+#: g10/keyedit.c:1888
 msgid "Command expects a filename argument\n"
-msgstr ""
+msgstr "這項指令應該要拿一個檔名當作參數\n"
 
-#: g10/keyedit.c:1822
-#, fuzzy, c-format
+#: g10/keyedit.c:1902
+#, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "無法開啟 `%s': %s\n"
 
-#: g10/keyedit.c:1839
-#, fuzzy, c-format
+#: g10/keyedit.c:1919
+#, c-format
 msgid "Error reading backup key from `%s': %s\n"
-msgstr "建立鑰匙圈 `%s' 時發生錯誤: %s\n"
+msgstr "從 `%s' 讀取備份金鑰時發生錯誤: %s\n"
 
-#: g10/keyedit.c:1863
+#: g10/keyedit.c:1943
 msgid "You must select at least one key.\n"
 msgstr "妳至少必須選擇一把金鑰.\n"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1946
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "妳真的想要刪除被選擇的金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:1867
+#: g10/keyedit.c:1947
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "妳真的要刪除這把金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1982
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "真的要撤銷所有被選擇的使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1983
 msgid "Really revoke this user ID? (y/N) "
 msgstr "真的要撤銷這個使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:1921
-#, fuzzy
+#: g10/keyedit.c:2001
 msgid "Do you really want to revoke the entire key? (y/N) "
-msgstr "妳真的想要撤銷這把金鑰嗎? (y/N) "
+msgstr "妳真的想要撤銷這整把金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:1932
-#, fuzzy
+#: g10/keyedit.c:2012
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
-msgstr "妳真的想要撤銷這些被選擇的金鑰嗎? (y/N) "
+msgstr "妳真的想要撤銷這些被選擇的次鑰嗎? (y/N) "
 
-#: g10/keyedit.c:1934
-#, fuzzy
+#: g10/keyedit.c:2014
 msgid "Do you really want to revoke this subkey? (y/N) "
-msgstr "妳真的想要撤銷這把金鑰嗎? (y/N) "
+msgstr "妳真的想要撤銷這把次鑰嗎? (y/N) "
 
-#: g10/keyedit.c:1975
+#: g10/keyedit.c:2055
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr "使用使用者所提供的信任資料庫時可能無法設定主觀信任\n"
 
-#: g10/keyedit.c:2007
+#: g10/keyedit.c:2087
 msgid "Set preference list to:\n"
 msgstr "設定偏好清單至:\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2093
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "真的要更新所選使用者 ID 的偏好嗎? (y/N) "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2095
 msgid "Really update the preferences? (y/N) "
 msgstr "真的要更新偏好嗎? (y/N) "
 
-#: g10/keyedit.c:2065
+#: g10/keyedit.c:2157
+#, fuzzy, c-format
+msgid "Unable to clean `%s'\n"
+msgstr "無法執行程式 `%s': %s\n"
+
+#: g10/keyedit.c:2160
+msgid "Please specify item to clean: `sigs', `uids', or `all'\n"
+msgstr ""
+
+#: g10/keyedit.c:2171
 msgid "Save changes? (y/N) "
 msgstr "要儲存變更嗎? (y/N) "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2174
 msgid "Quit without saving? (y/N) "
 msgstr "要不儲存就離開嗎? (y/N) "
 
-#: g10/keyedit.c:2078
+#: g10/keyedit.c:2184
 #, c-format
 msgid "update failed: %s\n"
 msgstr "更新失敗: %s\n"
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2191
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "更新私鑰失敗: %s\n"
 
-#: g10/keyedit.c:2092
+#: g10/keyedit.c:2198
 msgid "Key not changed so no update needed.\n"
 msgstr "金鑰沒有變更所以不需要更新.\n"
 
-#: g10/keyedit.c:2164
+#: g10/keyedit.c:2271
 msgid "Digest: "
 msgstr "摘要: "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2323
 msgid "Features: "
 msgstr "特點: "
 
-#: g10/keyedit.c:2227
+#: g10/keyedit.c:2334
 msgid "Keyserver no-modify"
 msgstr "金鑰伺服器無修改"
 
-#: g10/keyedit.c:2242 g10/keylist.c:307
+#: g10/keyedit.c:2349 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "偏好的金鑰伺服器: "
 
-#: g10/keyedit.c:2473
-#, fuzzy, c-format
+#: g10/keyedit.c:2580
+#, c-format
 msgid "This key was revoked on %s by %s key %s\n"
-msgstr "這把金鑰可能被 %s 金鑰 %s 撤銷了 "
+msgstr "這把金鑰已經在 %s 時被 %s 金鑰 %s 給撤銷了\n"
 
-#: g10/keyedit.c:2494
+#: g10/keyedit.c:2601
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "這把金鑰可能被 %s 金鑰 %s 撤銷了 "
 
-#: g10/keyedit.c:2500
+#: g10/keyedit.c:2607
 msgid "(sensitive)"
 msgstr "(機密的)"
 
-#: g10/keyedit.c:2516 g10/keyedit.c:2572 g10/keyedit.c:2684 g10/keyedit.c:2699
-#: g10/keylist.c:193 g10/keyserver.c:422
+#: g10/keyedit.c:2623 g10/keyedit.c:2679 g10/keyedit.c:2792 g10/keyedit.c:2807
+#: g10/keylist.c:194 g10/keyserver.c:421
 #, c-format
 msgid "created: %s"
 msgstr "建立於: %s"
 
-#: g10/keyedit.c:2519 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:931
+#: g10/keyedit.c:2626 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:948
 #, c-format
 msgid "revoked: %s"
 msgstr "已撤銷: %s"
 
-#: g10/keyedit.c:2521 g10/keylist.c:757 g10/keylist.c:886
+#  of subkey
+#: g10/keyedit.c:2628 g10/keylist.c:758 g10/keylist.c:887
 #, c-format
 msgid "expired: %s"
 msgstr "已過期: %s"
 
-#: g10/keyedit.c:2523 g10/keyedit.c:2574 g10/keyedit.c:2686 g10/keyedit.c:2701
-#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
-#: g10/keylist.c:913 g10/keyserver.c:428 g10/mainproc.c:937
+#  of subkey
+#: g10/keyedit.c:2630 g10/keyedit.c:2681 g10/keyedit.c:2794 g10/keyedit.c:2809
+#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
+#: g10/keylist.c:914 g10/keyserver.c:427 g10/mainproc.c:954
 #, c-format
 msgid "expires: %s"
 msgstr "過期: %s"
 
-#: g10/keyedit.c:2525
+#: g10/keyedit.c:2632
 #, c-format
 msgid "usage: %s"
 msgstr "用法: %s"
 
-#: g10/keyedit.c:2540
+#: g10/keyedit.c:2647
 #, c-format
 msgid "trust: %s"
 msgstr "信任: %s"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2651
 #, c-format
 msgid "validity: %s"
 msgstr "有效性: %s"
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2658
 msgid "This key has been disabled"
 msgstr "這把金鑰已經被禁用了"
 
-#: g10/keyedit.c:2579 g10/keylist.c:199
+#: g10/keyedit.c:2686 g10/keylist.c:200
 msgid "card-no: "
 msgstr "卡片編號: "
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2754
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x 型態的使用者 ID 沒有偏好.\n"
 
-#: g10/keyedit.c:2654
+#: g10/keyedit.c:2762
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3093,17 +3137,17 @@ msgstr ""
 "請注意顯示出來的金鑰有效性不需要更正,\n"
 "除非妳重新執行程式.\n"
 
-#: g10/keyedit.c:2718 g10/keyserver.c:432 g10/mainproc.c:1577
-#: g10/trustdb.c:1178
+#: g10/keyedit.c:2826 g10/keyedit.c:3201 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1690
 msgid "revoked"
 msgstr "已撤銷"
 
-#: g10/keyedit.c:2720 g10/keyserver.c:436 g10/mainproc.c:1579
-#: g10/trustdb.c:531
+#: g10/keyedit.c:2828 g10/keyedit.c:3203 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1692
 msgid "expired"
 msgstr "已過期"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2893
 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"
@@ -3111,7 +3155,7 @@ msgstr ""
 "警告: 沒有任何使用者 ID 已被標示為主要 ID. 這項指令可能\n"
 "      會導致不同的使用者 ID 被當成主要 ID.\n"
 
-#: g10/keyedit.c:2845
+#: g10/keyedit.c:2953
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3120,45 +3164,75 @@ msgstr ""
 "警告: 這是一把 PGP2 型態的金鑰.\n"
 "      增加照片 ID 可能會導致某些版本的 PGP 駁回這把金鑰.\n"
 
-#: g10/keyedit.c:2850 g10/keyedit.c:3128
+#: g10/keyedit.c:2958 g10/keyedit.c:3307
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "妳確定仍然想要增加嗎? (y/N) "
 
-#: g10/keyedit.c:2856
+#: g10/keyedit.c:2964
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "妳不可以把照片 ID 增加到 PGP2 型態的金鑰裡.\n"
 
-#: g10/keyedit.c:2996
+#: g10/keyedit.c:3104
 msgid "Delete this good signature? (y/N/q)"
 msgstr "刪除這個完好的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:3006
+#: g10/keyedit.c:3114
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "刪除這個無效的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:3010
+#: g10/keyedit.c:3118
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "刪除這個未知的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:3016
+#: g10/keyedit.c:3124
 msgid "Really delete this self-signature? (y/N)"
 msgstr "真的要刪除這個自我簽章嗎? (y/N)"
 
-#: g10/keyedit.c:3030
+#: g10/keyedit.c:3138
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "已經刪除了 %d 個簽章.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3139
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "已經刪除了 %d 個簽章.\n"
 
-#: g10/keyedit.c:3034
+#: g10/keyedit.c:3142
 msgid "Nothing deleted.\n"
 msgstr "沒有東西被刪除.\n"
 
-#: g10/keyedit.c:3123
+#: g10/keyedit.c:3167
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed.\n"
+msgstr "使用者 ID \"%s\" 已經被撤銷了."
+
+#: g10/keyedit.c:3168
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed.\n"
+msgstr "使用者 ID \"%s\" 已經被撤銷了."
+
+#: g10/keyedit.c:3173
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean.\n"
+msgstr "使用者 ID \"%s\" 已經被撤銷了\n"
+
+#: g10/keyedit.c:3205 g10/trustdb.c:1694
+#, fuzzy
+msgid "invalid"
+msgstr "無效的封裝"
+
+#: g10/keyedit.c:3207
+#, fuzzy, c-format
+msgid "User ID \"%s\" removed: %s\n"
+msgstr "使用者 ID \"%s\" 已經被撤銷了."
+
+#: g10/keyedit.c:3214
+#, fuzzy
+msgid "No user IDs are removable.\n"
+msgstr "使用者 ID \"%s\" 已經被撤銷了\n"
+
+#: g10/keyedit.c:3302
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3167,329 +3241,335 @@ msgstr ""
 "警告: 這是一把 PGP2 型態的金鑰.\n"
 "      增加指定撤銷者可能會導致某些版本的 PGP 駁回這把金鑰.\n"
 
-#: g10/keyedit.c:3134
+#: g10/keyedit.c:3313
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "妳不可以把指定撤銷者增加到 PGP2 型態的金鑰裡.\n"
 
-#: g10/keyedit.c:3154
+#: g10/keyedit.c:3333
 msgid "Enter the user ID of the designated revoker: "
 msgstr "輸入指定撤銷者的使用者 ID: "
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3356
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "無法將 PGP 2.x 型態的金鑰指派為指定撤銷者\n"
 
-#: g10/keyedit.c:3192
+#  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:3371
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "妳不能指派某把金鑰為它自己的指定撤銷者\n"
 
-#: g10/keyedit.c:3214
+#: g10/keyedit.c:3393
 msgid "this key has already been designated as a revoker\n"
 msgstr "這把金鑰已被指定為撤銷者了\n"
 
-#: g10/keyedit.c:3233
+#: g10/keyedit.c:3412
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告: 一旦把某把金鑰指派為指定撤銷者後, 就無法反悔了!\n"
 
-#: g10/keyedit.c:3239
+#: g10/keyedit.c:3418
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "妳確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
 
-#: g10/keyedit.c:3300
+#: g10/keyedit.c:3479
 msgid "Please remove selections from the secret keys.\n"
 msgstr "請從私鑰中移除選擇.\n"
 
-#: g10/keyedit.c:3306
-#, fuzzy
+#: g10/keyedit.c:3485
 msgid "Please select at most one subkey.\n"
 msgstr "請至多選擇一把次鑰.\n"
 
-#: g10/keyedit.c:3310
-#, fuzzy
+#: g10/keyedit.c:3489
 msgid "Changing expiration time for a subkey.\n"
 msgstr "正在變更某把次鑰的使用期限.\n"
 
-#: g10/keyedit.c:3313
+#: g10/keyedit.c:3492
 msgid "Changing expiration time for the primary key.\n"
 msgstr "正在變更主鑰的使用期限.\n"
 
-#: g10/keyedit.c:3359
+#: g10/keyedit.c:3538
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "妳不能變更 v3 金鑰的使用期限\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3554
 msgid "No corresponding signature in secret ring\n"
 msgstr "在私鑰圈裡沒有一致的簽章\n"
 
-#: g10/keyedit.c:3455
+#: g10/keyedit.c:3634
 msgid "Please select exactly one user ID.\n"
 msgstr "請精確地選擇一個使用者 ID.\n"
 
-#: g10/keyedit.c:3494 g10/keyedit.c:3604 g10/keyedit.c:3724
+#: g10/keyedit.c:3673 g10/keyedit.c:3783 g10/keyedit.c:3903
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "正在跳過使用者 ID \"%s\" 的 v3 自我簽章\n"
 
-#: g10/keyedit.c:3665
+#: g10/keyedit.c:3844
 msgid "Enter your preferred keyserver URL: "
 msgstr "請輸入妳的偏好金鑰伺服器 URL: "
 
-#: g10/keyedit.c:3745
+#: g10/keyedit.c:3924
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "妳確定要取代它嗎？ (y/N) "
 
-#: g10/keyedit.c:3746
+#: g10/keyedit.c:3925
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "妳確定要刪除它嗎？ (y/N) "
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3987
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "索引 %d 沒有使用者 ID\n"
 
-#: g10/keyedit.c:3854
+#: g10/keyedit.c:4045
 #, fuzzy, c-format
-msgid "No subkey with index %d\n"
+msgid "No user ID with hash %s\n"
 msgstr "索引 %d 沒有使用者 ID\n"
 
-#: g10/keyedit.c:3971
+#: g10/keyedit.c:4072
+#, c-format
+msgid "No subkey with index %d\n"
+msgstr "索引 %d 沒有次鑰\n"
+
+#: g10/keyedit.c:4189
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "使用者 ID: \"%s\"\n"
 
-#: g10/keyedit.c:3974 g10/keyedit.c:4038 g10/keyedit.c:4081
+#: g10/keyedit.c:4192 g10/keyedit.c:4256 g10/keyedit.c:4299
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "已被妳的金鑰 %s 於 %s%s%s 簽署了\n"
 
-#: g10/keyedit.c:3976 g10/keyedit.c:4040 g10/keyedit.c:4083
+#: g10/keyedit.c:4194 g10/keyedit.c:4258 g10/keyedit.c:4301
 msgid " (non-exportable)"
 msgstr " (不可匯出)"
 
-#: g10/keyedit.c:3980
+#: g10/keyedit.c:4198
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "這份簽署已經在 %s 過期了.\n"
 
-#: g10/keyedit.c:3984
+#: g10/keyedit.c:4202
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "妳確定妳仍然想要撤銷它嗎? (y/N) "
 
-#: g10/keyedit.c:3988
+#: g10/keyedit.c:4206
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "要為這份簽章建立一份撤銷憑證嗎? (y/N) "
 
-#: g10/keyedit.c:4015
+#: g10/keyedit.c:4233
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "妳已經簽署了金鑰 %s 上的這些使用者 ID:\n"
 
-#: g10/keyedit.c:4041
+#: g10/keyedit.c:4259
 msgid " (non-revocable)"
 msgstr " (不可撤銷)"
 
-#: g10/keyedit.c:4048
+#: g10/keyedit.c:4266
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "被妳的金鑰 %s 於 %s 所撤銷了\n"
 
-#: g10/keyedit.c:4070
+#: g10/keyedit.c:4288
 msgid "You are about to revoke these signatures:\n"
 msgstr "妳正在撤銷這些簽章:\n"
 
-#: g10/keyedit.c:4090
+#: g10/keyedit.c:4308
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "真的要建立撤銷憑證嗎? (y/N) "
 
-#: g10/keyedit.c:4120
+#: g10/keyedit.c:4338
 msgid "no secret key\n"
 msgstr "沒有私鑰\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4408
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "使用者 ID \"%s\" 已經被撤銷了\n"
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4425
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告: 有一份使用者 ID 簽章的日期標記為 %d 秒後的未來\n"
 
-#: g10/keyedit.c:4271
-#, fuzzy, c-format
+#: g10/keyedit.c:4489
+#, c-format
 msgid "Key %s is already revoked.\n"
-msgstr "使用者 ID \"%s\" 已經被撤銷了\n"
+msgstr "金鑰 %s 已經被撤銷了.\n"
 
-#: g10/keyedit.c:4333
-#, fuzzy, c-format
+#: g10/keyedit.c:4551
+#, c-format
 msgid "Subkey %s is already revoked.\n"
-msgstr "使用者 ID \"%s\" 已經被撤銷了\n"
+msgstr "次鑰 %s 已經被撤銷了.\n"
 
-#: g10/keyedit.c:4428
+#: g10/keyedit.c:4646
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在顯示 %s 照片 ID, 其尺寸為 %ld, 屬於金鑰 %s (uid %d) 的照片\n"
 
-#: g10/keygen.c:293
+#: g10/keygen.c:258
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "偏好設定 `%s' 重複了\n"
 
-#: g10/keygen.c:300
+#: g10/keygen.c:265
 msgid "too many cipher preferences\n"
 msgstr "編密偏好過多\n"
 
-#: g10/keygen.c:302
+#: g10/keygen.c:267
 msgid "too many digest preferences\n"
 msgstr "摘要偏好過多\n"
 
-#: g10/keygen.c:304
+#: g10/keygen.c:269
 msgid "too many compression preferences\n"
 msgstr "壓縮偏好過多\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:394
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "偏好字串中含有無效的 `%s' 項目\n"
 
-#: g10/keygen.c:829
+#: g10/keygen.c:822
 msgid "writing direct signature\n"
 msgstr "正在寫入直接簽章\n"
 
-#: g10/keygen.c:868
+#: g10/keygen.c:861
 msgid "writing self signature\n"
 msgstr "正在寫入自我簽章\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing key binding signature\n"
 msgstr "正在寫入附鑰簽章\n"
 
-#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2632
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "金鑰尺寸無效; 改用 %u 位元\n"
 
-#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2638
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "金鑰尺寸增大到 %u 位元\n"
 
-#: g10/keygen.c:1249
+#: g10/keygen.c:1239
 msgid "Sign"
 msgstr "簽署"
 
-#: g10/keygen.c:1252
+#: g10/keygen.c:1242
 msgid "Encrypt"
 msgstr "加密"
 
-#: g10/keygen.c:1255
+#: g10/keygen.c:1245
 msgid "Authenticate"
 msgstr "鑑定"
 
-#: g10/keygen.c:1263
+#: g10/keygen.c:1253
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1268
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "%s 金鑰可能的動作: "
 
-#: g10/keygen.c:1282
+#: g10/keygen.c:1272
 msgid "Current allowed actions: "
 msgstr "目前可進行的動作: "
 
-#: g10/keygen.c:1287
+#: g10/keygen.c:1277
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) 切換簽署性能\n"
 
-#: g10/keygen.c:1290
+#: g10/keygen.c:1280
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) 切換加密性能\n"
 
-#: g10/keygen.c:1293
+#: g10/keygen.c:1283
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) 切換鑑定性能\n"
 
-#: g10/keygen.c:1296
+#: g10/keygen.c:1286
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) 已完成\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1340
 msgid "Please select what kind of key you want:\n"
 msgstr "請選擇妳要使用的金鑰種類:\n"
 
-#: g10/keygen.c:1352
+#: g10/keygen.c:1342
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA 和 Elgamal (預設)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1343
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (僅能簽署用)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1345
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (妳自己設定性能)\n"
 
-#: g10/keygen.c:1357
+#: g10/keygen.c:1347
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (僅能加密用)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1348
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (僅能簽署用)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1350
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (僅能加密用)\n"
 
-#: g10/keygen.c:1362
+#: g10/keygen.c:1352
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (妳自己設定性能)\n"
 
-#: g10/keygen.c:1431 g10/keygen.c:2509
+#: g10/keygen.c:1421 g10/keygen.c:2506
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA 金鑰對會有 %u 位元長.\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1431
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s 金鑰的長度可能介於 %u 位元和 %u 位元之間.\n"
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1438
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "妳想要用多大的金鑰尺寸? (%u) "
 
-#: g10/keygen.c:1462
+#: g10/keygen.c:1452
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s 金鑰尺寸一定要介於 %u 到 %u 之間\n"
 
-#: g10/keygen.c:1468
+#: g10/keygen.c:1458
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "妳所要求的金鑰尺寸是 %u 位元\n"
 
-#: g10/keygen.c:1473 g10/keygen.c:1478
+#: g10/keygen.c:1463 g10/keygen.c:1468
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "加大到 %u 位元\n"
 
-#: g10/keygen.c:1530
+#: g10/keygen.c:1515
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3505,7 +3585,7 @@ msgstr ""
 "      <n>m = 金鑰在 n 月後會過期\n"
 "      <n>y = 金鑰在 n 年後會過期\n"
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1526
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3521,39 +3601,38 @@ msgstr ""
 "      <n>m = 簽章在 n 月後會過期\n"
 "      <n>y = 簽章在 n 年後會過期\n"
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1549
 msgid "Key is valid for? (0) "
 msgstr "金鑰的有效期限是多久? (0) "
 
-#: g10/keygen.c:1563
-msgid "Signature is valid for? (0) "
+#: g10/keygen.c:1554
+#, fuzzy, c-format
+msgid "Signature is valid for? (%s) "
 msgstr "簽章的有效期限是多久? (0) "
 
-#: g10/keygen.c:1568
+#: g10/keygen.c:1572
 msgid "invalid value\n"
 msgstr "無效的數值\n"
 
-#: g10/keygen.c:1575
-#, fuzzy
+#: g10/keygen.c:1579
 msgid "Key does not expire at all\n"
-msgstr "%s 完全不會過期\n"
+msgstr "金鑰完全不會過期\n"
 
-#: g10/keygen.c:1576
-#, fuzzy
+#: g10/keygen.c:1580
 msgid "Signature does not expire at all\n"
-msgstr "%s 完全不會過期\n"
+msgstr "簽章完全不會過期\n"
 
-#: g10/keygen.c:1583
-#, fuzzy, c-format
+#: g10/keygen.c:1585
+#, c-format
 msgid "Key expires at %s\n"
-msgstr "%s 將會在 %s 過期\n"
+msgstr "金鑰將會在 %s 過期\n"
 
-#: g10/keygen.c:1584
-#, fuzzy, c-format
+#: g10/keygen.c:1586
+#, c-format
 msgid "Signature expires at %s\n"
-msgstr "這份簽署在 %s 過期.\n"
+msgstr "簽章將會在 %s 過期.\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1592
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3561,11 +3640,11 @@ msgstr ""
 "妳的系統無法顯示 2038 年以後的日期.\n"
 "不過, 它可以正確處理直到 2106 年之前的年份.\n"
 
-#: g10/keygen.c:1595
+#: g10/keygen.c:1597
 msgid "Is this correct? (y/N) "
 msgstr "以上正確嗎? (y/N) "
 
-#: g10/keygen.c:1638
+#: g10/keygen.c:1641
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3580,44 +3659,44 @@ msgstr ""
 "    \"Ke-Huan Lin (Jedi) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1651
+#: g10/keygen.c:1654
 msgid "Real name: "
 msgstr "真實姓名: "
 
-#: g10/keygen.c:1659
+#: g10/keygen.c:1662
 msgid "Invalid character in name\n"
 msgstr "姓名含有無效的字符\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1664
 msgid "Name may not start with a digit\n"
 msgstr "姓名不可以用數字開頭\n"
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1666
 msgid "Name must be at least 5 characters long\n"
 msgstr "姓名至少要有五個字符長\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1674
 msgid "Email address: "
 msgstr "電子郵件地址: "
 
-#: g10/keygen.c:1682
+#: g10/keygen.c:1685
 msgid "Not a valid email address\n"
 msgstr "不是有效的電子郵件地址\n"
 
-#: g10/keygen.c:1690
+#: g10/keygen.c:1693
 msgid "Comment: "
 msgstr "註釋: "
 
-#: g10/keygen.c:1696
+#: g10/keygen.c:1699
 msgid "Invalid character in comment\n"
 msgstr "註釋含有無效的字符\n"
 
-#: g10/keygen.c:1719
+#: g10/keygen.c:1722
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "妳正在使用 `%s' 字元集.\n"
 
-#: g10/keygen.c:1725
+#: g10/keygen.c:1728
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3628,7 +3707,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1733
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "請不要把電子郵件地址放進妳的真實姓名或註釋裡\n"
 
@@ -3643,23 +3722,23 @@ msgstr "請不要把電子郵件地址放進妳的真實姓名或註釋裡\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1746
+#: g10/keygen.c:1749
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1756
+#: g10/keygen.c:1759
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或退出(Q)? "
 
-#: g10/keygen.c:1757
+#: g10/keygen.c:1760
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或確定(O)/退出(Q)? "
 
-#: g10/keygen.c:1776
+#: g10/keygen.c:1779
 msgid "Please correct the error first\n"
 msgstr "請先訂正錯誤\n"
 
-#: g10/keygen.c:1816
+#: g10/keygen.c:1819
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3667,12 +3746,12 @@ msgstr ""
 "妳需要一個密語來保護妳的私鑰.\n"
 "\n"
 
-#: g10/keygen.c:1826 g10/passphrase.c:1105
+#: g10/keygen.c:1829 g10/passphrase.c:786
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1832
+#: g10/keygen.c:1835
 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"
@@ -3684,7 +3763,7 @@ msgstr ""
 "僅需要再次執行這個程式, 並且使用 \"--edit-key\" 選項即可.\n"
 "\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1857
 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"
@@ -3695,429 +3774,411 @@ msgstr ""
 "(像是敲打鍵盤, 移動滑鼠, 讀寫硬碟之類的)\n"
 "這會讓隨機數字產生器有更多的機會獲得夠多的亂數.\n"
 
-#: g10/keygen.c:2578
+#: g10/keygen.c:2575
 msgid "Key generation canceled.\n"
 msgstr "已取消金鑰產生.\n"
 
-#: g10/keygen.c:2766 g10/keygen.c:2910
+#: g10/keygen.c:2774 g10/keygen.c:2918
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "正在將公鑰寫至 `%s'\n"
 
-#: g10/keygen.c:2768 g10/keygen.c:2913
+#: g10/keygen.c:2776 g10/keygen.c:2921
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "正在寫入私鑰 stub 至 `%s'\n"
 
-#: g10/keygen.c:2771 g10/keygen.c:2916
+#: g10/keygen.c:2779 g10/keygen.c:2924
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "正在將私鑰寫至 `%s'\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2907
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "找不到可寫的公鑰鑰匙圈: %s\n"
 
-#: g10/keygen.c:2905
+#: g10/keygen.c:2913
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "找不到可寫的私鑰鑰匙圈: %s\n"
 
-#: g10/keygen.c:2923
+#: g10/keygen.c:2931
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "寫入公鑰鑰匙圈 `%s' 時發生錯誤: %s\n"
 
-#: g10/keygen.c:2930
+#: g10/keygen.c:2938
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "寫入私鑰鑰匙圈 `%s' 時發生錯誤: %s\n"
 
-#: g10/keygen.c:2953
+#: g10/keygen.c:2961
 msgid "public and secret key created and signed.\n"
 msgstr "公鑰和私鑰已經被建立及簽署了.\n"
 
-#: g10/keygen.c:2964
-#, fuzzy
+#: g10/keygen.c:2972
 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 ""
-"請注意這把金鑰不能用來加密之用. 妳必須用 \"--edit-key\" 指令\n"
-"來產生次鑰纔行.\n"
+"請注意這把金鑰不能用於加密之用.  也許妳會想藉由 \"--edit-key\" \n"
+"指令來產生加密用的次鑰.\n"
 
-#: g10/keygen.c:2976 g10/keygen.c:3105 g10/keygen.c:3220
+#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "產生金鑰失敗: %s\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3156 g10/sign.c:290
+#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "金鑰已經在 %lu 秒後的未來製造出來了 (可能是因為時光旅行或時鐘的問題)\n"
 
-#: g10/keygen.c:3030 g10/keygen.c:3158 g10/sign.c:292
+#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "金鑰已經在 %lu 秒後的未來製造出來了 (可能是因為時光旅行或時鐘的問題)\n"
 
-#: g10/keygen.c:3039 g10/keygen.c:3169
+#: g10/keygen.c:3047 g10/keygen.c:3177
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "請注意: 對 v3 金鑰製造子鑰會失去 OpenPGP 相容性\n"
 
-#: g10/keygen.c:3078 g10/keygen.c:3202
+#: g10/keygen.c:3086 g10/keygen.c:3210
 msgid "Really create? (y/N) "
 msgstr "真的要建立嗎? (y/N) "
 
-#: g10/keygen.c:3355
+#: g10/keygen.c:3363
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "儲存金鑰到卡片上時失敗: %s\n"
 
-#: g10/keygen.c:3402
+#: g10/keygen.c:3410
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "無法建立備份檔案 `%s': %s\n"
 
-#: g10/keygen.c:3428
+#: g10/keygen.c:3436
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "請注意: 卡片金鑰的備份已儲存至 `%s'\n"
 
-#: g10/keygen.c:3508
-#, c-format
-msgid "length of RSA modulus is not %d\n"
-msgstr "RSA 系數的長度並非 %d\n"
-
-#: g10/keygen.c:3514
-msgid "public exponent too large (more than 32 bits)\n"
-msgstr "公用指數太大 (超過 32 位元)\n"
-
-#: g10/keygen.c:3520 g10/keygen.c:3526
-#, c-format
-msgid "length of an RSA prime is not %d\n"
-msgstr "RSA 質數的長度並非 %d\n"
-
-#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
+#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
 msgid "never     "
 msgstr "永遠不過期"
 
-#: g10/keylist.c:264
+#: g10/keylist.c:265
 msgid "Critical signature policy: "
 msgstr "關鍵簽章原則: "
 
-#: g10/keylist.c:266
+#: g10/keylist.c:267
 msgid "Signature policy: "
 msgstr "簽章原則: "
 
-#: g10/keylist.c:305
+#: g10/keylist.c:306
 msgid "Critical preferred keyserver: "
 msgstr "執意偏好的金鑰伺服器: "
 
-#: g10/keylist.c:354 g10/keylist.c:398
+#: g10/keylist.c:355 g10/keylist.c:399
 msgid "WARNING: invalid notation data found\n"
 msgstr "警告: 找到無效的標記資料\n"
 
-#: g10/keylist.c:372
+#: g10/keylist.c:373
 msgid "Critical signature notation: "
-msgstr "關鍵簽章標記： "
+msgstr "關鍵簽章標記: "
 
-#: g10/keylist.c:374
+#: g10/keylist.c:375
 msgid "Signature notation: "
-msgstr "簽章標記： "
+msgstr "簽章標記: "
 
-#: g10/keylist.c:385
+#: g10/keylist.c:386
 msgid "not human readable"
 msgstr "不是人類能讀得懂的"
 
-#: g10/keylist.c:486
+#: g10/keylist.c:487
 msgid "Keyring"
 msgstr "鑰匙圈"
 
-#: g10/keylist.c:792
+#  of subkey
+#: g10/keylist.c:793
 #, c-format
 msgid "expired: %s)"
 msgstr "已過期: %s)"
 
-#: g10/keylist.c:1488
+#: g10/keylist.c:1489
 msgid "Primary key fingerprint:"
-msgstr "主鑰指紋:"
+msgstr "               主鑰指紋:"
 
-#: g10/keylist.c:1490
+#: g10/keylist.c:1491
 msgid "     Subkey fingerprint:"
-msgstr "              子鑰指紋:"
+msgstr "               子鑰指紋:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1497
+#: g10/keylist.c:1498
 msgid " Primary key fingerprint:"
-msgstr " 主鑰指紋:"
+msgstr "                主鑰指紋:"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1500
 msgid "      Subkey fingerprint:"
-msgstr "               子鑰指紋:"
+msgstr "                子鑰指紋:"
 
-#: g10/keylist.c:1503 g10/keylist.c:1507
+#  use tty
+#: g10/keylist.c:1504 g10/keylist.c:1508
 msgid "      Key fingerprint ="
 msgstr "      金鑰指紋 ="
 
-#: g10/keylist.c:1574
+#: g10/keylist.c:1575
 msgid "      Card serial no. ="
 msgstr "      卡片序號 ="
 
-#: g10/keyring.c:1245
+#: g10/keyring.c:1246
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "把 `%s' 重新新命成 `%s' 時失敗: %s\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1252
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "警告: 2 個檔案存在有互相矛盾的資訊.\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s 是沒有改變的那一個\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1255
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s 是新的那一個\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1256
 msgid "Please fix this possible security flaw\n"
 msgstr "請修補這個可能的安全性裂縫\n"
 
-#: g10/keyring.c:1375
+#: g10/keyring.c:1376
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "正在快取鑰匙圈 `%s'\n"
 
-#: g10/keyring.c:1421
+#: g10/keyring.c:1422
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "目前檢查了 %lu 份金鑰 (共 %lu 份簽章)\n"
 
-#: g10/keyring.c:1433
+#: g10/keyring.c:1434
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "檢查了 %lu 份金鑰 (共 %lu 份簽章)\n"
 
-#: g10/keyring.c:1504
+#: g10/keyring.c:1505
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: 鑰匙圈已建立\n"
 
-#: g10/keyserver.c:107
+#: g10/keyserver.c:105
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "警告: 金鑰伺服器選項 `%s' 並未用於此平台\n"
 
-#: g10/keyserver.c:434
+#: g10/keyserver.c:433
 msgid "disabled"
 msgstr "已禁用"
 
-#: g10/keyserver.c:635
+#: g10/keyserver.c:634
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "請輸入數字, N)ext, 或 Q)uit > "
 
-#: g10/keyserver.c:718 g10/keyserver.c:1238
+#: g10/keyserver.c:717 g10/keyserver.c:1267
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "無效的金鑰伺服器協定 (我們用 %d != 經手程式 %d)\n"
 
-#: g10/keyserver.c:808
+#: g10/keyserver.c:815
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "在金鑰伺服器上找不到金鑰 \"%s\"\n"
 
-#: g10/keyserver.c:810
+#: g10/keyserver.c:817
 msgid "key not found on keyserver\n"
 msgstr "在金鑰伺服器上找不到金鑰\n"
 
-#: g10/keyserver.c:985
+#: g10/keyserver.c:1014
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "正在請求金鑰 %s 自 %s 伺服器 %s\n"
 
-#: g10/keyserver.c:989
+#: g10/keyserver.c:1018
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "正在請求金鑰 %s 自 %s\n"
 
-#: g10/keyserver.c:1141
+#: g10/keyserver.c:1170
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "遞送金鑰 %s 至 %s 伺服器 %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1174
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "遞送金鑰 %s 至 %s\n"
 
-#: g10/keyserver.c:1188
+#: g10/keyserver.c:1217
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "正在搜尋 \"%s\" 於 %s 伺服器 %s\n"
 
-#: g10/keyserver.c:1191
+#: g10/keyserver.c:1220
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "正在搜尋 \"%s\" 於 %s\n"
 
-#: g10/keyserver.c:1198 g10/keyserver.c:1293
+#: g10/keyserver.c:1227 g10/keyserver.c:1322
 msgid "no keyserver action!\n"
 msgstr "沒有金鑰伺服器動作!\n"
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1275
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "警告: 金鑰伺服器經手程式 (handler) 係來自不同版本的 GnuPG (%s)\n"
 
-#: g10/keyserver.c:1255
+#: g10/keyserver.c:1284
 msgid "keyserver did not send VERSION\n"
 msgstr "金鑰伺服器並未送出版本 (VERSION)\n"
 
-#: g10/keyserver.c:1314
+#: g10/keyserver.c:1343
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "沒有已知的金鑰伺服器 (使用 --keyserver 選項)\n"
 
-#: g10/keyserver.c:1320
+#: g10/keyserver.c:1349
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "本版並不支援外部金鑰伺服器叫用\n"
 
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1361
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "沒有金鑰伺服器方案 (scheme) `%s' 的經手程式 (handler)\n"
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1366
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "動作 `%s' 並未被金鑰伺服器方案 (scheme) `%s' 所支援\n"
 
-#: g10/keyserver.c:1345
-#, c-format
-msgid "gpgkeys_%s does not support handler version %d\n"
+#: g10/keyserver.c:1374
+#, fuzzy, c-format
+msgid "%s does not support handler version %d\n"
 msgstr "gpgkeys_%s 並不支援經手程式 (handler) 版本 %d\n"
 
-#: g10/keyserver.c:1351
+#: g10/keyserver.c:1381
 msgid "keyserver timed out\n"
 msgstr "金鑰伺服器逾時\n"
 
-#: g10/keyserver.c:1356
+#: g10/keyserver.c:1386
 msgid "keyserver internal error\n"
 msgstr "金鑰伺服器內部出錯\n"
 
-#: g10/keyserver.c:1365
+#: g10/keyserver.c:1395
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "金鑰伺服器通訊出錯: %s\n"
 
-#: g10/keyserver.c:1390 g10/keyserver.c:1424
+#: g10/keyserver.c:1420 g10/keyserver.c:1454
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" 並非金鑰 ID: 正跳過\n"
 
-#: g10/keyserver.c:1681
+#: g10/keyserver.c:1711
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
 
-#: g10/keyserver.c:1703
+#: g10/keyserver.c:1733
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "正從 %s 更新 1 份金鑰\n"
 
-#: g10/keyserver.c:1705
+#: g10/keyserver.c:1735
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "正在更新 %d 份金鑰自 %s\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:249
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "加密過的階段金鑰 (%d) 尺寸詭異\n"
 
-#: g10/mainproc.c:262
-#, c-format
-msgid "bad passphrase or unknown cipher algorithm (%d)\n"
-msgstr "錯誤的密語或未知的編密演算法 (%d)\n"
-
-#: g10/mainproc.c:299
+#: g10/mainproc.c:300
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s 加密過的階段金鑰\n"
 
-#: g10/mainproc.c:309
+#: g10/mainproc.c:310
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "密語係以未知的摘要演算法 %d 所產生\n"
 
-#: g10/mainproc.c:375
+#: g10/mainproc.c:376
 #, c-format
 msgid "public key is %s\n"
 msgstr "公鑰為 %s\n"
 
-#: g10/mainproc.c:430
+#: g10/mainproc.c:431
 msgid "public key encrypted data: good DEK\n"
 msgstr "公鑰加密過的資料: 完好的 DEK\n"
 
-#: g10/mainproc.c:463
+#: g10/mainproc.c:464
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "已用 %u 位元長的 %s 金鑰,  ID %s, 建立於 %s 加密了\n"
 
-#: g10/mainproc.c:467 g10/pkclist.c:218
+#: g10/mainproc.c:468 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:472
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "已用 %s 金鑰, ID %s 加密了\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "公鑰解密失敗: %s\n"
 
-#: g10/mainproc.c:499
+#: g10/mainproc.c:500
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "已用 %lu 個密語加密了\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:502
 msgid "encrypted with 1 passphrase\n"
 msgstr "已用 1 個密語加密了\n"
 
-#: g10/mainproc.c:529 g10/mainproc.c:551
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "假定 %s 為加密過的資料\n"
 
-#: g10/mainproc.c:537
+#: g10/mainproc.c:538
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA 編密法不可用, 我們樂觀地試著改以 %s 代替\n"
 
-#: g10/mainproc.c:569
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr "解密成功\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:574
 msgid "WARNING: message was not integrity protected\n"
 msgstr "警告: 訊息未受到完整的保護\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
-msgstr "警告: 加密過的訊息已經被變造了！\n"
+msgstr "警告: 加密過的訊息已經被變造了!\n"
 
-#: g10/mainproc.c:592
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "解密失敗: %s\n"
@@ -4131,297 +4192,286 @@ msgstr "請注意: 寄件者要求了 \"妳應該祇用眼睛看\"\n"
 msgid "original file name='%.*s'\n"
 msgstr "原始的檔名 ='%.*s'\n"
 
-#: g10/mainproc.c:786
+#: g10/mainproc.c:803
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "獨立撤銷 - 請用 \"gpg --import\" 來套用\n"
 
-#: g10/mainproc.c:1290
+#: g10/mainproc.c:1307
 msgid "signature verification suppressed\n"
 msgstr "簽章驗證已被抑制\n"
 
-#: g10/mainproc.c:1332 g10/mainproc.c:1342
+#: g10/mainproc.c:1349 g10/mainproc.c:1359
 msgid "can't handle these multiple signatures\n"
 msgstr "無法處理這些多重簽章\n"
 
-#: g10/mainproc.c:1352
+#: g10/mainproc.c:1369
 #, c-format
 msgid "Signature made %s\n"
 msgstr "由 %s 建立的簽章\n"
 
-#: g10/mainproc.c:1353
+#: g10/mainproc.c:1370
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               使用 %s 金鑰 %s\n"
 
-#: g10/mainproc.c:1357
+#: g10/mainproc.c:1374
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "由 %s 建立的簽章, 使用 %s 金鑰 ID %s\n"
 
-#: g10/mainproc.c:1377
+#: g10/mainproc.c:1394
 msgid "Key available at: "
 msgstr "可用的金鑰於: "
 
-#: g10/mainproc.c:1482 g10/mainproc.c:1530
+#: g10/mainproc.c:1499 g10/mainproc.c:1547
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "*損壞* 的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1484 g10/mainproc.c:1532
+#: g10/mainproc.c:1501 g10/mainproc.c:1549
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "過期的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1486 g10/mainproc.c:1534
+#: g10/mainproc.c:1503 g10/mainproc.c:1551
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "完好的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1538
+#: g10/mainproc.c:1555
 msgid "[uncertain]"
-msgstr "[不確定]"
+msgstr "[ 不確定 ]"
 
-#: g10/mainproc.c:1570
+#: g10/mainproc.c:1587
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                亦即 \"%s\""
 
-#: g10/mainproc.c:1664
+#: g10/mainproc.c:1681
 #, c-format
 msgid "Signature expired %s\n"
-msgstr "這份簽署已經在 %s 過期了.\n"
+msgstr "這份簽署已經在 %s 過期了\n"
 
-#: g10/mainproc.c:1669
+#: g10/mainproc.c:1686
 #, c-format
 msgid "Signature expires %s\n"
-msgstr "這份簽署在 %s 過期.\n"
+msgstr "這份簽署在 %s 過期\n"
 
-#: g10/mainproc.c:1672
+#: g10/mainproc.c:1689
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s 簽章, 摘要演算法 %s\n"
 
-#: g10/mainproc.c:1673
+#: g10/mainproc.c:1690
 msgid "binary"
 msgstr "二進制"
 
-#: g10/mainproc.c:1674
+#: g10/mainproc.c:1691
 msgid "textmode"
 msgstr "文字模式"
 
-#: g10/mainproc.c:1674 g10/trustdb.c:530
+#: g10/mainproc.c:1691 g10/trustdb.c:531
 msgid "unknown"
 msgstr "未知"
 
-#: g10/mainproc.c:1694
+#: g10/mainproc.c:1711
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "無法檢查簽章: %s\n"
 
-#: g10/mainproc.c:1762 g10/mainproc.c:1778 g10/mainproc.c:1864
+#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
 msgid "not a detached signature\n"
 msgstr "不是一份分離的簽章\n"
 
-#: g10/mainproc.c:1805
+#: g10/mainproc.c:1822
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
-msgstr "警告: 偵測到多重簽章.  祇有第一個簽章纔會被核選.\n"
+msgstr "警告: 偵測到多重簽章. 祇有第一個簽章纔會被核選.\n"
 
-#: g10/mainproc.c:1813
+#: g10/mainproc.c:1830
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "等級 0x%02x 的獨立簽章\n"
 
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1887
 msgid "old style (PGP 2.x) signature\n"
 msgstr "舊型 (PGP 2.x) 簽章\n"
 
-#: g10/mainproc.c:1880
+#: g10/mainproc.c:1897
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "在 proc_tree() 中偵測到無效的 root 封包\n"
 
-#: g10/misc.c:121
+#: g10/misc.c:122
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "無法讓系統停止傾印核心檔: %s\n"
 
-#: g10/misc.c:141 g10/misc.c:169 g10/misc.c:241
+#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "`%s' 的 fstat 失敗於 %s: %s\n"
 
-#: g10/misc.c:206
+#: g10/misc.c:207
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) 失敗於 %s: %s\n"
 
-#: g10/misc.c:315
+#: g10/misc.c:316
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "警告: 正在使用實驗性的公鑰演算法 %s\n"
 
-#: g10/misc.c:330
+#: g10/misc.c:331
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "警告: 正在使用實驗性的編密演算法 %s\n"
 
-#: g10/misc.c:345
+#: g10/misc.c:346
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "警告: 正在使用實驗性的摘要演算法 %s\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:351
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "警告: 摘要演算法 %s 已不建議使用\n"
 
-#: g10/misc.c:446
+#: g10/misc.c:447
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA 編密法外掛模組不存在\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:448
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr "請參考 http://www.gnupg.org/why-not-idea.html 取得更多資訊\n"
 
-#: g10/misc.c:680
+#: g10/misc.c:681
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: 不建議使用的選項 \"%s\"\n"
 
-#: g10/misc.c:684
+#: g10/misc.c:685
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "警告： \"%s\" 選項已不建議使用\n"
+msgstr "警告: \"%s\" 選項已不建議使用\n"
 
-#: g10/misc.c:686
+#: g10/misc.c:687
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "請改以 \"%s%s\" 代替\n"
 
-#: g10/misc.c:697
+#: g10/misc.c:694
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
+msgstr "警告: \"%s\" 選項已不建議使用\n"
+
+#: g10/misc.c:707
 msgid "Uncompressed"
 msgstr "未被壓縮"
 
-#: g10/misc.c:722
+#: g10/misc.c:732
 msgid "uncompressed|none"
 msgstr "uncompressed|none|未被壓縮|無"
 
-#: g10/misc.c:832
+#: g10/misc.c:842
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "這個訊息對 %s 來說無法使用\n"
 
-#: g10/misc.c:989
+#: g10/misc.c:999
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "不明確的選項 `%s'\n"
 
-#: g10/misc.c:1014
+#: g10/misc.c:1024
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "未知的選項 `%s'\n"
 
-#: g10/openfile.c:84
+#: g10/openfile.c:86
 #, c-format
 msgid "File `%s' exists. "
 msgstr "檔案 `%s' 存在. "
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 msgid "Overwrite? (y/N) "
 msgstr "是否覆寫? (y/N) "
 
-#: g10/openfile.c:119
+#: g10/openfile.c:121
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: 未知的副檔名\n"
 
-#: g10/openfile.c:141
+#: g10/openfile.c:143
 msgid "Enter new filename"
 msgstr "請輸入新的檔名"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:188
 msgid "writing to stdout\n"
 msgstr "正在寫入到標準輸出\n"
 
-#: g10/openfile.c:296
+#: g10/openfile.c:300
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "假設被簽署的資料在 `%s'\n"
 
-#: g10/openfile.c:375
+#: g10/openfile.c:379
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "新的設定檔 `%s' 被建立了\n"
 
-#: g10/openfile.c:377
+#: g10/openfile.c:381
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "警告: 在 `%s' 裡的選項於這次執行期間並沒有被啟用\n"
 
-#: g10/openfile.c:409
+#: g10/openfile.c:413
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "目錄 `%s' 已建立\n"
 
-#: g10/parse-packet.c:137
+#: g10/parse-packet.c:138
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "無法操作公開金鑰演算法 %d\n"
 
-#: g10/parse-packet.c:707
+#: g10/parse-packet.c:708
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "警告: 以可能並不安全的對稱式加密過的階段金鑰\n"
 
-#: g10/parse-packet.c:1132
+#: g10/parse-packet.c:1145
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d 類別的子封包設定了關鍵位元\n"
 
-#: g10/passphrase.c:478 g10/passphrase.c:525
+#: g10/passphrase.c:305
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent 在此階段無法使用\n"
 
-#: g10/passphrase.c:486
-msgid "can't set client pid for the agent\n"
-msgstr "無法設定代理程式中的使用者端 pid\n"
-
-#: g10/passphrase.c:494
-msgid "can't get server read FD for the agent\n"
-msgstr "無法取得代理程式所需的伺服器讀取檔案描述\n"
-
-#: g10/passphrase.c:501
-msgid "can't get server write FD for the agent\n"
-msgstr "無法取得代理程式所需的伺服器寫入檔案描述\n"
-
-#: g10/passphrase.c:534
+#: g10/passphrase.c:317
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "被變造的 GPG_AGENT_INFO 環境變數\n"
 
-#: g10/passphrase.c:547
+#: g10/passphrase.c:332
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent 協定版本 %d 未被支援\n"
 
-#: g10/passphrase.c:568
+#: g10/passphrase.c:345
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "無法連接至 `%s': %s\n"
 
-#: g10/passphrase.c:590
-msgid "communication problem with gpg-agent\n"
-msgstr "gpg-agent 的通訊問題\n"
-
-#: g10/passphrase.c:597 g10/passphrase.c:937 g10/passphrase.c:1049
+#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
 msgid "problem with the agent - disabling agent use\n"
 msgstr "代理程式的問題 - 正在停用代理程式\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1209
+#: g10/passphrase.c:511 g10/passphrase.c:890
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (主要金鑰 ID %s)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:525
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4432,40 +4482,27 @@ msgstr ""
 "\"%.*s\"\n"
 "%u 位元長的 %s 金鑰, ID %s, 建立於 %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:550
 msgid "Repeat passphrase\n"
 msgstr "請再輸入一次密語\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:552
 msgid "Enter passphrase\n"
 msgstr "請輸入密語\n"
 
-#: g10/passphrase.c:781
-msgid "passphrase too long\n"
-msgstr "密語太長\n"
-
-#: g10/passphrase.c:794
-msgid "invalid response from agent\n"
-msgstr "代理程式傳回無效的回應\n"
-
-#: g10/passphrase.c:810 g10/passphrase.c:931
+#: g10/passphrase.c:628
 msgid "cancelled by user\n"
 msgstr "由使用者取消了\n"
 
-#: g10/passphrase.c:815 g10/passphrase.c:1020
-#, c-format
-msgid "problem with the agent: agent returns 0x%lx\n"
-msgstr "代理程式的問題: 代理程式傳回 0x%lx\n"
-
-#: g10/passphrase.c:1100 g10/passphrase.c:1263
+#: g10/passphrase.c:781 g10/passphrase.c:944
 msgid "can't query passphrase in batch mode\n"
 msgstr "無法在批次模式中查詢密語\n"
 
-#: g10/passphrase.c:1107 g10/passphrase.c:1268
+#: g10/passphrase.c:788 g10/passphrase.c:949
 msgid "Enter passphrase: "
 msgstr "請輸入密語: "
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:871
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4474,21 +4511,21 @@ msgstr ""
 "妳需要用密語來解開下列使用者的\n"
 "私鑰: \"%s\"\n"
 
-#: g10/passphrase.c:1196
+#: g10/passphrase.c:877
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u 位元長的 %s 金鑰, ID %s, 建立於 %s"
 
-#: g10/passphrase.c:1205
+#: g10/passphrase.c:886
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (在主鑰 ID %s 上的子鑰)"
 
-#: g10/passphrase.c:1272
+#: g10/passphrase.c:953
 msgid "Repeat passphrase: "
 msgstr "請再輸入一次密語: "
 
-#: g10/photoid.c:66
+#: g10/photoid.c:67
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4502,111 +4539,112 @@ msgstr ""
 "妳的金鑰也會變成非常地大!\n"
 "盡量把圖片尺寸控制在 240x288 左右, 會是個非常理想的大小.\n"
 
-#: g10/photoid.c:80
+#: g10/photoid.c:81
 msgid "Enter JPEG filename for photo ID: "
 msgstr "輸入要當作相片 ID 的 JPEG 檔名: "
 
-#: g10/photoid.c:94
+#: g10/photoid.c:95
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "無法開啟 JPEG 圖檔 `%s': %s\n"
 
-#: g10/photoid.c:102
+#: g10/photoid.c:103
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "這個 JPEG 檔案真的很大 (%d 位元組) !\n"
 
-#: g10/photoid.c:104
+#: g10/photoid.c:105
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "妳確定要用它嗎? (y/N) "
 
-#: g10/photoid.c:119
+#: g10/photoid.c:120
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "`%s' 不是一個 JPEG 圖檔\n"
 
-#: g10/photoid.c:136
+#: g10/photoid.c:137
 msgid "Is this photo correct (y/N/q)? "
 msgstr "這張照片正確嗎? (y/N/q) "
 
-#: g10/photoid.c:338
+#: g10/photoid.c:339
 msgid "unable to display photo ID!\n"
 msgstr "無法顯示照片 ID!\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:580
+#: g10/pkclist.c:62 g10/revoke.c:581
 msgid "No reason specified"
 msgstr "未指定原因"
 
-#: g10/pkclist.c:63 g10/revoke.c:582
+#: g10/pkclist.c:64 g10/revoke.c:583
 msgid "Key is superseded"
 msgstr "金鑰被代換了"
 
-#: g10/pkclist.c:65 g10/revoke.c:581
+#: g10/pkclist.c:66 g10/revoke.c:582
 msgid "Key has been compromised"
 msgstr "金鑰已經被洩漏了"
 
-#: g10/pkclist.c:67 g10/revoke.c:583
+#: g10/pkclist.c:68 g10/revoke.c:584
 msgid "Key is no longer used"
 msgstr "金鑰不再被使用了"
 
-#: g10/pkclist.c:69 g10/revoke.c:584
+#: g10/pkclist.c:70 g10/revoke.c:585
 msgid "User ID is no longer valid"
 msgstr "使用者 ID 不再有效了"
 
-#: g10/pkclist.c:73
+#: g10/pkclist.c:74
 msgid "reason for revocation: "
 msgstr "撤銷原因: "
 
-#: g10/pkclist.c:90
+#: g10/pkclist.c:91
 msgid "revocation comment: "
 msgstr "撤銷註釋: "
 
-#: g10/pkclist.c:205
+#  a string with valid answers
+#: g10/pkclist.c:206
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:213
+#: g10/pkclist.c:214
 msgid "No trust value assigned to:\n"
 msgstr "下列項目沒有對應的信任值:\n"
 
-#: g10/pkclist.c:245
+#: g10/pkclist.c:246
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "  亦即 \"%s\"\n"
 
-#: g10/pkclist.c:255
+#: g10/pkclist.c:256
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "妳有多信任這把金鑰真的屬於叫這個名字的使用者?\n"
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:271
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = 我不知道或不想說\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr "  %d = 我*不*信任\n"
 
-#: g10/pkclist.c:278
+#: g10/pkclist.c:279
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr "  %d = 我徹底信任\n"
 
-#: g10/pkclist.c:284
+#: g10/pkclist.c:285
 msgid "  m = back to the main menu\n"
 msgstr " m = 回到主選單\n"
 
-#: g10/pkclist.c:287
+#: g10/pkclist.c:288
 msgid "  s = skip this key\n"
 msgstr " s = 跳過這把金鑰\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 msgid "  q = quit\n"
 msgstr "  q = 離開\n"
 
-#: g10/pkclist.c:292
+#: g10/pkclist.c:293
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
@@ -4615,37 +4653,37 @@ msgstr ""
 "這把金鑰的最小信任等級為: %s\n"
 "\n"
 
-#: g10/pkclist.c:298 g10/revoke.c:609
+#: g10/pkclist.c:299 g10/revoke.c:610
 msgid "Your decision? "
 msgstr "妳的決定是甚麼? "
 
-#: g10/pkclist.c:319
+#: g10/pkclist.c:320
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "請問妳是否真的想把這把金鑰設成徹底信任呢? (y/N) "
 
-#: g10/pkclist.c:333
+#: g10/pkclist.c:334
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "被徹底信任金鑰的憑證:\n"
 
-#: g10/pkclist.c:418
+#: g10/pkclist.c:419
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr "%s: 沒法保證這把金鑰真的屬於叫這個名字的使用者\n"
 
-#: g10/pkclist.c:423
+#: g10/pkclist.c:424
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr "%s: 祇能有限的保證這把金鑰真的屬於叫這個名字的使用者\n"
 
-#: g10/pkclist.c:429
+#: g10/pkclist.c:430
 msgid "This key probably belongs to the named user\n"
 msgstr "這把金鑰很可能屬於叫這個名字的使用者\n"
 
-#: g10/pkclist.c:434
+#: g10/pkclist.c:435
 msgid "This key belongs to us\n"
 msgstr "這把金鑰是屬於我們自己的\n"
 
-#: g10/pkclist.c:460
+#: g10/pkclist.c:461
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -4655,87 +4693,87 @@ msgstr ""
 "除非妳 **真的** 知道自己在做甚麼,\n"
 "否則妳最好在下一個問題回答 no\n"
 
-#: g10/pkclist.c:467
+#: g10/pkclist.c:468
 msgid "Use this key anyway? (y/N) "
 msgstr "無論如何還是使用這把金鑰嗎? (y/N) "
 
-#: g10/pkclist.c:501
+#: g10/pkclist.c:502
 msgid "WARNING: Using untrusted key!\n"
 msgstr "警告: 正在使用不被信任的金鑰!\n"
 
-#: g10/pkclist.c:508
+#: g10/pkclist.c:509
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "警告: 這把金鑰可能已被撤銷了 (撤銷金鑰未出現)\n"
 
-#: g10/pkclist.c:517
+#: g10/pkclist.c:518
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "警告: 這把金鑰已經被它的指定撤銷者給撤銷了!\n"
 
-#: g10/pkclist.c:520
+#: g10/pkclist.c:521
 msgid "WARNING: This key has been revoked by its owner!\n"
-msgstr "警告: 這把金鑰已經被它的持有人撤銷了! \n"
+msgstr "警告: 這把金鑰已經被它的持有人撤銷了!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         這很有可能表示這個簽章是被偽造的.\n"
 
-#: g10/pkclist.c:527
+#: g10/pkclist.c:528
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "警告: 這把子鑰已經被它的持有人撤銷了!\n"
 
-#: g10/pkclist.c:532
+#: g10/pkclist.c:533
 msgid "Note: This key has been disabled.\n"
 msgstr "請注意: 這把金鑰已經被禁用了.\n"
 
-#: g10/pkclist.c:537
+#: g10/pkclist.c:538
 msgid "Note: This key has expired!\n"
 msgstr "請注意: 這把金鑰已經過期了!\n"
 
-#: g10/pkclist.c:548
+#: g10/pkclist.c:549
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "警告: 這把金鑰並非以受信任的簽章所認證!\n"
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:551
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         沒有證據指出這個簽章屬於這個持有者.\n"
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:559
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "警告: 我們 *不* 信任這把金鑰!\n"
 
-#: g10/pkclist.c:559
+#: g10/pkclist.c:560
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         這個簽章很有可能是 *偽造的*.\n"
 
-#: g10/pkclist.c:567
+#: g10/pkclist.c:568
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
-msgstr "警告: 這把金鑰並非以足夠信任的簽章所認證.\n"
+msgstr "警告: 這把金鑰並非以足夠信任的簽章所認證!\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:570
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         這份簽章並不屬於這個持有者\n"
 
-#: g10/pkclist.c:734 g10/pkclist.c:767 g10/pkclist.c:936 g10/pkclist.c:996
+#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: 已跳過: %s\n"
 
-#: g10/pkclist.c:744 g10/pkclist.c:968
+#: g10/pkclist.c:745 g10/pkclist.c:969
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: 已跳過: 公鑰已經存在了\n"
 
-#: g10/pkclist.c:786
+#: g10/pkclist.c:787
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "妳沒有指定一個使用者 ID. (妳可能得用 \"-r\")\n"
 
-#: g10/pkclist.c:802
+#: g10/pkclist.c:803
 msgid "Current recipients:\n"
 msgstr "目前的收件者:\n"
 
-#: g10/pkclist.c:828
+#: g10/pkclist.c:829
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -4743,166 +4781,166 @@ msgstr ""
 "\n"
 "輸入使用者 ID. 以空白列結束: "
 
-#: g10/pkclist.c:844
+#: g10/pkclist.c:845
 msgid "No such user ID.\n"
 msgstr "沒有這個使用者 ID.\n"
 
-#: g10/pkclist.c:849 g10/pkclist.c:911
+#: g10/pkclist.c:850 g10/pkclist.c:912
 msgid "skipped: public key already set as default recipient\n"
 msgstr "已跳過: 公鑰已經被設成預設收件者\n"
 
-#: g10/pkclist.c:867
+#: g10/pkclist.c:868
 msgid "Public key is disabled.\n"
 msgstr "公鑰被禁用了.\n"
 
-#: g10/pkclist.c:874
+#: g10/pkclist.c:875
 msgid "skipped: public key already set\n"
 msgstr "已跳過: 公鑰已經被設過了\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:904
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "未知的預設收件者 \"%s\"\n"
 
-#: g10/pkclist.c:948
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: 已跳過: 公鑰已經被禁用了\n"
 
-#: g10/pkclist.c:1003
+#: g10/pkclist.c:1004
 msgid "no valid addressees\n"
 msgstr "沒有有效的地址\n"
 
-#: g10/plaintext.c:90
+#: g10/plaintext.c:91
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "資料未被儲存; 請用 \"--output\" 選項來儲存它們\n"
 
-#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
+#: g10/plaintext.c:136 g10/plaintext.c:141 g10/plaintext.c:159
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "建立 `%s' 時發生錯誤: %s\n"
 
-#: g10/plaintext.c:446
+#: g10/plaintext.c:447
 msgid "Detached signature.\n"
 msgstr "分離的簽章.\n"
 
-#: g10/plaintext.c:450
+#: g10/plaintext.c:452
 msgid "Please enter name of data file: "
 msgstr "請輸入資料檔的名稱: "
 
-#: g10/plaintext.c:478
+#: g10/plaintext.c:481
 msgid "reading stdin ...\n"
 msgstr "正在從標準輸入讀取 ...\n"
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:515
 msgid "no signed data\n"
 msgstr "沒有被簽署過的資料\n"
 
-#: g10/plaintext.c:526
+#: g10/plaintext.c:529
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "無法開啟被簽署過的資料 `%s'\n"
 
-#: g10/pubkey-enc.c:103
+#: g10/pubkey-enc.c:104
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "匿名收件者; 正在嘗試使用私鑰 %s ...\n"
 
-#: g10/pubkey-enc.c:119
+#: g10/pubkey-enc.c:120
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "很好, 我們就是匿名收件者.\n"
 
-#: g10/pubkey-enc.c:207
+#: g10/pubkey-enc.c:208
 msgid "old encoding of the DEK is not supported\n"
 msgstr "不支援舊式的 DEK 編碼\n"
 
-#: g10/pubkey-enc.c:228
+#: g10/pubkey-enc.c:229
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "編密演算法 %d%s 未知或已停用了\n"
 
-#: g10/pubkey-enc.c:266
+#: g10/pubkey-enc.c:267
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "警告: 收件者偏好設定中找不到編密演算法 %s\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:287
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "請注意: 私鑰 %s 在 %s 過期了\n"
 
-#: g10/pubkey-enc.c:292
+#: g10/pubkey-enc.c:293
 msgid "NOTE: key has been revoked"
 msgstr "請注意: 金鑰已經被撤銷了"
 
-#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:545
+#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
+#: g10/revoke.c:188 g10/revoke.c:546
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet 失敗: %s\n"
 
-#: g10/revoke.c:146
+#: g10/revoke.c:147
 #, c-format
 msgid "key %s has no user IDs\n"
 msgstr "金鑰 %s 沒有使用者 ID\n"
 
-#: g10/revoke.c:272
+#: g10/revoke.c:273
 msgid "To be revoked by:\n"
 msgstr "將被撤銷:\n"
 
-#: g10/revoke.c:276
+#: g10/revoke.c:277
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(這是把機密的撤銷金鑰)\n"
 
-#: g10/revoke.c:280
+#: g10/revoke.c:281
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "要為這把金鑰建立一份指定撤銷憑證嗎? (y/N) "
 
-#: g10/revoke.c:293 g10/revoke.c:511
+#: g10/revoke.c:294 g10/revoke.c:512
 msgid "ASCII armored output forced.\n"
 msgstr "已強迫使用 ASCII 封裝過的輸出.\n"
 
-#: g10/revoke.c:307 g10/revoke.c:525
+#: g10/revoke.c:308 g10/revoke.c:526
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet 失敗: %s\n"
 
-#: g10/revoke.c:370
+#: g10/revoke.c:371
 msgid "Revocation certificate created.\n"
 msgstr "已建立撤銷憑證.\n"
 
-#: g10/revoke.c:376
+#: g10/revoke.c:377
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "沒有找到 \"%s\" 用的撤銷金鑰\n"
 
-#: g10/revoke.c:432
+#: g10/revoke.c:433
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "找不到私鑰 \"%s\": %s\n"
 
-#: g10/revoke.c:461
+#: g10/revoke.c:462
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "沒有相對應的公鑰: %s\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:473
 msgid "public key does not match secret key!\n"
 msgstr "公鑰與私鑰並不吻合!\n"
 
-#: g10/revoke.c:479
+#: g10/revoke.c:480
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "要為這把金鑰建立一份撤銷憑證嗎? (y/N) "
 
-#: g10/revoke.c:496
+#: g10/revoke.c:497
 msgid "unknown protection algorithm\n"
 msgstr "未知的保護演算法\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 msgid "NOTE: This key is not protected!\n"
 msgstr "注意: 這把金鑰沒有被保護!\n"
 
-#: g10/revoke.c:551
+#: g10/revoke.c:552
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -4921,233 +4959,233 @@ msgstr ""
 "但是千萬小心: 妳的機器上的列印系統可能會在列印過\n"
 "程中把這些資料暫存在某個其他人也能夠看得到的地方!\n"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid "Please select the reason for the revocation:\n"
 msgstr "請選擇撤銷的原因:\n"
 
-#: g10/revoke.c:602
+#: g10/revoke.c:603
 msgid "Cancel"
 msgstr "取消"
 
-#: g10/revoke.c:604
+#: g10/revoke.c:605
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(也許妳會想要在這裡選擇 %d)\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:646
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "請輸入選用的描述; 以空白列結束:\n"
 
-#: g10/revoke.c:673
+#: g10/revoke.c:674
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "撤銷原因: %s\n"
 
-#: g10/revoke.c:675
+#: g10/revoke.c:676
 msgid "(No description given)\n"
 msgstr "(沒有給定描述)\n"
 
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 msgid "Is this okay? (y/N) "
 msgstr "這樣可以嗎? (y/N) "
 
-#: g10/seckey-cert.c:54
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "私鑰部分無法取用\n"
 
-#: g10/seckey-cert.c:60
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "保護演算法 %d%s 未被支援\n"
 
-#: g10/seckey-cert.c:71
+#: g10/seckey-cert.c:72
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "保護摘要 %d 未被支援\n"
 
-#: g10/seckey-cert.c:265
+#: g10/seckey-cert.c:266
 msgid "Invalid passphrase; please try again"
 msgstr "無效的密語; 請再試一次"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:267
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:326
+#: g10/seckey-cert.c:327
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "警告: 偵測到金鑰薄弱 - 請再更換密語一次.\n"
 
-#: g10/seckey-cert.c:364
+#: g10/seckey-cert.c:365
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr "正在產生私鑰保護會用到的舊式 16 位元加總檢查\n"
 
-#: g10/seskey.c:52
+#: g10/seskey.c:53
 msgid "weak key created - retrying\n"
-msgstr "建立了弱金鑰 ─ 正在重試\n"
+msgstr "建立了弱金鑰 - 正在重試\n"
 
-#: g10/seskey.c:57
+#: g10/seskey.c:58
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr "無法避免對稱式編密法的弱金鑰; 已經試了 %d 次了!\n"
 
-#: g10/seskey.c:213
+#: g10/seskey.c:214
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA 要求使用 160 位元的雜湊演算法\n"
 
-#: g10/sig-check.c:75
+#: g10/sig-check.c:76
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "警告: 簽章摘要與訊息不一致\n"
 
-#: g10/sig-check.c:99
+#: g10/sig-check.c:100
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "警告: 正要簽署的子鑰 %s 未經交叉認證\n"
 
-#: g10/sig-check.c:102
+#: g10/sig-check.c:103
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "警告: 正要簽署的子鑰 %s 有無效的交叉憑證\n"
 
-#: g10/sig-check.c:168
+#: g10/sig-check.c:169
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "公鑰 %s 比簽章還要新了 %lu 秒\n"
 
-#: g10/sig-check.c:169
+#: g10/sig-check.c:170
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "公鑰 %s 比簽章還要新了 %lu 秒\n"
 
-#: g10/sig-check.c:180
+#: g10/sig-check.c:181
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
 "金鑰 %s 已經在 %lu 秒後的未來製造出來了 (可能是因為時光旅行或時鐘的問題)\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:183
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr ""
 "金鑰 %s 已經在 %lu 秒後的未來製造出來了 (可能是因為時光旅行或時鐘的問題)\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:193
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "請注意: 簽章金鑰 %s 已於 %s 過期\n"
 
-#: g10/sig-check.c:275
+#: g10/sig-check.c:276
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "假設金鑰 %s 的損壞簽章導因於某個未知的關鍵位元\n"
 
-#: g10/sig-check.c:532
+#: g10/sig-check.c:533
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "金鑰 %s: 沒有子鑰可供子鑰撤銷簽章使用\n"
 
-#: g10/sig-check.c:558
+#: g10/sig-check.c:559
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "金鑰 %s: 沒有子鑰可供附子鑰簽章之用\n"
 
-#: g10/sign.c:85
+#: g10/sign.c:86
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr "無法在 v3 (PGP 2.x 型態) 的簽章內放入標記資料\n"
 
-#: g10/sign.c:93
+#: g10/sign.c:94
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr "無法在 v3 (PGP 2.x 型態) 的金鑰簽章內放入標記資料\n"
 
-#: g10/sign.c:112
+#: g10/sign.c:113
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr "警告: 標記 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
 
-#: g10/sign.c:138
+#: g10/sign.c:139
 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:146
+#: g10/sign.c:147
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr "無法在 v3 金鑰 (PGP 2.x 型態) 的簽章內放入原則 URL\n"
+msgstr "無法在 v3 (PGP 2.x 型態) 的金鑰簽章內放入原則 URL\n"
 
-#: g10/sign.c:159
+#: g10/sign.c:160
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr "警告: 原則 URL 的 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
 
-#: g10/sign.c:187
+#: g10/sign.c:188
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr "警告: 偏好金鑰伺服器 URL 的 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
 
-#: g10/sign.c:364
+#: g10/sign.c:365
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "檢查已建立的簽章時發生錯誤: %s\n"
 
-#: g10/sign.c:373
+#: g10/sign.c:374
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s 簽章來自: \"%s\"\n"
 
-#: g10/sign.c:741
+#: g10/sign.c:761
 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:808
+#: g10/sign.c:830
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "警告: 強迫使用 %s (%d) 摘要演算法會違反收件者偏好設定\n"
 
-#: g10/sign.c:900
+#: g10/sign.c:922
 msgid "signing:"
 msgstr "簽署:"
 
-#: g10/sign.c:1007
+#: g10/sign.c:1034
 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:1180
+#: g10/sign.c:1212
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s 加密將被採用\n"
 
-#: g10/skclist.c:126 g10/skclist.c:190
+#: g10/skclist.c:127 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "金鑰未被標示為不安全 - 不能夠拿來跟假的隨機數字產生器併用!\n"
 
-#: g10/skclist.c:157
+#: g10/skclist.c:158
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "已跳過 \"%s\": 重複了\n"
 
-#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "已跳過 \"%s\": %s\n"
 
-#: g10/skclist.c:170
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "已跳過: 私鑰已經存在\n"
 
-#: g10/skclist.c:185
+#: g10/skclist.c:186
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr "這是由 PGP 產生的 ElGamal 金鑰, 用於簽章並不安全!"
 
-#: g10/tdbdump.c:59 g10/trustdb.c:365
+#: g10/tdbdump.c:60 g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "信任記錄 %lu, 類別 %d: 寫入失敗: %s\n"
 
-#: g10/tdbdump.c:104
+#: g10/tdbdump.c:105
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5156,340 +5194,340 @@ msgstr ""
 "# 相對應的信任值清單被建立於 %s\n"
 "# (請用 \"gpg --import-ownertrust\" 來取回它們)\n"
 
-#: g10/tdbdump.c:159 g10/tdbdump.c:167 g10/tdbdump.c:172 g10/tdbdump.c:177
+#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
 #, c-format
 msgid "error in `%s': %s\n"
 msgstr "在 `%s' 中出錯: %s\n"
 
-#: g10/tdbdump.c:159
+#: g10/tdbdump.c:160
 msgid "line too long"
 msgstr "列太長"
 
-#: g10/tdbdump.c:167
+#: g10/tdbdump.c:168
 msgid "colon missing"
 msgstr "冒號缺漏"
 
-#: g10/tdbdump.c:173
+#: g10/tdbdump.c:174
 msgid "invalid fingerprint"
 msgstr "無效的指紋"
 
-#: g10/tdbdump.c:178
+#: g10/tdbdump.c:179
 msgid "ownertrust value missing"
 msgstr "主觀信任值缺漏"
 
-#: g10/tdbdump.c:214
+#: g10/tdbdump.c:215
 #, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "在 `%s' 中尋找信任記錄時出錯: %s\n"
 
-#: g10/tdbdump.c:218
+#: g10/tdbdump.c:219
 #, c-format
 msgid "read error in `%s': %s\n"
-msgstr "讀取 `%s' 錯誤: `%s'\n"
+msgstr "讀取 `%s' 錯誤: %s\n"
 
-#: g10/tdbdump.c:227 g10/trustdb.c:380
+#: g10/tdbdump.c:228 g10/trustdb.c:381
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "信任資料庫: 同步化失敗: %s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1440
+#: g10/tdbio.c:129 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "信任資料庫記錄 %lu: 本地搜尋失敗: %s\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1447
+#: g10/tdbio.c:135 g10/tdbio.c:1448
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "信任資料庫記錄 %lu: 寫入失敗 (n=%d): %s\n"
 
-#: g10/tdbio.c:244
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "信任資料庫更動量過大\n"
 
-#: g10/tdbio.c:497
+#: g10/tdbio.c:498
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "無法存取 `%s': %s\n"
 
-#: g10/tdbio.c:512
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: 目錄不存在!\n"
 
-#: g10/tdbio.c:522 g10/tdbio.c:545 g10/tdbio.c:588
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "無法為 `%s' 建立鎖定\n"
 
-#: g10/tdbio.c:524 g10/tdbio.c:591
+#: g10/tdbio.c:525 g10/tdbio.c:592
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "無法鎖定 `%s'\n"
 
-#: g10/tdbio.c:550
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: 建立版本記錄失敗: %s"
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: 建立了無效的信任資料庫\n"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: 建立了信任資料庫\n"
 
-#: g10/tdbio.c:597
+#: g10/tdbio.c:598
 msgid "NOTE: trustdb not writable\n"
 msgstr "請注意: 信任資料庫不可寫入\n"
 
-#: g10/tdbio.c:614
+#: g10/tdbio.c:615
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: 無效的信任資料庫\n"
 
-#: g10/tdbio.c:646
+#: g10/tdbio.c:647
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: 建立雜湊表失敗: %s\n"
 
-#: g10/tdbio.c:654
+#: g10/tdbio.c:655
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: 更新版本記錄時錯誤: %s\n"
 
-#: g10/tdbio.c:671 g10/tdbio.c:691 g10/tdbio.c:707 g10/tdbio.c:721
-#: g10/tdbio.c:751 g10/tdbio.c:1373 g10/tdbio.c:1400
+#: g10/tdbio.c:672 g10/tdbio.c:692 g10/tdbio.c:708 g10/tdbio.c:722
+#: g10/tdbio.c:752 g10/tdbio.c:1374 g10/tdbio.c:1401
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: 讀取版本記錄時錯誤: %s\n"
 
-#: g10/tdbio.c:730
+#: g10/tdbio.c:731
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: 寫入版本記錄時錯誤: %s\n"
 
-#: g10/tdbio.c:1169
+#: g10/tdbio.c:1170
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "信任資料庫: 本地搜尋失敗: %s\n"
 
-#: g10/tdbio.c:1177
+#: g10/tdbio.c:1178
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "信任資料庫: 讀取失敗 (n=%d): %s\n"
 
-#: g10/tdbio.c:1198
+#: g10/tdbio.c:1199
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: 不是一個信任資料庫檔案\n"
 
-#: g10/tdbio.c:1216
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: 記錄編號為 %lu 的版本記錄\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1222
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: 無效的檔案版本 %d\n"
 
-#: g10/tdbio.c:1406
+#: g10/tdbio.c:1407
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: 讀取自由記錄時錯誤: %s\n"
 
-#: g10/tdbio.c:1414
+#: g10/tdbio.c:1415
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: 寫入目錄記錄時錯誤: %s\n"
 
-#: g10/tdbio.c:1424
+#: g10/tdbio.c:1425
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: 記錄歸零時失敗: %s\n"
 
-#: g10/tdbio.c:1454
+#: g10/tdbio.c:1455
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: 附加某筆記錄時失敗: %s\n"
 
-#: g10/tdbio.c:1499
+#: g10/tdbio.c:1500
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "信任資料庫損毀了; 請執行 \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:147
+#: g10/textfilter.c:148
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "無法處理長於 %d 字符的文字列\n"
 
-#: g10/textfilter.c:244
+#: g10/textfilter.c:245
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "輸入列比 %d 字符還長\n"
 
-#: g10/trustdb.c:226
+#: g10/trustdb.c:227
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' 不是一個有效的長式金鑰 ID\n"
 
-#: g10/trustdb.c:257
+#: g10/trustdb.c:258
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "金鑰 %s: 如受信任的金鑰般被接受了\n"
 
-#: g10/trustdb.c:295
+#: g10/trustdb.c:296
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "金鑰 %s 在信任資料庫中出現了不止一次\n"
 
-#: g10/trustdb.c:310
+#: g10/trustdb.c:311
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
-msgstr "金鑰 %s: 受信任的金鑰沒有公鑰 ─ 已跳過\n"
+msgstr "金鑰 %s: 受信任的金鑰沒有公鑰 - 已跳過\n"
 
-#: g10/trustdb.c:320
+#: g10/trustdb.c:321
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "金鑰 %s 已被標記成徹底信任了\n"
 
-#: g10/trustdb.c:344
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "信任記錄 %lu, 請求類別 %d: 讀取失敗: %s\n"
 
-#: g10/trustdb.c:350
+#: g10/trustdb.c:351
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "信任記錄 %lu 不是所請求的類別 %d\n"
 
-#: g10/trustdb.c:446
+#: g10/trustdb.c:447
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr "無法使用未知的信任模型 (%d) - 現在採用 %s 信任模型\n"
 
-#: g10/trustdb.c:452
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr "正在使用 %s 信任模型\n"
 
-#: g10/trustdb.c:504
+#: 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:506
+#: g10/trustdb.c:507
 msgid "[ revoked]"
 msgstr "[ 已撤銷 ]"
 
-#: g10/trustdb.c:508 g10/trustdb.c:513
+#: g10/trustdb.c:509 g10/trustdb.c:514
 msgid "[ expired]"
 msgstr "[ 已過期 ]"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 msgid "[ unknown]"
 msgstr "[  未知  ]"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr "[ 未定義 ]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr "[  勉強  ]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr "[  完全  ]"
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr "[  徹底  ]"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr "未定義"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 msgid "never"
-msgstr "永遠不"
+msgstr "永遠不會"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr "勉強"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:536
 msgid "full"
 msgstr "完全"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr "徹底"
 
-#: g10/trustdb.c:576
+#: g10/trustdb.c:577
 msgid "no need for a trustdb check\n"
 msgstr "不需要檢查信任資料庫\n"
 
-#: g10/trustdb.c:582 g10/trustdb.c:2157
+#: g10/trustdb.c:583 g10/trustdb.c:2309
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "下次信任資料庫檢查將於 %s 進行\n"
 
-#: g10/trustdb.c:591
+#: g10/trustdb.c:592
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "在 `%s' 信任模型中並不需要檢查信任資料庫\n"
 
-#: g10/trustdb.c:606
+#: g10/trustdb.c:607
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "在 `%s' 信任模型中並不需要更新信任資料庫\n"
 
-#: g10/trustdb.c:838 g10/trustdb.c:1276
+#: 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:1033
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr "請做一次 --check-trustdb\n"
 
-#: g10/trustdb.c:1037
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "正在檢查信任資料庫\n"
 
-#: g10/trustdb.c:1901
+#: g10/trustdb.c:2053
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "已經處理了 %d 把金鑰 (共計已解決了 %d 份有效性)\n"
 
-#: g10/trustdb.c:1965
+#: g10/trustdb.c:2117
 msgid "no ultimately trusted keys found\n"
 msgstr "沒有找到任何徹底信任的金鑰\n"
 
-#: g10/trustdb.c:1979
+#: g10/trustdb.c:2131
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "徹底信任金鑰 %s 的公鑰沒有被找到\n"
 
-#: g10/trustdb.c:2002
+#: g10/trustdb.c:2154
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "%d 個勉強信任以及 %d 個完全信任是 %s 信任模型的最小需求\n"
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2240
 #, 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:2163
+#: g10/trustdb.c:2315
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "無法更新信任資料庫版本記錄: 寫入失敗: %s\n"
 
-#: g10/verify.c:116
+#: g10/verify.c:117
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -5499,321 +5537,333 @@ msgstr ""
 "請記住簽章檔 (.sig 或 .asc)\n"
 "應該是第一個命令列給定的檔案.\n"
 
-#: g10/verify.c:189
+#: g10/verify.c:190
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "輸入列 %u 太長或者列末的 LF 遺失了\n"
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "一般性錯誤"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "未知的封包型態"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "未知的版本"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "未知的公鑰演算法"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "未知的摘要演算法"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "損壞的公鑰"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "損壞的私鑰"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "損壞的簽章"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "加總檢查錯誤"
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "錯誤的密語"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "找不到公鑰"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "未知的編密演算法"
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "沒辦法開啟鑰匙圈"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "無效的封包"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "無效的封裝"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "沒有這個使用者 ID"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "無法取用私鑰"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "用了錯誤的私鑰"
 
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "未被支援"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "損壞的金鑰"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "檔案讀取錯誤"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "檔案寫入錯誤"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "未知的壓縮演算法"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "檔案開啟錯誤"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "檔案建立錯誤"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "無效的密語"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "未被採用的公鑰演算法"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "未被採用的編密演算法"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "未知的簽章層級"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "信任資料庫錯誤"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "損壞的 MPI"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "資源限制"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "無效的鑰匙圈"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "損壞的憑證"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "被變造過的使用者 ID"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "檔案關閉錯誤"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "檔案更名錯誤"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "檔案刪除錯誤"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "未預期的資料"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "時間戳印有矛盾"
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "無法使用的公鑰演算法"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "檔案已存在"
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "金鑰薄弱"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "無效的參數"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "損壞的 URI"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "未被支援的 URI"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "網路錯誤"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "未被加密"
 
-#: util/errors.c:103
+#: util/errors.c:104
 msgid "not processed"
 msgstr "未被處理"
 
-#: util/errors.c:105
+#: util/errors.c:106
 msgid "unusable public key"
 msgstr "不可用的公鑰"
 
-#: util/errors.c:106
+#: util/errors.c:107
 msgid "unusable secret key"
 msgstr "不可用的私鑰"
 
-#: util/errors.c:107
+#: util/errors.c:108
 msgid "keyserver error"
 msgstr "金鑰伺服器錯誤"
 
-#: util/errors.c:108
+#: util/errors.c:109
 msgid "canceled"
 msgstr "已取消"
 
-#: util/errors.c:109
+#: util/errors.c:110
 msgid "no card"
 msgstr "沒有卡片"
 
-#: util/logger.c:157
+#: util/logger.c:158
 msgid "ERROR: "
 msgstr "錯誤: "
 
-#: util/logger.c:160
+#: util/logger.c:161
 msgid "WARNING: "
 msgstr "警告: "
 
-#: util/logger.c:223
+#: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... 這是個瑕疵 (%s:%d:%s)\n"
 
-#: util/logger.c:229
+#: util/logger.c:230
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "妳找到一個瑕疵了 ... (%s:%d)\n"
 
-#: util/miscutil.c:336 util/miscutil.c:373
+#: util/miscutil.c:330 util/miscutil.c:367
 msgid "yes"
 msgstr "yes"
 
-#: util/miscutil.c:337 util/miscutil.c:378
+#: util/miscutil.c:331 util/miscutil.c:372
 msgid "yY"
 msgstr "yY"
 
-#: util/miscutil.c:339 util/miscutil.c:375
+#: util/miscutil.c:333 util/miscutil.c:369
 msgid "no"
 msgstr "no"
 
-#: util/miscutil.c:340 util/miscutil.c:379
+#: util/miscutil.c:334 util/miscutil.c:373
 msgid "nN"
 msgstr "nN"
 
-#: util/miscutil.c:377
+#: util/miscutil.c:371
 msgid "quit"
 msgstr "quit"
 
-#: util/miscutil.c:380
+#: util/miscutil.c:374
 msgid "qQ"
 msgstr "qQ"
 
-#: util/miscutil.c:413
+#: util/miscutil.c:407
 msgid "okay|okay"
-msgstr "okay|ok|好"
+msgstr "okay|okay"
 
-#: util/miscutil.c:415
+#: util/miscutil.c:409
 msgid "cancel|cancel"
-msgstr "cancel|取消"
+msgstr "cancel|cancel"
 
-#: util/miscutil.c:416
+#: util/miscutil.c:410
 msgid "oO"
 msgstr "oO"
 
-#: util/miscutil.c:417
+#: util/miscutil.c:411
 msgid "cC"
 msgstr "cC"
 
-#: util/secmem.c:90
+#: util/secmem.c:91
 msgid "WARNING: using insecure memory!\n"
 msgstr "警告: 正在使用不安全的記憶體!\n"
 
-#: util/secmem.c:91
+#: util/secmem.c:92
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "請參考 http://www.gnupg.org/faq.html 上進一步的資訊\n"
 
-#: util/secmem.c:343
+#: util/secmem.c:344
 msgid "operation is not possible without initialized secure memory\n"
-msgstr "尚未啟用安全的記憶體前，不可能進行操作\n"
+msgstr "尚未啟用安全的記憶體前, 不可能進行操作\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:345
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(也許妳選錯程式來做這件事了)\n"
 
-#~ msgid "select secondary key N"
-#~ msgstr "選擇次鑰 N"
+#~ msgid "error getting serial number: %s\n"
+#~ msgstr "取得序號時出錯: %s\n"
+
+#~ msgid "Hint: Select the user IDs to sign\n"
+#~ msgstr "提示: 選擇要簽署的使用者 ID\n"
+
+#~ msgid "length of RSA modulus is not %d\n"
+#~ msgstr "RSA 系數的長度並非 %d\n"
+
+#~ msgid "length of an RSA prime is not %d\n"
+#~ msgstr "RSA 質數的長度並非 %d\n"
+
+#~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+#~ msgstr "錯誤的密語或未知的編密演算法 (%d)\n"
 
-#~ msgid "list signatures"
-#~ msgstr "列出簽章"
+#~ msgid "can't set client pid for the agent\n"
+#~ msgstr "無法設定代理程式中的使用者端 pid\n"
 
-#~ msgid "sign the key"
-#~ msgstr "簽署金鑰"
+#~ msgid "can't get server read FD for the agent\n"
+#~ msgstr "無法取得代理程式所需的伺服器讀取檔案描述\n"
 
-#~ msgid "delete signatures"
-#~ msgstr "刪除簽章"
+#~ msgid "can't get server write FD for the agent\n"
+#~ msgstr "無法取得代理程式所需的伺服器寫入檔案描述\n"
 
-#~ msgid "change the expire date"
-#~ msgstr "更改使用期限"
+#~ msgid "communication problem with gpg-agent\n"
+#~ msgstr "gpg-agent 的通訊問題\n"
 
-#~ msgid "set preference list"
-#~ msgstr "設定偏好清單"
+#~ msgid "passphrase too long\n"
+#~ msgstr "密語太長\n"
 
-#~ msgid "updated preferences"
-#~ msgstr "更新過的偏好"
+#~ msgid "invalid response from agent\n"
+#~ msgstr "代理程式傳回無效的回應\n"
 
-#~ msgid "No secondary key with index %d\n"
-#~ msgstr "索引 %d 沒有次鑰\n"
+#~ msgid "problem with the agent: agent returns 0x%lx\n"
+#~ msgstr "代理程式的問題: 代理程式傳回 0x%lx\n"
diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 4b60293e0..a581e18e3 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-31  Werner Koch  <[email protected]>
+
+	* config.guess, config.sub, config.rpath: Updated from todays
+	gnulib CVS.
+
 2005-04-22  David Shaw  <[email protected]>
 
 	* gnupg.spec.in: No longer any need to override libexecdir.  The
diff --git a/scripts/conf-riscos/include/config.h b/scripts/conf-riscos/include/config.h
index 5b4b6ed67..208796bc6 100644
--- a/scripts/conf-riscos/include/config.h
+++ b/scripts/conf-riscos/include/config.h
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 #ifndef G10_CONFIG_H
 #define G10_CONFIG_H
diff --git a/scripts/conf-riscos/include/g10defs.h b/scripts/conf-riscos/include/g10defs.h
index 08f4a7a0a..679969751 100644
--- a/scripts/conf-riscos/include/g10defs.h
+++ b/scripts/conf-riscos/include/g10defs.h
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 /* Path variables and filing system constants for RISC OS */
diff --git a/scripts/config.guess b/scripts/config.guess
index 77c7cbab0..6d71f752f 100755
--- a/scripts/config.guess
+++ b/scripts/config.guess
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2004-08-13'
+timestamp='2005-05-27'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -17,13 +17,15 @@ timestamp='2004-08-13'
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+
 # Originally written by Per Bothner <[email protected]>.
 # Please send patches to <[email protected]>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
@@ -53,7 +55,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -66,11 +68,11 @@ Try \`$me --help' for more information."
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -196,55 +198,55 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
-	exit 0 ;;
+	exit ;;
     amd64:OpenBSD:*:*)
 	echo x86_64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     amiga:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     cats:OpenBSD:*:*)
 	echo arm-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     hp300:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     luna88k:OpenBSD:*:*)
     	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     mac68k:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     macppc:OpenBSD:*:*)
 	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     mvme68k:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     mvme88k:OpenBSD:*:*)
 	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     mvmeppc:OpenBSD:*:*)
 	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     sgi:OpenBSD:*:*)
 	echo mips64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     sun3:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:OpenBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     macppc:MirBSD:*:*)
 	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
 	*4.0)
@@ -297,37 +299,43 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit 0 ;;
+	exit ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
 	# of the specific Alpha model?
 	echo alpha-pc-interix
-	exit 0 ;;
+	exit ;;
     21064:Windows_NT:50:3)
 	echo alpha-dec-winnt3.5
-	exit 0 ;;
+	exit ;;
     Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-unknown-sysv4
-	exit 0;;
+	exit ;;
     *:[Aa]miga[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit 0 ;;
+	exit ;;
     *:[Mm]orph[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-morphos
-	exit 0 ;;
+	exit ;;
     *:OS/390:*:*)
 	echo i370-ibm-openedition
-	exit 0 ;;
+	exit ;;
+    *:z/VM:*:*)
+	echo s390-ibm-zvmoe
+	exit ;;
     *:OS400:*:*)
         echo powerpc-ibm-os400
-	exit 0 ;;
+	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit 0;;
+	exit ;;
+    arm:riscos:*:*|arm:RISCOS:*:*)
+	echo arm-unknown-riscos
+	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
-	exit 0;;
+	exit ;;
     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
 	# [email protected] (Earle F. Ake) contributed MIS and NILE.
 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@ -335,32 +343,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	else
 		echo pyramid-pyramid-bsd
 	fi
-	exit 0 ;;
+	exit ;;
     NILE*:*:*:dcosx)
 	echo pyramid-pyramid-svr4
-	exit 0 ;;
+	exit ;;
     DRS?6000:unix:4.0:6*)
 	echo sparc-icl-nx6
-	exit 0 ;;
-    DRS?6000:UNIX_SV:4.2*:7*)
+	exit ;;
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
 	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7 && exit 0 ;;
+	    sparc) echo sparc-icl-nx7; exit ;;
 	esac ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     i86pc:SunOS:5.*:*)
 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
 	# it's likely to be more like Solaris than SunOS4.
 	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:*:*)
 	case "`/usr/bin/arch -k`" in
 	    Series*|S4*)
@@ -369,10 +377,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	esac
 	# Japanese Language versions have a version number like `4.1.3-JL'.
 	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit 0 ;;
+	exit ;;
     sun3*:SunOS:*:*)
 	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     sun*:*:4.2BSD:*)
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
@@ -384,10 +392,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		echo sparc-sun-sunos${UNAME_RELEASE}
 		;;
 	esac
-	exit 0 ;;
+	exit ;;
     aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
     # "atarist" or "atariste" at least should have a processor
@@ -398,40 +406,40 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
         echo m68k-milan-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
         echo m68k-hades-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     RISC*:Mach:*:*)
 	echo mips-dec-mach_bsd4.3
-	exit 0 ;;
+	exit ;;
     RISC*:ULTRIX:*:*)
 	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     VAX*:ULTRIX*:*:*)
 	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     2020:CLIX:*:* | 2430:CLIX:*:*)
 	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -455,32 +463,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	  exit (-1);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c \
-	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && exit 0
+	$CC_FOR_BUILD -o $dummy $dummy.c &&
+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+	  SYSTEM_NAME=`$dummy $dummyarg` &&
+	    { echo "$SYSTEM_NAME"; exit; }
 	echo mips-mips-riscos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     Motorola:PowerMAX_OS:*:*)
 	echo powerpc-motorola-powermax
-	exit 0 ;;
+	exit ;;
     Motorola:*:4.3:PL8-*)
 	echo powerpc-harris-powermax
-	exit 0 ;;
+	exit ;;
     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
 	echo powerpc-harris-powermax
-	exit 0 ;;
+	exit ;;
     Night_Hawk:Power_UNIX:*:*)
 	echo powerpc-harris-powerunix
-	exit 0 ;;
+	exit ;;
     m88k:CX/UX:7*:*)
 	echo m88k-harris-cxux7
-	exit 0 ;;
+	exit ;;
     m88k:*:4*:R4*)
 	echo m88k-motorola-sysv4
-	exit 0 ;;
+	exit ;;
     m88k:*:3*:R3*)
 	echo m88k-motorola-sysv3
-	exit 0 ;;
+	exit ;;
     AViiON:dgux:*:*)
         # DG/UX returns AViiON for all architectures
         UNAME_PROCESSOR=`/usr/bin/uname -p`
@@ -496,29 +505,29 @@ EOF
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit 0 ;;
+ 	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
-	exit 0 ;;
+	exit ;;
     M88*:*:R3*:*)
 	# Delta 88k system running SVR3
 	echo m88k-motorola-sysv3
-	exit 0 ;;
+	exit ;;
     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
 	echo m88k-tektronix-sysv3
-	exit 0 ;;
+	exit ;;
     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
 	echo m68k-tektronix-bsd
-	exit 0 ;;
+	exit ;;
     *:IRIX*:*:*)
 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit 0 ;;
+	exit ;;
     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
     i*86:AIX:*:*)
 	echo i386-ibm-aix
-	exit 0 ;;
+	exit ;;
     ia64:AIX:*:*)
 	if [ -x /usr/bin/oslevel ] ; then
 		IBM_REV=`/usr/bin/oslevel`
@@ -526,7 +535,7 @@ EOF
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit 0 ;;
+	exit ;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
 		eval $set_cc_for_build
@@ -541,14 +550,18 @@ EOF
 			exit(0);
 			}
 EOF
-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-		echo rs6000-ibm-aix3.2.5
+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		then
+			echo "$SYSTEM_NAME"
+		else
+			echo rs6000-ibm-aix3.2.5
+		fi
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
 		echo rs6000-ibm-aix3.2.4
 	else
 		echo rs6000-ibm-aix3.2
 	fi
-	exit 0 ;;
+	exit ;;
     *:AIX:*:[45])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
@@ -562,28 +575,28 @@ EOF
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit 0 ;;
+	exit ;;
     *:AIX:*:*)
 	echo rs6000-ibm-aix
-	exit 0 ;;
+	exit ;;
     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
 	echo romp-ibm-bsd4.4
-	exit 0 ;;
+	exit ;;
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit 0 ;;                           # report: romp-ibm BSD 4.3
+	exit ;;                             # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
 	echo rs6000-bull-bosx
-	exit 0 ;;
+	exit ;;
     DPX/2?00:B.O.S.:*:*)
 	echo m68k-bull-sysv3
-	exit 0 ;;
+	exit ;;
     9000/[34]??:4.3bsd:1.*:*)
 	echo m68k-hp-bsd
-	exit 0 ;;
+	exit ;;
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
 	echo m68k-hp-bsd4.4
-	exit 0 ;;
+	exit ;;
     9000/[34678]??:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	case "${UNAME_MACHINE}" in
@@ -647,7 +660,18 @@ EOF
 	then
 	    # avoid double evaluation of $set_cc_for_build
 	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
+	    #
+	    # $ CC_FOR_BUILD=cc ./config.guess
+	    # => hppa2.0w-hp-hpux11.23
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+	    # => hppa64-hp-hpux11.23
+
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+		grep __LP64__ >/dev/null
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -655,11 +679,11 @@ EOF
 	    fi
 	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit 0 ;;
+	exit ;;
     ia64:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	echo ia64-hp-hpux${HPUX_REV}
-	exit 0 ;;
+	exit ;;
     3050*:HI-UX:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -687,152 +711,166 @@ EOF
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+		{ echo "$SYSTEM_NAME"; exit; }
 	echo unknown-hitachi-hiuxwe2
-	exit 0 ;;
+	exit ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
 	echo hppa1.1-hp-bsd
-	exit 0 ;;
+	exit ;;
     9000/8??:4.3bsd:*:*)
 	echo hppa1.0-hp-bsd
-	exit 0 ;;
+	exit ;;
     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
 	echo hppa1.0-hp-mpeix
-	exit 0 ;;
+	exit ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
 	echo hppa1.1-hp-osf
-	exit 0 ;;
+	exit ;;
     hp8??:OSF1:*:*)
 	echo hppa1.0-hp-osf
-	exit 0 ;;
+	exit ;;
     i*86:OSF1:*:*)
 	if [ -x /usr/sbin/sysversion ] ; then
 	    echo ${UNAME_MACHINE}-unknown-osf1mk
 	else
 	    echo ${UNAME_MACHINE}-unknown-osf1
 	fi
-	exit 0 ;;
+	exit ;;
     parisc*:Lites*:*:*)
 	echo hppa1.1-hp-lites
-	exit 0 ;;
+	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit 0 ;;
+        exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit 0 ;;
+        exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit 0 ;;
+        exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit 0 ;;
+        exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit 0 ;;
+        exit ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*[A-Z]90:*:*:*)
 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
 	      -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*T3E:*:*:*)
 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*SV1:*:*:*)
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     *:UNICOS/mp:*:*)
 	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
+        exit ;;
     5000:UNIX_System_V:4.*:*)
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
         echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit 0 ;;
+	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     sparc*:BSD/OS:*:*)
 	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:FreeBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
+	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
-	exit 0 ;;
+	exit ;;
     i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
-	exit 0 ;;
+	exit ;;
+    i*:windows32*:*)
+    	# uname -m includes "-pc" on this system.
+    	echo ${UNAME_MACHINE}-mingw32
+	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
-	exit 0 ;;
+	exit ;;
     x86:Interix*:[34]*)
 	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-	exit 0 ;;
+	exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
-	exit 0 ;;
+	exit ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
 	# UNAME_MACHINE based on the output of uname instead of i386?
 	echo i586-pc-interix
-	exit 0 ;;
+	exit ;;
     i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
-	exit 0 ;;
+	exit ;;
+    amd64:CYGWIN*:*:*)
+	echo x86_64-unknown-cygwin
+	exit ;;
     p*:CYGWIN*:*)
 	echo powerpcle-unknown-cygwin
-	exit 0 ;;
+	exit ;;
     prep*:SunOS:5.*:*)
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     *:GNU:*:*)
 	# the GNU system
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit 0 ;;
+	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
 	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit 0 ;;
+	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
-	exit 0 ;;
+	exit ;;
     arm*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     cris:Linux:*:*)
 	echo cris-axis-linux-gnu
-	exit 0 ;;
+	exit ;;
+    crisv32:Linux:*:*)
+	echo crisv32-axis-linux-gnu
+	exit ;;
+    frv:Linux:*:*)
+    	echo frv-unknown-linux-gnu
+	exit ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     m32r*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     mips:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -850,7 +888,7 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -869,14 +907,14 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     ppc:Linux:*:*)
 	echo powerpc-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     ppc64:Linux:*:*)
 	echo powerpc64-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -890,7 +928,7 @@ EOF
 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit 0 ;;
+	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -898,25 +936,25 @@ EOF
 	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
-	exit 0 ;;
+	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
 	echo hppa64-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
-	exit 0 ;;
+	exit ;;
     sh64*:Linux:*:*)
     	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
@@ -934,15 +972,15 @@ EOF
 		;;
 	  a.out-i386-linux)
 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0 ;;
+		exit ;;
 	  coff-i386)
 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit 0 ;;
+		exit ;;
 	  "")
 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
 		# one that does not give us useful --help.
 		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit 0 ;;
+		exit ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
 	eval $set_cc_for_build
@@ -970,15 +1008,18 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+	test x"${LIBC}" != x && {
+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+		exit
+	}
+	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
 	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
 	# sysname and nodename.
 	echo i386-sequent-sysv4
-	exit 0 ;;
+	exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
         # Unixware is an offshoot of SVR4, but it has its own version
         # number series starting with 2...
@@ -986,27 +1027,27 @@ EOF
 	# I just have to hope.  -- rms.
         # Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit 0 ;;
+	exit ;;
     i*86:OS/2:*:*)
 	# If we were able to find `uname', then EMX Unix compatibility
 	# is probably installed.
 	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit 0 ;;
+	exit ;;
     i*86:XTS-300:*:STOP)
 	echo ${UNAME_MACHINE}-unknown-stop
-	exit 0 ;;
+	exit ;;
     i*86:atheos:*:*)
 	echo ${UNAME_MACHINE}-unknown-atheos
-	exit 0 ;;
-	i*86:syllable:*:*)
+	exit ;;
+    i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
-	exit 0 ;;
+	exit ;;
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     i*86:*DOS:*:*)
 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
+	exit ;;
     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -1014,15 +1055,16 @@ EOF
 	else
 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
 	fi
-	exit 0 ;;
-    i*86:*:5:[78]*)
+	exit ;;
+    i*86:*:5:[678]*)
+    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
 	esac
 	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit 0 ;;
+	exit ;;
     i*86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
@@ -1040,73 +1082,73 @@ EOF
 	else
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
-	exit 0 ;;
+	exit ;;
     pc:*:*:*)
 	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
         # the processor, so we play safe by assuming i386.
 	echo i386-pc-msdosdjgpp
-        exit 0 ;;
+        exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
-	exit 0 ;;
+	exit ;;
     paragon:*:*:*)
 	echo i860-intel-osf1
-	exit 0 ;;
+	exit ;;
     i860:*:4.*:*) # i860-SVR4
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
 	else # Add other i860-SVR4 vendors below as they are discovered.
 	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
 	fi
-	exit 0 ;;
+	exit ;;
     mini*:CTIX:SYS*5:*)
 	# "miniframe"
 	echo m68010-convergent-sysv
-	exit 0 ;;
+	exit ;;
     mc68k:UNIX:SYSTEM5:3.51m)
 	echo m68k-convergent-sysv
-	exit 0 ;;
+	exit ;;
     M680?0:D-NIX:5.3:*)
 	echo m68k-diab-dnix
-	exit 0 ;;
+	exit ;;
     M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
     3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4 && exit 0 ;;
+          && { echo i486-ncr-sysv4; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
-	exit 0 ;;
+	exit ;;
     TSUNAMI:LynxOS:2.*:*)
 	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     SM[BE]S:UNIX_SV:*:*)
 	echo mips-dde-sysv${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     RM*:ReliantUNIX-*:*:*)
 	echo mips-sni-sysv4
-	exit 0 ;;
+	exit ;;
     RM*:SINIX-*:*:*)
 	echo mips-sni-sysv4
-	exit 0 ;;
+	exit ;;
     *:SINIX-*:*:*)
 	if uname -p 2>/dev/null >/dev/null ; then
 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -1114,61 +1156,65 @@ EOF
 	else
 		echo ns32k-sni-sysv
 	fi
-	exit 0 ;;
+	exit ;;
     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
                       # says <[email protected]>
         echo i586-unisys-sysv4
-        exit 0 ;;
+        exit ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <[email protected]>.
 	# How about differentiating between stratus architectures? -djm
 	echo hppa1.1-stratus-sysv4
-	exit 0 ;;
+	exit ;;
     *:*:*:FTX*)
 	# From [email protected].
 	echo i860-stratus-sysv4
-	exit 0 ;;
+	exit ;;
+    i*86:VOS:*:*)
+	# From [email protected].
+	echo ${UNAME_MACHINE}-stratus-vos
+	exit ;;
     *:VOS:*:*)
 	# From [email protected].
 	echo hppa1.1-stratus-vos
-	exit 0 ;;
+	exit ;;
     mc68*:A/UX:*:*)
 	echo m68k-apple-aux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     news*:NEWS-OS:6*:*)
 	echo mips-sony-newsos6
-	exit 0 ;;
+	exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
 	        echo mips-nec-sysv${UNAME_RELEASE}
 	else
 	        echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit 0 ;;
+        exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
-	exit 0 ;;
+	exit ;;
     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
 	echo powerpc-apple-beos
-	exit 0 ;;
+	exit ;;
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
-	exit 0 ;;
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     SX-5:SUPER-UX:*:*)
 	echo sx5-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Rhapsody:*:*)
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
@@ -1176,7 +1222,7 @@ EOF
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
 	if test "$UNAME_PROCESSOR" = "x86"; then
@@ -1184,22 +1230,25 @@ EOF
 		UNAME_MACHINE=pc
 	fi
 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:QNX:*:4*)
 	echo i386-pc-qnx
-	exit 0 ;;
+	exit ;;
+    NSE-?:NONSTOP_KERNEL:*:*)
+	echo nse-tandem-nsk${UNAME_RELEASE}
+	exit ;;
     NSR-?:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:NonStop-UX:*:*)
 	echo mips-compaq-nonstopux
-	exit 0 ;;
+	exit ;;
     BS2000:POSIX*:*:*)
 	echo bs2000-siemens-sysv
-	exit 0 ;;
+	exit ;;
     DS/*:UNIX_System_V:*:*)
 	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Plan9:*:*)
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
@@ -1210,38 +1259,44 @@ EOF
 	    UNAME_MACHINE="$cputype"
 	fi
 	echo ${UNAME_MACHINE}-unknown-plan9
-	exit 0 ;;
+	exit ;;
     *:TOPS-10:*:*)
 	echo pdp10-unknown-tops10
-	exit 0 ;;
+	exit ;;
     *:TENEX:*:*)
 	echo pdp10-unknown-tenex
-	exit 0 ;;
+	exit ;;
     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
 	echo pdp10-dec-tops20
-	exit 0 ;;
+	exit ;;
     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
 	echo pdp10-xkl-tops20
-	exit 0 ;;
+	exit ;;
     *:TOPS-20:*:*)
 	echo pdp10-unknown-tops20
-	exit 0 ;;
+	exit ;;
     *:ITS:*:*)
 	echo pdp10-unknown-its
-	exit 0 ;;
+	exit ;;
     SEI:*:*:SEIUX)
         echo mips-sei-seiux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
+	exit ;;
     *:*VMS:*:*)
     	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms && exit 0 ;;
-	    I*) echo ia64-dec-vms && exit 0 ;;
-	    V*) echo vax-dec-vms && exit 0 ;;
-	esac
+	    A*) echo alpha-dec-vms ; exit ;;
+	    I*) echo ia64-dec-vms ; exit ;;
+	    V*) echo vax-dec-vms ; exit ;;
+	esac ;;
+    *:XENIX:*:SysV)
+	echo i386-pc-xenix
+	exit ;;
+    i*86:skyos:*:*)
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1273,7 +1328,7 @@ main ()
 #endif
 
 #if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix"); exit (0);
+  printf ("arm-acorn-riscix\n"); exit (0);
 #endif
 
 #if defined (hp300) && !defined (hpux)
@@ -1362,11 +1417,12 @@ main ()
 }
 EOF
 
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+	{ echo "$SYSTEM_NAME"; exit; }
 
 # Apollos put the system type in the environment.
 
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
 
 # Convex versions that predate uname can use getsysinfo(1)
 
@@ -1375,22 +1431,22 @@ then
     case `getsysinfo -f cpu_type` in
     c1*)
 	echo c1-convex-bsd
-	exit 0 ;;
+	exit ;;
     c2*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-	exit 0 ;;
+	exit ;;
     c34*)
 	echo c34-convex-bsd
-	exit 0 ;;
+	exit ;;
     c38*)
 	echo c38-convex-bsd
-	exit 0 ;;
+	exit ;;
     c4*)
 	echo c4-convex-bsd
-	exit 0 ;;
+	exit ;;
     esac
 fi
 
@@ -1401,7 +1457,9 @@ This script, last modified $timestamp, has failed to recognize
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-    ftp://ftp.gnu.org/pub/gnu/config/
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+and
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be
diff --git a/scripts/config.rpath b/scripts/config.rpath
index 4db13e50f..3f1bef34a 100755
--- a/scripts/config.rpath
+++ b/scripts/config.rpath
@@ -2,28 +2,13 @@
 # Output a system dependent set of variables, describing how to set the
 # run time search path of shared libraries in an executable.
 #
-#   Copyright 1996-2003 Free Software Foundation, Inc.
+#   Copyright 1996-2005 Free Software Foundation, Inc.
 #   Taken from GNU libtool, 2001
 #   Originally by Gordon Matzigkeit <[email protected]>, 1996
 #
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 2 of the License, or
-#   (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-#   As a special exception to the GNU General Public License, if you
-#   distribute this file as part of a program that contains a
-#   configuration script generated by Autoconf, you may include it under
-#   the same distribution terms that you use for the rest of that program.
+#   This file is free software; the Free Software Foundation gives
+#   unlimited permission to copy and/or distribute it, with or without
+#   modifications, as long as this notice is preserved.
 #
 # The first argument passed to this file is the canonical host specification,
 #    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
@@ -50,6 +35,8 @@ host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
+cc_basename=`echo "$CC" | sed -e 's%^.*/%%'`
+
 # Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
 
 wl=
@@ -60,6 +47,13 @@ else
     aix*)
       wl='-Wl,'
       ;;
+    darwin*)
+      case "$cc_basename" in
+        xlc*)
+          wl='-Wl,'
+          ;;
+      esac
+      ;;
     mingw* | pw32* | os2*)
       ;;
     hpux9* | hpux10* | hpux11*)
@@ -71,13 +65,19 @@ else
     newsos6)
       ;;
     linux*)
-      case $CC in
-        icc|ecc)
+      case $cc_basename in
+        icc* | ecc*)
+          wl='-Wl,'
+          ;;
+        pgcc | pgf77 | pgf90)
           wl='-Wl,'
           ;;
-        ccc)
+        ccc*)
           wl='-Wl,'
           ;;
+        como)
+          wl='-lopt='
+          ;;
       esac
       ;;
     osf3* | osf4* | osf5*)
@@ -96,6 +96,9 @@ else
       ;;
     sysv4*MP*)
       ;;
+    unicos*)
+      wl='-Wl,'
+      ;;
     uts4*)
       ;;
   esac
@@ -138,7 +141,7 @@ if test "$with_gnu_ld" = yes; then
       # that the semantics of dynamic libraries on AmigaOS, at least up
       # to version 4, is to share data among multiple programs linked
       # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can use
+      # behavior of shared libraries on other platforms, we cannot use
       # them.
       ld_shlibs=no
       ;;
@@ -173,6 +176,13 @@ if test "$with_gnu_ld" = yes; then
     sunos4*)
       hardcode_direct=yes
       ;;
+    linux*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
     *)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
         :
@@ -266,7 +276,7 @@ else
       # see comment about different semantics on the GNU ld section
       ld_shlibs=no
       ;;
-    bsdi4*)
+    bsdi[45]*)
       ;;
     cygwin* | mingw* | pw32*)
       # When not using gcc, we currently assume that we are using
@@ -277,8 +287,17 @@ else
       libext=lib
       ;;
     darwin* | rhapsody*)
-      if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
-        hardcode_direct=no
+      hardcode_direct=no
+      if test "$GCC" = yes ; then
+        :
+      else
+        case "$cc_basename" in
+          xlc*)
+            ;;
+          *)
+            ld_shlibs=no
+            ;;
+        esac
       fi
       ;;
     dgux*)
@@ -295,7 +314,7 @@ else
       hardcode_direct=yes
       hardcode_minus_L=yes
       ;;
-    freebsd*)
+    freebsd* | kfreebsd*-gnu | dragonfly*)
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
       ;;
@@ -438,7 +457,7 @@ case "$host_os" in
     ;;
   beos*)
     ;;
-  bsdi4*)
+  bsdi[45]*)
     ;;
   cygwin* | mingw* | pw32*)
     shrext=.dll
@@ -450,6 +469,8 @@ case "$host_os" in
     ;;
   freebsd1*)
     ;;
+  kfreebsd*-gnu)
+    ;;
   freebsd*)
     ;;
   gnu*)
@@ -486,11 +507,13 @@ case "$host_os" in
     ;;
   linux*)
     ;;
+  knetbsd*-gnu)
+    ;;
   netbsd*)
     ;;
   newsos6)
     ;;
-  nto-qnx)
+  nto-qnx*)
     ;;
   openbsd*)
     ;;
@@ -519,7 +542,7 @@ escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
 shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
 escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
 
-sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
+LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
 
 # How to pass a linker flag through the compiler.
 wl="$escaped_wl"
diff --git a/scripts/config.sub b/scripts/config.sub
index ac6de9869..519f2cd00 100755
--- a/scripts/config.sub
+++ b/scripts/config.sub
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2004-06-24'
+timestamp='2005-05-12'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21,14 +21,15 @@ timestamp='2004-06-24'
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+
 # Please send patches to <[email protected]>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
 #
@@ -70,7 +71,7 @@ Report bugs and patches to <[email protected]>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -83,11 +84,11 @@ Try \`$me --help' for more information."
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -99,7 +100,7 @@ while test $# -gt 0 ; do
     *local*)
        # First pass through any local machine types.
        echo $1
-       exit 0;;
+       exit ;;
 
     * )
        break ;;
@@ -231,13 +232,14 @@ case $basic_machine in
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | mcore \
+	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -262,12 +264,13 @@ case $basic_machine in
 	| pyramid \
 	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
+	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b \
 	| strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xscale | xstormy16 | xtensa \
+	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
@@ -298,7 +301,7 @@ case $basic_machine in
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* \
-	| bs2000-* \
+	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
@@ -310,7 +313,7 @@ case $basic_machine in
 	| ip2k-* | iq2000-* \
 	| m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | mcore-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -336,15 +339,16 @@ case $basic_machine in
 	| romp-* | rs6000-* \
 	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
 	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-	| xtensa-* \
+	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| xstormy16-* | xtensa-* \
 	| ymp-* \
 	| z8k-*)
 		;;
@@ -457,6 +461,9 @@ case $basic_machine in
 	crds | unos)
 		basic_machine=m68k-crds
 		;;
+	crisv32 | crisv32-* | etraxfs*)
+		basic_machine=crisv32-axis
+		;;
 	cris | cris-* | etrax*)
 		basic_machine=cris-axis
 		;;
@@ -486,6 +493,10 @@ case $basic_machine in
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
 	dpx20 | dpx20-*)
 		basic_machine=rs6000-bull
 		os=-bosx
@@ -1026,6 +1037,10 @@ case $basic_machine in
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
@@ -1167,7 +1182,7 @@ case $os in
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* | -skyos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1294,6 +1309,9 @@ case $os in
 	-kaos*)
 		os=-kaos
 		;;
+	-zvmoe)
+		os=-zvmoe
+		;;
 	-none)
 		;;
 	*)
@@ -1542,7 +1560,7 @@ case $basic_machine in
 esac
 
 echo $basic_machine$os
-exit 0
+exit
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
diff --git a/scripts/depcomp b/scripts/depcomp
index 11e2d3bfe..eed3cc9f8 100755
--- a/scripts/depcomp
+++ b/scripts/depcomp
@@ -17,8 +17,8 @@ scriptversion=2004-05-31.23
 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
diff --git a/scripts/missing b/scripts/missing
index 64b5f901d..3392b9e70 100755
--- a/scripts/missing
+++ b/scripts/missing
@@ -19,8 +19,8 @@ scriptversion=2004-09-07.08
 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
diff --git a/scripts/w32installer.nsi b/scripts/w32installer.nsi
index 595dd94c5..92bb2710c 100644
--- a/scripts/w32installer.nsi
+++ b/scripts/w32installer.nsi
@@ -44,7 +44,7 @@ VIAddVersionKey "Comments" \
     it under the terms of the GNU General Public License. You should  \
     have received a copy of the GNU General Public License along with  \
     this software; if not, write to the Free Software Foundation, Inc.,  \
-    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA"
 VIAddVersionKey "CompanyName" "Free Software Foundation"
 VIAddVersionKey "LegalTrademarks" ""
 VIAddVersionKey "LegalCopyright" \
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 42929810b..1636eb3e0 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -15,7 +15,7 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 ## Process this file with automake to produce Makefile.in
 
diff --git a/tools/bftest.c b/tools/bftest.c
index 49516afc4..829c429a0 100644
--- a/tools/bftest.c
+++ b/tools/bftest.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/tools/gpgsplit.c b/tools/gpgsplit.c
index a91635092..8fc3fb346 100644
--- a/tools/gpgsplit.c
+++ b/tools/gpgsplit.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 /* 
diff --git a/tools/mpicalc.c b/tools/mpicalc.c
index 392bd3ef1..915dcc32a 100644
--- a/tools/mpicalc.c
+++ b/tools/mpicalc.c
@@ -21,7 +21,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/util/Makefile.am b/util/Makefile.am
index d54aa7a97..a143199af 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -14,7 +14,7 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 ## Process this file with automake to produce Makefile.in
 
diff --git a/util/argparse.c b/util/argparse.c
index becfb4d06..049eafd9e 100644
--- a/util/argparse.c
+++ b/util/argparse.c
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  *
  *
  * Note: This is an independent version of the one in WkLib
@@ -930,7 +930,7 @@ default_strusage( int level )
 "GNU General Public License for more details.\n\n"
 "You should have received a copy of the GNU General Public License\n"
 "along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n";
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n";
 	break;
       case 40: /* short and long usage */
       case 41: p = ""; break;
diff --git a/util/assuan-buffer.c b/util/assuan-buffer.c
index 949e7f49d..7d40b2c53 100644
--- a/util/assuan-buffer.c
+++ b/util/assuan-buffer.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA. 
  */
 
 /* Please note that this is a stripped down and modified version of
diff --git a/util/assuan-client.c b/util/assuan-client.c
index a1cd2a53a..0467f6dc5 100644
--- a/util/assuan-client.c
+++ b/util/assuan-client.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA. 
  */
 
 /* Please note that this is a stripped down and modified version of
diff --git a/util/assuan-connect.c b/util/assuan-connect.c
index 52c9aa00f..9952b4406 100644
--- a/util/assuan-connect.c
+++ b/util/assuan-connect.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA. 
  */
 
 /* Please note that this is a stripped down and modified version of
diff --git a/util/assuan-defs.h b/util/assuan-defs.h
index 06400d836..67c4e13ce 100644
--- a/util/assuan-defs.h
+++ b/util/assuan-defs.h
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA. 
  */
 
 /* Please note that this is a stripped down and modified version of
diff --git a/util/assuan-errors.c b/util/assuan-errors.c
index 01f718ca9..c3a8770cb 100644
--- a/util/assuan-errors.c
+++ b/util/assuan-errors.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA. 
  */
 
 /* Please note that this is a stripped down and modified version of
diff --git a/util/assuan-logging.c b/util/assuan-logging.c
index 6663e8114..f2d6c876d 100644
--- a/util/assuan-logging.c
+++ b/util/assuan-logging.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA. 
  */
 
 /* Please note that this is a stripped down and modified version of
diff --git a/util/assuan-socket-connect.c b/util/assuan-socket-connect.c
index 003859147..0c580cd5f 100644
--- a/util/assuan-socket-connect.c
+++ b/util/assuan-socket-connect.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA. 
  */
 
 /* Please note that this is a stripped down and modified version of
diff --git a/util/assuan-socket.c b/util/assuan-socket.c
index 080eff243..4d79792ce 100644
--- a/util/assuan-socket.c
+++ b/util/assuan-socket.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 /* Please note that this is a stripped down and modified version of
diff --git a/util/assuan-util.c b/util/assuan-util.c
index a5ee0b290..db3cb7232 100644
--- a/util/assuan-util.c
+++ b/util/assuan-util.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA. 
  */
 
 /* Please note that this is a stripped down and modified version of
diff --git a/util/dotlock.c b/util/dotlock.c
index b60e4db75..82df3b3c4 100644
--- a/util/dotlock.c
+++ b/util/dotlock.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/util/errors.c b/util/errors.c
index feb84fca1..66f539464 100644
--- a/util/errors.c
+++ b/util/errors.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/util/fileutil.c b/util/fileutil.c
index 99aa0776b..4ee94400e 100644
--- a/util/fileutil.c
+++ b/util/fileutil.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/util/http.c b/util/http.c
index 19393c360..33349dce4 100644
--- a/util/http.c
+++ b/util/http.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/util/iobuf.c b/util/iobuf.c
index 2cbde7f90..324bf075e 100644
--- a/util/iobuf.c
+++ b/util/iobuf.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/util/isascii.c b/util/isascii.c
index 565c71664..b71febe99 100644
--- a/util/isascii.c
+++ b/util/isascii.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/util/logger.c b/util/logger.c
index bd3156f3d..9326a4659 100644
--- a/util/logger.c
+++ b/util/logger.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/util/membuf.c b/util/membuf.c
index ea69ee953..44347fa1b 100644
--- a/util/membuf.c
+++ b/util/membuf.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/util/memory.c b/util/memory.c
index f84e507dc..35b37cfbc 100644
--- a/util/memory.c
+++ b/util/memory.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  *
  * We use our own memory allocation functions instead of plain malloc(),
diff --git a/util/memrchr.c b/util/memrchr.c
index 009ae8ec4..fafce1073 100644
--- a/util/memrchr.c
+++ b/util/memrchr.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 /*
diff --git a/util/miscutil.c b/util/miscutil.c
index 8a1a1b126..92dde404c 100644
--- a/util/miscutil.c
+++ b/util/miscutil.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/util/mkdtemp.c b/util/mkdtemp.c
index 3abdc1da6..c8b67db5a 100644
--- a/util/mkdtemp.c
+++ b/util/mkdtemp.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 /* This is a replacement function for mkdtemp in case the platform
diff --git a/util/regcomp.c b/util/regcomp.c
index c517b71cc..d4957e4b9 100644
--- a/util/regcomp.c
+++ b/util/regcomp.c
@@ -16,7 +16,7 @@
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   02110-1301 USA.  */
 
 #include <assert.h>
 #include <ctype.h>
diff --git a/util/regex.c b/util/regex.c
index 1d5dd0f53..34d412002 100644
--- a/util/regex.c
+++ b/util/regex.c
@@ -16,7 +16,7 @@
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   02110-1301 USA.  */
 
 #ifdef _LIBC
 /* We have to keep the namespace clean.  */
diff --git a/util/regex_internal.c b/util/regex_internal.c
index 94185bf89..0f8b897b1 100644
--- a/util/regex_internal.c
+++ b/util/regex_internal.c
@@ -16,7 +16,7 @@
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   02110-1301 USA.  */
 
 #include <assert.h>
 #include <ctype.h>
diff --git a/util/regex_internal.h b/util/regex_internal.h
index 0bbf1081e..679bea11b 100644
--- a/util/regex_internal.h
+++ b/util/regex_internal.h
@@ -16,7 +16,7 @@
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   02110-1301 USA.  */
 
 #ifndef _REGEX_INTERNAL_H
 #define _REGEX_INTERNAL_H 1
diff --git a/util/regexec.c b/util/regexec.c
index d791edb36..40d305899 100644
--- a/util/regexec.c
+++ b/util/regexec.c
@@ -16,7 +16,7 @@
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   02110-1301 USA.  */
 
 #include <assert.h>
 #include <ctype.h>
diff --git a/util/riscos.c b/util/riscos.c
index 256f3f65d..c4240c8ba 100644
--- a/util/riscos.c
+++ b/util/riscos.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef __RISCOS__C__
diff --git a/util/secmem.c b/util/secmem.c
index de3e9d4fb..10f6052ab 100644
--- a/util/secmem.c
+++ b/util/secmem.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/util/simple-gettext.c b/util/simple-gettext.c
index d5db6f8fa..483f293b4 100644
--- a/util/simple-gettext.c
+++ b/util/simple-gettext.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 /* This is a simplified version of gettext written by Ulrich Drepper.
diff --git a/util/srv.c b/util/srv.c
index 594055776..75424d91d 100644
--- a/util/srv.c
+++ b/util/srv.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/util/srv.h b/util/srv.h
index d672d3f47..a81ebd573 100644
--- a/util/srv.h
+++ b/util/srv.h
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef _SRV_H_
diff --git a/util/strgutil.c b/util/strgutil.c
index 131ef3cd4..58f5b0b50 100644
--- a/util/strgutil.c
+++ b/util/strgutil.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/util/timegm.c b/util/timegm.c
index 3fdd99e43..3b7931e7c 100644
--- a/util/timegm.c
+++ b/util/timegm.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 /*
diff --git a/util/ttyio.c b/util/ttyio.c
index 08f4d3373..65d50479d 100644
--- a/util/ttyio.c
+++ b/util/ttyio.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/util/w32reg.c b/util/w32reg.c
index f8e81b478..73732e032 100644
--- a/util/w32reg.c
+++ b/util/w32reg.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>