-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
NotDashEscaped: You need GnuPG to verify this message


This is a patch file to create version 1.0.4 from 1.0.3.

Please check the signature of this patch file:

    zcat somepath/gnupg-1.0.3-1.0.4.diff.gz | gpg --verify

Change to directory gnupg-1.0.3 (or however you renamed it)
and give this command:

     zcat somepath/gnupg-1.0.3-1.0.4.diff.gz | patch -p1

It is a good idea to rename your current directory to gnupg-1.0.4 now.



Prereq: 1.0.3

diff -urN gnupg-1.0.3/VERSION gnupg-1.0.4/VERSION
--- gnupg-1.0.3/VERSION	Mon Sep 18 12:15:03 2000
+++ gnupg-1.0.4/VERSION	Tue Oct 17 15:11:23 2000
@@ -1 +1 @@
-1.0.3
+1.0.4

diff -urN gnupg-1.0.3/AUTHORS gnupg-1.0.4/AUTHORS
--- gnupg-1.0.3/AUTHORS	Tue Aug  1 19:57:30 2000
+++ gnupg-1.0.4/AUTHORS	Wed Oct  4 16:15:49 2000
@@ -30,8 +30,8 @@
 Niklas Hernaeus <nh@df.lth.se> Disclaimer
     (weak key patches)
 
-Nils Ellmenreich  <nils@infosun.fmi.uni-passau.de> Assignment
-    (configure.in, cipher/rndlinux.c)
+Nils Ellmenreich  <nils 'at' infosun.fmi.uni-passau.de> Assignment
+    (configure.in, cipher/rndlinux.c, FAQ)
 
 Pedro Morais <morais@poli.org> Translations [pt_BR]
 
@@ -57,15 +57,15 @@
 Other legal information
 =======================
 
-Natural Resources Canada disclaims changes by Matthew Skala.
-
 This program uses the zlib compression library written by
 Jean-loup Gailly and Mark Adler.
 
 Most of the stuff in mpi has been taken from the GMP library by
 Torbjorn Granlund <tege@noisy.tmg.se>.
 
-The keybox implementation is based on GDBM 1.7.3 by Philip A. Nelson.
+The Rijndael implementation (cipher/rijndael.c) is based on the 
+public domain reference code provided for the AES selection process.
+The Rijndael algorithm is due to Joan Daemen and Vincent Rijmen. 
 
 The files cipher/rndunix.c and cipher/rndw32.c are based on rndunix.c
 and rndwin32.c from cryptlib.
@@ -76,4 +76,3 @@
 
 The RPM specs file scripts/gnupg.spec has been contributed by
 several people.
-
diff -urN gnupg-1.0.3/ChangeLog gnupg-1.0.4/ChangeLog
--- gnupg-1.0.3/ChangeLog	Thu Sep 14 14:20:39 2000
+++ gnupg-1.0.4/ChangeLog	Tue Oct 17 14:55:59 2000
@@ -1,3 +1,21 @@
+2000-10-17  Werner Koch  <wk@gnupg.org>
+
+	* configure.in: Disabled fopen64 checks for Solaris and HPUX.
+
+2000-10-13  Werner Koch  <wk@gnupg.org>
+
+	* configure.in: Append mpi/mpi-asm-defs.h to g10defs.h
+
+2000-10-09  Werner Koch  <wk@gnupg.org>
+
+	* acinclude.m4: Changed wording of the faqprog.pl warning.
+
+Wed Oct  4 15:50:18 CEST 2000  Werner Koch  <wk@openit.de>
+
+        * configure.in: Set DYNLINK_MOD_CFLAGS for Irix. It seems that Irix
+        needs the -shared flag.  In 1.1 we are going to use libtool, so this
+        module stuff will get redesigned anyway. Suggested by Jeff Long.
+
 Thu Sep 14 14:20:38 CEST 2000  Werner Koch  <wk@openit.de>
 
         * acinclude.m4 (GNUPG_CHECK_FAQPROG): New.
diff -urN gnupg-1.0.3/NEWS gnupg-1.0.4/NEWS
--- gnupg-1.0.3/NEWS	Mon Sep 18 12:17:34 2000
+++ gnupg-1.0.4/NEWS	Tue Oct 17 14:47:04 2000
@@ -1,3 +1,17 @@
+Noteworthy changes in version 1.0.4 (2000-10-17)
+------------------------------------------------
+
+    * Fixed a serious bug which could lead to false signature verification
+      results when more than one signature is fed to gpg.  This is the
+      primary reason for releasing this version.
+
+    * New utility gpgv which is a stripped down version of gpg to
+      be used to verify signatures against a list of trusted keys.
+
+    * Rijndael (AES) is now supported and listed with top preference.
+
+    * --with-colons now works with --print-md[s].
+
 Noteworthy changes in version 1.0.3 (2000-09-18)
 ------------------------------------------------
 
diff -urN gnupg-1.0.3/README gnupg-1.0.4/README
--- gnupg-1.0.3/README	Sat Dec  4 15:36:20 1999
+++ gnupg-1.0.4/README	Wed Oct  4 16:04:11 2000
@@ -1,4 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
 
 		    GnuPG - The GNU Privacy Guard
 		   -------------------------------
@@ -17,9 +16,8 @@
     See the file COPYING for copyright and warranty information.
 
     Because GnuPG does not use use any patented algorithm it cannot be
-    compatible with PGP2 versions.  PGP 2.x uses only IDEA (which is
-    patented worldwide) and RSA (which is patented in the United States
-    until Sep 20, 2000).
+    compatible with PGP2 versions.  PGP 2.x uses IDEA (which is patented
+    worldwide).
 
     The default algorithms are DSA and ElGamal.  ElGamal for signing
     is still available, but because of the larger size of such
@@ -141,12 +139,17 @@
 
 	http://www.gnupg.org/gph/
 
+    A list of frequently asked questions is available in GnuPG's
+    distibution in the file doc/FAQ and online as:
+
+	http://www.gnupg.org/faq.html
+
     A couple of HOWTO documents are available online; for a listing see:
 
 	http://www.gnupg.org/docs.html#howtos
 
     A man page with a description of all commands and options gets installed
-    along with the program.
+    along with the program. 
 
 
     Introduction
@@ -509,11 +512,3 @@
 
     Commercial grade support for GnuPG is available; please see
     the GNU service directory or search other resources.
-
------BEGIN PGP SIGNATURE-----
-
-iQB1AwUBOEkX0B0Z9MEMmFelAQE2aQL/bo8po/atFACnG7eZBodfV0ikE+PFynOf
-uzQjirp00hSFwP8jMmv+ccnlyZkHRwrhl/Xc8GCmmeATwtb1fuAWvCO51T1YIv3i
-+K8Y6ThnQxG6TS0A/DBcoxwKpT7jEEPG
-=WYfE
------END PGP SIGNATURE-----
diff -urN gnupg-1.0.3/THANKS gnupg-1.0.4/THANKS
--- gnupg-1.0.3/THANKS	Thu Sep 14 13:34:28 2000
+++ gnupg-1.0.4/THANKS	Mon Oct 16 16:11:19 2000
@@ -38,7 +38,7 @@
 Edmund GRIMLEY EVANS	   edmundo@rano.org
 Enzo Michelangeli	   em@MailAndNews.com
 Ernst Molitor		   ernst.molitor@uni-bonn.de
-Fabio Coatti		   cova@felix.unife.it
+Fabio Coatti		   cova@ferrara.linux.it
 Felix von Leitner	   leitner@amdiv.de
 Frank Donahoe		   fdonahoe@wilkes1.wilkes.edu
 Frank Heckenbach	   heckenb@mi.uni-erlangen.de
@@ -65,10 +65,12 @@
 James Troup		   james@nocrew.org
 Jean-loup Gailly	   gzip@prep.ai.mit.edu
 Jeff Long		   long@kestrel.cc.ukans.edu
+Jeffery Von Ronne          jronne@ics.uci.edu
 Jens Bachem		   bachem@rrz.uni-koeln.de
 Jeroen C. van Gelderen     jeroen@vangelderen.org
 J Horacio MG		   homega@ciberia.es
 J. Michael Ashley          jashley@acm.org
+Jim Small                  cavenewt@my-deja.com
 Joachim Backes		   backes@rhrk.uni-kl.de
 John A. Martin		   jam@jamux.com
 Johnny Teveßen		   j.tevessen@gmx.de
diff -urN gnupg-1.0.3/TODO gnupg-1.0.4/TODO
--- gnupg-1.0.3/TODO	Thu Sep 14 13:15:51 2000
+++ gnupg-1.0.4/TODO	Tue Oct 17 14:44:47 2000
@@ -1,4 +1,17 @@
 
+  * option to set the signature expiration time for key sigs.
+
+  * Option to warn when a non MDC message is decrypted?
+
+  * If there is no secure memory, allocate more memory for the secure
+    memory block or do it in all cases.
+
+  * for detached signatures:  Allow to specify a filedescriptor (maybe
+    we can use a generic way to specify filedescriptors - "-" is already
+    used to specify 0/1).
+
+  * List all UserID with GOODSIG?
+
   * add a way to set expiration time for key signatures.
 
   * add some minor things vor VMS.
diff -urN gnupg-1.0.3/acinclude.m4 gnupg-1.0.4/acinclude.m4
--- gnupg-1.0.3/acinclude.m4	Thu Sep 14 11:24:02 2000
+++ gnupg-1.0.4/acinclude.m4	Mon Oct  9 13:41:12 2000
@@ -63,10 +63,11 @@
     if test $working_faqprog = no; then
 	AC_MSG_WARN([[
 ***
-*** It seems that the faqprog.pl program is not installed.
-*** Unless you do not change the source of the FAQs it is not required.
-*** The working version of this utility should be available at:
-***   ftp://ftp.gnupg.org/pub/gcrypt/contrib/faqprog.pl
+*** It seems that the faqprog.pl program is not installed;
+*** however it is only needed if you want to change the FAQ.
+***  (faqprog.pl should be available at:
+***    ftp://ftp.gnupg.org/pub/gcrypt/contrib/faqprog.pl )
+*** No need to worry about this warning.
 ***]])
     fi
   ])       
diff -urN gnupg-1.0.3/aclocal.m4 gnupg-1.0.4/aclocal.m4
--- gnupg-1.0.3/aclocal.m4	Thu Sep 14 14:22:51 2000
+++ gnupg-1.0.4/aclocal.m4	Tue Oct 17 15:39:38 2000
@@ -75,10 +75,11 @@
     if test $working_faqprog = no; then
 	AC_MSG_WARN([[
 ***
-*** It seems that the faqprog.pl program is not installed.
-*** Unless you do not change the source of the FAQs it is not required.
-*** The working version of this utility should be available at:
-***   ftp://ftp.gnupg.org/pub/gcrypt/contrib/faqprog.pl
+*** It seems that the faqprog.pl program is not installed;
+*** however it is only needed if you want to change the FAQ.
+***  (faqprog.pl should be available at:
+***    ftp://ftp.gnupg.org/pub/gcrypt/contrib/faqprog.pl )
+*** No need to worry about this warning.
 ***]])
     fi
   ])       
diff -urN gnupg-1.0.3/cipher/ChangeLog gnupg-1.0.4/cipher/ChangeLog
--- gnupg-1.0.3/cipher/ChangeLog	Thu Sep 14 14:20:39 2000
+++ gnupg-1.0.4/cipher/ChangeLog	Thu Oct 12 12:18:37 2000
@@ -1,3 +1,13 @@
+2000-10-12  Werner Koch  <wk@gnupg.org>
+
+        * rijndael.c: New.
+        * cipher.c: Add Rijndael support.
+
+Wed Oct  4 15:50:18 CEST 2000  Werner Koch  <wk@openit.de>
+
+        * sha1.c (transform): Use rol() macro.  Actually this is not needed
+        for a newer gcc but there are still aoter compilers.
+
 Thu Sep 14 14:20:38 CEST 2000  Werner Koch  <wk@openit.de>
 
         * random.c (fast_random_poll): Check ENOSYS for getrusage.
diff -urN gnupg-1.0.3/cipher/Makefile.am gnupg-1.0.4/cipher/Makefile.am
--- gnupg-1.0.3/cipher/Makefile.am	Wed Sep  6 16:14:14 2000
+++ gnupg-1.0.4/cipher/Makefile.am	Thu Oct 12 12:27:08 2000
@@ -41,6 +41,7 @@
 		 blowfish.h	\
 		 cast5.c	\
 		 cast5.h	\
+		 rijndael.c     \
 		 elgamal.c	\
 		 elgamal.h	\
 		 rsa.c rsa.h    \
diff -urN gnupg-1.0.3/cipher/Makefile.in gnupg-1.0.4/cipher/Makefile.in
--- gnupg-1.0.3/cipher/Makefile.in	Mon Sep 18 12:17:55 2000
+++ gnupg-1.0.4/cipher/Makefile.in	Tue Oct 17 15:40:21 2000
@@ -126,7 +126,7 @@
 DYNLINK_MOD_CFLAGS = -DIS_MODULE @DYNLINK_MOD_CFLAGS@
 
 #libcipher_a_LDFLAGS =
-libcipher_a_SOURCES = cipher.c			 pubkey.c			 md.c				 dynload.c			 dynload.h			 bithelp.h			 des.c				 des.h				 twofish.c			 blowfish.c			 blowfish.h			 cast5.c			 cast5.h			 elgamal.c			 elgamal.h			 rsa.c rsa.h    		 primegen.c			 random.h			 random.c			 rand-internal.h 		 rmd.h				 dsa.h				 dsa.c				 g10c.c 			 smallprime.c			 construct.c
+libcipher_a_SOURCES = cipher.c			 pubkey.c			 md.c				 dynload.c			 dynload.h			 bithelp.h			 des.c				 des.h				 twofish.c			 blowfish.c			 blowfish.h			 cast5.c			 cast5.h			 rijndael.c     		 elgamal.c			 elgamal.h			 rsa.c rsa.h    		 primegen.c			 random.h			 random.c			 rand-internal.h 		 rmd.h				 dsa.h				 dsa.c				 g10c.c 			 smallprime.c			 construct.c
 
 
 # configure creates the constructor file
@@ -145,8 +145,8 @@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 libcipher_a_OBJECTS =  cipher.o pubkey.o md.o dynload.o des.o twofish.o \
-blowfish.o cast5.o elgamal.o rsa.o primegen.o random.o dsa.o g10c.o \
-smallprime.o construct.o
+blowfish.o cast5.o rijndael.o elgamal.o rsa.o primegen.o random.o dsa.o \
+g10c.o smallprime.o construct.o
 AR = ar
 PROGRAMS =  $(pkglib_PROGRAMS)
 
@@ -380,6 +380,9 @@
 	../include/types.h ../include/errors.h ../include/mpi.h \
 	../include/iobuf.h ../include/memory.h rmd.h ../include/ttyio.h \
 	../include/i18n.h random.h rand-internal.h dynload.h
+rijndael.o: rijndael.c ../config.h ../g10defs.h ../include/types.h \
+	../include/util.h ../include/errors.h ../include/mpi.h \
+	../include/iobuf.h ../include/memory.h dynload.h
 rmd160.o: rmd160.c ../config.h ../g10defs.h ../include/util.h \
 	../include/types.h ../include/errors.h ../include/mpi.h \
 	../include/iobuf.h ../include/memory.h rmd.h \
diff -urN gnupg-1.0.3/cipher/blowfish.h gnupg-1.0.4/cipher/blowfish.h
--- gnupg-1.0.3/cipher/blowfish.h	Wed Apr  7 20:58:23 1999
+++ gnupg-1.0.4/cipher/blowfish.h	Thu Oct 12 12:26:42 2000
@@ -41,4 +41,14 @@
 		   void (**decryptf)( void *c, byte *outbuf, byte *inbuf )
 		 );
 
+/* this is just a kludge for the time we have not yet chnaged the cipher
+ * stuff to the scheme we use for random and digests */
+const char *
+rijndael_get_info( int algo, size_t *keylen,
+		   size_t *blocksize, size_t *contextsize,
+		   int	(**setkeyf)( void *c, byte *key, unsigned keylen ),
+		   void (**encryptf)( void *c, byte *outbuf, byte *inbuf ),
+		   void (**decryptf)( void *c, byte *outbuf, byte *inbuf )
+		 );
+
 #endif /*G10_BLOWFISH_H*/
diff -urN gnupg-1.0.3/cipher/cipher.c gnupg-1.0.4/cipher/cipher.c
--- gnupg-1.0.3/cipher/cipher.c	Mon Aug 30 20:48:47 1999
+++ gnupg-1.0.4/cipher/cipher.c	Thu Oct 12 12:26:01 2000
@@ -34,7 +34,7 @@
 
 
 #define MAX_BLOCKSIZE 16
-#define TABLE_SIZE 10
+#define TABLE_SIZE 14
 
 struct cipher_table_s {
     const char *name;
@@ -84,6 +84,39 @@
     int i;
 
     i = 0;
+    cipher_table[i].algo = CIPHER_ALGO_RIJNDAEL;
+    cipher_table[i].name = rijndael_get_info( cipher_table[i].algo,
+					 &cipher_table[i].keylen,
+					 &cipher_table[i].blocksize,
+					 &cipher_table[i].contextsize,
+					 &cipher_table[i].setkey,
+					 &cipher_table[i].encrypt,
+					 &cipher_table[i].decrypt     );
+    if( !cipher_table[i].name )
+	BUG();
+    i++;
+    cipher_table[i].algo = CIPHER_ALGO_RIJNDAEL192;
+    cipher_table[i].name = rijndael_get_info( cipher_table[i].algo,
+					 &cipher_table[i].keylen,
+					 &cipher_table[i].blocksize,
+					 &cipher_table[i].contextsize,
+					 &cipher_table[i].setkey,
+					 &cipher_table[i].encrypt,
+					 &cipher_table[i].decrypt     );
+    if( !cipher_table[i].name )
+	BUG();
+    i++;
+    cipher_table[i].algo = CIPHER_ALGO_RIJNDAEL256;
+    cipher_table[i].name = rijndael_get_info( cipher_table[i].algo,
+					 &cipher_table[i].keylen,
+					 &cipher_table[i].blocksize,
+					 &cipher_table[i].contextsize,
+					 &cipher_table[i].setkey,
+					 &cipher_table[i].encrypt,
+					 &cipher_table[i].decrypt     );
+    if( !cipher_table[i].name )
+	BUG();
+    i++;
     cipher_table[i].algo = CIPHER_ALGO_TWOFISH;
     cipher_table[i].name = twofish_get_info( cipher_table[i].algo,
 					 &cipher_table[i].keylen,
diff -urN gnupg-1.0.3/cipher/rijndael.c gnupg-1.0.4/cipher/rijndael.c
--- gnupg-1.0.3/cipher/rijndael.c	Thu Jan  1 01:00:00 1970
+++ gnupg-1.0.4/cipher/rijndael.c	Thu Oct 12 16:33:57 2000
@@ -0,0 +1,2196 @@
+/* Rijndael (AES) for GnuPG
+ *	Copyright (C) 2000 Free Software Foundation, Inc.
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG 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.
+ *
+ * GnuPG 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
+ *******************************************************************
+ * The code here is based on the optimized implementation taken from
+ * http://www.esat.kuleuven.ac.be/~rijmen/rijndael/ on Oct 2, 2000,
+ * which carries this notice:
+ *------------------------------------------
+ * rijndael-alg-fst.c   v2.3   April '2000
+ *
+ * Optimised ANSI C code
+ *
+ * authors: v1.0: Antoon Bosselaers
+ *          v2.0: Vincent Rijmen
+ *          v2.3: Paulo Barreto
+ *
+ * This code is placed in the public domain.
+ *------------------------------------------
+ */
+
+#include <config.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h> /* for memcmp() */
+
+#include "types.h"  /* for byte and u32 typedefs */
+#include "util.h"
+#include "errors.h"
+#include "dynload.h"
+
+#define MAXKC			(256/32)
+#define MAXROUNDS		14
+
+
+static const char *selftest(void);
+
+typedef struct {
+    int   ROUNDS;                   /* key-length-dependent number of rounds */
+    int decryption_prepared;
+    byte  keySched[MAXROUNDS+1][4][4];	/* key schedule		*/
+    byte  keySched2[MAXROUNDS+1][4][4];	/* key schedule		*/
+} RIJNDAEL_context;
+
+
+static const byte S[256] = {
+    99, 124, 119, 123, 242, 107, 111, 197,
+    48,   1, 103,  43, 254, 215, 171, 118, 
+    202, 130, 201, 125, 250,  89,  71, 240,
+    173, 212, 162, 175, 156, 164, 114, 192, 
+    183, 253, 147,  38,  54,  63, 247, 204,
+    52, 165, 229, 241, 113, 216,  49,  21, 
+    4, 199,  35, 195,  24, 150,   5, 154,
+    7,  18, 128, 226, 235,  39, 178, 117, 
+    9, 131,  44,  26,  27, 110,  90, 160, 
+    82,  59, 214, 179,  41, 227,  47, 132, 
+    83, 209,   0, 237,  32, 252, 177,  91,
+    106, 203, 190,  57,  74,  76,  88, 207, 
+    208, 239, 170, 251,  67,  77,  51, 133,
+    69, 249,   2, 127,  80,  60, 159, 168, 
+    81, 163,  64, 143, 146, 157,  56, 245,
+    188, 182, 218,  33,  16, 255, 243, 210, 
+    205,  12,  19, 236,  95, 151,  68,  23,
+    196, 167, 126,  61, 100,  93,  25, 115, 
+    96, 129,  79, 220,  34,  42, 144, 136,
+    70, 238, 184,  20, 222,  94,  11, 219, 
+    224,  50,  58,  10,  73,   6,  36,  92,
+    194, 211, 172,  98, 145, 149, 228, 121, 
+    231, 200,  55, 109, 141, 213,  78, 169, 
+    108,  86, 244, 234, 101, 122, 174,   8, 
+    186, 120,  37,  46,  28, 166, 180, 198, 
+    232, 221, 116,  31,  75, 189, 139, 138, 
+    112,  62, 181, 102,  72,   3, 246,  14,
+    97,  53,  87, 185, 134, 193,  29, 158, 
+    225, 248, 152,  17, 105, 217, 142, 148,
+    155,  30, 135, 233, 206,  85,  40, 223, 
+    140, 161, 137,  13, 191, 230,  66, 104, 
+    65, 153,  45,  15, 176,  84, 187,  22
+};
+
+
+static const byte T1[256][4] = {
+    { 0xc6,0x63,0x63,0xa5 }, { 0xf8,0x7c,0x7c,0x84 },
+    { 0xee,0x77,0x77,0x99 }, { 0xf6,0x7b,0x7b,0x8d }, 
+    { 0xff,0xf2,0xf2,0x0d }, { 0xd6,0x6b,0x6b,0xbd },
+    { 0xde,0x6f,0x6f,0xb1 }, { 0x91,0xc5,0xc5,0x54 }, 
+    { 0x60,0x30,0x30,0x50 }, { 0x02,0x01,0x01,0x03 },
+    { 0xce,0x67,0x67,0xa9 }, { 0x56,0x2b,0x2b,0x7d }, 
+    { 0xe7,0xfe,0xfe,0x19 }, { 0xb5,0xd7,0xd7,0x62 },
+    { 0x4d,0xab,0xab,0xe6 }, { 0xec,0x76,0x76,0x9a }, 
+    { 0x8f,0xca,0xca,0x45 }, { 0x1f,0x82,0x82,0x9d },
+    { 0x89,0xc9,0xc9,0x40 }, { 0xfa,0x7d,0x7d,0x87 }, 
+    { 0xef,0xfa,0xfa,0x15 }, { 0xb2,0x59,0x59,0xeb }, 
+    { 0x8e,0x47,0x47,0xc9 }, { 0xfb,0xf0,0xf0,0x0b }, 
+    { 0x41,0xad,0xad,0xec }, { 0xb3,0xd4,0xd4,0x67 },
+    { 0x5f,0xa2,0xa2,0xfd }, { 0x45,0xaf,0xaf,0xea }, 
+    { 0x23,0x9c,0x9c,0xbf }, { 0x53,0xa4,0xa4,0xf7 },
+    { 0xe4,0x72,0x72,0x96 }, { 0x9b,0xc0,0xc0,0x5b }, 
+    { 0x75,0xb7,0xb7,0xc2 }, { 0xe1,0xfd,0xfd,0x1c },
+    { 0x3d,0x93,0x93,0xae }, { 0x4c,0x26,0x26,0x6a }, 
+    { 0x6c,0x36,0x36,0x5a }, { 0x7e,0x3f,0x3f,0x41 },
+    { 0xf5,0xf7,0xf7,0x02 }, { 0x83,0xcc,0xcc,0x4f }, 
+    { 0x68,0x34,0x34,0x5c }, { 0x51,0xa5,0xa5,0xf4 }, 
+    { 0xd1,0xe5,0xe5,0x34 }, { 0xf9,0xf1,0xf1,0x08 }, 
+    { 0xe2,0x71,0x71,0x93 }, { 0xab,0xd8,0xd8,0x73 },
+    { 0x62,0x31,0x31,0x53 }, { 0x2a,0x15,0x15,0x3f }, 
+    { 0x08,0x04,0x04,0x0c }, { 0x95,0xc7,0xc7,0x52 },
+    { 0x46,0x23,0x23,0x65 }, { 0x9d,0xc3,0xc3,0x5e }, 
+    { 0x30,0x18,0x18,0x28 }, { 0x37,0x96,0x96,0xa1 },
+    { 0x0a,0x05,0x05,0x0f }, { 0x2f,0x9a,0x9a,0xb5 }, 
+    { 0x0e,0x07,0x07,0x09 }, { 0x24,0x12,0x12,0x36 },
+    { 0x1b,0x80,0x80,0x9b }, { 0xdf,0xe2,0xe2,0x3d }, 
+    { 0xcd,0xeb,0xeb,0x26 }, { 0x4e,0x27,0x27,0x69 },
+    { 0x7f,0xb2,0xb2,0xcd }, { 0xea,0x75,0x75,0x9f }, 
+    { 0x12,0x09,0x09,0x1b }, { 0x1d,0x83,0x83,0x9e },
+    { 0x58,0x2c,0x2c,0x74 }, { 0x34,0x1a,0x1a,0x2e }, 
+    { 0x36,0x1b,0x1b,0x2d }, { 0xdc,0x6e,0x6e,0xb2 }, 
+    { 0xb4,0x5a,0x5a,0xee }, { 0x5b,0xa0,0xa0,0xfb }, 
+    { 0xa4,0x52,0x52,0xf6 }, { 0x76,0x3b,0x3b,0x4d },
+    { 0xb7,0xd6,0xd6,0x61 }, { 0x7d,0xb3,0xb3,0xce }, 
+    { 0x52,0x29,0x29,0x7b }, { 0xdd,0xe3,0xe3,0x3e }, 
+    { 0x5e,0x2f,0x2f,0x71 }, { 0x13,0x84,0x84,0x97 }, 
+    { 0xa6,0x53,0x53,0xf5 }, { 0xb9,0xd1,0xd1,0x68 }, 
+    { 0x00,0x00,0x00,0x00 }, { 0xc1,0xed,0xed,0x2c }, 
+    { 0x40,0x20,0x20,0x60 }, { 0xe3,0xfc,0xfc,0x1f },
+    { 0x79,0xb1,0xb1,0xc8 }, { 0xb6,0x5b,0x5b,0xed }, 
+    { 0xd4,0x6a,0x6a,0xbe }, { 0x8d,0xcb,0xcb,0x46 },
+    { 0x67,0xbe,0xbe,0xd9 }, { 0x72,0x39,0x39,0x4b }, 
+    { 0x94,0x4a,0x4a,0xde }, { 0x98,0x4c,0x4c,0xd4 },
+    { 0xb0,0x58,0x58,0xe8 }, { 0x85,0xcf,0xcf,0x4a }, 
+    { 0xbb,0xd0,0xd0,0x6b }, { 0xc5,0xef,0xef,0x2a },
+    { 0x4f,0xaa,0xaa,0xe5 }, { 0xed,0xfb,0xfb,0x16 }, 
+    { 0x86,0x43,0x43,0xc5 }, { 0x9a,0x4d,0x4d,0xd7 },
+    { 0x66,0x33,0x33,0x55 }, { 0x11,0x85,0x85,0x94 }, 
+    { 0x8a,0x45,0x45,0xcf }, { 0xe9,0xf9,0xf9,0x10 },
+    { 0x04,0x02,0x02,0x06 }, { 0xfe,0x7f,0x7f,0x81 }, 
+    { 0xa0,0x50,0x50,0xf0 }, { 0x78,0x3c,0x3c,0x44 },
+    { 0x25,0x9f,0x9f,0xba }, { 0x4b,0xa8,0xa8,0xe3 }, 
+    { 0xa2,0x51,0x51,0xf3 }, { 0x5d,0xa3,0xa3,0xfe },
+    { 0x80,0x40,0x40,0xc0 }, { 0x05,0x8f,0x8f,0x8a }, 
+    { 0x3f,0x92,0x92,0xad }, { 0x21,0x9d,0x9d,0xbc },
+    { 0x70,0x38,0x38,0x48 }, { 0xf1,0xf5,0xf5,0x04 }, 
+    { 0x63,0xbc,0xbc,0xdf }, { 0x77,0xb6,0xb6,0xc1 },
+    { 0xaf,0xda,0xda,0x75 }, { 0x42,0x21,0x21,0x63 }, 
+    { 0x20,0x10,0x10,0x30 }, { 0xe5,0xff,0xff,0x1a },
+    { 0xfd,0xf3,0xf3,0x0e }, { 0xbf,0xd2,0xd2,0x6d }, 
+    { 0x81,0xcd,0xcd,0x4c }, { 0x18,0x0c,0x0c,0x14 },
+    { 0x26,0x13,0x13,0x35 }, { 0xc3,0xec,0xec,0x2f }, 
+    { 0xbe,0x5f,0x5f,0xe1 }, { 0x35,0x97,0x97,0xa2 },
+    { 0x88,0x44,0x44,0xcc }, { 0x2e,0x17,0x17,0x39 }, 
+    { 0x93,0xc4,0xc4,0x57 }, { 0x55,0xa7,0xa7,0xf2 },
+    { 0xfc,0x7e,0x7e,0x82 }, { 0x7a,0x3d,0x3d,0x47 }, 
+    { 0xc8,0x64,0x64,0xac }, { 0xba,0x5d,0x5d,0xe7 },
+    { 0x32,0x19,0x19,0x2b }, { 0xe6,0x73,0x73,0x95 }, 
+    { 0xc0,0x60,0x60,0xa0 }, { 0x19,0x81,0x81,0x98 },
+    { 0x9e,0x4f,0x4f,0xd1 }, { 0xa3,0xdc,0xdc,0x7f }, 
+    { 0x44,0x22,0x22,0x66 }, { 0x54,0x2a,0x2a,0x7e },
+    { 0x3b,0x90,0x90,0xab }, { 0x0b,0x88,0x88,0x83 }, 
+    { 0x8c,0x46,0x46,0xca }, { 0xc7,0xee,0xee,0x29 },
+    { 0x6b,0xb8,0xb8,0xd3 }, { 0x28,0x14,0x14,0x3c }, 
+    { 0xa7,0xde,0xde,0x79 }, { 0xbc,0x5e,0x5e,0xe2 },
+    { 0x16,0x0b,0x0b,0x1d }, { 0xad,0xdb,0xdb,0x76 }, 
+    { 0xdb,0xe0,0xe0,0x3b }, { 0x64,0x32,0x32,0x56 },
+    { 0x74,0x3a,0x3a,0x4e }, { 0x14,0x0a,0x0a,0x1e }, 
+    { 0x92,0x49,0x49,0xdb }, { 0x0c,0x06,0x06,0x0a },
+    { 0x48,0x24,0x24,0x6c }, { 0xb8,0x5c,0x5c,0xe4 }, 
+    { 0x9f,0xc2,0xc2,0x5d }, { 0xbd,0xd3,0xd3,0x6e },
+    { 0x43,0xac,0xac,0xef }, { 0xc4,0x62,0x62,0xa6 }, 
+    { 0x39,0x91,0x91,0xa8 }, { 0x31,0x95,0x95,0xa4 },
+    { 0xd3,0xe4,0xe4,0x37 }, { 0xf2,0x79,0x79,0x8b }, 
+    { 0xd5,0xe7,0xe7,0x32 }, { 0x8b,0xc8,0xc8,0x43 },
+    { 0x6e,0x37,0x37,0x59 }, { 0xda,0x6d,0x6d,0xb7 }, 
+    { 0x01,0x8d,0x8d,0x8c }, { 0xb1,0xd5,0xd5,0x64 },
+    { 0x9c,0x4e,0x4e,0xd2 }, { 0x49,0xa9,0xa9,0xe0 }, 
+    { 0xd8,0x6c,0x6c,0xb4 }, { 0xac,0x56,0x56,0xfa },
+    { 0xf3,0xf4,0xf4,0x07 }, { 0xcf,0xea,0xea,0x25 }, 
+    { 0xca,0x65,0x65,0xaf }, { 0xf4,0x7a,0x7a,0x8e },
+    { 0x47,0xae,0xae,0xe9 }, { 0x10,0x08,0x08,0x18 }, 
+    { 0x6f,0xba,0xba,0xd5 }, { 0xf0,0x78,0x78,0x88 },
+    { 0x4a,0x25,0x25,0x6f }, { 0x5c,0x2e,0x2e,0x72 }, 
+    { 0x38,0x1c,0x1c,0x24 }, { 0x57,0xa6,0xa6,0xf1 },
+    { 0x73,0xb4,0xb4,0xc7 }, { 0x97,0xc6,0xc6,0x51 }, 
+    { 0xcb,0xe8,0xe8,0x23 }, { 0xa1,0xdd,0xdd,0x7c },
+    { 0xe8,0x74,0x74,0x9c }, { 0x3e,0x1f,0x1f,0x21 }, 
+    { 0x96,0x4b,0x4b,0xdd }, { 0x61,0xbd,0xbd,0xdc }, 
+    { 0x0d,0x8b,0x8b,0x86 }, { 0x0f,0x8a,0x8a,0x85 }, 
+    { 0xe0,0x70,0x70,0x90 }, { 0x7c,0x3e,0x3e,0x42 },
+    { 0x71,0xb5,0xb5,0xc4 }, { 0xcc,0x66,0x66,0xaa }, 
+    { 0x90,0x48,0x48,0xd8 }, { 0x06,0x03,0x03,0x05 },
+    { 0xf7,0xf6,0xf6,0x01 }, { 0x1c,0x0e,0x0e,0x12 }, 
+    { 0xc2,0x61,0x61,0xa3 }, { 0x6a,0x35,0x35,0x5f },
+    { 0xae,0x57,0x57,0xf9 }, { 0x69,0xb9,0xb9,0xd0 }, 
+    { 0x17,0x86,0x86,0x91 }, { 0x99,0xc1,0xc1,0x58 },
+    { 0x3a,0x1d,0x1d,0x27 }, { 0x27,0x9e,0x9e,0xb9 }, 
+    { 0xd9,0xe1,0xe1,0x38 }, { 0xeb,0xf8,0xf8,0x13 },
+    { 0x2b,0x98,0x98,0xb3 }, { 0x22,0x11,0x11,0x33 }, 
+    { 0xd2,0x69,0x69,0xbb }, { 0xa9,0xd9,0xd9,0x70 },
+    { 0x07,0x8e,0x8e,0x89 }, { 0x33,0x94,0x94,0xa7 }, 
+    { 0x2d,0x9b,0x9b,0xb6 }, { 0x3c,0x1e,0x1e,0x22 },
+    { 0x15,0x87,0x87,0x92 }, { 0xc9,0xe9,0xe9,0x20 }, 
+    { 0x87,0xce,0xce,0x49 }, { 0xaa,0x55,0x55,0xff },
+    { 0x50,0x28,0x28,0x78 }, { 0xa5,0xdf,0xdf,0x7a }, 
+    { 0x03,0x8c,0x8c,0x8f }, { 0x59,0xa1,0xa1,0xf8 },
+    { 0x09,0x89,0x89,0x80 }, { 0x1a,0x0d,0x0d,0x17 }, 
+    { 0x65,0xbf,0xbf,0xda }, { 0xd7,0xe6,0xe6,0x31 },
+    { 0x84,0x42,0x42,0xc6 }, { 0xd0,0x68,0x68,0xb8 }, 
+    { 0x82,0x41,0x41,0xc3 }, { 0x29,0x99,0x99,0xb0 },
+    { 0x5a,0x2d,0x2d,0x77 }, { 0x1e,0x0f,0x0f,0x11 }, 
+    { 0x7b,0xb0,0xb0,0xcb }, { 0xa8,0x54,0x54,0xfc },
+    { 0x6d,0xbb,0xbb,0xd6 }, { 0x2c,0x16,0x16,0x3a }
+};
+
+static const byte T2[256][4] = {
+    { 0xa5,0xc6,0x63,0x63 }, { 0x84,0xf8,0x7c,0x7c },
+    { 0x99,0xee,0x77,0x77 }, { 0x8d,0xf6,0x7b,0x7b }, 
+    { 0x0d,0xff,0xf2,0xf2 }, { 0xbd,0xd6,0x6b,0x6b },
+    { 0xb1,0xde,0x6f,0x6f }, { 0x54,0x91,0xc5,0xc5 }, 
+    { 0x50,0x60,0x30,0x30 }, { 0x03,0x02,0x01,0x01 },
+    { 0xa9,0xce,0x67,0x67 }, { 0x7d,0x56,0x2b,0x2b }, 
+    { 0x19,0xe7,0xfe,0xfe }, { 0x62,0xb5,0xd7,0xd7 }, 
+    { 0xe6,0x4d,0xab,0xab }, { 0x9a,0xec,0x76,0x76 }, 
+    { 0x45,0x8f,0xca,0xca }, { 0x9d,0x1f,0x82,0x82 }, 
+    { 0x40,0x89,0xc9,0xc9 }, { 0x87,0xfa,0x7d,0x7d }, 
+    { 0x15,0xef,0xfa,0xfa }, { 0xeb,0xb2,0x59,0x59 }, 
+    { 0xc9,0x8e,0x47,0x47 }, { 0x0b,0xfb,0xf0,0xf0 }, 
+    { 0xec,0x41,0xad,0xad }, { 0x67,0xb3,0xd4,0xd4 }, 
+    { 0xfd,0x5f,0xa2,0xa2 }, { 0xea,0x45,0xaf,0xaf }, 
+    { 0xbf,0x23,0x9c,0x9c }, { 0xf7,0x53,0xa4,0xa4 }, 
+    { 0x96,0xe4,0x72,0x72 }, { 0x5b,0x9b,0xc0,0xc0 }, 
+    { 0xc2,0x75,0xb7,0xb7 }, { 0x1c,0xe1,0xfd,0xfd }, 
+    { 0xae,0x3d,0x93,0x93 }, { 0x6a,0x4c,0x26,0x26 }, 
+    { 0x5a,0x6c,0x36,0x36 }, { 0x41,0x7e,0x3f,0x3f },
+    { 0x02,0xf5,0xf7,0xf7 }, { 0x4f,0x83,0xcc,0xcc }, 
+    { 0x5c,0x68,0x34,0x34 }, { 0xf4,0x51,0xa5,0xa5 },
+    { 0x34,0xd1,0xe5,0xe5 }, { 0x08,0xf9,0xf1,0xf1 }, 
+    { 0x93,0xe2,0x71,0x71 }, { 0x73,0xab,0xd8,0xd8 },
+    { 0x53,0x62,0x31,0x31 }, { 0x3f,0x2a,0x15,0x15 }, 
+    { 0x0c,0x08,0x04,0x04 }, { 0x52,0x95,0xc7,0xc7 }, 
+    { 0x65,0x46,0x23,0x23 }, { 0x5e,0x9d,0xc3,0xc3 }, 
+    { 0x28,0x30,0x18,0x18 }, { 0xa1,0x37,0x96,0x96 }, 
+    { 0x0f,0x0a,0x05,0x05 }, { 0xb5,0x2f,0x9a,0x9a }, 
+    { 0x09,0x0e,0x07,0x07 }, { 0x36,0x24,0x12,0x12 },
+    { 0x9b,0x1b,0x80,0x80 }, { 0x3d,0xdf,0xe2,0xe2 }, 
+    { 0x26,0xcd,0xeb,0xeb }, { 0x69,0x4e,0x27,0x27 }, 
+    { 0xcd,0x7f,0xb2,0xb2 }, { 0x9f,0xea,0x75,0x75 }, 
+    { 0x1b,0x12,0x09,0x09 }, { 0x9e,0x1d,0x83,0x83 },
+    { 0x74,0x58,0x2c,0x2c }, { 0x2e,0x34,0x1a,0x1a }, 
+    { 0x2d,0x36,0x1b,0x1b }, { 0xb2,0xdc,0x6e,0x6e },
+    { 0xee,0xb4,0x5a,0x5a }, { 0xfb,0x5b,0xa0,0xa0 }, 
+    { 0xf6,0xa4,0x52,0x52 }, { 0x4d,0x76,0x3b,0x3b },
+    { 0x61,0xb7,0xd6,0xd6 }, { 0xce,0x7d,0xb3,0xb3 }, 
+    { 0x7b,0x52,0x29,0x29 }, { 0x3e,0xdd,0xe3,0xe3 }, 
+    { 0x71,0x5e,0x2f,0x2f }, { 0x97,0x13,0x84,0x84 }, 
+    { 0xf5,0xa6,0x53,0x53 }, { 0x68,0xb9,0xd1,0xd1 }, 
+    { 0x00,0x00,0x00,0x00 }, { 0x2c,0xc1,0xed,0xed }, 
+    { 0x60,0x40,0x20,0x20 }, { 0x1f,0xe3,0xfc,0xfc }, 
+    { 0xc8,0x79,0xb1,0xb1 }, { 0xed,0xb6,0x5b,0x5b }, 
+    { 0xbe,0xd4,0x6a,0x6a }, { 0x46,0x8d,0xcb,0xcb }, 
+    { 0xd9,0x67,0xbe,0xbe }, { 0x4b,0x72,0x39,0x39 }, 
+    { 0xde,0x94,0x4a,0x4a }, { 0xd4,0x98,0x4c,0x4c }, 
+    { 0xe8,0xb0,0x58,0x58 }, { 0x4a,0x85,0xcf,0xcf }, 
+    { 0x6b,0xbb,0xd0,0xd0 }, { 0x2a,0xc5,0xef,0xef },
+    { 0xe5,0x4f,0xaa,0xaa }, { 0x16,0xed,0xfb,0xfb }, 
+    { 0xc5,0x86,0x43,0x43 }, { 0xd7,0x9a,0x4d,0x4d }, 
+    { 0x55,0x66,0x33,0x33 }, { 0x94,0x11,0x85,0x85 }, 
+    { 0xcf,0x8a,0x45,0x45 }, { 0x10,0xe9,0xf9,0xf9 }, 
+    { 0x06,0x04,0x02,0x02 }, { 0x81,0xfe,0x7f,0x7f }, 
+    { 0xf0,0xa0,0x50,0x50 }, { 0x44,0x78,0x3c,0x3c },
+    { 0xba,0x25,0x9f,0x9f }, { 0xe3,0x4b,0xa8,0xa8 }, 
+    { 0xf3,0xa2,0x51,0x51 }, { 0xfe,0x5d,0xa3,0xa3 },
+    { 0xc0,0x80,0x40,0x40 }, { 0x8a,0x05,0x8f,0x8f }, 
+    { 0xad,0x3f,0x92,0x92 }, { 0xbc,0x21,0x9d,0x9d },
+    { 0x48,0x70,0x38,0x38 }, { 0x04,0xf1,0xf5,0xf5 }, 
+    { 0xdf,0x63,0xbc,0xbc }, { 0xc1,0x77,0xb6,0xb6 },
+    { 0x75,0xaf,0xda,0xda }, { 0x63,0x42,0x21,0x21 }, 
+    { 0x30,0x20,0x10,0x10 }, { 0x1a,0xe5,0xff,0xff },
+    { 0x0e,0xfd,0xf3,0xf3 }, { 0x6d,0xbf,0xd2,0xd2 }, 
+    { 0x4c,0x81,0xcd,0xcd }, { 0x14,0x18,0x0c,0x0c },
+    { 0x35,0x26,0x13,0x13 }, { 0x2f,0xc3,0xec,0xec }, 
+    { 0xe1,0xbe,0x5f,0x5f }, { 0xa2,0x35,0x97,0x97 },
+    { 0xcc,0x88,0x44,0x44 }, { 0x39,0x2e,0x17,0x17 }, 
+    { 0x57,0x93,0xc4,0xc4 }, { 0xf2,0x55,0xa7,0xa7 },
+    { 0x82,0xfc,0x7e,0x7e }, { 0x47,0x7a,0x3d,0x3d }, 
+    { 0xac,0xc8,0x64,0x64 }, { 0xe7,0xba,0x5d,0x5d },
+    { 0x2b,0x32,0x19,0x19 }, { 0x95,0xe6,0x73,0x73 }, 
+    { 0xa0,0xc0,0x60,0x60 }, { 0x98,0x19,0x81,0x81 }, 
+    { 0xd1,0x9e,0x4f,0x4f }, { 0x7f,0xa3,0xdc,0xdc }, 
+    { 0x66,0x44,0x22,0x22 }, { 0x7e,0x54,0x2a,0x2a }, 
+    { 0xab,0x3b,0x90,0x90 }, { 0x83,0x0b,0x88,0x88 }, 
+    { 0xca,0x8c,0x46,0x46 }, { 0x29,0xc7,0xee,0xee },
+    { 0xd3,0x6b,0xb8,0xb8 }, { 0x3c,0x28,0x14,0x14 }, 
+    { 0x79,0xa7,0xde,0xde }, { 0xe2,0xbc,0x5e,0x5e },
+    { 0x1d,0x16,0x0b,0x0b }, { 0x76,0xad,0xdb,0xdb }, 
+    { 0x3b,0xdb,0xe0,0xe0 }, { 0x56,0x64,0x32,0x32 },
+    { 0x4e,0x74,0x3a,0x3a }, { 0x1e,0x14,0x0a,0x0a }, 
+    { 0xdb,0x92,0x49,0x49 }, { 0x0a,0x0c,0x06,0x06 },
+    { 0x6c,0x48,0x24,0x24 }, { 0xe4,0xb8,0x5c,0x5c }, 
+    { 0x5d,0x9f,0xc2,0xc2 }, { 0x6e,0xbd,0xd3,0xd3 }, 
+    { 0xef,0x43,0xac,0xac }, { 0xa6,0xc4,0x62,0x62 }, 
+    { 0xa8,0x39,0x91,0x91 }, { 0xa4,0x31,0x95,0x95 },
+    { 0x37,0xd3,0xe4,0xe4 }, { 0x8b,0xf2,0x79,0x79 }, 
+    { 0x32,0xd5,0xe7,0xe7 }, { 0x43,0x8b,0xc8,0xc8 },
+    { 0x59,0x6e,0x37,0x37 }, { 0xb7,0xda,0x6d,0x6d }, 
+    { 0x8c,0x01,0x8d,0x8d }, { 0x64,0xb1,0xd5,0xd5 },
+    { 0xd2,0x9c,0x4e,0x4e }, { 0xe0,0x49,0xa9,0xa9 }, 
+    { 0xb4,0xd8,0x6c,0x6c }, { 0xfa,0xac,0x56,0x56 },
+    { 0x07,0xf3,0xf4,0xf4 }, { 0x25,0xcf,0xea,0xea }, 
+    { 0xaf,0xca,0x65,0x65 }, { 0x8e,0xf4,0x7a,0x7a },
+    { 0xe9,0x47,0xae,0xae }, { 0x18,0x10,0x08,0x08 }, 
+    { 0xd5,0x6f,0xba,0xba }, { 0x88,0xf0,0x78,0x78 }, 
+    { 0x6f,0x4a,0x25,0x25 }, { 0x72,0x5c,0x2e,0x2e }, 
+    { 0x24,0x38,0x1c,0x1c }, { 0xf1,0x57,0xa6,0xa6 }, 
+    { 0xc7,0x73,0xb4,0xb4 }, { 0x51,0x97,0xc6,0xc6 }, 
+    { 0x23,0xcb,0xe8,0xe8 }, { 0x7c,0xa1,0xdd,0xdd },
+    { 0x9c,0xe8,0x74,0x74 }, { 0x21,0x3e,0x1f,0x1f }, 
+    { 0xdd,0x96,0x4b,0x4b }, { 0xdc,0x61,0xbd,0xbd },
+    { 0x86,0x0d,0x8b,0x8b }, { 0x85,0x0f,0x8a,0x8a }, 
+    { 0x90,0xe0,0x70,0x70 }, { 0x42,0x7c,0x3e,0x3e }, 
+    { 0xc4,0x71,0xb5,0xb5 }, { 0xaa,0xcc,0x66,0x66 }, 
+    { 0xd8,0x90,0x48,0x48 }, { 0x05,0x06,0x03,0x03 },
+    { 0x01,0xf7,0xf6,0xf6 }, { 0x12,0x1c,0x0e,0x0e }, 
+    { 0xa3,0xc2,0x61,0x61 }, { 0x5f,0x6a,0x35,0x35 },
+    { 0xf9,0xae,0x57,0x57 }, { 0xd0,0x69,0xb9,0xb9 }, 
+    { 0x91,0x17,0x86,0x86 }, { 0x58,0x99,0xc1,0xc1 }, 
+    { 0x27,0x3a,0x1d,0x1d }, { 0xb9,0x27,0x9e,0x9e }, 
+    { 0x38,0xd9,0xe1,0xe1 }, { 0x13,0xeb,0xf8,0xf8 },
+    { 0xb3,0x2b,0x98,0x98 }, { 0x33,0x22,0x11,0x11 }, 
+    { 0xbb,0xd2,0x69,0x69 }, { 0x70,0xa9,0xd9,0xd9 },
+    { 0x89,0x07,0x8e,0x8e }, { 0xa7,0x33,0x94,0x94 }, 
+    { 0xb6,0x2d,0x9b,0x9b }, { 0x22,0x3c,0x1e,0x1e },
+    { 0x92,0x15,0x87,0x87 }, { 0x20,0xc9,0xe9,0xe9 }, 
+    { 0x49,0x87,0xce,0xce }, { 0xff,0xaa,0x55,0x55 },
+    { 0x78,0x50,0x28,0x28 }, { 0x7a,0xa5,0xdf,0xdf }, 
+    { 0x8f,0x03,0x8c,0x8c }, { 0xf8,0x59,0xa1,0xa1 }, 
+    { 0x80,0x09,0x89,0x89 }, { 0x17,0x1a,0x0d,0x0d }, 
+    { 0xda,0x65,0xbf,0xbf }, { 0x31,0xd7,0xe6,0xe6 },
+    { 0xc6,0x84,0x42,0x42 }, { 0xb8,0xd0,0x68,0x68 }, 
+    { 0xc3,0x82,0x41,0x41 }, { 0xb0,0x29,0x99,0x99 }, 
+    { 0x77,0x5a,0x2d,0x2d }, { 0x11,0x1e,0x0f,0x0f }, 
+    { 0xcb,0x7b,0xb0,0xb0 }, { 0xfc,0xa8,0x54,0x54 }, 
+    { 0xd6,0x6d,0xbb,0xbb }, { 0x3a,0x2c,0x16,0x16 }
+};
+
+static const byte T3[256][4] = {
+    { 0x63,0xa5,0xc6,0x63 }, { 0x7c,0x84,0xf8,0x7c },
+    { 0x77,0x99,0xee,0x77 }, { 0x7b,0x8d,0xf6,0x7b }, 
+    { 0xf2,0x0d,0xff,0xf2 }, { 0x6b,0xbd,0xd6,0x6b },
+    { 0x6f,0xb1,0xde,0x6f }, { 0xc5,0x54,0x91,0xc5 }, 
+    { 0x30,0x50,0x60,0x30 }, { 0x01,0x03,0x02,0x01 },
+    { 0x67,0xa9,0xce,0x67 }, { 0x2b,0x7d,0x56,0x2b }, 
+    { 0xfe,0x19,0xe7,0xfe }, { 0xd7,0x62,0xb5,0xd7 }, 
+    { 0xab,0xe6,0x4d,0xab }, { 0x76,0x9a,0xec,0x76 }, 
+    { 0xca,0x45,0x8f,0xca }, { 0x82,0x9d,0x1f,0x82 },
+    { 0xc9,0x40,0x89,0xc9 }, { 0x7d,0x87,0xfa,0x7d }, 
+    { 0xfa,0x15,0xef,0xfa }, { 0x59,0xeb,0xb2,0x59 }, 
+    { 0x47,0xc9,0x8e,0x47 }, { 0xf0,0x0b,0xfb,0xf0 }, 
+    { 0xad,0xec,0x41,0xad }, { 0xd4,0x67,0xb3,0xd4 }, 
+    { 0xa2,0xfd,0x5f,0xa2 }, { 0xaf,0xea,0x45,0xaf }, 
+    { 0x9c,0xbf,0x23,0x9c }, { 0xa4,0xf7,0x53,0xa4 },
+    { 0x72,0x96,0xe4,0x72 }, { 0xc0,0x5b,0x9b,0xc0 }, 
+    { 0xb7,0xc2,0x75,0xb7 }, { 0xfd,0x1c,0xe1,0xfd }, 
+    { 0x93,0xae,0x3d,0x93 }, { 0x26,0x6a,0x4c,0x26 }, 
+    { 0x36,0x5a,0x6c,0x36 }, { 0x3f,0x41,0x7e,0x3f },
+    { 0xf7,0x02,0xf5,0xf7 }, { 0xcc,0x4f,0x83,0xcc }, 
+    { 0x34,0x5c,0x68,0x34 }, { 0xa5,0xf4,0x51,0xa5 },
+    { 0xe5,0x34,0xd1,0xe5 }, { 0xf1,0x08,0xf9,0xf1 }, 
+    { 0x71,0x93,0xe2,0x71 }, { 0xd8,0x73,0xab,0xd8 },
+    { 0x31,0x53,0x62,0x31 }, { 0x15,0x3f,0x2a,0x15 }, 
+    { 0x04,0x0c,0x08,0x04 }, { 0xc7,0x52,0x95,0xc7 }, 
+    { 0x23,0x65,0x46,0x23 }, { 0xc3,0x5e,0x9d,0xc3 }, 
+    { 0x18,0x28,0x30,0x18 }, { 0x96,0xa1,0x37,0x96 },
+    { 0x05,0x0f,0x0a,0x05 }, { 0x9a,0xb5,0x2f,0x9a }, 
+    { 0x07,0x09,0x0e,0x07 }, { 0x12,0x36,0x24,0x12 }, 
+    { 0x80,0x9b,0x1b,0x80 }, { 0xe2,0x3d,0xdf,0xe2 }, 
+    { 0xeb,0x26,0xcd,0xeb }, { 0x27,0x69,0x4e,0x27 },
+    { 0xb2,0xcd,0x7f,0xb2 }, { 0x75,0x9f,0xea,0x75 }, 
+    { 0x09,0x1b,0x12,0x09 }, { 0x83,0x9e,0x1d,0x83 },
+    { 0x2c,0x74,0x58,0x2c }, { 0x1a,0x2e,0x34,0x1a }, 
+    { 0x1b,0x2d,0x36,0x1b }, { 0x6e,0xb2,0xdc,0x6e },
+    { 0x5a,0xee,0xb4,0x5a }, { 0xa0,0xfb,0x5b,0xa0 }, 
+    { 0x52,0xf6,0xa4,0x52 }, { 0x3b,0x4d,0x76,0x3b },
+    { 0xd6,0x61,0xb7,0xd6 }, { 0xb3,0xce,0x7d,0xb3 }, 
+    { 0x29,0x7b,0x52,0x29 }, { 0xe3,0x3e,0xdd,0xe3 }, 
+    { 0x2f,0x71,0x5e,0x2f }, { 0x84,0x97,0x13,0x84 }, 
+    { 0x53,0xf5,0xa6,0x53 }, { 0xd1,0x68,0xb9,0xd1 },
+    { 0x00,0x00,0x00,0x00 }, { 0xed,0x2c,0xc1,0xed }, 
+    { 0x20,0x60,0x40,0x20 }, { 0xfc,0x1f,0xe3,0xfc },
+    { 0xb1,0xc8,0x79,0xb1 }, { 0x5b,0xed,0xb6,0x5b }, 
+    { 0x6a,0xbe,0xd4,0x6a }, { 0xcb,0x46,0x8d,0xcb },
+    { 0xbe,0xd9,0x67,0xbe }, { 0x39,0x4b,0x72,0x39 }, 
+    { 0x4a,0xde,0x94,0x4a }, { 0x4c,0xd4,0x98,0x4c },
+    { 0x58,0xe8,0xb0,0x58 }, { 0xcf,0x4a,0x85,0xcf }, 
+    { 0xd0,0x6b,0xbb,0xd0 }, { 0xef,0x2a,0xc5,0xef },
+    { 0xaa,0xe5,0x4f,0xaa }, { 0xfb,0x16,0xed,0xfb }, 
+    { 0x43,0xc5,0x86,0x43 }, { 0x4d,0xd7,0x9a,0x4d },
+    { 0x33,0x55,0x66,0x33 }, { 0x85,0x94,0x11,0x85 }, 
+    { 0x45,0xcf,0x8a,0x45 }, { 0xf9,0x10,0xe9,0xf9 },
+    { 0x02,0x06,0x04,0x02 }, { 0x7f,0x81,0xfe,0x7f }, 
+    { 0x50,0xf0,0xa0,0x50 }, { 0x3c,0x44,0x78,0x3c },
+    { 0x9f,0xba,0x25,0x9f }, { 0xa8,0xe3,0x4b,0xa8 }, 
+    { 0x51,0xf3,0xa2,0x51 }, { 0xa3,0xfe,0x5d,0xa3 },
+    { 0x40,0xc0,0x80,0x40 }, { 0x8f,0x8a,0x05,0x8f }, 
+    { 0x92,0xad,0x3f,0x92 }, { 0x9d,0xbc,0x21,0x9d },
+    { 0x38,0x48,0x70,0x38 }, { 0xf5,0x04,0xf1,0xf5 }, 
+    { 0xbc,0xdf,0x63,0xbc }, { 0xb6,0xc1,0x77,0xb6 },
+    { 0xda,0x75,0xaf,0xda }, { 0x21,0x63,0x42,0x21 }, 
+    { 0x10,0x30,0x20,0x10 }, { 0xff,0x1a,0xe5,0xff },
+    { 0xf3,0x0e,0xfd,0xf3 }, { 0xd2,0x6d,0xbf,0xd2 }, 
+    { 0xcd,0x4c,0x81,0xcd }, { 0x0c,0x14,0x18,0x0c }, 
+    { 0x13,0x35,0x26,0x13 }, { 0xec,0x2f,0xc3,0xec }, 
+    { 0x5f,0xe1,0xbe,0x5f }, { 0x97,0xa2,0x35,0x97 },
+    { 0x44,0xcc,0x88,0x44 }, { 0x17,0x39,0x2e,0x17 }, 
+    { 0xc4,0x57,0x93,0xc4 }, { 0xa7,0xf2,0x55,0xa7 },
+    { 0x7e,0x82,0xfc,0x7e }, { 0x3d,0x47,0x7a,0x3d }, 
+    { 0x64,0xac,0xc8,0x64 }, { 0x5d,0xe7,0xba,0x5d },
+    { 0x19,0x2b,0x32,0x19 }, { 0x73,0x95,0xe6,0x73 }, 
+    { 0x60,0xa0,0xc0,0x60 }, { 0x81,0x98,0x19,0x81 },
+    { 0x4f,0xd1,0x9e,0x4f }, { 0xdc,0x7f,0xa3,0xdc }, 
+    { 0x22,0x66,0x44,0x22 }, { 0x2a,0x7e,0x54,0x2a },
+    { 0x90,0xab,0x3b,0x90 }, { 0x88,0x83,0x0b,0x88 }, 
+    { 0x46,0xca,0x8c,0x46 }, { 0xee,0x29,0xc7,0xee },
+    { 0xb8,0xd3,0x6b,0xb8 }, { 0x14,0x3c,0x28,0x14 }, 
+    { 0xde,0x79,0xa7,0xde }, { 0x5e,0xe2,0xbc,0x5e }, 
+    { 0x0b,0x1d,0x16,0x0b }, { 0xdb,0x76,0xad,0xdb }, 
+    { 0xe0,0x3b,0xdb,0xe0 }, { 0x32,0x56,0x64,0x32 },
+    { 0x3a,0x4e,0x74,0x3a }, { 0x0a,0x1e,0x14,0x0a }, 
+    { 0x49,0xdb,0x92,0x49 }, { 0x06,0x0a,0x0c,0x06 },
+    { 0x24,0x6c,0x48,0x24 }, { 0x5c,0xe4,0xb8,0x5c }, 
+    { 0xc2,0x5d,0x9f,0xc2 }, { 0xd3,0x6e,0xbd,0xd3 },
+    { 0xac,0xef,0x43,0xac }, { 0x62,0xa6,0xc4,0x62 }, 
+    { 0x91,0xa8,0x39,0x91 }, { 0x95,0xa4,0x31,0x95 },
+    { 0xe4,0x37,0xd3,0xe4 }, { 0x79,0x8b,0xf2,0x79 }, 
+    { 0xe7,0x32,0xd5,0xe7 }, { 0xc8,0x43,0x8b,0xc8 }, 
+    { 0x37,0x59,0x6e,0x37 }, { 0x6d,0xb7,0xda,0x6d }, 
+    { 0x8d,0x8c,0x01,0x8d }, { 0xd5,0x64,0xb1,0xd5 }, 
+    { 0x4e,0xd2,0x9c,0x4e }, { 0xa9,0xe0,0x49,0xa9 }, 
+    { 0x6c,0xb4,0xd8,0x6c }, { 0x56,0xfa,0xac,0x56 },
+    { 0xf4,0x07,0xf3,0xf4 }, { 0xea,0x25,0xcf,0xea }, 
+    { 0x65,0xaf,0xca,0x65 }, { 0x7a,0x8e,0xf4,0x7a }, 
+    { 0xae,0xe9,0x47,0xae }, { 0x08,0x18,0x10,0x08 }, 
+    { 0xba,0xd5,0x6f,0xba }, { 0x78,0x88,0xf0,0x78 }, 
+    { 0x25,0x6f,0x4a,0x25 }, { 0x2e,0x72,0x5c,0x2e }, 
+    { 0x1c,0x24,0x38,0x1c }, { 0xa6,0xf1,0x57,0xa6 }, 
+    { 0xb4,0xc7,0x73,0xb4 }, { 0xc6,0x51,0x97,0xc6 }, 
+    { 0xe8,0x23,0xcb,0xe8 }, { 0xdd,0x7c,0xa1,0xdd },
+    { 0x74,0x9c,0xe8,0x74 }, { 0x1f,0x21,0x3e,0x1f }, 
+    { 0x4b,0xdd,0x96,0x4b }, { 0xbd,0xdc,0x61,0xbd },
+    { 0x8b,0x86,0x0d,0x8b }, { 0x8a,0x85,0x0f,0x8a }, 
+    { 0x70,0x90,0xe0,0x70 }, { 0x3e,0x42,0x7c,0x3e },
+    { 0xb5,0xc4,0x71,0xb5 }, { 0x66,0xaa,0xcc,0x66 }, 
+    { 0x48,0xd8,0x90,0x48 }, { 0x03,0x05,0x06,0x03 },
+    { 0xf6,0x01,0xf7,0xf6 }, { 0x0e,0x12,0x1c,0x0e }, 
+    { 0x61,0xa3,0xc2,0x61 }, { 0x35,0x5f,0x6a,0x35 },
+    { 0x57,0xf9,0xae,0x57 }, { 0xb9,0xd0,0x69,0xb9 }, 
+    { 0x86,0x91,0x17,0x86 }, { 0xc1,0x58,0x99,0xc1 }, 
+    { 0x1d,0x27,0x3a,0x1d }, { 0x9e,0xb9,0x27,0x9e }, 
+    { 0xe1,0x38,0xd9,0xe1 }, { 0xf8,0x13,0xeb,0xf8 },
+    { 0x98,0xb3,0x2b,0x98 }, { 0x11,0x33,0x22,0x11 }, 
+    { 0x69,0xbb,0xd2,0x69 }, { 0xd9,0x70,0xa9,0xd9 },
+    { 0x8e,0x89,0x07,0x8e }, { 0x94,0xa7,0x33,0x94 }, 
+    { 0x9b,0xb6,0x2d,0x9b }, { 0x1e,0x22,0x3c,0x1e },
+    { 0x87,0x92,0x15,0x87 }, { 0xe9,0x20,0xc9,0xe9 }, 
+    { 0xce,0x49,0x87,0xce }, { 0x55,0xff,0xaa,0x55 },
+    { 0x28,0x78,0x50,0x28 }, { 0xdf,0x7a,0xa5,0xdf }, 
+    { 0x8c,0x8f,0x03,0x8c }, { 0xa1,0xf8,0x59,0xa1 },
+    { 0x89,0x80,0x09,0x89 }, { 0x0d,0x17,0x1a,0x0d }, 
+    { 0xbf,0xda,0x65,0xbf }, { 0xe6,0x31,0xd7,0xe6 },
+    { 0x42,0xc6,0x84,0x42 }, { 0x68,0xb8,0xd0,0x68 }, 
+    { 0x41,0xc3,0x82,0x41 }, { 0x99,0xb0,0x29,0x99 },
+    { 0x2d,0x77,0x5a,0x2d }, { 0x0f,0x11,0x1e,0x0f }, 
+    { 0xb0,0xcb,0x7b,0xb0 }, { 0x54,0xfc,0xa8,0x54 },
+    { 0xbb,0xd6,0x6d,0xbb }, { 0x16,0x3a,0x2c,0x16 }
+};
+
+static const byte T4[256][4] = {
+    { 0x63,0x63,0xa5,0xc6 }, { 0x7c,0x7c,0x84,0xf8 },
+    { 0x77,0x77,0x99,0xee }, { 0x7b,0x7b,0x8d,0xf6 }, 
+    { 0xf2,0xf2,0x0d,0xff }, { 0x6b,0x6b,0xbd,0xd6 }, 
+    { 0x6f,0x6f,0xb1,0xde }, { 0xc5,0xc5,0x54,0x91 }, 
+    { 0x30,0x30,0x50,0x60 }, { 0x01,0x01,0x03,0x02 },
+    { 0x67,0x67,0xa9,0xce }, { 0x2b,0x2b,0x7d,0x56 }, 
+    { 0xfe,0xfe,0x19,0xe7 }, { 0xd7,0xd7,0x62,0xb5 },
+    { 0xab,0xab,0xe6,0x4d }, { 0x76,0x76,0x9a,0xec }, 
+    { 0xca,0xca,0x45,0x8f }, { 0x82,0x82,0x9d,0x1f },
+    { 0xc9,0xc9,0x40,0x89 }, { 0x7d,0x7d,0x87,0xfa }, 
+    { 0xfa,0xfa,0x15,0xef }, { 0x59,0x59,0xeb,0xb2 },
+    { 0x47,0x47,0xc9,0x8e }, { 0xf0,0xf0,0x0b,0xfb }, 
+    { 0xad,0xad,0xec,0x41 }, { 0xd4,0xd4,0x67,0xb3 },
+    { 0xa2,0xa2,0xfd,0x5f }, { 0xaf,0xaf,0xea,0x45 }, 
+    { 0x9c,0x9c,0xbf,0x23 }, { 0xa4,0xa4,0xf7,0x53 },
+    { 0x72,0x72,0x96,0xe4 }, { 0xc0,0xc0,0x5b,0x9b }, 
+    { 0xb7,0xb7,0xc2,0x75 }, { 0xfd,0xfd,0x1c,0xe1 },
+    { 0x93,0x93,0xae,0x3d }, { 0x26,0x26,0x6a,0x4c }, 
+    { 0x36,0x36,0x5a,0x6c }, { 0x3f,0x3f,0x41,0x7e },
+    { 0xf7,0xf7,0x02,0xf5 }, { 0xcc,0xcc,0x4f,0x83 }, 
+    { 0x34,0x34,0x5c,0x68 }, { 0xa5,0xa5,0xf4,0x51 },
+    { 0xe5,0xe5,0x34,0xd1 }, { 0xf1,0xf1,0x08,0xf9 }, 
+    { 0x71,0x71,0x93,0xe2 }, { 0xd8,0xd8,0x73,0xab },
+    { 0x31,0x31,0x53,0x62 }, { 0x15,0x15,0x3f,0x2a }, 
+    { 0x04,0x04,0x0c,0x08 }, { 0xc7,0xc7,0x52,0x95 },
+    { 0x23,0x23,0x65,0x46 }, { 0xc3,0xc3,0x5e,0x9d }, 
+    { 0x18,0x18,0x28,0x30 }, { 0x96,0x96,0xa1,0x37 },
+    { 0x05,0x05,0x0f,0x0a }, { 0x9a,0x9a,0xb5,0x2f }, 
+    { 0x07,0x07,0x09,0x0e }, { 0x12,0x12,0x36,0x24 },
+    { 0x80,0x80,0x9b,0x1b }, { 0xe2,0xe2,0x3d,0xdf }, 
+    { 0xeb,0xeb,0x26,0xcd }, { 0x27,0x27,0x69,0x4e },
+    { 0xb2,0xb2,0xcd,0x7f }, { 0x75,0x75,0x9f,0xea }, 
+    { 0x09,0x09,0x1b,0x12 }, { 0x83,0x83,0x9e,0x1d },
+    { 0x2c,0x2c,0x74,0x58 }, { 0x1a,0x1a,0x2e,0x34 }, 
+    { 0x1b,0x1b,0x2d,0x36 }, { 0x6e,0x6e,0xb2,0xdc },
+    { 0x5a,0x5a,0xee,0xb4 }, { 0xa0,0xa0,0xfb,0x5b }, 
+    { 0x52,0x52,0xf6,0xa4 }, { 0x3b,0x3b,0x4d,0x76 },
+    { 0xd6,0xd6,0x61,0xb7 }, { 0xb3,0xb3,0xce,0x7d }, 
+    { 0x29,0x29,0x7b,0x52 }, { 0xe3,0xe3,0x3e,0xdd },
+    { 0x2f,0x2f,0x71,0x5e }, { 0x84,0x84,0x97,0x13 }, 
+    { 0x53,0x53,0xf5,0xa6 }, { 0xd1,0xd1,0x68,0xb9 },
+    { 0x00,0x00,0x00,0x00 }, { 0xed,0xed,0x2c,0xc1 }, 
+    { 0x20,0x20,0x60,0x40 }, { 0xfc,0xfc,0x1f,0xe3 },
+    { 0xb1,0xb1,0xc8,0x79 }, { 0x5b,0x5b,0xed,0xb6 }, 
+    { 0x6a,0x6a,0xbe,0xd4 }, { 0xcb,0xcb,0x46,0x8d },
+    { 0xbe,0xbe,0xd9,0x67 }, { 0x39,0x39,0x4b,0x72 }, 
+    { 0x4a,0x4a,0xde,0x94 }, { 0x4c,0x4c,0xd4,0x98 },
+    { 0x58,0x58,0xe8,0xb0 }, { 0xcf,0xcf,0x4a,0x85 }, 
+    { 0xd0,0xd0,0x6b,0xbb }, { 0xef,0xef,0x2a,0xc5 },
+    { 0xaa,0xaa,0xe5,0x4f }, { 0xfb,0xfb,0x16,0xed }, 
+    { 0x43,0x43,0xc5,0x86 }, { 0x4d,0x4d,0xd7,0x9a },
+    { 0x33,0x33,0x55,0x66 }, { 0x85,0x85,0x94,0x11 }, 
+    { 0x45,0x45,0xcf,0x8a }, { 0xf9,0xf9,0x10,0xe9 },
+    { 0x02,0x02,0x06,0x04 }, { 0x7f,0x7f,0x81,0xfe }, 
+    { 0x50,0x50,0xf0,0xa0 }, { 0x3c,0x3c,0x44,0x78 },
+    { 0x9f,0x9f,0xba,0x25 }, { 0xa8,0xa8,0xe3,0x4b }, 
+    { 0x51,0x51,0xf3,0xa2 }, { 0xa3,0xa3,0xfe,0x5d },
+    { 0x40,0x40,0xc0,0x80 }, { 0x8f,0x8f,0x8a,0x05 }, 
+    { 0x92,0x92,0xad,0x3f }, { 0x9d,0x9d,0xbc,0x21 },
+    { 0x38,0x38,0x48,0x70 }, { 0xf5,0xf5,0x04,0xf1 }, 
+    { 0xbc,0xbc,0xdf,0x63 }, { 0xb6,0xb6,0xc1,0x77 },
+    { 0xda,0xda,0x75,0xaf }, { 0x21,0x21,0x63,0x42 }, 
+    { 0x10,0x10,0x30,0x20 }, { 0xff,0xff,0x1a,0xe5 },
+    { 0xf3,0xf3,0x0e,0xfd }, { 0xd2,0xd2,0x6d,0xbf }, 
+    { 0xcd,0xcd,0x4c,0x81 }, { 0x0c,0x0c,0x14,0x18 },
+    { 0x13,0x13,0x35,0x26 }, { 0xec,0xec,0x2f,0xc3 }, 
+    { 0x5f,0x5f,0xe1,0xbe }, { 0x97,0x97,0xa2,0x35 },
+    { 0x44,0x44,0xcc,0x88 }, { 0x17,0x17,0x39,0x2e }, 
+    { 0xc4,0xc4,0x57,0x93 }, { 0xa7,0xa7,0xf2,0x55 },
+    { 0x7e,0x7e,0x82,0xfc }, { 0x3d,0x3d,0x47,0x7a }, 
+    { 0x64,0x64,0xac,0xc8 }, { 0x5d,0x5d,0xe7,0xba },
+    { 0x19,0x19,0x2b,0x32 }, { 0x73,0x73,0x95,0xe6 }, 
+    { 0x60,0x60,0xa0,0xc0 }, { 0x81,0x81,0x98,0x19 },
+    { 0x4f,0x4f,0xd1,0x9e }, { 0xdc,0xdc,0x7f,0xa3 }, 
+    { 0x22,0x22,0x66,0x44 }, { 0x2a,0x2a,0x7e,0x54 },
+    { 0x90,0x90,0xab,0x3b }, { 0x88,0x88,0x83,0x0b }, 
+    { 0x46,0x46,0xca,0x8c }, { 0xee,0xee,0x29,0xc7 },
+    { 0xb8,0xb8,0xd3,0x6b }, { 0x14,0x14,0x3c,0x28 }, 
+    { 0xde,0xde,0x79,0xa7 }, { 0x5e,0x5e,0xe2,0xbc },
+    { 0x0b,0x0b,0x1d,0x16 }, { 0xdb,0xdb,0x76,0xad }, 
+    { 0xe0,0xe0,0x3b,0xdb }, { 0x32,0x32,0x56,0x64 },
+    { 0x3a,0x3a,0x4e,0x74 }, { 0x0a,0x0a,0x1e,0x14 }, 
+    { 0x49,0x49,0xdb,0x92 }, { 0x06,0x06,0x0a,0x0c },
+    { 0x24,0x24,0x6c,0x48 }, { 0x5c,0x5c,0xe4,0xb8 }, 
+    { 0xc2,0xc2,0x5d,0x9f }, { 0xd3,0xd3,0x6e,0xbd },
+    { 0xac,0xac,0xef,0x43 }, { 0x62,0x62,0xa6,0xc4 }, 
+    { 0x91,0x91,0xa8,0x39 }, { 0x95,0x95,0xa4,0x31 },
+    { 0xe4,0xe4,0x37,0xd3 }, { 0x79,0x79,0x8b,0xf2 }, 
+    { 0xe7,0xe7,0x32,0xd5 }, { 0xc8,0xc8,0x43,0x8b },
+    { 0x37,0x37,0x59,0x6e }, { 0x6d,0x6d,0xb7,0xda }, 
+    { 0x8d,0x8d,0x8c,0x01 }, { 0xd5,0xd5,0x64,0xb1 }, 
+    { 0x4e,0x4e,0xd2,0x9c }, { 0xa9,0xa9,0xe0,0x49 }, 
+    { 0x6c,0x6c,0xb4,0xd8 }, { 0x56,0x56,0xfa,0xac }, 
+    { 0xf4,0xf4,0x07,0xf3 }, { 0xea,0xea,0x25,0xcf }, 
+    { 0x65,0x65,0xaf,0xca }, { 0x7a,0x7a,0x8e,0xf4 }, 
+    { 0xae,0xae,0xe9,0x47 }, { 0x08,0x08,0x18,0x10 }, 
+    { 0xba,0xba,0xd5,0x6f }, { 0x78,0x78,0x88,0xf0 }, 
+    { 0x25,0x25,0x6f,0x4a }, { 0x2e,0x2e,0x72,0x5c }, 
+    { 0x1c,0x1c,0x24,0x38 }, { 0xa6,0xa6,0xf1,0x57 },
+    { 0xb4,0xb4,0xc7,0x73 }, { 0xc6,0xc6,0x51,0x97 }, 
+    { 0xe8,0xe8,0x23,0xcb }, { 0xdd,0xdd,0x7c,0xa1 },
+    { 0x74,0x74,0x9c,0xe8 }, { 0x1f,0x1f,0x21,0x3e }, 
+    { 0x4b,0x4b,0xdd,0x96 }, { 0xbd,0xbd,0xdc,0x61 },
+    { 0x8b,0x8b,0x86,0x0d }, { 0x8a,0x8a,0x85,0x0f }, 
+    { 0x70,0x70,0x90,0xe0 }, { 0x3e,0x3e,0x42,0x7c },
+    { 0xb5,0xb5,0xc4,0x71 }, { 0x66,0x66,0xaa,0xcc }, 
+    { 0x48,0x48,0xd8,0x90 }, { 0x03,0x03,0x05,0x06 },
+    { 0xf6,0xf6,0x01,0xf7 }, { 0x0e,0x0e,0x12,0x1c }, 
+    { 0x61,0x61,0xa3,0xc2 }, { 0x35,0x35,0x5f,0x6a },
+    { 0x57,0x57,0xf9,0xae }, { 0xb9,0xb9,0xd0,0x69 }, 
+    { 0x86,0x86,0x91,0x17 }, { 0xc1,0xc1,0x58,0x99 },
+    { 0x1d,0x1d,0x27,0x3a }, { 0x9e,0x9e,0xb9,0x27 }, 
+    { 0xe1,0xe1,0x38,0xd9 }, { 0xf8,0xf8,0x13,0xeb },
+    { 0x98,0x98,0xb3,0x2b }, { 0x11,0x11,0x33,0x22 }, 
+    { 0x69,0x69,0xbb,0xd2 }, { 0xd9,0xd9,0x70,0xa9 },
+    { 0x8e,0x8e,0x89,0x07 }, { 0x94,0x94,0xa7,0x33 }, 
+    { 0x9b,0x9b,0xb6,0x2d }, { 0x1e,0x1e,0x22,0x3c },
+    { 0x87,0x87,0x92,0x15 }, { 0xe9,0xe9,0x20,0xc9 }, 
+    { 0xce,0xce,0x49,0x87 }, { 0x55,0x55,0xff,0xaa },
+    { 0x28,0x28,0x78,0x50 }, { 0xdf,0xdf,0x7a,0xa5 }, 
+    { 0x8c,0x8c,0x8f,0x03 }, { 0xa1,0xa1,0xf8,0x59 },
+    { 0x89,0x89,0x80,0x09 }, { 0x0d,0x0d,0x17,0x1a }, 
+    { 0xbf,0xbf,0xda,0x65 }, { 0xe6,0xe6,0x31,0xd7 }, 
+    { 0x42,0x42,0xc6,0x84 }, { 0x68,0x68,0xb8,0xd0 }, 
+    { 0x41,0x41,0xc3,0x82 }, { 0x99,0x99,0xb0,0x29 },
+    { 0x2d,0x2d,0x77,0x5a }, { 0x0f,0x0f,0x11,0x1e }, 
+    { 0xb0,0xb0,0xcb,0x7b }, { 0x54,0x54,0xfc,0xa8 },
+    { 0xbb,0xbb,0xd6,0x6d }, { 0x16,0x16,0x3a,0x2c }
+};
+
+static const byte T5[256][4] = {
+    { 0x51,0xf4,0xa7,0x50 }, { 0x7e,0x41,0x65,0x53 }, 
+    { 0x1a,0x17,0xa4,0xc3 }, { 0x3a,0x27,0x5e,0x96 }, 
+    { 0x3b,0xab,0x6b,0xcb }, { 0x1f,0x9d,0x45,0xf1 },
+    { 0xac,0xfa,0x58,0xab }, { 0x4b,0xe3,0x03,0x93 }, 
+    { 0x20,0x30,0xfa,0x55 }, { 0xad,0x76,0x6d,0xf6 },
+    { 0x88,0xcc,0x76,0x91 }, { 0xf5,0x02,0x4c,0x25 }, 
+    { 0x4f,0xe5,0xd7,0xfc }, { 0xc5,0x2a,0xcb,0xd7 },
+    { 0x26,0x35,0x44,0x80 }, { 0xb5,0x62,0xa3,0x8f }, 
+    { 0xde,0xb1,0x5a,0x49 }, { 0x25,0xba,0x1b,0x67 },
+    { 0x45,0xea,0x0e,0x98 }, { 0x5d,0xfe,0xc0,0xe1 }, 
+    { 0xc3,0x2f,0x75,0x02 }, { 0x81,0x4c,0xf0,0x12 },
+    { 0x8d,0x46,0x97,0xa3 }, { 0x6b,0xd3,0xf9,0xc6 }, 
+    { 0x03,0x8f,0x5f,0xe7 }, { 0x15,0x92,0x9c,0x95 },
+    { 0xbf,0x6d,0x7a,0xeb }, { 0x95,0x52,0x59,0xda }, 
+    { 0xd4,0xbe,0x83,0x2d }, { 0x58,0x74,0x21,0xd3 },
+    { 0x49,0xe0,0x69,0x29 }, { 0x8e,0xc9,0xc8,0x44 }, 
+    { 0x75,0xc2,0x89,0x6a }, { 0xf4,0x8e,0x79,0x78 },
+    { 0x99,0x58,0x3e,0x6b }, { 0x27,0xb9,0x71,0xdd }, 
+    { 0xbe,0xe1,0x4f,0xb6 }, { 0xf0,0x88,0xad,0x17 },
+    { 0xc9,0x20,0xac,0x66 }, { 0x7d,0xce,0x3a,0xb4 }, 
+    { 0x63,0xdf,0x4a,0x18 }, { 0xe5,0x1a,0x31,0x82 },
+    { 0x97,0x51,0x33,0x60 }, { 0x62,0x53,0x7f,0x45 }, 
+    { 0xb1,0x64,0x77,0xe0 }, { 0xbb,0x6b,0xae,0x84 }, 
+    { 0xfe,0x81,0xa0,0x1c }, { 0xf9,0x08,0x2b,0x94 }, 
+    { 0x70,0x48,0x68,0x58 }, { 0x8f,0x45,0xfd,0x19 }, 
+    { 0x94,0xde,0x6c,0x87 }, { 0x52,0x7b,0xf8,0xb7 }, 
+    { 0xab,0x73,0xd3,0x23 }, { 0x72,0x4b,0x02,0xe2 },
+    { 0xe3,0x1f,0x8f,0x57 }, { 0x66,0x55,0xab,0x2a }, 
+    { 0xb2,0xeb,0x28,0x07 }, { 0x2f,0xb5,0xc2,0x03 },
+    { 0x86,0xc5,0x7b,0x9a }, { 0xd3,0x37,0x08,0xa5 }, 
+    { 0x30,0x28,0x87,0xf2 }, { 0x23,0xbf,0xa5,0xb2 },
+    { 0x02,0x03,0x6a,0xba }, { 0xed,0x16,0x82,0x5c }, 
+    { 0x8a,0xcf,0x1c,0x2b }, { 0xa7,0x79,0xb4,0x92 },
+    { 0xf3,0x07,0xf2,0xf0 }, { 0x4e,0x69,0xe2,0xa1 }, 
+    { 0x65,0xda,0xf4,0xcd }, { 0x06,0x05,0xbe,0xd5 },
+    { 0xd1,0x34,0x62,0x1f }, { 0xc4,0xa6,0xfe,0x8a }, 
+    { 0x34,0x2e,0x53,0x9d }, { 0xa2,0xf3,0x55,0xa0 },
+    { 0x05,0x8a,0xe1,0x32 }, { 0xa4,0xf6,0xeb,0x75 }, 
+    { 0x0b,0x83,0xec,0x39 }, { 0x40,0x60,0xef,0xaa },
+    { 0x5e,0x71,0x9f,0x06 }, { 0xbd,0x6e,0x10,0x51 }, 
+    { 0x3e,0x21,0x8a,0xf9 }, { 0x96,0xdd,0x06,0x3d }, 
+    { 0xdd,0x3e,0x05,0xae }, { 0x4d,0xe6,0xbd,0x46 }, 
+    { 0x91,0x54,0x8d,0xb5 }, { 0x71,0xc4,0x5d,0x05 }, 
+    { 0x04,0x06,0xd4,0x6f }, { 0x60,0x50,0x15,0xff }, 
+    { 0x19,0x98,0xfb,0x24 }, { 0xd6,0xbd,0xe9,0x97 },
+    { 0x89,0x40,0x43,0xcc }, { 0x67,0xd9,0x9e,0x77 }, 
+    { 0xb0,0xe8,0x42,0xbd }, { 0x07,0x89,0x8b,0x88 },
+    { 0xe7,0x19,0x5b,0x38 }, { 0x79,0xc8,0xee,0xdb }, 
+    { 0xa1,0x7c,0x0a,0x47 }, { 0x7c,0x42,0x0f,0xe9 },
+    { 0xf8,0x84,0x1e,0xc9 }, { 0x00,0x00,0x00,0x00 }, 
+    { 0x09,0x80,0x86,0x83 }, { 0x32,0x2b,0xed,0x48 },
+    { 0x1e,0x11,0x70,0xac }, { 0x6c,0x5a,0x72,0x4e }, 
+    { 0xfd,0x0e,0xff,0xfb }, { 0x0f,0x85,0x38,0x56 },
+    { 0x3d,0xae,0xd5,0x1e }, { 0x36,0x2d,0x39,0x27 }, 
+    { 0x0a,0x0f,0xd9,0x64 }, { 0x68,0x5c,0xa6,0x21 },
+    { 0x9b,0x5b,0x54,0xd1 }, { 0x24,0x36,0x2e,0x3a }, 
+    { 0x0c,0x0a,0x67,0xb1 }, { 0x93,0x57,0xe7,0x0f },
+    { 0xb4,0xee,0x96,0xd2 }, { 0x1b,0x9b,0x91,0x9e }, 
+    { 0x80,0xc0,0xc5,0x4f }, { 0x61,0xdc,0x20,0xa2 },
+    { 0x5a,0x77,0x4b,0x69 }, { 0x1c,0x12,0x1a,0x16 }, 
+    { 0xe2,0x93,0xba,0x0a }, { 0xc0,0xa0,0x2a,0xe5 }, 
+    { 0x3c,0x22,0xe0,0x43 }, { 0x12,0x1b,0x17,0x1d }, 
+    { 0x0e,0x09,0x0d,0x0b }, { 0xf2,0x8b,0xc7,0xad }, 
+    { 0x2d,0xb6,0xa8,0xb9 }, { 0x14,0x1e,0xa9,0xc8 }, 
+    { 0x57,0xf1,0x19,0x85 }, { 0xaf,0x75,0x07,0x4c }, 
+    { 0xee,0x99,0xdd,0xbb }, { 0xa3,0x7f,0x60,0xfd }, 
+    { 0xf7,0x01,0x26,0x9f }, { 0x5c,0x72,0xf5,0xbc },
+    { 0x44,0x66,0x3b,0xc5 }, { 0x5b,0xfb,0x7e,0x34 }, 
+    { 0x8b,0x43,0x29,0x76 }, { 0xcb,0x23,0xc6,0xdc },
+    { 0xb6,0xed,0xfc,0x68 }, { 0xb8,0xe4,0xf1,0x63 }, 
+    { 0xd7,0x31,0xdc,0xca }, { 0x42,0x63,0x85,0x10 },
+    { 0x13,0x97,0x22,0x40 }, { 0x84,0xc6,0x11,0x20 }, 
+    { 0x85,0x4a,0x24,0x7d }, { 0xd2,0xbb,0x3d,0xf8 }, 
+    { 0xae,0xf9,0x32,0x11 }, { 0xc7,0x29,0xa1,0x6d }, 
+    { 0x1d,0x9e,0x2f,0x4b }, { 0xdc,0xb2,0x30,0xf3 },
+    { 0x0d,0x86,0x52,0xec }, { 0x77,0xc1,0xe3,0xd0 }, 
+    { 0x2b,0xb3,0x16,0x6c }, { 0xa9,0x70,0xb9,0x99 },
+    { 0x11,0x94,0x48,0xfa }, { 0x47,0xe9,0x64,0x22 }, 
+    { 0xa8,0xfc,0x8c,0xc4 }, { 0xa0,0xf0,0x3f,0x1a },
+    { 0x56,0x7d,0x2c,0xd8 }, { 0x22,0x33,0x90,0xef }, 
+    { 0x87,0x49,0x4e,0xc7 }, { 0xd9,0x38,0xd1,0xc1 }, 
+    { 0x8c,0xca,0xa2,0xfe }, { 0x98,0xd4,0x0b,0x36 }, 
+    { 0xa6,0xf5,0x81,0xcf }, { 0xa5,0x7a,0xde,0x28 }, 
+    { 0xda,0xb7,0x8e,0x26 }, { 0x3f,0xad,0xbf,0xa4 }, 
+    { 0x2c,0x3a,0x9d,0xe4 }, { 0x50,0x78,0x92,0x0d }, 
+    { 0x6a,0x5f,0xcc,0x9b }, { 0x54,0x7e,0x46,0x62 }, 
+    { 0xf6,0x8d,0x13,0xc2 }, { 0x90,0xd8,0xb8,0xe8 }, 
+    { 0x2e,0x39,0xf7,0x5e }, { 0x82,0xc3,0xaf,0xf5 }, 
+    { 0x9f,0x5d,0x80,0xbe }, { 0x69,0xd0,0x93,0x7c },
+    { 0x6f,0xd5,0x2d,0xa9 }, { 0xcf,0x25,0x12,0xb3 }, 
+    { 0xc8,0xac,0x99,0x3b }, { 0x10,0x18,0x7d,0xa7 },
+    { 0xe8,0x9c,0x63,0x6e }, { 0xdb,0x3b,0xbb,0x7b }, 
+    { 0xcd,0x26,0x78,0x09 }, { 0x6e,0x59,0x18,0xf4 },
+    { 0xec,0x9a,0xb7,0x01 }, { 0x83,0x4f,0x9a,0xa8 }, 
+    { 0xe6,0x95,0x6e,0x65 }, { 0xaa,0xff,0xe6,0x7e }, 
+    { 0x21,0xbc,0xcf,0x08 }, { 0xef,0x15,0xe8,0xe6 }, 
+    { 0xba,0xe7,0x9b,0xd9 }, { 0x4a,0x6f,0x36,0xce }, 
+    { 0xea,0x9f,0x09,0xd4 }, { 0x29,0xb0,0x7c,0xd6 }, 
+    { 0x31,0xa4,0xb2,0xaf }, { 0x2a,0x3f,0x23,0x31 }, 
+    { 0xc6,0xa5,0x94,0x30 }, { 0x35,0xa2,0x66,0xc0 }, 
+    { 0x74,0x4e,0xbc,0x37 }, { 0xfc,0x82,0xca,0xa6 }, 
+    { 0xe0,0x90,0xd0,0xb0 }, { 0x33,0xa7,0xd8,0x15 }, 
+    { 0xf1,0x04,0x98,0x4a }, { 0x41,0xec,0xda,0xf7 },
+    { 0x7f,0xcd,0x50,0x0e }, { 0x17,0x91,0xf6,0x2f }, 
+    { 0x76,0x4d,0xd6,0x8d }, { 0x43,0xef,0xb0,0x4d },
+    { 0xcc,0xaa,0x4d,0x54 }, { 0xe4,0x96,0x04,0xdf }, 
+    { 0x9e,0xd1,0xb5,0xe3 }, { 0x4c,0x6a,0x88,0x1b },
+    { 0xc1,0x2c,0x1f,0xb8 }, { 0x46,0x65,0x51,0x7f }, 
+    { 0x9d,0x5e,0xea,0x04 }, { 0x01,0x8c,0x35,0x5d },
+    { 0xfa,0x87,0x74,0x73 }, { 0xfb,0x0b,0x41,0x2e }, 
+    { 0xb3,0x67,0x1d,0x5a }, { 0x92,0xdb,0xd2,0x52 },
+    { 0xe9,0x10,0x56,0x33 }, { 0x6d,0xd6,0x47,0x13 }, 
+    { 0x9a,0xd7,0x61,0x8c }, { 0x37,0xa1,0x0c,0x7a },
+    { 0x59,0xf8,0x14,0x8e }, { 0xeb,0x13,0x3c,0x89 }, 
+    { 0xce,0xa9,0x27,0xee }, { 0xb7,0x61,0xc9,0x35 },
+    { 0xe1,0x1c,0xe5,0xed }, { 0x7a,0x47,0xb1,0x3c }, 
+    { 0x9c,0xd2,0xdf,0x59 }, { 0x55,0xf2,0x73,0x3f }, 
+    { 0x18,0x14,0xce,0x79 }, { 0x73,0xc7,0x37,0xbf }, 
+    { 0x53,0xf7,0xcd,0xea }, { 0x5f,0xfd,0xaa,0x5b },
+    { 0xdf,0x3d,0x6f,0x14 }, { 0x78,0x44,0xdb,0x86 }, 
+    { 0xca,0xaf,0xf3,0x81 }, { 0xb9,0x68,0xc4,0x3e }, 
+    { 0x38,0x24,0x34,0x2c }, { 0xc2,0xa3,0x40,0x5f }, 
+    { 0x16,0x1d,0xc3,0x72 }, { 0xbc,0xe2,0x25,0x0c }, 
+    { 0x28,0x3c,0x49,0x8b }, { 0xff,0x0d,0x95,0x41 }, 
+    { 0x39,0xa8,0x01,0x71 }, { 0x08,0x0c,0xb3,0xde }, 
+    { 0xd8,0xb4,0xe4,0x9c }, { 0x64,0x56,0xc1,0x90 }, 
+    { 0x7b,0xcb,0x84,0x61 }, { 0xd5,0x32,0xb6,0x70 },
+    { 0x48,0x6c,0x5c,0x74 }, { 0xd0,0xb8,0x57,0x42 }
+};
+
+static const byte T6[256][4] = {
+    { 0x50,0x51,0xf4,0xa7 }, { 0x53,0x7e,0x41,0x65 }, 
+    { 0xc3,0x1a,0x17,0xa4 }, { 0x96,0x3a,0x27,0x5e }, 
+    { 0xcb,0x3b,0xab,0x6b }, { 0xf1,0x1f,0x9d,0x45 },
+    { 0xab,0xac,0xfa,0x58 }, { 0x93,0x4b,0xe3,0x03 }, 
+    { 0x55,0x20,0x30,0xfa }, { 0xf6,0xad,0x76,0x6d },
+    { 0x91,0x88,0xcc,0x76 }, { 0x25,0xf5,0x02,0x4c }, 
+    { 0xfc,0x4f,0xe5,0xd7 }, { 0xd7,0xc5,0x2a,0xcb },
+    { 0x80,0x26,0x35,0x44 }, { 0x8f,0xb5,0x62,0xa3 }, 
+    { 0x49,0xde,0xb1,0x5a }, { 0x67,0x25,0xba,0x1b }, 
+    { 0x98,0x45,0xea,0x0e }, { 0xe1,0x5d,0xfe,0xc0 }, 
+    { 0x02,0xc3,0x2f,0x75 }, { 0x12,0x81,0x4c,0xf0 },
+    { 0xa3,0x8d,0x46,0x97 }, { 0xc6,0x6b,0xd3,0xf9 }, 
+    { 0xe7,0x03,0x8f,0x5f }, { 0x95,0x15,0x92,0x9c },
+    { 0xeb,0xbf,0x6d,0x7a }, { 0xda,0x95,0x52,0x59 }, 
+    { 0x2d,0xd4,0xbe,0x83 }, { 0xd3,0x58,0x74,0x21 },
+    { 0x29,0x49,0xe0,0x69 }, { 0x44,0x8e,0xc9,0xc8 }, 
+    { 0x6a,0x75,0xc2,0x89 }, { 0x78,0xf4,0x8e,0x79 },
+    { 0x6b,0x99,0x58,0x3e }, { 0xdd,0x27,0xb9,0x71 }, 
+    { 0xb6,0xbe,0xe1,0x4f }, { 0x17,0xf0,0x88,0xad },
+    { 0x66,0xc9,0x20,0xac }, { 0xb4,0x7d,0xce,0x3a }, 
+    { 0x18,0x63,0xdf,0x4a }, { 0x82,0xe5,0x1a,0x31 },
+    { 0x60,0x97,0x51,0x33 }, { 0x45,0x62,0x53,0x7f }, 
+    { 0xe0,0xb1,0x64,0x77 }, { 0x84,0xbb,0x6b,0xae },
+    { 0x1c,0xfe,0x81,0xa0 }, { 0x94,0xf9,0x08,0x2b }, 
+    { 0x58,0x70,0x48,0x68 }, { 0x19,0x8f,0x45,0xfd },
+    { 0x87,0x94,0xde,0x6c }, { 0xb7,0x52,0x7b,0xf8 }, 
+    { 0x23,0xab,0x73,0xd3 }, { 0xe2,0x72,0x4b,0x02 },
+    { 0x57,0xe3,0x1f,0x8f }, { 0x2a,0x66,0x55,0xab }, 
+    { 0x07,0xb2,0xeb,0x28 }, { 0x03,0x2f,0xb5,0xc2 },
+    { 0x9a,0x86,0xc5,0x7b }, { 0xa5,0xd3,0x37,0x08 }, 
+    { 0xf2,0x30,0x28,0x87 }, { 0xb2,0x23,0xbf,0xa5 },
+    { 0xba,0x02,0x03,0x6a }, { 0x5c,0xed,0x16,0x82 }, 
+    { 0x2b,0x8a,0xcf,0x1c }, { 0x92,0xa7,0x79,0xb4 },
+    { 0xf0,0xf3,0x07,0xf2 }, { 0xa1,0x4e,0x69,0xe2 }, 
+    { 0xcd,0x65,0xda,0xf4 }, { 0xd5,0x06,0x05,0xbe },
+    { 0x1f,0xd1,0x34,0x62 }, { 0x8a,0xc4,0xa6,0xfe }, 
+    { 0x9d,0x34,0x2e,0x53 }, { 0xa0,0xa2,0xf3,0x55 },
+    { 0x32,0x05,0x8a,0xe1 }, { 0x75,0xa4,0xf6,0xeb }, 
+    { 0x39,0x0b,0x83,0xec }, { 0xaa,0x40,0x60,0xef },
+    { 0x06,0x5e,0x71,0x9f }, { 0x51,0xbd,0x6e,0x10 }, 
+    { 0xf9,0x3e,0x21,0x8a }, { 0x3d,0x96,0xdd,0x06 },
+    { 0xae,0xdd,0x3e,0x05 }, { 0x46,0x4d,0xe6,0xbd }, 
+    { 0xb5,0x91,0x54,0x8d }, { 0x05,0x71,0xc4,0x5d },
+    { 0x6f,0x04,0x06,0xd4 }, { 0xff,0x60,0x50,0x15 }, 
+    { 0x24,0x19,0x98,0xfb }, { 0x97,0xd6,0xbd,0xe9 },
+    { 0xcc,0x89,0x40,0x43 }, { 0x77,0x67,0xd9,0x9e }, 
+    { 0xbd,0xb0,0xe8,0x42 }, { 0x88,0x07,0x89,0x8b },
+    { 0x38,0xe7,0x19,0x5b }, { 0xdb,0x79,0xc8,0xee }, 
+    { 0x47,0xa1,0x7c,0x0a }, { 0xe9,0x7c,0x42,0x0f },
+    { 0xc9,0xf8,0x84,0x1e }, { 0x00,0x00,0x00,0x00 }, 
+    { 0x83,0x09,0x80,0x86 }, { 0x48,0x32,0x2b,0xed },
+    { 0xac,0x1e,0x11,0x70 }, { 0x4e,0x6c,0x5a,0x72 }, 
+    { 0xfb,0xfd,0x0e,0xff }, { 0x56,0x0f,0x85,0x38 },
+    { 0x1e,0x3d,0xae,0xd5 }, { 0x27,0x36,0x2d,0x39 }, 
+    { 0x64,0x0a,0x0f,0xd9 }, { 0x21,0x68,0x5c,0xa6 },
+    { 0xd1,0x9b,0x5b,0x54 }, { 0x3a,0x24,0x36,0x2e }, 
+    { 0xb1,0x0c,0x0a,0x67 }, { 0x0f,0x93,0x57,0xe7 },
+    { 0xd2,0xb4,0xee,0x96 }, { 0x9e,0x1b,0x9b,0x91 }, 
+    { 0x4f,0x80,0xc0,0xc5 }, { 0xa2,0x61,0xdc,0x20 }, 
+    { 0x69,0x5a,0x77,0x4b }, { 0x16,0x1c,0x12,0x1a }, 
+    { 0x0a,0xe2,0x93,0xba }, { 0xe5,0xc0,0xa0,0x2a },
+    { 0x43,0x3c,0x22,0xe0 }, { 0x1d,0x12,0x1b,0x17 }, 
+    { 0x0b,0x0e,0x09,0x0d }, { 0xad,0xf2,0x8b,0xc7 },
+    { 0xb9,0x2d,0xb6,0xa8 }, { 0xc8,0x14,0x1e,0xa9 }, 
+    { 0x85,0x57,0xf1,0x19 }, { 0x4c,0xaf,0x75,0x07 },
+    { 0xbb,0xee,0x99,0xdd }, { 0xfd,0xa3,0x7f,0x60 }, 
+    { 0x9f,0xf7,0x01,0x26 }, { 0xbc,0x5c,0x72,0xf5 },
+    { 0xc5,0x44,0x66,0x3b }, { 0x34,0x5b,0xfb,0x7e }, 
+    { 0x76,0x8b,0x43,0x29 }, { 0xdc,0xcb,0x23,0xc6 },
+    { 0x68,0xb6,0xed,0xfc }, { 0x63,0xb8,0xe4,0xf1 }, 
+    { 0xca,0xd7,0x31,0xdc }, { 0x10,0x42,0x63,0x85 },
+    { 0x40,0x13,0x97,0x22 }, { 0x20,0x84,0xc6,0x11 }, 
+    { 0x7d,0x85,0x4a,0x24 }, { 0xf8,0xd2,0xbb,0x3d },
+    { 0x11,0xae,0xf9,0x32 }, { 0x6d,0xc7,0x29,0xa1 }, 
+    { 0x4b,0x1d,0x9e,0x2f }, { 0xf3,0xdc,0xb2,0x30 },
+    { 0xec,0x0d,0x86,0x52 }, { 0xd0,0x77,0xc1,0xe3 }, 
+    { 0x6c,0x2b,0xb3,0x16 }, { 0x99,0xa9,0x70,0xb9 }, 
+    { 0xfa,0x11,0x94,0x48 }, { 0x22,0x47,0xe9,0x64 }, 
+    { 0xc4,0xa8,0xfc,0x8c }, { 0x1a,0xa0,0xf0,0x3f }, 
+    { 0xd8,0x56,0x7d,0x2c }, { 0xef,0x22,0x33,0x90 }, 
+    { 0xc7,0x87,0x49,0x4e }, { 0xc1,0xd9,0x38,0xd1 },
+    { 0xfe,0x8c,0xca,0xa2 }, { 0x36,0x98,0xd4,0x0b }, 
+    { 0xcf,0xa6,0xf5,0x81 }, { 0x28,0xa5,0x7a,0xde }, 
+    { 0x26,0xda,0xb7,0x8e }, { 0xa4,0x3f,0xad,0xbf }, 
+    { 0xe4,0x2c,0x3a,0x9d }, { 0x0d,0x50,0x78,0x92 }, 
+    { 0x9b,0x6a,0x5f,0xcc }, { 0x62,0x54,0x7e,0x46 }, 
+    { 0xc2,0xf6,0x8d,0x13 }, { 0xe8,0x90,0xd8,0xb8 }, 
+    { 0x5e,0x2e,0x39,0xf7 }, { 0xf5,0x82,0xc3,0xaf }, 
+    { 0xbe,0x9f,0x5d,0x80 }, { 0x7c,0x69,0xd0,0x93 },
+    { 0xa9,0x6f,0xd5,0x2d }, { 0xb3,0xcf,0x25,0x12 }, 
+    { 0x3b,0xc8,0xac,0x99 }, { 0xa7,0x10,0x18,0x7d }, 
+    { 0x6e,0xe8,0x9c,0x63 }, { 0x7b,0xdb,0x3b,0xbb }, 
+    { 0x09,0xcd,0x26,0x78 }, { 0xf4,0x6e,0x59,0x18 },
+    { 0x01,0xec,0x9a,0xb7 }, { 0xa8,0x83,0x4f,0x9a }, 
+    { 0x65,0xe6,0x95,0x6e }, { 0x7e,0xaa,0xff,0xe6 }, 
+    { 0x08,0x21,0xbc,0xcf }, { 0xe6,0xef,0x15,0xe8 }, 
+    { 0xd9,0xba,0xe7,0x9b }, { 0xce,0x4a,0x6f,0x36 },
+    { 0xd4,0xea,0x9f,0x09 }, { 0xd6,0x29,0xb0,0x7c }, 
+    { 0xaf,0x31,0xa4,0xb2 }, { 0x31,0x2a,0x3f,0x23 },
+    { 0x30,0xc6,0xa5,0x94 }, { 0xc0,0x35,0xa2,0x66 }, 
+    { 0x37,0x74,0x4e,0xbc }, { 0xa6,0xfc,0x82,0xca }, 
+    { 0xb0,0xe0,0x90,0xd0 }, { 0x15,0x33,0xa7,0xd8 }, 
+    { 0x4a,0xf1,0x04,0x98 }, { 0xf7,0x41,0xec,0xda },
+    { 0x0e,0x7f,0xcd,0x50 }, { 0x2f,0x17,0x91,0xf6 }, 
+    { 0x8d,0x76,0x4d,0xd6 }, { 0x4d,0x43,0xef,0xb0 },
+    { 0x54,0xcc,0xaa,0x4d }, { 0xdf,0xe4,0x96,0x04 }, 
+    { 0xe3,0x9e,0xd1,0xb5 }, { 0x1b,0x4c,0x6a,0x88 },
+    { 0xb8,0xc1,0x2c,0x1f }, { 0x7f,0x46,0x65,0x51 }, 
+    { 0x04,0x9d,0x5e,0xea }, { 0x5d,0x01,0x8c,0x35 },
+    { 0x73,0xfa,0x87,0x74 }, { 0x2e,0xfb,0x0b,0x41 }, 
+    { 0x5a,0xb3,0x67,0x1d }, { 0x52,0x92,0xdb,0xd2 },
+    { 0x33,0xe9,0x10,0x56 }, { 0x13,0x6d,0xd6,0x47 }, 
+    { 0x8c,0x9a,0xd7,0x61 }, { 0x7a,0x37,0xa1,0x0c }, 
+    { 0x8e,0x59,0xf8,0x14 }, { 0x89,0xeb,0x13,0x3c }, 
+    { 0xee,0xce,0xa9,0x27 }, { 0x35,0xb7,0x61,0xc9 },
+    { 0xed,0xe1,0x1c,0xe5 }, { 0x3c,0x7a,0x47,0xb1 }, 
+    { 0x59,0x9c,0xd2,0xdf }, { 0x3f,0x55,0xf2,0x73 },
+    { 0x79,0x18,0x14,0xce }, { 0xbf,0x73,0xc7,0x37 }, 
+    { 0xea,0x53,0xf7,0xcd }, { 0x5b,0x5f,0xfd,0xaa },
+    { 0x14,0xdf,0x3d,0x6f }, { 0x86,0x78,0x44,0xdb }, 
+    { 0x81,0xca,0xaf,0xf3 }, { 0x3e,0xb9,0x68,0xc4 },
+    { 0x2c,0x38,0x24,0x34 }, { 0x5f,0xc2,0xa3,0x40 }, 
+    { 0x72,0x16,0x1d,0xc3 }, { 0x0c,0xbc,0xe2,0x25 },
+    { 0x8b,0x28,0x3c,0x49 }, { 0x41,0xff,0x0d,0x95 }, 
+    { 0x71,0x39,0xa8,0x01 }, { 0xde,0x08,0x0c,0xb3 },
+    { 0x9c,0xd8,0xb4,0xe4 }, { 0x90,0x64,0x56,0xc1 }, 
+    { 0x61,0x7b,0xcb,0x84 }, { 0x70,0xd5,0x32,0xb6 },
+    { 0x74,0x48,0x6c,0x5c }, { 0x42,0xd0,0xb8,0x57 }
+};
+
+static const byte T7[256][4] = {
+    { 0xa7,0x50,0x51,0xf4 }, { 0x65,0x53,0x7e,0x41 },
+    { 0xa4,0xc3,0x1a,0x17 }, { 0x5e,0x96,0x3a,0x27 }, 
+    { 0x6b,0xcb,0x3b,0xab }, { 0x45,0xf1,0x1f,0x9d },
+    { 0x58,0xab,0xac,0xfa }, { 0x03,0x93,0x4b,0xe3 }, 
+    { 0xfa,0x55,0x20,0x30 }, { 0x6d,0xf6,0xad,0x76 },
+    { 0x76,0x91,0x88,0xcc }, { 0x4c,0x25,0xf5,0x02 }, 
+    { 0xd7,0xfc,0x4f,0xe5 }, { 0xcb,0xd7,0xc5,0x2a },
+    { 0x44,0x80,0x26,0x35 }, { 0xa3,0x8f,0xb5,0x62 }, 
+    { 0x5a,0x49,0xde,0xb1 }, { 0x1b,0x67,0x25,0xba }, 
+    { 0x0e,0x98,0x45,0xea }, { 0xc0,0xe1,0x5d,0xfe }, 
+    { 0x75,0x02,0xc3,0x2f }, { 0xf0,0x12,0x81,0x4c },
+    { 0x97,0xa3,0x8d,0x46 }, { 0xf9,0xc6,0x6b,0xd3 }, 
+    { 0x5f,0xe7,0x03,0x8f }, { 0x9c,0x95,0x15,0x92 },
+    { 0x7a,0xeb,0xbf,0x6d }, { 0x59,0xda,0x95,0x52 }, 
+    { 0x83,0x2d,0xd4,0xbe }, { 0x21,0xd3,0x58,0x74 },
+    { 0x69,0x29,0x49,0xe0 }, { 0xc8,0x44,0x8e,0xc9 }, 
+    { 0x89,0x6a,0x75,0xc2 }, { 0x79,0x78,0xf4,0x8e }, 
+    { 0x3e,0x6b,0x99,0x58 }, { 0x71,0xdd,0x27,0xb9 }, 
+    { 0x4f,0xb6,0xbe,0xe1 }, { 0xad,0x17,0xf0,0x88 },
+    { 0xac,0x66,0xc9,0x20 }, { 0x3a,0xb4,0x7d,0xce }, 
+    { 0x4a,0x18,0x63,0xdf }, { 0x31,0x82,0xe5,0x1a },
+    { 0x33,0x60,0x97,0x51 }, { 0x7f,0x45,0x62,0x53 }, 
+    { 0x77,0xe0,0xb1,0x64 }, { 0xae,0x84,0xbb,0x6b },
+    { 0xa0,0x1c,0xfe,0x81 }, { 0x2b,0x94,0xf9,0x08 }, 
+    { 0x68,0x58,0x70,0x48 }, { 0xfd,0x19,0x8f,0x45 },
+    { 0x6c,0x87,0x94,0xde }, { 0xf8,0xb7,0x52,0x7b }, 
+    { 0xd3,0x23,0xab,0x73 }, { 0x02,0xe2,0x72,0x4b },
+    { 0x8f,0x57,0xe3,0x1f }, { 0xab,0x2a,0x66,0x55 }, 
+    { 0x28,0x07,0xb2,0xeb }, { 0xc2,0x03,0x2f,0xb5 },
+    { 0x7b,0x9a,0x86,0xc5 }, { 0x08,0xa5,0xd3,0x37 }, 
+    { 0x87,0xf2,0x30,0x28 }, { 0xa5,0xb2,0x23,0xbf },
+    { 0x6a,0xba,0x02,0x03 }, { 0x82,0x5c,0xed,0x16 }, 
+    { 0x1c,0x2b,0x8a,0xcf }, { 0xb4,0x92,0xa7,0x79 }, 
+    { 0xf2,0xf0,0xf3,0x07 }, { 0xe2,0xa1,0x4e,0x69 }, 
+    { 0xf4,0xcd,0x65,0xda }, { 0xbe,0xd5,0x06,0x05 },
+    { 0x62,0x1f,0xd1,0x34 }, { 0xfe,0x8a,0xc4,0xa6 }, 
+    { 0x53,0x9d,0x34,0x2e }, { 0x55,0xa0,0xa2,0xf3 },
+    { 0xe1,0x32,0x05,0x8a }, { 0xeb,0x75,0xa4,0xf6 }, 
+    { 0xec,0x39,0x0b,0x83 }, { 0xef,0xaa,0x40,0x60 },
+    { 0x9f,0x06,0x5e,0x71 }, { 0x10,0x51,0xbd,0x6e }, 
+    { 0x8a,0xf9,0x3e,0x21 }, { 0x06,0x3d,0x96,0xdd },
+    { 0x05,0xae,0xdd,0x3e }, { 0xbd,0x46,0x4d,0xe6 }, 
+    { 0x8d,0xb5,0x91,0x54 }, { 0x5d,0x05,0x71,0xc4 },
+    { 0xd4,0x6f,0x04,0x06 }, { 0x15,0xff,0x60,0x50 }, 
+    { 0xfb,0x24,0x19,0x98 }, { 0xe9,0x97,0xd6,0xbd }, 
+    { 0x43,0xcc,0x89,0x40 }, { 0x9e,0x77,0x67,0xd9 }, 
+    { 0x42,0xbd,0xb0,0xe8 }, { 0x8b,0x88,0x07,0x89 },
+    { 0x5b,0x38,0xe7,0x19 }, { 0xee,0xdb,0x79,0xc8 }, 
+    { 0x0a,0x47,0xa1,0x7c }, { 0x0f,0xe9,0x7c,0x42 },
+    { 0x1e,0xc9,0xf8,0x84 }, { 0x00,0x00,0x00,0x00 }, 
+    { 0x86,0x83,0x09,0x80 }, { 0xed,0x48,0x32,0x2b },
+    { 0x70,0xac,0x1e,0x11 }, { 0x72,0x4e,0x6c,0x5a }, 
+    { 0xff,0xfb,0xfd,0x0e }, { 0x38,0x56,0x0f,0x85 },
+    { 0xd5,0x1e,0x3d,0xae }, { 0x39,0x27,0x36,0x2d }, 
+    { 0xd9,0x64,0x0a,0x0f }, { 0xa6,0x21,0x68,0x5c },
+    { 0x54,0xd1,0x9b,0x5b }, { 0x2e,0x3a,0x24,0x36 }, 
+    { 0x67,0xb1,0x0c,0x0a }, { 0xe7,0x0f,0x93,0x57 },
+    { 0x96,0xd2,0xb4,0xee }, { 0x91,0x9e,0x1b,0x9b }, 
+    { 0xc5,0x4f,0x80,0xc0 }, { 0x20,0xa2,0x61,0xdc },
+    { 0x4b,0x69,0x5a,0x77 }, { 0x1a,0x16,0x1c,0x12 }, 
+    { 0xba,0x0a,0xe2,0x93 }, { 0x2a,0xe5,0xc0,0xa0 },
+    { 0xe0,0x43,0x3c,0x22 }, { 0x17,0x1d,0x12,0x1b }, 
+    { 0x0d,0x0b,0x0e,0x09 }, { 0xc7,0xad,0xf2,0x8b },
+    { 0xa8,0xb9,0x2d,0xb6 }, { 0xa9,0xc8,0x14,0x1e }, 
+    { 0x19,0x85,0x57,0xf1 }, { 0x07,0x4c,0xaf,0x75 },
+    { 0xdd,0xbb,0xee,0x99 }, { 0x60,0xfd,0xa3,0x7f }, 
+    { 0x26,0x9f,0xf7,0x01 }, { 0xf5,0xbc,0x5c,0x72 },
+    { 0x3b,0xc5,0x44,0x66 }, { 0x7e,0x34,0x5b,0xfb }, 
+    { 0x29,0x76,0x8b,0x43 }, { 0xc6,0xdc,0xcb,0x23 },
+    { 0xfc,0x68,0xb6,0xed }, { 0xf1,0x63,0xb8,0xe4 }, 
+    { 0xdc,0xca,0xd7,0x31 }, { 0x85,0x10,0x42,0x63 },
+    { 0x22,0x40,0x13,0x97 }, { 0x11,0x20,0x84,0xc6 }, 
+    { 0x24,0x7d,0x85,0x4a }, { 0x3d,0xf8,0xd2,0xbb },
+    { 0x32,0x11,0xae,0xf9 }, { 0xa1,0x6d,0xc7,0x29 }, 
+    { 0x2f,0x4b,0x1d,0x9e }, { 0x30,0xf3,0xdc,0xb2 },
+    { 0x52,0xec,0x0d,0x86 }, { 0xe3,0xd0,0x77,0xc1 }, 
+    { 0x16,0x6c,0x2b,0xb3 }, { 0xb9,0x99,0xa9,0x70 },
+    { 0x48,0xfa,0x11,0x94 }, { 0x64,0x22,0x47,0xe9 }, 
+    { 0x8c,0xc4,0xa8,0xfc }, { 0x3f,0x1a,0xa0,0xf0 },
+    { 0x2c,0xd8,0x56,0x7d }, { 0x90,0xef,0x22,0x33 }, 
+    { 0x4e,0xc7,0x87,0x49 }, { 0xd1,0xc1,0xd9,0x38 },
+    { 0xa2,0xfe,0x8c,0xca }, { 0x0b,0x36,0x98,0xd4 }, 
+    { 0x81,0xcf,0xa6,0xf5 }, { 0xde,0x28,0xa5,0x7a },
+    { 0x8e,0x26,0xda,0xb7 }, { 0xbf,0xa4,0x3f,0xad }, 
+    { 0x9d,0xe4,0x2c,0x3a }, { 0x92,0x0d,0x50,0x78 },
+    { 0xcc,0x9b,0x6a,0x5f }, { 0x46,0x62,0x54,0x7e }, 
+    { 0x13,0xc2,0xf6,0x8d }, { 0xb8,0xe8,0x90,0xd8 },
+    { 0xf7,0x5e,0x2e,0x39 }, { 0xaf,0xf5,0x82,0xc3 }, 
+    { 0x80,0xbe,0x9f,0x5d }, { 0x93,0x7c,0x69,0xd0 },
+    { 0x2d,0xa9,0x6f,0xd5 }, { 0x12,0xb3,0xcf,0x25 }, 
+    { 0x99,0x3b,0xc8,0xac }, { 0x7d,0xa7,0x10,0x18 },
+    { 0x63,0x6e,0xe8,0x9c }, { 0xbb,0x7b,0xdb,0x3b }, 
+    { 0x78,0x09,0xcd,0x26 }, { 0x18,0xf4,0x6e,0x59 }, 
+    { 0xb7,0x01,0xec,0x9a }, { 0x9a,0xa8,0x83,0x4f }, 
+    { 0x6e,0x65,0xe6,0x95 }, { 0xe6,0x7e,0xaa,0xff },
+    { 0xcf,0x08,0x21,0xbc }, { 0xe8,0xe6,0xef,0x15 }, 
+    { 0x9b,0xd9,0xba,0xe7 }, { 0x36,0xce,0x4a,0x6f },
+    { 0x09,0xd4,0xea,0x9f }, { 0x7c,0xd6,0x29,0xb0 }, 
+    { 0xb2,0xaf,0x31,0xa4 }, { 0x23,0x31,0x2a,0x3f },
+    { 0x94,0x30,0xc6,0xa5 }, { 0x66,0xc0,0x35,0xa2 }, 
+    { 0xbc,0x37,0x74,0x4e }, { 0xca,0xa6,0xfc,0x82 },
+    { 0xd0,0xb0,0xe0,0x90 }, { 0xd8,0x15,0x33,0xa7 }, 
+    { 0x98,0x4a,0xf1,0x04 }, { 0xda,0xf7,0x41,0xec },
+    { 0x50,0x0e,0x7f,0xcd }, { 0xf6,0x2f,0x17,0x91 }, 
+    { 0xd6,0x8d,0x76,0x4d }, { 0xb0,0x4d,0x43,0xef }, 
+    { 0x4d,0x54,0xcc,0xaa }, { 0x04,0xdf,0xe4,0x96 }, 
+    { 0xb5,0xe3,0x9e,0xd1 }, { 0x88,0x1b,0x4c,0x6a },
+    { 0x1f,0xb8,0xc1,0x2c }, { 0x51,0x7f,0x46,0x65 }, 
+    { 0xea,0x04,0x9d,0x5e }, { 0x35,0x5d,0x01,0x8c },
+    { 0x74,0x73,0xfa,0x87 }, { 0x41,0x2e,0xfb,0x0b }, 
+    { 0x1d,0x5a,0xb3,0x67 }, { 0xd2,0x52,0x92,0xdb },
+    { 0x56,0x33,0xe9,0x10 }, { 0x47,0x13,0x6d,0xd6 }, 
+    { 0x61,0x8c,0x9a,0xd7 }, { 0x0c,0x7a,0x37,0xa1 },
+    { 0x14,0x8e,0x59,0xf8 }, { 0x3c,0x89,0xeb,0x13 }, 
+    { 0x27,0xee,0xce,0xa9 }, { 0xc9,0x35,0xb7,0x61 },
+    { 0xe5,0xed,0xe1,0x1c }, { 0xb1,0x3c,0x7a,0x47 }, 
+    { 0xdf,0x59,0x9c,0xd2 }, { 0x73,0x3f,0x55,0xf2 },
+    { 0xce,0x79,0x18,0x14 }, { 0x37,0xbf,0x73,0xc7 }, 
+    { 0xcd,0xea,0x53,0xf7 }, { 0xaa,0x5b,0x5f,0xfd },
+    { 0x6f,0x14,0xdf,0x3d }, { 0xdb,0x86,0x78,0x44 }, 
+    { 0xf3,0x81,0xca,0xaf }, { 0xc4,0x3e,0xb9,0x68 },
+    { 0x34,0x2c,0x38,0x24 }, { 0x40,0x5f,0xc2,0xa3 }, 
+    { 0xc3,0x72,0x16,0x1d }, { 0x25,0x0c,0xbc,0xe2 },
+    { 0x49,0x8b,0x28,0x3c }, { 0x95,0x41,0xff,0x0d }, 
+    { 0x01,0x71,0x39,0xa8 }, { 0xb3,0xde,0x08,0x0c },
+    { 0xe4,0x9c,0xd8,0xb4 }, { 0xc1,0x90,0x64,0x56 }, 
+    { 0x84,0x61,0x7b,0xcb }, { 0xb6,0x70,0xd5,0x32 },
+    { 0x5c,0x74,0x48,0x6c }, { 0x57,0x42,0xd0,0xb8 }
+};
+
+static const byte  T8[256][4] = {
+    { 0xf4,0xa7,0x50,0x51 }, { 0x41,0x65,0x53,0x7e },
+    { 0x17,0xa4,0xc3,0x1a }, { 0x27,0x5e,0x96,0x3a }, 
+    { 0xab,0x6b,0xcb,0x3b }, { 0x9d,0x45,0xf1,0x1f },
+    { 0xfa,0x58,0xab,0xac }, { 0xe3,0x03,0x93,0x4b }, 
+    { 0x30,0xfa,0x55,0x20 }, { 0x76,0x6d,0xf6,0xad },
+    { 0xcc,0x76,0x91,0x88 }, { 0x02,0x4c,0x25,0xf5 }, 
+    { 0xe5,0xd7,0xfc,0x4f }, { 0x2a,0xcb,0xd7,0xc5 },
+    { 0x35,0x44,0x80,0x26 }, { 0x62,0xa3,0x8f,0xb5 }, 
+    { 0xb1,0x5a,0x49,0xde }, { 0xba,0x1b,0x67,0x25 },
+    { 0xea,0x0e,0x98,0x45 }, { 0xfe,0xc0,0xe1,0x5d }, 
+    { 0x2f,0x75,0x02,0xc3 }, { 0x4c,0xf0,0x12,0x81 },
+    { 0x46,0x97,0xa3,0x8d }, { 0xd3,0xf9,0xc6,0x6b }, 
+    { 0x8f,0x5f,0xe7,0x03 }, { 0x92,0x9c,0x95,0x15 },
+    { 0x6d,0x7a,0xeb,0xbf }, { 0x52,0x59,0xda,0x95 }, 
+    { 0xbe,0x83,0x2d,0xd4 }, { 0x74,0x21,0xd3,0x58 },
+    { 0xe0,0x69,0x29,0x49 }, { 0xc9,0xc8,0x44,0x8e }, 
+    { 0xc2,0x89,0x6a,0x75 }, { 0x8e,0x79,0x78,0xf4 },
+    { 0x58,0x3e,0x6b,0x99 }, { 0xb9,0x71,0xdd,0x27 }, 
+    { 0xe1,0x4f,0xb6,0xbe }, { 0x88,0xad,0x17,0xf0 },
+    { 0x20,0xac,0x66,0xc9 }, { 0xce,0x3a,0xb4,0x7d }, 
+    { 0xdf,0x4a,0x18,0x63 }, { 0x1a,0x31,0x82,0xe5 },
+    { 0x51,0x33,0x60,0x97 }, { 0x53,0x7f,0x45,0x62 }, 
+    { 0x64,0x77,0xe0,0xb1 }, { 0x6b,0xae,0x84,0xbb },
+    { 0x81,0xa0,0x1c,0xfe }, { 0x08,0x2b,0x94,0xf9 }, 
+    { 0x48,0x68,0x58,0x70 }, { 0x45,0xfd,0x19,0x8f },
+    { 0xde,0x6c,0x87,0x94 }, { 0x7b,0xf8,0xb7,0x52 }, 
+    { 0x73,0xd3,0x23,0xab }, { 0x4b,0x02,0xe2,0x72 },
+    { 0x1f,0x8f,0x57,0xe3 }, { 0x55,0xab,0x2a,0x66 }, 
+    { 0xeb,0x28,0x07,0xb2 }, { 0xb5,0xc2,0x03,0x2f },
+    { 0xc5,0x7b,0x9a,0x86 }, { 0x37,0x08,0xa5,0xd3 }, 
+    { 0x28,0x87,0xf2,0x30 }, { 0xbf,0xa5,0xb2,0x23 },
+    { 0x03,0x6a,0xba,0x02 }, { 0x16,0x82,0x5c,0xed }, 
+    { 0xcf,0x1c,0x2b,0x8a }, { 0x79,0xb4,0x92,0xa7 },
+    { 0x07,0xf2,0xf0,0xf3 }, { 0x69,0xe2,0xa1,0x4e }, 
+    { 0xda,0xf4,0xcd,0x65 }, { 0x05,0xbe,0xd5,0x06 },
+    { 0x34,0x62,0x1f,0xd1 }, { 0xa6,0xfe,0x8a,0xc4 }, 
+    { 0x2e,0x53,0x9d,0x34 }, { 0xf3,0x55,0xa0,0xa2 },
+    { 0x8a,0xe1,0x32,0x05 }, { 0xf6,0xeb,0x75,0xa4 }, 
+    { 0x83,0xec,0x39,0x0b }, { 0x60,0xef,0xaa,0x40 },
+    { 0x71,0x9f,0x06,0x5e }, { 0x6e,0x10,0x51,0xbd }, 
+    { 0x21,0x8a,0xf9,0x3e }, { 0xdd,0x06,0x3d,0x96 },
+    { 0x3e,0x05,0xae,0xdd }, { 0xe6,0xbd,0x46,0x4d }, 
+    { 0x54,0x8d,0xb5,0x91 }, { 0xc4,0x5d,0x05,0x71 },
+    { 0x06,0xd4,0x6f,0x04 }, { 0x50,0x15,0xff,0x60 }, 
+    { 0x98,0xfb,0x24,0x19 }, { 0xbd,0xe9,0x97,0xd6 },
+    { 0x40,0x43,0xcc,0x89 }, { 0xd9,0x9e,0x77,0x67 }, 
+    { 0xe8,0x42,0xbd,0xb0 }, { 0x89,0x8b,0x88,0x07 },
+    { 0x19,0x5b,0x38,0xe7 }, { 0xc8,0xee,0xdb,0x79 }, 
+    { 0x7c,0x0a,0x47,0xa1 }, { 0x42,0x0f,0xe9,0x7c },
+    { 0x84,0x1e,0xc9,0xf8 }, { 0x00,0x00,0x00,0x00 }, 
+    { 0x80,0x86,0x83,0x09 }, { 0x2b,0xed,0x48,0x32 },
+    { 0x11,0x70,0xac,0x1e }, { 0x5a,0x72,0x4e,0x6c }, 
+    { 0x0e,0xff,0xfb,0xfd }, { 0x85,0x38,0x56,0x0f }, 
+    { 0xae,0xd5,0x1e,0x3d }, { 0x2d,0x39,0x27,0x36 }, 
+    { 0x0f,0xd9,0x64,0x0a }, { 0x5c,0xa6,0x21,0x68 },
+    { 0x5b,0x54,0xd1,0x9b }, { 0x36,0x2e,0x3a,0x24 }, 
+    { 0x0a,0x67,0xb1,0x0c }, { 0x57,0xe7,0x0f,0x93 },
+    { 0xee,0x96,0xd2,0xb4 }, { 0x9b,0x91,0x9e,0x1b }, 
+    { 0xc0,0xc5,0x4f,0x80 }, { 0xdc,0x20,0xa2,0x61 },
+    { 0x77,0x4b,0x69,0x5a }, { 0x12,0x1a,0x16,0x1c }, 
+    { 0x93,0xba,0x0a,0xe2 }, { 0xa0,0x2a,0xe5,0xc0 },
+    { 0x22,0xe0,0x43,0x3c }, { 0x1b,0x17,0x1d,0x12 }, 
+    { 0x09,0x0d,0x0b,0x0e }, { 0x8b,0xc7,0xad,0xf2 },
+    { 0xb6,0xa8,0xb9,0x2d }, { 0x1e,0xa9,0xc8,0x14 }, 
+    { 0xf1,0x19,0x85,0x57 }, { 0x75,0x07,0x4c,0xaf },
+    { 0x99,0xdd,0xbb,0xee }, { 0x7f,0x60,0xfd,0xa3 }, 
+    { 0x01,0x26,0x9f,0xf7 }, { 0x72,0xf5,0xbc,0x5c },
+    { 0x66,0x3b,0xc5,0x44 }, { 0xfb,0x7e,0x34,0x5b }, 
+    { 0x43,0x29,0x76,0x8b }, { 0x23,0xc6,0xdc,0xcb },
+    { 0xed,0xfc,0x68,0xb6 }, { 0xe4,0xf1,0x63,0xb8 }, 
+    { 0x31,0xdc,0xca,0xd7 }, { 0x63,0x85,0x10,0x42 },
+    { 0x97,0x22,0x40,0x13 }, { 0xc6,0x11,0x20,0x84 }, 
+    { 0x4a,0x24,0x7d,0x85 }, { 0xbb,0x3d,0xf8,0xd2 }, 
+    { 0xf9,0x32,0x11,0xae }, { 0x29,0xa1,0x6d,0xc7 }, 
+    { 0x9e,0x2f,0x4b,0x1d }, { 0xb2,0x30,0xf3,0xdc },
+    { 0x86,0x52,0xec,0x0d }, { 0xc1,0xe3,0xd0,0x77 }, 
+    { 0xb3,0x16,0x6c,0x2b }, { 0x70,0xb9,0x99,0xa9 },
+    { 0x94,0x48,0xfa,0x11 }, { 0xe9,0x64,0x22,0x47 }, 
+    { 0xfc,0x8c,0xc4,0xa8 }, { 0xf0,0x3f,0x1a,0xa0 },
+    { 0x7d,0x2c,0xd8,0x56 }, { 0x33,0x90,0xef,0x22 }, 
+    { 0x49,0x4e,0xc7,0x87 }, { 0x38,0xd1,0xc1,0xd9 },
+    { 0xca,0xa2,0xfe,0x8c }, { 0xd4,0x0b,0x36,0x98 }, 
+    { 0xf5,0x81,0xcf,0xa6 }, { 0x7a,0xde,0x28,0xa5 },
+    { 0xb7,0x8e,0x26,0xda }, { 0xad,0xbf,0xa4,0x3f }, 
+    { 0x3a,0x9d,0xe4,0x2c }, { 0x78,0x92,0x0d,0x50 },
+    { 0x5f,0xcc,0x9b,0x6a }, { 0x7e,0x46,0x62,0x54 }, 
+    { 0x8d,0x13,0xc2,0xf6 }, { 0xd8,0xb8,0xe8,0x90 },
+    { 0x39,0xf7,0x5e,0x2e }, { 0xc3,0xaf,0xf5,0x82 }, 
+    { 0x5d,0x80,0xbe,0x9f }, { 0xd0,0x93,0x7c,0x69 },
+    { 0xd5,0x2d,0xa9,0x6f }, { 0x25,0x12,0xb3,0xcf }, 
+    { 0xac,0x99,0x3b,0xc8 }, { 0x18,0x7d,0xa7,0x10 },
+    { 0x9c,0x63,0x6e,0xe8 }, { 0x3b,0xbb,0x7b,0xdb }, 
+    { 0x26,0x78,0x09,0xcd }, { 0x59,0x18,0xf4,0x6e },
+    { 0x9a,0xb7,0x01,0xec }, { 0x4f,0x9a,0xa8,0x83 }, 
+    { 0x95,0x6e,0x65,0xe6 }, { 0xff,0xe6,0x7e,0xaa },
+    { 0xbc,0xcf,0x08,0x21 }, { 0x15,0xe8,0xe6,0xef }, 
+    { 0xe7,0x9b,0xd9,0xba }, { 0x6f,0x36,0xce,0x4a },
+    { 0x9f,0x09,0xd4,0xea }, { 0xb0,0x7c,0xd6,0x29 }, 
+    { 0xa4,0xb2,0xaf,0x31 }, { 0x3f,0x23,0x31,0x2a },
+    { 0xa5,0x94,0x30,0xc6 }, { 0xa2,0x66,0xc0,0x35 }, 
+    { 0x4e,0xbc,0x37,0x74 }, { 0x82,0xca,0xa6,0xfc },
+    { 0x90,0xd0,0xb0,0xe0 }, { 0xa7,0xd8,0x15,0x33 }, 
+    { 0x04,0x98,0x4a,0xf1 }, { 0xec,0xda,0xf7,0x41 },
+    { 0xcd,0x50,0x0e,0x7f }, { 0x91,0xf6,0x2f,0x17 }, 
+    { 0x4d,0xd6,0x8d,0x76 }, { 0xef,0xb0,0x4d,0x43 }, 
+    { 0xaa,0x4d,0x54,0xcc }, { 0x96,0x04,0xdf,0xe4 }, 
+    { 0xd1,0xb5,0xe3,0x9e }, { 0x6a,0x88,0x1b,0x4c },
+    { 0x2c,0x1f,0xb8,0xc1 }, { 0x65,0x51,0x7f,0x46 }, 
+    { 0x5e,0xea,0x04,0x9d }, { 0x8c,0x35,0x5d,0x01 },
+    { 0x87,0x74,0x73,0xfa }, { 0x0b,0x41,0x2e,0xfb }, 
+    { 0x67,0x1d,0x5a,0xb3 }, { 0xdb,0xd2,0x52,0x92 },
+    { 0x10,0x56,0x33,0xe9 }, { 0xd6,0x47,0x13,0x6d }, 
+    { 0xd7,0x61,0x8c,0x9a }, { 0xa1,0x0c,0x7a,0x37 },
+    { 0xf8,0x14,0x8e,0x59 }, { 0x13,0x3c,0x89,0xeb }, 
+    { 0xa9,0x27,0xee,0xce }, { 0x61,0xc9,0x35,0xb7 },
+    { 0x1c,0xe5,0xed,0xe1 }, { 0x47,0xb1,0x3c,0x7a }, 
+    { 0xd2,0xdf,0x59,0x9c }, { 0xf2,0x73,0x3f,0x55 },
+    { 0x14,0xce,0x79,0x18 }, { 0xc7,0x37,0xbf,0x73 }, 
+    { 0xf7,0xcd,0xea,0x53 }, { 0xfd,0xaa,0x5b,0x5f },
+    { 0x3d,0x6f,0x14,0xdf }, { 0x44,0xdb,0x86,0x78 }, 
+    { 0xaf,0xf3,0x81,0xca }, { 0x68,0xc4,0x3e,0xb9 },
+    { 0x24,0x34,0x2c,0x38 }, { 0xa3,0x40,0x5f,0xc2 }, 
+    { 0x1d,0xc3,0x72,0x16 }, { 0xe2,0x25,0x0c,0xbc },
+    { 0x3c,0x49,0x8b,0x28 }, { 0x0d,0x95,0x41,0xff }, 
+    { 0xa8,0x01,0x71,0x39 }, { 0x0c,0xb3,0xde,0x08 },
+    { 0xb4,0xe4,0x9c,0xd8 }, { 0x56,0xc1,0x90,0x64 }, 
+    { 0xcb,0x84,0x61,0x7b }, { 0x32,0xb6,0x70,0xd5 },
+    { 0x6c,0x5c,0x74,0x48 }, { 0xb8,0x57,0x42,0xd0 }
+};
+
+static const byte S5[256] = {
+    0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38,
+    0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb,
+    0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87,
+    0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb,
+    0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d,
+    0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e,
+    0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2,
+    0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25,
+    0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16,
+    0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92,
+    0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda,
+    0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84,
+    0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a,
+    0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06,
+    0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02,
+    0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b,
+    0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea,
+    0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73,
+    0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85,
+    0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e,
+    0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89,
+    0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b,
+    0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20,
+    0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4,
+    0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31,
+    0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f,
+    0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d,
+    0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef,
+    0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0,
+    0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61,
+    0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26,
+    0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
+};
+
+static const byte U1[256][4] = {
+    { 0x00,0x00,0x00,0x00 }, { 0x0e,0x09,0x0d,0x0b },
+    { 0x1c,0x12,0x1a,0x16 }, { 0x12,0x1b,0x17,0x1d }, 
+    { 0x38,0x24,0x34,0x2c }, { 0x36,0x2d,0x39,0x27 },
+    { 0x24,0x36,0x2e,0x3a }, { 0x2a,0x3f,0x23,0x31 }, 
+    { 0x70,0x48,0x68,0x58 }, { 0x7e,0x41,0x65,0x53 },
+    { 0x6c,0x5a,0x72,0x4e }, { 0x62,0x53,0x7f,0x45 }, 
+    { 0x48,0x6c,0x5c,0x74 }, { 0x46,0x65,0x51,0x7f },
+    { 0x54,0x7e,0x46,0x62 }, { 0x5a,0x77,0x4b,0x69 }, 
+    { 0xe0,0x90,0xd0,0xb0 }, { 0xee,0x99,0xdd,0xbb },
+    { 0xfc,0x82,0xca,0xa6 }, { 0xf2,0x8b,0xc7,0xad }, 
+    { 0xd8,0xb4,0xe4,0x9c }, { 0xd6,0xbd,0xe9,0x97 },
+    { 0xc4,0xa6,0xfe,0x8a }, { 0xca,0xaf,0xf3,0x81 }, 
+    { 0x90,0xd8,0xb8,0xe8 }, { 0x9e,0xd1,0xb5,0xe3 },
+    { 0x8c,0xca,0xa2,0xfe }, { 0x82,0xc3,0xaf,0xf5 }, 
+    { 0xa8,0xfc,0x8c,0xc4 }, { 0xa6,0xf5,0x81,0xcf },
+    { 0xb4,0xee,0x96,0xd2 }, { 0xba,0xe7,0x9b,0xd9 }, 
+    { 0xdb,0x3b,0xbb,0x7b }, { 0xd5,0x32,0xb6,0x70 },
+    { 0xc7,0x29,0xa1,0x6d }, { 0xc9,0x20,0xac,0x66 }, 
+    { 0xe3,0x1f,0x8f,0x57 }, { 0xed,0x16,0x82,0x5c },
+    { 0xff,0x0d,0x95,0x41 }, { 0xf1,0x04,0x98,0x4a }, 
+    { 0xab,0x73,0xd3,0x23 }, { 0xa5,0x7a,0xde,0x28 },
+    { 0xb7,0x61,0xc9,0x35 }, { 0xb9,0x68,0xc4,0x3e }, 
+    { 0x93,0x57,0xe7,0x0f }, { 0x9d,0x5e,0xea,0x04 },
+    { 0x8f,0x45,0xfd,0x19 }, { 0x81,0x4c,0xf0,0x12 }, 
+    { 0x3b,0xab,0x6b,0xcb }, { 0x35,0xa2,0x66,0xc0 },
+    { 0x27,0xb9,0x71,0xdd }, { 0x29,0xb0,0x7c,0xd6 }, 
+    { 0x03,0x8f,0x5f,0xe7 }, { 0x0d,0x86,0x52,0xec },
+    { 0x1f,0x9d,0x45,0xf1 }, { 0x11,0x94,0x48,0xfa }, 
+    { 0x4b,0xe3,0x03,0x93 }, { 0x45,0xea,0x0e,0x98 },
+    { 0x57,0xf1,0x19,0x85 }, { 0x59,0xf8,0x14,0x8e }, 
+    { 0x73,0xc7,0x37,0xbf }, { 0x7d,0xce,0x3a,0xb4 },
+    { 0x6f,0xd5,0x2d,0xa9 }, { 0x61,0xdc,0x20,0xa2 }, 
+    { 0xad,0x76,0x6d,0xf6 }, { 0xa3,0x7f,0x60,0xfd },
+    { 0xb1,0x64,0x77,0xe0 }, { 0xbf,0x6d,0x7a,0xeb }, 
+    { 0x95,0x52,0x59,0xda }, { 0x9b,0x5b,0x54,0xd1 },
+    { 0x89,0x40,0x43,0xcc }, { 0x87,0x49,0x4e,0xc7 }, 
+    { 0xdd,0x3e,0x05,0xae }, { 0xd3,0x37,0x08,0xa5 },
+    { 0xc1,0x2c,0x1f,0xb8 }, { 0xcf,0x25,0x12,0xb3 }, 
+    { 0xe5,0x1a,0x31,0x82 }, { 0xeb,0x13,0x3c,0x89 },
+    { 0xf9,0x08,0x2b,0x94 }, { 0xf7,0x01,0x26,0x9f }, 
+    { 0x4d,0xe6,0xbd,0x46 }, { 0x43,0xef,0xb0,0x4d },
+    { 0x51,0xf4,0xa7,0x50 }, { 0x5f,0xfd,0xaa,0x5b }, 
+    { 0x75,0xc2,0x89,0x6a }, { 0x7b,0xcb,0x84,0x61 },
+    { 0x69,0xd0,0x93,0x7c }, { 0x67,0xd9,0x9e,0x77 }, 
+    { 0x3d,0xae,0xd5,0x1e }, { 0x33,0xa7,0xd8,0x15 },
+    { 0x21,0xbc,0xcf,0x08 }, { 0x2f,0xb5,0xc2,0x03 }, 
+    { 0x05,0x8a,0xe1,0x32 }, { 0x0b,0x83,0xec,0x39 },
+    { 0x19,0x98,0xfb,0x24 }, { 0x17,0x91,0xf6,0x2f }, 
+    { 0x76,0x4d,0xd6,0x8d }, { 0x78,0x44,0xdb,0x86 },
+    { 0x6a,0x5f,0xcc,0x9b }, { 0x64,0x56,0xc1,0x90 }, 
+    { 0x4e,0x69,0xe2,0xa1 }, { 0x40,0x60,0xef,0xaa },
+    { 0x52,0x7b,0xf8,0xb7 }, { 0x5c,0x72,0xf5,0xbc }, 
+    { 0x06,0x05,0xbe,0xd5 }, { 0x08,0x0c,0xb3,0xde },
+    { 0x1a,0x17,0xa4,0xc3 }, { 0x14,0x1e,0xa9,0xc8 }, 
+    { 0x3e,0x21,0x8a,0xf9 }, { 0x30,0x28,0x87,0xf2 },
+    { 0x22,0x33,0x90,0xef }, { 0x2c,0x3a,0x9d,0xe4 }, 
+    { 0x96,0xdd,0x06,0x3d }, { 0x98,0xd4,0x0b,0x36 },
+    { 0x8a,0xcf,0x1c,0x2b }, { 0x84,0xc6,0x11,0x20 }, 
+    { 0xae,0xf9,0x32,0x11 }, { 0xa0,0xf0,0x3f,0x1a },
+    { 0xb2,0xeb,0x28,0x07 }, { 0xbc,0xe2,0x25,0x0c }, 
+    { 0xe6,0x95,0x6e,0x65 }, { 0xe8,0x9c,0x63,0x6e },
+    { 0xfa,0x87,0x74,0x73 }, { 0xf4,0x8e,0x79,0x78 }, 
+    { 0xde,0xb1,0x5a,0x49 }, { 0xd0,0xb8,0x57,0x42 },
+    { 0xc2,0xa3,0x40,0x5f }, { 0xcc,0xaa,0x4d,0x54 }, 
+    { 0x41,0xec,0xda,0xf7 }, { 0x4f,0xe5,0xd7,0xfc },
+    { 0x5d,0xfe,0xc0,0xe1 }, { 0x53,0xf7,0xcd,0xea }, 
+    { 0x79,0xc8,0xee,0xdb }, { 0x77,0xc1,0xe3,0xd0 },
+    { 0x65,0xda,0xf4,0xcd }, { 0x6b,0xd3,0xf9,0xc6 }, 
+    { 0x31,0xa4,0xb2,0xaf }, { 0x3f,0xad,0xbf,0xa4 },
+    { 0x2d,0xb6,0xa8,0xb9 }, { 0x23,0xbf,0xa5,0xb2 }, 
+    { 0x09,0x80,0x86,0x83 }, { 0x07,0x89,0x8b,0x88 },
+    { 0x15,0x92,0x9c,0x95 }, { 0x1b,0x9b,0x91,0x9e }, 
+    { 0xa1,0x7c,0x0a,0x47 }, { 0xaf,0x75,0x07,0x4c },
+    { 0xbd,0x6e,0x10,0x51 }, { 0xb3,0x67,0x1d,0x5a }, 
+    { 0x99,0x58,0x3e,0x6b }, { 0x97,0x51,0x33,0x60 },
+    { 0x85,0x4a,0x24,0x7d }, { 0x8b,0x43,0x29,0x76 }, 
+    { 0xd1,0x34,0x62,0x1f }, { 0xdf,0x3d,0x6f,0x14 },
+    { 0xcd,0x26,0x78,0x09 }, { 0xc3,0x2f,0x75,0x02 }, 
+    { 0xe9,0x10,0x56,0x33 }, { 0xe7,0x19,0x5b,0x38 },
+    { 0xf5,0x02,0x4c,0x25 }, { 0xfb,0x0b,0x41,0x2e }, 
+    { 0x9a,0xd7,0x61,0x8c }, { 0x94,0xde,0x6c,0x87 }, 
+    { 0x86,0xc5,0x7b,0x9a }, { 0x88,0xcc,0x76,0x91 }, 
+    { 0xa2,0xf3,0x55,0xa0 }, { 0xac,0xfa,0x58,0xab },
+    { 0xbe,0xe1,0x4f,0xb6 }, { 0xb0,0xe8,0x42,0xbd }, 
+    { 0xea,0x9f,0x09,0xd4 }, { 0xe4,0x96,0x04,0xdf },
+    { 0xf6,0x8d,0x13,0xc2 }, { 0xf8,0x84,0x1e,0xc9 }, 
+    { 0xd2,0xbb,0x3d,0xf8 }, { 0xdc,0xb2,0x30,0xf3 },
+    { 0xce,0xa9,0x27,0xee }, { 0xc0,0xa0,0x2a,0xe5 }, 
+    { 0x7a,0x47,0xb1,0x3c }, { 0x74,0x4e,0xbc,0x37 }, 
+    { 0x66,0x55,0xab,0x2a }, { 0x68,0x5c,0xa6,0x21 }, 
+    { 0x42,0x63,0x85,0x10 }, { 0x4c,0x6a,0x88,0x1b },
+    { 0x5e,0x71,0x9f,0x06 }, { 0x50,0x78,0x92,0x0d }, 
+    { 0x0a,0x0f,0xd9,0x64 }, { 0x04,0x06,0xd4,0x6f },
+    { 0x16,0x1d,0xc3,0x72 }, { 0x18,0x14,0xce,0x79 }, 
+    { 0x32,0x2b,0xed,0x48 }, { 0x3c,0x22,0xe0,0x43 },
+    { 0x2e,0x39,0xf7,0x5e }, { 0x20,0x30,0xfa,0x55 }, 
+    { 0xec,0x9a,0xb7,0x01 }, { 0xe2,0x93,0xba,0x0a },
+    { 0xf0,0x88,0xad,0x17 }, { 0xfe,0x81,0xa0,0x1c }, 
+    { 0xd4,0xbe,0x83,0x2d }, { 0xda,0xb7,0x8e,0x26 },
+    { 0xc8,0xac,0x99,0x3b }, { 0xc6,0xa5,0x94,0x30 }, 
+    { 0x9c,0xd2,0xdf,0x59 }, { 0x92,0xdb,0xd2,0x52 },
+    { 0x80,0xc0,0xc5,0x4f }, { 0x8e,0xc9,0xc8,0x44 }, 
+    { 0xa4,0xf6,0xeb,0x75 }, { 0xaa,0xff,0xe6,0x7e },
+    { 0xb8,0xe4,0xf1,0x63 }, { 0xb6,0xed,0xfc,0x68 }, 
+    { 0x0c,0x0a,0x67,0xb1 }, { 0x02,0x03,0x6a,0xba },
+    { 0x10,0x18,0x7d,0xa7 }, { 0x1e,0x11,0x70,0xac }, 
+    { 0x34,0x2e,0x53,0x9d }, { 0x3a,0x27,0x5e,0x96 },
+    { 0x28,0x3c,0x49,0x8b }, { 0x26,0x35,0x44,0x80 }, 
+    { 0x7c,0x42,0x0f,0xe9 }, { 0x72,0x4b,0x02,0xe2 },
+    { 0x60,0x50,0x15,0xff }, { 0x6e,0x59,0x18,0xf4 }, 
+    { 0x44,0x66,0x3b,0xc5 }, { 0x4a,0x6f,0x36,0xce },
+    { 0x58,0x74,0x21,0xd3 }, { 0x56,0x7d,0x2c,0xd8 }, 
+    { 0x37,0xa1,0x0c,0x7a }, { 0x39,0xa8,0x01,0x71 },
+    { 0x2b,0xb3,0x16,0x6c }, { 0x25,0xba,0x1b,0x67 }, 
+    { 0x0f,0x85,0x38,0x56 }, { 0x01,0x8c,0x35,0x5d },
+    { 0x13,0x97,0x22,0x40 }, { 0x1d,0x9e,0x2f,0x4b }, 
+    { 0x47,0xe9,0x64,0x22 }, { 0x49,0xe0,0x69,0x29 },
+    { 0x5b,0xfb,0x7e,0x34 }, { 0x55,0xf2,0x73,0x3f }, 
+    { 0x7f,0xcd,0x50,0x0e }, { 0x71,0xc4,0x5d,0x05 },
+    { 0x63,0xdf,0x4a,0x18 }, { 0x6d,0xd6,0x47,0x13 }, 
+    { 0xd7,0x31,0xdc,0xca }, { 0xd9,0x38,0xd1,0xc1 },
+    { 0xcb,0x23,0xc6,0xdc }, { 0xc5,0x2a,0xcb,0xd7 }, 
+    { 0xef,0x15,0xe8,0xe6 }, { 0xe1,0x1c,0xe5,0xed },
+    { 0xf3,0x07,0xf2,0xf0 }, { 0xfd,0x0e,0xff,0xfb }, 
+    { 0xa7,0x79,0xb4,0x92 }, { 0xa9,0x70,0xb9,0x99 },
+    { 0xbb,0x6b,0xae,0x84 }, { 0xb5,0x62,0xa3,0x8f }, 
+    { 0x9f,0x5d,0x80,0xbe }, { 0x91,0x54,0x8d,0xb5 },
+    { 0x83,0x4f,0x9a,0xa8 }, { 0x8d,0x46,0x97,0xa3 }
+};
+
+static const byte U2[256][4] = {
+    { 0x00,0x00,0x00,0x00 }, { 0x0b,0x0e,0x09,0x0d },
+    { 0x16,0x1c,0x12,0x1a }, { 0x1d,0x12,0x1b,0x17 }, 
+    { 0x2c,0x38,0x24,0x34 }, { 0x27,0x36,0x2d,0x39 },
+    { 0x3a,0x24,0x36,0x2e }, { 0x31,0x2a,0x3f,0x23 }, 
+    { 0x58,0x70,0x48,0x68 }, { 0x53,0x7e,0x41,0x65 }, 
+    { 0x4e,0x6c,0x5a,0x72 }, { 0x45,0x62,0x53,0x7f }, 
+    { 0x74,0x48,0x6c,0x5c }, { 0x7f,0x46,0x65,0x51 },
+    { 0x62,0x54,0x7e,0x46 }, { 0x69,0x5a,0x77,0x4b }, 
+    { 0xb0,0xe0,0x90,0xd0 }, { 0xbb,0xee,0x99,0xdd }, 
+    { 0xa6,0xfc,0x82,0xca }, { 0xad,0xf2,0x8b,0xc7 }, 
+    { 0x9c,0xd8,0xb4,0xe4 }, { 0x97,0xd6,0xbd,0xe9 }, 
+    { 0x8a,0xc4,0xa6,0xfe }, { 0x81,0xca,0xaf,0xf3 }, 
+    { 0xe8,0x90,0xd8,0xb8 }, { 0xe3,0x9e,0xd1,0xb5 },
+    { 0xfe,0x8c,0xca,0xa2 }, { 0xf5,0x82,0xc3,0xaf }, 
+    { 0xc4,0xa8,0xfc,0x8c }, { 0xcf,0xa6,0xf5,0x81 }, 
+    { 0xd2,0xb4,0xee,0x96 }, { 0xd9,0xba,0xe7,0x9b }, 
+    { 0x7b,0xdb,0x3b,0xbb }, { 0x70,0xd5,0x32,0xb6 }, 
+    { 0x6d,0xc7,0x29,0xa1 }, { 0x66,0xc9,0x20,0xac }, 
+    { 0x57,0xe3,0x1f,0x8f }, { 0x5c,0xed,0x16,0x82 }, 
+    { 0x41,0xff,0x0d,0x95 }, { 0x4a,0xf1,0x04,0x98 }, 
+    { 0x23,0xab,0x73,0xd3 }, { 0x28,0xa5,0x7a,0xde },
+    { 0x35,0xb7,0x61,0xc9 }, { 0x3e,0xb9,0x68,0xc4 }, 
+    { 0x0f,0x93,0x57,0xe7 }, { 0x04,0x9d,0x5e,0xea },
+    { 0x19,0x8f,0x45,0xfd }, { 0x12,0x81,0x4c,0xf0 }, 
+    { 0xcb,0x3b,0xab,0x6b }, { 0xc0,0x35,0xa2,0x66 },
+    { 0xdd,0x27,0xb9,0x71 }, { 0xd6,0x29,0xb0,0x7c }, 
+    { 0xe7,0x03,0x8f,0x5f }, { 0xec,0x0d,0x86,0x52 },
+    { 0xf1,0x1f,0x9d,0x45 }, { 0xfa,0x11,0x94,0x48 }, 
+    { 0x93,0x4b,0xe3,0x03 }, { 0x98,0x45,0xea,0x0e }, 
+    { 0x85,0x57,0xf1,0x19 }, { 0x8e,0x59,0xf8,0x14 }, 
+    { 0xbf,0x73,0xc7,0x37 }, { 0xb4,0x7d,0xce,0x3a },
+    { 0xa9,0x6f,0xd5,0x2d }, { 0xa2,0x61,0xdc,0x20 }, 
+    { 0xf6,0xad,0x76,0x6d }, { 0xfd,0xa3,0x7f,0x60 }, 
+    { 0xe0,0xb1,0x64,0x77 }, { 0xeb,0xbf,0x6d,0x7a }, 
+    { 0xda,0x95,0x52,0x59 }, { 0xd1,0x9b,0x5b,0x54 }, 
+    { 0xcc,0x89,0x40,0x43 }, { 0xc7,0x87,0x49,0x4e }, 
+    { 0xae,0xdd,0x3e,0x05 }, { 0xa5,0xd3,0x37,0x08 },
+    { 0xb8,0xc1,0x2c,0x1f }, { 0xb3,0xcf,0x25,0x12 }, 
+    { 0x82,0xe5,0x1a,0x31 }, { 0x89,0xeb,0x13,0x3c },
+    { 0x94,0xf9,0x08,0x2b }, { 0x9f,0xf7,0x01,0x26 }, 
+    { 0x46,0x4d,0xe6,0xbd }, { 0x4d,0x43,0xef,0xb0 },
+    { 0x50,0x51,0xf4,0xa7 }, { 0x5b,0x5f,0xfd,0xaa }, 
+    { 0x6a,0x75,0xc2,0x89 }, { 0x61,0x7b,0xcb,0x84 },
+    { 0x7c,0x69,0xd0,0x93 }, { 0x77,0x67,0xd9,0x9e }, 
+    { 0x1e,0x3d,0xae,0xd5 }, { 0x15,0x33,0xa7,0xd8 },
+    { 0x08,0x21,0xbc,0xcf }, { 0x03,0x2f,0xb5,0xc2 }, 
+    { 0x32,0x05,0x8a,0xe1 }, { 0x39,0x0b,0x83,0xec },
+    { 0x24,0x19,0x98,0xfb }, { 0x2f,0x17,0x91,0xf6 }, 
+    { 0x8d,0x76,0x4d,0xd6 }, { 0x86,0x78,0x44,0xdb },
+    { 0x9b,0x6a,0x5f,0xcc }, { 0x90,0x64,0x56,0xc1 }, 
+    { 0xa1,0x4e,0x69,0xe2 }, { 0xaa,0x40,0x60,0xef },
+    { 0xb7,0x52,0x7b,0xf8 }, { 0xbc,0x5c,0x72,0xf5 }, 
+    { 0xd5,0x06,0x05,0xbe }, { 0xde,0x08,0x0c,0xb3 },
+    { 0xc3,0x1a,0x17,0xa4 }, { 0xc8,0x14,0x1e,0xa9 }, 
+    { 0xf9,0x3e,0x21,0x8a }, { 0xf2,0x30,0x28,0x87 },
+    { 0xef,0x22,0x33,0x90 }, { 0xe4,0x2c,0x3a,0x9d }, 
+    { 0x3d,0x96,0xdd,0x06 }, { 0x36,0x98,0xd4,0x0b },
+    { 0x2b,0x8a,0xcf,0x1c }, { 0x20,0x84,0xc6,0x11 }, 
+    { 0x11,0xae,0xf9,0x32 }, { 0x1a,0xa0,0xf0,0x3f },
+    { 0x07,0xb2,0xeb,0x28 }, { 0x0c,0xbc,0xe2,0x25 }, 
+    { 0x65,0xe6,0x95,0x6e }, { 0x6e,0xe8,0x9c,0x63 },
+    { 0x73,0xfa,0x87,0x74 }, { 0x78,0xf4,0x8e,0x79 }, 
+    { 0x49,0xde,0xb1,0x5a }, { 0x42,0xd0,0xb8,0x57 },
+    { 0x5f,0xc2,0xa3,0x40 }, { 0x54,0xcc,0xaa,0x4d }, 
+    { 0xf7,0x41,0xec,0xda }, { 0xfc,0x4f,0xe5,0xd7 },
+    { 0xe1,0x5d,0xfe,0xc0 }, { 0xea,0x53,0xf7,0xcd }, 
+    { 0xdb,0x79,0xc8,0xee }, { 0xd0,0x77,0xc1,0xe3 },
+    { 0xcd,0x65,0xda,0xf4 }, { 0xc6,0x6b,0xd3,0xf9 }, 
+    { 0xaf,0x31,0xa4,0xb2 }, { 0xa4,0x3f,0xad,0xbf },
+    { 0xb9,0x2d,0xb6,0xa8 }, { 0xb2,0x23,0xbf,0xa5 }, 
+    { 0x83,0x09,0x80,0x86 }, { 0x88,0x07,0x89,0x8b },
+    { 0x95,0x15,0x92,0x9c }, { 0x9e,0x1b,0x9b,0x91 }, 
+    { 0x47,0xa1,0x7c,0x0a }, { 0x4c,0xaf,0x75,0x07 },
+    { 0x51,0xbd,0x6e,0x10 }, { 0x5a,0xb3,0x67,0x1d }, 
+    { 0x6b,0x99,0x58,0x3e }, { 0x60,0x97,0x51,0x33 },
+    { 0x7d,0x85,0x4a,0x24 }, { 0x76,0x8b,0x43,0x29 }, 
+    { 0x1f,0xd1,0x34,0x62 }, { 0x14,0xdf,0x3d,0x6f },
+    { 0x09,0xcd,0x26,0x78 }, { 0x02,0xc3,0x2f,0x75 }, 
+    { 0x33,0xe9,0x10,0x56 }, { 0x38,0xe7,0x19,0x5b },
+    { 0x25,0xf5,0x02,0x4c }, { 0x2e,0xfb,0x0b,0x41 }, 
+    { 0x8c,0x9a,0xd7,0x61 }, { 0x87,0x94,0xde,0x6c },
+    { 0x9a,0x86,0xc5,0x7b }, { 0x91,0x88,0xcc,0x76 }, 
+    { 0xa0,0xa2,0xf3,0x55 }, { 0xab,0xac,0xfa,0x58 },
+    { 0xb6,0xbe,0xe1,0x4f }, { 0xbd,0xb0,0xe8,0x42 }, 
+    { 0xd4,0xea,0x9f,0x09 }, { 0xdf,0xe4,0x96,0x04 },
+    { 0xc2,0xf6,0x8d,0x13 }, { 0xc9,0xf8,0x84,0x1e }, 
+    { 0xf8,0xd2,0xbb,0x3d }, { 0xf3,0xdc,0xb2,0x30 },
+    { 0xee,0xce,0xa9,0x27 }, { 0xe5,0xc0,0xa0,0x2a }, 
+    { 0x3c,0x7a,0x47,0xb1 }, { 0x37,0x74,0x4e,0xbc },
+    { 0x2a,0x66,0x55,0xab }, { 0x21,0x68,0x5c,0xa6 }, 
+    { 0x10,0x42,0x63,0x85 }, { 0x1b,0x4c,0x6a,0x88 },
+    { 0x06,0x5e,0x71,0x9f }, { 0x0d,0x50,0x78,0x92 }, 
+    { 0x64,0x0a,0x0f,0xd9 }, { 0x6f,0x04,0x06,0xd4 },
+    { 0x72,0x16,0x1d,0xc3 }, { 0x79,0x18,0x14,0xce }, 
+    { 0x48,0x32,0x2b,0xed }, { 0x43,0x3c,0x22,0xe0 },
+    { 0x5e,0x2e,0x39,0xf7 }, { 0x55,0x20,0x30,0xfa }, 
+    { 0x01,0xec,0x9a,0xb7 }, { 0x0a,0xe2,0x93,0xba },
+    { 0x17,0xf0,0x88,0xad }, { 0x1c,0xfe,0x81,0xa0 }, 
+    { 0x2d,0xd4,0xbe,0x83 }, { 0x26,0xda,0xb7,0x8e },
+    { 0x3b,0xc8,0xac,0x99 }, { 0x30,0xc6,0xa5,0x94 }, 
+    { 0x59,0x9c,0xd2,0xdf }, { 0x52,0x92,0xdb,0xd2 },
+    { 0x4f,0x80,0xc0,0xc5 }, { 0x44,0x8e,0xc9,0xc8 }, 
+    { 0x75,0xa4,0xf6,0xeb }, { 0x7e,0xaa,0xff,0xe6 },
+    { 0x63,0xb8,0xe4,0xf1 }, { 0x68,0xb6,0xed,0xfc }, 
+    { 0xb1,0x0c,0x0a,0x67 }, { 0xba,0x02,0x03,0x6a },
+    { 0xa7,0x10,0x18,0x7d }, { 0xac,0x1e,0x11,0x70 }, 
+    { 0x9d,0x34,0x2e,0x53 }, { 0x96,0x3a,0x27,0x5e },
+    { 0x8b,0x28,0x3c,0x49 }, { 0x80,0x26,0x35,0x44 }, 
+    { 0xe9,0x7c,0x42,0x0f }, { 0xe2,0x72,0x4b,0x02 },
+    { 0xff,0x60,0x50,0x15 }, { 0xf4,0x6e,0x59,0x18 }, 
+    { 0xc5,0x44,0x66,0x3b }, { 0xce,0x4a,0x6f,0x36 },
+    { 0xd3,0x58,0x74,0x21 }, { 0xd8,0x56,0x7d,0x2c }, 
+    { 0x7a,0x37,0xa1,0x0c }, { 0x71,0x39,0xa8,0x01 },
+    { 0x6c,0x2b,0xb3,0x16 }, { 0x67,0x25,0xba,0x1b }, 
+    { 0x56,0x0f,0x85,0x38 }, { 0x5d,0x01,0x8c,0x35 },
+    { 0x40,0x13,0x97,0x22 }, { 0x4b,0x1d,0x9e,0x2f }, 
+    { 0x22,0x47,0xe9,0x64 }, { 0x29,0x49,0xe0,0x69 },
+    { 0x34,0x5b,0xfb,0x7e }, { 0x3f,0x55,0xf2,0x73 }, 
+    { 0x0e,0x7f,0xcd,0x50 }, { 0x05,0x71,0xc4,0x5d },
+    { 0x18,0x63,0xdf,0x4a }, { 0x13,0x6d,0xd6,0x47 }, 
+    { 0xca,0xd7,0x31,0xdc }, { 0xc1,0xd9,0x38,0xd1 },
+    { 0xdc,0xcb,0x23,0xc6 }, { 0xd7,0xc5,0x2a,0xcb }, 
+    { 0xe6,0xef,0x15,0xe8 }, { 0xed,0xe1,0x1c,0xe5 },
+    { 0xf0,0xf3,0x07,0xf2 }, { 0xfb,0xfd,0x0e,0xff }, 
+    { 0x92,0xa7,0x79,0xb4 }, { 0x99,0xa9,0x70,0xb9 },
+    { 0x84,0xbb,0x6b,0xae }, { 0x8f,0xb5,0x62,0xa3 }, 
+    { 0xbe,0x9f,0x5d,0x80 }, { 0xb5,0x91,0x54,0x8d },
+    { 0xa8,0x83,0x4f,0x9a }, { 0xa3,0x8d,0x46,0x97 }
+};
+
+static const byte U3[256][4] = {
+    { 0x00,0x00,0x00,0x00 }, { 0x0d,0x0b,0x0e,0x09 },
+    { 0x1a,0x16,0x1c,0x12 }, { 0x17,0x1d,0x12,0x1b }, 
+    { 0x34,0x2c,0x38,0x24 }, { 0x39,0x27,0x36,0x2d },
+    { 0x2e,0x3a,0x24,0x36 }, { 0x23,0x31,0x2a,0x3f }, 
+    { 0x68,0x58,0x70,0x48 }, { 0x65,0x53,0x7e,0x41 },
+    { 0x72,0x4e,0x6c,0x5a }, { 0x7f,0x45,0x62,0x53 }, 
+    { 0x5c,0x74,0x48,0x6c }, { 0x51,0x7f,0x46,0x65 },
+    { 0x46,0x62,0x54,0x7e }, { 0x4b,0x69,0x5a,0x77 }, 
+    { 0xd0,0xb0,0xe0,0x90 }, { 0xdd,0xbb,0xee,0x99 },
+    { 0xca,0xa6,0xfc,0x82 }, { 0xc7,0xad,0xf2,0x8b }, 
+    { 0xe4,0x9c,0xd8,0xb4 }, { 0xe9,0x97,0xd6,0xbd },
+    { 0xfe,0x8a,0xc4,0xa6 }, { 0xf3,0x81,0xca,0xaf }, 
+    { 0xb8,0xe8,0x90,0xd8 }, { 0xb5,0xe3,0x9e,0xd1 },
+    { 0xa2,0xfe,0x8c,0xca }, { 0xaf,0xf5,0x82,0xc3 }, 
+    { 0x8c,0xc4,0xa8,0xfc }, { 0x81,0xcf,0xa6,0xf5 },
+    { 0x96,0xd2,0xb4,0xee }, { 0x9b,0xd9,0xba,0xe7 }, 
+    { 0xbb,0x7b,0xdb,0x3b }, { 0xb6,0x70,0xd5,0x32 },
+    { 0xa1,0x6d,0xc7,0x29 }, { 0xac,0x66,0xc9,0x20 }, 
+    { 0x8f,0x57,0xe3,0x1f }, { 0x82,0x5c,0xed,0x16 },
+    { 0x95,0x41,0xff,0x0d }, { 0x98,0x4a,0xf1,0x04 }, 
+    { 0xd3,0x23,0xab,0x73 }, { 0xde,0x28,0xa5,0x7a },
+    { 0xc9,0x35,0xb7,0x61 }, { 0xc4,0x3e,0xb9,0x68 }, 
+    { 0xe7,0x0f,0x93,0x57 }, { 0xea,0x04,0x9d,0x5e },
+    { 0xfd,0x19,0x8f,0x45 }, { 0xf0,0x12,0x81,0x4c }, 
+    { 0x6b,0xcb,0x3b,0xab }, { 0x66,0xc0,0x35,0xa2 },
+    { 0x71,0xdd,0x27,0xb9 }, { 0x7c,0xd6,0x29,0xb0 }, 
+    { 0x5f,0xe7,0x03,0x8f }, { 0x52,0xec,0x0d,0x86 },
+    { 0x45,0xf1,0x1f,0x9d }, { 0x48,0xfa,0x11,0x94 }, 
+    { 0x03,0x93,0x4b,0xe3 }, { 0x0e,0x98,0x45,0xea },
+    { 0x19,0x85,0x57,0xf1 }, { 0x14,0x8e,0x59,0xf8 }, 
+    { 0x37,0xbf,0x73,0xc7 }, { 0x3a,0xb4,0x7d,0xce }, 
+    { 0x2d,0xa9,0x6f,0xd5 }, { 0x20,0xa2,0x61,0xdc }, 
+    { 0x6d,0xf6,0xad,0x76 }, { 0x60,0xfd,0xa3,0x7f },
+    { 0x77,0xe0,0xb1,0x64 }, { 0x7a,0xeb,0xbf,0x6d }, 
+    { 0x59,0xda,0x95,0x52 }, { 0x54,0xd1,0x9b,0x5b },
+    { 0x43,0xcc,0x89,0x40 }, { 0x4e,0xc7,0x87,0x49 }, 
+    { 0x05,0xae,0xdd,0x3e }, { 0x08,0xa5,0xd3,0x37 },
+    { 0x1f,0xb8,0xc1,0x2c }, { 0x12,0xb3,0xcf,0x25 }, 
+    { 0x31,0x82,0xe5,0x1a }, { 0x3c,0x89,0xeb,0x13 }, 
+    { 0x2b,0x94,0xf9,0x08 }, { 0x26,0x9f,0xf7,0x01 }, 
+    { 0xbd,0x46,0x4d,0xe6 }, { 0xb0,0x4d,0x43,0xef }, 
+    { 0xa7,0x50,0x51,0xf4 }, { 0xaa,0x5b,0x5f,0xfd }, 
+    { 0x89,0x6a,0x75,0xc2 }, { 0x84,0x61,0x7b,0xcb }, 
+    { 0x93,0x7c,0x69,0xd0 }, { 0x9e,0x77,0x67,0xd9 }, 
+    { 0xd5,0x1e,0x3d,0xae }, { 0xd8,0x15,0x33,0xa7 },
+    { 0xcf,0x08,0x21,0xbc }, { 0xc2,0x03,0x2f,0xb5 }, 
+    { 0xe1,0x32,0x05,0x8a }, { 0xec,0x39,0x0b,0x83 },
+    { 0xfb,0x24,0x19,0x98 }, { 0xf6,0x2f,0x17,0x91 }, 
+    { 0xd6,0x8d,0x76,0x4d }, { 0xdb,0x86,0x78,0x44 }, 
+    { 0xcc,0x9b,0x6a,0x5f }, { 0xc1,0x90,0x64,0x56 }, 
+    { 0xe2,0xa1,0x4e,0x69 }, { 0xef,0xaa,0x40,0x60 }, 
+    { 0xf8,0xb7,0x52,0x7b }, { 0xf5,0xbc,0x5c,0x72 }, 
+    { 0xbe,0xd5,0x06,0x05 }, { 0xb3,0xde,0x08,0x0c }, 
+    { 0xa4,0xc3,0x1a,0x17 }, { 0xa9,0xc8,0x14,0x1e }, 
+    { 0x8a,0xf9,0x3e,0x21 }, { 0x87,0xf2,0x30,0x28 },
+    { 0x90,0xef,0x22,0x33 }, { 0x9d,0xe4,0x2c,0x3a }, 
+    { 0x06,0x3d,0x96,0xdd }, { 0x0b,0x36,0x98,0xd4 },
+    { 0x1c,0x2b,0x8a,0xcf }, { 0x11,0x20,0x84,0xc6 }, 
+    { 0x32,0x11,0xae,0xf9 }, { 0x3f,0x1a,0xa0,0xf0 },
+    { 0x28,0x07,0xb2,0xeb }, { 0x25,0x0c,0xbc,0xe2 }, 
+    { 0x6e,0x65,0xe6,0x95 }, { 0x63,0x6e,0xe8,0x9c },
+    { 0x74,0x73,0xfa,0x87 }, { 0x79,0x78,0xf4,0x8e }, 
+    { 0x5a,0x49,0xde,0xb1 }, { 0x57,0x42,0xd0,0xb8 },
+    { 0x40,0x5f,0xc2,0xa3 }, { 0x4d,0x54,0xcc,0xaa }, 
+    { 0xda,0xf7,0x41,0xec }, { 0xd7,0xfc,0x4f,0xe5 },
+    { 0xc0,0xe1,0x5d,0xfe }, { 0xcd,0xea,0x53,0xf7 }, 
+    { 0xee,0xdb,0x79,0xc8 }, { 0xe3,0xd0,0x77,0xc1 },
+    { 0xf4,0xcd,0x65,0xda }, { 0xf9,0xc6,0x6b,0xd3 }, 
+    { 0xb2,0xaf,0x31,0xa4 }, { 0xbf,0xa4,0x3f,0xad },
+    { 0xa8,0xb9,0x2d,0xb6 }, { 0xa5,0xb2,0x23,0xbf }, 
+    { 0x86,0x83,0x09,0x80 }, { 0x8b,0x88,0x07,0x89 },
+    { 0x9c,0x95,0x15,0x92 }, { 0x91,0x9e,0x1b,0x9b }, 
+    { 0x0a,0x47,0xa1,0x7c }, { 0x07,0x4c,0xaf,0x75 },
+    { 0x10,0x51,0xbd,0x6e }, { 0x1d,0x5a,0xb3,0x67 }, 
+    { 0x3e,0x6b,0x99,0x58 }, { 0x33,0x60,0x97,0x51 },
+    { 0x24,0x7d,0x85,0x4a }, { 0x29,0x76,0x8b,0x43 }, 
+    { 0x62,0x1f,0xd1,0x34 }, { 0x6f,0x14,0xdf,0x3d },
+    { 0x78,0x09,0xcd,0x26 }, { 0x75,0x02,0xc3,0x2f }, 
+    { 0x56,0x33,0xe9,0x10 }, { 0x5b,0x38,0xe7,0x19 },
+    { 0x4c,0x25,0xf5,0x02 }, { 0x41,0x2e,0xfb,0x0b }, 
+    { 0x61,0x8c,0x9a,0xd7 }, { 0x6c,0x87,0x94,0xde },
+    { 0x7b,0x9a,0x86,0xc5 }, { 0x76,0x91,0x88,0xcc }, 
+    { 0x55,0xa0,0xa2,0xf3 }, { 0x58,0xab,0xac,0xfa },
+    { 0x4f,0xb6,0xbe,0xe1 }, { 0x42,0xbd,0xb0,0xe8 }, 
+    { 0x09,0xd4,0xea,0x9f }, { 0x04,0xdf,0xe4,0x96 },
+    { 0x13,0xc2,0xf6,0x8d }, { 0x1e,0xc9,0xf8,0x84 }, 
+    { 0x3d,0xf8,0xd2,0xbb }, { 0x30,0xf3,0xdc,0xb2 },
+    { 0x27,0xee,0xce,0xa9 }, { 0x2a,0xe5,0xc0,0xa0 }, 
+    { 0xb1,0x3c,0x7a,0x47 }, { 0xbc,0x37,0x74,0x4e },
+    { 0xab,0x2a,0x66,0x55 }, { 0xa6,0x21,0x68,0x5c }, 
+    { 0x85,0x10,0x42,0x63 }, { 0x88,0x1b,0x4c,0x6a },
+    { 0x9f,0x06,0x5e,0x71 }, { 0x92,0x0d,0x50,0x78 }, 
+    { 0xd9,0x64,0x0a,0x0f }, { 0xd4,0x6f,0x04,0x06 },
+    { 0xc3,0x72,0x16,0x1d }, { 0xce,0x79,0x18,0x14 }, 
+    { 0xed,0x48,0x32,0x2b }, { 0xe0,0x43,0x3c,0x22 },
+    { 0xf7,0x5e,0x2e,0x39 }, { 0xfa,0x55,0x20,0x30 }, 
+    { 0xb7,0x01,0xec,0x9a }, { 0xba,0x0a,0xe2,0x93 },
+    { 0xad,0x17,0xf0,0x88 }, { 0xa0,0x1c,0xfe,0x81 }, 
+    { 0x83,0x2d,0xd4,0xbe }, { 0x8e,0x26,0xda,0xb7 },
+    { 0x99,0x3b,0xc8,0xac }, { 0x94,0x30,0xc6,0xa5 }, 
+    { 0xdf,0x59,0x9c,0xd2 }, { 0xd2,0x52,0x92,0xdb },
+    { 0xc5,0x4f,0x80,0xc0 }, { 0xc8,0x44,0x8e,0xc9 }, 
+    { 0xeb,0x75,0xa4,0xf6 }, { 0xe6,0x7e,0xaa,0xff },
+    { 0xf1,0x63,0xb8,0xe4 }, { 0xfc,0x68,0xb6,0xed }, 
+    { 0x67,0xb1,0x0c,0x0a }, { 0x6a,0xba,0x02,0x03 },
+    { 0x7d,0xa7,0x10,0x18 }, { 0x70,0xac,0x1e,0x11 }, 
+    { 0x53,0x9d,0x34,0x2e }, { 0x5e,0x96,0x3a,0x27 },
+    { 0x49,0x8b,0x28,0x3c }, { 0x44,0x80,0x26,0x35 }, 
+    { 0x0f,0xe9,0x7c,0x42 }, { 0x02,0xe2,0x72,0x4b },
+    { 0x15,0xff,0x60,0x50 }, { 0x18,0xf4,0x6e,0x59 }, 
+    { 0x3b,0xc5,0x44,0x66 }, { 0x36,0xce,0x4a,0x6f },
+    { 0x21,0xd3,0x58,0x74 }, { 0x2c,0xd8,0x56,0x7d }, 
+    { 0x0c,0x7a,0x37,0xa1 }, { 0x01,0x71,0x39,0xa8 },
+    { 0x16,0x6c,0x2b,0xb3 }, { 0x1b,0x67,0x25,0xba }, 
+    { 0x38,0x56,0x0f,0x85 }, { 0x35,0x5d,0x01,0x8c },
+    { 0x22,0x40,0x13,0x97 }, { 0x2f,0x4b,0x1d,0x9e }, 
+    { 0x64,0x22,0x47,0xe9 }, { 0x69,0x29,0x49,0xe0 },
+    { 0x7e,0x34,0x5b,0xfb }, { 0x73,0x3f,0x55,0xf2 }, 
+    { 0x50,0x0e,0x7f,0xcd }, { 0x5d,0x05,0x71,0xc4 },
+    { 0x4a,0x18,0x63,0xdf }, { 0x47,0x13,0x6d,0xd6 }, 
+    { 0xdc,0xca,0xd7,0x31 }, { 0xd1,0xc1,0xd9,0x38 },
+    { 0xc6,0xdc,0xcb,0x23 }, { 0xcb,0xd7,0xc5,0x2a }, 
+    { 0xe8,0xe6,0xef,0x15 }, { 0xe5,0xed,0xe1,0x1c },
+    { 0xf2,0xf0,0xf3,0x07 }, { 0xff,0xfb,0xfd,0x0e }, 
+    { 0xb4,0x92,0xa7,0x79 }, { 0xb9,0x99,0xa9,0x70 },
+    { 0xae,0x84,0xbb,0x6b }, { 0xa3,0x8f,0xb5,0x62 }, 
+    { 0x80,0xbe,0x9f,0x5d }, { 0x8d,0xb5,0x91,0x54 },
+    { 0x9a,0xa8,0x83,0x4f }, { 0x97,0xa3,0x8d,0x46 }
+};
+
+static const byte U4[256][4] = {
+    { 0x00,0x00,0x00,0x00 }, { 0x09,0x0d,0x0b,0x0e },
+    { 0x12,0x1a,0x16,0x1c }, { 0x1b,0x17,0x1d,0x12 }, 
+    { 0x24,0x34,0x2c,0x38 }, { 0x2d,0x39,0x27,0x36 },
+    { 0x36,0x2e,0x3a,0x24 }, { 0x3f,0x23,0x31,0x2a }, 
+    { 0x48,0x68,0x58,0x70 }, { 0x41,0x65,0x53,0x7e },
+    { 0x5a,0x72,0x4e,0x6c }, { 0x53,0x7f,0x45,0x62 }, 
+    { 0x6c,0x5c,0x74,0x48 }, { 0x65,0x51,0x7f,0x46 },
+    { 0x7e,0x46,0x62,0x54 }, { 0x77,0x4b,0x69,0x5a }, 
+    { 0x90,0xd0,0xb0,0xe0 }, { 0x99,0xdd,0xbb,0xee },
+    { 0x82,0xca,0xa6,0xfc }, { 0x8b,0xc7,0xad,0xf2 }, 
+    { 0xb4,0xe4,0x9c,0xd8 }, { 0xbd,0xe9,0x97,0xd6 },
+    { 0xa6,0xfe,0x8a,0xc4 }, { 0xaf,0xf3,0x81,0xca }, 
+    { 0xd8,0xb8,0xe8,0x90 }, { 0xd1,0xb5,0xe3,0x9e },
+    { 0xca,0xa2,0xfe,0x8c }, { 0xc3,0xaf,0xf5,0x82 }, 
+    { 0xfc,0x8c,0xc4,0xa8 }, { 0xf5,0x81,0xcf,0xa6 },
+    { 0xee,0x96,0xd2,0xb4 }, { 0xe7,0x9b,0xd9,0xba }, 
+    { 0x3b,0xbb,0x7b,0xdb }, { 0x32,0xb6,0x70,0xd5 },
+    { 0x29,0xa1,0x6d,0xc7 }, { 0x20,0xac,0x66,0xc9 }, 
+    { 0x1f,0x8f,0x57,0xe3 }, { 0x16,0x82,0x5c,0xed },
+    { 0x0d,0x95,0x41,0xff }, { 0x04,0x98,0x4a,0xf1 }, 
+    { 0x73,0xd3,0x23,0xab }, { 0x7a,0xde,0x28,0xa5 },
+    { 0x61,0xc9,0x35,0xb7 }, { 0x68,0xc4,0x3e,0xb9 }, 
+    { 0x57,0xe7,0x0f,0x93 }, { 0x5e,0xea,0x04,0x9d },
+    { 0x45,0xfd,0x19,0x8f }, { 0x4c,0xf0,0x12,0x81 }, 
+    { 0xab,0x6b,0xcb,0x3b }, { 0xa2,0x66,0xc0,0x35 },
+    { 0xb9,0x71,0xdd,0x27 }, { 0xb0,0x7c,0xd6,0x29 }, 
+    { 0x8f,0x5f,0xe7,0x03 }, { 0x86,0x52,0xec,0x0d },
+    { 0x9d,0x45,0xf1,0x1f }, { 0x94,0x48,0xfa,0x11 }, 
+    { 0xe3,0x03,0x93,0x4b }, { 0xea,0x0e,0x98,0x45 },
+    { 0xf1,0x19,0x85,0x57 }, { 0xf8,0x14,0x8e,0x59 }, 
+    { 0xc7,0x37,0xbf,0x73 }, { 0xce,0x3a,0xb4,0x7d },
+    { 0xd5,0x2d,0xa9,0x6f }, { 0xdc,0x20,0xa2,0x61 }, 
+    { 0x76,0x6d,0xf6,0xad }, { 0x7f,0x60,0xfd,0xa3 },
+    { 0x64,0x77,0xe0,0xb1 }, { 0x6d,0x7a,0xeb,0xbf }, 
+    { 0x52,0x59,0xda,0x95 }, { 0x5b,0x54,0xd1,0x9b },
+    { 0x40,0x43,0xcc,0x89 }, { 0x49,0x4e,0xc7,0x87 }, 
+    { 0x3e,0x05,0xae,0xdd }, { 0x37,0x08,0xa5,0xd3 },
+    { 0x2c,0x1f,0xb8,0xc1 }, { 0x25,0x12,0xb3,0xcf }, 
+    { 0x1a,0x31,0x82,0xe5 }, { 0x13,0x3c,0x89,0xeb },
+    { 0x08,0x2b,0x94,0xf9 }, { 0x01,0x26,0x9f,0xf7 }, 
+    { 0xe6,0xbd,0x46,0x4d }, { 0xef,0xb0,0x4d,0x43 },
+    { 0xf4,0xa7,0x50,0x51 }, { 0xfd,0xaa,0x5b,0x5f }, 
+    { 0xc2,0x89,0x6a,0x75 }, { 0xcb,0x84,0x61,0x7b },
+    { 0xd0,0x93,0x7c,0x69 }, { 0xd9,0x9e,0x77,0x67 }, 
+    { 0xae,0xd5,0x1e,0x3d }, { 0xa7,0xd8,0x15,0x33 },
+    { 0xbc,0xcf,0x08,0x21 }, { 0xb5,0xc2,0x03,0x2f }, 
+    { 0x8a,0xe1,0x32,0x05 }, { 0x83,0xec,0x39,0x0b },
+    { 0x98,0xfb,0x24,0x19 }, { 0x91,0xf6,0x2f,0x17 }, 
+    { 0x4d,0xd6,0x8d,0x76 }, { 0x44,0xdb,0x86,0x78 },
+    { 0x5f,0xcc,0x9b,0x6a }, { 0x56,0xc1,0x90,0x64 }, 
+    { 0x69,0xe2,0xa1,0x4e }, { 0x60,0xef,0xaa,0x40 },
+    { 0x7b,0xf8,0xb7,0x52 }, { 0x72,0xf5,0xbc,0x5c }, 
+    { 0x05,0xbe,0xd5,0x06 }, { 0x0c,0xb3,0xde,0x08 },
+    { 0x17,0xa4,0xc3,0x1a }, { 0x1e,0xa9,0xc8,0x14 }, 
+    { 0x21,0x8a,0xf9,0x3e }, { 0x28,0x87,0xf2,0x30 },
+    { 0x33,0x90,0xef,0x22 }, { 0x3a,0x9d,0xe4,0x2c }, 
+    { 0xdd,0x06,0x3d,0x96 }, { 0xd4,0x0b,0x36,0x98 },
+    { 0xcf,0x1c,0x2b,0x8a }, { 0xc6,0x11,0x20,0x84 }, 
+    { 0xf9,0x32,0x11,0xae }, { 0xf0,0x3f,0x1a,0xa0 },
+    { 0xeb,0x28,0x07,0xb2 }, { 0xe2,0x25,0x0c,0xbc }, 
+    { 0x95,0x6e,0x65,0xe6 }, { 0x9c,0x63,0x6e,0xe8 },
+    { 0x87,0x74,0x73,0xfa }, { 0x8e,0x79,0x78,0xf4 }, 
+    { 0xb1,0x5a,0x49,0xde }, { 0xb8,0x57,0x42,0xd0 },
+    { 0xa3,0x40,0x5f,0xc2 }, { 0xaa,0x4d,0x54,0xcc }, 
+    { 0xec,0xda,0xf7,0x41 }, { 0xe5,0xd7,0xfc,0x4f },
+    { 0xfe,0xc0,0xe1,0x5d }, { 0xf7,0xcd,0xea,0x53 }, 
+    { 0xc8,0xee,0xdb,0x79 }, { 0xc1,0xe3,0xd0,0x77 },
+    { 0xda,0xf4,0xcd,0x65 }, { 0xd3,0xf9,0xc6,0x6b }, 
+    { 0xa4,0xb2,0xaf,0x31 }, { 0xad,0xbf,0xa4,0x3f },
+    { 0xb6,0xa8,0xb9,0x2d }, { 0xbf,0xa5,0xb2,0x23 }, 
+    { 0x80,0x86,0x83,0x09 }, { 0x89,0x8b,0x88,0x07 },
+    { 0x92,0x9c,0x95,0x15 }, { 0x9b,0x91,0x9e,0x1b }, 
+    { 0x7c,0x0a,0x47,0xa1 }, { 0x75,0x07,0x4c,0xaf },
+    { 0x6e,0x10,0x51,0xbd }, { 0x67,0x1d,0x5a,0xb3 }, 
+    { 0x58,0x3e,0x6b,0x99 }, { 0x51,0x33,0x60,0x97 },
+    { 0x4a,0x24,0x7d,0x85 }, { 0x43,0x29,0x76,0x8b }, 
+    { 0x34,0x62,0x1f,0xd1 }, { 0x3d,0x6f,0x14,0xdf },
+    { 0x26,0x78,0x09,0xcd }, { 0x2f,0x75,0x02,0xc3 }, 
+    { 0x10,0x56,0x33,0xe9 }, { 0x19,0x5b,0x38,0xe7 },
+    { 0x02,0x4c,0x25,0xf5 }, { 0x0b,0x41,0x2e,0xfb }, 
+    { 0xd7,0x61,0x8c,0x9a }, { 0xde,0x6c,0x87,0x94 },
+    { 0xc5,0x7b,0x9a,0x86 }, { 0xcc,0x76,0x91,0x88 }, 
+    { 0xf3,0x55,0xa0,0xa2 }, { 0xfa,0x58,0xab,0xac },
+    { 0xe1,0x4f,0xb6,0xbe }, { 0xe8,0x42,0xbd,0xb0 }, 
+    { 0x9f,0x09,0xd4,0xea }, { 0x96,0x04,0xdf,0xe4 },
+    { 0x8d,0x13,0xc2,0xf6 }, { 0x84,0x1e,0xc9,0xf8 }, 
+    { 0xbb,0x3d,0xf8,0xd2 }, { 0xb2,0x30,0xf3,0xdc },
+    { 0xa9,0x27,0xee,0xce }, { 0xa0,0x2a,0xe5,0xc0 }, 
+    { 0x47,0xb1,0x3c,0x7a }, { 0x4e,0xbc,0x37,0x74 },
+    { 0x55,0xab,0x2a,0x66 }, { 0x5c,0xa6,0x21,0x68 }, 
+    { 0x63,0x85,0x10,0x42 }, { 0x6a,0x88,0x1b,0x4c },
+    { 0x71,0x9f,0x06,0x5e }, { 0x78,0x92,0x0d,0x50 }, 
+    { 0x0f,0xd9,0x64,0x0a }, { 0x06,0xd4,0x6f,0x04 },
+    { 0x1d,0xc3,0x72,0x16 }, { 0x14,0xce,0x79,0x18 }, 
+    { 0x2b,0xed,0x48,0x32 }, { 0x22,0xe0,0x43,0x3c },
+    { 0x39,0xf7,0x5e,0x2e }, { 0x30,0xfa,0x55,0x20 }, 
+    { 0x9a,0xb7,0x01,0xec }, { 0x93,0xba,0x0a,0xe2 }, 
+    { 0x88,0xad,0x17,0xf0 }, { 0x81,0xa0,0x1c,0xfe }, 
+    { 0xbe,0x83,0x2d,0xd4 }, { 0xb7,0x8e,0x26,0xda },
+    { 0xac,0x99,0x3b,0xc8 }, { 0xa5,0x94,0x30,0xc6 }, 
+    { 0xd2,0xdf,0x59,0x9c }, { 0xdb,0xd2,0x52,0x92 }, 
+    { 0xc0,0xc5,0x4f,0x80 }, { 0xc9,0xc8,0x44,0x8e }, 
+    { 0xf6,0xeb,0x75,0xa4 }, { 0xff,0xe6,0x7e,0xaa },
+    { 0xe4,0xf1,0x63,0xb8 }, { 0xed,0xfc,0x68,0xb6 }, 
+    { 0x0a,0x67,0xb1,0x0c }, { 0x03,0x6a,0xba,0x02 },
+    { 0x18,0x7d,0xa7,0x10 }, { 0x11,0x70,0xac,0x1e }, 
+    { 0x2e,0x53,0x9d,0x34 }, { 0x27,0x5e,0x96,0x3a },
+    { 0x3c,0x49,0x8b,0x28 }, { 0x35,0x44,0x80,0x26 }, 
+    { 0x42,0x0f,0xe9,0x7c }, { 0x4b,0x02,0xe2,0x72 }, 
+    { 0x50,0x15,0xff,0x60 }, { 0x59,0x18,0xf4,0x6e }, 
+    { 0x66,0x3b,0xc5,0x44 }, { 0x6f,0x36,0xce,0x4a },
+    { 0x74,0x21,0xd3,0x58 }, { 0x7d,0x2c,0xd8,0x56 }, 
+    { 0xa1,0x0c,0x7a,0x37 }, { 0xa8,0x01,0x71,0x39 },
+    { 0xb3,0x16,0x6c,0x2b }, { 0xba,0x1b,0x67,0x25 }, 
+    { 0x85,0x38,0x56,0x0f }, { 0x8c,0x35,0x5d,0x01 },
+    { 0x97,0x22,0x40,0x13 }, { 0x9e,0x2f,0x4b,0x1d }, 
+    { 0xe9,0x64,0x22,0x47 }, { 0xe0,0x69,0x29,0x49 }, 
+    { 0xfb,0x7e,0x34,0x5b }, { 0xf2,0x73,0x3f,0x55 }, 
+    { 0xcd,0x50,0x0e,0x7f }, { 0xc4,0x5d,0x05,0x71 },
+    { 0xdf,0x4a,0x18,0x63 }, { 0xd6,0x47,0x13,0x6d }, 
+    { 0x31,0xdc,0xca,0xd7 }, { 0x38,0xd1,0xc1,0xd9 },
+    { 0x23,0xc6,0xdc,0xcb }, { 0x2a,0xcb,0xd7,0xc5 }, 
+    { 0x15,0xe8,0xe6,0xef }, { 0x1c,0xe5,0xed,0xe1 },
+    { 0x07,0xf2,0xf0,0xf3 }, { 0x0e,0xff,0xfb,0xfd }, 
+    { 0x79,0xb4,0x92,0xa7 }, { 0x70,0xb9,0x99,0xa9 },
+    { 0x6b,0xae,0x84,0xbb }, { 0x62,0xa3,0x8f,0xb5 }, 
+    { 0x5d,0x80,0xbe,0x9f }, { 0x54,0x8d,0xb5,0x91 },
+    { 0x4f,0x9a,0xa8,0x83 }, { 0x46,0x97,0xa3,0x8d }
+};
+
+static const u32 rcon[30] = { 
+    0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c,
+    0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35,
+    0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91
+};
+
+
+/* Perform the key setup.
+ */  
+static int
+rijndael_setkey (RIJNDAEL_context *ctx, const byte *key, const unsigned keylen)
+{
+    static int initialized = 0;
+    static const char *selftest_failed=0;
+    int ROUNDS;
+    byte k[MAXKC][4];
+    int i,j, r, t, rconpointer = 0;
+    byte tk[MAXKC][4];
+    int KC;
+
+    if (!initialized) {
+        initialized = 1;
+        selftest_failed = selftest ();
+        if( selftest_failed )
+            fprintf(stderr, "%s\n", selftest_failed );
+    }
+    if( selftest_failed )
+        return G10ERR_SELFTEST_FAILED;
+
+    if( keylen == 128/8 ) {
+        ROUNDS = 10;
+        KC = 4;
+    }
+    else if ( keylen == 192/8 ) {
+        ROUNDS = 12;
+        KC = 6;
+    }
+    else if ( keylen == 256/8 ) {
+        ROUNDS = 14;
+        KC = 8;
+    }
+    else
+	return G10ERR_WRONG_KEYLEN;
+
+    ctx->ROUNDS = ROUNDS;
+    ctx->decryption_prepared = 0;
+
+    for (i = 0; i < keylen; i++) {
+        k[i >> 2][i & 3] = key[i]; 
+    }
+ #define W (ctx->keySched)
+
+    for (j = KC-1; j >= 0; j--) {
+        *((u32*)tk[j]) = *((u32*)k[j]);
+    }
+    r = 0;
+    t = 0;
+    /* copy values into round key array */
+    for (j = 0; (j < KC) && (r < ROUNDS + 1); ) {
+        for (; (j < KC) && (t < 4); j++, t++) {
+            *((u32*)W[r][t]) = *((u32*)tk[j]);
+        }
+        if (t == 4) {
+            r++;
+            t = 0;
+        }
+    }
+		
+    while (r < ROUNDS + 1) {
+        /* while not enough round key material calculated */
+        /* calculate new values */
+        tk[0][0] ^= S[tk[KC-1][1]];
+        tk[0][1] ^= S[tk[KC-1][2]];
+        tk[0][2] ^= S[tk[KC-1][3]];
+        tk[0][3] ^= S[tk[KC-1][0]];
+        tk[0][0] ^= rcon[rconpointer++];
+        
+        if (KC != 8) {
+            for (j = 1; j < KC; j++) {
+                *((u32*)tk[j]) ^= *((u32*)tk[j-1]);
+            }
+        } else {
+            for (j = 1; j < KC/2; j++) {
+                *((u32*)tk[j]) ^= *((u32*)tk[j-1]);
+            }
+            tk[KC/2][0] ^= S[tk[KC/2 - 1][0]];
+            tk[KC/2][1] ^= S[tk[KC/2 - 1][1]];
+            tk[KC/2][2] ^= S[tk[KC/2 - 1][2]];
+            tk[KC/2][3] ^= S[tk[KC/2 - 1][3]];
+            for (j = KC/2 + 1; j < KC; j++) {
+                *((u32*)tk[j]) ^= *((u32*)tk[j-1]);
+            }
+        }
+        /* copy values into round key array */
+        for (j = 0; (j < KC) && (r < ROUNDS + 1); ) {
+            for (; (j < KC) && (t < 4); j++, t++) {
+                *((u32*)W[r][t]) = *((u32*)tk[j]);
+            }
+            if (t == 4) {
+                r++;
+                t = 0;
+            }
+        }
+    }		
+    
+  #undef W    
+    return 0;
+}
+
+/* make a decryption  key from an encryption key */
+static void
+prepare_decryption( RIJNDAEL_context *ctx )
+{
+    int r;
+    byte *w;
+
+    for (r=0; r < MAXROUNDS+1; r++ ) {
+        *((u32*)ctx->keySched2[r][0]) = *((u32*)ctx->keySched[r][0]);
+        *((u32*)ctx->keySched2[r][1]) = *((u32*)ctx->keySched[r][1]);
+        *((u32*)ctx->keySched2[r][2]) = *((u32*)ctx->keySched[r][2]);
+        *((u32*)ctx->keySched2[r][3]) = *((u32*)ctx->keySched[r][3]);
+    }
+  #define W (ctx->keySched2)
+    for (r = 1; r < ctx->ROUNDS; r++) {
+        w = W[r][0];
+        *((u32*)w) = *((u32*)U1[w[0]]) ^ *((u32*)U2[w[1]])
+                   ^ *((u32*)U3[w[2]]) ^ *((u32*)U4[w[3]]);
+       
+        w = W[r][1];
+        *((u32*)w) = *((u32*)U1[w[0]]) ^ *((u32*)U2[w[1]])
+                   ^ *((u32*)U3[w[2]]) ^ *((u32*)U4[w[3]]);
+        
+        w = W[r][2];
+        *((u32*)w) = *((u32*)U1[w[0]]) ^ *((u32*)U2[w[1]])
+                   ^ *((u32*)U3[w[2]]) ^ *((u32*)U4[w[3]]);
+        
+        w = W[r][3];
+        *((u32*)w) = *((u32*)U1[w[0]]) ^ *((u32*)U2[w[1]])
+                   ^ *((u32*)U3[w[2]]) ^ *((u32*)U4[w[3]]);
+    }
+  #undef W
+}	
+
+
+
+/* Encrypt one block.  A and B may be the same. */
+static void
+rijndael_encrypt (const RIJNDAEL_context *ctx, byte *b, const byte *a)
+{
+    int r;
+    byte temp[4][4];
+    int ROUNDS = ctx->ROUNDS;
+  #define rk (ctx->keySched)
+
+    *((u32*)temp[0]) = *((u32*)(a   )) ^ *((u32*)rk[0][0]);
+    *((u32*)temp[1]) = *((u32*)(a+ 4)) ^ *((u32*)rk[0][1]);
+    *((u32*)temp[2]) = *((u32*)(a+ 8)) ^ *((u32*)rk[0][2]);
+    *((u32*)temp[3]) = *((u32*)(a+12)) ^ *((u32*)rk[0][3]);
+    *((u32*)(b    )) = *((u32*)T1[temp[0][0]])
+        ^ *((u32*)T2[temp[1][1]])
+        ^ *((u32*)T3[temp[2][2]]) 
+        ^ *((u32*)T4[temp[3][3]]);
+    *((u32*)(b + 4)) = *((u32*)T1[temp[1][0]])
+        ^ *((u32*)T2[temp[2][1]])
+        ^ *((u32*)T3[temp[3][2]]) 
+        ^ *((u32*)T4[temp[0][3]]);
+    *((u32*)(b + 8)) = *((u32*)T1[temp[2][0]])
+        ^ *((u32*)T2[temp[3][1]])
+        ^ *((u32*)T3[temp[0][2]]) 
+        ^ *((u32*)T4[temp[1][3]]);
+    *((u32*)(b +12)) = *((u32*)T1[temp[3][0]])
+        ^ *((u32*)T2[temp[0][1]])
+        ^ *((u32*)T3[temp[1][2]]) 
+        ^ *((u32*)T4[temp[2][3]]);
+    for (r = 1; r < ROUNDS-1; r++) {
+        *((u32*)temp[0]) = *((u32*)(b   )) ^ *((u32*)rk[r][0]);
+        *((u32*)temp[1]) = *((u32*)(b+ 4)) ^ *((u32*)rk[r][1]);
+        *((u32*)temp[2]) = *((u32*)(b+ 8)) ^ *((u32*)rk[r][2]);
+        *((u32*)temp[3]) = *((u32*)(b+12)) ^ *((u32*)rk[r][3]);
+
+        *((u32*)(b    )) = *((u32*)T1[temp[0][0]])
+            ^ *((u32*)T2[temp[1][1]])
+            ^ *((u32*)T3[temp[2][2]]) 
+            ^ *((u32*)T4[temp[3][3]]);
+        *((u32*)(b + 4)) = *((u32*)T1[temp[1][0]])
+            ^ *((u32*)T2[temp[2][1]])
+            ^ *((u32*)T3[temp[3][2]]) 
+            ^ *((u32*)T4[temp[0][3]]);
+        *((u32*)(b + 8)) = *((u32*)T1[temp[2][0]])
+            ^ *((u32*)T2[temp[3][1]])
+            ^ *((u32*)T3[temp[0][2]]) 
+            ^ *((u32*)T4[temp[1][3]]);
+        *((u32*)(b +12)) = *((u32*)T1[temp[3][0]])
+            ^ *((u32*)T2[temp[0][1]])
+            ^ *((u32*)T3[temp[1][2]]) 
+            ^ *((u32*)T4[temp[2][3]]);
+    }
+    /* last round is special */   
+    *((u32*)temp[0]) = *((u32*)(b   )) ^ *((u32*)rk[ROUNDS-1][0]);
+    *((u32*)temp[1]) = *((u32*)(b+ 4)) ^ *((u32*)rk[ROUNDS-1][1]);
+    *((u32*)temp[2]) = *((u32*)(b+ 8)) ^ *((u32*)rk[ROUNDS-1][2]);
+    *((u32*)temp[3]) = *((u32*)(b+12)) ^ *((u32*)rk[ROUNDS-1][3]);
+    b[ 0] = T1[temp[0][0]][1];
+    b[ 1] = T1[temp[1][1]][1];
+    b[ 2] = T1[temp[2][2]][1];
+    b[ 3] = T1[temp[3][3]][1];
+    b[ 4] = T1[temp[1][0]][1];
+    b[ 5] = T1[temp[2][1]][1];
+    b[ 6] = T1[temp[3][2]][1];
+    b[ 7] = T1[temp[0][3]][1];
+    b[ 8] = T1[temp[2][0]][1];
+    b[ 9] = T1[temp[3][1]][1];
+    b[10] = T1[temp[0][2]][1];
+    b[11] = T1[temp[1][3]][1];
+    b[12] = T1[temp[3][0]][1];
+    b[13] = T1[temp[0][1]][1];
+    b[14] = T1[temp[1][2]][1];
+    b[15] = T1[temp[2][3]][1];
+    *((u32*)(b   )) ^= *((u32*)rk[ROUNDS][0]);
+    *((u32*)(b+ 4)) ^= *((u32*)rk[ROUNDS][1]);
+    *((u32*)(b+ 8)) ^= *((u32*)rk[ROUNDS][2]);
+    *((u32*)(b+12)) ^= *((u32*)rk[ROUNDS][3]);
+  #undef rk
+}
+
+/* Decrypt one block.  a and b may be the same. */
+static void
+rijndael_decrypt (RIJNDAEL_context *ctx, byte *b, const byte *a)
+{
+  #define rk  (ctx->keySched2)
+    int ROUNDS = ctx->ROUNDS; 
+    int r;
+    byte temp[4][4];
+
+    if ( !ctx->decryption_prepared ) {
+        prepare_decryption ( ctx );
+        ctx->decryption_prepared = 1;
+    }
+    
+    *((u32*)temp[0]) = *((u32*)(a   )) ^ *((u32*)rk[ROUNDS][0]);
+    *((u32*)temp[1]) = *((u32*)(a+ 4)) ^ *((u32*)rk[ROUNDS][1]);
+    *((u32*)temp[2]) = *((u32*)(a+ 8)) ^ *((u32*)rk[ROUNDS][2]);
+    *((u32*)temp[3]) = *((u32*)(a+12)) ^ *((u32*)rk[ROUNDS][3]);
+  
+    *((u32*)(b   )) = *((u32*)T5[temp[0][0]])
+        ^ *((u32*)T6[temp[3][1]])
+        ^ *((u32*)T7[temp[2][2]]) 
+        ^ *((u32*)T8[temp[1][3]]);
+    *((u32*)(b+ 4)) = *((u32*)T5[temp[1][0]])
+        ^ *((u32*)T6[temp[0][1]])
+        ^ *((u32*)T7[temp[3][2]]) 
+        ^ *((u32*)T8[temp[2][3]]);
+    *((u32*)(b+ 8)) = *((u32*)T5[temp[2][0]])
+        ^ *((u32*)T6[temp[1][1]])
+        ^ *((u32*)T7[temp[0][2]]) 
+        ^ *((u32*)T8[temp[3][3]]);
+    *((u32*)(b+12)) = *((u32*)T5[temp[3][0]])
+        ^ *((u32*)T6[temp[2][1]])
+        ^ *((u32*)T7[temp[1][2]]) 
+        ^ *((u32*)T8[temp[0][3]]);
+    for (r = ROUNDS-1; r > 1; r--) {
+		*((u32*)temp[0]) = *((u32*)(b   )) ^ *((u32*)rk[r][0]);
+		*((u32*)temp[1]) = *((u32*)(b+ 4)) ^ *((u32*)rk[r][1]);
+		*((u32*)temp[2]) = *((u32*)(b+ 8)) ^ *((u32*)rk[r][2]);
+		*((u32*)temp[3]) = *((u32*)(b+12)) ^ *((u32*)rk[r][3]);
+		*((u32*)(b   )) = *((u32*)T5[temp[0][0]])
+           ^ *((u32*)T6[temp[3][1]])
+           ^ *((u32*)T7[temp[2][2]]) 
+           ^ *((u32*)T8[temp[1][3]]);
+		*((u32*)(b+ 4)) = *((u32*)T5[temp[1][0]])
+           ^ *((u32*)T6[temp[0][1]])
+           ^ *((u32*)T7[temp[3][2]]) 
+           ^ *((u32*)T8[temp[2][3]]);
+		*((u32*)(b+ 8)) = *((u32*)T5[temp[2][0]])
+           ^ *((u32*)T6[temp[1][1]])
+           ^ *((u32*)T7[temp[0][2]]) 
+           ^ *((u32*)T8[temp[3][3]]);
+		*((u32*)(b+12)) = *((u32*)T5[temp[3][0]])
+           ^ *((u32*)T6[temp[2][1]])
+           ^ *((u32*)T7[temp[1][2]]) 
+           ^ *((u32*)T8[temp[0][3]]);
+	}
+	/* last round is special */   
+	*((u32*)temp[0]) = *((u32*)(b   )) ^ *((u32*)rk[1][0]);
+	*((u32*)temp[1]) = *((u32*)(b+ 4)) ^ *((u32*)rk[1][1]);
+	*((u32*)temp[2]) = *((u32*)(b+ 8)) ^ *((u32*)rk[1][2]);
+	*((u32*)temp[3]) = *((u32*)(b+12)) ^ *((u32*)rk[1][3]);
+	b[ 0] = S5[temp[0][0]];
+	b[ 1] = S5[temp[3][1]];
+	b[ 2] = S5[temp[2][2]];
+	b[ 3] = S5[temp[1][3]];
+	b[ 4] = S5[temp[1][0]];
+	b[ 5] = S5[temp[0][1]];
+	b[ 6] = S5[temp[3][2]];
+	b[ 7] = S5[temp[2][3]];
+	b[ 8] = S5[temp[2][0]];
+	b[ 9] = S5[temp[1][1]];
+	b[10] = S5[temp[0][2]];
+	b[11] = S5[temp[3][3]];
+	b[12] = S5[temp[3][0]];
+	b[13] = S5[temp[2][1]];
+	b[14] = S5[temp[1][2]];
+	b[15] = S5[temp[0][3]];
+	*((u32*)(b   )) ^= *((u32*)rk[0][0]);
+	*((u32*)(b+ 4)) ^= *((u32*)rk[0][1]);
+	*((u32*)(b+ 8)) ^= *((u32*)rk[0][2]);
+	*((u32*)(b+12)) ^= *((u32*)rk[0][3]);
+  #undef rk
+}
+
+/* Test a single encryption and decryption with each key size. */
+
+static const char*
+selftest (void)
+{
+    RIJNDAEL_context ctx;
+    byte scratch[16];	   
+
+    /* The test vectors are from the AES supplied ones; more or less 
+     * randomly taken from ecb_tbl.txt (I=42,81,14)
+     */
+    static const byte plaintext[16] = {
+       0x01,0x4B,0xAF,0x22,0x78,0xA6,0x9D,0x33,
+       0x1D,0x51,0x80,0x10,0x36,0x43,0xE9,0x9A
+    };
+    static const byte key[16] = {
+        0xE8,0xE9,0xEA,0xEB,0xED,0xEE,0xEF,0xF0,
+        0xF2,0xF3,0xF4,0xF5,0xF7,0xF8,0xF9,0xFA
+    };
+    static const byte ciphertext[16] = {
+        0x67,0x43,0xC3,0xD1,0x51,0x9A,0xB4,0xF2,
+        0xCD,0x9A,0x78,0xAB,0x09,0xA5,0x11,0xBD
+    };
+
+    static const byte plaintext_192[16] = {
+        0x76,0x77,0x74,0x75,0xF1,0xF2,0xF3,0xF4,
+        0xF8,0xF9,0xE6,0xE7,0x77,0x70,0x71,0x72
+    };
+    static const byte key_192[24] = {
+        0x04,0x05,0x06,0x07,0x09,0x0A,0x0B,0x0C,
+        0x0E,0x0F,0x10,0x11,0x13,0x14,0x15,0x16,
+        0x18,0x19,0x1A,0x1B,0x1D,0x1E,0x1F,0x20
+    };
+    static const byte ciphertext_192[16] = {
+        0x5D,0x1E,0xF2,0x0D,0xCE,0xD6,0xBC,0xBC,
+        0x12,0x13,0x1A,0xC7,0xC5,0x47,0x88,0xAA
+    };
+    
+    static const byte plaintext_256[16] = {
+        0x06,0x9A,0x00,0x7F,0xC7,0x6A,0x45,0x9F,
+        0x98,0xBA,0xF9,0x17,0xFE,0xDF,0x95,0x21
+    };
+    static const byte key_256[32] = {
+        0x08,0x09,0x0A,0x0B,0x0D,0x0E,0x0F,0x10,
+        0x12,0x13,0x14,0x15,0x17,0x18,0x19,0x1A,
+        0x1C,0x1D,0x1E,0x1F,0x21,0x22,0x23,0x24,
+        0x26,0x27,0x28,0x29,0x2B,0x2C,0x2D,0x2E
+    };
+    static const byte ciphertext_256[16] = {
+        0x08,0x0E,0x95,0x17,0xEB,0x16,0x77,0x71,
+        0x9A,0xCF,0x72,0x80,0x86,0x04,0x0A,0xE3
+    };
+
+    rijndael_setkey (&ctx, key, sizeof(key));
+    rijndael_encrypt (&ctx, scratch, plaintext);
+    if (memcmp (scratch, ciphertext, sizeof (ciphertext)))
+        return "Rijndael-128 test encryption failed.";
+    rijndael_decrypt (&ctx, scratch, scratch);
+    if (memcmp (scratch, plaintext, sizeof (plaintext)))
+        return "Rijndael-128 test decryption failed.";
+
+    rijndael_setkey (&ctx, key_192, sizeof(key_192));
+    rijndael_encrypt (&ctx, scratch, plaintext_192);
+    if (memcmp (scratch, ciphertext_192, sizeof (ciphertext_192)))
+        return "Rijndael-192 test encryption failed.";
+    rijndael_decrypt (&ctx, scratch, scratch);
+    if (memcmp (scratch, plaintext_192, sizeof (plaintext_192)))
+        return "Rijndael-192 test decryption failed.";
+    
+    rijndael_setkey (&ctx, key_256, sizeof(key_256));
+    rijndael_encrypt (&ctx, scratch, plaintext_256);
+    if (memcmp (scratch, ciphertext_256, sizeof (ciphertext_256)))
+        return "Rijndael-256 test encryption failed.";
+    rijndael_decrypt (&ctx, scratch, scratch);
+    if (memcmp (scratch, plaintext_256, sizeof (plaintext_256)))
+        return "Rijndael-256 test decryption failed.";
+    
+    return NULL;
+}
+
+#ifdef IS_MODULE
+static
+#endif
+       const char *
+rijndael_get_info (int algo, size_t *keylen,
+		  size_t *blocksize, size_t *contextsize,
+		  int  (**r_setkey) (void *c, byte *key, unsigned keylen),
+		  void (**r_encrypt) (void *c, byte *outbuf, byte *inbuf),
+		  void (**r_decrypt) (void *c, byte *outbuf, byte *inbuf)
+		 )
+{
+    *keylen = algo==7? 128 :  algo==8? 192 : 256;
+    *blocksize = 16;
+    *contextsize = sizeof (RIJNDAEL_context);
+
+    *(int  (**)(RIJNDAEL_context*, const byte*, const unsigned))r_setkey
+							= rijndael_setkey;
+    *(void (**)(const RIJNDAEL_context*, byte*, const byte*))r_encrypt
+							= rijndael_encrypt;
+    *(void (**)(RIJNDAEL_context*, byte*, const byte*))r_decrypt
+							= rijndael_decrypt;
+
+    if( algo == 7 )
+	return "RIJNDAEL";
+    if (algo == 8)
+        return "RIJNDAEL192";
+    if (algo == 9)
+        return "RIJNDAEL256";
+    return NULL;
+}
+
+
+#ifdef IS_MODULE
+static
+const char * const gnupgext_version = "RIJNDAEL ($Revision: 1.1.2.1 $)";
+
+static struct {
+    int class;
+    int version;
+    int  value;
+    void (*func)(void);
+} func_table[] = {
+    { 20, 1, 0, (void(*)(void))rijndael_get_info },
+    { 21, 1, 7  },
+    { 21, 1, 8  },
+    { 21, 1, 9  },
+};
+
+
+
+/****************
+ * Enumerate the names of the functions together with information about
+ * this function. Set sequence to an integer with a initial value of 0 and
+ * do not change it.
+ * If what is 0 all kind of functions are returned.
+ * Return values: class := class of function:
+ *			   10 = message digest algorithm info function
+ *			   11 = integer with available md algorithms
+ *			   20 = cipher algorithm info function
+ *			   21 = integer with available cipher algorithms
+ *			   30 = public key algorithm info function
+ *			   31 = integer with available pubkey algorithms
+ *		  version = interface version of the function/pointer
+ *			    (currently this is 1 for all functions)
+ */
+static
+void *
+gnupgext_enum_func ( int what, int *sequence, int *class, int *vers )
+{
+    void *ret;
+    int i = *sequence;
+
+    do {
+	if ( i >= DIM(func_table) || i < 0 ) {
+	    return NULL;
+	}
+	*class = func_table[i].class;
+	*vers  = func_table[i].version;
+	switch( *class ) {
+	  case 11:
+	  case 21:
+	  case 31:
+	    ret = &func_table[i].value;
+	    break;
+	  default:
+	    ret = func_table[i].func;
+	    break;
+	}
+	i++;
+    } while ( what && what != *class );
+
+    *sequence = i;
+    return ret;
+}
+#endif
+
+
+
+
+
+
+
+
+
diff -urN gnupg-1.0.3/cipher/sha1.c gnupg-1.0.4/cipher/sha1.c
--- gnupg-1.0.3/cipher/sha1.c	Thu Mar  2 15:45:05 2000
+++ gnupg-1.0.4/cipher/sha1.c	Wed Oct  4 15:50:33 2000
@@ -108,7 +108,7 @@
 
 #define M(i) ( tm =   x[i&0x0f] ^ x[(i-14)&0x0f] \
 		    ^ x[(i-8)&0x0f] ^ x[(i-3)&0x0f] \
-	       , (x[i&0x0f] = (tm << 1) | (tm >> 31)) )
+	       , (x[i&0x0f] = rol(tm,1)) )
 
 #define R(a,b,c,d,e,f,k,m)  do { e += rol( a, 5 )     \
 				      + f( b, c, d )  \
@@ -350,7 +350,7 @@
 #ifndef IS_MODULE
 static
 #endif
-const char * const gnupgext_version = "SHA1 ($Revision: 1.12.2.2 $)";
+const char * const gnupgext_version = "SHA1 ($Revision: 1.12.2.3 $)";
 
 static struct {
     int class;
diff -urN gnupg-1.0.3/configure gnupg-1.0.4/configure
--- gnupg-1.0.3/configure	Thu Sep 14 14:22:53 2000
+++ gnupg-1.0.4/configure	Tue Oct 17 15:39:41 2000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# From configure.in Revision: 1.103.2.24 
+# From configure.in Revision: 1.103.2.27 
 CDPATH=
 
 
@@ -1884,10 +1884,11 @@
     if test $working_faqprog = no; then
 	echo "configure: warning: 
 ***
-*** It seems that the faqprog.pl program is not installed.
-*** Unless you do not change the source of the FAQs it is not required.
-*** The working version of this utility should be available at:
-***   ftp://ftp.gnupg.org/pub/gcrypt/contrib/faqprog.pl
+*** It seems that the faqprog.pl program is not installed;
+*** however it is only needed if you want to change the FAQ.
+***  (faqprog.pl should be available at:
+***    ftp://ftp.gnupg.org/pub/gcrypt/contrib/faqprog.pl )
+*** No need to worry about this warning.
 ***" 1>&2
     fi
   
@@ -1897,6 +1898,7 @@
 
 try_gettext=yes
 try_gdbm=yes
+try_large_file=yes
 case "${target}" in
     *-*-mingw32*)
         # special stuff for Windoze NT
@@ -1960,6 +1962,7 @@
         if test -z "$GCC" ; then
             CFLAGS="$CFLAGS -Ae -D_HPUX_SOURCE"
         fi
+        try_large_file="no"
         ;;
     *-dec-osf4*)
         if test -z "$GCC" ; then
@@ -1970,13 +1973,16 @@
         ;;
     m68k-atari-mint)
         ;;
+    *-solaris*)
+        try_large_file="no"
+        ;;
     *)
        ;;
 esac
 
 
 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1980: checking for BSD-compatible nm" >&5
+echo "configure:1986: checking for BSD-compatible nm" >&5
 if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2012,7 +2018,7 @@
 
 # Check for command to grab the raw symbol name followed by C symbol from nm.
 echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6
-echo "configure:2016: checking command to parse $NM output" >&5
+echo "configure:2022: checking command to parse $NM output" >&5
 if eval "test \"`echo '$''{'ac_cv_sys_global_symbol_pipe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2075,10 +2081,10 @@
 #endif
 int main(){nm_test_var='a';nm_test_func;return 0;}
 EOF
-if { (eval echo configure:2079: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2085: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   # Now try to grab the symbols.
   ac_nlist=conftest.nm
-  if { (eval echo configure:2082: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then
+  if { (eval echo configure:2088: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then
 
     # Try sorting and uniquifying the output.
     if sort "$ac_nlist" | uniq > "$ac_nlist"T; then
@@ -2136,7 +2142,7 @@
         ac_save_CFLAGS="$CFLAGS"
         LIBS="conftestm.$ac_objext"
         CFLAGS="$CFLAGS$no_builtin_flag"
-        if { (eval echo configure:2140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+        if { (eval echo configure:2146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
           ac_pipe_works=yes
         else
           echo "configure: failed program was:" >&5
@@ -2187,7 +2193,7 @@
 
 if test "$tmp_do_check" = "yes"; then
 echo $ac_n "checking for _ prefix in compiled symbols""... $ac_c" 1>&6
-echo "configure:2191: checking for _ prefix in compiled symbols" >&5
+echo "configure:2197: checking for _ prefix in compiled symbols" >&5
 if eval "test \"`echo '$''{'ac_cv_sys_symbol_underscore'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2196,10 +2202,10 @@
 void nm_test_func(){}
 int main(){nm_test_func;return 0;}
 EOF
-if { (eval echo configure:2200: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2206: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   # Now try to grab the symbols.
   ac_nlist=conftest.nm
-  if { (eval echo configure:2203: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then
+  if { (eval echo configure:2209: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then
     # See whether the symbols have a leading underscore.
     if egrep '^_nm_test_func' "$ac_nlist" >/dev/null; then
       ac_cv_sys_symbol_underscore=yes
@@ -2223,7 +2229,7 @@
 
 else
 echo $ac_n "checking for _ prefix in compiled symbols""... $ac_c" 1>&6
-echo "configure:2227: checking for _ prefix in compiled symbols" >&5
+echo "configure:2233: checking for _ prefix in compiled symbols" >&5
 fi
 echo "$ac_t""$ac_cv_sys_symbol_underscore" 1>&6
 if test x$ac_cv_sys_symbol_underscore = xyes; then
@@ -2234,7 +2240,7 @@
 fi
 
  echo $ac_n "checking for option to create PIC""... $ac_c" 1>&6
-echo "configure:2238: checking for option to create PIC" >&5
+echo "configure:2244: checking for option to create PIC" >&5
     CFLAGS_PIC=
     NO_PIC=no
     if test "$cross_compiling" = yes; then
@@ -2299,7 +2305,7 @@
     fi
   
  echo $ac_n "checking how to specify -export-dynamic""... $ac_c" 1>&6
-echo "configure:2303: checking how to specify -export-dynamic" >&5
+echo "configure:2309: checking how to specify -export-dynamic" >&5
     if test "$cross_compiling" = yes; then
       echo "$ac_t""assume none" 1>&6
       CFLAGS_EXPORTDYNAMIC=""
@@ -2309,7 +2315,7 @@
 else
   
       if { ac_try='${CC-cc} $CFLAGS -Wl,--version 2>&1 |
-                                          grep "GNU ld" >/dev/null'; { (eval echo configure:2313: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
+                                          grep "GNU ld" >/dev/null'; { (eval echo configure:2319: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
           # using gnu's linker
           gnupg_cv_export_dynamic="-Wl,-export-dynamic"
       else
@@ -2379,6 +2385,12 @@
         DYNLINK_MOD_CFLAGS="-shared $CFLAGS_PIC"
         ;;
 
+    *-irix*)
+        NAME_OF_DEV_RANDOM="/dev/random"
+        NAME_OF_DEV_URANDOM="/dev/urandom"
+        DYNLINK_MOD_CFLAGS="-shared $CFLAGS_PIC"
+        ;;
+
     *)
         NAME_OF_DEV_RANDOM="/dev/random"
         NAME_OF_DEV_URANDOM="/dev/urandom"
@@ -2406,7 +2418,7 @@
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2410: checking for $ac_word" >&5
+echo "configure:2422: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2434,12 +2446,12 @@
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2438: checking for ANSI C header files" >&5
+echo "configure:2450: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2443 "configure"
+#line 2455 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -2447,7 +2459,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2451: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2463: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2464,7 +2476,7 @@
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 2468 "configure"
+#line 2480 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -2482,7 +2494,7 @@
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 2486 "configure"
+#line 2498 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -2503,7 +2515,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 2507 "configure"
+#line 2519 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -2514,7 +2526,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:2518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -2538,12 +2550,12 @@
 fi
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:2542: checking for working const" >&5
+echo "configure:2554: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2547 "configure"
+#line 2559 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -2592,7 +2604,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2596: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2608: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -2613,21 +2625,21 @@
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:2617: checking for inline" >&5
+echo "configure:2629: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 2624 "configure"
+#line 2636 "configure"
 #include "confdefs.h"
 
 int main() {
 } int $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:2631: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2643: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -2653,12 +2665,12 @@
 esac
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:2657: checking for off_t" >&5
+echo "configure:2669: checking for off_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2662 "configure"
+#line 2674 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2686,12 +2698,12 @@
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:2690: checking for size_t" >&5
+echo "configure:2702: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2695 "configure"
+#line 2707 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2721,19 +2733,19 @@
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:2725: checking for working alloca.h" >&5
+echo "configure:2737: checking for working alloca.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2730 "configure"
+#line 2742 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 void *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:2737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -2754,12 +2766,12 @@
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:2758: checking for alloca" >&5
+echo "configure:2770: checking for alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2763 "configure"
+#line 2775 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -2787,7 +2799,7 @@
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:2791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -2819,12 +2831,12 @@
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:2823: checking whether alloca needs Cray hooks" >&5
+echo "configure:2835: checking whether alloca needs Cray hooks" >&5
 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2828 "configure"
+#line 2840 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -2849,12 +2861,12 @@
 if test $ac_cv_os_cray = yes; then
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2853: checking for $ac_func" >&5
+echo "configure:2865: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2858 "configure"
+#line 2870 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2877,7 +2889,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2904,7 +2916,7 @@
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:2908: checking stack direction for C alloca" >&5
+echo "configure:2920: checking stack direction for C alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2912,7 +2924,7 @@
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 2916 "configure"
+#line 2928 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -2931,7 +2943,7 @@
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:2935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_stack_direction=1
 else
@@ -2956,17 +2968,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2960: checking for $ac_hdr" >&5
+echo "configure:2972: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2965 "configure"
+#line 2977 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2970: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2982: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2995,12 +3007,12 @@
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2999: checking for $ac_func" >&5
+echo "configure:3011: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3004 "configure"
+#line 3016 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3023,7 +3035,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3048,7 +3060,7 @@
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:3052: checking for working mmap" >&5
+echo "configure:3064: checking for working mmap" >&5
 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3056,7 +3068,7 @@
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 3060 "configure"
+#line 3072 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -3199,7 +3211,7 @@
 }
 
 EOF
-if { (eval echo configure:3203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -3227,17 +3239,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3231: checking for $ac_hdr" >&5
+echo "configure:3243: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3236 "configure"
+#line 3248 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3241: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3253: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3267,12 +3279,12 @@
 strdup __argz_count __argz_stringify __argz_next
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3271: checking for $ac_func" >&5
+echo "configure:3283: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3276 "configure"
+#line 3288 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3295,7 +3307,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3324,12 +3336,12 @@
      for ac_func in stpcpy
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3328: checking for $ac_func" >&5
+echo "configure:3340: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3333 "configure"
+#line 3345 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3352,7 +3364,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3386,19 +3398,19 @@
 
    if test $ac_cv_header_locale_h = yes; then
     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:3390: checking for LC_MESSAGES" >&5
+echo "configure:3402: checking for LC_MESSAGES" >&5
 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3395 "configure"
+#line 3407 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 return LC_MESSAGES
 ; return 0; }
 EOF
-if { (eval echo configure:3402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_val_LC_MESSAGES=yes
 else
@@ -3419,7 +3431,7 @@
     fi
   fi
    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-echo "configure:3423: checking whether NLS is requested" >&5
+echo "configure:3435: checking whether NLS is requested" >&5
         # Check whether --enable-nls or --disable-nls was given.
 if test "${enable_nls+set}" = set; then
   enableval="$enable_nls"
@@ -3439,7 +3451,7 @@
 EOF
 
       echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
-echo "configure:3443: checking whether included gettext is requested" >&5
+echo "configure:3455: checking whether included gettext is requested" >&5
       # Check whether --with-included-gettext or --without-included-gettext was given.
 if test "${with_included_gettext+set}" = set; then
   withval="$with_included_gettext"
@@ -3458,17 +3470,17 @@
 
 	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
-echo "configure:3462: checking for libintl.h" >&5
+echo "configure:3474: checking for libintl.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3467 "configure"
+#line 3479 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3472: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3484: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3485,19 +3497,19 @@
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6
-echo "configure:3489: checking for gettext in libc" >&5
+echo "configure:3501: checking for gettext in libc" >&5
 if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3494 "configure"
+#line 3506 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 int main() {
 return (int) gettext ("")
 ; return 0; }
 EOF
-if { (eval echo configure:3501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gt_cv_func_gettext_libc=yes
 else
@@ -3513,7 +3525,7 @@
 
 	   if test "$gt_cv_func_gettext_libc" != "yes"; then
 	     echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
-echo "configure:3517: checking for bindtextdomain in -lintl" >&5
+echo "configure:3529: checking for bindtextdomain in -lintl" >&5
 ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3521,7 +3533,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3525 "configure"
+#line 3537 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3532,7 +3544,7 @@
 bindtextdomain()
 ; return 0; }
 EOF
-if { (eval echo configure:3536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3548,12 +3560,12 @@
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6
-echo "configure:3552: checking for gettext in libintl" >&5
+echo "configure:3564: checking for gettext in libintl" >&5
 if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6
-echo "configure:3557: checking for gettext in -lintl" >&5
+echo "configure:3569: checking for gettext in -lintl" >&5
 ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3561,7 +3573,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3565 "configure"
+#line 3577 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3572,7 +3584,7 @@
 gettext()
 ; return 0; }
 EOF
-if { (eval echo configure:3576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3611,7 +3623,7 @@
 	      # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3615: checking for $ac_word" >&5
+echo "configure:3627: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3645,12 +3657,12 @@
 		for ac_func in dcgettext
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3649: checking for $ac_func" >&5
+echo "configure:3661: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3654 "configure"
+#line 3666 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3673,7 +3685,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3700,7 +3712,7 @@
 		# Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3704: checking for $ac_word" >&5
+echo "configure:3716: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3736,7 +3748,7 @@
 		# Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3740: checking for $ac_word" >&5
+echo "configure:3752: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3768,7 +3780,7 @@
 fi
 
 		cat > conftest.$ac_ext <<EOF
-#line 3772 "configure"
+#line 3784 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -3776,7 +3788,7 @@
 			       return _nl_msg_cat_cntr
 ; return 0; }
 EOF
-if { (eval echo configure:3780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   CATOBJEXT=.gmo
 		   DATADIRNAME=share
@@ -3799,7 +3811,7 @@
 
         if test "$CATOBJEXT" = "NONE"; then
 	  echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6
-echo "configure:3803: checking whether catgets can be used" >&5
+echo "configure:3815: checking whether catgets can be used" >&5
 	  # Check whether --with-catgets or --without-catgets was given.
 if test "${with_catgets+set}" = set; then
   withval="$with_catgets"
@@ -3812,7 +3824,7 @@
 
 	  if test "$nls_cv_use_catgets" = "yes"; then
 	    	    echo $ac_n "checking for main in -li""... $ac_c" 1>&6
-echo "configure:3816: checking for main in -li" >&5
+echo "configure:3828: checking for main in -li" >&5
 ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3820,14 +3832,14 @@
   ac_save_LIBS="$LIBS"
 LIBS="-li  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3824 "configure"
+#line 3836 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:3831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3855,12 +3867,12 @@
 fi
 
 	    echo $ac_n "checking for catgets""... $ac_c" 1>&6
-echo "configure:3859: checking for catgets" >&5
+echo "configure:3871: checking for catgets" >&5
 if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3864 "configure"
+#line 3876 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char catgets(); below.  */
@@ -3883,7 +3895,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_catgets=yes"
 else
@@ -3905,7 +3917,7 @@
 	       # Extract the first word of "gencat", so it can be a program name with args.
 set dummy gencat; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3909: checking for $ac_word" >&5
+echo "configure:3921: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3941,7 +3953,7 @@
 		 # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3945: checking for $ac_word" >&5
+echo "configure:3957: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3978,7 +3990,7 @@
 		   # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3982: checking for $ac_word" >&5
+echo "configure:3994: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4013,7 +4025,7 @@
 		 # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4017: checking for $ac_word" >&5
+echo "configure:4029: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4071,7 +4083,7 @@
         # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4075: checking for $ac_word" >&5
+echo "configure:4087: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4105,7 +4117,7 @@
         # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4109: checking for $ac_word" >&5
+echo "configure:4121: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4141,7 +4153,7 @@
         # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4145: checking for $ac_word" >&5
+echo "configure:4157: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4234,7 +4246,7 @@
        LINGUAS=
      else
        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
-echo "configure:4238: checking for catalogs to be installed" >&5
+echo "configure:4250: checking for catalogs to be installed" >&5
        NEW_LINGUAS=
        for lang in ${LINGUAS=$ALL_LINGUAS}; do
          case "$ALL_LINGUAS" in
@@ -4262,17 +4274,17 @@
    if test "$CATOBJEXT" = ".cat"; then
      ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6
-echo "configure:4266: checking for linux/version.h" >&5
+echo "configure:4278: checking for linux/version.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4271 "configure"
+#line 4283 "configure"
 #include "confdefs.h"
 #include <linux/version.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4276: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4288: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4348,17 +4360,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4352: checking for $ac_hdr" >&5
+echo "configure:4364: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4357 "configure"
+#line 4369 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4362: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4374: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4386,7 +4398,7 @@
 
 if test "$ac_cv_header_gdbm_h" = yes ; then
   echo $ac_n "checking for gdbm_firstkey in -lgdbm""... $ac_c" 1>&6
-echo "configure:4390: checking for gdbm_firstkey in -lgdbm" >&5
+echo "configure:4402: checking for gdbm_firstkey in -lgdbm" >&5
 ac_lib_var=`echo gdbm'_'gdbm_firstkey | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4394,7 +4406,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgdbm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4398 "configure"
+#line 4410 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4405,7 +4417,7 @@
 gdbm_firstkey()
 ; return 0; }
 EOF
-if { (eval echo configure:4409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4437,7 +4449,7 @@
 
 
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:4441: checking for gethostbyname in -lnsl" >&5
+echo "configure:4453: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4445,7 +4457,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4449 "configure"
+#line 4461 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4456,7 +4468,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:4460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4484,7 +4496,7 @@
 fi
 
 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:4488: checking for socket in -lsocket" >&5
+echo "configure:4500: checking for socket in -lsocket" >&5
 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4492,7 +4504,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4496 "configure"
+#line 4508 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4503,7 +4515,7 @@
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:4507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4529,7 +4541,7 @@
 fi
 if test x$ac_try_nsl = x1; then
     echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:4533: checking for gethostbyname in -lnsl" >&5
+echo "configure:4545: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4537,7 +4549,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4541 "configure"
+#line 4553 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4548,7 +4560,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:4552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4577,7 +4589,7 @@
 
 if test "$try_dynload" = yes ; then
   echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:4581: checking for dlopen in -ldl" >&5
+echo "configure:4593: checking for dlopen in -ldl" >&5
 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4585,7 +4597,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4589 "configure"
+#line 4601 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4596,7 +4608,7 @@
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:4600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4638,12 +4650,12 @@
     for ac_func in dlopen
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4642: checking for $ac_func" >&5
+echo "configure:4654: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4647 "configure"
+#line 4659 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4666,7 +4678,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4703,7 +4715,7 @@
       use_gnupg_extensions=yes
     else
       echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:4707: checking for shl_load in -ldld" >&5
+echo "configure:4719: checking for shl_load in -ldld" >&5
 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4711,7 +4723,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldld  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4715 "configure"
+#line 4727 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4722,7 +4734,7 @@
 shl_load()
 ; return 0; }
 EOF
-if { (eval echo configure:4726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4765,7 +4777,7 @@
   fi
 else
   echo $ac_n "checking for dynamic loading""... $ac_c" 1>&6
-echo "configure:4769: checking for dynamic loading" >&5
+echo "configure:4781: checking for dynamic loading" >&5
   DYNLINK_LDFLAGS=
   DYNLINK_MOD_CFLAGS=
   use_gnupg_extensions=no
@@ -4786,12 +4798,12 @@
 
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:4790: checking for ANSI C header files" >&5
+echo "configure:4802: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4795 "configure"
+#line 4807 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -4799,7 +4811,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4803: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4815: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4816,7 +4828,7 @@
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 4820 "configure"
+#line 4832 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -4834,7 +4846,7 @@
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 4838 "configure"
+#line 4850 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -4855,7 +4867,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 4859 "configure"
+#line 4871 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -4866,7 +4878,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:4870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -4893,17 +4905,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4897: checking for $ac_hdr" >&5
+echo "configure:4909: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4902 "configure"
+#line 4914 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4907: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4919: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4932,12 +4944,12 @@
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:4936: checking for working const" >&5
+echo "configure:4948: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4941 "configure"
+#line 4953 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -4986,7 +4998,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4990: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5002: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -5007,21 +5019,21 @@
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:5011: checking for inline" >&5
+echo "configure:5023: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 5018 "configure"
+#line 5030 "configure"
 #include "confdefs.h"
 
 int main() {
 } int $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:5025: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5037: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -5047,12 +5059,12 @@
 esac
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:5051: checking for size_t" >&5
+echo "configure:5063: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5056 "configure"
+#line 5068 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -5080,12 +5092,12 @@
 fi
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:5084: checking return type of signal handlers" >&5
+echo "configure:5096: checking return type of signal handlers" >&5
 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5089 "configure"
+#line 5101 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -5102,7 +5114,7 @@
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:5106: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5118: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -5121,12 +5133,12 @@
 
 
 echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
-echo "configure:5125: checking for sys_siglist declaration in signal.h or unistd.h" >&5
+echo "configure:5137: checking for sys_siglist declaration in signal.h or unistd.h" >&5
 if eval "test \"`echo '$''{'ac_cv_decl_sys_siglist'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5130 "configure"
+#line 5142 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -5138,7 +5150,7 @@
 char *msg = *(sys_siglist + 1);
 ; return 0; }
 EOF
-if { (eval echo configure:5142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5154: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_decl_sys_siglist=yes
 else
@@ -5163,14 +5175,14 @@
         echo "configure: warning: cross compiling; assuming little endianess" 1>&2
     fi
     echo $ac_n "checking endianess""... $ac_c" 1>&6
-echo "configure:5167: checking endianess" >&5
+echo "configure:5179: checking endianess" >&5
     if eval "test \"`echo '$''{'gnupg_cv_c_endian'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
    gnupg_cv_c_endian=unknown
         # See if sys/param.h defines the BYTE_ORDER macro.
         cat > conftest.$ac_ext <<EOF
-#line 5174 "configure"
+#line 5186 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
         #include <sys/param.h>
@@ -5181,11 +5193,11 @@
         #endif
 ; return 0; }
 EOF
-if { (eval echo configure:5185: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5197: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   # It does; now see whether it defined to BIG_ENDIAN or not.
         cat > conftest.$ac_ext <<EOF
-#line 5189 "configure"
+#line 5201 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
         #include <sys/param.h>
@@ -5196,7 +5208,7 @@
         #endif
 ; return 0; }
 EOF
-if { (eval echo configure:5200: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5212: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   gnupg_cv_c_endian=big
 else
@@ -5217,7 +5229,7 @@
             
 else
   cat > conftest.$ac_ext <<EOF
-#line 5221 "configure"
+#line 5233 "configure"
 #include "confdefs.h"
 main () {
               /* Are we little or big endian?  From Harbison&Steele.  */
@@ -5230,7 +5242,7 @@
               exit (u.c[sizeof (long) - 1] == 1);
               }
 EOF
-if { (eval echo configure:5234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   gnupg_cv_c_endian=little
 else
@@ -5262,12 +5274,12 @@
 
 
  echo $ac_n "checking for byte typedef""... $ac_c" 1>&6
-echo "configure:5266: checking for byte typedef" >&5
+echo "configure:5278: checking for byte typedef" >&5
     if eval "test \"`echo '$''{'gnupg_cv_typedef_byte'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5271 "configure"
+#line 5283 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
     #include <sys/types.h>
@@ -5278,7 +5290,7 @@
     
 ; return 0; }
 EOF
-if { (eval echo configure:5282: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5294: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   gnupg_cv_typedef_byte=yes
 else
@@ -5299,12 +5311,12 @@
     fi
   
  echo $ac_n "checking for ushort typedef""... $ac_c" 1>&6
-echo "configure:5303: checking for ushort typedef" >&5
+echo "configure:5315: checking for ushort typedef" >&5
     if eval "test \"`echo '$''{'gnupg_cv_typedef_ushort'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5308 "configure"
+#line 5320 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
     #include <sys/types.h>
@@ -5315,7 +5327,7 @@
     
 ; return 0; }
 EOF
-if { (eval echo configure:5319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5331: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   gnupg_cv_typedef_ushort=yes
 else
@@ -5336,12 +5348,12 @@
     fi
   
  echo $ac_n "checking for ulong typedef""... $ac_c" 1>&6
-echo "configure:5340: checking for ulong typedef" >&5
+echo "configure:5352: checking for ulong typedef" >&5
     if eval "test \"`echo '$''{'gnupg_cv_typedef_ulong'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5345 "configure"
+#line 5357 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
     #include <sys/types.h>
@@ -5352,7 +5364,7 @@
     
 ; return 0; }
 EOF
-if { (eval echo configure:5356: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5368: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   gnupg_cv_typedef_ulong=yes
 else
@@ -5373,12 +5385,12 @@
     fi
   
  echo $ac_n "checking for u16 typedef""... $ac_c" 1>&6
-echo "configure:5377: checking for u16 typedef" >&5
+echo "configure:5389: checking for u16 typedef" >&5
     if eval "test \"`echo '$''{'gnupg_cv_typedef_u16'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5382 "configure"
+#line 5394 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
     #include <sys/types.h>
@@ -5389,7 +5401,7 @@
     
 ; return 0; }
 EOF
-if { (eval echo configure:5393: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   gnupg_cv_typedef_u16=yes
 else
@@ -5410,12 +5422,12 @@
     fi
   
  echo $ac_n "checking for u32 typedef""... $ac_c" 1>&6
-echo "configure:5414: checking for u32 typedef" >&5
+echo "configure:5426: checking for u32 typedef" >&5
     if eval "test \"`echo '$''{'gnupg_cv_typedef_u32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5419 "configure"
+#line 5431 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
     #include <sys/types.h>
@@ -5426,7 +5438,7 @@
     
 ; return 0; }
 EOF
-if { (eval echo configure:5430: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5442: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   gnupg_cv_typedef_u32=yes
 else
@@ -5448,7 +5460,7 @@
   
 
 echo $ac_n "checking size of unsigned short""... $ac_c" 1>&6
-echo "configure:5452: checking size of unsigned short" >&5
+echo "configure:5464: checking size of unsigned short" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_short'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5456,7 +5468,7 @@
   ac_cv_sizeof_unsigned_short=2
 else
   cat > conftest.$ac_ext <<EOF
-#line 5460 "configure"
+#line 5472 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -5467,7 +5479,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:5471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_unsigned_short=`cat conftestval`
 else
@@ -5487,7 +5499,7 @@
 
 
 echo $ac_n "checking size of unsigned int""... $ac_c" 1>&6
-echo "configure:5491: checking size of unsigned int" >&5
+echo "configure:5503: checking size of unsigned int" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_int'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5495,7 +5507,7 @@
   ac_cv_sizeof_unsigned_int=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 5499 "configure"
+#line 5511 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -5506,7 +5518,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:5510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_unsigned_int=`cat conftestval`
 else
@@ -5526,7 +5538,7 @@
 
 
 echo $ac_n "checking size of unsigned long""... $ac_c" 1>&6
-echo "configure:5530: checking size of unsigned long" >&5
+echo "configure:5542: checking size of unsigned long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5534,7 +5546,7 @@
   ac_cv_sizeof_unsigned_long=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 5538 "configure"
+#line 5550 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -5545,7 +5557,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:5549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_unsigned_long=`cat conftestval`
 else
@@ -5565,7 +5577,7 @@
 
 
 echo $ac_n "checking size of unsigned long long""... $ac_c" 1>&6
-echo "configure:5569: checking size of unsigned long long" >&5
+echo "configure:5581: checking size of unsigned long long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_long_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5573,7 +5585,7 @@
   ac_cv_sizeof_unsigned_long_long=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 5577 "configure"
+#line 5589 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -5584,7 +5596,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:5588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_unsigned_long_long=`cat conftestval`
 else
@@ -5613,12 +5625,12 @@
 
 
 echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:5617: checking for vprintf" >&5
+echo "configure:5629: checking for vprintf" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5622 "configure"
+#line 5634 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vprintf(); below.  */
@@ -5641,7 +5653,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_vprintf=yes"
 else
@@ -5665,12 +5677,12 @@
 
 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:5669: checking for _doprnt" >&5
+echo "configure:5681: checking for _doprnt" >&5
 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5674 "configure"
+#line 5686 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt(); below.  */
@@ -5693,7 +5705,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func__doprnt=yes"
 else
@@ -5720,12 +5732,12 @@
 for ac_func in strerror stpcpy strlwr stricmp tcgetattr rand strtoul mmap
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5724: checking for $ac_func" >&5
+echo "configure:5736: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5729 "configure"
+#line 5741 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5748,7 +5760,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5775,12 +5787,12 @@
 for ac_func in memmove gettimeofday getrusage gethrtime setrlimit clock_gettime
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5779: checking for $ac_func" >&5
+echo "configure:5791: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5784 "configure"
+#line 5796 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5803,7 +5815,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5830,12 +5842,67 @@
 for ac_func in memicmp atexit raise getpagesize strftime nl_langinfo
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5834: checking for $ac_func" >&5
+echo "configure:5846: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 5851 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:5874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+for ac_func in waitpid wait4 sigaction sigprocmask
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:5901: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5839 "configure"
+#line 5906 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5858,7 +5925,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5882,15 +5949,17 @@
 fi
 done
 
-for ac_func in waitpid wait4 sigaction sigprocmask fopen64 fstat64
+
+if test $try_large_file = "yes"; then
+for ac_func in fopen64 fstat64
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5889: checking for $ac_func" >&5
+echo "configure:5958: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5894 "configure"
+#line 5963 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5913,7 +5982,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5937,16 +6006,17 @@
 fi
 done
 
+fi
 
  for ac_func in mlock
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5945: checking for $ac_func" >&5
+echo "configure:6015: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5950 "configure"
+#line 6020 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5969,7 +6039,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5998,17 +6068,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6002: checking for $ac_hdr" >&5
+echo "configure:6072: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6007 "configure"
+#line 6077 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6012: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6082: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6037,7 +6107,7 @@
         if test "$ac_cv_header_sys_mman_h" = "yes"; then
             # Add librt to LIBS:
             echo $ac_n "checking for memlk in -lrt""... $ac_c" 1>&6
-echo "configure:6041: checking for memlk in -lrt" >&5
+echo "configure:6111: checking for memlk in -lrt" >&5
 ac_lib_var=`echo rt'_'memlk | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6045,7 +6115,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lrt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6049 "configure"
+#line 6119 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6056,7 +6126,7 @@
 memlk()
 ; return 0; }
 EOF
-if { (eval echo configure:6060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6084,12 +6154,12 @@
 fi
 
             echo $ac_n "checking whether mlock is in sys/mman.h""... $ac_c" 1>&6
-echo "configure:6088: checking whether mlock is in sys/mman.h" >&5
+echo "configure:6158: checking whether mlock is in sys/mman.h" >&5
 if eval "test \"`echo '$''{'gnupg_cv_mlock_is_in_sys_mman'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6093 "configure"
+#line 6163 "configure"
 #include "confdefs.h"
 
                     #include <assert.h>
@@ -6114,7 +6184,7 @@
                 
 ; return 0; }
 EOF
-if { (eval echo configure:6118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gnupg_cv_mlock_is_in_sys_mman=yes
 else
@@ -6137,7 +6207,7 @@
     fi
     if test "$ac_cv_func_mlock" = "yes"; then
         echo $ac_n "checking whether mlock is broken""... $ac_c" 1>&6
-echo "configure:6141: checking whether mlock is broken" >&5
+echo "configure:6211: checking whether mlock is broken" >&5
           if eval "test \"`echo '$''{'gnupg_cv_have_broken_mlock'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6146,7 +6216,7 @@
            
 else
   cat > conftest.$ac_ext <<EOF
-#line 6150 "configure"
+#line 6220 "configure"
 #include "confdefs.h"
 
                 #include <stdlib.h>
@@ -6176,7 +6246,7 @@
 
             
 EOF
-if { (eval echo configure:6180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   gnupg_cv_have_broken_mlock="no"
 else
@@ -6210,17 +6280,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6214: checking for $ac_hdr" >&5
+echo "configure:6284: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6219 "configure"
+#line 6289 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6224: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6294: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6247,12 +6317,12 @@
 done
 
 echo $ac_n "checking if mkdir takes one argument""... $ac_c" 1>&6
-echo "configure:6251: checking if mkdir takes one argument" >&5
+echo "configure:6321: checking if mkdir takes one argument" >&5
 if eval "test \"`echo '$''{'gnupg_cv_mkdir_takes_one_arg'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6256 "configure"
+#line 6326 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6269,7 +6339,7 @@
 mkdir ("foo", 0);
 ; return 0; }
 EOF
-if { (eval echo configure:6273: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6343: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   gnupg_cv_mkdir_takes_one_arg=no
 else
@@ -6296,17 +6366,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6300: checking for $ac_hdr" >&5
+echo "configure:6370: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6305 "configure"
+#line 6375 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6310: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6380: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6334,7 +6404,7 @@
 
 if test "$ac_cv_header_sys_capability_h" = "yes" ; then
   echo $ac_n "checking for cap_init in -lcap""... $ac_c" 1>&6
-echo "configure:6338: checking for cap_init in -lcap" >&5
+echo "configure:6408: checking for cap_init in -lcap" >&5
 ac_lib_var=`echo cap'_'cap_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6342,7 +6412,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lcap  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6346 "configure"
+#line 6416 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6353,7 +6423,7 @@
 cap_init()
 ; return 0; }
 EOF
-if { (eval echo configure:6357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6401,17 +6471,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6405: checking for $ac_hdr" >&5
+echo "configure:6475: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6410 "configure"
+#line 6480 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6415: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6485: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6439,7 +6509,7 @@
 
      if test "$ac_cv_header_sys_shm_h" = "yes"; then
        echo $ac_n "checking whether IPC_RMID allowes subsequent attaches""... $ac_c" 1>&6
-echo "configure:6443: checking whether IPC_RMID allowes subsequent attaches" >&5
+echo "configure:6513: checking whether IPC_RMID allowes subsequent attaches" >&5
        if eval "test \"`echo '$''{'gnupg_cv_ipc_rmid_deferred_release'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6447,7 +6517,7 @@
   gnupg_cv_ipc_rmid_deferred_release="assume-no"
 else
   cat > conftest.$ac_ext <<EOF
-#line 6451 "configure"
+#line 6521 "configure"
 #include "confdefs.h"
 
              #include <sys/types.h>
@@ -6473,7 +6543,7 @@
              }
          
 EOF
-if { (eval echo configure:6477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   gnupg_cv_ipc_rmid_deferred_release="yes"
 else
@@ -6503,12 +6573,12 @@
        fi
 
        echo $ac_n "checking whether SHM_LOCK is available""... $ac_c" 1>&6
-echo "configure:6507: checking whether SHM_LOCK is available" >&5
+echo "configure:6577: checking whether SHM_LOCK is available" >&5
        if eval "test \"`echo '$''{'gnupg_cv_ipc_have_shm_lock'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6512 "configure"
+#line 6582 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
              #include <sys/ipc.h>
@@ -6520,7 +6590,7 @@
              
 ; return 0; }
 EOF
-if { (eval echo configure:6524: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6594: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   gnupg_cv_ipc_have_shm_lock="yes"
 else
@@ -6554,7 +6624,7 @@
 
 if test "$try_dev_random" = yes ; then
     echo $ac_n "checking for random device""... $ac_c" 1>&6
-echo "configure:6558: checking for random device" >&5
+echo "configure:6628: checking for random device" >&5
 if eval "test \"`echo '$''{'ac_cv_have_dev_random'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6571,7 +6641,7 @@
     fi
 else
     echo $ac_n "checking for random device""... $ac_c" 1>&6
-echo "configure:6575: checking for random device" >&5
+echo "configure:6645: checking for random device" >&5
     ac_cv_have_dev_random=no
     echo "$ac_t""has been disabled" 1>&6
 fi
@@ -6581,17 +6651,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6585: checking for $ac_hdr" >&5
+echo "configure:6655: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6590 "configure"
+#line 6660 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6595: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6665: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6618,7 +6688,7 @@
 done
 
     echo $ac_n "checking for random device ioctl""... $ac_c" 1>&6
-echo "configure:6622: checking for random device ioctl" >&5
+echo "configure:6692: checking for random device ioctl" >&5
 if eval "test \"`echo '$''{'ac_cv_have_dev_random_ioctl'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6772,7 +6842,7 @@
 
 
 echo $ac_n "checking for mpi assembler functions""... $ac_c" 1>&6
-echo "configure:6776: checking for mpi assembler functions" >&5
+echo "configure:6846: checking for mpi assembler functions" >&5
 if test -f $srcdir/mpi/config.links ; then
     . $srcdir/mpi/config.links
      if test "x$wk_link_files_src" = "x"; then
@@ -6814,17 +6884,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6818: checking for $ac_hdr" >&5
+echo "configure:6888: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6823 "configure"
+#line 6893 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6898: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6852,7 +6922,7 @@
 
   if test "$ac_cv_header_zlib_h" = yes ; then
       echo $ac_n "checking for deflateInit2_ in -lz""... $ac_c" 1>&6
-echo "configure:6856: checking for deflateInit2_ in -lz" >&5
+echo "configure:6926: checking for deflateInit2_ in -lz" >&5
 ac_lib_var=`echo z'_'deflateInit2_ | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6860,7 +6930,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lz  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6864 "configure"
+#line 6934 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6871,7 +6941,7 @@
 deflateInit2_()
 ; return 0; }
 EOF
-if { (eval echo configure:6875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7509,6 +7579,7 @@
   #endif
 #endif
 G10EOF
+cat mpi/mpi-asm-defs.h >>g10defs.tmp 
 if cmp -s g10defs.h g10defs.tmp 2>/dev/null; then
     echo "g10defs.h is unchanged"
     rm -f g10defs.tmp
diff -urN gnupg-1.0.3/configure.in gnupg-1.0.4/configure.in
--- gnupg-1.0.3/configure.in	Thu Sep 14 14:20:26 2000
+++ gnupg-1.0.4/configure.in	Tue Oct 17 15:29:31 2000
@@ -2,7 +2,7 @@
 dnl Configure template for GNUPG
 dnl
 dnl (Process this file with autoconf to produce a configure script.)
-AC_REVISION($Revision: 1.103.2.24 $)dnl
+AC_REVISION($Revision: 1.103.2.27 $)dnl
 
 dnl Must reset CDPATH so that bash's cd does not print to stdout
 CDPATH=
@@ -166,6 +166,7 @@
 
 try_gettext=yes
 try_gdbm=yes
+try_large_file=yes
 case "${target}" in
     *-*-mingw32*)
         # special stuff for Windoze NT
@@ -205,6 +206,7 @@
         if test -z "$GCC" ; then
             CFLAGS="$CFLAGS -Ae -D_HPUX_SOURCE"
         fi
+        try_large_file="no"
         ;;
     *-dec-osf4*)
         if test -z "$GCC" ; then
@@ -215,6 +217,9 @@
         ;;
     m68k-atari-mint)
         ;;
+    *-solaris*)
+        try_large_file="no"
+        ;;
     *)
        ;;
 esac
@@ -272,6 +277,12 @@
         DYNLINK_MOD_CFLAGS="-shared $CFLAGS_PIC"
         ;;
 
+    *-irix*)
+        NAME_OF_DEV_RANDOM="/dev/random"
+        NAME_OF_DEV_URANDOM="/dev/urandom"
+        DYNLINK_MOD_CFLAGS="-shared $CFLAGS_PIC"
+        ;;
+
     *)
         NAME_OF_DEV_RANDOM="/dev/random"
         NAME_OF_DEV_URANDOM="/dev/urandom"
@@ -413,7 +424,11 @@
 AC_CHECK_FUNCS(strerror stpcpy strlwr stricmp tcgetattr rand strtoul mmap)
 AC_CHECK_FUNCS(memmove gettimeofday getrusage gethrtime setrlimit clock_gettime)
 AC_CHECK_FUNCS(memicmp atexit raise getpagesize strftime nl_langinfo)
-AC_CHECK_FUNCS(waitpid wait4 sigaction sigprocmask fopen64 fstat64)
+AC_CHECK_FUNCS(waitpid wait4 sigaction sigprocmask)
+
+if test $try_large_file = "yes"; then
+AC_CHECK_FUNCS(fopen64 fstat64)
+fi
 
 GNUPG_CHECK_MLOCK
 GNUPG_FUNC_MKDIR_TAKES_ONE_ARG
@@ -719,6 +734,7 @@
   #endif
 #endif
 G10EOF
+cat mpi/mpi-asm-defs.h >>g10defs.tmp 
 if cmp -s g10defs.h g10defs.tmp 2>/dev/null; then
     echo "g10defs.h is unchanged"
     rm -f g10defs.tmp
diff -urN gnupg-1.0.3/debian/README.Debian gnupg-1.0.4/debian/README.Debian
--- gnupg-1.0.3/debian/README.Debian	Sat Jan  9 16:06:48 1999
+++ gnupg-1.0.4/debian/README.Debian	Mon Oct 16 17:43:42 2000
@@ -1,3 +1,14 @@
+GDBM keyring support
+--------------------
+
+GDBM-based keyring support is (and always) was an experimental feature
+which is likely to be removed in future versions.  For that reason it
+is not compiled into the Debian package and won't be until and unless
+GDBM support stabalizes.
+
+Upgrading from old (<= 0.3.3) versions GnuPG
+--------------------------------------------
+
 Due to a bug in the way secret keys were encrypted in versions prior
 to 0.3.3, later version of gnupg are not backwards compatible and you
 will have to convert your secret keys before using old secret keys
@@ -12,5 +23,6 @@
   <URL:http://james.nocrew.org/gnupg/>
 
 -- 
-James Troup <james@nocrew.org>, Bradford, UK
-Sun,  8 Nov 1998 19:11:40 +0000
+James Troup <james@nocrew.org>, Horsforth, UK
+Sun,  1 Oct 2000 13:53:12 +0100
+
diff -urN gnupg-1.0.3/debian/changelog gnupg-1.0.4/debian/changelog
--- gnupg-1.0.3/debian/changelog	Mon Sep  6 20:10:13 1999
+++ gnupg-1.0.4/debian/changelog	Mon Oct 16 17:43:42 2000
@@ -1,3 +1,91 @@
+gnupg (1.0.3b-1) unstable; urgency=low
+
+  * New upstream snapshot version.
+
+ -- James Troup <james@nocrew.org>  Fri, 13 Oct 2000 18:08:14 +0100
+
+gnupg (1.0.3-2) unstable; urgency=low
+
+  * debian/control: Conflict, Replace and Provide gpg-rsa & gpg-rsaref.
+    Fix long description to reflect the fact that RSA is no longer
+    patented and now included. [#72177]
+  * debian/rules: move faq.html to /usr/share/doc/gnupg/ and remove FAQ
+    from /usr/share/gnupg/.  Thanks to Robert Luberda
+    <robert@pingu.ii.uj.edu.pl> for noticing. [#72151]
+  * debian/control: Suggest new package gnupg-doc. [#64323, #65560]
+  * utils/secmem.c (lock_pool): don't bomb out if mlock() returns ENOMEM,
+    as Linux will do this if resource limits (or other reasons) prevent
+    memory from being locked, instead treat it like permission was denied
+    and warn but continue.  Thanks to Topi Miettinen
+    <Topi.Miettinen@nic.fi>. [#70446]
+  * g10/hkp.c (not_implemented): s/ist/is/ in error message.
+  * debian/README.Debian: add a note about GDBM support and why it is
+    disabled.  Upstream already fixed the manpage.  [#65913]
+  * debian/rules (binary-arch): fix the Spanish translation to be 'es' not
+    'es_ES' at Nicolás Lichtmaier <nick@debian.org>'s request. [#57314]
+
+ -- James Troup <james@nocrew.org>  Sun,  1 Oct 2000 14:55:03 +0100
+
+gnupg (1.0.3-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- James Troup <james@nocrew.org>  Mon, 18 Sep 2000 15:56:54 +0100
+
+gnupg (1.0.2-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- James Troup <james@nocrew.org>  Thu, 13 Jul 2000 20:26:50 +0100
+
+gnupg (1.0.1-2) unstable; urgency=low
+
+  * debian/control (Build-Depends): added.
+  * debian/copyright: corrected location of copyright file.  Removed
+    references to Linux.  Removed warnings about beta nature of GnuPG.
+  * debian/rules (binary-arch): install documentation into
+    /usr/share/doc/gnupg/ and pass mandir to make install to ensure the
+    manpages go to /usr/share/man/.
+  * debian/postinst: create /usr/doc/gnupg symlink.
+  * debian/prerm: new file; remove /usr/doc/gnupg symlink.
+  * debian/rules (binary-arch): install prerm.
+  * debian/control (Standards-Version): updated to 3.1.1.1.
+
+ -- James Troup <james@nocrew.org>  Thu, 30 Dec 1999 16:16:49 +0000
+
+gnupg (1.0.1-1) unstable; urgency=low
+
+  * New upstream version.
+  * doc/gpg.1: updated to something usable from
+    ftp://ftp.gnupg.org/pub/gcrypt/gnupg/gpg.1.gz.
+
+ -- James Troup <james@nocrew.org>  Sun, 19 Dec 1999 23:47:10 +0000
+
+gnupg (1.0.0-3) unstable; urgency=low
+
+  * debian/rules (build): remove the stunningly ill-advised --host option
+    to configure.  [#44698, #48212, #48281]
+
+ -- James Troup <james@nocrew.org>  Tue, 26 Oct 1999 01:12:59 +0100
+
+gnupg (1.0.0-2) unstable; urgency=low
+
+  * debian/rules (binary-arch): fix the permissions on the
+    modules. [#47280]
+  * debian/postinst, debian/postrm: fix the package name passed to
+    suidregister. [#45013]
+  * debian/control: update long description. [#44636]
+  * debian/rules (build): pass the host explicitly to configure to avoid
+    problems on sparc64. [(Should fix) #44698].
+
+ -- James Troup <james@nocrew.org>  Wed, 20 Oct 1999 23:39:05 +0100
+
+gnupg (1.0.0-1) unstable; urgency=low
+
+  * New upstream release. [#44545]
+
+ -- James Troup <james@nocrew.org>  Wed,  8 Sep 1999 00:53:02 +0100
+
 gnupg (0.9.10-2) unstable; urgency=low
 
   * debian/rules (binary-arch): install lspgpot.  Requested by Kai
diff -urN gnupg-1.0.3/debian/control gnupg-1.0.4/debian/control
--- gnupg-1.0.3/debian/control	Tue Jun 29 21:50:43 1999
+++ gnupg-1.0.4/debian/control	Mon Oct 16 17:43:42 2000
@@ -2,22 +2,23 @@
 Section: utils
 Priority: optional
 Maintainer: James Troup <james@nocrew.org>
-Standards-Version: 2.5.0.0
+Standards-Version: 3.1.1.1
+Build-Depends: gettext, libgdbmg1-dev, libz-dev
 
 Package: gnupg
 Architecture: any
 Depends: ${shlibs:Depends}, makedev (>= 2.3.1-13)
+Suggests: gnupg-doc
+Conflicts: gpg-rsa, gpg-rsaref
+Replaces: gpg-rsa, gpg-rsaref
+Provides: gpg-rsa, gpg-rsaref
 Description: GNU privacy guard - a free PGP replacement.
- GnuPG is the GNU encryption and signing tool.  As you can see from the
- version number, the program may have some bugs and some features may not
- work at all.
+ GnuPG is GNU's tool for secure communication and data storage.
+ It can be used to encrypt data and to create digital signatures.
+ It includes an advanced key management facility and is compliant
+ with the proposed OpenPGP Internet standard as described in RFC2440.
  .
- Due to the fact that GnuPG does not use use any patented algorithm,
- it cannot be compatible to old PGP versions, because those use
- IDEA (which is worldwide patented) and RSA (which is patented in
- the United States until Sep 20, 2000).
- .
- GnuPG is in almost all aspects compatible with other OpenPGP
- implementations. The default algorithms are DSA and ELGamal.
- Symmetric algorithms are: Blowfish and CAST5, Digest algorithms are
- MD5, RIPEMD160, SHA1 and TIGER/192.
+ GnuPG does not use use any patented algorithms so it cannot be
+ compatible with PGP2 because it uses IDEA (which is patented
+ worldwide) and RSA.  RSA's patent expired on the 20th September 2000,
+ and it is now included in GnuPG.
diff -urN gnupg-1.0.3/debian/copyright gnupg-1.0.4/debian/copyright
--- gnupg-1.0.3/debian/copyright	Mon Aug 30 20:48:48 1999
+++ gnupg-1.0.4/debian/copyright	Mon Oct 16 17:43:42 2000
@@ -1,30 +1,29 @@
-This is Debian/GNU Linux's prepackaged version of GNUPG, a free PGP
-replacement. As you can see from the version number, the program may
-have some bugs and some features may not work at all.
-
-This package was put together by me, James Troup
-<james@nocrew.org>, from the sources, which I obtained from
-ftp://ftp.gnupg.org/pub/gcrypt/gnupg-0.9.10.tar.gz.  The changes were
-minimal, namely:
+This is Debian GNU's prepackaged version of GnuPG, a free PGP
+replacement.
+
+This package was put together by me, James Troup <james@nocrew.org>,
+from the sources, which I obtained from
+ftp://ftp.gnupg.org/pub/gcrypt/gnupg/gnupg-1.0.3.tar.gz.  The changes
+were minimal, namely:
 
 - adding support for the Debian package maintenance scheme, by adding
   various debian/* files.
 
 Program Copyright (C) 1998, 1999 Free Software Foundation, Inc.
-Modifications for Debian Copyright (C) 1998,1999 James Troup.
+Modifications for Debian Copyright (C) 1998, 1999, 2000 James Troup.
 
-GNUPG 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, or (at your option)
-any later version.
-
-GNUPG 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.
+GnuPG 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, or (at your option) any later
+version.
+
+GnuPG 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 with
-your Debian GNU/Linux system, in /usr/doc/copyright/GPL, or with the
-Debian GNU/Linux gnupg source package as the file COPYING.  If not,
-write to the Free Software Foundation, Inc., 59 Temple Place, Suite
-330, Boston, MA 02111-1307, USA.
+your Debian GNU system, in /usr/share/common-licenses/GPL, or with the
+Debian GNU gnupg source package as the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+Boston, MA 02111-1307, USA.
diff -urN gnupg-1.0.3/debian/rules gnupg-1.0.4/debian/rules
--- gnupg-1.0.3/debian/rules	Mon Aug 30 20:48:48 1999
+++ gnupg-1.0.4/debian/rules	Mon Oct 16 17:43:42 2000
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-# debian/rules file - for GNUPG (0.9.10)
+# debian/rules file - for GNUPG (1.0.3)
 # Based on sample debian/rules file - for GNU Hello (1.3).
 # Copyright 1994,1995 by Ian Jackson.
 # Copyright 1998 James Troup
@@ -32,26 +32,31 @@
 	$(checkdir)
 	-rm -rf debian/tmp
 	install -d debian/tmp/DEBIAN/
-	install -m 755 debian/preinst debian/postinst debian/postrm debian/tmp/DEBIAN/
-	$(MAKE) prefix=`pwd`/debian/tmp/usr install
+	install -m 755 debian/preinst debian/prerm debian/postinst debian/postrm debian/tmp/DEBIAN/
+	$(MAKE) prefix=`pwd`/debian/tmp/usr mandir=`pwd`/debian/tmp/usr/share/man install
 	strip debian/tmp/usr/bin/*
+	chmod 644 debian/tmp/usr/lib/gnupg/*
 	sed -e "s#../g10/gpg#gpg#" < tools/lspgpot > debian/tmp/usr/bin/lspgpot
 	chmod 755 debian/tmp/usr/bin/lspgpot
 	strip --strip-unneeded debian/tmp/usr/lib/gnupg/*
-	sed -e "s#/usr/local/#/usr/#" < debian/tmp/usr/man/man1/gpg.1 \
-	    > debian/tmp/usr/man/man1/gpg.1.new
-	mv debian/tmp/usr/man/man1/gpg.1.new debian/tmp/usr/man/man1/gpg.1
-	gzip -9v debian/tmp/usr/man/man1/*
-	install -d debian/tmp/usr/doc/gnupg/
-	install -m 644 debian/changelog debian/tmp/usr/doc/gnupg/changelog.Debian
+	# In response to #53714... no idea if it's correct, will check with upstream
+	mv debian/tmp/usr/share/locale/es_ES debian/tmp/usr/share/locale/es
+	sed -e "s#/usr/local/#/usr/#" < debian/tmp/usr/share/man/man1/gpg.1 \
+	    > debian/tmp/usr/share/man/man1/gpg.1.new
+	mv debian/tmp/usr/share/man/man1/gpg.1.new debian/tmp/usr/share/man/man1/gpg.1
+	gzip -9v debian/tmp/usr/share/man/man1/*
+	# Remove from /usr/share/gnupg that we install into /usr/share/doc/gnupg/
+	rm debian/tmp/usr/share/gnupg/FAQ debian/tmp/usr/share/gnupg/faq.html
+	install -d debian/tmp/usr/share/doc/gnupg/
+	install -m 644 debian/changelog debian/tmp/usr/share/doc/gnupg/changelog.Debian
 	install -m 644 debian/README.Debian README NEWS THANKS TODO doc/DETAILS \
-		doc/FAQ doc/OpenPGP debian/tmp/usr/doc/gnupg/
+		doc/FAQ doc/faq.html doc/OpenPGP debian/tmp/usr/share/doc/gnupg/
 	for i in po util mpi cipher tools g10 checks include; do \
-		install -m 644 $$i/ChangeLog debian/tmp/usr/doc/gnupg/changelog.$$i; done
-	install -m 644 ChangeLog debian/tmp/usr/doc/gnupg/changelog.toplevel
-	gzip -9v debian/tmp/usr/doc/gnupg/*
-	ln -s changelog.g10.gz debian/tmp/usr/doc/gnupg/changelog.gz
-	install -m 644 debian/copyright debian/tmp/usr/doc/gnupg/
+		install -m 644 $$i/ChangeLog debian/tmp/usr/share/doc/gnupg/changelog.$$i; done
+	install -m 644 ChangeLog debian/tmp/usr/share/doc/gnupg/changelog.toplevel
+	gzip -9v debian/tmp/usr/share/doc/gnupg/*
+	ln -s changelog.g10.gz debian/tmp/usr/share/doc/gnupg/changelog.gz
+	install -m 644 debian/copyright debian/tmp/usr/share/doc/gnupg/
 	dpkg-shlibdeps g10/gpg
 	dpkg-gencontrol -isp
 	chown -R root.root debian/tmp
diff -urN gnupg-1.0.3/doc/ChangeLog gnupg-1.0.4/doc/ChangeLog
--- gnupg-1.0.3/doc/ChangeLog	Thu Sep 14 14:20:39 2000
+++ gnupg-1.0.4/doc/ChangeLog	Sat Oct 14 18:19:16 2000
@@ -1,3 +1,12 @@
+2000-10-14  Werner Koch  <wk@gnupg.org>
+
+	* faq.raw: Add an answer to the problem of multiple signatures.
+
+Wed Oct  4 15:50:18 CEST 2000  Werner Koch  <wk@openit.de>
+
+        * gpgv.sgml: New.
+        * Makefile.am: build it.
+
 Thu Sep 14 14:20:38 CEST 2000  Werner Koch  <wk@openit.de>
 
         * faq.raw: New.
@@ -5,11 +14,11 @@
 
 Wed Jul 12 13:32:06 CEST 2000  Werner Koch  <wk@>
 
-  * gpg.sgml: Add a note about the availability of the GPH.
+        * gpg.sgml: Add a note about the availability of the GPH.
 
 2000-07-03 13:59:24  Werner Koch  (wk@habibti.openit.de)
 
-  * DETAILS, FAQ: Typo fixes by Yosiaki IIDA.
+        * DETAILS, FAQ: Typo fixes by Yosiaki IIDA.
 
 2000-05-12 10:57:21  Werner Koch  (wk@habibti.openit.de)
 
diff -urN gnupg-1.0.3/doc/FAQ gnupg-1.0.4/doc/FAQ
--- gnupg-1.0.3/doc/FAQ	Thu Sep 14 11:35:29 2000
+++ gnupg-1.0.4/doc/FAQ	Tue Oct 17 15:16:56 2000
@@ -1,13 +1,12 @@
 
-
 GNUPG FREQUENTLY ASKED QUESTIONS
 
-Version: 0.1
-Last-Modified: Sep 14, 2000
+Version: 0.2
+Last-Modified: Oct 14, 2000
 Maintained-by: Nils Ellmenreich <nils 'at' infosun.fmi.uni-passau.de>
 
 This is the GnuPG FAQ. The latest HTML version is available  
- here.   <http://www.gnupg.org>
+ here.   <http://www.gnupg.org/faq.html>
 
 The index is generated automatically, so there may be errors here.  Not
 all questions may be in the section they belong to. Suggestions about
@@ -20,6 +19,7 @@
 
 
 
+
  1. GENERAL
    1.1) What is GnuPG?
    1.2) Is GnuPG compatible with PGP?
@@ -39,7 +39,7 @@
    4.3) And it really takes long when I work on a remote system. Why?
    4.4) What is the difference between options and commands?
    4.5) I can't delete an user id because it is already deleted on my public
-	keying?
+	keyring?
    4.6) What are trust, validity and ownertrust?
    4.7) How do I sign a patch file?
    4.8) Where is the "encrypt-to-self" option?
@@ -52,13 +52,14 @@
    4.13) How can I used GnuPG in an automated environment?
 
  5. COMPATIBILITY ISSUES 
-   5.1) How can I encrypt a message so that pgp 2.x is able to decrypt it?
-   5.2) How can I conventional encrypt a message, so that PGP can decrypt
+   5.1) How can I encrypt a message so that PGP 2.x is able to decrypt it?
+   5.2) How do I migrate from PGP 2.x to GnuPG?
+   5.3) How can I conventional encrypt a message, so that PGP can decrypt
 	it?
-   5.3) Why is PGP 5.x not able to encrypt messages with some keys?
-   5.4) Why is PGP 5.x not able to verify my messages?
-   5.5) How do I transfer owner trust values from PGP to GnuPG?
-   5.6) PGP 5.x, 6.x do not like my secret key.
+   5.4) Why is PGP 5.x not able to encrypt messages with some keys?
+   5.5) Why is PGP 5.x not able to verify my messages?
+   5.6) How do I transfer owner trust values from PGP to GnuPG?
+   5.7) PGP 5.x, 6.x do not like my secret key.
 
  6. PROBLEMS and ERROR MESSAGES
    6.1) Why do I get "gpg: Warning: using insecure memory!"
@@ -68,6 +69,7 @@
    6.4) Old versions of GnuPG can't verify ElGamal signatures
    6.5) When I use --clearsign, the plain text has sometimes extra dashes 
 	in it - why?
+   6.6) What is the thing with "can't handle multiple signatures"?
 
  7. ADVANCED TOPICS
    7.1) How does this whole thing work?
@@ -157,22 +159,22 @@
 
 3.3) How do I include support for RSA and IDEA?
 
-    The official GnuPG distribution (as of 1.0.2) does not contain
-    either of them due to patents restriction. The RSA patent expires
-    Sept 20, 2000. A new GnuPG release is then scheduled to include
-    it. The IDEA patent does not expire before 2007 so don't expect
-    official support before then.
+    RSA is included as of GnuPG 1.0.3.
 
-    However, there are unofficial modules to include both of them even
-    in earlier version of GnuPG. They're available from  
+    The official GnuPG distribution does not contain IDEA due to a
+    patent restriction. The patent does not expire before 2007 so don't
+    expect official support before then.
+
+    However, there is an unofficial modules to include it even
+    in earlier version of GnuPG. It's available from  
 	    <ftp://ftp.gnupg.org/pub/gcrypt/contrib/>
-    <ftp://ftp.gnupg.org/pub/gcrypt/contrib/>. Look for idea.c 
-    and rsa.c. Compilation directives are in the headers
-    of these files. Then add the following lines to your ~/.gnupg/options:
+    <ftp://ftp.gnupg.org/pub/gcrypt/contrib/>. Look for idea.c. 
+
+    Compilation directives are in the headers of these files. Then add
+    the following line to your ~/.gnupg/options: 
     load-extension idea 
-    load-extension rsa
 
-    These extensions are not available for the Windows version of GnuPG.
+    The extension is not available for the Windows version of GnuPG.
 
 
 4. USAGE
@@ -196,7 +198,7 @@
     What I do is to hit several times on the shift, control, alternate,
     and capslock keys, because these keys do not produce output to the
     screen. This way you get your keys really fast (it's the same thing
-    pgp2 does).
+    PGP2 does).
 
     Another problem might be another program which eats up your random
     bytes (a program (look at your daemons) that reads from
@@ -273,7 +275,7 @@
 
 
 4.5) I can't delete an user id because it is already deleted on my public
-keying?
+keyring?
 
     Because you can only select from the public key ring, there is no
     direct way to do this.  However it is not very complicated to do it
@@ -372,18 +374,29 @@
 5. COMPATIBILITY ISSUES 
 
 
-5.1) How can I encrypt a message so that pgp 2.x is able to decrypt it?
+5.1) How can I encrypt a message so that PGP 2.x is able to decrypt it?
 
-    You can't do that because pgp 2.x normally uses IDEA which is not
-    supported by GnuPG because it is patented, but if you have a
-    modified version of PGP you can try this:
+    You can't do that because PGP 2.x normally uses IDEA which is not
+    supported by GnuPG because it is patented (see 3.3), but if you
+    have a modified version of PGP you can try this:
 
      gpg --rfc1991 --cipher-algo 3des ...  
 
     Please don't pipe the data to encrypt to gpg but give it as a
-    filename; otherwise, pgp 2 will not be able to handle it.
+    filename; otherwise, PGP 2 will not be able to handle it.
 
-5.2) How can I conventional encrypt a message, so that PGP can decrypt
+5.2) How do I migrate from PGP 2.x to GnuPG?
+
+    PGP 2 uses the RSA and IDEA encryption algorithms. Whereas the RSA
+    patent has expired and RSA is included as of GnuPG 1.0.3, the IDEA
+    algorithm is still patented until 2007. Under certain conditions you
+    may use IDEA even today. In that case, you may refer to Question
+    3.3 about how to add IDEA support to GnuPG and read
+    http://www.gnupg.org/gph/en/pgp2x.html
+    to perfrom the migration. 
+
+
+5.3) How can I conventional encrypt a message, so that PGP can decrypt
 it?
 
     You can't do this for PGP 2.  For PGP 5 you should use this: 
@@ -396,7 +409,7 @@
     normal gnupg operation.
 
 
-5.3) Why is PGP 5.x not able to encrypt messages with some keys?
+5.4) Why is PGP 5.x not able to encrypt messages with some keys?
 
     PGP Inc refuses to accept ElGamal keys of type 20 even for
     encryption.  They only support type 16 (which is identical at least
@@ -406,13 +419,13 @@
     16 ElGamal key to your public key which is easy as your key
     signatures are still valid.
 
-5.4) Why is PGP 5.x not able to verify my messages?
+5.5) Why is PGP 5.x not able to verify my messages?
 
     PGP 5.x does not accept V4 signatures for data material but OpenPGP
     requires generation of V4 signatures for all kind of data.  Use the
     option "--force-v3-sigs" to generate V3 signatures for data.
 
-5.5) How do I transfer owner trust values from PGP to GnuPG?
+5.6) How do I transfer owner trust values from PGP to GnuPG?
 
     There is a script in the tools directory to help you: After you have
     imported the PGP keyring you can give this command: 
@@ -422,7 +435,7 @@
     where pgpkeyring is the original keyring and not the GnuPG one you
     might have created in the first step.
 
-5.6) PGP 5.x, 6.x do not like my secret key.
+5.7) PGP 5.x, 6.x do not like my secret key.
 
     PGP probably bails out on some private comment packets used by
     GnuPG.  These packets are fully in compliance with OpenPGP; however
@@ -470,13 +483,23 @@
 
     This is called dash-escaped text and required by OpenPGP.
     It always happens when a line starts with a dash ("-") and is needed
-    to distinguish those lines from the thos lines which make up such
-    a clearsigned message. 
+    to make the lines that structure signature and text
+    (i.e., "-----BEGIN PGP SIGNATURE-----") to be the only lines that
+    start with two dashes.
 
-    If you use GnuPG to process those emessage, the extra dashes are removed.
+    If you use GnuPG to process those messages, the extra dashes are removed.
     Good mail clients remove those extra dashes when displaying such a 
     message.      
 
+6.6) What is the thing with "can't handle multiple signatures"?
+
+    Due to different message formats GnuPG is not always able to split a
+    file with multiple signatures unambiguously into it's parts.  This 
+    error message informs you that there is something wrong with the input.
+
+    The only way to have multiple signatures in a file is by using the 
+    OpenPGP format with one-pass-signature packets (which is GnuPG's
+    default) or the cleartext signed format.
 
 
 7. ADVANCED TOPICS
diff -urN gnupg-1.0.3/doc/Makefile.am gnupg-1.0.4/doc/Makefile.am
--- gnupg-1.0.3/doc/Makefile.am	Thu Sep 14 16:34:45 2000
+++ gnupg-1.0.4/doc/Makefile.am	Wed Oct  4 15:32:33 2000
@@ -1,9 +1,9 @@
 ## Process this file with automake to create Makefile.in
 
-EXTRA_DIST = DETAILS gpg.sgml gpg.1 faq.raw FAQ faq.html \
+EXTRA_DIST = DETAILS gpg.sgml gpg.1 gpgv.sgml gpgv.1 faq.raw FAQ faq.html \
              HACKING OpenPGP README.W32 
 
-man_MANS = gpg.1
+man_MANS = gpg.1 gpgv.1
 
 pkgdata_DATA = FAQ faq.html
 
@@ -42,6 +42,10 @@
 dist-hook:
 	@if test `wc -c < gpg.1` -lt 200; then \
 	    echo 'ERROR: dummy man page'; false; fi
+
+
+
+
 
 
 
diff -urN gnupg-1.0.3/doc/Makefile.in gnupg-1.0.4/doc/Makefile.in
--- gnupg-1.0.3/doc/Makefile.in	Mon Sep 18 12:18:15 2000
+++ gnupg-1.0.4/doc/Makefile.in	Tue Oct 17 15:40:48 2000
@@ -106,10 +106,10 @@
 ZLIBS = @ZLIBS@
 l = @l@
 
-EXTRA_DIST = DETAILS gpg.sgml gpg.1 faq.raw FAQ faq.html              HACKING OpenPGP README.W32 
+EXTRA_DIST = DETAILS gpg.sgml gpg.1 gpgv.sgml gpgv.1 faq.raw FAQ faq.html              HACKING OpenPGP README.W32 
 
 
-man_MANS = gpg.1
+man_MANS = gpg.1 gpgv.1
 
 pkgdata_DATA = FAQ faq.html
 
diff -urN gnupg-1.0.3/doc/faq.html gnupg-1.0.4/doc/faq.html
--- gnupg-1.0.3/doc/faq.html	Thu Sep 14 11:35:30 2000
+++ gnupg-1.0.4/doc/faq.html	Tue Oct 17 15:16:57 2000
@@ -2,17 +2,17 @@
 <title>GnuPG FAQ</title>
 </head>
 <body>
-<P>
+<body bgcolor=#ffffff text=#000000 link=#1f00ff alink=#ff0000 vlink=#9900dd>
 <H1>GNUPG FREQUENTLY ASKED QUESTIONS</H1>
 <P>
 <pre>
-Version: 0.1
-Last-Modified: Sep 14, 2000
+Version: 0.2
+Last-Modified: Oct 14, 2000
 Maintained-by: Nils Ellmenreich &lt;nils 'at' infosun.fmi.uni-passau.de&gt;
 </pre>
 <P>
 This is the GnuPG FAQ. The latest HTML version is available  
-<a href=http://www.gnupg.org> here</a>.  
+<a href=http://www.gnupg.org/faq.html> here</a>.  
 <P>
 The index is generated automatically, so there may be errors here.  Not
 all questions may be in the section they belong to. Suggestions about
@@ -23,6 +23,7 @@
 been asked before, it isn't a FAQ. Otherwise, please provide the answer
 to be included here.
 <P>
+<P>
 <HR>
 <P>
 <menu>
@@ -57,7 +58,7 @@
 <LI><a HREF=#q4.4>4.4) What is the difference between options and commands?
 </a>
 <LI><a HREF=#q4.5>4.5) I can't delete an user id because it is already deleted on my public
-keying?
+keyring?
 </a>
 <LI><a HREF=#q4.6>4.6) What are trust, validity and ownertrust?
 </a>
@@ -79,18 +80,20 @@
 </a>
 <h2><A HREF=#q5>5. COMPATIBILITY ISSUES 
 </A></h2>
-<LI><a HREF=#q5.1>5.1) How can I encrypt a message so that pgp 2.x is able to decrypt it?
+<LI><a HREF=#q5.1>5.1) How can I encrypt a message so that PGP 2.x is able to decrypt it?
 </a>
-<LI><a HREF=#q5.2>5.2) How can I conventional encrypt a message, so that PGP can decrypt
+<LI><a HREF=#q5.2>5.2) How do I migrate from PGP 2.x to GnuPG?
+</a>
+<LI><a HREF=#q5.3>5.3) How can I conventional encrypt a message, so that PGP can decrypt
 it?
 </a>
-<LI><a HREF=#q5.3>5.3) Why is PGP 5.x not able to encrypt messages with some keys?
+<LI><a HREF=#q5.4>5.4) Why is PGP 5.x not able to encrypt messages with some keys?
 </a>
-<LI><a HREF=#q5.4>5.4) Why is PGP 5.x not able to verify my messages?
+<LI><a HREF=#q5.5>5.5) Why is PGP 5.x not able to verify my messages?
 </a>
-<LI><a HREF=#q5.5>5.5) How do I transfer owner trust values from PGP to GnuPG?
+<LI><a HREF=#q5.6>5.6) How do I transfer owner trust values from PGP to GnuPG?
 </a>
-<LI><a HREF=#q5.6>5.6) PGP 5.x, 6.x do not like my secret key.
+<LI><a HREF=#q5.7>5.7) PGP 5.x, 6.x do not like my secret key.
 </a>
 <h2><A HREF=#q6>6. PROBLEMS and ERROR MESSAGES
 </A></h2>
@@ -106,6 +109,8 @@
 <LI><a HREF=#q6.5>6.5) When I use --clearsign, the plain text has sometimes extra dashes 
 in it - why?
 </a>
+<LI><a HREF=#q6.6>6.6) What is the thing with &quot;can't handle multiple signatures&quot;?
+</a>
 <h2><A HREF=#q7>7. ADVANCED TOPICS
 </A></h2>
 <LI><a HREF=#q7.1>7.1) How does this whole thing work?
@@ -225,23 +230,23 @@
 <a NAME=q3.3>3.3)</a> How do I include support for RSA and IDEA?
 </h3>
 <P>
-The official GnuPG distribution (as of 1.0.2) does not contain
-either of them due to patents restriction. The RSA patent expires
-Sept 20, 2000. A new GnuPG release is then scheduled to include
-it. The IDEA patent does not expire before 2007 so don't expect
-official support before then.
-<P>
-However, there are unofficial modules to include both of them even
-in earlier version of GnuPG. They're available from <a href=ftp://ftp.gnupg.org/pub/gcrypt/contrib/> 
-&lt;ftp://ftp.gnupg.org/pub/gcrypt/contrib/&gt;</a>. Look for <pre>idea.c</pre> 
-and <pre>rsa.c</pre>. Compilation directives are in the headers
-of these files. Then add the following lines to your ~/.gnupg/options:
+RSA is included as of GnuPG 1.0.3.
+<P>
+The official GnuPG distribution does not contain IDEA due to a
+patent restriction. The patent does not expire before 2007 so don't
+expect official support before then.
+<P>
+However, there is an unofficial modules to include it even
+in earlier version of GnuPG. It's available from <a href=ftp://ftp.gnupg.org/pub/gcrypt/contrib/> 
+&lt;ftp://ftp.gnupg.org/pub/gcrypt/contrib/&gt;</a>. Look for <pre>idea.c</pre>. 
+<P>
+Compilation directives are in the headers of these files. Then add
+the following line to your ~/.gnupg/options: 
 <pre>
 load-extension idea 
-load-extension rsa
 </pre>
 <P>
-These extensions are not available for the Windows version of GnuPG.
+The extension is not available for the Windows version of GnuPG.
 <P>
 <P>
 <h2>
@@ -271,7 +276,7 @@
 What I do is to hit several times on the shift, control, alternate,
 and capslock keys, because these keys do not produce output to the
 screen. This way you get your keys really fast (it's the same thing
-pgp2 does).
+PGP2 does).
 <P>
 Another problem might be another program which eats up your random
 bytes (a program (look at your daemons) that reads from
@@ -365,7 +370,7 @@
 <P>
 <h3>
 <a NAME=q4.5>4.5)</a> I can't delete an user id because it is already deleted on my public
-keying?
+keyring?
 </h3>
 <P>
 Because you can only select from the public key ring, there is no
@@ -484,20 +489,33 @@
 <P>
 <P>
 <h3>
-<a NAME=q5.1>5.1)</a> How can I encrypt a message so that pgp 2.x is able to decrypt it?
+<a NAME=q5.1>5.1)</a> How can I encrypt a message so that PGP 2.x is able to decrypt it?
 </h3>
 <P>
-You can't do that because pgp 2.x normally uses IDEA which is not
-supported by GnuPG because it is patented, but if you have a
-modified version of PGP you can try this:
+You can't do that because PGP 2.x normally uses IDEA which is not
+supported by GnuPG because it is patented (see <a HREF=#q3.3>3.3</a>), but if you
+have a modified version of PGP you can try this:
 <P>
 <pre> gpg --rfc1991 --cipher-algo 3des ...  </pre>
 <P>
 Please don't pipe the data to encrypt to gpg but give it as a
-filename; otherwise, pgp 2 will not be able to handle it.
+filename; otherwise, PGP 2 will not be able to handle it.
 <P>
 <h3>
-<a NAME=q5.2>5.2)</a> How can I conventional encrypt a message, so that PGP can decrypt
+<a NAME=q5.2>5.2)</a> How do I migrate from PGP 2.x to GnuPG?
+</h3>
+<P>
+PGP 2 uses the RSA and IDEA encryption algorithms. Whereas the RSA
+patent has expired and RSA is included as of GnuPG 1.0.3, the IDEA
+algorithm is still patented until 2007. Under certain conditions you
+may use IDEA even today. In that case, you may refer to Question
+<a HREF=#q3.3>3.3</a> about how to add IDEA support to GnuPG and read
+<a href=http://www.gnupg.org/gph/en/pgp2x.html>http://www.gnupg.org/gph/en/pgp2x.html</a>
+to perfrom the migration. 
+<P>
+<P>
+<h3>
+<a NAME=q5.3>5.3)</a> How can I conventional encrypt a message, so that PGP can decrypt
 it?
 </h3>
 <P>
@@ -514,7 +532,7 @@
 <P>
 <P>
 <h3>
-<a NAME=q5.3>5.3)</a> Why is PGP 5.x not able to encrypt messages with some keys?
+<a NAME=q5.4>5.4)</a> Why is PGP 5.x not able to encrypt messages with some keys?
 </h3>
 <P>
 PGP Inc refuses to accept ElGamal keys of type 20 even for
@@ -526,7 +544,7 @@
 signatures are still valid.
 <P>
 <h3>
-<a NAME=q5.4>5.4)</a> Why is PGP 5.x not able to verify my messages?
+<a NAME=q5.5>5.5)</a> Why is PGP 5.x not able to verify my messages?
 </h3>
 <P>
 PGP 5.x does not accept V4 signatures for data material but OpenPGP
@@ -534,7 +552,7 @@
 option &quot;--force-v3-sigs&quot; to generate V3 signatures for data.
 <P>
 <h3>
-<a NAME=q5.5>5.5)</a> How do I transfer owner trust values from PGP to GnuPG?
+<a NAME=q5.6>5.6)</a> How do I transfer owner trust values from PGP to GnuPG?
 </h3>
 <P>
 There is a script in the tools directory to help you: After you have
@@ -548,7 +566,7 @@
 might have created in the first step.
 <P>
 <h3>
-<a NAME=q5.6>5.6)</a> PGP 5.x, 6.x do not like my secret key.
+<a NAME=q5.7>5.7)</a> PGP 5.x, 6.x do not like my secret key.
 </h3>
 <P>
 PGP probably bails out on some private comment packets used by
@@ -609,13 +627,25 @@
 <P>
 This is called dash-escaped text and required by OpenPGP.
 It always happens when a line starts with a dash (&quot;-&quot;) and is needed
-to distinguish those lines from the thos lines which make up such
-a clearsigned message. 
+to make the lines that structure signature and text
+(i.e., &quot;-----BEGIN PGP SIGNATURE-----&quot;) to be the only lines that
+start with two dashes.
 <P>
-If you use GnuPG to process those emessage, the extra dashes are removed.
+If you use GnuPG to process those messages, the extra dashes are removed.
 Good mail clients remove those extra dashes when displaying such a 
 message.      
 <P>
+<h3>
+<a NAME=q6.6>6.6)</a> What is the thing with &quot;can't handle multiple signatures&quot;?
+</h3>
+<P>
+Due to different message formats GnuPG is not always able to split a
+file with multiple signatures unambiguously into it's parts.  This 
+error message informs you that there is something wrong with the input.
+<P>
+The only way to have multiple signatures in a file is by using the 
+OpenPGP format with one-pass-signature packets (which is GnuPG's
+default) or the cleartext signed format.
 <P>
 <P>
 <h2>
diff -urN gnupg-1.0.3/doc/faq.raw gnupg-1.0.4/doc/faq.raw
--- gnupg-1.0.3/doc/faq.raw	Thu Sep 14 11:35:27 2000
+++ gnupg-1.0.4/doc/faq.raw	Tue Oct 17 15:16:22 2000
@@ -7,23 +7,19 @@
 [$usenetheader=
 ]
 [$maintainer=Nils Ellmenreich <nils 'at' infosun.fmi.uni-passau.de>]
-[$WINS=.wins.uva.nl/pub/solaris]
-[$ftpWINS=ftp://ftp.wins.uva.nl/pub/solaris]
-[$hWINS=http://www.wins.uva.nl/]
-[$fhWINS=http://www.wins.uva.nl/pub/solaris/solaris2]
 [$hGPG=http://www.gnupg.org]
 
-
+[H body bgcolor=#ffffff text=#000000 link=#1f00ff alink=#ff0000 vlink=#9900dd]
 [H H1]GNUPG FREQUENTLY ASKED QUESTIONS[H /H1]
 
 [H pre]
-Version: 0.1
-Last-Modified: Sep 14, 2000
+Version: 0.2
+Last-Modified: Oct 14, 2000
 Maintained-by: [$maintainer]
 [H/pre]
 
 This is the GnuPG FAQ. The latest HTML version is available  
-[H a href=[$hGPG]] here[H/a].  
+[H a href=[$hGPG]/faq.html] here[H/a].  
 
 The index is generated automatically, so there may be errors here.  Not
 all questions may be in the section they belong to. Suggestions about
@@ -34,6 +30,7 @@
 been asked before, it isn't a FAQ. Otherwise, please provide the answer
 to be included here.
 
+
 [H HR]
 
 <C>
@@ -116,25 +113,26 @@
     avoided. The random quality isn't very good so don't use it on
     sensitive data.
 
+<Didea>
 <Q> How do I include support for RSA and IDEA?
 
-    The official GnuPG distribution (as of 1.0.2) does not contain
-    either of them due to patents restriction. The RSA patent expires
-    Sept 20, 2000. A new GnuPG release is then scheduled to include
-    it. The IDEA patent does not expire before 2007 so don't expect
-    official support before then.
-
-    However, there are unofficial modules to include both of them even
-    in earlier version of GnuPG. They're available from [H a href=ftp://ftp.gnupg.org/pub/gcrypt/contrib/] 
-    <ftp://ftp.gnupg.org/pub/gcrypt/contrib/>[H /a]. Look for [H pre]idea.c[H /pre] 
-    and [H pre]rsa.c[H /pre]. Compilation directives are in the headers
-    of these files. Then add the following lines to your ~/.gnupg/options:
+    RSA is included as of GnuPG 1.0.3.
+
+    The official GnuPG distribution does not contain IDEA due to a
+    patent restriction. The patent does not expire before 2007 so don't
+    expect official support before then.
+
+    However, there is an unofficial modules to include it even
+    in earlier version of GnuPG. It's available from [H a href=ftp://ftp.gnupg.org/pub/gcrypt/contrib/] 
+    <ftp://ftp.gnupg.org/pub/gcrypt/contrib/>[H /a]. Look for [H pre]idea.c[H /pre]. 
+
+    Compilation directives are in the headers of these files. Then add
+    the following line to your ~/.gnupg/options: 
     [H pre]
     load-extension idea 
-    load-extension rsa
     [H /pre]
 
-    These extensions are not available for the Windows version of GnuPG.
+    The extension is not available for the Windows version of GnuPG.
 
 
 <S> USAGE
@@ -158,7 +156,7 @@
     What I do is to hit several times on the shift, control, alternate,
     and capslock keys, because these keys do not produce output to the
     screen. This way you get your keys really fast (it's the same thing
-    pgp2 does).
+    PGP2 does).
 
     Another problem might be another program which eats up your random
     bytes (a program (look at your daemons) that reads from
@@ -247,7 +245,7 @@
 
 
 <Q> I can't delete an user id because it is already deleted on my public
-keying?
+keyring?
 
     Because you can only select from the public key ring, there is no
     direct way to do this.  However it is not very complicated to do it
@@ -347,16 +345,27 @@
 
 <Dcompat>
 
-<Q> How can I encrypt a message so that pgp 2.x is able to decrypt it?
+<Q> How can I encrypt a message so that PGP 2.x is able to decrypt it?
 
-    You can't do that because pgp 2.x normally uses IDEA which is not
-    supported by GnuPG because it is patented, but if you have a
-    modified version of PGP you can try this:
+    You can't do that because PGP 2.x normally uses IDEA which is not
+    supported by GnuPG because it is patented (see <Ridea>), but if you
+    have a modified version of PGP you can try this:
 
     [H pre] gpg --rfc1991 --cipher-algo 3des ...  [H/pre]
 
     Please don't pipe the data to encrypt to gpg but give it as a
-    filename; otherwise, pgp 2 will not be able to handle it.
+    filename; otherwise, PGP 2 will not be able to handle it.
+
+<Q> How do I migrate from PGP 2.x to GnuPG?
+
+    PGP 2 uses the RSA and IDEA encryption algorithms. Whereas the RSA
+    patent has expired and RSA is included as of GnuPG 1.0.3, the IDEA
+    algorithm is still patented until 2007. Under certain conditions you
+    may use IDEA even today. In that case, you may refer to Question
+    <Ridea> about how to add IDEA support to GnuPG and read
+    [H a href=http://www.gnupg.org/gph/en/pgp2x.html]http://www.gnupg.org/gph/en/pgp2x.html[H /a]
+    to perfrom the migration. 
+    
 
 <Q> How can I conventional encrypt a message, so that PGP can decrypt
 it?
@@ -449,13 +458,23 @@
 
     This is called dash-escaped text and required by OpenPGP.
     It always happens when a line starts with a dash ("-") and is needed
-    to distinguish those lines from the thos lines which make up such
-    a clearsigned message. 
+    to make the lines that structure signature and text
+    (i.e., "-----BEGIN PGP SIGNATURE-----") to be the only lines that
+    start with two dashes.
     
-    If you use GnuPG to process those emessage, the extra dashes are removed.
+    If you use GnuPG to process those messages, the extra dashes are removed.
     Good mail clients remove those extra dashes when displaying such a 
     message.      
 
+<Q> What is the thing with "can't handle multiple signatures"?
+
+    Due to different message formats GnuPG is not always able to split a
+    file with multiple signatures unambiguously into it's parts.  This 
+    error message informs you that there is something wrong with the input.
+
+    The only way to have multiple signatures in a file is by using the 
+    OpenPGP format with one-pass-signature packets (which is GnuPG's
+    default) or the cleartext signed format.
 
 
 <S> ADVANCED TOPICS
diff -urN gnupg-1.0.3/doc/gpgv.1 gnupg-1.0.4/doc/gpgv.1
--- gnupg-1.0.3/doc/gpgv.1	Thu Jan  1 01:00:00 1970
+++ gnupg-1.0.4/doc/gpgv.1	Thu Oct 12 12:00:07 2000
@@ -0,0 +1,141 @@
+.\" This -*- nroff -*- file has been generated from
+.\" DocBook SGML with docbook-to-man on Debian GNU/Linux.
+...\"
+...\"	transcript compatibility for postscript use.
+...\"
+...\"	synopsis:  .P! <file.ps>
+...\"
+.de P!
+\\&.
+.fl			\" force out current output buffer
+\\!%PB
+\\!/showpage{}def
+...\" the following is from Ken Flowers -- it prevents dictionary overflows
+\\!/tempdict 200 dict def tempdict begin
+.fl			\" prolog
+.sy cat \\$1\" bring in postscript file
+...\" the following line matches the tempdict above
+\\!end % tempdict %
+\\!PE
+\\!.
+.sp \\$2u	\" move below the image
+..
+.de pF
+.ie     \\*(f1 .ds f1 \\n(.f
+.el .ie \\*(f2 .ds f2 \\n(.f
+.el .ie \\*(f3 .ds f3 \\n(.f
+.el .ie \\*(f4 .ds f4 \\n(.f
+.el .tm ? font overflow
+.ft \\$1
+..
+.de fP
+.ie     !\\*(f4 \{\
+.	ft \\*(f4
+.	ds f4\"
+'	br \}
+.el .ie !\\*(f3 \{\
+.	ft \\*(f3
+.	ds f3\"
+'	br \}
+.el .ie !\\*(f2 \{\
+.	ft \\*(f2
+.	ds f2\"
+'	br \}
+.el .ie !\\*(f1 \{\
+.	ft \\*(f1
+.	ds f1\"
+'	br \}
+.el .tm ? font underflow
+..
+.ds f1\"
+.ds f2\"
+.ds f3\"
+.ds f4\"
+'\" t 
+.ta 8n 16n 24n 32n 40n 48n 56n 64n 72n  
+.TH "gpgv" "1" 
+.SH "NAME" 
+gpg \(em signature verification tool 
+.SH "SYNOPSIS" 
+.PP 
+.nf 
+.ta 8n 16n 24n 32n 40n 48n 56n 64n 72n 
+\fBgpg\fP  [\fBoptions\fR]  [\fBsigned files\fR]    
+.fi 
+.SH "DESCRIPTION" 
+.PP 
+\fBgpgv\fP is the OpenPGP signature checking tool. 
+ 
+.PP 
+This program is a stripped down version of \fBgpg\fP which is only 
+able 
+to check signatures.  It is somewhat smaller than the full blown 
+\fBgpg\fP and uses a different (and more simple way) to check that 
+the public keys used to made the signature are trustworth.  There is 
+no options files and only very few options are implemented. 
+.PP 
+\fBgpgv\fP assumes that all keys in the keyring are trustworty. 
+It uses by default a keyring named \fBtrustedkeys.gpg\fP which is 
+assumed to be in the home directory as defined by GnuPG or set by an 
+option or an environment variable.  An option may be used to specify 
+another keyring or even multiple keyrings. 
+.SH "OPTIONS" 
+.PP 
+\fBgpgv\fP recognizes these options: 
+.IP "-v, --verbose" 10 
+Give more information during processing. If used 
+twice, the input data is listed in detail. 
+.IP "-q, --quiet" 10 
+Try to be as quiet as possible. 
+.IP "--keyring \fBfile\fR" 10 
+Add \fBfile\fR to the list of keyrings. 
+If \fBfile\fR begins with a tilde and a slash, these 
+are replaced by the HOME directory. If the filename 
+does not contain a slash, it is assumed to be in the 
+home-directory ("~/.gnupg" if --homedir is not used). 
+The filename may be prefixed with a scheme: 
+.IP "" 10 
+"gnupg-ring:" is the default one. 
+.IP "" 10 
+"gnupg-gdbm:" may be used for a GDBM ring. Note that GDBM 
+is experimental and likely to be removed in future versions. 
+.IP "" 10 
+It might make sense to use it together with --no-default-keyring. 
+.IP "--homedir \fBdirectory\fR" 10 
+Set the name of the home directory to \fBdirectory\fR If this 
+option is not used it defaults to "~/.gnupg". It does 
+not make sense to use this in a options file. This 
+also overrides the environment variable "GNUPGHOME". 
+.IP "--status-fd \fBn\fR" 10 
+Write special status strings to the file descriptor \fBn\fR. 
+See the file DETAILS in the documentation for a listing of them. 
+.IP "--logger-fd \fBn\fR" 10 
+Write log output to file descriptor \fBn\fR and not to stderr. 
+.IP "--ignore-time-conflict" 10 
+GnuPG normally checks that the timestamps associated with keys and 
+signatures have plausible values.  However, sometimes a signature seems to 
+be older than the key due to clock problems.  This option makes these 
+checks just a warning. 
+.SH "RETURN VALUE" 
+.PP 
+The program returns 0 if everything was fine, 1 if at least 
+one signature was bad, and other error codes for fatal errors. 
+ 
+.SH "EXAMPLES" 
+.IP "gpgv \fBpgpfile\fR" 10 
+.IP "gpgv \fBsigfile\fR [\fBfiles\fR]" 10 
+Verify the signature of the file. The second form 
+is used for detached signatures, where \fBsigfile\fR is the detached 
+signature (either ASCII armored or binary) and [\fBfiles\fR] are the signed 
+data; if this is not given the name of the file holding the signed data is 
+constructed by cutting off the extension (".asc", ".sig" or ".sign") from 
+\fBsigfile\fR. 
+.SH "ENVIRONMENT" 
+.IP "HOME" 10 
+Used to locate the default home directory. 
+.IP "GNUPGHOME" 10 
+If set directory used instead of "~/.gnupg". 
+.SH "FILES" 
+.IP "~/.gnupg/trustedkeys.gpg" 10 
+The default keyring with the allowed keys 
+...\" created by instant / docbook-to-man, Thu 12 Oct 2000, 12:00 
diff -urN gnupg-1.0.3/doc/gpgv.sgml gnupg-1.0.4/doc/gpgv.sgml
--- gnupg-1.0.3/doc/gpgv.sgml	Thu Jan  1 01:00:00 1970
+++ gnupg-1.0.4/doc/gpgv.sgml	Wed Oct  4 15:34:57 2000
@@ -0,0 +1,227 @@
+<!-- gpgv.sgml - the man page for GnuPG
+    Copyright (C) 2000 Free Software Foundation, Inc.
+
+    This file is part of GnuPG.
+
+    GnuPG 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.
+
+    GnuPG 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
+-->
+<!-- This file should be processed by docbook-to-man to
+     create a manual page.  This program has currently the bug
+     not to remove leading white space. So this source file does
+     not look very pretty
+
+    FIXME: generated a file with entity (e.g. pathnames) from the
+    configure scripts and include it here
+-->
+
+
+<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
+<!entity ParmDir "<parameter>directory</parameter>">
+<!entity ParmFile "<parameter>file</parameter>">
+<!entity OptParmFile "<optional>&ParmFile;</optional>">
+<!entity ParmFiles "<parameter>files</parameter>">
+<!entity OptParmFiles "<optional>&ParmFiles;</optional>">
+<!entity ParmNames "<parameter>names</parameter>">
+<!entity OptParmNames "<optional>&ParmNames;</optional>">
+<!entity ParmName  "<parameter>name</parameter>">
+<!entity OptParmName  "<optional>&ParmName;</optional>">
+<!entity ParmKeyIDs "<parameter>key IDs</parameter>">
+<!entity ParmN	    "<parameter>n</parameter>">
+<!entity ParmFlags  "<parameter>flags</parameter>">
+<!entity ParmString "<parameter>string</parameter>">
+<!entity ParmValue  "<parameter>value</parameter>">
+<!entity ParmNameValue	"<parameter>name=value</parameter>">
+]>
+
+<refentry id="gpgb">
+<refmeta>
+  <refentrytitle>gpgv</refentrytitle>
+  <manvolnum>1</manvolnum>
+  <refmiscinfo class="gnu">GNU Tools</refmiscinfo>
+</refmeta>
+<refnamediv>
+  <refname/gpg/
+  <refpurpose>signature verification tool</>
+</refnamediv>
+<refsynopsisdiv>
+  <synopsis>
+<command>gpg</>
+ <optional><parameter/options/</optional>
+ <optional><parameter/signed files/</optional>
+  </synopsis>
+</refsynopsisdiv>
+
+<refsect1>
+    <title>DESCRIPTION</title>
+    <para>
+<command/gpgv/ is the OpenPGP signature checking tool.
+    </para>
+    <para>
+This program is a stripped down version of <command/gpg/ which is only
+able
+to check signatures.  It is somewhat smaller than the full blown
+<command/gpg/ and uses a different (and more simple way) to check that
+the public keys used to made the signature are trustworth.  There is
+no options files and only very few options are implemented.
+</para>
+<para>
+<command/gpgv/ assumes that all keys in the keyring are trustworty.
+It uses by default a keyring named <filename/trustedkeys.gpg/ which is
+assumed to be in the home directory as defined by GnuPG or set by an
+option or an environment variable.  An option may be used to specify
+another keyring or even multiple keyrings.
+</para>
+</refsect1>
+
+<refsect1>
+<title>OPTIONS</title>
+<para>
+<command/gpgv/ recognizes these options:
+</para>
+
+<variablelist>
+
+
+<varlistentry>
+<term>-v, --verbose</term>
+<listitem><para>
+Give more information during processing. If used
+twice, the input data is listed in detail.
+</para></listitem></varlistentry>
+
+
+<varlistentry>
+<term>-q, --quiet</term>
+<listitem><para>
+Try to be as quiet as possible.
+</para></listitem></varlistentry>
+
+
+<varlistentry>
+<term>--keyring &ParmFile;</term>
+<listitem><para>
+Add &ParmFile to the list of keyrings.
+If &ParmFile begins with a tilde and a slash, these
+are replaced by the HOME directory. If the filename
+does not contain a slash, it is assumed to be in the
+home-directory ("~/.gnupg" if --homedir is not used).
+The filename may be prefixed with a scheme:</para>
+<para>"gnupg-ring:" is the default one.</para>
+<para>"gnupg-gdbm:" may be used for a GDBM ring. Note that GDBM
+is experimental and likely to be removed in future versions.</para>
+<para>It might make sense to use it together with --no-default-keyring.
+</para></listitem></varlistentry>
+
+
+<varlistentry>
+<term>--homedir &ParmDir;</term>
+<listitem><para>
+Set the name of the home directory to &ParmDir; If this
+option is not used it defaults to "~/.gnupg". It does
+not make sense to use this in a options file. This
+also overrides the environment variable "GNUPGHOME".
+</para></listitem></varlistentry>
+
+
+<varlistentry>
+<term>--status-fd &ParmN;</term>
+<listitem><para>
+Write special status strings to the file descriptor &ParmN;.
+See the file DETAILS in the documentation for a listing of them.
+</para></listitem></varlistentry>
+
+
+<varlistentry>
+<term>--logger-fd &ParmN;</term>
+<listitem><para>
+Write log output to file descriptor &ParmN; and not to stderr.
+</para></listitem></varlistentry>
+
+
+<varlistentry>
+<term>--ignore-time-conflict</term>
+<listitem><para>
+GnuPG normally checks that the timestamps associated with keys and
+signatures have plausible values.  However, sometimes a signature seems to
+be older than the key due to clock problems.  This option makes these
+checks just a warning.
+</para></listitem></varlistentry>
+
+
+</variablelist>
+</refsect1>
+
+
+<refsect1>
+    <title>RETURN VALUE</title>
+    <para>
+The program returns 0 if everything was fine, 1 if at least
+one signature was bad, and other error codes for fatal errors.
+    </para>
+</refsect1>
+
+<refsect1>
+    <title>EXAMPLES</title>
+    <variablelist>
+
+<varlistentry>
+<term>gpgv <parameter/pgpfile/</term>
+<term>gpgv <parameter/sigfile/ &OptParmFiles;</term>
+<listitem><para>
+Verify the signature of the file. The second form
+is used for detached signatures, where <parameter/sigfile/ is the detached
+signature (either ASCII armored or binary) and &OptParmFiles are the signed
+data; if this is not given the name of the file holding the signed data is
+constructed by cutting off the extension (".asc", ".sig" or ".sign") from
+<parameter/sigfile/.
+</para></listitem></varlistentry>
+
+    </variablelist>
+</refsect1>
+
+
+<refsect1>
+    <title>ENVIRONMENT</title>
+
+    <variablelist>
+<varlistentry>
+<term>HOME</term>
+<listitem><para>Used to locate the default home directory.</para></listitem>
+</varlistentry>
+<varlistentry>
+<term>GNUPGHOME</term>
+<listitem><para>If set directory used instead of "~/.gnupg".</para></listitem>
+</varlistentry>
+
+    </variablelist>
+
+</refsect1>
+
+<refsect1>
+    <title>FILES</title>
+    <variablelist>
+
+<varlistentry>
+<term>~/.gnupg/trustedkeys.gpg</term>
+<listitem><para>The default keyring with the allowed keys</para></listitem>
+</varlistentry>
+
+    </variablelist>
+</refsect1>
+
+<!-- SEE ALSO  not yet needed-->
+
+</refentry>
+
diff -urN gnupg-1.0.3/g10/ChangeLog gnupg-1.0.4/g10/ChangeLog
--- gnupg-1.0.3/g10/ChangeLog	Mon Sep 18 12:13:54 2000
+++ gnupg-1.0.4/g10/ChangeLog	Mon Oct 16 19:12:23 2000
@@ -1,3 +1,58 @@
+2000-10-16  Werner Koch  <wk@gnupg.org>
+
+	* mainproc.c (do_proc_packets): Hack to fix the problem that
+	signatures are not detected when there is a MDC packet but no
+	compression packet.
+	
+	* g10.c (print_hashline): New.
+	(print_mds): Use above func with --with-colons.
+
+	* mainproc.c (check_sig_and_print): Detect multiple signatures
+	and don't verify them.
+
+2000-10-14  Werner Koch  <wk@gnupg.org>
+
+	* mainproc.c (add_onepass_sig): There is an easier solution to the
+	error fixed yesterday; just check that we only have onepass
+	packets.  However, the other solution provides an cleaner
+	interface and opens the path to get access to other information
+	from the armore headers.
+	(release_list): Reset some more variables.
+
+2000-10-13  Werner Koch  <wk@gnupg.org>
+
+	* mainproc.c (add_gpg_control): New.
+	(do_proc_packets): use it.
+	(proc_plaintext): Changed logic to detect clearsigns.
+	(proc_tree): Check the cleartext sig with some new code.
+
+	* packet.h: New packet PKT_GPG_CONTROL.
+	* parse-packet.c (parse_gpg_control): New.
+	* misc.c (get_session_marker): New.
+	* armor.c (armor_filter): Replaced the faked 1-pass packet by the
+	new control packet.
+
+	* keyedit.c (keyedit_menu): Allow batchmode with a command_fd. 
+	* status.c (my_read): New.
+	(do_get_from_fd): use it.
+
+2000-10-12  Werner Koch  <wk@gnupg.org>
+
+	* keygen.c (keygen_add_std_prefs): Add Rijndael to the prefs.
+
+2000-10-07  Werner Koch  <wk@gnupg.org>
+
+	* gpgv.c: Add more stubs for ununsed code to make the binary smaller.
+
+Wed Oct  4 15:50:18 CEST 2000  Werner Koch  <wk@openit.de>
+
+        * sign.c (hash_for): New arg to take packet version in account, changed
+        call callers.
+
+        * gpgv.c: New.
+        * Makefile.am: Rearranged source files so that gpgv can be build with
+        at least files as possible.
+
 Mon Sep 18 12:13:52 CEST 2000  Werner Koch  <wk@openit.de>
 
         * hkp.c (not_implemented): Print a notice for W32
diff -urN gnupg-1.0.3/g10/Makefile.am gnupg-1.0.4/g10/Makefile.am
--- gnupg-1.0.3/g10/Makefile.am	Sat Oct  9 20:36:45 1999
+++ gnupg-1.0.4/g10/Makefile.am	Wed Oct  4 15:07:28 2000
@@ -7,7 +7,7 @@
 needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a
 
 #noinst_PROGRAMS = gpgd
-bin_PROGRAMS = gpg
+bin_PROGRAMS = gpg gpgv
 
 common_source =  \
 	      build-packet.c	\
@@ -15,57 +15,64 @@
 	      filter.h		\
 	      free-packet.c	\
 	      getkey.c		\
-	      keydb.h		\
-	      delkey.c		\
-	      pkclist.c 	\
-	      skclist.c 	\
 	      ringedit.c	\
+	      seskey.c		\
+	      keydb.h		\
 	      kbnode.c		\
 	      main.h		\
 	      mainproc.c	\
 	      armor.c		\
 	      mdfilter.c	\
 	      textfilter.c	\
-	      cipher.c		\
 	      misc.c		\
 	      options.h 	\
 	      openfile.c	\
 	      keyid.c		\
-	      trustdb.c 	\
-	      trustdb.h 	\
-	      tdbdump.c 	\
-	      tdbio.c		\
-	      tdbio.h		\
-	      hkp.h		\
-	      hkp.c		\
 	      packet.h		\
 	      parse-packet.c	\
-	      passphrase.c	\
-	      pubkey-enc.c	\
-	      seckey-cert.c	\
-	      seskey.c		\
-	      import.c		\
-	      export.c		\
 	      comment.c 	\
 	      status.c		\
 	      status.h		\
-	      sign.c		\
 	      plaintext.c	\
-	      encr-data.c	\
-	      encode.c		\
-	      revoke.c		\
-	      keylist.c 	\
 	      sig-check.c	\
-	      signal.c		\
-	      helptext.c
+	      signal.c		
 
 gpg_SOURCES  = g10.c		\
 	      $(common_source)	\
+	      pkclist.c 	\
+	      skclist.c 	\
+	      pubkey-enc.c	\
+	      passphrase.c	\
+	      seckey-cert.c	\
+	      encr-data.c	\
+	      cipher.c		\
+	      keylist.c 	\
+	      encode.c		\
+	      sign.c		\
 	      verify.c		\
+	      revoke.c		\
 	      decrypt.c 	\
 	      keyedit.c 	\
 	      dearmor.c 	\
-	      keygen.c
+	      import.c		\
+	      export.c		\
+	      hkp.h		\
+	      hkp.c		\
+	      trustdb.c 	\
+	      trustdb.h 	\
+	      tdbdump.c 	\
+	      tdbio.c		\
+	      tdbio.h		\
+	      delkey.c		\
+	      keygen.c          \
+	      helptext.c
+
+gpgv_SOURCES = gpgv.c           \
+	      $(common_source)  \
+	      verify.c          
+
+
+
 
 #gpgd_SOURCES = gpgd.c \
 #	       ks-proto.h \
diff -urN gnupg-1.0.3/g10/Makefile.in gnupg-1.0.4/g10/Makefile.in
--- gnupg-1.0.3/g10/Makefile.in	Mon Sep 18 12:17:59 2000
+++ gnupg-1.0.4/g10/Makefile.in	Tue Oct 17 15:40:32 2000
@@ -113,12 +113,15 @@
 needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a
 
 #noinst_PROGRAMS = gpgd
-bin_PROGRAMS = gpg
+bin_PROGRAMS = gpg gpgv
 
-common_source =  	      build-packet.c		      compress.c		      filter.h			      free-packet.c		      getkey.c			      keydb.h			      delkey.c			      pkclist.c 		      skclist.c 		      ringedit.c		      kbnode.c			      main.h			      mainproc.c		      armor.c			      mdfilter.c		      textfilter.c		      cipher.c			      misc.c			      options.h 		      openfile.c		      keyid.c			      trustdb.c 		      trustdb.h 		      tdbdump.c 		      tdbio.c			      tdbio.h			      hkp.h			      hkp.c			      packet.h			      parse-packet.c		      passphrase.c		      pubkey-enc.c		      seckey-cert.c		      seskey.c			      import.c			      export.c			      comment.c 		      status.c			      status.h			      sign.c			      plaintext.c		      encr-data.c		      encode.c			      revoke.c			      keylist.c 		      sig-check.c		      signal.c			      helptext.c
+common_source =  	      build-packet.c		      compress.c		      filter.h			      free-packet.c		      getkey.c			      ringedit.c		      seskey.c			      keydb.h			      kbnode.c			      main.h			      mainproc.c		      armor.c			      mdfilter.c		      textfilter.c		      misc.c			      options.h 		      openfile.c		      keyid.c			      packet.h			      parse-packet.c		      comment.c 		      status.c			      status.h			      plaintext.c		      sig-check.c		      signal.c		
 
 
-gpg_SOURCES = g10.c			      $(common_source)		      verify.c			      decrypt.c 		      keyedit.c 		      dearmor.c 		      keygen.c
+gpg_SOURCES = g10.c			      $(common_source)		      pkclist.c 		      skclist.c 		      pubkey-enc.c		      passphrase.c		      seckey-cert.c		      encr-data.c		      cipher.c			      keylist.c 		      encode.c			      sign.c			      verify.c			      revoke.c			      decrypt.c 		      keyedit.c 		      dearmor.c 		      import.c			      export.c			      hkp.h			      hkp.c			      trustdb.c 		      trustdb.h 		      tdbdump.c 		      tdbio.c			      tdbio.h			      delkey.c			      keygen.c          	      helptext.c
+
+
+gpgv_SOURCES = gpgv.c           	      $(common_source)  	      verify.c          
 
 
 #gpgd_SOURCES = gpgd.c \
@@ -139,16 +142,24 @@
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
 gpg_OBJECTS =  g10.o build-packet.o compress.o free-packet.o getkey.o \
-delkey.o pkclist.o skclist.o ringedit.o kbnode.o mainproc.o armor.o \
-mdfilter.o textfilter.o cipher.o misc.o openfile.o keyid.o trustdb.o \
-tdbdump.o tdbio.o hkp.o parse-packet.o passphrase.o pubkey-enc.o \
-seckey-cert.o seskey.o import.o export.o comment.o status.o sign.o \
-plaintext.o encr-data.o encode.o revoke.o keylist.o sig-check.o \
-signal.o helptext.o verify.o decrypt.o keyedit.o dearmor.o keygen.o
+ringedit.o seskey.o kbnode.o mainproc.o armor.o mdfilter.o textfilter.o \
+misc.o openfile.o keyid.o parse-packet.o comment.o status.o plaintext.o \
+sig-check.o signal.o pkclist.o skclist.o pubkey-enc.o passphrase.o \
+seckey-cert.o encr-data.o cipher.o keylist.o encode.o sign.o verify.o \
+revoke.o decrypt.o keyedit.o dearmor.o import.o export.o hkp.o \
+trustdb.o tdbdump.o tdbio.o delkey.o keygen.o helptext.o
 gpg_LDADD = $(LDADD)
 gpg_DEPENDENCIES =  ../cipher/libcipher.a ../mpi/libmpi.a \
 ../util/libutil.a
 gpg_LDFLAGS = 
+gpgv_OBJECTS =  gpgv.o build-packet.o compress.o free-packet.o getkey.o \
+ringedit.o seskey.o kbnode.o mainproc.o armor.o mdfilter.o textfilter.o \
+misc.o openfile.o keyid.o parse-packet.o comment.o status.o plaintext.o \
+sig-check.o signal.o verify.o
+gpgv_LDADD = $(LDADD)
+gpgv_DEPENDENCIES =  ../cipher/libcipher.a ../mpi/libmpi.a \
+../util/libutil.a
+gpgv_LDFLAGS = 
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -160,8 +171,8 @@
 
 TAR = tar
 GZIP_ENV = --best
-SOURCES = $(gpg_SOURCES)
-OBJECTS = $(gpg_OBJECTS)
+SOURCES = $(gpg_SOURCES) $(gpgv_SOURCES)
+OBJECTS = $(gpg_OBJECTS) $(gpgv_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
@@ -222,6 +233,10 @@
 	@rm -f gpg
 	$(LINK) $(gpg_LDFLAGS) $(gpg_OBJECTS) $(gpg_LDADD) $(LIBS)
 
+gpgv: $(gpgv_OBJECTS) $(gpgv_DEPENDENCIES)
+	@rm -f gpgv
+	$(LINK) $(gpgv_LDFLAGS) $(gpgv_OBJECTS) $(gpgv_LDADD) $(LIBS)
+
 tags: TAGS
 
 ID: $(HEADERS) $(SOURCES) $(LISP)
@@ -336,6 +351,11 @@
 	../include/iobuf.h ../include/memory.h packet.h \
 	../include/cipher.h ../include/../cipher/random.h filter.h \
 	keydb.h options.h main.h trustdb.h ../include/i18n.h
+gpgv.o: gpgv.c ../config.h ../g10defs.h packet.h ../include/types.h \
+	../include/iobuf.h ../include/mpi.h ../include/memory.h \
+	../include/cipher.h ../include/../cipher/random.h filter.h \
+	../include/util.h ../include/errors.h main.h keydb.h options.h \
+	trustdb.h ../include/ttyio.h ../include/i18n.h status.h hkp.h
 helptext.o: helptext.c ../config.h ../g10defs.h ../include/util.h \
 	../include/types.h ../include/errors.h ../include/mpi.h \
 	../include/iobuf.h ../include/memory.h ../include/ttyio.h \
diff -urN gnupg-1.0.3/g10/armor.c gnupg-1.0.4/g10/armor.c
--- gnupg-1.0.3/g10/armor.c	Tue Jun 27 11:16:13 2000
+++ gnupg-1.0.4/g10/armor.c	Fri Oct 13 16:50:00 2000
@@ -502,7 +502,7 @@
 	    /* the buffer is always allocated with enough space to append
 	     * the removed [CR], LF and a Nul
 	     * The reason for this complicated procedure is to keep at least
-	     * the original tupe of lineending - handling of the removed
+	     * the original type of lineending - handling of the removed
 	     * trailing spaces seems to be impossible in our method
 	     * of faking a packet; either we have to use a temporary file
 	     * or calculate the hash here in this module and somehow find
@@ -815,7 +815,9 @@
 	*ret_len = n;
     }
     else if( control == IOBUFCTRL_UNDERFLOW ) {
-	if( size < 15+(4*15) )	/* need space for up to 4 onepass_sigs */
+        /* We need some space for the faked packet.  The minmum required
+         * size is ~18 + length of the session marker */
+	if( size < 50 ) 
 	    BUG(); /* supplied buffer too short */
 
 	if( afx->faked )
@@ -831,7 +833,14 @@
 		    rc = -1;
 	    }
 	    else if( afx->faked ) {
-		unsigned hashes = afx->hashes;
+		unsigned int hashes = afx->hashes;
+                const byte *sesmark;
+                size_t sesmarklen;
+                
+                sesmark = get_session_marker( &sesmarklen );
+                if ( sesmarklen > 20 )
+                    BUG();
+
 		/* the buffer is at least 15+n*15 bytes long, so it
 		 * is easy to construct the packets */
 
@@ -842,36 +851,21 @@
 			afx->pgp2mode = 1;
 		}
 		n=0;
-		do {
-		    /* first some onepass signature packets */
-		    buf[n++] = 0x90; /* old format, type 4, 1 length byte */
-		    buf[n++] = 13;   /* length */
-		    buf[n++] = 3;    /* version */
-		    buf[n++] = afx->not_dash_escaped? 0:1; /* sigclass */
-		    if( hashes & 1 ) {
-			hashes &= ~1;
-			buf[n++] = DIGEST_ALGO_RMD160;
-		    }
-		    else if( hashes & 2 ) {
-			hashes &= ~2;
-			buf[n++] = DIGEST_ALGO_SHA1;
-		    }
-		    else if( hashes & 4 ) {
-			hashes &= ~4;
-			buf[n++] = DIGEST_ALGO_MD5;
-		    }
-		    else if( hashes & 8 ) {
-			hashes &= ~8;
-			buf[n++] = DIGEST_ALGO_TIGER;
-		    }
-		    else
-			buf[n++] = 0;	 /* (don't know) */
-
-		    buf[n++] = 0;    /* public key algo (don't know) */
-		    memset(buf+n, 0, 8); /* don't know the keyid */
-		    n += 8;
-		    buf[n++] = !hashes;   /* last one */
-		} while( hashes );
+                /* first a gpg control packet */
+                buf[n++] = 0xff; /* new format, type 63, 1 length byte */
+                n++;   /* see below */
+                memcpy(buf+n, sesmark, sesmarklen ); n+= sesmarklen;
+                buf[n++] = 1;    /* control type */
+                buf[n++] = afx->not_dash_escaped? 0:1; /* sigclass */
+                if( hashes & 1 ) 
+                    buf[n++] = DIGEST_ALGO_RMD160;
+                if( hashes & 2 ) 
+                    buf[n++] = DIGEST_ALGO_SHA1;
+                if( hashes & 4 ) 
+                    buf[n++] = DIGEST_ALGO_MD5;
+                if( hashes & 8 ) 
+                    buf[n++] = DIGEST_ALGO_TIGER;
+                buf[1] = n - 2;
 
 		/* followed by a plaintext packet */
 		buf[n++] = 0xaf; /* old packet format, type 11, var length */
diff -urN gnupg-1.0.3/g10/g10.c gnupg-1.0.4/g10/g10.c
--- gnupg-1.0.3/g10/g10.c	Thu Sep 14 12:45:01 2000
+++ gnupg-1.0.4/g10/g10.c	Mon Oct 16 10:01:07 2000
@@ -1608,6 +1608,30 @@
 }
 
 static void
+print_hashline( MD_HANDLE md, int algo, const char *fname )
+{
+    int i, n;
+    const byte *p;
+    
+    if ( fname ) {
+        for (p = fname; *p; p++ ) {
+            if ( *p <= 32 || *p > 127 || *p == ':' || *p == '%' )
+                printf("%%%02X", *p );
+            else 
+                putchar( *p );
+        }
+    }
+    putchar(':');
+    printf("%d:", algo );
+    p = md_read( md, algo );
+    n = md_digest_length(algo);
+    for(i=0; i < n ; i++, p++ ) 
+        printf("%02X", *p );
+    putchar(':');
+    putchar('\n');
+}
+
+static void
 print_mds( const char *fname, int algo )
 {
     FILE *fp;
@@ -1651,24 +1675,37 @@
 	log_error("%s%s\n", pname, strerror(errno) );
     else {
 	md_final(md);
-	if( algo ) {
-	    if( fname )
-		fputs( pname, stdout );
-	    print_hex(md_read(md, algo), md_digest_length(algo) );
-	}
-	else {
-	    printf(  "%s   MD5 = ", fname?pname:"" );
-			    print_hex(md_read(md, DIGEST_ALGO_MD5), 16 );
-	    printf("\n%s  SHA1 = ", fname?pname:""  );
-			    print_hex(md_read(md, DIGEST_ALGO_SHA1), 20 );
-	    printf("\n%sRMD160 = ", fname?pname:""  );
-			    print_hex(md_read(md, DIGEST_ALGO_RMD160), 20 );
-	    if( !check_digest_algo(DIGEST_ALGO_TIGER) ) {
-		printf("\n%s TIGER = ", fname?pname:""  );
-			    print_hex(md_read(md, DIGEST_ALGO_TIGER), 24 );
-	    }
-	}
-	putchar('\n');
+        if ( opt.with_colons ) {
+            if ( algo ) 
+                print_hashline( md, algo, fname );
+            else {
+                print_hashline( md, DIGEST_ALGO_MD5, fname );
+                print_hashline( md, DIGEST_ALGO_SHA1, fname );
+                print_hashline( md, DIGEST_ALGO_RMD160, fname );
+                if( !check_digest_algo(DIGEST_ALGO_TIGER) ) 
+                    print_hashline( md, DIGEST_ALGO_TIGER, fname );
+            }
+        }
+        else {
+            if( algo ) {
+                if( fname )
+                    fputs( pname, stdout );
+                print_hex(md_read(md, algo), md_digest_length(algo) );
+            }
+            else {
+                printf(  "%s   MD5 = ", fname?pname:"" );
+                print_hex(md_read(md, DIGEST_ALGO_MD5), 16 );
+                printf("\n%s  SHA1 = ", fname?pname:""  );
+                print_hex(md_read(md, DIGEST_ALGO_SHA1), 20 );
+                printf("\n%sRMD160 = ", fname?pname:""  );
+                print_hex(md_read(md, DIGEST_ALGO_RMD160), 20 );
+                if( !check_digest_algo(DIGEST_ALGO_TIGER) ) {
+                    printf("\n%s TIGER = ", fname?pname:""  );
+                    print_hex(md_read(md, DIGEST_ALGO_TIGER), 24 );
+                }
+            }
+            putchar('\n');
+        }
     }
     md_close(md);
 
diff -urN gnupg-1.0.3/g10/gpgv.c gnupg-1.0.4/g10/gpgv.c
--- gnupg-1.0.3/g10/gpgv.c	Thu Jan  1 01:00:00 1970
+++ gnupg-1.0.4/g10/gpgv.c	Sat Oct  7 13:15:02 2000
@@ -0,0 +1,372 @@
+/* gpgv.c - The GnuPG signature verify utility
+ *	Copyright (C) 2000 Free Software Foundation, Inc.
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG 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.
+ *
+ * GnuPG 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
+ */
+
+#include <config.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <unistd.h>
+#ifdef HAVE_DOSISH_SYSTEM
+  #include <fcntl.h> /* for setmode() */
+#endif
+
+
+#include "packet.h"
+#include "iobuf.h"
+#include "memory.h"
+#include "util.h"
+#include "main.h"
+#include "options.h"
+#include "keydb.h"
+#include "trustdb.h"
+#include "mpi.h"
+#include "cipher.h"
+#include "filter.h"
+#include "ttyio.h"
+#include "i18n.h"
+#include "status.h"
+#include "g10defs.h"
+#include "hkp.h"
+
+
+enum cmd_and_opt_values { aNull = 0,
+    oQuiet	  = 'q',
+    oVerbose	  = 'v',
+    oBatch	  = 500,
+    oKeyring,
+    oIgnoreTimeConflict,                      
+    oStatusFD,
+    oLoggerFD,
+    oHomedir,
+aTest };
+
+
+static ARGPARSE_OPTS opts[] = {
+
+    { 301, NULL, 0, N_("@\nOptions:\n ") },
+
+    { oVerbose, "verbose",   0, N_("verbose") },
+    { oQuiet,	"quiet",     0, N_("be somewhat more quiet") },
+    { oKeyring, "keyring"   ,2, N_("take the keys from this keyring")},
+    { oIgnoreTimeConflict, "ignore-time-conflict", 0, 
+                           N_("make timestamp conflicts only a warning") },
+    { oStatusFD, "status-fd" ,1, N_("|FD|write status info to this FD") },
+    { oLoggerFD, "logger-fd",1, "@" },
+    { oHomedir, "homedir", 2, "@" },   /* defaults to "~/.gnupg" */
+
+{0} };
+
+
+
+int g10_errors_seen = 0;
+
+const char *
+strusage( int level )
+{
+    const char *p;
+    switch( level ) {
+      case 11: p = "gpgv (GnuPG)";
+	break;
+      case 13: p = VERSION; break;
+      case 17: p = PRINTABLE_OS_NAME; break;
+      case 19: p =
+	    _("Please report bugs to <gnupg-bugs@gnu.org>.\n");
+	break;
+      case 1:
+      case 40:	p =
+	    _("Usage: gpgv [options] [files] (-h for help)");
+	break;
+      case 41:	p =
+	    _("Syntax: gpg [options] [files]\n"
+	      "Check signatures against known trusted keys\n");
+	break;
+
+      default:	p = default_strusage(level);
+    }
+    return p;
+}
+
+
+
+
+static void
+i18n_init(void)
+{
+  #ifdef USE_SIMPLE_GETTEXT
+    set_gettext_file( PACKAGE );
+  #else
+  #ifdef ENABLE_NLS
+    #ifdef HAVE_LC_MESSAGES
+       setlocale( LC_TIME, "" );
+       setlocale( LC_MESSAGES, "" );
+    #else
+       setlocale( LC_ALL, "" );
+    #endif
+    bindtextdomain( PACKAGE, G10_LOCALEDIR );
+    textdomain( PACKAGE );
+  #endif
+  #endif
+}
+
+
+int
+main( int argc, char **argv )
+{
+    ARGPARSE_ARGS pargs;
+    int rc=0;
+    STRLIST sl;
+    STRLIST nrings=NULL;
+    unsigned configlineno;
+
+    log_set_name("gpgv");
+    init_signals();
+    i18n_init();
+    opt.command_fd = -1; /* no command fd */
+    opt.pgp2_workarounds = 1;
+    opt.auto_key_retrieve = 1;
+    opt.always_trust = 1;
+    opt.batch = 1;
+
+  #ifdef __MINGW32__
+    opt.homedir = read_w32_registry_string( NULL, "Software\\GNU\\GnuPG", "HomeDir" );
+  #else
+    opt.homedir = getenv("GNUPGHOME");
+  #endif
+    if( !opt.homedir || !*opt.homedir ) {
+	opt.homedir = GNUPG_HOMEDIR;
+    }
+    tty_no_terminal(1);
+    tty_batchmode(1);
+    disable_dotlock();
+    
+    pargs.argc = &argc;
+    pargs.argv = &argv;
+    pargs.flags=  1;  /* do not remove the args */
+    while( optfile_parse( NULL, NULL, &configlineno, &pargs, opts) ) {
+	switch( pargs.r_opt ) {
+	  case oQuiet: opt.quiet = 1; break;
+          case oVerbose: g10_opt_verbose++;
+		  opt.verbose++; opt.list_sigs=1; break;
+          case oKeyring: append_to_strlist( &nrings, pargs.r.ret_str); break;
+	  case oStatusFD: set_status_fd( pargs.r.ret_int ); break;
+	  case oLoggerFD: log_set_logfile( NULL, pargs.r.ret_int ); break;
+	  case oHomedir: opt.homedir = pargs.r.ret_str; break;
+	  default : pargs.err = 2; break;
+	}
+    }
+
+    if( log_get_errorcount(0) )
+	g10_exit(2);
+
+    g10_opt_homedir = opt.homedir;
+
+    if( opt.verbose > 1 )
+	set_packet_list_mode(1);
+
+    if( !nrings )  /* no keyring given: use default one */
+        add_keyblock_resource("trustedkeys.gpg", 0, 0);
+    for(sl = nrings; sl; sl = sl->next )
+        add_keyblock_resource( sl->d, 0, 0 );
+    
+    FREE_STRLIST(nrings);
+    
+    if( (rc = verify_signatures( argc, argv ) ))
+        log_error("verify signatures failed: %s\n", g10_errstr(rc) );
+
+    /* cleanup */
+    g10_exit(0);
+    return 8; /*NEVER REACHED*/
+}
+
+
+void
+g10_exit( int rc )
+{
+    rc = rc? rc : log_get_errorcount(0)? 2 :
+			g10_errors_seen? 1 : 0;
+    exit(rc );
+}
+
+
+/* Stub:
+ * We have to override the trustcheck from pkclist.c becuase 
+ * this utility assumes that all keys in the keyring are trustworthy
+ */
+int
+check_signatures_trust( PKT_signature *sig )
+{
+    return 0;
+}
+
+
+/* Stub: 
+ * We don't have the trustdb , so we have to provide some stub functions
+ * instead
+ */
+int
+keyid_from_lid( ulong lid, u32 *keyid )
+{
+    return G10ERR_TRUSTDB;
+}
+
+/* Stub: */
+int
+query_trust_info( PKT_public_key *pk, const byte *namehash )
+{
+    return '?';
+}
+
+/* Stub: */
+int
+get_ownertrust_info( ulong lid )
+{
+    return '?';
+}
+
+
+/* Stub:
+ * Because we only work with trusted keys, it does not make sense to
+ * get them from a keyserver
+ */
+int
+hkp_ask_import( u32 *keyid )
+{
+    return -1;
+}
+
+/* Stub:
+ * No encryption here but mainproc links to these functions.
+ */
+int
+get_session_key( PKT_pubkey_enc *k, DEK *dek )
+{
+    return G10ERR_GENERAL;
+}
+/* Stub: */
+int
+get_override_session_key( DEK *dek, const char *string )
+{
+    return G10ERR_GENERAL;
+}
+/* Stub: */
+int
+decrypt_data( void *procctx, PKT_encrypted *ed, DEK *dek )
+{
+    return G10ERR_GENERAL;
+}
+
+
+/* Stub:
+ * No interactive commnds, so we don't need the helptexts
+ */
+void
+display_online_help( const char *keyword )
+{
+}
+
+/* Stub:
+ * We don't use secret keys, but getkey.c links to this
+ */
+int
+check_secret_key( PKT_secret_key *sk, int n )
+{
+    return G10ERR_GENERAL;
+}
+
+/* Stub:
+ * No secret key, so no passphrase needed 
+ */
+DEK *
+passphrase_to_dek( u32 *keyid, int pubkey_algo,
+		   int cipher_algo, STRING2KEY *s2k, int mode )
+{
+    return NULL;
+}
+
+
+/* Stubs to void linking to ../cipher/cipher.c */
+int string_to_cipher_algo( const char *string ) { return 0; }
+const char *cipher_algo_to_string( int algo ) { return "?";}
+void disable_cipher_algo( int algo ) {}
+int check_cipher_algo( int algo ) { return -1;}
+unsigned int cipher_get_keylen( int algo ) { return 0; }
+unsigned int cipher_get_blocksize( int algo ) {return 0;}
+CIPHER_HANDLE cipher_open( int algo, int mode, int secure ) { return NULL;}
+void cipher_close( CIPHER_HANDLE c ) {}
+int cipher_setkey( CIPHER_HANDLE c, byte *key, unsigned keylen ) { return -1;}
+void cipher_setiv( CIPHER_HANDLE c, const byte *iv, unsigned ivlen ){}
+void cipher_encrypt( CIPHER_HANDLE c, byte *outbuf,
+                     byte *inbuf, unsigned nbytes ) {}
+void cipher_decrypt( CIPHER_HANDLE c, byte *outbuf,
+                     byte *inbuf, unsigned nbytes ) {}
+void cipher_sync( CIPHER_HANDLE c ) {}
+
+/* Stubs to avoid linking to ../cipher/random.c */
+void random_dump_stats(void) {}
+int quick_random_gen( int onoff ) { return -1;}
+void randomize_buffer( byte *buffer, size_t length, int level ) {}
+int random_is_faked() { return -1;}
+byte *get_random_bits( size_t nbits, int level, int secure ) { return NULL;}
+void set_random_seed_file( const char *name ) {}
+void update_random_seed_file() {}
+void fast_random_poll() {}
+
+/* Stubs to avoid linking of ../cipher/primegen.c */
+void register_primegen_progress ( void (*cb)( void *, int), void *cb_data ) {}
+MPI generate_secret_prime( unsigned  nbits ) { return NULL;}
+MPI generate_public_prime( unsigned  nbits ) { return NULL;}
+MPI generate_elg_prime( int mode, unsigned pbits, unsigned qbits,
+                        MPI g, MPI **ret_factors ) { return NULL;}
+
+/* Do not link to ../cipher/rndlinux.c */
+void rndlinux_constructor(void) {}
+
+
+/* Stubs to avoid linking to ../util/ttyio.c */
+int tty_batchmode( int onoff ) { return 0; }
+void tty_printf( const char *fmt, ... ) { }
+void tty_print_string( byte *p, size_t n ) { }
+void tty_print_utf8_string( byte *p, size_t n ) {}
+void tty_print_utf8_string2( byte *p, size_t n, size_t max_n ) {}
+char *tty_get( const char *prompt ) { return NULL;}
+char *tty_get_hidden( const char *prompt ) {return NULL; }
+void tty_kill_prompt(void) {}
+int tty_get_answer_is_yes( const char *prompt ) {return 0;}
+int tty_no_terminal(int onoff) {return 0;}
+
+/* We do not do any locking, so use these stubs here */
+void disable_dotlock(void) {}
+DOTLOCK create_dotlock( const char *file_to_lock ) { return NULL; }
+int make_dotlock( DOTLOCK h, long timeout ) { return 0;}
+int release_dotlock( DOTLOCK h ) {return 0;}
+
+
+
+
+
+
+
+
+
+
+
+
diff -urN gnupg-1.0.3/g10/hkp.c gnupg-1.0.4/g10/hkp.c
--- gnupg-1.0.3/g10/hkp.c	Mon Sep 18 11:32:27 2000
+++ gnupg-1.0.4/g10/hkp.c	Mon Oct 16 17:43:41 2000
@@ -42,7 +42,7 @@
 static void
 not_implemented(void)
 {
-    log_error("keyserver access ist not yet available for MS-Windows\n");
+    log_error("keyserver access is not yet available for MS-Windows\n");
 }
 #endif
 
diff -urN gnupg-1.0.3/g10/keyedit.c gnupg-1.0.4/g10/keyedit.c
--- gnupg-1.0.3/g10/keyedit.c	Wed Sep 13 16:07:22 2000
+++ gnupg-1.0.4/g10/keyedit.c	Fri Oct 13 12:04:45 2000
@@ -625,8 +625,9 @@
     int toggle;
     int have_commands = !!commands;
 
-
-    if( opt.batch && !have_commands ) {
+    if ( opt.command_fd != -1 )
+        ;
+    else if( opt.batch && !have_commands  ) {
 	log_error(_("can't do that in batchmode\n"));
 	goto leave;
     }
diff -urN gnupg-1.0.3/g10/keygen.c gnupg-1.0.4/g10/keygen.c
--- gnupg-1.0.3/g10/keygen.c	Fri Sep 15 18:38:14 2000
+++ gnupg-1.0.4/g10/keygen.c	Thu Oct 12 12:23:16 2000
@@ -135,10 +135,11 @@
 
     keygen_add_key_expire( sig, opaque );
 
-    buf[0] = CIPHER_ALGO_TWOFISH;
-    buf[1] = CIPHER_ALGO_CAST5;
-    buf[2] = CIPHER_ALGO_BLOWFISH;
-    build_sig_subpkt( sig, SIGSUBPKT_PREF_SYM, buf, 3 );
+    buf[0] = CIPHER_ALGO_RIJNDAEL;
+    buf[1] = CIPHER_ALGO_TWOFISH;
+    buf[2] = CIPHER_ALGO_CAST5;
+    buf[3] = CIPHER_ALGO_BLOWFISH;
+    build_sig_subpkt( sig, SIGSUBPKT_PREF_SYM, buf, 4 );
 
     buf[0] = DIGEST_ALGO_RMD160;
     buf[1] = DIGEST_ALGO_SHA1;
diff -urN gnupg-1.0.3/g10/main.h gnupg-1.0.4/g10/main.h
--- gnupg-1.0.3/g10/main.h	Thu Sep 14 14:00:55 2000
+++ gnupg-1.0.4/g10/main.h	Fri Oct 13 15:25:35 2000
@@ -60,6 +60,7 @@
 u16 checksum_mpi( MPI a );
 u16 checksum_mpi_counted_nbits( MPI a );
 u32 buffer_to_u32( const byte *buffer );
+const byte *get_session_marker( size_t *rlen );
 
 /*-- helptext.c --*/
 void display_online_help( const char *keyword );
diff -urN gnupg-1.0.3/g10/mainproc.c gnupg-1.0.4/g10/mainproc.c
--- gnupg-1.0.3/g10/mainproc.c	Thu Jul 27 11:25:40 2000
+++ gnupg-1.0.4/g10/mainproc.c	Mon Oct 16 19:12:30 2000
@@ -95,6 +95,9 @@
     }
     c->failed_pkenc = NULL;
     c->list = NULL;
+    c->have_data = 0;
+    c->last_was_session_key = 0;
+    m_free(c->dek); c->dek = NULL;
 }
 
 
@@ -104,8 +107,14 @@
     KBNODE node;
 
     if( c->list ) { /* add another packet */
-	if( c->list->pkt->pkttype != PKT_ONEPASS_SIG ) {
-	   log_error("add_onepass_sig: another packet is in the way\n");
+        /* We can only append another onepass packet if the list
+         * does contain only onepass packets */
+        for( node=c->list; node && node->pkt->pkttype == PKT_ONEPASS_SIG;
+             node = node->next )
+            ;
+	if( node ) {
+            /* this is not the case, so we flush the current thing and 
+             * allow this packet to start a new verification thing */
 	   release_list( c );
 	   c->list = new_kbnode( pkt );
 	}
@@ -119,6 +128,24 @@
 }
 
 
+static int
+add_gpg_control( CTX c, PACKET *pkt )
+{
+    if ( pkt->pkt.gpg_control->control == 1 ) {
+        /* New clear text signature.
+         * Process the last one and reset everything */
+        release_list(c);
+    }   
+
+    if( c->list )  /* add another packet */
+        add_kbnode( c->list, new_kbnode( pkt ));
+    else /* insert the first one */
+	c->list = new_kbnode( pkt );
+
+    return 1;
+}
+
+
 
 static int
 add_user_id( CTX c, PACKET *pkt )
@@ -412,20 +439,23 @@
 	    }
 	    if( n->pkt->pkt.onepass_sig->sig_class != 0x01 )
 		only_md5 = 0;
-
-	    /* Check whether this is a cleartext signature.  We assume that
-	     * we have one if the sig_class is 1 and the keyid is 0, that
-	     * are the faked packets produced by armor.c.  There is a
-	     * possibility that this fails, but there is no other easy way
-	     * to do it. (We could use a special packet type to indicate
-	     * this, but this may also be faked - it simply can't be verified
-	     * and is _no_ security issue)
-	     */
-	    if( n->pkt->pkt.onepass_sig->sig_class == 0x01
-		&& !n->pkt->pkt.onepass_sig->keyid[0]
-		&& !n->pkt->pkt.onepass_sig->keyid[1] )
-		clearsig = 1;
 	}
+	else if( n->pkt->pkttype == PKT_GPG_CONTROL
+                 && n->pkt->pkt.gpg_control->control == 1 ) {
+            size_t datalen = n->pkt->pkt.gpg_control->datalen;
+            const byte *data = n->pkt->pkt.gpg_control->data;
+
+            /* check that we have at least the sigclass and one hash */
+            if ( datalen < 2 )
+                log_fatal("invalid control packet of type 1\n"); 
+            /* Note that we don't set the clearsig flag for not-dash-escaped
+             * documents */
+            clearsig = (*data == 0x01);
+            for( data++, datalen--; datalen; datalen--, data++ )
+                md_enable( c->mfx.md, *data );
+            any = 1;
+            break;  /* no pass signature pakets are expected */
+        }
     }
 
     if( !any && !opt.skip_verify ) {
@@ -993,6 +1023,7 @@
 	      case PKT_PLAINTEXT:   proc_plaintext( c, pkt ); break;
 	      case PKT_COMPRESSED:  proc_compressed( c, pkt ); break;
 	      case PKT_ONEPASS_SIG: newpkt = add_onepass_sig( c, pkt ); break;
+              case PKT_GPG_CONTROL: newpkt = add_gpg_control(c, pkt); break;
 	      default: newpkt = 0; break;
 	    }
 	}
@@ -1011,6 +1042,7 @@
 	      case PKT_PLAINTEXT:   proc_plaintext( c, pkt ); break;
 	      case PKT_COMPRESSED:  proc_compressed( c, pkt ); break;
 	      case PKT_ONEPASS_SIG: newpkt = add_onepass_sig( c, pkt ); break;
+	      case PKT_GPG_CONTROL: newpkt = add_gpg_control(c, pkt); break;
 	      default: newpkt = 0; break;
 	    }
 	}
@@ -1035,11 +1067,20 @@
 	      case PKT_PLAINTEXT:   proc_plaintext( c, pkt ); break;
 	      case PKT_COMPRESSED:  proc_compressed( c, pkt ); break;
 	      case PKT_ONEPASS_SIG: newpkt = add_onepass_sig( c, pkt ); break;
+              case PKT_GPG_CONTROL: newpkt = add_gpg_control(c, pkt); break;
 	      case PKT_RING_TRUST:  newpkt = add_ring_trust( c, pkt ); break;
 	      default: newpkt = 0; break;
 	    }
 	}
-	if( pkt->pkttype != PKT_SIGNATURE )
+        /* This is a very ugly construct and frankly, I don't remember why
+         * I used it.  Adding the MDC check here is a hack.
+         * The right solution is to initiate another context for encrypted
+         * packet and not to reuse the current one ...  It works right
+         * when there is a compression packet inbetween which adds just
+         * an extra layer.
+         * Hmmm: Rewrite this whole module here?? 
+         */
+	if( pkt->pkttype != PKT_SIGNATURE && pkt->pkttype != PKT_MDC )
 	    c->have_data = pkt->pkttype == PKT_PLAINTEXT;
 
 	if( newpkt == -1 )
@@ -1081,6 +1122,37 @@
 	return 0;
     }
 
+    /* It is not in all cases possible to check multiple signatures:
+     * PGP 2 (which is also allowed by OpenPGP), does use the packet
+     * sequence: sig+data,  OpenPGP does use onepas+data=sig and GnuPG
+     * sometimes uses (because I did'nt read the specs right) data+sig.
+     * Because it is possible to create multiple signatures with
+     * different packet sequence (e.g. data+sig and sig+data) it might
+     * not be possible to get it right:  let's say we have:
+     * data+sig, sig+data,sig+data and we have not yet encountered the last
+     * data, we could also see this a one data with 2 signatures and then 
+     * data+sig.
+     * To protect against this we check that we all signatures follow
+     * without any intermediate packets.  Note, that we won't get this
+     * error when we use onepass packets or cleartext signatures because
+     * we reset the list every time
+     */
+    {
+        KBNODE n;
+        int tmp=0;
+
+        for(n=c->list; n; n=n->next ) {
+            if ( tmp && n->pkt->pkttype == PKT_SIGNATURE ) {
+                log_error("can't handle these multiple signatures\n");
+                return 0;
+            }
+            else if ( n->pkt->pkttype == PKT_SIGNATURE ) 
+                tmp = 1;
+        }
+    }
+    
+
+
     tstr = asctimestamp(sig->timestamp);
     astr = pubkey_algo_to_string( sig->pubkey_algo );
     log_info(_("Signature made %.*s using %s key ID %08lX\n"),
@@ -1228,6 +1300,17 @@
 	for( n1 = node; (n1 = find_next_kbnode(n1, PKT_SIGNATURE )); )
 	    check_sig_and_print( c, n1 );
     }
+    else if( node->pkt->pkttype == PKT_GPG_CONTROL
+             && node->pkt->pkt.gpg_control->control == 1 ) {
+        /* clear text signed message */
+	if( !c->have_data ) {
+            log_error("cleartext signature without data\n" );
+            return;
+        }
+	
+	for( n1 = node; (n1 = find_next_kbnode(n1, PKT_SIGNATURE )); )
+	    check_sig_and_print( c, n1 );
+    }
     else if( node->pkt->pkttype == PKT_SIGNATURE ) {
 	PKT_signature *sig = node->pkt->pkt.signature;
 
@@ -1262,6 +1345,11 @@
 	     */
 		    /*	c->mfx.md2? 0 :(sig->sig_class == 0x01) */
 	  #endif
+            if ( DBG_HASHING ) {
+                md_start_debug( c->mfx.md, "verify" );
+                if ( c->mfx.md2  )
+                    md_start_debug( c->mfx.md2, "verify2" );
+            }
 	    if( c->sigs_only ) {
 		rc = hash_datafiles( c->mfx.md, c->mfx.md2,
 				     c->signed_data, c->sigfilename,
@@ -1286,6 +1374,7 @@
 	log_error(_("invalid root packet detected in proc_tree()\n"));
 
 }
+
 
 
 
diff -urN gnupg-1.0.3/g10/misc.c gnupg-1.0.4/g10/misc.c
--- gnupg-1.0.3/g10/misc.c	Thu Sep 14 12:59:24 2000
+++ gnupg-1.0.4/g10/misc.c	Fri Oct 13 16:39:17 2000
@@ -22,6 +22,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include <errno.h>
 #if defined(__linux__) && defined(__alpha__) && __GLIBC__ < 2
   #include <asm/sysinfo.h>
@@ -244,6 +245,32 @@
 }
 
 
+/* Return a string which is used as a kind of process ID */
+const byte *
+get_session_marker( size_t *rlen )
+{
+    static byte marker[SIZEOF_UNSIGNED_LONG*2];
+    static int initialized;
+
+    if ( !initialized ) {
+        volatile ulong aa, bb; /* we really want the unitialized value */
+        ulong a, b;
+
+        initialized = 1;
+        /* also this marker is guessable it is not easy to use this 
+         * for a faked control packet because an attacker does not
+         * have enough control about the time the verification does 
+         * take place.  Of course, we can add just more random but 
+         * than we need the random generator even for verification
+         * tasks - which does not make sense. */
+        a = aa ^ (ulong)getpid();
+        b = bb ^ (ulong)time(NULL);
+        memcpy( marker, &a, SIZEOF_UNSIGNED_LONG );
+        memcpy( marker+SIZEOF_UNSIGNED_LONG, &b, SIZEOF_UNSIGNED_LONG );
+    }
+    *rlen = sizeof(marker);
+    return marker;
+}
 
 
 
diff -urN gnupg-1.0.3/g10/packet.h gnupg-1.0.4/g10/packet.h
--- gnupg-1.0.3/g10/packet.h	Thu Jul 27 11:26:29 2000
+++ gnupg-1.0.4/g10/packet.h	Fri Oct 13 16:16:51 2000
@@ -50,6 +50,7 @@
 	PKT_ENCRYPTED_MDC =18, /* integrity protected encrypted data */
 	PKT_MDC 	  =19, /* manipulaion detection code packet */
 	PKT_COMMENT	  =61, /* new comment packet (private) */
+        PKT_GPG_CONTROL   =63  /* internal control packet */
 } pkttype_t;
 
 typedef struct packet_struct PACKET;
@@ -194,6 +195,11 @@
     char name[1];
 } PKT_plaintext;
 
+typedef struct {
+    int  control;
+    size_t datalen;
+    char data[1];
+} PKT_gpg_control;
 
 /* combine all packets into a union */
 struct packet_struct {
@@ -213,6 +219,7 @@
 	PKT_mdc 	*mdc;		/* PKT_MDC */
 	PKT_ring_trust	*ring_trust;	/* PKT_RING_TRUST */
 	PKT_plaintext	*plaintext;	/* PKT_PLAINTEXT */
+        PKT_gpg_control *gpg_control;   /* PKT_GPG_CONTROL */
     } pkt;
 };
 
diff -urN gnupg-1.0.3/g10/parse-packet.c gnupg-1.0.4/g10/parse-packet.c
--- gnupg-1.0.3/g10/parse-packet.c	Thu Sep 14 17:29:47 2000
+++ gnupg-1.0.4/g10/parse-packet.c	Fri Oct 13 16:48:55 2000
@@ -75,6 +75,8 @@
 					       PACKET *packet, int new_ctb);
 static int  parse_mdc( IOBUF inp, int pkttype, unsigned long pktlen,
 					       PACKET *packet, int new_ctb);
+static int  parse_gpg_control( IOBUF inp, int pkttype, unsigned long pktlen,
+                               PACKET *packet );
 
 static unsigned short
 read_16(IOBUF inp)
@@ -446,6 +448,9 @@
       case PKT_MDC:
 	rc = parse_mdc(inp, pkttype, pktlen, pkt, new_ctb );
 	break;
+      case PKT_GPG_CONTROL:
+        rc = parse_gpg_control(inp, pkttype, pktlen, pkt );
+        break;
       default:
 	skip_packet(inp, pkttype, pktlen);
 	break;
@@ -1734,6 +1739,7 @@
 	if( version != 1 ) {
 	    log_error("encrypted_mdc packet with unknown version %d\n",
 								version);
+            /*skip_rest(inp, pktlen); should we really do this? */
 	    goto leave;
 	}
 	ed->mdc_method = DIGEST_ALGO_SHA1;
@@ -1781,4 +1787,67 @@
   leave:
     return 0;
 }
+
+
+/*
+ * This packet is internally generated by PGG (by armor.c) to
+ * transfer some information to the lower layer.  To make sure that
+ * this packet is really a GPG faked one and not one comming from outside,
+ * we first check that tehre is a unique tag in it.
+ * The format of such a control packet is:
+ *   n byte  session marker
+ *   1 byte  control type: 1 = Clearsign hash info
+ *   m byte  control data
+ */
+
+static int
+parse_gpg_control( IOBUF inp,
+                   int pkttype, unsigned long pktlen, PACKET *packet )
+{
+    byte *p;
+    const byte *sesmark;
+    size_t sesmarklen;
+    int i;
+
+    if ( list_mode )
+        printf(":packet 63: length %lu ",  pktlen);
+
+    sesmark = get_session_marker ( &sesmarklen );
+    if ( pktlen < sesmarklen+1 ) /* 1 is for the control bytes */
+        goto skipit;
+    for( i=0; i < sesmarklen; i++, pktlen-- ) {
+	if ( sesmark[i] != iobuf_get_noeof(inp) )
+            goto skipit;
+    }
+    if ( list_mode )
+        puts ("- gpg control packet");
+
+    packet->pkt.gpg_control = m_alloc(sizeof *packet->pkt.gpg_control
+                                      + pktlen - 1);
+    packet->pkt.gpg_control->control = iobuf_get_noeof(inp); pktlen--;
+    packet->pkt.gpg_control->datalen = pktlen;
+    p = packet->pkt.gpg_control->data;
+    for( ; pktlen; pktlen--, p++ )
+	*p = iobuf_get_noeof(inp);
+
+    return 0;
+
+ skipit:
+    if ( list_mode ) {
+        int c, i=0 ;
+        printf("- private (rest length %lu)\n",  pktlen);
+        if( iobuf_in_block_mode(inp) ) {
+            while( (c=iobuf_get(inp)) != -1 )
+                dump_hex_line(c, &i);
+        }
+        else {
+            for( ; pktlen; pktlen-- )
+                dump_hex_line(iobuf_get(inp), &i);
+        }
+        putchar('\n');
+    }
+    skip_rest(inp,pktlen);
+    return G10ERR_INVALID_PACKET;
+}
+
 
diff -urN gnupg-1.0.3/g10/sign.c gnupg-1.0.4/g10/sign.c
--- gnupg-1.0.3/g10/sign.c	Wed Sep 13 15:42:09 2000
+++ gnupg-1.0.4/g10/sign.c	Fri Sep 29 16:47:19 2000
@@ -162,13 +162,13 @@
 }
 
 static int
-hash_for(int pubkey_algo )
+hash_for(int pubkey_algo, int packet_version )
 {
     if( opt.def_digest_algo )
 	return opt.def_digest_algo;
     if( pubkey_algo == PUBKEY_ALGO_DSA )
 	return DIGEST_ALGO_SHA1;
-    if( pubkey_algo == PUBKEY_ALGO_RSA )
+    if( pubkey_algo == PUBKEY_ALGO_RSA && packet_version < 4 )
 	return DIGEST_ALGO_MD5;
     return DEFAULT_DIGEST_ALGO;
 }
@@ -304,7 +304,7 @@
 
     for( sk_rover = sk_list; sk_rover; sk_rover = sk_rover->next ) {
 	PKT_secret_key *sk = sk_rover->sk;
-	md_enable(mfx.md, hash_for(sk->pubkey_algo));
+	md_enable(mfx.md, hash_for(sk->pubkey_algo, sk->version ));
     }
 
     if( !multifile )
@@ -361,7 +361,7 @@
 	    sk = sk_rover->sk;
 	    ops = m_alloc_clear( sizeof *ops );
 	    ops->sig_class = opt.textmode && !outfile ? 0x01 : 0x00;
-	    ops->digest_algo = hash_for(sk->pubkey_algo);
+	    ops->digest_algo = hash_for(sk->pubkey_algo, sk->version);
 	    ops->pubkey_algo = sk->pubkey_algo;
 	    keyid_from_sk( sk, ops->keyid );
 	    ops->last = skcount == 1;
@@ -488,7 +488,7 @@
 	sig = m_alloc_clear( sizeof *sig );
 	sig->version = old_style || opt.force_v3_sigs ? 3 : sk->version;
 	keyid_from_sk( sk, sig->keyid );
-	sig->digest_algo = hash_for(sk->pubkey_algo);
+	sig->digest_algo = hash_for(sk->pubkey_algo, sk->version);
 	sig->pubkey_algo = sk->pubkey_algo;
 	sig->timestamp = make_timestamp();
 	sig->sig_class = opt.textmode && !outfile? 0x01 : 0x00;
@@ -538,7 +538,7 @@
 	}
 	md_final( md );
 
-	rc = do_sign( sk, sig, md, hash_for(sig->pubkey_algo) );
+	rc = do_sign( sk, sig, md, hash_for(sig->pubkey_algo, sk->version) );
 	md_close( md );
 
 	if( !rc ) { /* and write it */
@@ -621,7 +621,7 @@
 
     for( sk_rover = sk_list; sk_rover; sk_rover = sk_rover->next ) {
 	PKT_secret_key *sk = sk_rover->sk;
-	if( hash_for(sk->pubkey_algo) == DIGEST_ALGO_MD5 )
+	if( hash_for(sk->pubkey_algo, sk->version) == DIGEST_ALGO_MD5 )
 	    only_md5 = 1;
 	else {
 	    only_md5 = 0;
@@ -640,7 +640,7 @@
 	iobuf_writestr(out, "Hash: " );
 	for( sk_rover = sk_list; sk_rover; sk_rover = sk_rover->next ) {
 	    PKT_secret_key *sk = sk_rover->sk;
-	    int i = hash_for(sk->pubkey_algo);
+	    int i = hash_for(sk->pubkey_algo, sk->version);
 
 	    if( !hashs_seen[ i & 0xff ] ) {
 		s = digest_algo_to_string( i );
@@ -665,7 +665,7 @@
     textmd = md_open(0, 0);
     for( sk_rover = sk_list; sk_rover; sk_rover = sk_rover->next ) {
 	PKT_secret_key *sk = sk_rover->sk;
-	md_enable(textmd, hash_for(sk->pubkey_algo));
+	md_enable(textmd, hash_for(sk->pubkey_algo, sk->version));
     }
     if ( DBG_HASHING )
 	md_start_debug( textmd, "clearsign" );
@@ -690,7 +690,7 @@
 	sig = m_alloc_clear( sizeof *sig );
 	sig->version = old_style || opt.force_v3_sigs ? 3 : sk->version;
 	keyid_from_sk( sk, sig->keyid );
-	sig->digest_algo = hash_for(sk->pubkey_algo);
+	sig->digest_algo = hash_for(sk->pubkey_algo, sk->version);
 	sig->pubkey_algo = sk->pubkey_algo;
 	sig->timestamp = make_timestamp();
 	sig->sig_class = 0x01;
@@ -739,7 +739,7 @@
 	}
 	md_final( md );
 
-	rc = do_sign( sk, sig, md, hash_for(sig->pubkey_algo) );
+	rc = do_sign( sk, sig, md, hash_for(sig->pubkey_algo, sk->version) );
 	md_close( md );
 
 	if( !rc ) { /* and write it */
diff -urN gnupg-1.0.3/g10/status.c gnupg-1.0.4/g10/status.c
--- gnupg-1.0.3/g10/status.c	Fri Aug  4 14:22:46 2000
+++ gnupg-1.0.4/g10/status.c	Fri Oct 13 12:32:10 2000
@@ -24,6 +24,7 @@
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
+#include <signal.h>
 #ifdef USE_SHM_COPROCESSING
   #ifdef USE_CAPABILITIES
     #include <sys/capability.h>
@@ -46,6 +47,10 @@
 #include "i18n.h"
 #include "cipher.h" /* for progress functions */
 
+#define CONTROL_D ('D' - 'A' + 1)
+
+
+
 static int fd = -1;
 #ifdef USE_SHM_COPROCESSING
   static int shm_id = -1;
@@ -340,6 +345,28 @@
 
 #endif /* USE_SHM_COPROCESSING */
 
+static int
+myread(int fd, void *buf, size_t count)
+{
+    int rc;
+    do {
+        rc = read( fd, buf, count );
+    } while ( rc == -1 && errno == EINTR );
+    if ( !rc && count ) {
+        static int eof_emmited=0;
+        if ( eof_emmited < 3 ) {
+            *(char*)buf = CONTROL_D;
+            rc = 1;
+            eof_emmited++;
+        }
+        else { /* Ctrl-D not caught - do something reasonable */
+            raise (SIGHUP); /* no more input data */
+        }
+    }    
+    return rc;
+}
+
+
 
 /****************
  * Request a string from the client over the command-fd
@@ -365,8 +392,14 @@
 		i=0;
 	}
 	/* Hmmm: why not use our read_line function here */
-	if( read( opt.command_fd, string+i, 1) != 1 || string[i] == '\n' )
-	    break;
+	if( myread( opt.command_fd, string+i, 1) != 1 || string[i] == '\n'  )
+            break;
+        else if ( string[i] == CONTROL_D ) {
+            /* found ETX - cancel the line and return a sole ETX */
+            string[0] = CONTROL_D;
+            i=1;
+            break;
+        }
     }
     string[i] = 0;
 
diff -urN gnupg-1.0.3/include/ChangeLog gnupg-1.0.4/include/ChangeLog
--- gnupg-1.0.3/include/ChangeLog	Wed Sep  6 17:55:50 2000
+++ gnupg-1.0.4/include/ChangeLog	Thu Oct 12 11:42:17 2000
@@ -1,3 +1,7 @@
+2000-10-12  Werner Koch  <wk@gnupg.org>
+
+	* mpi.h: Changed the way mpi_limb_t is defined.
+
 Wed Sep  6 17:55:47 CEST 2000  Werner Koch  <wk@openit.de>
 
         * iobuf.c (IOBUF_FILELENGTH_LIMIT): New.
diff -urN gnupg-1.0.3/include/cipher.h gnupg-1.0.4/include/cipher.h
--- gnupg-1.0.3/include/cipher.h	Thu May 18 08:15:20 2000
+++ gnupg-1.0.4/include/cipher.h	Thu Oct 12 12:23:02 2000
@@ -33,6 +33,9 @@
 #define CIPHER_ALGO_BLOWFISH	 4  /* blowfish 128 bit key */
 #define CIPHER_ALGO_SAFER_SK128  5
 #define CIPHER_ALGO_DES_SK	 6
+#define CIPHER_ALGO_RIJNDAEL     7
+#define CIPHER_ALGO_RIJNDAEL192  8
+#define CIPHER_ALGO_RIJNDAEL256  9
 #define CIPHER_ALGO_TWOFISH	10  /* twofish 256 bit */
 #define CIPHER_ALGO_SKIPJACK   101  /* experimental: skipjack */
 #define CIPHER_ALGO_TWOFISH_OLD 102 /* experimental: twofish 128 bit */
diff -urN gnupg-1.0.3/include/mpi.h gnupg-1.0.4/include/mpi.h
--- gnupg-1.0.3/include/mpi.h	Wed Jul  7 13:28:09 1999
+++ gnupg-1.0.4/include/mpi.h	Fri Oct 13 17:56:17 2000
@@ -29,19 +29,32 @@
 #ifndef G10_MPI_H
 #define G10_MPI_H
 
+#include <config.h>
 #include <stdio.h>
 #include "iobuf.h"
 #include "types.h"
 #include "memory.h"
 
+#if BYTES_PER_MPI_LIMB == SIZEOF_UNSIGNED_INT
+  typedef unsigned int mpi_limb_t;
+  typedef   signed int mpi_limb_signed_t;
+#elif BYTES_PER_MPI_LIMB == SIZEOF_UNSIGNED_LONG
+  typedef unsigned long int mpi_limb_t;
+  typedef   signed long int mpi_limb_signed_t;
+#elif BYTES_PER_MPI_LIMB == SIZEOF_UNSIGNED_LONG_LONG
+  typedef unsigned long long int mpi_limb_t;
+  typedef   signed long long int mpi_limb_signed_t;
+#elif BYTES_PER_MPI_LIMB == SIZEOF_UNSIGNED_SHORT
+  typedef unsigned short int mpi_limb_t;
+  typedef   signed short int mpi_limb_signed_t;
+#else
+  #error BYTES_PER_MPI_LIMB does not match any C type
+#endif
+#define BITS_PER_MPI_LIMB    (8*BYTES_PER_MPI_LIMB)
+
 
 #define DBG_MPI     mpi_debug_mode
 int mpi_debug_mode;
-
-#define BITS_PER_MPI_LIMB    (8*SIZEOF_UNSIGNED_LONG)
-#define BYTES_PER_MPI_LIMB   SIZEOF_UNSIGNED_LONG
-typedef unsigned long int mpi_limb_t;
-typedef   signed long int mpi_limb_signed_t;
 
 struct gcry_mpi {
     int alloced;    /* array size (# of allocated limbs) */
diff -urN gnupg-1.0.3/mpi/ChangeLog gnupg-1.0.4/mpi/ChangeLog
--- gnupg-1.0.3/mpi/ChangeLog	Wed Jul 19 11:26:45 2000
+++ gnupg-1.0.4/mpi/ChangeLog	Fri Oct 13 18:04:13 2000
@@ -1,3 +1,15 @@
+2000-10-13  Werner Koch  <wk@gnupg.org>
+
+	* mpi.h: Removed the inclusion of mpi-asm-defs.h because this
+	makes some trouble when doing a VPATH build.  configure now
+	takes care of it.
+	
+2000-10-12  Werner Koch  <wk@gnupg.org>
+
+	* generic/mpi-asm-defs.h: New.
+	* mips3/mpi-asm-defs.h: New.
+	* config.links: Create a link to one of the above files.
+
 Wed Jul 19 11:26:43 CEST 2000  Werner Koch  <wk@>
 
   * config.links: Support for powerpc--netbsd by Gabriel Rosenkoetter.
diff -urN gnupg-1.0.3/mpi/Makefile.am gnupg-1.0.4/mpi/Makefile.am
--- gnupg-1.0.3/mpi/Makefile.am	Tue Mar 14 12:03:54 2000
+++ gnupg-1.0.4/mpi/Makefile.am	Fri Oct 13 17:46:59 2000
@@ -6,7 +6,8 @@
 ASFLAGS = @MPI_SFLAGS@
 
 EXTRA_DIST = config.links
-DISTCLEANFILES = mpih-add1.S mpih-mul1.S mpih-mul2.S mpih-mul3.S  \
+DISTCLEANFILES = mpi-asm-defs.h \
+                 mpih-add1.S mpih-mul1.S mpih-mul2.S mpih-mul3.S  \
 		 mpih-lshift.S mpih-rshift.S mpih-sub1.S asm-syntax.h sysdep.h
 # Note: we only use .S files so we should delete all left over .s
 CLEANFILES = _*.s
diff -urN gnupg-1.0.3/mpi/Makefile.in gnupg-1.0.4/mpi/Makefile.in
--- gnupg-1.0.3/mpi/Makefile.in	Mon Sep 18 12:17:53 2000
+++ gnupg-1.0.4/mpi/Makefile.in	Tue Oct 17 15:40:15 2000
@@ -111,7 +111,7 @@
 ASFLAGS = @MPI_SFLAGS@
 
 EXTRA_DIST = config.links
-DISTCLEANFILES = mpih-add1.S mpih-mul1.S mpih-mul2.S mpih-mul3.S  		 mpih-lshift.S mpih-rshift.S mpih-sub1.S asm-syntax.h sysdep.h
+DISTCLEANFILES = mpi-asm-defs.h                  mpih-add1.S mpih-mul1.S mpih-mul2.S mpih-mul3.S  		 mpih-lshift.S mpih-rshift.S mpih-sub1.S asm-syntax.h sysdep.h
 
 # Note: we only use .S files so we should delete all left over .s
 CLEANFILES = _*.s
diff -urN gnupg-1.0.3/mpi/config.links gnupg-1.0.4/mpi/config.links
--- gnupg-1.0.3/mpi/config.links	Tue Jul 18 10:31:39 2000
+++ gnupg-1.0.4/mpi/config.links	Thu Oct 12 11:43:12 2000
@@ -277,3 +277,13 @@
     done
 done
 
+# Same thing for the file which defines the limb size
+path="$path generic"
+for dir in $path ; do
+     	rm -f $srcdir/mpi/mpi-asm-defs.h
+	if test -f $srcdir/mpi/$dir/mpi-asm-defs.h ; then
+	    mpi_ln_src="$mpi_ln_src mpi/$dir/mpi-asm-defs.h"
+	    mpi_ln_dst="$mpi_ln_dst mpi/mpi-asm-defs.h"
+	    break;
+	fi
+done
diff -urN gnupg-1.0.3/mpi/generic/distfiles gnupg-1.0.4/mpi/generic/distfiles
--- gnupg-1.0.3/mpi/generic/distfiles	Tue Nov 10 19:35:06 1998
+++ gnupg-1.0.4/mpi/generic/distfiles	Thu Oct 12 11:46:46 2000
@@ -6,4 +6,5 @@
 mpih-rshift.c
 mpih-sub1.c
 udiv-w-sdiv.c
+mpi-asm-defs.h
 
diff -urN gnupg-1.0.3/mpi/generic/mpi-asm-defs.h gnupg-1.0.4/mpi/generic/mpi-asm-defs.h
--- gnupg-1.0.3/mpi/generic/mpi-asm-defs.h	Thu Jan  1 01:00:00 1970
+++ gnupg-1.0.4/mpi/generic/mpi-asm-defs.h	Thu Oct 12 12:08:53 2000
@@ -0,0 +1,10 @@
+/* This file defines some basic constants for the MPI machinery.  We
+ * need to define the types on a per-CPU basis, so it is done with
+ * this file here.  */
+#define BYTES_PER_MPI_LIMB  (SIZEOF_UNSIGNED_LONG)
+
+
+
+
+
+
diff -urN gnupg-1.0.3/mpi/mips3/distfiles gnupg-1.0.4/mpi/mips3/distfiles
--- gnupg-1.0.3/mpi/mips3/distfiles	Thu Jun 25 12:19:06 1998
+++ gnupg-1.0.4/mpi/mips3/distfiles	Thu Oct 12 11:45:50 2000
@@ -6,4 +6,5 @@
 mpih-mul3.S
 mpih-lshift.S
 mpih-rshift.S
+mpi-asm-defs.h
 
diff -urN gnupg-1.0.3/mpi/mips3/mpi-asm-defs.h gnupg-1.0.4/mpi/mips3/mpi-asm-defs.h
--- gnupg-1.0.3/mpi/mips3/mpi-asm-defs.h	Thu Jan  1 01:00:00 1970
+++ gnupg-1.0.4/mpi/mips3/mpi-asm-defs.h	Thu Oct 12 11:45:37 2000
@@ -0,0 +1,10 @@
+/* This file defines some basic constants for the MPI machinery.  We
+ * need to define the types on a per-CPU basis, so it is done with
+ * this file here.  */
+#define BYTES_PER_MPI_LIMB  8
+
+
+
+
+
+
diff -urN gnupg-1.0.3/po/ChangeLog gnupg-1.0.4/po/ChangeLog
--- gnupg-1.0.3/po/ChangeLog	Thu Sep 14 17:45:13 2000
+++ gnupg-1.0.4/po/ChangeLog	Mon Oct 16 18:38:49 2000
@@ -1,3 +1,7 @@
+2000-10-16  Werner Koch  <wk@gnupg.org>
+
+	* de.po, de.glo: Updated.
+
 Thu Sep 14 17:45:11 CEST 2000  Werner Koch  <wk@openit.de>
 
         * eo.po: Updated.
diff -urN gnupg-1.0.3/po/da.po gnupg-1.0.4/po/da.po
--- gnupg-1.0.3/po/da.po	Mon Sep 18 12:18:01 2000
+++ gnupg-1.0.4/po/da.po	Tue Oct 17 15:40:35 2000
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-09-18 12:17+0200\n"
+"POT-Creation-Date: 2000-10-16 19:22+0200\n"
 "PO-Revision-Date: 2000-03-07 22:51+01:00\n"
 "Last-Translator: Birger Langkjer <birger.langkjer@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -19,11 +19,11 @@
 msgid "Warning: using insecure memory!\n"
 msgstr "Advarsel: benytter ubeskyttet hukommelse!\n"
 
-#: util/secmem.c:289
+#: util/secmem.c:295
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operation er ikke mulig uden beskyttet hukommelse indlæst\n"
 
-#: util/secmem.c:290
+#: util/secmem.c:296
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(du kan have brugt et forkert program til denne opgave)\n"
 
@@ -257,7 +257,7 @@
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "du fandt en fejl ... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1255
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke åbne '%s': %s\n"
@@ -861,24 +861,24 @@
 msgid "can't open `%s'\n"
 msgstr "kan ikke åbne `%s'\n"
 
-#: g10/g10.c:1700
+#: g10/g10.c:1737
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "første bogstav af en notationsnavn skal være et bogstave eller en "
 "understregning\n"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1743
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
 msgstr ""
 
-#: g10/g10.c:1712
+#: g10/g10.c:1749
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 
-#: g10/g10.c:1720
+#: g10/g10.c:1757
 msgid "a notation value must not use any control characters\n"
 msgstr "en notationsværdi må ikke bruge nogen kontroltegn\n"
 
@@ -941,27 +941,27 @@
 msgid "error in trailer line\n"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/armor.c:912
+#: g10/armor.c:906
 msgid "For info see http://www.gnupg.org"
 msgstr ""
 
-#: g10/armor.c:1033
+#: g10/armor.c:1027
 msgid "no valid OpenPGP data found.\n"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
 
-#: g10/armor.c:1038
+#: g10/armor.c:1032
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ugyldigt panser: linie længere end %d tegn\n"
 
-#: g10/armor.c:1042
+#: g10/armor.c:1036
 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"
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1188 g10/pkclist.c:53
+#: g10/keyedit.c:1189 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "             Fingeraftryk:"
 
@@ -1221,66 +1221,66 @@
 msgid "no valid addressees\n"
 msgstr "ingen gyldige adresser\n"
 
-#: g10/keygen.c:175
+#: g10/keygen.c:176
 msgid "writing self signature\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keygen.c:213
+#: g10/keygen.c:214
 msgid "writing key binding signature\n"
 msgstr ""
 
-#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:435
+#: g10/keygen.c:262 g10/keygen.c:346 g10/keygen.c:436
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Ønsket nøglestørrelse er %u bit\n"
 
-#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:440
+#: g10/keygen.c:267 g10/keygen.c:351 g10/keygen.c:441
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
 
-#: g10/keygen.c:539
+#: g10/keygen.c:540
 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:541
+#: g10/keygen.c:542
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA og ElGamal (standard)\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:543
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (signér kun)\n"
 
-#: g10/keygen.c:544
+#: g10/keygen.c:545
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (kryptér kun)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:546
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signér og kryptér)\n"
 
-#: g10/keygen.c:547
+#: g10/keygen.c:548
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signér og kryptér)\n"
 
-#: g10/keygen.c:551
+#: g10/keygen.c:552
 msgid "Your selection? "
 msgstr "Dit valg? "
 
-#: g10/keygen.c:562 g10/keygen.c:570
+#: g10/keygen.c:563 g10/keygen.c:571
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "Vil du gerne oprette en underskrivnings- og krypteringsnøgle? "
 
-#: g10/keygen.c:584
+#: g10/keygen.c:585
 msgid "Invalid selection.\n"
 msgstr "Ugyldigt valg.\n"
 
-#: g10/keygen.c:596
+#: g10/keygen.c:597
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1289,19 +1289,19 @@
 "    highest suggested keysize is 2048 bits\n"
 msgstr ""
 
-#: g10/keygen.c:603
+#: g10/keygen.c:604
 msgid "What keysize do you want? (1024) "
 msgstr "Hvilken nøglestørrelse ønsker du? (1024) "
 
-#: g10/keygen.c:608
+#: g10/keygen.c:609
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA tillader kun nøglestørrelser fra 512 til 1024\n"
 
-#: g10/keygen.c:610
+#: g10/keygen.c:611
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr ""
 
-#: g10/keygen.c:612
+#: g10/keygen.c:613
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr ""
 
@@ -1313,42 +1313,42 @@
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:623
+#: g10/keygen.c:624
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr ""
 
-#: g10/keygen.c:628
+#: g10/keygen.c:629
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
 msgstr ""
 
-#: g10/keygen.c:631
+#: g10/keygen.c:632
 msgid "Are you sure that you want this keysize? "
 msgstr "Er du sikker på at de vil benytte denne nøglestørrelse? "
 
-#: g10/keygen.c:632
+#: g10/keygen.c:633
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
 msgstr ""
 
-#: g10/keygen.c:640
+#: g10/keygen.c:641
 msgid "Do you really need such a large keysize? "
 msgstr ""
 
-#: g10/keygen.c:646
+#: g10/keygen.c:647
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Ønsket nøglestørrelse er %u bit\n"
 
-#: g10/keygen.c:649 g10/keygen.c:653
+#: g10/keygen.c:650 g10/keygen.c:654
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
 
-#: g10/keygen.c:701
+#: g10/keygen.c:702
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1358,36 +1358,36 @@
 "      <n>y = key expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:716
+#: g10/keygen.c:717
 msgid "Key is valid for? (0) "
 msgstr "Nøgle er gyldig for? (0) "
 
-#: g10/keygen.c:721
+#: g10/keygen.c:722
 msgid "invalid value\n"
 msgstr "ugyldig værdi\n"
 
-#: g10/keygen.c:726
+#: g10/keygen.c:727
 msgid "Key does not expire at all\n"
 msgstr "Nøglen udløber aldrig\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:732
+#: g10/keygen.c:733
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Nøgle udløber d. %s\n"
 
-#: g10/keygen.c:735
+#: g10/keygen.c:736
 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:740
+#: g10/keygen.c:741
 msgid "Is this correct (y/n)? "
 msgstr "Er dette korrekt (j/n)? "
 
-#: g10/keygen.c:783
+#: g10/keygen.c:784
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1397,44 +1397,44 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:795
+#: g10/keygen.c:796
 msgid "Real name: "
 msgstr "Rigtige navn: "
 
-#: g10/keygen.c:803
+#: g10/keygen.c:804
 msgid "Invalid character in name\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/keygen.c:805
+#: g10/keygen.c:806
 msgid "Name may not start with a digit\n"
 msgstr "Navn må ikke starte med et tal\n"
 
-#: g10/keygen.c:807
+#: g10/keygen.c:808
 msgid "Name must be at least 5 characters long\n"
 msgstr "Navn skal være mindst 5 bogstaver langt\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:816
 msgid "Email address: "
 msgstr "Epostadresse: "
 
-#: g10/keygen.c:826
+#: g10/keygen.c:827
 msgid "Not a valid email address\n"
 msgstr "Ikke en gyldig epostadresse\n"
 
-#: g10/keygen.c:834
+#: g10/keygen.c:835
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:840
+#: g10/keygen.c:841
 msgid "Invalid character in comment\n"
 msgstr "Ugyldigt tegn i kommentar\n"
 
-#: g10/keygen.c:863
+#: g10/keygen.c:864
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du bruger '%s' tegnsættet.\n"
 
-#: g10/keygen.c:869
+#: g10/keygen.c:870
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1445,28 +1445,28 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:873
+#: g10/keygen.c:874
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:878
+#: g10/keygen.c:879
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:888
+#: g10/keygen.c:889
 #, 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:889
+#: g10/keygen.c:890
 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:908
+#: g10/keygen.c:909
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:946
+#: g10/keygen.c:947
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1474,11 +1474,11 @@
 "Du skal bruge en kodesætning til at beskytte din hemmelige nøgle.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:954
+#: g10/keyedit.c:468 g10/keygen.c:955
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "kodesætningen blev ikke ordentlig gentaget; prøv igen.\n"
 
-#: g10/keygen.c:960
+#: g10/keygen.c:961
 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"
@@ -1486,7 +1486,7 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:981
+#: g10/keygen.c:982
 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"
@@ -1494,52 +1494,52 @@
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:1430
+#: g10/keygen.c:1431
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA nøglepar vil have 1024 bit.\n"
 
-#: g10/keygen.c:1473
+#: g10/keygen.c:1474
 msgid "Key generation canceled.\n"
 msgstr "Nøgleoprettelse annulleret.\n"
 
-#: g10/keygen.c:1570
+#: g10/keygen.c:1571
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/keygen.c:1571
+#: g10/keygen.c:1572
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1668
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig nøgle oprettet og signeret.\n"
 
-#: g10/keygen.c:1672
+#: g10/keygen.c:1673
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
 msgstr ""
 
-#: g10/keygen.c:1689 g10/keygen.c:1790
+#: g10/keygen.c:1690 g10/keygen.c:1791
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:1733 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:1735 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1736 g10/sig-check.c:317 g10/sign.c:114
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1769
 msgid "Really create? "
 msgstr "Vil du virkelig oprette?"
 
@@ -1978,7 +1978,7 @@
 msgid "Really sign? "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1870 g10/keyedit.c:1932 g10/sign.c:136
+#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering fejlede: %s\n"
@@ -2233,235 +2233,235 @@
 msgid "enable a key"
 msgstr "slå nøgle til"
 
-#: g10/delkey.c:110 g10/keyedit.c:630
+#: g10/delkey.c:110 g10/keyedit.c:631
 msgid "can't do that in batchmode\n"
 msgstr ""
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:668
+#: g10/keyedit.c:669
 msgid "Secret key is available.\n"
 msgstr ""
 
-#: g10/keyedit.c:697
+#: g10/keyedit.c:698
 msgid "Command> "
 msgstr ""
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Need the secret key to do this.\n"
 msgstr ""
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:732
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:779
 msgid "Really sign all user IDs? "
 msgstr ""
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:780
 msgid "Hint: Select the user IDs to sign\n"
 msgstr ""
 
-#: g10/keyedit.c:811 g10/keyedit.c:993
+#: g10/keyedit.c:812 g10/keyedit.c:994
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:822 g10/keyedit.c:843
+#: g10/keyedit.c:823 g10/keyedit.c:844
 msgid "You must select at least one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:825
 msgid "You can't delete the last user ID!\n"
 msgstr ""
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:828
 msgid "Really remove all selected user IDs? "
 msgstr ""
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:829
 msgid "Really remove this user ID? "
 msgstr ""
 
-#: g10/keyedit.c:864 g10/keyedit.c:886
+#: g10/keyedit.c:865 g10/keyedit.c:887
 msgid "You must select at least one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:869
 msgid "Do you really want to delete the selected keys? "
 msgstr ""
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:870
 msgid "Do you really want to delete this key? "
 msgstr ""
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:891
 msgid "Do you really want to revoke the selected keys? "
 msgstr ""
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:892
 msgid "Do you really want to revoke this key? "
 msgstr ""
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:958
 msgid "Save changes? "
 msgstr "Gem ændringer? "
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:961
 msgid "Quit without saving? "
 msgstr "Afslut uden at gemme? "
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:972
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:979
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:986
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1001
 msgid "Invalid command  (try \"help\")\n"
 msgstr ""
 
-#: g10/keyedit.c:1080 g10/keyedit.c:1106
+#: g10/keyedit.c:1081 g10/keyedit.c:1107
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1089
+#: g10/keyedit.c:1090
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1093
+#: g10/keyedit.c:1094
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:1122
+#: g10/keyedit.c:1123
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "nøgle %08lX: undernøgle er blevet annulleret!\n"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1126
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "  nye nøgletilbagekald: %lu\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1128
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1370
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1374
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1380
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1394
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Slettede %d signatur.\n"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1398
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:1466
+#: g10/keyedit.c:1467
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:1472
+#: g10/keyedit.c:1473
 msgid "Please select at most one secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1477
 msgid "Changing expiration time for a secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1479
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1520
+#: g10/keyedit.c:1521
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:1536
+#: g10/keyedit.c:1537
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:1597
+#: g10/keyedit.c:1598
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:1643
+#: g10/keyedit.c:1644
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Ingen sekundær nøgle med indeks %d\n"
 
-#: g10/keyedit.c:1741
+#: g10/keyedit.c:1742
 msgid "user ID: \""
 msgstr "bruger-id: \""
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1745
 #, c-format
 msgid ""
 "\"\n"
 "signed with your key %08lX at %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:1749
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr ""
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1773
 msgid "You have signed these user IDs:\n"
 msgstr ""
 
-#: g10/keyedit.c:1786 g10/keyedit.c:1821
+#: g10/keyedit.c:1787 g10/keyedit.c:1822
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1791
+#: g10/keyedit.c:1792
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1811
+#: g10/keyedit.c:1812
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:1829
+#: g10/keyedit.c:1830
 msgid "Really create the revocation certificates? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1859
 msgid "no secret key\n"
 msgstr ""
 
@@ -2475,136 +2475,136 @@
 msgstr ""
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:760
+#: g10/keylist.c:400 g10/mainproc.c:790
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "Nøgle udløber d. %s\n"
 
-#: g10/mainproc.c:213
+#: g10/mainproc.c:240
 #, c-format
 msgid "public key is %08lX\n"
 msgstr ""
 
-#: g10/mainproc.c:257
+#: g10/mainproc.c:284
 msgid "public key encrypted data: good DEK\n"
 msgstr ""
 
-#: g10/mainproc.c:299
+#: g10/mainproc.c:326
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr ""
 
-#: g10/mainproc.c:309
+#: g10/mainproc.c:336
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr ""
 
-#: g10/mainproc.c:315
+#: g10/mainproc.c:342
 msgid "no secret key for decryption available\n"
 msgstr ""
 
-#: g10/mainproc.c:324
+#: g10/mainproc.c:351
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:361
+#: g10/mainproc.c:388
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:366
+#: g10/mainproc.c:393
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:371
+#: g10/mainproc.c:398
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:390
+#: g10/mainproc.c:417
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:392
+#: g10/mainproc.c:419
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:544
+#: g10/mainproc.c:574
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:631 g10/mainproc.c:640
+#: g10/mainproc.c:661 g10/mainproc.c:670
 msgid "WARNING: invalid notation data found\n"
 msgstr ""
 
-#: g10/mainproc.c:643
+#: g10/mainproc.c:673
 msgid "Notation: "
 msgstr ""
 
-#: g10/mainproc.c:650
+#: g10/mainproc.c:680
 msgid "Policy: "
 msgstr "Politik: "
 
-#: g10/mainproc.c:1080
+#: g10/mainproc.c:1121
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1086
+#: g10/mainproc.c:1158
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr ""
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1112 g10/mainproc.c:1123
+#: g10/mainproc.c:1184 g10/mainproc.c:1195
 msgid "BAD signature from \""
 msgstr "DÅRLIG signatur fra \""
 
-#: g10/mainproc.c:1113 g10/mainproc.c:1124
+#: g10/mainproc.c:1185 g10/mainproc.c:1196
 msgid "Good signature from \""
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1115
+#: g10/mainproc.c:1187
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1171
+#: g10/mainproc.c:1243
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/mainproc.c:1235
+#: g10/mainproc.c:1318
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:1281
+#: g10/mainproc.c:1369
 msgid "old style (PGP 2.x) signature\n"
 msgstr "gammeldags (PGP 2.x) signatur\n"
 
-#: g10/mainproc.c:1286
+#: g10/mainproc.c:1374
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
-#: g10/misc.c:96
+#: g10/misc.c:97
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "kan ikke slå core-dump fra: %s\n"
 
-#: g10/misc.c:206
+#: g10/misc.c:207
 msgid "Experimental algorithms should not be used!\n"
 msgstr ""
 
-#: g10/misc.c:233
+#: g10/misc.c:234
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 
-#: g10/parse-packet.c:117
+#: g10/parse-packet.c:119
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:986
+#: g10/parse-packet.c:991
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
diff -urN gnupg-1.0.3/po/de.po gnupg-1.0.4/po/de.po
--- gnupg-1.0.3/po/de.po	Mon Sep 18 12:18:02 2000
+++ gnupg-1.0.4/po/de.po	Tue Oct 17 15:40:35 2000
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-09-18 12:17+0200\n"
-"PO-Revision-Date: 2000-06-12  12:50+0200\n"
+"POT-Creation-Date: 2000-10-16 19:22+0200\n"
+"PO-Revision-Date: 2000-10-15 14:30+0200\n"
 "Last-Translator: Walter Koch <koch@hsp.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@
 
 # "  Um dies zu vermeiden, kann das Programm suid(root) installiert werden.\n"
 # "  Bitte wenden Sie sich hierzu an den Systemadministrator.\n"
-#: util/secmem.c:289
+#: util/secmem.c:295
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "Vorgang ist ohne sicheren Hauptspeicher nicht möglich\n"
 
-#: util/secmem.c:290
+#: util/secmem.c:296
 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"
@@ -257,7 +257,7 @@
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Sie haben eine Bug (Programmfehler) gefunden ... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1255
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "'%s' kann nicht geöffnet werden: %s\n"
@@ -591,7 +591,7 @@
 
 #: g10/g10.c:299
 msgid "|KEYID|ulimately trust this key"
-msgstr ""
+msgstr "|KEYID|diesem Schlüssel uneingeschränkt vertrauen"
 
 #: g10/g10.c:300
 msgid "|FILE|load extension module FILE"
@@ -870,14 +870,14 @@
 msgid "can't open `%s'\n"
 msgstr "'%s' kann nicht geöffnet werden\n"
 
-#: g10/g10.c:1700
+#: g10/g10.c:1737
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "Das erste Zeichen eines \"notation\"-Namens muß ein Buchstabe oder\n"
 "ein Unterstrich sein\n"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1743
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -885,12 +885,12 @@
 "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
 "enthalten und muß mit einem '=' enden\n"
 
-#: g10/g10.c:1712
+#: g10/g10.c:1749
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 "Punkte in einem \"notation\"-Namen müssen von anderen Zeichen umgeben sein\n"
 
-#: g10/g10.c:1720
+#: g10/g10.c:1757
 msgid "a notation value must not use any control characters\n"
 msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
 
@@ -953,20 +953,20 @@
 msgid "error in trailer line\n"
 msgstr "Fehler in der Nachsatzzeile\n"
 
-#: g10/armor.c:912
+#: g10/armor.c:906
 msgid "For info see http://www.gnupg.org"
 msgstr "Weitere Infos: siehe http://www.gnupg.org"
 
-#: g10/armor.c:1033
+#: g10/armor.c:1027
 msgid "no valid OpenPGP data found.\n"
 msgstr "Keine gültigen OpenPGP-Daten gefunden.\n"
 
-#: g10/armor.c:1038
+#: g10/armor.c:1032
 #, 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:1042
+#: g10/armor.c:1036
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -975,7 +975,7 @@
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1188 g10/pkclist.c:53
+#: g10/keyedit.c:1189 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "           Fingerabdruck:"
 
@@ -1273,68 +1273,68 @@
 msgid "no valid addressees\n"
 msgstr "Keine gültigen Adressaten\n"
 
-#: g10/keygen.c:175
+#: g10/keygen.c:176
 msgid "writing self signature\n"
 msgstr "Die Eigenbeglaubigung wird geschrieben\n"
 
-#: g10/keygen.c:213
+#: g10/keygen.c:214
 msgid "writing key binding signature\n"
 msgstr "Schreiben der \"key-binding\" Signatur\n"
 
-#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:435
+#: g10/keygen.c:262 g10/keygen.c:346 g10/keygen.c:436
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Ungültig Schlüssellänge; %u Bit werden verwendet\n"
 
-#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:440
+#: g10/keygen.c:267 g10/keygen.c:351 g10/keygen.c:441
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Schlüssellänge auf %u Bit aufgerundet\n"
 
-#: g10/keygen.c:539
+#: g10/keygen.c:540
 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:541
+#: g10/keygen.c:542
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA und ElGamal (voreingestellt)\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:543
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nur signieren/beglaubigen)\n"
 
-#: g10/keygen.c:544
+#: g10/keygen.c:545
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (nur verschlüsseln)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:546
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signieren/beglaubigen und verschlüsseln)\n"
 
-#: g10/keygen.c:547
-#, fuzzy, c-format
+#: g10/keygen.c:548
+#, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
-msgstr "   (%d) ElGamal (signieren/beglaubigen und verschlüsseln)\n"
+msgstr "   (%d) RSA (signieren/beglaubigen und verschlüsseln)\n"
 
-#: g10/keygen.c:551
+#: g10/keygen.c:552
 msgid "Your selection? "
 msgstr "Ihre Auswahl? "
 
-#: g10/keygen.c:562 g10/keygen.c:570
+#: g10/keygen.c:563 g10/keygen.c:571
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr ""
 "Möchten Sie wirklich einen Unterschriften-/Verschlüsselungschlüssel "
 "erzeugen? "
 
-#: g10/keygen.c:584
+#: g10/keygen.c:585
 msgid "Invalid selection.\n"
 msgstr "Ungültige Auswahl.\n"
 
-#: g10/keygen.c:596
+#: g10/keygen.c:597
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1347,22 +1347,21 @@
 "              standard Schlüssellänge ist 1024 Bit\n"
 "      größte sinnvolle Schlüssellänge ist 2048 Bit\n"
 
-#: g10/keygen.c:603
+#: g10/keygen.c:604
 msgid "What keysize do you want? (1024) "
 msgstr "Welche Schlüssellänge wünschen Sie? (1024) "
 
-#: g10/keygen.c:608
+#: g10/keygen.c:609
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA erlaubt nur Schlüssellängen von 512 bis 1024\n"
 
-#: g10/keygen.c:610
+#: g10/keygen.c:611
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "zu kurz; 768 ist die kleinste mögliche Schlüssellänge.\n"
 
-#: g10/keygen.c:612
-#, fuzzy
+#: g10/keygen.c:613
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-msgstr "zu kurz; 768 ist die kleinste mögliche Schlüssellänge.\n"
+msgstr "zu kurz; 1024 ist die kleinste für RSA mögliche Schlüssellänge.\n"
 
 #. It is ridiculous and an annoyance to use larger key sizes!
 #. * GnuPG can handle much larger sizes; but it takes an eternity
@@ -1372,12 +1371,12 @@
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:623
+#: g10/keygen.c:624
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "Schüsselgröße zu hoch; %d ist der Maximalwert.\n"
 
-#: g10/keygen.c:628
+#: g10/keygen.c:629
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1385,11 +1384,11 @@
 "Schlüssellängen größer als 2048 werden nicht empfohlen, da die\n"
 "Berechnungen dann WIRKLICH lange brauchen!\n"
 
-#: g10/keygen.c:631
+#: g10/keygen.c:632
 msgid "Are you sure that you want this keysize? "
 msgstr "Sind Sie sicher, daß Sie diese Schlüssellänge wünschen? "
 
-#: g10/keygen.c:632
+#: g10/keygen.c:633
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1397,21 +1396,21 @@
 "Gut, aber bitte denken Sie auch daran, daß Monitor und Tastatur Daten "
 "abstrahlen und diese leicht mitgelesen werden können.\n"
 
-#: g10/keygen.c:640
+#: g10/keygen.c:641
 msgid "Do you really need such a large keysize? "
 msgstr "Brauchen Sie wirklich einen derartig langen Schlüssel? "
 
-#: g10/keygen.c:646
+#: g10/keygen.c:647
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Die verlangte Schlüssellänge beträgt %u Bit\n"
 
-#: g10/keygen.c:649 g10/keygen.c:653
+#: g10/keygen.c:650 g10/keygen.c:654
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "aufgerundet auf %u Bit\n"
 
-#: g10/keygen.c:701
+#: g10/keygen.c:702
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1427,25 +1426,25 @@
 "      <n>m = Schlüssel verfällt nach n Monaten\n"
 "      <n>y = Schlüssel verfällt nach n Jahren\n"
 
-#: g10/keygen.c:716
+#: g10/keygen.c:717
 msgid "Key is valid for? (0) "
 msgstr "Der Schlüssel bleibt wie lange gültig? (0) "
 
-#: g10/keygen.c:721
+#: g10/keygen.c:722
 msgid "invalid value\n"
 msgstr "Ungültiger Wert.\n"
 
-#: g10/keygen.c:726
+#: g10/keygen.c:727
 msgid "Key does not expire at all\n"
 msgstr "Der Schlüssel verfällt nie.\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:732
+#: g10/keygen.c:733
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Der Schlüssel verfällt am %s\n"
 
-#: g10/keygen.c:735
+#: g10/keygen.c:736
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1453,11 +1452,11 @@
 "Ihr Rechner kann Daten jenseits des Jahres 2038 nicht anzeigen.\n"
 "Trotzdem werden Daten bis 2106 korrekt verarbeitet.\n"
 
-#: g10/keygen.c:740
+#: g10/keygen.c:741
 msgid "Is this correct (y/n)? "
 msgstr "Ist dies richtig? (j/n) "
 
-#: g10/keygen.c:783
+#: g10/keygen.c:784
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1473,44 +1472,44 @@
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:795
+#: g10/keygen.c:796
 msgid "Real name: "
 msgstr "Ihr Name (\"Vorname Nachname\"): "
 
-#: g10/keygen.c:803
+#: g10/keygen.c:804
 msgid "Invalid character in name\n"
 msgstr "Ungültiges Zeichen im Namen\n"
 
-#: g10/keygen.c:805
+#: g10/keygen.c:806
 msgid "Name may not start with a digit\n"
 msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
 
-#: g10/keygen.c:807
+#: g10/keygen.c:808
 msgid "Name must be at least 5 characters long\n"
 msgstr "Der Name muß min. 5 Zeichen lang sein.\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:816
 msgid "Email address: "
 msgstr "E-Mail-Adresse: "
 
-#: g10/keygen.c:826
+#: g10/keygen.c:827
 msgid "Not a valid email address\n"
 msgstr "Diese E-Mail-Adresse ist ungültig\n"
 
-#: g10/keygen.c:834
+#: g10/keygen.c:835
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:840
+#: g10/keygen.c:841
 msgid "Invalid character in comment\n"
 msgstr "Ungültiges Zeichen im Kommentar.\n"
 
-#: g10/keygen.c:863
+#: g10/keygen.c:864
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Sie benutzen den Zeichensatz `%s'\n"
 
-#: g10/keygen.c:869
+#: g10/keygen.c:870
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1521,27 +1520,27 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:873
+#: g10/keygen.c:874
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Bitte keine E-Mailadressen als Namen oder Kommentar verwenden\n"
 
-#: g10/keygen.c:878
+#: g10/keygen.c:879
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeFfBb"
 
-#: g10/keygen.c:888
+#: g10/keygen.c:889
 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:889
+#: g10/keygen.c:890
 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:908
+#: g10/keygen.c:909
 msgid "Please correct the error first\n"
 msgstr "Bitte beseitigen Sie zuerst den Fehler\n"
 
-#: g10/keygen.c:946
+#: g10/keygen.c:947
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1549,11 +1548,11 @@
 "Sie benötigen ein Mantra, um den geheimen Schlüssel zu schützen.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:954
+#: g10/keyedit.c:468 g10/keygen.c:955
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "Mantra wurde nicht richtig wiederholt; noch einmal versuchen.\n"
 
-#: g10/keygen.c:960
+#: g10/keygen.c:961
 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"
@@ -1566,7 +1565,7 @@
 "aufrufen.\n"
 "\n"
 
-#: g10/keygen.c:981
+#: g10/keygen.c:982
 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"
@@ -1577,29 +1576,29 @@
 "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:1430
+#: g10/keygen.c:1431
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "Der DSA Schlüssel wird 1024 Bit haben.\n"
 
-#: g10/keygen.c:1473
+#: g10/keygen.c:1474
 msgid "Key generation canceled.\n"
 msgstr "Schlüsselerzeugung abgebrochen.\n"
 
-#: g10/keygen.c:1570
+#: g10/keygen.c:1571
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "schreiben des öffentlichen Schlüssels nach '%s'\n"
 
-#: g10/keygen.c:1571
+#: g10/keygen.c:1572
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "schreiben des geheimen Schlüssels nach '%s'\n"
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1668
 msgid "public and secret key created and signed.\n"
 msgstr "Öffentlichen und geheimen Schlüssel erzeugt und signiert.\n"
 
-#: g10/keygen.c:1672
+#: g10/keygen.c:1673
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1608,12 +1607,12 @@
 "werden kann.  Sie können aber mit dem Befehl \"--edit-key\" einen\n"
 "Zweitschlüssel für diesem Zweck erzeugen.\n"
 
-#: g10/keygen.c:1689 g10/keygen.c:1790
+#: g10/keygen.c:1690 g10/keygen.c:1791
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Schlüsselerzeugung fehlgeschlagen: %s\n"
 
-#: g10/keygen.c:1733 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1621,7 +1620,7 @@
 "Der Schlüssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht überein)\n"
 
-#: g10/keygen.c:1735 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1736 g10/sig-check.c:317 g10/sign.c:114
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1629,7 +1628,7 @@
 "Der Schlüssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
 "Uhren stimmen nicht überein)\n"
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1769
 msgid "Really create? "
 msgstr "Wirklich erzeugen? "
 
@@ -1672,7 +1671,7 @@
 #: g10/export.c:171
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
-msgstr "Schlüssel %08lX: dies ist kein rfc2440-Schüssel - übersprungen\n"
+msgstr "Schlüssel %08lX: dies ist kein RFC2440-Schüssel - übersprungen\n"
 
 #: g10/export.c:182
 #, c-format
@@ -1734,59 +1733,59 @@
 msgstr "Anzahl insgesamt bearbeiteter Schlüssel: %lu\n"
 
 #: g10/import.c:206
-#, fuzzy, c-format
+#, c-format
 msgid "      skipped new keys: %lu\n"
-msgstr "  neue Unterschlüssel: %lu\n"
+msgstr "              ignorierte neue Schlüssel: %lu\n"
 
 #: g10/import.c:209
 #, c-format
 msgid "          w/o user IDs: %lu\n"
-msgstr "         ohne User-ID: %lu\n"
+msgstr "                           ohne User-ID: %lu\n"
 
 #: g10/import.c:211
 #, c-format
 msgid "              imported: %lu"
-msgstr "           importiert: %lu"
+msgstr "                             importiert: %lu"
 
 #: g10/import.c:217
 #, c-format
 msgid "             unchanged: %lu\n"
-msgstr "          unverändert: %lu\n"
+msgstr "                            unverändert: %lu\n"
 
 #: g10/import.c:219
 #, c-format
 msgid "          new user IDs: %lu\n"
-msgstr "        neue User-IDs: %lu\n"
+msgstr "                          neue User-IDs: %lu\n"
 
 #: g10/import.c:221
 #, c-format
 msgid "           new subkeys: %lu\n"
-msgstr "  neue Unterschlüssel: %lu\n"
+msgstr "                    neue Unterschlüssel: %lu\n"
 
 #: g10/import.c:223
 #, c-format
 msgid "        new signatures: %lu\n"
-msgstr "        neue Signaturen: %lu\n"
+msgstr "                        neue Signaturen: %lu\n"
 
 #: g10/import.c:225
 #, c-format
 msgid "   new key revocations: %lu\n"
-msgstr "neue Schlüsselwiderrufe: %lu\n"
+msgstr "                neue Schlüsselwiderrufe: %lu\n"
 
 #: g10/import.c:227
 #, c-format
 msgid "      secret keys read: %lu\n"
-msgstr " gelesene geheime Schl.: %lu\n"
+msgstr "             gelesene geheime Schlüssel: %lu\n"
 
 #: g10/import.c:229
 #, c-format
 msgid "  secret keys imported: %lu\n"
-msgstr "geheime Schlüssel importiert: %lu\n"
+msgstr "           geheime Schlüssel importiert: %lu\n"
 
 #: g10/import.c:231
 #, c-format
 msgid " secret keys unchanged: %lu\n"
-msgstr " unveränderte geh.Schl.: %lu\n"
+msgstr "                 unveränderte geh.Schl.: %lu\n"
 
 #: g10/import.c:391 g10/import.c:590
 #, c-format
@@ -1808,9 +1807,9 @@
 msgstr "Schlüssel %08lX: Öffentlicher Schlüssel nicht gefunden: %s\n"
 
 #: g10/import.c:423
-#, fuzzy, c-format
+#, c-format
 msgid "key %08lX: new key - skipped\n"
-msgstr "Schlüssel %08lX: dies ist kein rfc2440-Schüssel - übersprungen\n"
+msgstr "Schlüssel %08lX: neuer Schlüssel - übersprungen\n"
 
 #: g10/import.c:431
 msgid "no default public keyring\n"
@@ -2078,7 +2077,7 @@
 msgid "Really sign? "
 msgstr "Wirklich unterschreiben? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1870 g10/keyedit.c:1932 g10/sign.c:136
+#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Beglaubigung fehlgeschlagen: %s\n"
@@ -2336,201 +2335,200 @@
 msgid "enable a key"
 msgstr "Schlüssel anschalten"
 
-#: g10/delkey.c:110 g10/keyedit.c:630
+#: g10/delkey.c:110 g10/keyedit.c:631
 msgid "can't do that in batchmode\n"
 msgstr "Dies kann im Batchmodus nicht durchgeführt werden.\n"
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:668
+#: g10/keyedit.c:669
 msgid "Secret key is available.\n"
 msgstr "Geheimer Schlüssel ist vorhanden.\n"
 
-#: g10/keyedit.c:697
+#: g10/keyedit.c:698
 msgid "Command> "
 msgstr "Befehl> "
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Need the secret key to do this.\n"
 msgstr "Hierzu wird der geheime Schlüssel benötigt.\n"
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:732
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Bitte verwenden sie zunächst den Befehl \"toggle\"\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:779
 msgid "Really sign all user IDs? "
 msgstr "Wirklich alle User-IDs beglaubigen? "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:780
 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:811 g10/keyedit.c:993
+#: g10/keyedit.c:812 g10/keyedit.c:994
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "Änderung der \"Trust-DB\" fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:822 g10/keyedit.c:843
+#: g10/keyedit.c:823 g10/keyedit.c:844
 msgid "You must select at least one user ID.\n"
 msgstr "Zumindestens eine User-ID muß ausgewählt werden.\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:825
 msgid "You can't delete the last user ID!\n"
 msgstr "Die letzte User-ID kann nicht gelöscht werden!\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:828
 msgid "Really remove all selected user IDs? "
 msgstr "Möchten Sie alle ausgewählten User-IDs wirklich entfernen? "
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:829
 msgid "Really remove this user ID? "
 msgstr "Diese User-ID wirklich entfernen? "
 
-#: g10/keyedit.c:864 g10/keyedit.c:886
+#: g10/keyedit.c:865 g10/keyedit.c:887
 msgid "You must select at least one key.\n"
 msgstr "Zumindestens ein Schlüssel muß ausgewählt werden.\n"
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:869
 msgid "Do you really want to delete the selected keys? "
 msgstr "Möchten Sie die ausgewählten Schlüssel wirklich entfernen? "
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:870
 msgid "Do you really want to delete this key? "
 msgstr "Möchten Sie diesen Schlüssel wirklich entfernen? "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:891
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Möchten Sie die ausgewählten Schlüssel wirklich widerrufen? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:892
 msgid "Do you really want to revoke this key? "
 msgstr "Möchten Sie diesen Schlüssel wirklich wiederrufen? "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:958
 msgid "Save changes? "
 msgstr "Änderungen speichern? "
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:961
 msgid "Quit without saving? "
 msgstr "Beenden ohne zu speichern? "
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:972
 #, c-format
 msgid "update failed: %s\n"
 msgstr "Änderung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:979
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "Änderung des Geheimnisses fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:986
 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:1000
+#: g10/keyedit.c:1001
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n"
 
-#: g10/keyedit.c:1080 g10/keyedit.c:1106
+#: g10/keyedit.c:1081 g10/keyedit.c:1107
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
-msgstr ""
+msgstr "%s%c %4u%c/%08lX  erstellt: %s verfällt: %s"
 
-#: g10/keyedit.c:1089
+#: g10/keyedit.c:1090
 #, c-format
 msgid " trust: %c/%c"
-msgstr ""
+msgstr " Vertrauen: %c/%c"
 
-#: g10/keyedit.c:1093
+#: g10/keyedit.c:1094
 msgid "This key has been disabled"
 msgstr "Hinweis: Dieser Schlüssel ist abgeschaltet"
 
-#: g10/keyedit.c:1122
-#, fuzzy, c-format
+#: g10/keyedit.c:1123
+#, c-format
 msgid "rev! subkey has been revoked: %s\n"
-msgstr "Schlüssel %08lX: Unterschlüssel wurde widerrufen\n"
+msgstr "rev! Unterschlüssel wurde widerrufen: %s\n"
 
-#: g10/keyedit.c:1125
-#, fuzzy
+#: g10/keyedit.c:1126
 msgid "rev- faked revocation found\n"
-msgstr "neue Schlüsselwiderrufe: %lu\n"
+msgstr "rev- gefälschter Schlüsselwiderruf entdeckt\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1128
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
-msgstr ""
+msgstr "rev? Schwierigkeiten bei der Widerruf-Überprüfung: %s\n"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1370
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Diese ungültige Beglaubigung entfernen= (j/N/q)"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1374
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1380
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1394
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1398
 msgid "Nothing deleted.\n"
 msgstr "Nichts entfernt.\n"
 
-#: g10/keyedit.c:1466
+#: g10/keyedit.c:1467
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bitte entfernen Sie die Auswahl von den geheimen Schlüsseln.\n"
 
-#: g10/keyedit.c:1472
+#: g10/keyedit.c:1473
 msgid "Please select at most one secondary key.\n"
 msgstr "Bitte wählen Sie höchstens einen Zweitschlüssel aus.\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1477
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Ändern des Verfallsdatums des Zweitschlüssels.\n"
 
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1479
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändern des Verfallsdatums des Hauptschlüssels.\n"
 
-#: g10/keyedit.c:1520
+#: g10/keyedit.c:1521
 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:1536
+#: g10/keyedit.c:1537
 msgid "No corresponding signature in secret ring\n"
 msgstr "Keine entsprechende Signatur im geheimen Schlüsselbund\n"
 
-#: g10/keyedit.c:1597
+#: g10/keyedit.c:1598
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:1643
+#: g10/keyedit.c:1644
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Kein Zweitschlüssel mit Index %d\n"
 
-#: g10/keyedit.c:1741
+#: g10/keyedit.c:1742
 msgid "user ID: \""
 msgstr "User-ID: \""
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1745
 #, c-format
 msgid ""
 "\"\n"
@@ -2539,185 +2537,183 @@
 "\"\n"
 "unterschrieben mit Ihrem Schlüssel %08lX um %s\n"
 
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:1749
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "Ein Widerrufszertifikat für diese Unterschrift erzeugen (j/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1773
 msgid "You have signed these user IDs:\n"
 msgstr "Sie haben folgende User-IDs beglaubigt:\n"
 
-#: g10/keyedit.c:1786 g10/keyedit.c:1821
+#: g10/keyedit.c:1787 g10/keyedit.c:1822
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   beglaubigt durch %08lX um %s\n"
 
-#: g10/keyedit.c:1791
+#: g10/keyedit.c:1792
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   widerrufen durch %08lX um %s\n"
 
-#: g10/keyedit.c:1811
+#: g10/keyedit.c:1812
 msgid "You are about to revoke these signatures:\n"
 msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
 
-#: g10/keyedit.c:1829
+#: g10/keyedit.c:1830
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) "
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1859
 msgid "no secret key\n"
 msgstr "Kein geheimer Schlüssel\n"
 
 #: g10/keylist.c:158
-#, fuzzy
 msgid "invalid"
-msgstr "Ungültige ASCII-Hülle"
+msgstr "ungültig"
 
 #: g10/keylist.c:178
-#, fuzzy
 msgid "revoked"
-msgstr "revkey"
+msgstr "widerrufen"
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:760
+#: g10/keylist.c:400 g10/mainproc.c:790
 #, c-format
 msgid " [expires: %s]"
 msgstr " [verfällt: %s]"
 
-#: g10/mainproc.c:213
+#: g10/mainproc.c:240
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "Öffentlicher Schlüssel ist %08lX\n"
 
-#: g10/mainproc.c:257
+#: g10/mainproc.c:284
 msgid "public key encrypted data: good DEK\n"
 msgstr "Mit öffentlichem Schüssel verschlüsselte Daten: Korrekte DEK\n"
 
-#: g10/mainproc.c:299
+#: g10/mainproc.c:326
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "verschlüsselt mit %u-Bit %s Schlüssel, ID %08lX, erzeugt %s\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
 # [kw]
-#: g10/mainproc.c:309
+#: g10/mainproc.c:336
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "verschlüsselt mit %s Schlüssel, ID %08lX\n"
 
-#: g10/mainproc.c:315
+#: g10/mainproc.c:342
 msgid "no secret key for decryption available\n"
 msgstr "kein geheimer Schlüssel zur Entschlüsselung vorhanden\n"
 
-#: g10/mainproc.c:324
+#: g10/mainproc.c:351
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Entschlüsselung mit öffentlichem Schlüssel fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:361
+#: g10/mainproc.c:388
 msgid "decryption okay\n"
 msgstr "Enschlüsselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:366
+#: g10/mainproc.c:393
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "Warnung: Verschlüsselte Botschaft ist manipuliert worden!\n"
 
-#: g10/mainproc.c:371
+#: g10/mainproc.c:398
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Enschlüsselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:390
+#: g10/mainproc.c:417
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 "Hinweis: Der Absender verlangte Vertraulichkeit(\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:392
+#: g10/mainproc.c:419
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "Ursprünglicher Dateiname='%.*s'\n"
 
-#: g10/mainproc.c:544
+#: g10/mainproc.c:574
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "Einzelner Widerruf - verwenden Sie \"gpg --import\" um ihn anzuwenden\n"
 
-#: g10/mainproc.c:631 g10/mainproc.c:640
+#: g10/mainproc.c:661 g10/mainproc.c:670
 msgid "WARNING: invalid notation data found\n"
 msgstr "WARNUNG: Ungültige \"Notation\"-Daten gefunden\n"
 
-#: g10/mainproc.c:643
+#: g10/mainproc.c:673
 msgid "Notation: "
 msgstr "\"Notation\": "
 
-#: g10/mainproc.c:650
+#: g10/mainproc.c:680
 msgid "Policy: "
 msgstr "Richtlinie: "
 
-#: g10/mainproc.c:1080
+#: g10/mainproc.c:1121
 msgid "signature verification suppressed\n"
 msgstr "Unterschriften-Überprüfung unterdrückt\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
-#: g10/mainproc.c:1086
+#: g10/mainproc.c:1158
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Unterschrift vom %.*s, %s Schlüssel ID %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1112 g10/mainproc.c:1123
+#: g10/mainproc.c:1184 g10/mainproc.c:1195
 msgid "BAD signature from \""
 msgstr "FALSCHE Unterschrift von \""
 
-#: g10/mainproc.c:1113 g10/mainproc.c:1124
+#: g10/mainproc.c:1185 g10/mainproc.c:1196
 msgid "Good signature from \""
 msgstr "Korrekte Unterschrift von \""
 
-#: g10/mainproc.c:1115
+#: g10/mainproc.c:1187
 msgid "                aka \""
 msgstr "                    alias \""
 
-#: g10/mainproc.c:1171
+#: g10/mainproc.c:1243
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Unterschrift kann nicht geprüft werden: %s\n"
 
-#: g10/mainproc.c:1235
+#: g10/mainproc.c:1318
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "Einzelne Unterschrift der Klasse 0x%02x\n"
 
-#: g10/mainproc.c:1281
+#: g10/mainproc.c:1369
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
 
-#: g10/mainproc.c:1286
+#: g10/mainproc.c:1374
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ungültiges root-Paket in proc_tree() entdeckt\n"
 
-#: g10/misc.c:96
+#: g10/misc.c:97
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "core-dump-Dateierzeugung kann nicht abgeschaltet werden: %s\n"
 
-#: g10/misc.c:206
+#: g10/misc.c:207
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Experimentiermethoden sollten nicht benutzt werden!\n"
 
-#: g10/misc.c:233
+#: g10/misc.c:234
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 "Diese Verschlüsselungsmethode taugt nicht mehr viel; verwenden Sie eine "
 "stärker standardisierte Methode!\n"
 
-#: g10/parse-packet.c:117
+#: g10/parse-packet.c:119
 #, 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:986
+#: g10/parse-packet.c:991
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
@@ -3098,9 +3094,9 @@
 msgstr "get_dir_record: search_record fehlgeschlagen: %s\n"
 
 #: g10/trustdb.c:474
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid long keyID\n"
-msgstr "%s: Dies ist keine gültige Schlüssel-ID\n"
+msgstr "'%s' ist keine gültige Schlüssel-ID-Länge\n"
 
 #: g10/trustdb.c:501
 #, c-format
@@ -3123,9 +3119,11 @@
 msgstr "Schlüssel %08lX: Akzeptiert als vertrauenswürdiger Schlüssel.\n"
 
 #: g10/trustdb.c:546
-#, fuzzy, c-format
+#, c-format
 msgid "key %08lX: no public key for trusted key - skipped\n"
-msgstr "Schlüssel %08lX: ungeschützt - übersprungen\n"
+msgstr ""
+"Schlüssel %08lX: kein öffentlicher Schlüssel für den vertrauenswürdig\ren "
+"Schlüssel - übersprungen\n"
 
 #: g10/trustdb.c:565
 #, c-format
diff -urN gnupg-1.0.3/po/eo.po gnupg-1.0.4/po/eo.po
--- gnupg-1.0.3/po/eo.po	Mon Sep 18 12:18:02 2000
+++ gnupg-1.0.4/po/eo.po	Tue Oct 17 15:40:36 2000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.1e\n"
-"POT-Creation-Date: 2000-09-18 12:17+0200\n"
+"POT-Creation-Date: 2000-10-16 19:22+0200\n"
 "PO-Revision-Date: 2000-08-16 23:19+01:00\n"
 "Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -17,11 +17,11 @@
 msgid "Warning: using insecure memory!\n"
 msgstr "Averto: uzas malsekuran memoron!\n"
 
-#: util/secmem.c:289
+#: util/secmem.c:295
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operacio ne eblas sen sekura memoro kun komenca valoro\n"
 
-#: util/secmem.c:290
+#: util/secmem.c:296
 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"
 
@@ -255,7 +255,7 @@
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "vi trovis cimon ... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1255
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
@@ -859,12 +859,12 @@
 msgid "can't open `%s'\n"
 msgstr "ne povas malfermi '%s'\n"
 
-#: g10/g10.c:1700
+#: g10/g10.c:1737
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "la unua signo de notacia nomo devas esti litero aý substreko\n"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1743
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -872,11 +872,11 @@
 "notacia nomo devas enhavi nur literojn, ciferojn, punktojn aý substrekojn "
 "kaj fini per '='\n"
 
-#: g10/g10.c:1712
+#: g10/g10.c:1749
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "punktoj en notacia nomo devas esti inter aliaj signoj\n"
 
-#: g10/g10.c:1720
+#: g10/g10.c:1757
 msgid "a notation value must not use any control characters\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
@@ -939,20 +939,20 @@
 msgid "error in trailer line\n"
 msgstr "eraro en vostolinio\n"
 
-#: g10/armor.c:912
+#: g10/armor.c:906
 msgid "For info see http://www.gnupg.org"
 msgstr "Por informoj vidu http://www.gnupg.org"
 
-#: g10/armor.c:1033
+#: g10/armor.c:1027
 msgid "no valid OpenPGP data found.\n"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 
-#: g10/armor.c:1038
+#: g10/armor.c:1032
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "nevalida kiraso: linio pli longa ol %d signojn\n"
 
-#: g10/armor.c:1042
+#: g10/armor.c:1036
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -961,7 +961,7 @@
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1188 g10/pkclist.c:53
+#: g10/keyedit.c:1189 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "             Fingrospuro:"
 
@@ -1246,66 +1246,66 @@
 msgid "no valid addressees\n"
 msgstr "mankas validaj adresitoj\n"
 
-#: g10/keygen.c:175
+#: g10/keygen.c:176
 msgid "writing self signature\n"
 msgstr "skribas mem-subskribon\n"
 
-#: g10/keygen.c:213
+#: g10/keygen.c:214
 msgid "writing key binding signature\n"
 msgstr "skribas þlosilbindan subskribon\n"
 
-#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:435
+#: g10/keygen.c:262 g10/keygen.c:346 g10/keygen.c:436
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "þlosilgrando nevalida; uzas %u bitojn\n"
 
-#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:440
+#: g10/keygen.c:267 g10/keygen.c:351 g10/keygen.c:441
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "þlosilgrando rondigita øis %u bitoj\n"
 
-#: g10/keygen.c:539
+#: g10/keygen.c:540
 msgid "Please select what kind of key you want:\n"
 msgstr "Bonvolu elekti, kian þlosilon vi deziras:\n"
 
-#: g10/keygen.c:541
+#: g10/keygen.c:542
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA kaj ElGamal (implicita elekto)\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:543
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nur subskribi)\n"
 
-#: g10/keygen.c:544
+#: g10/keygen.c:545
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (nur æifri)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:546
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (subskribi kaj æifri)\n"
 
-#: g10/keygen.c:547
+#: g10/keygen.c:548
 #, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (subskribi kaj æifri)\n"
 
-#: g10/keygen.c:551
+#: g10/keygen.c:552
 msgid "Your selection? "
 msgstr "Via elekto? "
 
-#: g10/keygen.c:562 g10/keygen.c:570
+#: g10/keygen.c:563 g10/keygen.c:571
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "Æu vi vere volas krei subskriban kaj æifran þlosilon? "
 
-#: g10/keygen.c:584
+#: g10/keygen.c:585
 msgid "Invalid selection.\n"
 msgstr "Nevalida elekto.\n"
 
-#: g10/keygen.c:596
+#: g10/keygen.c:597
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1318,19 +1318,19 @@
 "               implicita þlosilgrando estas 1024 bitoj\n"
 " plej granda rekomendata þlosilgrando estas 2048 bitoj\n"
 
-#: g10/keygen.c:603
+#: g10/keygen.c:604
 msgid "What keysize do you want? (1024) "
 msgstr "Kiun þlosilgrandon vi deziras? (1024) "
 
-#: g10/keygen.c:608
+#: g10/keygen.c:609
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA permesas þlosilgrandon nur inter 512 kaj 1024\n"
 
-#: g10/keygen.c:610
+#: g10/keygen.c:611
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "þlosilgrando tro malgranda; 768 estas plej eta permesata valoro.\n"
 
-#: g10/keygen.c:612
+#: g10/keygen.c:613
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "þlosilgrando tro malgranda; 1024 estas plej eta valoro por RSA.\n"
 
@@ -1342,12 +1342,12 @@
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:623
+#: g10/keygen.c:624
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "þlosilgrando tro granda; %d estas plej granda permesata valoro.\n"
 
-#: g10/keygen.c:628
+#: g10/keygen.c:629
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1355,11 +1355,11 @@
 "Þlosilgrandoj pli grandaj ol 2048 ne estas rekomendataj,\n"
 "æar la komputado daýras TRE longe!\n"
 
-#: g10/keygen.c:631
+#: g10/keygen.c:632
 msgid "Are you sure that you want this keysize? "
 msgstr "Æu vi estas certa, ke vi deziras æi tiun þlosilgrandon? "
 
-#: g10/keygen.c:632
+#: g10/keygen.c:633
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1367,21 +1367,21 @@
 "Bone, sed pripensu, ke la elradiado de viaj ekrano kaj klavaro estas tre "
 "facile kaptebla!\n"
 
-#: g10/keygen.c:640
+#: g10/keygen.c:641
 msgid "Do you really need such a large keysize? "
 msgstr "Æu vi vere bezonas tiom grandan þlosilgrandon? "
 
-#: g10/keygen.c:646
+#: g10/keygen.c:647
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Petita þlosilgrando estas %u bitoj\n"
 
-#: g10/keygen.c:649 g10/keygen.c:653
+#: g10/keygen.c:650 g10/keygen.c:654
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rondigita øis %u bitoj\n"
 
-#: g10/keygen.c:701
+#: g10/keygen.c:702
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1397,25 +1397,25 @@
 "      <n>m = þlosilo eksvalidiøos post n monatoj\n"
 "      <n>y = þlosilo eksvalidiøos post n jaroj\n"
 
-#: g10/keygen.c:716
+#: g10/keygen.c:717
 msgid "Key is valid for? (0) "
 msgstr "Þlosilo validu ...? (0) "
 
-#: g10/keygen.c:721
+#: g10/keygen.c:722
 msgid "invalid value\n"
 msgstr "nevalida valoro\n"
 
-#: g10/keygen.c:726
+#: g10/keygen.c:727
 msgid "Key does not expire at all\n"
 msgstr "Þlosilo neniam eksvalidiøos\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:732
+#: g10/keygen.c:733
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Þlosilo eksvalidiøos je %s\n"
 
-#: g10/keygen.c:735
+#: g10/keygen.c:736
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1423,11 +1423,11 @@
 "Via sistemo ne povas montri datojn post 2038.\n"
 "Tamen, øi estos øuste traktata øis 2106.\n"
 
-#: g10/keygen.c:740
+#: g10/keygen.c:741
 msgid "Is this correct (y/n)? "
 msgstr "Æu tio estas øusta (j/n)? "
 
-#: g10/keygen.c:783
+#: g10/keygen.c:784
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1442,44 +1442,44 @@
 "    \"Heinrich Heine (la poeto) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:795
+#: g10/keygen.c:796
 msgid "Real name: "
 msgstr "Vera nomo: "
 
-#: g10/keygen.c:803
+#: g10/keygen.c:804
 msgid "Invalid character in name\n"
 msgstr "Nevalida signo en nomo\n"
 
-#: g10/keygen.c:805
+#: g10/keygen.c:806
 msgid "Name may not start with a digit\n"
 msgstr "Nomo ne povas komenciøi per cifero\n"
 
-#: g10/keygen.c:807
+#: g10/keygen.c:808
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nomo devas havi almenaý 5 signojn\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:816
 msgid "Email address: "
 msgstr "Retadreso: "
 
-#: g10/keygen.c:826
+#: g10/keygen.c:827
 msgid "Not a valid email address\n"
 msgstr "Nevalida retadreso\n"
 
-#: g10/keygen.c:834
+#: g10/keygen.c:835
 msgid "Comment: "
 msgstr "Komento: "
 
-#: g10/keygen.c:840
+#: g10/keygen.c:841
 msgid "Invalid character in comment\n"
 msgstr "Nevalida signo en komento\n"
 
-#: g10/keygen.c:863
+#: g10/keygen.c:864
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vi uzas la signaron '%s'.\n"
 
-#: g10/keygen.c:869
+#: g10/keygen.c:870
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1490,27 +1490,27 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:873
+#: g10/keygen.c:874
 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"
 
-#: g10/keygen.c:878
+#: g10/keygen.c:879
 msgid "NnCcEeOoQq"
 msgstr "NnKkAaBbFf"
 
-#: g10/keygen.c:888
+#: g10/keygen.c:889
 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:889
+#: g10/keygen.c:890
 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:908
+#: g10/keygen.c:909
 msgid "Please correct the error first\n"
 msgstr "Bonvolu korekti la eraron unue\n"
 
-#: g10/keygen.c:946
+#: g10/keygen.c:947
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1518,11 +1518,11 @@
 "Vi bezonas pasfrazon por protekti vian sekretan þlosilon.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:954
+#: g10/keyedit.c:468 g10/keygen.c:955
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "la pasfrazo ne estis øuste ripetita; provu denove.\n"
 
-#: g10/keygen.c:960
+#: g10/keygen.c:961
 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"
@@ -1534,7 +1534,7 @@
 "uzante æi tiun programon kun la opcio \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:981
+#: g10/keygen.c:982
 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"
@@ -1546,29 +1546,29 @@
 "kreado de la primoj; tio donas al la stokastilo pli bonan þancon\n"
 "akiri sufiæe da entropio.\n"
 
-#: g10/keygen.c:1430
+#: g10/keygen.c:1431
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA-þlosilparo havos 1024 bitojn.\n"
 
-#: g10/keygen.c:1473
+#: g10/keygen.c:1474
 msgid "Key generation canceled.\n"
 msgstr "Kreado de þlosiloj nuligita.\n"
 
-#: g10/keygen.c:1570
+#: g10/keygen.c:1571
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skribas publikan þlosilon al '%s'\n"
 
-#: g10/keygen.c:1571
+#: g10/keygen.c:1572
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skribas sekretan þlosilon al '%s'\n"
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1668
 msgid "public and secret key created and signed.\n"
 msgstr "publika kaj sekreta þlosiloj kreitaj kaj subskribitaj.\n"
 
-#: g10/keygen.c:1672
+#: g10/keygen.c:1673
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1576,12 +1576,12 @@
 "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:1689 g10/keygen.c:1790
+#: g10/keygen.c:1690 g10/keygen.c:1791
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kreado de þlosiloj malsukcesis: %s\n"
 
-#: g10/keygen.c:1733 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1589,7 +1589,7 @@
 "þlosilo estis kreita %lu sekundon en la estonteco (tempotordo aý "
 "horloøeraro)\n"
 
-#: g10/keygen.c:1735 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1736 g10/sig-check.c:317 g10/sign.c:114
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1597,7 +1597,7 @@
 "þlosilo estis kreita %lu sekundojn en la estonteco (tempotordo aý "
 "horloøeraro)\n"
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1769
 msgid "Really create? "
 msgstr "Æu vere krei? "
 
@@ -2040,7 +2040,7 @@
 msgid "Really sign? "
 msgstr "Æu vere subskribi? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1870 g10/keyedit.c:1932 g10/sign.c:136
+#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
@@ -2298,200 +2298,200 @@
 msgid "enable a key"
 msgstr "þalti þlosilon"
 
-#: g10/delkey.c:110 g10/keyedit.c:630
+#: g10/delkey.c:110 g10/keyedit.c:631
 msgid "can't do that in batchmode\n"
 msgstr "ne povas fari tion en neinteraga reøimo\n"
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:668
+#: g10/keyedit.c:669
 msgid "Secret key is available.\n"
 msgstr "Sekreta þlosilo estas havebla.\n"
 
-#: g10/keyedit.c:697
+#: g10/keyedit.c:698
 msgid "Command> "
 msgstr "Komando> "
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Need the secret key to do this.\n"
 msgstr "Bezonas la sekretan þlosilon por fari tion.\n"
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:732
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Bonvolu uzi la komandon \"toggle\" unue.\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:779
 msgid "Really sign all user IDs? "
 msgstr "Æu vere subskribi æiujn uzantidentigilojn? "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:780
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
 
-#: g10/keyedit.c:811 g10/keyedit.c:993
+#: g10/keyedit.c:812 g10/keyedit.c:994
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "aktualigo de fido-datenaro malsukcesis: %s\n"
 
-#: g10/keyedit.c:822 g10/keyedit.c:843
+#: g10/keyedit.c:823 g10/keyedit.c:844
 msgid "You must select at least one user ID.\n"
 msgstr "Vi devas elekti almenaý unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:825
 msgid "You can't delete the last user ID!\n"
 msgstr "Vi ne povas forviþi la lastan uzantidentigilon!\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:828
 msgid "Really remove all selected user IDs? "
 msgstr "Æu vere forigi æiujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:829
 msgid "Really remove this user ID? "
 msgstr "Æu vere forigi æi tiun uzantidentigilon? "
 
-#: g10/keyedit.c:864 g10/keyedit.c:886
+#: g10/keyedit.c:865 g10/keyedit.c:887
 msgid "You must select at least one key.\n"
 msgstr "Vi devas elekti almenaý unu þlosilon.\n"
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:869
 msgid "Do you really want to delete the selected keys? "
 msgstr "Æu vi vere volas forviþi la elektitajn þlosilojn? "
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:870
 msgid "Do you really want to delete this key? "
 msgstr "Æu vi vere volas forviþi æi tiun þlosilon? "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:891
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Æu vi vere volas revoki la elektitajn þlosilojn? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:892
 msgid "Do you really want to revoke this key? "
 msgstr "Æu vi vere volas revoki æi tiun þlosilon? "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:958
 msgid "Save changes? "
 msgstr "Æu skribi þanøojn? "
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:961
 msgid "Quit without saving? "
 msgstr "Æu fini sen skribi þanøojn? "
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:972
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:979
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualigo de sekreto malsukcesis: %s\n"
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:986
 msgid "Key not changed so no update needed.\n"
 msgstr "Þlosilo ne þanøita, do aktualigo ne necesas.\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1001
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Nevalida komando (provu per \"helpo\")\n"
 
-#: g10/keyedit.c:1080 g10/keyedit.c:1106
+#: g10/keyedit.c:1081 g10/keyedit.c:1107
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  kreita: %s eksvalidiøos: %s"
 
-#: g10/keyedit.c:1089
+#: g10/keyedit.c:1090
 #, c-format
 msgid " trust: %c/%c"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:1093
+#: g10/keyedit.c:1094
 msgid "This key has been disabled"
 msgstr "Æi tiu þlosilo estas malþaltita"
 
-#: g10/keyedit.c:1122
+#: g10/keyedit.c:1123
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! subþlosilo estas revokita: %s\n"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1126
 msgid "rev- faked revocation found\n"
 msgstr "rev- falsita revoko trovita\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1128
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problemo en kontrolo de revoko: %s\n"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Æu forviþi æi tiun bonan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1370
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Æu forviþi æi tiun nevalidan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1374
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Æu forviþi æi tiun nekonatan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1380
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Æu vere forviþi æi tiun mem-subskribon? (j/N)"
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1394
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Forviþis %d subskribon.\n"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Forviþis %d subskribojn.\n"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1398
 msgid "Nothing deleted.\n"
 msgstr "Nenio estis forviþita.\n"
 
-#: g10/keyedit.c:1466
+#: g10/keyedit.c:1467
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bonvolu malelekti la sekretajn þlosilojn.\n"
 
-#: g10/keyedit.c:1472
+#: g10/keyedit.c:1473
 msgid "Please select at most one secondary key.\n"
 msgstr "Bonvolu elekti maksimume unu flankan þlosilon.\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1477
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Þanøas la daton de eksvalidiøo de flanka þlosilo.\n"
 
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1479
 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:1520
+#: g10/keyedit.c:1521
 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:1536
+#: g10/keyedit.c:1537
 msgid "No corresponding signature in secret ring\n"
 msgstr "Mankas responda subskribo en sekreta þlosilaro\n"
 
-#: g10/keyedit.c:1597
+#: g10/keyedit.c:1598
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:1643
+#: g10/keyedit.c:1644
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Mankas flanka þlosilo kun indekso %d\n"
 
-#: g10/keyedit.c:1741
+#: g10/keyedit.c:1742
 msgid "user ID: \""
 msgstr "uzantidentigilo: \""
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1745
 #, c-format
 msgid ""
 "\"\n"
@@ -2500,34 +2500,34 @@
 "\"\n"
 "subskribita per via þlosilo %08lX je %s\n"
 
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:1749
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "Æu krei revokatestilon por æi tiu subskribo? (j/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1773
 msgid "You have signed these user IDs:\n"
 msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
 
-#: g10/keyedit.c:1786 g10/keyedit.c:1821
+#: g10/keyedit.c:1787 g10/keyedit.c:1822
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   subskribita per %08lX je %s\n"
 
-#: g10/keyedit.c:1791
+#: g10/keyedit.c:1792
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revokita de %08lX je %s\n"
 
-#: g10/keyedit.c:1811
+#: g10/keyedit.c:1812
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vi revokos la sekvajn subskribojn:\n"
 
-#: g10/keyedit.c:1829
+#: g10/keyedit.c:1830
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Æu vere krei la revokatestilojn? (j/N)"
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1859
 msgid "no secret key\n"
 msgstr "mankas sekreta þlosilo\n"
 
@@ -2542,136 +2542,136 @@
 msgstr "rev"
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:760
+#: g10/keylist.c:400 g10/mainproc.c:790
 #, c-format
 msgid " [expires: %s]"
 msgstr " [eksvalidiøos: %s]"
 
-#: g10/mainproc.c:213
+#: g10/mainproc.c:240
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "publika þlosilo estas %08lX\n"
 
-#: g10/mainproc.c:257
+#: g10/mainproc.c:284
 msgid "public key encrypted data: good DEK\n"
 msgstr "publikþlosile æifritaj datenoj: bona DEK\n"
 
-#: g10/mainproc.c:299
+#: g10/mainproc.c:326
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "æifrita per %u-bita %s-þlosilo, %08lX, kreita je %s\n"
 
-#: g10/mainproc.c:309
+#: g10/mainproc.c:336
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "æifrita per %s-þlosilo, %08lX\n"
 
-#: g10/mainproc.c:315
+#: g10/mainproc.c:342
 msgid "no secret key for decryption available\n"
 msgstr "mankas sekreta þlosilo por malæifrado\n"
 
-#: g10/mainproc.c:324
+#: g10/mainproc.c:351
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "publikþlosila malæifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:361
+#: g10/mainproc.c:388
 msgid "decryption okay\n"
 msgstr "malæifrado sukcesis\n"
 
-#: g10/mainproc.c:366
+#: g10/mainproc.c:393
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTO: æifrita mesaøo estis manipulita!\n"
 
-#: g10/mainproc.c:371
+#: g10/mainproc.c:398
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "malæifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:390
+#: g10/mainproc.c:417
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTO: sendinto petis konfidencon (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:392
+#: g10/mainproc.c:419
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "originala dosiernomo='%.*s'\n"
 
-#: g10/mainproc.c:544
+#: g10/mainproc.c:574
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "memstara revoko - uzu \"gpg --import\" por apliki øin\n"
 
-#: g10/mainproc.c:631 g10/mainproc.c:640
+#: g10/mainproc.c:661 g10/mainproc.c:670
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVERTO: nevalida notacia dateno trovita\n"
 
-#: g10/mainproc.c:643
+#: g10/mainproc.c:673
 msgid "Notation: "
 msgstr "Notacio: "
 
-#: g10/mainproc.c:650
+#: g10/mainproc.c:680
 msgid "Policy: "
 msgstr "Gvidlinio: "
 
-#: g10/mainproc.c:1080
+#: g10/mainproc.c:1121
 msgid "signature verification suppressed\n"
 msgstr "kontrolo de subskribo estas malþaltita\n"
 
-#: g10/mainproc.c:1086
+#: g10/mainproc.c:1158
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Subskribo farita je %.*s per %s, þlosilo %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1112 g10/mainproc.c:1123
+#: g10/mainproc.c:1184 g10/mainproc.c:1195
 msgid "BAD signature from \""
 msgstr "MALBONA subskribo de \""
 
-#: g10/mainproc.c:1113 g10/mainproc.c:1124
+#: g10/mainproc.c:1185 g10/mainproc.c:1196
 msgid "Good signature from \""
 msgstr "Bona subskribo de \""
 
-#: g10/mainproc.c:1115
+#: g10/mainproc.c:1187
 msgid "                aka \""
 msgstr "            alinome \""
 
-#: g10/mainproc.c:1171
+#: g10/mainproc.c:1243
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Ne povas kontroli subskribon: %s\n"
 
-#: g10/mainproc.c:1235
+#: g10/mainproc.c:1318
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "memstara subskribo de klaso 0x%02x\n"
 
-#: g10/mainproc.c:1281
+#: g10/mainproc.c:1369
 msgid "old style (PGP 2.x) signature\n"
 msgstr "malnovstila subskribo (PGP 2.x)\n"
 
-#: g10/mainproc.c:1286
+#: g10/mainproc.c:1374
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nevalida radikpaketo trovita en proc_tree()\n"
 
-#: g10/misc.c:96
+#: g10/misc.c:97
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "ne povas malþalti kreadon de core-dosieroj: %s\n"
 
-#: g10/misc.c:206
+#: g10/misc.c:207
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Eksperimentaj metodoj ne estu uzataj!\n"
 
-#: g10/misc.c:233
+#: g10/misc.c:234
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr "æi tiu æifrad-metodo estas malrekomendata; bonvolu uzi pli normalan!\n"
 
-#: g10/parse-packet.c:117
+#: g10/parse-packet.c:119
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "ne povas trakti publikþlosilan metodon %d\n"
 
-#: g10/parse-packet.c:986
+#: g10/parse-packet.c:991
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaketo de speco %d havas þaltitan \"critical bit\"\n"
diff -urN gnupg-1.0.3/po/es_ES.po gnupg-1.0.4/po/es_ES.po
--- gnupg-1.0.3/po/es_ES.po	Mon Sep 18 12:18:03 2000
+++ gnupg-1.0.4/po/es_ES.po	Tue Oct 17 15:40:36 2000
@@ -7,7 +7,7 @@
 # GPG version: 1.0.0
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-09-18 12:17+0200\n"
+"POT-Creation-Date: 2000-10-16 19:22+0200\n"
 "PO-Revision-Date: 1999-10-27 06:35+0200\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Date: 1998-11-13 10:49:25+0100\n"
@@ -26,11 +26,11 @@
 msgid "Warning: using insecure memory!\n"
 msgstr "ATENCIÓN: ¡se está usando memoria insegura!\n"
 
-#: util/secmem.c:289
+#: util/secmem.c:295
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operación imposible sin memoria segura inicializada\n"
 
-#: util/secmem.c:290
+#: util/secmem.c:296
 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"
 
@@ -265,7 +265,7 @@
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Ha encontrado Vd. un bug... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1255
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no puede abrirse `%s': %s\n"
@@ -876,12 +876,12 @@
 msgid "can't open `%s'\n"
 msgstr "no puede abrirse `%s'\n"
 
-#: g10/g10.c:1700
+#: g10/g10.c:1737
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "El primer caracter de una notación debe ser una letra o un subrayado\n"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1743
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -889,11 +889,11 @@
 "un nombre de notación debe tener sólo letras, dígitos, puntos o subrayados, "
 "y acabar con un '='\n"
 
-#: g10/g10.c:1712
+#: g10/g10.c:1749
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "los puntos en una notación deben estar rodeados por otros caracteres\n"
 
-#: g10/g10.c:1720
+#: g10/g10.c:1757
 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"
 
@@ -956,20 +956,20 @@
 msgid "error in trailer line\n"
 msgstr "error en la línea de cierre\n"
 
-#: g10/armor.c:912
+#: g10/armor.c:906
 msgid "For info see http://www.gnupg.org"
 msgstr ""
 
-#: g10/armor.c:1033
+#: g10/armor.c:1027
 msgid "no valid OpenPGP data found.\n"
 msgstr "no se han encontrados datos OpenPGP válidos\n"
 
-#: g10/armor.c:1038
+#: g10/armor.c:1032
 #, 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:1042
+#: g10/armor.c:1036
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -978,7 +978,7 @@
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1188 g10/pkclist.c:53
+#: g10/keyedit.c:1189 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "         Huella dactilar:"
 
@@ -1267,66 +1267,66 @@
 msgid "no valid addressees\n"
 msgstr "no hay direcciones válidas\n"
 
-#: g10/keygen.c:175
+#: g10/keygen.c:176
 msgid "writing self signature\n"
 msgstr "escribiendo autofirma\n"
 
-#: g10/keygen.c:213
+#: g10/keygen.c:214
 msgid "writing key binding signature\n"
 msgstr "escribiendo la firma de comprobación de clave\n"
 
-#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:435
+#: g10/keygen.c:262 g10/keygen.c:346 g10/keygen.c:436
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "El tamaño requerido es de %u bits\n"
 
-#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:440
+#: g10/keygen.c:267 g10/keygen.c:351 g10/keygen.c:441
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "redondeados a %u bits\n"
 
-#: g10/keygen.c:539
+#: g10/keygen.c:540
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor seleccione tipo de clave deseado:\n"
 
-#: g10/keygen.c:541
+#: g10/keygen.c:542
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA y ElGamal (por defecto)\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:543
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (sólo firma)\n"
 
-#: g10/keygen.c:544
+#: g10/keygen.c:545
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (sólo cifrado)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:546
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (firma y cifrado)\n"
 
-#: g10/keygen.c:547
+#: g10/keygen.c:548
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (firma y cifrado)\n"
 
-#: g10/keygen.c:551
+#: g10/keygen.c:552
 msgid "Your selection? "
 msgstr "Su elección: "
 
-#: g10/keygen.c:562 g10/keygen.c:570
+#: g10/keygen.c:563 g10/keygen.c:571
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "¿De verdad quiere crear una clave de firma y cifrado? "
 
-#: g10/keygen.c:584
+#: g10/keygen.c:585
 msgid "Invalid selection.\n"
 msgstr "Elección no válida.\n"
 
-#: g10/keygen.c:596
+#: g10/keygen.c:597
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1339,19 +1339,19 @@
 "        el tamaño por defecto es 1024 bits\n"
 " el tamaño máximo recomendado es 2048 bits\n"
 
-#: g10/keygen.c:603
+#: g10/keygen.c:604
 msgid "What keysize do you want? (1024) "
 msgstr "¿De qué tamaño quiere la clave (1024)? "
 
-#: g10/keygen.c:608
+#: g10/keygen.c:609
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA sólo permite tamaños desde 512 a 1024\n"
 
-#: g10/keygen.c:610
+#: g10/keygen.c:611
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "tamaño insuficiente; 768 es el valor mínimo permitido\n"
 
-#: g10/keygen.c:612
+#: g10/keygen.c:613
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "tamaño insuficiente; 768 es el valor mínimo permitido\n"
@@ -1364,12 +1364,12 @@
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:623
+#: g10/keygen.c:624
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "tamaño excesivo; %d es el máximo valor permitido.\n"
 
-#: g10/keygen.c:628
+#: g10/keygen.c:629
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1377,11 +1377,11 @@
 "No se recomiendan claves de más de 2048 bits porque\n"
 "el tiempo de computación es REALMENTE largo.\n"
 
-#: g10/keygen.c:631
+#: g10/keygen.c:632
 msgid "Are you sure that you want this keysize? "
 msgstr "¿Seguro que quiere una clave de este tamaño? "
 
-#: g10/keygen.c:632
+#: g10/keygen.c:633
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1390,21 +1390,21 @@
 "teclado\n"
 "también son vulnerables a un ataque!\n"
 
-#: g10/keygen.c:640
+#: g10/keygen.c:641
 msgid "Do you really need such a large keysize? "
 msgstr "¿De verdad necesita una clave tan grande? "
 
-#: g10/keygen.c:646
+#: g10/keygen.c:647
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "El tamaño requerido es de %u bits\n"
 
-#: g10/keygen.c:649 g10/keygen.c:653
+#: g10/keygen.c:650 g10/keygen.c:654
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeados a %u bits\n"
 
-#: g10/keygen.c:701
+#: g10/keygen.c:702
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1420,35 +1420,35 @@
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n años\n"
 
-#: g10/keygen.c:716
+#: g10/keygen.c:717
 msgid "Key is valid for? (0) "
 msgstr "¿Validez de la clave (0)? "
 
-#: g10/keygen.c:721
+#: g10/keygen.c:722
 msgid "invalid value\n"
 msgstr "valor no válido\n"
 
-#: g10/keygen.c:726
+#: g10/keygen.c:727
 msgid "Key does not expire at all\n"
 msgstr "La clave nunca caduca\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:732
+#: g10/keygen.c:733
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La clave caduca el %s\n"
 
-#: g10/keygen.c:735
+#: g10/keygen.c:736
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:740
+#: g10/keygen.c:741
 msgid "Is this correct (y/n)? "
 msgstr "¿Es correcto (s/n)? "
 
-#: g10/keygen.c:783
+#: g10/keygen.c:784
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1466,44 +1466,44 @@
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:795
+#: g10/keygen.c:796
 msgid "Real name: "
 msgstr "Nombre y apellidos: "
 
-#: g10/keygen.c:803
+#: g10/keygen.c:804
 msgid "Invalid character in name\n"
 msgstr "Caracter no válido en el nombre\n"
 
-#: g10/keygen.c:805
+#: g10/keygen.c:806
 msgid "Name may not start with a digit\n"
 msgstr "El nombre no puede empezar con un número\n"
 
-#: g10/keygen.c:807
+#: g10/keygen.c:808
 msgid "Name must be at least 5 characters long\n"
 msgstr "El nombre debe tener al menos 5 caracteres\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:816
 msgid "Email address: "
 msgstr "Dirección de correo electrónico: "
 
-#: g10/keygen.c:826
+#: g10/keygen.c:827
 msgid "Not a valid email address\n"
 msgstr "Dirección no válida\n"
 
-#: g10/keygen.c:834
+#: g10/keygen.c:835
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:840
+#: g10/keygen.c:841
 msgid "Invalid character in comment\n"
 msgstr "Caracter no válido en el comentario\n"
 
-#: g10/keygen.c:863
+#: g10/keygen.c:864
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Está usando el juego de caracteres `%s'.\n"
 
-#: g10/keygen.c:869
+#: g10/keygen.c:870
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1514,28 +1514,28 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:873
+#: g10/keygen.c:874
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:878
+#: g10/keygen.c:879
 msgid "NnCcEeOoQq"
 msgstr "NnCcDdVvSs"
 
-#: g10/keygen.c:888
+#: g10/keygen.c:889
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "¿Cambia (N)ombre, (C)omentario, (D)irección o (V)ale/(S)alir? "
 
-#: g10/keygen.c:889
+#: g10/keygen.c:890
 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:908
+#: g10/keygen.c:909
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:946
+#: g10/keygen.c:947
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1543,11 +1543,11 @@
 "Necesita una contraseña para proteger su clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:954
+#: g10/keyedit.c:468 g10/keygen.c:955
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "contraseña repetida incorrecta, inténtelo de nuevo.\n"
 
-#: g10/keygen.c:960
+#: g10/keygen.c:961
 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"
@@ -1559,7 +1559,7 @@
 "la opción \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:981
+#: g10/keygen.c:982
 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"
@@ -1572,29 +1572,29 @@
 "generador de números aleatorios mayor oportunidad de recoger suficiente\n"
 "entropía.\n"
 
-#: g10/keygen.c:1430
+#: g10/keygen.c:1431
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "El par de claves DSA tendrá 1024 bits.\n"
 
-#: g10/keygen.c:1473
+#: g10/keygen.c:1474
 msgid "Key generation canceled.\n"
 msgstr "Creación de claves cancelada.\n"
 
-#: g10/keygen.c:1570
+#: g10/keygen.c:1571
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escribiendo certificado público en `%s'\n"
 
-#: g10/keygen.c:1571
+#: g10/keygen.c:1572
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escribiendo certificado privado en `%s'\n"
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1668
 msgid "public and secret key created and signed.\n"
 msgstr "Claves pública y secreta creadas y firmadas.\n"
 
-#: g10/keygen.c:1672
+#: g10/keygen.c:1673
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1603,12 +1603,12 @@
 "el comando \"--edit-key\" para crear una clave secundaria con este "
 "propósito.\n"
 
-#: g10/keygen.c:1689 g10/keygen.c:1790
+#: g10/keygen.c:1690 g10/keygen.c:1791
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Creación de la clave fallida: %s\n"
 
-#: g10/keygen.c:1733 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1616,7 +1616,7 @@
 "clave pública creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:1735 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1736 g10/sig-check.c:317 g10/sign.c:114
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1624,7 +1624,7 @@
 "clave pública creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1769
 msgid "Really create? "
 msgstr "¿Crear de verdad? "
 
@@ -2070,7 +2070,7 @@
 msgid "Really sign? "
 msgstr "¿Firmar de verdad? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1870 g10/keyedit.c:1932 g10/sign.c:136
+#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallida: %s\n"
@@ -2329,201 +2329,201 @@
 msgid "enable a key"
 msgstr "habilita una clave"
 
-#: g10/delkey.c:110 g10/keyedit.c:630
+#: g10/delkey.c:110 g10/keyedit.c:631
 msgid "can't do that in batchmode\n"
 msgstr "imposible hacer esto en modo de proceso por lotes\n"
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:668
+#: g10/keyedit.c:669
 msgid "Secret key is available.\n"
 msgstr "Clave secreta disponible.\n"
 
-#: g10/keyedit.c:697
+#: g10/keyedit.c:698
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Need the secret key to do this.\n"
 msgstr "Se necesita la clave secreta para hacer esto.\n"
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:732
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:779
 msgid "Really sign all user IDs? "
 msgstr "¿Firmar realmente todos los identificativos de usuario? "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:780
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugerencia: seleccione los identificativos de usuario a firmar\n"
 
-#: g10/keyedit.c:811 g10/keyedit.c:993
+#: g10/keyedit.c:812 g10/keyedit.c:994
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "actualización de confianza fallida: %s\n"
 
-#: g10/keyedit.c:822 g10/keyedit.c:843
+#: g10/keyedit.c:823 g10/keyedit.c:844
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar por lo menos un identificativo de usuario.\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:825
 msgid "You can't delete the last user ID!\n"
 msgstr "¡No puede borrar el último identificativo de usuario!\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:828
 msgid "Really remove all selected user IDs? "
 msgstr "¿Borrar realmente todos los identificativos seleccionados? "
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:829
 msgid "Really remove this user ID? "
 msgstr "¿Borrar realmente este identificativo? "
 
-#: g10/keyedit.c:864 g10/keyedit.c:886
+#: g10/keyedit.c:865 g10/keyedit.c:887
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar por lo menos una clave.\n"
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:869
 msgid "Do you really want to delete the selected keys? "
 msgstr "¿Borrar realmente las claves seleccionadas? "
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:870
 msgid "Do you really want to delete this key? "
 msgstr "¿Borrar realmente esta clave? "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:891
 msgid "Do you really want to revoke the selected keys? "
 msgstr "¿Revocar realmente las claves seleccionadas? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:892
 msgid "Do you really want to revoke this key? "
 msgstr "¿Revocar realmente esta clave? "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:958
 msgid "Save changes? "
 msgstr "¿Grabar cambios? "
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:961
 msgid "Quit without saving? "
 msgstr "¿Salir sin grabar? "
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:972
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualización fallida: %s\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:979
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualización de la clave secreta fallida: %s\n"
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:986
 msgid "Key not changed so no update needed.\n"
 msgstr "Clave sin cambios, no se necesita actualización.\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1001
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando no válido (pruebe \"help\")\n"
 
-#: g10/keyedit.c:1080 g10/keyedit.c:1106
+#: g10/keyedit.c:1081 g10/keyedit.c:1107
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1089
+#: g10/keyedit.c:1090
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1093
+#: g10/keyedit.c:1094
 msgid "This key has been disabled"
 msgstr "Esta clave está deshabilitada"
 
-#: g10/keyedit.c:1122
+#: g10/keyedit.c:1123
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "clave %08lX: ¡esta subclave ha sido revocada!\n"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1126
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "        nuevas revocaciones: %lu\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1128
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "Delete this good signature? (y/N/q)"
 msgstr "¿Borrar esta firma correcta? (s/N/q)"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1370
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "¿Borrar esta firma no válida? (s/N/q)"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1374
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "¿Borrar esta firma desconocida? (s/N/q)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1380
 msgid "Really delete this self-signature? (y/N)"
 msgstr "¿Borrar realmente esta autofirma? (s/N)"
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1394
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d firmas borradas.\n"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d firmas borradas\n"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1398
 msgid "Nothing deleted.\n"
 msgstr "No se borró nada\n"
 
-#: g10/keyedit.c:1466
+#: g10/keyedit.c:1467
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite la selección de las claves secretas.\n"
 
-#: g10/keyedit.c:1472
+#: g10/keyedit.c:1473
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor, seleccione como máximo una clave secundaria.\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1477
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Cambiando caducidad de clave secundaria.\n"
 
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1479
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando caducidad de clave primaria.\n"
 
-#: g10/keyedit.c:1520
+#: g10/keyedit.c:1521
 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:1536
+#: g10/keyedit.c:1537
 msgid "No corresponding signature in secret ring\n"
 msgstr "No hay firma correspondiente en anillo secreto\n"
 
-#: g10/keyedit.c:1597
+#: g10/keyedit.c:1598
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No hay ningún identificativo de usuario con el índice %d\n"
 
-#: g10/keyedit.c:1643
+#: g10/keyedit.c:1644
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "No hay ninguna clave secundaria con el índice %d\n"
 
-#: g10/keyedit.c:1741
+#: g10/keyedit.c:1742
 msgid "user ID: \""
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1745
 #, c-format
 msgid ""
 "\"\n"
@@ -2532,34 +2532,34 @@
 "\"\n"
 "firmada con su clave %08lX el %s\n"
 
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:1749
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "¿Crear un certificado de revocación para esta clave (s/N)?"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1773
 msgid "You have signed these user IDs:\n"
 msgstr "Ha firmado los siguientes IDs de usuario:\n"
 
-#: g10/keyedit.c:1786 g10/keyedit.c:1821
+#: g10/keyedit.c:1787 g10/keyedit.c:1822
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   firmada por %08lX el %s\n"
 
-#: g10/keyedit.c:1791
+#: g10/keyedit.c:1792
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revocada por %08lX el %s\n"
 
-#: g10/keyedit.c:1811
+#: g10/keyedit.c:1812
 msgid "You are about to revoke these signatures:\n"
 msgstr "Va Vd. a revocar las siguientes firmas:\n"
 
-#: g10/keyedit.c:1829
+#: g10/keyedit.c:1830
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "¿Crear los certificados de revocación realmente? (s/N)"
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1859
 msgid "no secret key\n"
 msgstr "no hay clave secreta\n"
 
@@ -2573,138 +2573,138 @@
 msgstr ""
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:760
+#: g10/keylist.c:400 g10/mainproc.c:790
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "La clave caduca el %s\n"
 
-#: g10/mainproc.c:213
+#: g10/mainproc.c:240
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "la clave pública es %08lX\n"
 
-#: g10/mainproc.c:257
+#: g10/mainproc.c:284
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados de la clave pública: DEK bueno\n"
 
-#: g10/mainproc.c:299
+#: g10/mainproc.c:326
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "cifrado con clave %2$s de %1$u bits, ID %3$08lX, creada el %4$s\n"
 
-#: g10/mainproc.c:309
+#: g10/mainproc.c:336
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "cifrado con clave %s, ID %08lX\n"
 
-#: g10/mainproc.c:315
+#: g10/mainproc.c:342
 msgid "no secret key for decryption available\n"
 msgstr "clave secreta para descifrado no disponible\n"
 
-#: g10/mainproc.c:324
+#: g10/mainproc.c:351
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descifrado de la clave pública fallido: %s\n"
 
-#: g10/mainproc.c:361
+#: g10/mainproc.c:388
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:366
+#: g10/mainproc.c:393
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATENCIÓN: ¡el mensaje cifrado ha sido manipulado!\n"
 
-#: g10/mainproc.c:371
+#: g10/mainproc.c:398
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descifrado fallido: %s\n"
 
-#: g10/mainproc.c:390
+#: g10/mainproc.c:417
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: el remitente solicitó \"sólo-para-tus-ojos\"\n"
 
-#: g10/mainproc.c:392
+#: g10/mainproc.c:419
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nombre fichero original='%.*s'\n"
 
-#: g10/mainproc.c:544
+#: g10/mainproc.c:574
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:631 g10/mainproc.c:640
+#: g10/mainproc.c:661 g10/mainproc.c:670
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATENCIÓN: encontrados datos de notación no válidos\n"
 
-#: g10/mainproc.c:643
+#: g10/mainproc.c:673
 msgid "Notation: "
 msgstr "Notación: "
 
-#: g10/mainproc.c:650
+#: g10/mainproc.c:680
 msgid "Policy: "
 msgstr "Política: "
 
-#: g10/mainproc.c:1080
+#: g10/mainproc.c:1121
 msgid "signature verification suppressed\n"
 msgstr "suprimida la verificación de la firma\n"
 
-#: g10/mainproc.c:1086
+#: g10/mainproc.c:1158
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Firma creada el %.*s usando clave %s ID %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1112 g10/mainproc.c:1123
+#: g10/mainproc.c:1184 g10/mainproc.c:1195
 msgid "BAD signature from \""
 msgstr "Firma INCORRECTA de \""
 
-#: g10/mainproc.c:1113 g10/mainproc.c:1124
+#: g10/mainproc.c:1185 g10/mainproc.c:1196
 msgid "Good signature from \""
 msgstr "Firma correcta de \""
 
-#: g10/mainproc.c:1115
+#: g10/mainproc.c:1187
 msgid "                aka \""
 msgstr "también conocido como \""
 
-#: g10/mainproc.c:1171
+#: g10/mainproc.c:1243
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposible comprobar la firma: %s\n"
 
-#: g10/mainproc.c:1235
+#: g10/mainproc.c:1318
 #, fuzzy, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "Clase de firma desconocida"
 
-#: g10/mainproc.c:1281
+#: g10/mainproc.c:1369
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma viejo estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:1286
+#: g10/mainproc.c:1374
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete raíz no válido detectado en proc_tree()\n"
 
-#: g10/misc.c:96
+#: g10/misc.c:97
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "no se pueden desactivar los core dumps: %s\n"
 
-#: g10/misc.c:206
+#: g10/misc.c:207
 msgid "Experimental algorithms should not be used!\n"
 msgstr "¡No se deberían usar algoritmos experimentales!\n"
 
-#: g10/misc.c:233
+#: g10/misc.c:234
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 "este algoritmo de cifrado está en desuso, considere el uso de uno más "
 "estándar.\n"
 
-#: g10/parse-packet.c:117
+#: g10/parse-packet.c:119
 #, 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:986
+#: g10/parse-packet.c:991
 #, 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"
diff -urN gnupg-1.0.3/po/fr.po gnupg-1.0.4/po/fr.po
--- gnupg-1.0.3/po/fr.po	Mon Sep 18 12:18:03 2000
+++ gnupg-1.0.4/po/fr.po	Tue Oct 17 15:40:37 2000
@@ -5,12 +5,12 @@
 # Thanks to Rémi Guyomarch <rguyom@mail.dotcom.fr> and <nmorant@amadeus.net>
 # for pointing me out some errors.
 #
-# $Id: fr.po,v 1.47.2.23 2000/09/15 16:39:44 wkoch Exp $
+# $Id: fr.po,v 1.47.2.26 2000/10/17 13:29:48 wkoch Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.1h\n"
-"POT-Creation-Date: 2000-09-18 12:17+0200\n"
+"POT-Creation-Date: 2000-10-16 19:22+0200\n"
 "PO-Revision-Date: 2000-06-28 18:41+02:00\n"
 "Last-Translator: Gaël Quéri <gqueri@mail.dotcom.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -22,13 +22,13 @@
 msgid "Warning: using insecure memory!\n"
 msgstr "Avertissement: l'utilisation de la mémoire n'est pas sûre !\n"
 
-#: util/secmem.c:289
+#: util/secmem.c:295
 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:290
+#: util/secmem.c:296
 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"
 
@@ -262,7 +262,7 @@
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "vous avez trouvé un bug... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1255
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossible d'ouvrir `%s': %s\n"
@@ -873,14 +873,14 @@
 msgid "can't open `%s'\n"
 msgstr "impossible d'ouvrir `%s'\n"
 
-#: g10/g10.c:1700
+#: g10/g10.c:1737
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "le premier caractère du nom d'une notation doit être un lettre ou un trait\n"
 "de soulignement\n"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1743
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -889,13 +889,13 @@
 "des points ou des traits de soulignement et doit se terminer par un signe "
 "égal\n"
 
-#: g10/g10.c:1712
+#: g10/g10.c:1749
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 "les points dans le nom d'une notation doivent être entourés d'autes "
 "caractères\n"
 
-#: g10/g10.c:1720
+#: g10/g10.c:1757
 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"
 
@@ -958,20 +958,20 @@
 msgid "error in trailer line\n"
 msgstr "erreur dans la ligne de remorque\n"
 
-#: g10/armor.c:912
+#: g10/armor.c:906
 msgid "For info see http://www.gnupg.org"
 msgstr "Pour information voir http://www.gnupg.org"
 
-#: g10/armor.c:1033
+#: g10/armor.c:1027
 msgid "no valid OpenPGP data found.\n"
 msgstr "aucune donnée OpenPGP valide n'a été trouvée.\n"
 
-#: g10/armor.c:1038
+#: g10/armor.c:1032
 #, 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:1042
+#: g10/armor.c:1036
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -980,7 +980,7 @@
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1188 g10/pkclist.c:53
+#: g10/keyedit.c:1189 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "               Empreinte:"
 
@@ -1270,67 +1270,67 @@
 msgstr "pas de destinataire valide\n"
 
 # g10/keygen.c:123 ???
-#: g10/keygen.c:175
+#: g10/keygen.c:176
 msgid "writing self signature\n"
 msgstr "écriture de l'auto-signature\n"
 
 # g10/keygen.c:161 ???
-#: g10/keygen.c:213
+#: g10/keygen.c:214
 msgid "writing key binding signature\n"
 msgstr "écriture de la signature de liaison\n"
 
-#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:435
+#: g10/keygen.c:262 g10/keygen.c:346 g10/keygen.c:436
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Taille invalide; utilisation de %u bits\n"
 
-#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:440
+#: g10/keygen.c:267 g10/keygen.c:351 g10/keygen.c:441
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "taille arrondie à %u bits\n"
 
-#: g10/keygen.c:539
+#: g10/keygen.c:540
 msgid "Please select what kind of key you want:\n"
 msgstr "Sélectionnez le type de clé désiré:\n"
 
-#: g10/keygen.c:541
+#: g10/keygen.c:542
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA et ElGamal (par défaut)\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:543
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (signature seule)\n"
 
-#: g10/keygen.c:544
+#: g10/keygen.c:545
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (chiffrement seul)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:546
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signature et chiffrement)\n"
 
-#: g10/keygen.c:547
+#: g10/keygen.c:548
 #, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (signature et chiffrement)\n"
 
-#: g10/keygen.c:551
+#: g10/keygen.c:552
 msgid "Your selection? "
 msgstr "Votre choix ? "
 
-#: g10/keygen.c:562 g10/keygen.c:570
+#: g10/keygen.c:563 g10/keygen.c:571
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "Voulez-vous vraiment créer une clé de signature et de chiffrement ? "
 
-#: g10/keygen.c:584
+#: g10/keygen.c:585
 msgid "Invalid selection.\n"
 msgstr "Choix invalide.\n"
 
-#: g10/keygen.c:596
+#: g10/keygen.c:597
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1343,19 +1343,19 @@
 "          la taille par défaut est 1024 bits\n"
 " la taille maximale conseillée est 2048 bits\n"
 
-#: g10/keygen.c:603
+#: g10/keygen.c:604
 msgid "What keysize do you want? (1024) "
 msgstr "Quelle taille de clé désirez-vous ? (1024) "
 
-#: g10/keygen.c:608
+#: g10/keygen.c:609
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA permet seulement des tailles comprises entre 512 et 1024\n"
 
-#: g10/keygen.c:610
+#: g10/keygen.c:611
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "taille trop petite; 768 est la plus petite valeur permise.\n"
 
-#: g10/keygen.c:612
+#: g10/keygen.c:613
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "taille trop petite; 1024 est la plus petite valeur permise pour RSA.\n"
 
@@ -1367,12 +1367,12 @@
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:623
+#: g10/keygen.c:624
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "taille trop importante; %d est la plus grande valeur permise.\n"
 
-#: g10/keygen.c:628
+#: g10/keygen.c:629
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1380,11 +1380,11 @@
 "Les tailles supérieures à 2048 ne sont pas conseillées car\n"
 "les calculs prennent VRAIMENT beaucoup de temps !\n"
 
-#: g10/keygen.c:631
+#: g10/keygen.c:632
 msgid "Are you sure that you want this keysize? "
 msgstr "Etes-vous sûr de vouloir cette taille ? "
 
-#: g10/keygen.c:632
+#: g10/keygen.c:633
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1392,21 +1392,21 @@
 "D'accord, mais n'oubliez pas que les radiations de votre écran et de votre\n"
 "clavier sont aussi très vulnérables aux attaques !\n"
 
-#: g10/keygen.c:640
+#: g10/keygen.c:641
 msgid "Do you really need such a large keysize? "
 msgstr "Avez-vous réellement besoin d'une taille aussi grande ? "
 
-#: g10/keygen.c:646
+#: g10/keygen.c:647
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La taille demandée est %u bits\n"
 
-#: g10/keygen.c:649 g10/keygen.c:653
+#: g10/keygen.c:650 g10/keygen.c:654
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrondie à %u bits\n"
 
-#: g10/keygen.c:701
+#: g10/keygen.c:702
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1422,25 +1422,25 @@
 "      <n>m = la clé expire dans n mois\n"
 "      <n>y = la clé expire dans n ans\n"
 
-#: g10/keygen.c:716
+#: g10/keygen.c:717
 msgid "Key is valid for? (0) "
 msgstr "La clé est valide pour ? (0) "
 
-#: g10/keygen.c:721
+#: g10/keygen.c:722
 msgid "invalid value\n"
 msgstr "valeur invalide\n"
 
-#: g10/keygen.c:726
+#: g10/keygen.c:727
 msgid "Key does not expire at all\n"
 msgstr "La clé n'expire pas du tout\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:732
+#: g10/keygen.c:733
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La clé expire le %s\n"
 
-#: g10/keygen.c:735
+#: g10/keygen.c:736
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1448,11 +1448,11 @@
 "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:740
+#: g10/keygen.c:741
 msgid "Is this correct (y/n)? "
 msgstr "Est-ce correct (o/n) ? "
 
-#: g10/keygen.c:783
+#: g10/keygen.c:784
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1468,44 +1468,44 @@
 "   « Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de> »\n"
 "\n"
 
-#: g10/keygen.c:795
+#: g10/keygen.c:796
 msgid "Real name: "
 msgstr "Nom réel: "
 
-#: g10/keygen.c:803
+#: g10/keygen.c:804
 msgid "Invalid character in name\n"
 msgstr "Caractère invalide dans le nom\n"
 
-#: g10/keygen.c:805
+#: g10/keygen.c:806
 msgid "Name may not start with a digit\n"
 msgstr "Le nom ne doit pas commencer par un chiffre\n"
 
-#: g10/keygen.c:807
+#: g10/keygen.c:808
 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:815
+#: g10/keygen.c:816
 msgid "Email address: "
 msgstr "Adresse e-mail: "
 
-#: g10/keygen.c:826
+#: g10/keygen.c:827
 msgid "Not a valid email address\n"
 msgstr "Ce n'est pas une adresse e-mail valide\n"
 
-#: g10/keygen.c:834
+#: g10/keygen.c:835
 msgid "Comment: "
 msgstr "Commentaire: "
 
-#: g10/keygen.c:840
+#: g10/keygen.c:841
 msgid "Invalid character in comment\n"
 msgstr "Caractère invalide dans le commentaire\n"
 
-#: g10/keygen.c:863
+#: g10/keygen.c:864
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vous utilisez le jeu de caractères '%s'.\n"
 
-#: g10/keygen.c:869
+#: g10/keygen.c:870
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1516,28 +1516,28 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:873
+#: g10/keygen.c:874
 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"
 
-#: g10/keygen.c:878
+#: g10/keygen.c:879
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:888
+#: g10/keygen.c:889
 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:889
+#: g10/keygen.c:890
 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:908
+#: g10/keygen.c:909
 msgid "Please correct the error first\n"
 msgstr "Corrigez l'erreur d'abord\n"
 
-#: g10/keygen.c:946
+#: g10/keygen.c:947
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1545,11 +1545,11 @@
 "Vous avez besoin d'un mot de passe pour protéger votre clé secrète.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:954
+#: g10/keyedit.c:468 g10/keygen.c:955
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "le mot de passe n'a pas été répété à l'identique; recommencez.\n"
 
-#: g10/keygen.c:960
+#: g10/keygen.c:961
 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"
@@ -1561,7 +1561,7 @@
 "le désirez, en utilisant ce programme avec l'option « --edit-key ».\n"
 "\n"
 
-#: g10/keygen.c:981
+#: g10/keygen.c:982
 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"
@@ -1573,29 +1573,29 @@
 "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:1430
+#: g10/keygen.c:1431
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "La paire de clés DSA fera 1024 bits.\n"
 
-#: g10/keygen.c:1473
+#: g10/keygen.c:1474
 msgid "Key generation canceled.\n"
 msgstr "La génération de clé a été annulée.\n"
 
-#: g10/keygen.c:1570
+#: g10/keygen.c:1571
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "écriture de la clé publique vers `%s'\n"
 
-#: g10/keygen.c:1571
+#: g10/keygen.c:1572
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "écriture de la clé secrète vers `%s'\n"
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1668
 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:1672
+#: g10/keygen.c:1673
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1604,13 +1604,13 @@
 "utiliser la commande «--edit-key» pour générer une clé secondaire à\n"
 "cette fin.\n"
 
-#: g10/keygen.c:1689 g10/keygen.c:1790
+#: g10/keygen.c:1690 g10/keygen.c:1791
 #, 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:1733 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1618,7 +1618,7 @@
 "la clé a été créée %lu seconde dans le futur (rupture spatio-temporelle ou\n"
 "problème d'horloge)\n"
 
-#: g10/keygen.c:1735 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1736 g10/sig-check.c:317 g10/sign.c:114
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1626,7 +1626,7 @@
 "la clé a été créée %lu secondes dans le futur (rupture spatio-temporelle ou\n"
 "problème d'horloge\n"
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1769
 msgid "Really create? "
 msgstr "Créer vraiment ? "
 
@@ -2072,7 +2072,7 @@
 msgid "Really sign? "
 msgstr "Signer réellement ? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1870 g10/keyedit.c:1932 g10/sign.c:136
+#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "la signature a échoué: %s\n"
@@ -2330,201 +2330,201 @@
 msgid "enable a key"
 msgstr "activer une clé"
 
-#: g10/delkey.c:110 g10/keyedit.c:630
+#: g10/delkey.c:110 g10/keyedit.c:631
 msgid "can't do that in batchmode\n"
 msgstr "impossible de faire cela en mode automatique\n"
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:668
+#: g10/keyedit.c:669
 msgid "Secret key is available.\n"
 msgstr "La clé secrète est disponible.\n"
 
-#: g10/keyedit.c:697
+#: g10/keyedit.c:698
 msgid "Command> "
 msgstr "Commande> "
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Need the secret key to do this.\n"
 msgstr "Il faut la clé secrète pour faire cela.\n"
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:732
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Utilisez la commande «toggle» d'abord.\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:779
 msgid "Really sign all user IDs? "
 msgstr "Signer vraiment tous les utilisateurs ? "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:780
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Aide: Sélectionner les utilisateurs à signer\n"
 
-#: g10/keyedit.c:811 g10/keyedit.c:993
+#: g10/keyedit.c:812 g10/keyedit.c:994
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "la mise à jour de la base de confiance a échoué: %s\n"
 
-#: g10/keyedit.c:822 g10/keyedit.c:843
+#: g10/keyedit.c:823 g10/keyedit.c:844
 msgid "You must select at least one user ID.\n"
 msgstr "Vous devez sélectionner au moins un utilisateur.\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:825
 msgid "You can't delete the last user ID!\n"
 msgstr "Vous ne pouvez pas supprimer le dernier utilisateur !\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:828
 msgid "Really remove all selected user IDs? "
 msgstr "Enlever réellement tous les utilisateurs sélectionnés ? "
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:829
 msgid "Really remove this user ID? "
 msgstr "Enlever réellement cet utilisateur ? "
 
-#: g10/keyedit.c:864 g10/keyedit.c:886
+#: g10/keyedit.c:865 g10/keyedit.c:887
 msgid "You must select at least one key.\n"
 msgstr "Vous devez sélectionner au moins une clé.\n"
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:869
 msgid "Do you really want to delete the selected keys? "
 msgstr "Voulez-vous vraiment supprimer les clés sélectionnées ? "
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:870
 msgid "Do you really want to delete this key? "
 msgstr "Voulez-vous vraiment supprimer cette clé ? "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:891
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Voulez-vous vraiment révoquer les clés sélectionnées ? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:892
 msgid "Do you really want to revoke this key? "
 msgstr "Voulez-vous vraiment révoquer cette clé ? "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:958
 msgid "Save changes? "
 msgstr "Enregistrer les changements? "
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:961
 msgid "Quit without saving? "
 msgstr "Quitter sans enregistrer? "
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:972
 #, c-format
 msgid "update failed: %s\n"
 msgstr "la mise à jour a échoué: %s\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:979
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "la mise à jour de la clé secrète a échoué: %s\n"
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:986
 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:1000
+#: g10/keyedit.c:1001
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Commande invalide  (essayez «help»)\n"
 
-#: g10/keyedit.c:1080 g10/keyedit.c:1106
+#: g10/keyedit.c:1081 g10/keyedit.c:1107
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1089
+#: g10/keyedit.c:1090
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1093
+#: g10/keyedit.c:1094
 msgid "This key has been disabled"
 msgstr "Cette clé a été désactivée"
 
-#: g10/keyedit.c:1122
+#: g10/keyedit.c:1123
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "clé %08lX: la sous-clé a été révoquée !\n"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1126
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr " nouvelles révocations de clés: %lu\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1128
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Supprimer cette bonne signature ? (o/N/q)"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1370
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Supprimer cette signature invalide ? (o/N/q)"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1374
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Supprimer cette signature inconnue ? (o/N/q)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1380
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Faut-il vraiment supprimer cette auto-signature ? (o/N)"
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1394
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d signature supprimée.\n"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d signatures supprimées\n"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1398
 msgid "Nothing deleted.\n"
 msgstr "Rien n'a été supprimé.\n"
 
-#: g10/keyedit.c:1466
+#: g10/keyedit.c:1467
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Enlevez les sélections des clés secrètes.\n"
 
-#: g10/keyedit.c:1472
+#: g10/keyedit.c:1473
 msgid "Please select at most one secondary key.\n"
 msgstr "Vous devez sélectionner au plus une clé secondaire.\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1477
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Changer la date d'expiration d'une clé secondaire.\n"
 
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1479
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changer la date d'expiration de la clé principale.\n"
 
-#: g10/keyedit.c:1520
+#: g10/keyedit.c:1521
 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:1536
+#: g10/keyedit.c:1537
 msgid "No corresponding signature in secret ring\n"
 msgstr "Pas de signature correspondante dans le porte-clés secret\n"
 
-#: g10/keyedit.c:1597
+#: g10/keyedit.c:1598
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Pas d'utilisateur avec l'index %d\n"
 
-#: g10/keyedit.c:1643
+#: g10/keyedit.c:1644
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Pas de clé secondaire avec l'index %d\n"
 
-#: g10/keyedit.c:1741
+#: g10/keyedit.c:1742
 msgid "user ID: \""
 msgstr "nom d'utilisateur: «"
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1745
 #, c-format
 msgid ""
 "\"\n"
@@ -2533,34 +2533,34 @@
 "»\n"
 "signé avec votre clé %08lX à %s\n"
 
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:1749
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "Générer un certificat de révocation pour cette signature ? (o/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1773
 msgid "You have signed these user IDs:\n"
 msgstr "Vous avez signé ces noms d'utilisateurs:\n"
 
-#: g10/keyedit.c:1786 g10/keyedit.c:1821
+#: g10/keyedit.c:1787 g10/keyedit.c:1822
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   signé par %08lX à %s\n"
 
-#: g10/keyedit.c:1791
+#: g10/keyedit.c:1792
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   révoqué par %08lX à %s\n"
 
-#: g10/keyedit.c:1811
+#: g10/keyedit.c:1812
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vous êtes sur le point de révoquer ces signatures:\n"
 
-#: g10/keyedit.c:1829
+#: g10/keyedit.c:1830
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Faut-il vraiment générer les certificats de révocation ? (o/N)"
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1859
 msgid "no secret key\n"
 msgstr "pas de clé secrète\n"
 
@@ -2575,138 +2575,138 @@
 msgstr "revclé"
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:760
+#: g10/keylist.c:400 g10/mainproc.c:790
 #, c-format
 msgid " [expires: %s]"
 msgstr " [expire: %s]"
 
-#: g10/mainproc.c:213
+#: g10/mainproc.c:240
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "la clé publique est %08lX\n"
 
-#: g10/mainproc.c:257
+#: g10/mainproc.c:284
 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:299
+#: g10/mainproc.c:326
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "chiffré avec une clé de %u bits %s, ID %08lX, créée le %s\n"
 
-#: g10/mainproc.c:309
+#: g10/mainproc.c:336
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "chiffré avec une clé %s, %08lX\n"
 
-#: g10/mainproc.c:315
+#: g10/mainproc.c:342
 msgid "no secret key for decryption available\n"
 msgstr "aucune clé secrète n'est disponible pour le déchiffrement\n"
 
-#: g10/mainproc.c:324
+#: g10/mainproc.c:351
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "le déchiffrement par clé publique a échoué: %s\n"
 
-#: g10/mainproc.c:361
+#: g10/mainproc.c:388
 msgid "decryption okay\n"
 msgstr "le déchiffrement a réussi\n"
 
-#: g10/mainproc.c:366
+#: g10/mainproc.c:393
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENTION: le message chiffré a été manipulé !\n"
 
-#: g10/mainproc.c:371
+#: g10/mainproc.c:398
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "le déchiffrement a échoué: %s\n"
 
-#: g10/mainproc.c:390
+#: g10/mainproc.c:417
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTE: l'expéditeur a demandé «pour vos yeux seulement»\n"
 
-#: g10/mainproc.c:392
+#: g10/mainproc.c:419
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom de fichier original: '%.*s'\n"
 
-#: g10/mainproc.c:544
+#: g10/mainproc.c:574
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "révocation autonome - utilisez «gpg --import» pour l'appliquer\n"
 
-#: g10/mainproc.c:631 g10/mainproc.c:640
+#: g10/mainproc.c:661 g10/mainproc.c:670
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATTENTION: des données de notation invalides ont été détectées\n"
 
-#: g10/mainproc.c:643
+#: g10/mainproc.c:673
 msgid "Notation: "
 msgstr "Notation: "
 
-#: g10/mainproc.c:650
+#: g10/mainproc.c:680
 msgid "Policy: "
 msgstr "Politique: "
 
-#: g10/mainproc.c:1080
+#: g10/mainproc.c:1121
 msgid "signature verification suppressed\n"
 msgstr "vérification de signature supprimée\n"
 
-#: g10/mainproc.c:1086
+#: g10/mainproc.c:1158
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Signature faite %.*s avec une clé %s ID %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1112 g10/mainproc.c:1123
+#: g10/mainproc.c:1184 g10/mainproc.c:1195
 msgid "BAD signature from \""
 msgstr "MAUVAISE signature de \""
 
-#: g10/mainproc.c:1113 g10/mainproc.c:1124
+#: g10/mainproc.c:1185 g10/mainproc.c:1196
 msgid "Good signature from \""
 msgstr "Bonne signature de \""
 
-#: g10/mainproc.c:1115
+#: g10/mainproc.c:1187
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1171
+#: g10/mainproc.c:1243
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossible de vérifier la signature: %s\n"
 
-#: g10/mainproc.c:1235
+#: g10/mainproc.c:1318
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signature autonome de classe 0x%02x\n"
 
-#: g10/mainproc.c:1281
+#: g10/mainproc.c:1369
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature d'un ancien style (PGP 2.x)\n"
 
-#: g10/mainproc.c:1286
+#: g10/mainproc.c:1374
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquet racine invalide détecté dans proc_tree()\n"
 
-#: g10/misc.c:96
+#: g10/misc.c:97
 #, 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:206
+#: g10/misc.c:207
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Les algorithmes expérimentaux ne devraient pas être utilisés !\n"
 
-#: g10/misc.c:233
+#: g10/misc.c:234
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 "Cet algorithme de chiffrement est déconseillé; utilisez-en un\n"
 "plus standard !\n"
 
-#: g10/parse-packet.c:117
+#: g10/parse-packet.c:119
 #, 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:986
+#: g10/parse-packet.c:991
 #, 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"
diff -urN gnupg-1.0.3/po/gnupg.pot gnupg-1.0.4/po/gnupg.pot
--- gnupg-1.0.3/po/gnupg.pot	Mon Sep 18 12:18:01 2000
+++ gnupg-1.0.4/po/gnupg.pot	Mon Oct 16 19:22:11 2000
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-09-18 12:17+0200\n"
+"POT-Creation-Date: 2000-10-16 19:22+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,11 +18,11 @@
 msgid "Warning: using insecure memory!\n"
 msgstr ""
 
-#: util/secmem.c:289
+#: util/secmem.c:295
 msgid "operation is not possible without initialized secure memory\n"
 msgstr ""
 
-#: util/secmem.c:290
+#: util/secmem.c:296
 msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 
@@ -256,7 +256,7 @@
 msgid "you found a bug ... (%s:%d)\n"
 msgstr ""
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1255
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr ""
@@ -832,22 +832,22 @@
 msgid "can't open `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1700
+#: g10/g10.c:1737
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 
-#: g10/g10.c:1706
+#: g10/g10.c:1743
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
 msgstr ""
 
-#: g10/g10.c:1712
+#: g10/g10.c:1749
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 
-#: g10/g10.c:1720
+#: g10/g10.c:1757
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 
@@ -910,27 +910,27 @@
 msgid "error in trailer line\n"
 msgstr ""
 
-#: g10/armor.c:912
+#: g10/armor.c:906
 msgid "For info see http://www.gnupg.org"
 msgstr ""
 
-#: g10/armor.c:1033
+#: g10/armor.c:1027
 msgid "no valid OpenPGP data found.\n"
 msgstr ""
 
-#: g10/armor.c:1038
+#: g10/armor.c:1032
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr ""
 
-#: g10/armor.c:1042
+#: g10/armor.c:1036
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1188 g10/pkclist.c:53
+#: g10/keyedit.c:1189 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr ""
 
@@ -1185,66 +1185,66 @@
 msgid "no valid addressees\n"
 msgstr ""
 
-#: g10/keygen.c:175
+#: g10/keygen.c:176
 msgid "writing self signature\n"
 msgstr ""
 
-#: g10/keygen.c:213
+#: g10/keygen.c:214
 msgid "writing key binding signature\n"
 msgstr ""
 
-#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:435
+#: g10/keygen.c:262 g10/keygen.c:346 g10/keygen.c:436
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:440
+#: g10/keygen.c:267 g10/keygen.c:351 g10/keygen.c:441
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:539
+#: g10/keygen.c:540
 msgid "Please select what kind of key you want:\n"
 msgstr ""
 
-#: g10/keygen.c:541
+#: g10/keygen.c:542
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr ""
 
-#: g10/keygen.c:542
+#: g10/keygen.c:543
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr ""
 
-#: g10/keygen.c:544
+#: g10/keygen.c:545
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr ""
 
-#: g10/keygen.c:545
+#: g10/keygen.c:546
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr ""
 
-#: g10/keygen.c:547
+#: g10/keygen.c:548
 #, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr ""
 
-#: g10/keygen.c:551
+#: g10/keygen.c:552
 msgid "Your selection? "
 msgstr ""
 
-#: g10/keygen.c:562 g10/keygen.c:570
+#: g10/keygen.c:563 g10/keygen.c:571
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr ""
 
-#: g10/keygen.c:584
+#: g10/keygen.c:585
 msgid "Invalid selection.\n"
 msgstr ""
 
-#: g10/keygen.c:596
+#: g10/keygen.c:597
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1253,19 +1253,19 @@
 "    highest suggested keysize is 2048 bits\n"
 msgstr ""
 
-#: g10/keygen.c:603
+#: g10/keygen.c:604
 msgid "What keysize do you want? (1024) "
 msgstr ""
 
-#: g10/keygen.c:608
+#: g10/keygen.c:609
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr ""
 
-#: g10/keygen.c:610
+#: g10/keygen.c:611
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr ""
 
-#: g10/keygen.c:612
+#: g10/keygen.c:613
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr ""
 
@@ -1277,42 +1277,42 @@
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:623
+#: g10/keygen.c:624
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr ""
 
-#: g10/keygen.c:628
+#: g10/keygen.c:629
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
 msgstr ""
 
-#: g10/keygen.c:631
+#: g10/keygen.c:632
 msgid "Are you sure that you want this keysize? "
 msgstr ""
 
-#: g10/keygen.c:632
+#: g10/keygen.c:633
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
 msgstr ""
 
-#: g10/keygen.c:640
+#: g10/keygen.c:641
 msgid "Do you really need such a large keysize? "
 msgstr ""
 
-#: g10/keygen.c:646
+#: g10/keygen.c:647
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:649 g10/keygen.c:653
+#: g10/keygen.c:650 g10/keygen.c:654
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:701
+#: g10/keygen.c:702
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1322,35 +1322,35 @@
 "      <n>y = key expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:716
+#: g10/keygen.c:717
 msgid "Key is valid for? (0) "
 msgstr ""
 
-#: g10/keygen.c:721
+#: g10/keygen.c:722
 msgid "invalid value\n"
 msgstr ""
 
-#: g10/keygen.c:726
+#: g10/keygen.c:727
 msgid "Key does not expire at all\n"
 msgstr ""
 
 #. print the date when the key expires
-#: g10/keygen.c:732
+#: g10/keygen.c:733
 #, c-format
 msgid "Key expires at %s\n"
 msgstr ""
 
-#: g10/keygen.c:735
+#: g10/keygen.c:736
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:740
+#: g10/keygen.c:741
 msgid "Is this correct (y/n)? "
 msgstr ""
 
-#: g10/keygen.c:783
+#: g10/keygen.c:784
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1360,44 +1360,44 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:795
+#: g10/keygen.c:796
 msgid "Real name: "
 msgstr ""
 
-#: g10/keygen.c:803
+#: g10/keygen.c:804
 msgid "Invalid character in name\n"
 msgstr ""
 
-#: g10/keygen.c:805
+#: g10/keygen.c:806
 msgid "Name may not start with a digit\n"
 msgstr ""
 
-#: g10/keygen.c:807
+#: g10/keygen.c:808
 msgid "Name must be at least 5 characters long\n"
 msgstr ""
 
-#: g10/keygen.c:815
+#: g10/keygen.c:816
 msgid "Email address: "
 msgstr ""
 
-#: g10/keygen.c:826
+#: g10/keygen.c:827
 msgid "Not a valid email address\n"
 msgstr ""
 
-#: g10/keygen.c:834
+#: g10/keygen.c:835
 msgid "Comment: "
 msgstr ""
 
-#: g10/keygen.c:840
+#: g10/keygen.c:841
 msgid "Invalid character in comment\n"
 msgstr ""
 
-#: g10/keygen.c:863
+#: g10/keygen.c:864
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr ""
 
-#: g10/keygen.c:869
+#: g10/keygen.c:870
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1405,37 +1405,37 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:873
+#: g10/keygen.c:874
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:878
+#: g10/keygen.c:879
 msgid "NnCcEeOoQq"
 msgstr ""
 
-#: g10/keygen.c:888
+#: g10/keygen.c:889
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:889
+#: g10/keygen.c:890
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:908
+#: g10/keygen.c:909
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:946
+#: g10/keygen.c:947
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:468 g10/keygen.c:954
+#: g10/keyedit.c:468 g10/keygen.c:955
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr ""
 
-#: g10/keygen.c:960
+#: g10/keygen.c:961
 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"
@@ -1443,7 +1443,7 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:981
+#: g10/keygen.c:982
 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"
@@ -1451,52 +1451,52 @@
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:1430
+#: g10/keygen.c:1431
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr ""
 
-#: g10/keygen.c:1473
+#: g10/keygen.c:1474
 msgid "Key generation canceled.\n"
 msgstr ""
 
-#: g10/keygen.c:1570
+#: g10/keygen.c:1571
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr ""
 
-#: g10/keygen.c:1571
+#: g10/keygen.c:1572
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr ""
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1668
 msgid "public and secret key created and signed.\n"
 msgstr ""
 
-#: g10/keygen.c:1672
+#: g10/keygen.c:1673
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
 msgstr ""
 
-#: g10/keygen.c:1689 g10/keygen.c:1790
+#: g10/keygen.c:1690 g10/keygen.c:1791
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:1733 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:1735 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1736 g10/sig-check.c:317 g10/sign.c:114
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1769
 msgid "Really create? "
 msgstr ""
 
@@ -1934,7 +1934,7 @@
 msgid "Really sign? "
 msgstr ""
 
-#: g10/keyedit.c:373 g10/keyedit.c:1870 g10/keyedit.c:1932 g10/sign.c:136
+#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
 #, c-format
 msgid "signing failed: %s\n"
 msgstr ""
@@ -2188,234 +2188,234 @@
 msgid "enable a key"
 msgstr ""
 
-#: g10/delkey.c:110 g10/keyedit.c:630
+#: g10/delkey.c:110 g10/keyedit.c:631
 msgid "can't do that in batchmode\n"
 msgstr ""
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:668
+#: g10/keyedit.c:669
 msgid "Secret key is available.\n"
 msgstr ""
 
-#: g10/keyedit.c:697
+#: g10/keyedit.c:698
 msgid "Command> "
 msgstr ""
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Need the secret key to do this.\n"
 msgstr ""
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:732
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:779
 msgid "Really sign all user IDs? "
 msgstr ""
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:780
 msgid "Hint: Select the user IDs to sign\n"
 msgstr ""
 
-#: g10/keyedit.c:811 g10/keyedit.c:993
+#: g10/keyedit.c:812 g10/keyedit.c:994
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:822 g10/keyedit.c:843
+#: g10/keyedit.c:823 g10/keyedit.c:844
 msgid "You must select at least one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:825
 msgid "You can't delete the last user ID!\n"
 msgstr ""
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:828
 msgid "Really remove all selected user IDs? "
 msgstr ""
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:829
 msgid "Really remove this user ID? "
 msgstr ""
 
-#: g10/keyedit.c:864 g10/keyedit.c:886
+#: g10/keyedit.c:865 g10/keyedit.c:887
 msgid "You must select at least one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:869
 msgid "Do you really want to delete the selected keys? "
 msgstr ""
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:870
 msgid "Do you really want to delete this key? "
 msgstr ""
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:891
 msgid "Do you really want to revoke the selected keys? "
 msgstr ""
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:892
 msgid "Do you really want to revoke this key? "
 msgstr ""
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:958
 msgid "Save changes? "
 msgstr ""
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:961
 msgid "Quit without saving? "
 msgstr ""
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:972
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:979
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:986
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1001
 msgid "Invalid command  (try \"help\")\n"
 msgstr ""
 
-#: g10/keyedit.c:1080 g10/keyedit.c:1106
+#: g10/keyedit.c:1081 g10/keyedit.c:1107
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1089
+#: g10/keyedit.c:1090
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1093
+#: g10/keyedit.c:1094
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:1122
+#: g10/keyedit.c:1123
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1126
 msgid "rev- faked revocation found\n"
 msgstr ""
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1128
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1370
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1374
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1380
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1394
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1398
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:1466
+#: g10/keyedit.c:1467
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:1472
+#: g10/keyedit.c:1473
 msgid "Please select at most one secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1477
 msgid "Changing expiration time for a secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1479
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1520
+#: g10/keyedit.c:1521
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:1536
+#: g10/keyedit.c:1537
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:1597
+#: g10/keyedit.c:1598
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:1643
+#: g10/keyedit.c:1644
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:1741
+#: g10/keyedit.c:1742
 msgid "user ID: \""
 msgstr ""
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1745
 #, c-format
 msgid ""
 "\"\n"
 "signed with your key %08lX at %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:1749
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr ""
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1773
 msgid "You have signed these user IDs:\n"
 msgstr ""
 
-#: g10/keyedit.c:1786 g10/keyedit.c:1821
+#: g10/keyedit.c:1787 g10/keyedit.c:1822
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1791
+#: g10/keyedit.c:1792
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1811
+#: g10/keyedit.c:1812
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:1829
+#: g10/keyedit.c:1830
 msgid "Really create the revocation certificates? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1859
 msgid "no secret key\n"
 msgstr ""
 
@@ -2428,136 +2428,136 @@
 msgstr ""
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:760
+#: g10/keylist.c:400 g10/mainproc.c:790
 #, c-format
 msgid " [expires: %s]"
 msgstr ""
 
-#: g10/mainproc.c:213
+#: g10/mainproc.c:240
 #, c-format
 msgid "public key is %08lX\n"
 msgstr ""
 
-#: g10/mainproc.c:257
+#: g10/mainproc.c:284
 msgid "public key encrypted data: good DEK\n"
 msgstr ""
 
-#: g10/mainproc.c:299
+#: g10/mainproc.c:326
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr ""
 
-#: g10/mainproc.c:309
+#: g10/mainproc.c:336
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr ""
 
-#: g10/mainproc.c:315
+#: g10/mainproc.c:342
 msgid "no secret key for decryption available\n"
 msgstr ""
 
-#: g10/mainproc.c:324
+#: g10/mainproc.c:351
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:361
+#: g10/mainproc.c:388
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:366
+#: g10/mainproc.c:393
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:371
+#: g10/mainproc.c:398
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:390
+#: g10/mainproc.c:417
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:392
+#: g10/mainproc.c:419
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:544
+#: g10/mainproc.c:574
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:631 g10/mainproc.c:640
+#: g10/mainproc.c:661 g10/mainproc.c:670
 msgid "WARNING: invalid notation data found\n"
 msgstr ""
 
-#: g10/mainproc.c:643
+#: g10/mainproc.c:673
 msgid "Notation: "
 msgstr ""
 
-#: g10/mainproc.c:650
+#: g10/mainproc.c:680
 msgid "Policy: "
 msgstr ""
 
-#: g10/mainproc.c:1080
+#: g10/mainproc.c:1121
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1086
+#: g10/mainproc.c:1158
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr ""
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1112 g10/mainproc.c:1123
+#: g10/mainproc.c:1184 g10/mainproc.c:1195
 msgid "BAD signature from \""
 msgstr ""
 
-#: g10/mainproc.c:1113 g10/mainproc.c:1124
+#: g10/mainproc.c:1185 g10/mainproc.c:1196
 msgid "Good signature from \""
 msgstr ""
 
-#: g10/mainproc.c:1115
+#: g10/mainproc.c:1187
 msgid "                aka \""
 msgstr ""
 
-#: g10/mainproc.c:1171
+#: g10/mainproc.c:1243
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1235
+#: g10/mainproc.c:1318
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:1281
+#: g10/mainproc.c:1369
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
 
-#: g10/mainproc.c:1286
+#: g10/mainproc.c:1374
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
-#: g10/misc.c:96
+#: g10/misc.c:97
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr ""
 
-#: g10/misc.c:206
+#: g10/misc.c:207
 msgid "Experimental algorithms should not be used!\n"
 msgstr ""
 
-#: g10/misc.c:233
+#: g10/misc.c:234
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 
-#: g10/parse-packet.c:117
+#: g10/parse-packet.c:119
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:986
+#: g10/parse-packet.c:991
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
diff -urN gnupg-1.0.3/po/id.po gnupg-1.0.4/po/id.po
--- gnupg-1.0.3/po/id.po	Mon Sep 18 12:18:04 2000
+++ gnupg-1.0.4/po/id.po	Tue Oct 17 15:40:37 2000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU Privacy Guard 1.0.1\n"
-"POT-Creation-Date: 2000-09-18 12:17+0200\n"
+"POT-Creation-Date: 2000-10-16 19:22+0200\n"
 "PO-Revision-Date: 2000-02-06 18:04+07:00\n"
 "Last-Translator: Tedi Heriyanto <tedi-h@usa.net>\n"
 "Language-Team: Indonesia <id@li.org>\n"
@@ -17,11 +17,11 @@
 msgid "Warning: using insecure memory!\n"
 msgstr "Peringatan: menggunakan memori yang tidak aman!\n"
 
-#: util/secmem.c:289
+#: util/secmem.c:295
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operasi tidak mungkin tanpa menginisialisasi memori yang aman\n"
 
-#: util/secmem.c:290
+#: util/secmem.c:296
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(anda mungkin menggunakan program yang salah untuk tugas ini)\n"
 
@@ -256,7 +256,7 @@
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "anda menemukan kesalahan ...(%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1255
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
@@ -859,12 +859,12 @@
 msgid "can't open `%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
 
-#: g10/g10.c:1700
+#: g10/g10.c:1737
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "karakter pertama nama notasi harus huruf atau garis bawah\n"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1743
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -872,11 +872,11 @@
 "nama notasi hanya terdiri dari huruf, digit, titik atau garis bawah dan "
 "diakhiri dengan sebuah '='\n"
 
-#: g10/g10.c:1712
+#: g10/g10.c:1749
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "titik dalam nama notasi harus diapit oleh karakter lain\n"
 
-#: g10/g10.c:1720
+#: g10/g10.c:1757
 msgid "a notation value must not use any control characters\n"
 msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n"
 
@@ -939,20 +939,20 @@
 msgid "error in trailer line\n"
 msgstr "kesalahan dalam garis trailer\n"
 
-#: g10/armor.c:912
+#: g10/armor.c:906
 msgid "For info see http://www.gnupg.org"
 msgstr ""
 
-#: g10/armor.c:1033
+#: g10/armor.c:1027
 msgid "no valid OpenPGP data found.\n"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 
-#: g10/armor.c:1038
+#: g10/armor.c:1032
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armor tidak valid: baris melebihi %d karakter\n"
 
-#: g10/armor.c:1042
+#: g10/armor.c:1036
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -961,7 +961,7 @@
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1188 g10/pkclist.c:53
+#: g10/keyedit.c:1189 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "            Fingerprint:"
 
@@ -1244,66 +1244,66 @@
 msgid "no valid addressees\n"
 msgstr "tidak ada alamat yang valid\n"
 
-#: g10/keygen.c:175
+#: g10/keygen.c:176
 msgid "writing self signature\n"
 msgstr "menulis self signature\n"
 
-#: g10/keygen.c:213
+#: g10/keygen.c:214
 msgid "writing key binding signature\n"
 msgstr "menulis key binding signature\n"
 
-#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:435
+#: g10/keygen.c:262 g10/keygen.c:346 g10/keygen.c:436
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Keysize yang diminta adalah %u bit\n"
 
-#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:440
+#: g10/keygen.c:267 g10/keygen.c:351 g10/keygen.c:441
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:539
+#: g10/keygen.c:540
 msgid "Please select what kind of key you want:\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
 
-#: g10/keygen.c:541
+#: g10/keygen.c:542
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "  (%d) DSA dan ElGamal (baku)\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:543
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "  (%d) DSA (hanya menandai)\n"
 
-#: g10/keygen.c:544
+#: g10/keygen.c:545
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "  (%d) ElGamal (hanya enkripsi)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:546
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "  (%d) ElGamal (tandai dan enkripsi)\n"
 
-#: g10/keygen.c:547
+#: g10/keygen.c:548
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "  (%d) ElGamal (tandai dan enkripsi)\n"
 
-#: g10/keygen.c:551
+#: g10/keygen.c:552
 msgid "Your selection? "
 msgstr "Pilihan anda? "
 
-#: g10/keygen.c:562 g10/keygen.c:570
+#: g10/keygen.c:563 g10/keygen.c:571
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "Anda ingin membuat kunci sign dan enkripsi? "
 
-#: g10/keygen.c:584
+#: g10/keygen.c:585
 msgid "Invalid selection.\n"
 msgstr "Pilihan tidak valid.\n"
 
-#: g10/keygen.c:596
+#: g10/keygen.c:597
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1316,19 +1316,19 @@
 "       keysize default adalah 1024 bit\n"
 " keysize tertinggi dianjurkan 2048 bit\n"
 
-#: g10/keygen.c:603
+#: g10/keygen.c:604
 msgid "What keysize do you want? (1024) "
 msgstr "Keysize yang anda inginkan? (1024) "
 
-#: g10/keygen.c:608
+#: g10/keygen.c:609
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA hanya membolehkan keysize dari 512 hingga 1024\n"
 
-#: g10/keygen.c:610
+#: g10/keygen.c:611
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "keysize terlalu kecil; 768 adalah nilai terendah yang diijinkan.\n"
 
-#: g10/keygen.c:612
+#: g10/keygen.c:613
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "keysize terlalu kecil; 768 adalah nilai terendah yang diijinkan.\n"
@@ -1341,12 +1341,12 @@
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:623
+#: g10/keygen.c:624
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "keysize terlalu besar; %d adalah nilai tertinggi yang diijinkan.\n"
 
-#: g10/keygen.c:628
+#: g10/keygen.c:629
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1354,11 +1354,11 @@
 "Keysize lebih besar dari 2048 tidak dianjurkan karena\n"
 "komputasi akan sangat lama!\n"
 
-#: g10/keygen.c:631
+#: g10/keygen.c:632
 msgid "Are you sure that you want this keysize? "
 msgstr "Apakah anda yakin memerlukan keysize ini? "
 
-#: g10/keygen.c:632
+#: g10/keygen.c:633
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1366,21 +1366,21 @@
 "Oke, tetapi ingat bahwa radiasi monitor dan keyboard anda juga sangat mudah "
 "diserang!\n"
 
-#: g10/keygen.c:640
+#: g10/keygen.c:641
 msgid "Do you really need such a large keysize? "
 msgstr "Apakah anda perlu keysize berukuran besar tersebut? "
 
-#: g10/keygen.c:646
+#: g10/keygen.c:647
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Keysize yang diminta adalah %u bit\n"
 
-#: g10/keygen.c:649 g10/keygen.c:653
+#: g10/keygen.c:650 g10/keygen.c:654
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:701
+#: g10/keygen.c:702
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1396,35 +1396,35 @@
 "     <n>m = kunci berakhir dalam n bulan\n"
 "     <n>y = kunci berakhir dalam n tahun\n"
 
-#: g10/keygen.c:716
+#: g10/keygen.c:717
 msgid "Key is valid for? (0) "
 msgstr "Kunci valid untuk? (0) "
 
-#: g10/keygen.c:721
+#: g10/keygen.c:722
 msgid "invalid value\n"
 msgstr "nilai yang tidak valid\n"
 
-#: g10/keygen.c:726
+#: g10/keygen.c:727
 msgid "Key does not expire at all\n"
 msgstr "Kunci tidak pernah berakhir\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:732
+#: g10/keygen.c:733
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Kunci berakhir pada %s\n"
 
-#: g10/keygen.c:735
+#: g10/keygen.c:736
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:740
+#: g10/keygen.c:741
 msgid "Is this correct (y/n)? "
 msgstr "Benar (y/t)? "
 
-#: g10/keygen.c:783
+#: g10/keygen.c:784
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1439,44 +1439,44 @@
 "user-id dari Nama sebenarnya, Komentar dan Alamat email dalam bentuk:\n"
 "  \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 
-#: g10/keygen.c:795
+#: g10/keygen.c:796
 msgid "Real name: "
 msgstr "Nama sebenarnya: "
 
-#: g10/keygen.c:803
+#: g10/keygen.c:804
 msgid "Invalid character in name\n"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: g10/keygen.c:805
+#: g10/keygen.c:806
 msgid "Name may not start with a digit\n"
 msgstr "Nama tidak boleh dimulai dengan digit\n"
 
-#: g10/keygen.c:807
+#: g10/keygen.c:808
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nama harus berukuran minimum 5 karakter\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:816
 msgid "Email address: "
 msgstr "Alamat email: "
 
-#: g10/keygen.c:826
+#: g10/keygen.c:827
 msgid "Not a valid email address\n"
 msgstr "Bukan alamat email yang valid\n"
 
-#: g10/keygen.c:834
+#: g10/keygen.c:835
 msgid "Comment: "
 msgstr "Komentar: "
 
-#: g10/keygen.c:840
+#: g10/keygen.c:841
 msgid "Invalid character in comment\n"
 msgstr "Karakter tidak valid dalam komentar\n"
 
-#: g10/keygen.c:863
+#: g10/keygen.c:864
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Anda menggunakan set karakter `%s'.\n"
 
-#: g10/keygen.c:869
+#: g10/keygen.c:870
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1486,28 +1486,28 @@
 "Anda memilih USER-ID ini:\n"
 "   \"%s\"\n"
 
-#: g10/keygen.c:873
+#: g10/keygen.c:874
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:878
+#: g10/keygen.c:879
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoQq"
 
-#: g10/keygen.c:888
+#: g10/keygen.c:889
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (O)ke/(Q)uit? "
 
-#: g10/keygen.c:889
+#: g10/keygen.c:890
 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:908
+#: g10/keygen.c:909
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:946
+#: g10/keygen.c:947
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1515,11 +1515,11 @@
 "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:954
+#: g10/keyedit.c:468 g10/keygen.c:955
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "passphrase tidak diulang dengan benar; coba lagi.\n"
 
-#: g10/keygen.c:960
+#: g10/keygen.c:961
 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"
@@ -1531,7 +1531,7 @@
 "saat,\n"
 "menggunakan program ini dengan pilihan \"--edit-key\".\n"
 
-#: g10/keygen.c:981
+#: g10/keygen.c:982
 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"
@@ -1543,29 +1543,29 @@
 "selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
 "yang baik untuk memperoleh entropi.\n"
 
-#: g10/keygen.c:1430
+#: g10/keygen.c:1431
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "Keypair DSA akan memiliki 1024 bit.\n"
 
-#: g10/keygen.c:1473
+#: g10/keygen.c:1474
 msgid "Key generation canceled.\n"
 msgstr "Pembuatan kunci dibatalkan.\n"
 
-#: g10/keygen.c:1570
+#: g10/keygen.c:1571
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "menulis sertifikat publik ke `%s'\n"
 
-#: g10/keygen.c:1571
+#: g10/keygen.c:1572
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "menulis sertifikat rahasia ke `%s'\n"
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1668
 msgid "public and secret key created and signed.\n"
 msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
 
-#: g10/keygen.c:1672
+#: g10/keygen.c:1673
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1574,26 +1574,26 @@
 "mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
 "untuk tujuan ini.\n"
 
-#: g10/keygen.c:1689 g10/keygen.c:1790
+#: g10/keygen.c:1690 g10/keygen.c:1791
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/keygen.c:1733 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112
 #, 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:1735 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1736 g10/sig-check.c:317 g10/sign.c:114
 #, 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:1768
+#: g10/keygen.c:1769
 msgid "Really create? "
 msgstr "Ingin diciptakan? "
 
@@ -2038,7 +2038,7 @@
 msgid "Really sign? "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1870 g10/keyedit.c:1932 g10/sign.c:136
+#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "gagal menandai: %s\n"
@@ -2297,235 +2297,235 @@
 msgid "enable a key"
 msgstr "aktifkan kunci"
 
-#: g10/delkey.c:110 g10/keyedit.c:630
+#: g10/delkey.c:110 g10/keyedit.c:631
 msgid "can't do that in batchmode\n"
 msgstr "tidak dapat dilakukan dalam mode batch\n"
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:668
+#: g10/keyedit.c:669
 msgid "Secret key is available.\n"
 msgstr "Kunci rahasia tersedia.\n"
 
-#: g10/keyedit.c:697
+#: g10/keyedit.c:698
 msgid "Command> "
 msgstr "Perintah> "
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Need the secret key to do this.\n"
 msgstr "Perlu kunci rahasia.\n"
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:732
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:779
 msgid "Really sign all user IDs? "
 msgstr "Tandai ID seluruh user? "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:780
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
 
-#: g10/keyedit.c:811 g10/keyedit.c:993
+#: g10/keyedit.c:812 g10/keyedit.c:994
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "gagal perbarui trustdb: %s\n"
 
-#: g10/keyedit.c:822 g10/keyedit.c:843
+#: g10/keyedit.c:823 g10/keyedit.c:844
 msgid "You must select at least one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:825
 msgid "You can't delete the last user ID!\n"
 msgstr "Anda tidak dapat menghapus ID user terakhir!\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:828
 msgid "Really remove all selected user IDs? "
 msgstr "Hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:829
 msgid "Really remove this user ID? "
 msgstr "Hapus ID user ini? "
 
-#: g10/keyedit.c:864 g10/keyedit.c:886
+#: g10/keyedit.c:865 g10/keyedit.c:887
 msgid "You must select at least one key.\n"
 msgstr "Anda harus memilih minimum satu kunci.\n"
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:869
 msgid "Do you really want to delete the selected keys? "
 msgstr "Anda ingin menghapus kunci terpilih ini? "
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:870
 msgid "Do you really want to delete this key? "
 msgstr "Anda ingin menghapus kunci ini? "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:891
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Anda ingin membatalkan kunci terpilih ini? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:892
 msgid "Do you really want to revoke this key? "
 msgstr "Anda ingin membatalkan kunci ini? "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:958
 msgid "Save changes? "
 msgstr "Simpan perubahan? "
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:961
 msgid "Quit without saving? "
 msgstr "Berhenti tanpa menyimpan? "
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:972
 #, c-format
 msgid "update failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:979
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:986
 msgid "Key not changed so no update needed.\n"
 msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1001
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Perintah tidak valid (coba \"help\")\n"
 
-#: g10/keyedit.c:1080 g10/keyedit.c:1106
+#: g10/keyedit.c:1081 g10/keyedit.c:1107
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1089
+#: g10/keyedit.c:1090
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1093
+#: g10/keyedit.c:1094
 msgid "This key has been disabled"
 msgstr "Kunci ini telah ditiadakan"
 
-#: g10/keyedit.c:1122
+#: g10/keyedit.c:1123
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "kunci %08lX: subkey telah dibatalkan!\n"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1126
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "  pembatalan kunci baru: %lu\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1128
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Hapus signature baik ini? (y/T/q)"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1370
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Hapus signature tidak valid ini? (y/T/q)"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1374
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1380
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1394
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1398
 msgid "Nothing deleted.\n"
 msgstr "Tidak ada yang dihapus.\n"
 
-#: g10/keyedit.c:1466
+#: g10/keyedit.c:1467
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Silakan hapus pilihan dari kunci rahasia.\n"
 
-#: g10/keyedit.c:1472
+#: g10/keyedit.c:1473
 msgid "Please select at most one secondary key.\n"
 msgstr "Silakan pilih maksimum satu kunci sekunder.\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1477
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Merubah batas waktu untuk kunci sekunder.\n"
 
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1479
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Merubah batas waktu untuk kunci primer.\n"
 
-#: g10/keyedit.c:1520
+#: g10/keyedit.c:1521
 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:1536
+#: g10/keyedit.c:1537
 msgid "No corresponding signature in secret ring\n"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/keyedit.c:1597
+#: g10/keyedit.c:1598
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:1643
+#: g10/keyedit.c:1644
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Tidak ada kunci sekunder dengan index %d\n"
 
-#: g10/keyedit.c:1741
+#: g10/keyedit.c:1742
 msgid "user ID: \""
 msgstr "ID user: "
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1745
 #, c-format
 msgid ""
 "\"\n"
 "signed with your key %08lX at %s\n"
 msgstr "ditandai dengan kunci anda %08lX pada %s\n"
 
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:1749
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1773
 msgid "You have signed these user IDs:\n"
 msgstr "Anda telah menandai ID user ini:\n"
 
-#: g10/keyedit.c:1786 g10/keyedit.c:1821
+#: g10/keyedit.c:1787 g10/keyedit.c:1822
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   ditandai oleh %08lX pada %s\n"
 
-#: g10/keyedit.c:1791
+#: g10/keyedit.c:1792
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   dibatalkan oleh %08lX pada %s\n"
 
-#: g10/keyedit.c:1811
+#: g10/keyedit.c:1812
 msgid "You are about to revoke these signatures:\n"
 msgstr "Anda akan membatalkan signature ini:\n"
 
-#: g10/keyedit.c:1829
+#: g10/keyedit.c:1830
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1859
 msgid "no secret key\n"
 msgstr "tidak ada kunci rahasia\n"
 
@@ -2540,137 +2540,137 @@
 msgstr "revkey"
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:760
+#: g10/keylist.c:400 g10/mainproc.c:790
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "Kunci berakhir pada %s\n"
 
-#: g10/mainproc.c:213
+#: g10/mainproc.c:240
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "kunci publik adalah %08lX\n"
 
-#: g10/mainproc.c:257
+#: g10/mainproc.c:284
 msgid "public key encrypted data: good DEK\n"
 msgstr "data terenkripsi dengan kunci publik: DEK baik\n"
 
-#: g10/mainproc.c:299
+#: g10/mainproc.c:326
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "dienkripsi dengan %u-bit kunci %s, ID %08lX, tercipta %s\n"
 
-#: g10/mainproc.c:309
+#: g10/mainproc.c:336
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "dienkripsi dengan kunci %s, ID %08lX\n"
 
-#: g10/mainproc.c:315
+#: g10/mainproc.c:342
 msgid "no secret key for decryption available\n"
 msgstr "tidak tersedia kunci rahasia untuk dekripsi\n"
 
-#: g10/mainproc.c:324
+#: g10/mainproc.c:351
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "gagal dekripsi kunci publik: %s\n"
 
-#: g10/mainproc.c:361
+#: g10/mainproc.c:388
 msgid "decryption okay\n"
 msgstr "dekripsi lancar\n"
 
-#: g10/mainproc.c:366
+#: g10/mainproc.c:393
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "PERINGATAN: pesan terenkripsi telah dimanipulasi!\n"
 
-#: g10/mainproc.c:371
+#: g10/mainproc.c:398
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "gagal dekripsi: %s\n"
 
-#: g10/mainproc.c:390
+#: g10/mainproc.c:417
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "CATATAN: pengirim meminta \"for-your-eyes-only\"\n"
 
-#: g10/mainproc.c:392
+#: g10/mainproc.c:419
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nama file asli='%.*s'\n"
 
-#: g10/mainproc.c:544
+#: g10/mainproc.c:574
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:631 g10/mainproc.c:640
+#: g10/mainproc.c:661 g10/mainproc.c:670
 msgid "WARNING: invalid notation data found\n"
 msgstr "PERINGATAN: ditemukan notasi data tidak valid\n"
 
-#: g10/mainproc.c:643
+#: g10/mainproc.c:673
 msgid "Notation: "
 msgstr "Notasi: "
 
-#: g10/mainproc.c:650
+#: g10/mainproc.c:680
 msgid "Policy: "
 msgstr "Kebijakan: "
 
-#: g10/mainproc.c:1080
+#: g10/mainproc.c:1121
 msgid "signature verification suppressed\n"
 msgstr "verifikasi signature tidak optimal\n"
 
-#: g10/mainproc.c:1086
+#: g10/mainproc.c:1158
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Signature dibuat %.*s menggunakan kunci %s ID %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1112 g10/mainproc.c:1123
+#: g10/mainproc.c:1184 g10/mainproc.c:1195
 msgid "BAD signature from \""
 msgstr "signature BURUK dari \""
 
-#: g10/mainproc.c:1113 g10/mainproc.c:1124
+#: g10/mainproc.c:1185 g10/mainproc.c:1196
 msgid "Good signature from \""
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1115
+#: g10/mainproc.c:1187
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1171
+#: g10/mainproc.c:1243
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Tidak dapat memeriksa signature: %s\n"
 
-#: g10/mainproc.c:1235
+#: g10/mainproc.c:1318
 #, fuzzy, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "kelas signature tidak dikenal"
 
-#: g10/mainproc.c:1281
+#: g10/mainproc.c:1369
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature model lama (PGP 2.X)\n"
 
-#: g10/mainproc.c:1286
+#: g10/mainproc.c:1374
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "terdeteksi root paket tidak valid dalam proc_tree()\n"
 
-#: g10/misc.c:96
+#: g10/misc.c:97
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "tidak dapat meniadakan core dump: %s\n"
 
-#: g10/misc.c:206
+#: g10/misc.c:207
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Algoritma eksperimental sebaiknya tidak dipakai!\n"
 
-#: g10/misc.c:233
+#: g10/misc.c:234
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 "algoritma cipher ini didepresiasi; silakan gunakan yang lebih standar!\n"
 
-#: g10/parse-packet.c:117
+#: g10/parse-packet.c:119
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "tidak dapat menangani algoritma kunci publik %d\n"
 
-#: g10/parse-packet.c:986
+#: g10/parse-packet.c:991
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaket tipe %d memiliki bit kritis terset\n"
diff -urN gnupg-1.0.3/po/it.po gnupg-1.0.4/po/it.po
--- gnupg-1.0.3/po/it.po	Mon Sep 18 12:18:05 2000
+++ gnupg-1.0.4/po/it.po	Tue Oct 17 15:40:38 2000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.0.0h\n"
-"POT-Creation-Date: 2000-09-18 12:17+0200\n"
+"POT-Creation-Date: 2000-10-16 19:22+0200\n"
 "PO-Revision-Date: 1999-12-08 15:51+02:00\n"
 "Last-Translator: Marco d'Itri <md@linux.it>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -17,11 +17,11 @@
 msgid "Warning: using insecure memory!\n"
 msgstr "Attenzione: si sta usando memoria insicura!\n"
 
-#: util/secmem.c:289
+#: util/secmem.c:295
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "l'operazione non è possibile senza memoria sicura inizializzata\n"
 
-#: util/secmem.c:290
+#: util/secmem.c:296
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n"
 
@@ -256,7 +256,7 @@
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Hai trovato un bug... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1255
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
@@ -862,14 +862,14 @@
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
 
-#: g10/g10.c:1700
+#: g10/g10.c:1737
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "il primo carattere del nome di una nota deve essere una lettera o un\n"
 "underscore\n"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1743
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -877,11 +877,11 @@
 "il nome di una nota deve essere formato solo da lettere, numeri, punti o\n"
 "underscore e deve finire con `='\n"
 
-#: g10/g10.c:1712
+#: g10/g10.c:1749
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "nel nome di una nota i punti devono avere altri caratteri intorno\n"
 
-#: g10/g10.c:1720
+#: g10/g10.c:1757
 msgid "a notation value must not use any control characters\n"
 msgstr "il valore di una nota non deve usare caratteri di controllo\n"
 
@@ -944,20 +944,20 @@
 msgid "error in trailer line\n"
 msgstr "errore nella riga della coda\n"
 
-#: g10/armor.c:912
+#: g10/armor.c:906
 msgid "For info see http://www.gnupg.org"
 msgstr ""
 
-#: g10/armor.c:1033
+#: g10/armor.c:1027
 msgid "no valid OpenPGP data found.\n"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
 
-#: g10/armor.c:1038
+#: g10/armor.c:1032
 #, 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:1042
+#: g10/armor.c:1036
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -966,7 +966,7 @@
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1188 g10/pkclist.c:53
+#: g10/keyedit.c:1189 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "       Impronta digitale:"
 
@@ -1252,66 +1252,66 @@
 msgid "no valid addressees\n"
 msgstr "nessun indirizzo valido\n"
 
-#: g10/keygen.c:175
+#: g10/keygen.c:176
 msgid "writing self signature\n"
 msgstr "scrittura della autofirma\n"
 
-#: g10/keygen.c:213
+#: g10/keygen.c:214
 msgid "writing key binding signature\n"
 msgstr "scrittura della firma di collegamento alla chiave\n"
 
-#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:435
+#: g10/keygen.c:262 g10/keygen.c:346 g10/keygen.c:436
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "La dimensione richiesta della chiave è %u bit\n"
 
-#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:440
+#: g10/keygen.c:267 g10/keygen.c:351 g10/keygen.c:441
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "arrotondate a %u bit\n"
 
-#: g10/keygen.c:539
+#: g10/keygen.c:540
 msgid "Please select what kind of key you want:\n"
 msgstr "Per favore scegli che tipo di chiave vuoi:\n"
 
-#: g10/keygen.c:541
+#: g10/keygen.c:542
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (default)\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:543
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (firma solo)\n"
 
-#: g10/keygen.c:544
+#: g10/keygen.c:545
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (cifra solo)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:546
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (firma e cifra)\n"
 
-#: g10/keygen.c:547
+#: g10/keygen.c:548
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (firma e cifra)\n"
 
-#: g10/keygen.c:551
+#: g10/keygen.c:552
 msgid "Your selection? "
 msgstr "Cosa scegli? "
 
-#: g10/keygen.c:562 g10/keygen.c:570
+#: g10/keygen.c:563 g10/keygen.c:571
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "Vuoi davvero creare una chiave di firma e cifratura? "
 
-#: g10/keygen.c:584
+#: g10/keygen.c:585
 msgid "Invalid selection.\n"
 msgstr "Scelta non valida.\n"
 
-#: g10/keygen.c:596
+#: g10/keygen.c:597
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1324,19 +1324,19 @@
 "          la dimensione predefinita è 1024 bit\n"
 "  la dimensione massima consigliata è 2048 bit\n"
 
-#: g10/keygen.c:603
+#: g10/keygen.c:604
 msgid "What keysize do you want? (1024) "
 msgstr "Di che dimensioni vuoi la chiave? (1024) "
 
-#: g10/keygen.c:608
+#: g10/keygen.c:609
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA permette solo chiavi di dimensioni tra 512 e 1024\n"
 
-#: g10/keygen.c:610
+#: g10/keygen.c:611
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "la chiave è troppo corta; 768 è il minimo valore permesso.\n"
 
-#: g10/keygen.c:612
+#: g10/keygen.c:613
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "la chiave è troppo corta; 768 è il minimo valore permesso.\n"
@@ -1349,12 +1349,12 @@
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:623
+#: g10/keygen.c:624
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "la chiave è troppo lunga; %d è il massimo valore permesso.\n"
 
-#: g10/keygen.c:628
+#: g10/keygen.c:629
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1362,11 +1362,11 @@
 "Chiavi più lunghe di 2048 non sono consigliate perchè i calcoli sono\n"
 "VERAMENTE lunghi!\n"
 
-#: g10/keygen.c:631
+#: g10/keygen.c:632
 msgid "Are you sure that you want this keysize? "
 msgstr "Sei sicuro di volere una chiave di queste dimensioni? "
 
-#: g10/keygen.c:632
+#: g10/keygen.c:633
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1374,21 +1374,21 @@
 "Va bene, ma ricordati che anche le radiazioni emesse dal tuo monitor e dalla "
 "tua tastiera sono molto vulnerabili ad attacchi!\n"
 
-#: g10/keygen.c:640
+#: g10/keygen.c:641
 msgid "Do you really need such a large keysize? "
 msgstr "Ti serve davvero una chiave così lunga? "
 
-#: g10/keygen.c:646
+#: g10/keygen.c:647
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La dimensione richiesta della chiave è %u bit\n"
 
-#: g10/keygen.c:649 g10/keygen.c:653
+#: g10/keygen.c:650 g10/keygen.c:654
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrotondate a %u bit\n"
 
-#: g10/keygen.c:701
+#: g10/keygen.c:702
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1404,25 +1404,25 @@
 "      <n>m = la chiave scadrà dopo n mesi\n"
 "      <n>y = la chiave scadrà dopo n anni\n"
 
-#: g10/keygen.c:716
+#: g10/keygen.c:717
 msgid "Key is valid for? (0) "
 msgstr "Chiave valida per? (0) "
 
-#: g10/keygen.c:721
+#: g10/keygen.c:722
 msgid "invalid value\n"
 msgstr "valore non valido\n"
 
-#: g10/keygen.c:726
+#: g10/keygen.c:727
 msgid "Key does not expire at all\n"
 msgstr "La chiave non scade\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:732
+#: g10/keygen.c:733
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La chiave scadrà il %s\n"
 
-#: g10/keygen.c:735
+#: g10/keygen.c:736
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1430,11 +1430,11 @@
 "Il tuo sistema non può mostrare date oltre il 2038.\n"
 "Comunque, sarà gestita correttamente fino al 2106.\n"
 
-#: g10/keygen.c:740
+#: g10/keygen.c:741
 msgid "Is this correct (y/n)? "
 msgstr "È giusto (s/n)? "
 
-#: g10/keygen.c:783
+#: g10/keygen.c:784
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1450,44 +1450,44 @@
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:795
+#: g10/keygen.c:796
 msgid "Real name: "
 msgstr "Nome e Cognome: "
 
-#: g10/keygen.c:803
+#: g10/keygen.c:804
 msgid "Invalid character in name\n"
 msgstr "Carattere non valido nel nome\n"
 
-#: g10/keygen.c:805
+#: g10/keygen.c:806
 msgid "Name may not start with a digit\n"
 msgstr "Il nome non può iniziare con una cifra\n"
 
-#: g10/keygen.c:807
+#: g10/keygen.c:808
 msgid "Name must be at least 5 characters long\n"
 msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:816
 msgid "Email address: "
 msgstr "Indirizzo di Email: "
 
-#: g10/keygen.c:826
+#: g10/keygen.c:827
 msgid "Not a valid email address\n"
 msgstr "L'indirizzo di email non è valido\n"
 
-#: g10/keygen.c:834
+#: g10/keygen.c:835
 msgid "Comment: "
 msgstr "Commento: "
 
-#: g10/keygen.c:840
+#: g10/keygen.c:841
 msgid "Invalid character in comment\n"
 msgstr "Carattere non valido nel commento\n"
 
-#: g10/keygen.c:863
+#: g10/keygen.c:864
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Stai usando il set di caratteri `%s'.\n"
 
-#: g10/keygen.c:869
+#: g10/keygen.c:870
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1498,28 +1498,28 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:873
+#: g10/keygen.c:874
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:878
+#: g10/keygen.c:879
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:888
+#: g10/keygen.c:889
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (O)kay/(Q)uit? "
 
-#: g10/keygen.c:889
+#: g10/keygen.c:890
 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:908
+#: g10/keygen.c:909
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:946
+#: g10/keygen.c:947
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1527,11 +1527,11 @@
 "Ti serve una passphrase per proteggere la tua chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:954
+#: g10/keyedit.c:468 g10/keygen.c:955
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "passphrase non ripetuta correttamente; riprova.\n"
 
-#: g10/keygen.c:960
+#: g10/keygen.c:961
 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"
@@ -1543,7 +1543,7 @@
 "programma con l'opzione \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:981
+#: g10/keygen.c:982
 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"
@@ -1555,29 +1555,29 @@
 "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:1430
+#: g10/keygen.c:1431
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "La coppia DSA avrà 1024 bit.\n"
 
-#: g10/keygen.c:1473
+#: g10/keygen.c:1474
 msgid "Key generation canceled.\n"
 msgstr "Generazione della chiave annullata.\n"
 
-#: g10/keygen.c:1570
+#: g10/keygen.c:1571
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "scrittura del certificato pubblico in `%s'\n"
 
-#: g10/keygen.c:1571
+#: g10/keygen.c:1572
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "scrittura del certificato segreto in `%s'\n"
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1668
 msgid "public and secret key created and signed.\n"
 msgstr "chiavi pubbliche e segrete create e firmate.\n"
 
-#: g10/keygen.c:1672
+#: g10/keygen.c:1673
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1586,12 +1586,12 @@
 "il comando \"--edit-key\" per generare una chiave secondaria per questo "
 "scopo.\n"
 
-#: g10/keygen.c:1689 g10/keygen.c:1790
+#: g10/keygen.c:1690 g10/keygen.c:1791
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/keygen.c:1733 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1599,7 +1599,7 @@
 "la chiave è stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:1735 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1736 g10/sig-check.c:317 g10/sign.c:114
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1607,7 +1607,7 @@
 "la chiave è stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1769
 msgid "Really create? "
 msgstr "Crea davvero? "
 
@@ -2052,7 +2052,7 @@
 msgid "Really sign? "
 msgstr "Firmo davvero? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1870 g10/keyedit.c:1932 g10/sign.c:136
+#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallita: %s\n"
@@ -2311,201 +2311,201 @@
 msgid "enable a key"
 msgstr "abilita una chiave"
 
-#: g10/delkey.c:110 g10/keyedit.c:630
+#: g10/delkey.c:110 g10/keyedit.c:631
 msgid "can't do that in batchmode\n"
 msgstr "impossibile fare questo in modo batch\n"
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:668
+#: g10/keyedit.c:669
 msgid "Secret key is available.\n"
 msgstr "È disponibile una chiave segreta.\n"
 
-#: g10/keyedit.c:697
+#: g10/keyedit.c:698
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Need the secret key to do this.\n"
 msgstr "Per fare questo serve la chiave segreta.\n"
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:732
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:779
 msgid "Really sign all user IDs? "
 msgstr "Firmo davvero tutti gli user ID? "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:780
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Suggerimento: seleziona gli user ID da firmare\n"
 
-#: g10/keyedit.c:811 g10/keyedit.c:993
+#: g10/keyedit.c:812 g10/keyedit.c:994
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "aggiornamento del trustdb fallito: %s\n"
 
-#: g10/keyedit.c:822 g10/keyedit.c:843
+#: g10/keyedit.c:823 g10/keyedit.c:844
 msgid "You must select at least one user ID.\n"
 msgstr "Devi selezionare almeno un user ID.\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:825
 msgid "You can't delete the last user ID!\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:828
 msgid "Really remove all selected user IDs? "
 msgstr "Tolgo davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:829
 msgid "Really remove this user ID? "
 msgstr "Tolgo davvero questo user ID? "
 
-#: g10/keyedit.c:864 g10/keyedit.c:886
+#: g10/keyedit.c:865 g10/keyedit.c:887
 msgid "You must select at least one key.\n"
 msgstr "Devi selezionare almeno una chiave.\n"
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:869
 msgid "Do you really want to delete the selected keys? "
 msgstr "Vuoi davvero cancellare le chiavi selezionate? "
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:870
 msgid "Do you really want to delete this key? "
 msgstr "Vuoi davvero cancellare questa chiave? "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:891
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Vuoi davvero revocare le chiavi selezionate? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:892
 msgid "Do you really want to revoke this key? "
 msgstr "Vuoi davvero revocare questa chiave? "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:958
 msgid "Save changes? "
 msgstr "Salvo i cambiamenti? "
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:961
 msgid "Quit without saving? "
 msgstr "Esco senza salvare? "
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:972
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:979
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:986
 msgid "Key not changed so no update needed.\n"
 msgstr "La chiave non è cambiata quindi non sono necessari aggiornamenti.\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1001
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando non valido  (prova \"help\")\n"
 
-#: g10/keyedit.c:1080 g10/keyedit.c:1106
+#: g10/keyedit.c:1081 g10/keyedit.c:1107
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1089
+#: g10/keyedit.c:1090
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1093
+#: g10/keyedit.c:1094
 msgid "This key has been disabled"
 msgstr "Questa chiave è stata disabilitata"
 
-#: g10/keyedit.c:1122
+#: g10/keyedit.c:1123
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "chiave %08lX: la subchiave è stata revocata!\n"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1126
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "nuove revoche di chiavi: %lu\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1128
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Cancellare questa firma corretta? (s/N/q)"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1370
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Cancellare questa firma non valida? (s/N/q)"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1374
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1380
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Cancellare davvero questa autofirma? (s/N)"
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1394
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Cancellata %d firma.\n"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Cancellate %d firme.\n"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1398
 msgid "Nothing deleted.\n"
 msgstr "Non è stato cancellato nulla.\n"
 
-#: g10/keyedit.c:1466
+#: g10/keyedit.c:1467
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Togli le selezioni dalle chiavi segrete.\n"
 
-#: g10/keyedit.c:1472
+#: g10/keyedit.c:1473
 msgid "Please select at most one secondary key.\n"
 msgstr "Seleziona al massimo una chiave secondaria.\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1477
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
 
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1479
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambio la data di scadenza per la chiave primaria.\n"
 
-#: g10/keyedit.c:1520
+#: g10/keyedit.c:1521
 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:1536
+#: g10/keyedit.c:1537
 msgid "No corresponding signature in secret ring\n"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/keyedit.c:1597
+#: g10/keyedit.c:1598
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:1643
+#: g10/keyedit.c:1644
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nessuna chiave secondaria con l'indice %d\n"
 
-#: g10/keyedit.c:1741
+#: g10/keyedit.c:1742
 msgid "user ID: \""
 msgstr "user ID: \""
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1745
 #, c-format
 msgid ""
 "\"\n"
@@ -2515,34 +2515,34 @@
 "firmata con la tua chiave %08lX a %s\n"
 "\n"
 
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:1749
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "Creare un certificato di revoca per questa firma? (s/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1773
 msgid "You have signed these user IDs:\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:1786 g10/keyedit.c:1821
+#: g10/keyedit.c:1787 g10/keyedit.c:1822
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   firmata da %08lX il %s\n"
 
-#: g10/keyedit.c:1791
+#: g10/keyedit.c:1792
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revocata da %08lX il %s\n"
 
-#: g10/keyedit.c:1811
+#: g10/keyedit.c:1812
 msgid "You are about to revoke these signatures:\n"
 msgstr "Stai per revocare queste firme:\n"
 
-#: g10/keyedit.c:1829
+#: g10/keyedit.c:1830
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Creare davvero i certificati di revoca? (s/N)"
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1859
 msgid "no secret key\n"
 msgstr "manca la chiave segreta\n"
 
@@ -2557,136 +2557,136 @@
 msgstr "revkey"
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:760
+#: g10/keylist.c:400 g10/mainproc.c:790
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "La chiave scadrà il %s\n"
 
-#: g10/mainproc.c:213
+#: g10/mainproc.c:240
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "la chiave pubblica è %08lX\n"
 
-#: g10/mainproc.c:257
+#: g10/mainproc.c:284
 msgid "public key encrypted data: good DEK\n"
 msgstr "dati cifrati con la chiave pubblica: DEK corretto\n"
 
-#: g10/mainproc.c:299
+#: g10/mainproc.c:326
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, 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:309
+#: g10/mainproc.c:336
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "Cifrato con la chiave %s con ID %08lX\n"
 
-#: g10/mainproc.c:315
+#: g10/mainproc.c:342
 msgid "no secret key for decryption available\n"
 msgstr "nessuna chiave disponibile per decifrare\n"
 
-#: g10/mainproc.c:324
+#: g10/mainproc.c:351
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifratura della chiave pubblica fallita: %s\n"
 
-#: g10/mainproc.c:361
+#: g10/mainproc.c:388
 msgid "decryption okay\n"
 msgstr "decifratura corretta\n"
 
-#: g10/mainproc.c:366
+#: g10/mainproc.c:393
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENZIONE: il messaggio cifrato è stato manipolato!\n"
 
-#: g10/mainproc.c:371
+#: g10/mainproc.c:398
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/mainproc.c:390
+#: g10/mainproc.c:417
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: il mittente ha richiesto \"solo-per-i-tuoi-occhi\"\n"
 
-#: g10/mainproc.c:392
+#: g10/mainproc.c:419
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome del file originale='%.*s'\n"
 
-#: g10/mainproc.c:544
+#: g10/mainproc.c:574
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca solitaria - usa \"gpg --import\" per applicarla\n"
 
-#: g10/mainproc.c:631 g10/mainproc.c:640
+#: g10/mainproc.c:661 g10/mainproc.c:670
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATTENZIONE: trovati dati di una nota non validi\n"
 
-#: g10/mainproc.c:643
+#: g10/mainproc.c:673
 msgid "Notation: "
 msgstr "Nota: "
 
-#: g10/mainproc.c:650
+#: g10/mainproc.c:680
 msgid "Policy: "
 msgstr "Policy: "
 
-#: g10/mainproc.c:1080
+#: g10/mainproc.c:1121
 msgid "signature verification suppressed\n"
 msgstr "verifica della firma soppressa\n"
 
-#: g10/mainproc.c:1086
+#: g10/mainproc.c:1158
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Firma fatta %.*s usando la chiave %s con ID %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1112 g10/mainproc.c:1123
+#: g10/mainproc.c:1184 g10/mainproc.c:1195
 msgid "BAD signature from \""
 msgstr "Firma NON corretta da \""
 
-#: g10/mainproc.c:1113 g10/mainproc.c:1124
+#: g10/mainproc.c:1185 g10/mainproc.c:1196
 msgid "Good signature from \""
 msgstr "Firma valida da \""
 
-#: g10/mainproc.c:1115
+#: g10/mainproc.c:1187
 msgid "                aka \""
 msgstr "    anche noto come \""
 
-#: g10/mainproc.c:1171
+#: g10/mainproc.c:1243
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossibile controllare la firma: %s\n"
 
-#: g10/mainproc.c:1235
+#: g10/mainproc.c:1318
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma solitaria di classe 0x%02x\n"
 
-#: g10/mainproc.c:1281
+#: g10/mainproc.c:1369
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma vecchio stile (PGP 2.x)\n"
 
-#: g10/mainproc.c:1286
+#: g10/mainproc.c:1374
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "individuato un pacchetto radice non valido in proc_tree()\n"
 
-#: g10/misc.c:96
+#: g10/misc.c:97
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "impossibile disabilitare i core dump: %s\n"
 
-#: g10/misc.c:206
+#: g10/misc.c:207
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Gli algoritmi sperimentali non dovrebbero essere usati!\n"
 
-#: g10/misc.c:233
+#: g10/misc.c:234
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr "questo algoritmo di cifratura è deprecato; usane uno più standard!\n"
 
-#: g10/parse-packet.c:117
+#: g10/parse-packet.c:119
 #, 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:986
+#: g10/parse-packet.c:991
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
diff -urN gnupg-1.0.3/po/ja.po gnupg-1.0.4/po/ja.po
--- gnupg-1.0.3/po/ja.po	Mon Sep 18 12:18:05 2000
+++ gnupg-1.0.4/po/ja.po	Tue Oct 17 15:40:38 2000
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-09-18 12:17+0200\n"
+"POT-Creation-Date: 2000-10-16 19:22+0200\n"
 "PO-Revision-Date: 2000-02-16 20:10+09:00\n"
 "Last-Translator: IIDA Yosiaki <iida@secom.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -19,11 +19,11 @@
 msgid "Warning: using insecure memory!\n"
 msgstr "·Ù¹ð: °ÂÁ´¤Ç¤Ê¤¤¥á¥â¥ê¡¼¤ò»ÈÍѤ·¤Æ¤¤¤Þ¤¹!\n"
 
-#: util/secmem.c:289
+#: util/secmem.c:295
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "½é´ü²½¤µ¤ì¤¿°ÂÁ´¤Ê¥á¥â¥ê¡¼¤¬Ìµ¤¤¾ì¹ç¤Ë¤Ï¼Â¹Ô¤Ç¤­¤Þ¤»¤ó\n"
 
-#: util/secmem.c:290
+#: util/secmem.c:296
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(¤³¤ÎÌÜŪ¤Ë¤ÏÉÔŬÀÚ¤Ê¥×¥í¥°¥é¥à¤òÍѤ¤¤¿¤Î¤Ç¤·¤ç¤¦)\n"
 
@@ -257,7 +257,7 @@
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "¥Ð¥°¤ò¸«¤Ä¤±¤¿¤è¤¦¤Ç¤¹ ... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1255
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' ¤¬³«¤±¤Þ¤»¤ó: %s\n"
@@ -859,12 +859,12 @@
 msgid "can't open `%s'\n"
 msgstr "`%s' ¤¬³«¤±¤Þ¤»¤ó\n"
 
-#: g10/g10.c:1700
+#: g10/g10.c:1737
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "Ãí¼á̾¤ÎÀèƬ¤Ïʸ»ú¤«¥¢¥ó¥À¡¼¥¹¥³¥¢(_)¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1743
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -872,11 +872,11 @@
 "Ãí¼á̾¤Ë¤Ïʸ»ú¡¢¿ô»ú¡¢¥É¥Ã¥È¡¢¥¢¥ó¥À¡¼¥¹¥³¥¢(_)¤Î¤ß¤òÍѤ¤¡¢'=' "
 "¤òȼ¤ï¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
 
-#: g10/g10.c:1712
+#: g10/g10.c:1749
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "Ãí¼á̾¤Î¥É¥Ã¥È¤Ï¾¤Îʸ»ú¤Ç°Ï¤Þ¤ì¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
 
-#: g10/g10.c:1720
+#: g10/g10.c:1757
 msgid "a notation value must not use any control characters\n"
 msgstr "Ãí¼á̾¤ÎÃͤËÀ©¸æʸ»ú¤òÍѤ¤¤Æ¤Ï¤¤¤±¤Þ¤»¤ó\n"
 
@@ -939,20 +939,20 @@
 msgid "error in trailer line\n"
 msgstr "Trailer ¹Ô¤Ë¥¨¥é¡¼¤¬¤¢¤ê¤Þ¤¹\n"
 
-#: g10/armor.c:912
+#: g10/armor.c:906
 msgid "For info see http://www.gnupg.org"
 msgstr ""
 
-#: g10/armor.c:1033
+#: g10/armor.c:1027
 msgid "no valid OpenPGP data found.\n"
 msgstr "Í­¸ú¤Ê OpenPGP ¥Ç¡¼¥¿¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
 
-#: g10/armor.c:1038
+#: g10/armor.c:1032
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "̵¸ú¤ÊÁõ¹Ã: ¹Ô¤ÎŤµ¤¬ %d ʸ»ú¤ò±Û¤¨¤Æ¤¤¤Þ¤¹\n"
 
-#: g10/armor.c:1042
+#: g10/armor.c:1036
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -961,7 +961,7 @@
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1188 g10/pkclist.c:53
+#: g10/keyedit.c:1189 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "             »ØÌæ:"
 
@@ -1241,66 +1241,66 @@
 msgid "no valid addressees\n"
 msgstr "Í­¸ú¤Ê¥¢¥É¥ì¥¹¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/keygen.c:175
+#: g10/keygen.c:176
 msgid "writing self signature\n"
 msgstr "¼«¸Ê½ð̾¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n"
 
-#: g10/keygen.c:213
+#: g10/keygen.c:214
 msgid "writing key binding signature\n"
 msgstr "½ð̾¤ËÂбþ¤¹¤ë¸°¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n"
 
-#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:435
+#: g10/keygen.c:262 g10/keygen.c:346 g10/keygen.c:436
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Í׵ᤵ¤ì¤¿¸°¥µ¥¤¥º¤Ï %u ¥Ó¥Ã¥È\n"
 
-#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:440
+#: g10/keygen.c:267 g10/keygen.c:351 g10/keygen.c:441
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "%u ¥Ó¥Ã¥È¤Ë´Ý¤á¤Þ¤¹\n"
 
-#: g10/keygen.c:539
+#: g10/keygen.c:540
 msgid "Please select what kind of key you want:\n"
 msgstr "¸°¤Î¼ïÎà¤òÁªÂò¤·¤Æ²¼¤µ¤¤:\n"
 
-#: g10/keygen.c:541
+#: g10/keygen.c:542
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA ¤È ElGamal (¥Ç¥Õ¥©¥ë¥È)\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:543
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (½ð̾¤Î¤ß)\n"
 
-#: g10/keygen.c:544
+#: g10/keygen.c:545
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (°Å¹æ²½¤Î¤ß)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:546
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (½ð̾¤È°Å¹æ²½)\n"
 
-#: g10/keygen.c:547
+#: g10/keygen.c:548
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (½ð̾¤È°Å¹æ²½)\n"
 
-#: g10/keygen.c:551
+#: g10/keygen.c:552
 msgid "Your selection? "
 msgstr "¤É¤ì¤òÁª¤Ó¤Þ¤¹¤«? "
 
-#: g10/keygen.c:562 g10/keygen.c:570
+#: g10/keygen.c:563 g10/keygen.c:571
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "ËÜÅö¤Ë½ð̾¤È°Å¹æÍѤθ°¤òºî¤ê¤Þ¤¹¤«? "
 
-#: g10/keygen.c:584
+#: g10/keygen.c:585
 msgid "Invalid selection.\n"
 msgstr "̵¸ú¤ÊÁªÂò¤Ç¤¹¡£\n"
 
-#: g10/keygen.c:596
+#: g10/keygen.c:597
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1313,19 +1313,19 @@
 "          ¥Ç¥Õ¥©¥ë¥È¤Î¸°¥µ¥¤¥º¤Ï 1024 ¥Ó¥Ã¥È\n"
 "                ºÇÂç¤Î¸°¥µ¥¤¥º¤Ï 2048 ¥Ó¥Ã¥È\n"
 
-#: g10/keygen.c:603
+#: g10/keygen.c:604
 msgid "What keysize do you want? (1024) "
 msgstr "¤É¤Î¸°¥µ¥¤¥º¤òÁªÂò¤·¤Þ¤¹¤«? (1024) "
 
-#: g10/keygen.c:608
+#: g10/keygen.c:609
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA ¤Î¸°¥µ¥¤¥º¤Ï 512 ¤«¤é 1024 ¤Þ¤Ç¤Ç¤¹\n"
 
-#: g10/keygen.c:610
+#: g10/keygen.c:611
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "¸°¥µ¥¤¥º¤¬¾®¤µ¤¹¤®¤Þ¤¹; 768 ¤¬ºÇ¾®¤Ç¤¹¡£\n"
 
-#: g10/keygen.c:612
+#: g10/keygen.c:613
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "¸°¥µ¥¤¥º¤¬¾®¤µ¤¹¤®¤Þ¤¹; 768 ¤¬ºÇ¾®¤Ç¤¹¡£\n"
@@ -1338,12 +1338,12 @@
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:623
+#: g10/keygen.c:624
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "¸°¥µ¥¤¥º¤¬Â礭¤¹¤®¤Þ¤¹; %d ¤¬ºÇÂç¤Ç¤¹¡£\n"
 
-#: g10/keygen.c:628
+#: g10/keygen.c:629
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1351,11 +1351,11 @@
 "2048 °Ê¾å¤Î¸°¥µ¥¤¥º¤Ï¡¢·×»»»þ´Ö¤¬ Èó¾ï¤Ë Ť¯¤Ê¤ë¤Î¤Ç\n"
 "¿ä¾©¤·¤Þ¤»¤ó!\n"
 
-#: g10/keygen.c:631
+#: g10/keygen.c:632
 msgid "Are you sure that you want this keysize? "
 msgstr "¤³¤Î¸°¥µ¥¤¥º¤ÇËÜÅö¤ËÎɤ¤¤Ç¤¹¤«? "
 
-#: g10/keygen.c:632
+#: g10/keygen.c:633
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1363,21 +1363,21 @@
 "¤ï¤«¤ê¤Þ¤·¤¿¡£¤·¤«¤·¡¢¤¢¤Ê¤¿¤Î¥â¥Ë¥¿¡¼¤ä¥­¡¼¥Ü¡¼¥ÉÆþÎϤϡ¢¹¶·â¤ËÂФ·¤Æ "
 "¤¹¤­¤À¤é¤±¤Ç¤¢¤ë¤³¤È¤ò¿´¤Ëα¤á¤Æ¤ª¤¤¤Æ²¼¤µ¤¤!\n"
 
-#: g10/keygen.c:640
+#: g10/keygen.c:641
 msgid "Do you really need such a large keysize? "
 msgstr "¤¢¤Ê¤¿¤ÏËÜÅö¤Ë¤³¤Î¤è¤¦¤ÊŤ¤¸°¤¬É¬ÍפǤ¹¤«? "
 
-#: g10/keygen.c:646
+#: g10/keygen.c:647
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Í׵ᤵ¤ì¤¿¸°¥µ¥¤¥º¤Ï %u ¥Ó¥Ã¥È\n"
 
-#: g10/keygen.c:649 g10/keygen.c:653
+#: g10/keygen.c:650 g10/keygen.c:654
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%u ¥Ó¥Ã¥È¤Ë´Ý¤á¤Þ¤¹\n"
 
-#: g10/keygen.c:701
+#: g10/keygen.c:702
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1393,25 +1393,25 @@
 "      <n>m = Í­¸ú´ü¸Â n ·î\n"
 "      <n>y = Í­¸ú´ü¸Â n ǯ\n"
 
-#: g10/keygen.c:716
+#: g10/keygen.c:717
 msgid "Key is valid for? (0) "
 msgstr "¸°¤ÎÍ­¸úÀ­¤Ï? (0)"
 
-#: g10/keygen.c:721
+#: g10/keygen.c:722
 msgid "invalid value\n"
 msgstr "̵¸ú¤ÊÃÍ\n"
 
-#: g10/keygen.c:726
+#: g10/keygen.c:727
 msgid "Key does not expire at all\n"
 msgstr "¸°¤Ï̵´ü¸Â¤Ç¤¹\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:732
+#: g10/keygen.c:733
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "¸°¤Ï %s ¤Ë¤Æ´ü¸ÂÀÚ¤ì¤Ë¤Ê¤ê¤Þ¤¹\n"
 
-#: g10/keygen.c:735
+#: g10/keygen.c:736
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1419,11 +1419,11 @@
 "¤³¤Î¥·¥¹¥Æ¥à¤Ç¤Ï¡¢2038ǯ°Ê¹ß¤ÎÆüÉÕ¤òɽ¼¨¤Ç¤­¤Þ¤»¤ó¤¬¡¢\n"
 "2106ǯ¤Þ¤Ç¤Ê¤éÀµ¤·¤¯½èÍý¤Ç¤­¤Þ¤¹¡£\n"
 
-#: g10/keygen.c:740
+#: g10/keygen.c:741
 msgid "Is this correct (y/n)? "
 msgstr "¤³¤ì¤ÇÎɤ¤¤Ç¤¹¤« (y/n)? "
 
-#: g10/keygen.c:783
+#: g10/keygen.c:784
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1439,44 +1439,44 @@
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:795
+#: g10/keygen.c:796
 msgid "Real name: "
 msgstr "ËÜ̾: "
 
-#: g10/keygen.c:803
+#: g10/keygen.c:804
 msgid "Invalid character in name\n"
 msgstr "̾Á°¤Ë̵¸ú¤Êʸ»ú¤¬¤¢¤ê¤Þ¤¹\n"
 
-#: g10/keygen.c:805
+#: g10/keygen.c:806
 msgid "Name may not start with a digit\n"
 msgstr "̾Á°¤Ï¿ô»ú¤Ç»Ï¤Þ¤Ã¤Æ¤Ï¤¤¤±¤Þ¤»¤ó\n"
 
-#: g10/keygen.c:807
+#: g10/keygen.c:808
 msgid "Name must be at least 5 characters long\n"
 msgstr "̾Á°¤Ï 5 ʸ»ú°Ê¾å¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:816
 msgid "Email address: "
 msgstr "ÅŻҥ᡼¥ë¥¢¥É¥ì¥¹: "
 
-#: g10/keygen.c:826
+#: g10/keygen.c:827
 msgid "Not a valid email address\n"
 msgstr "Í­¸ú¤ÊÅŻҥ᡼¥ë¥¢¥É¥ì¥¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/keygen.c:834
+#: g10/keygen.c:835
 msgid "Comment: "
 msgstr "Ãí¼á: "
 
-#: g10/keygen.c:840
+#: g10/keygen.c:841
 msgid "Invalid character in comment\n"
 msgstr "Ãí¼á¤Ë̵¸ú¤Êʸ»ú¤¬¤¢¤ê¤Þ¤¹\n"
 
-#: g10/keygen.c:863
+#: g10/keygen.c:864
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "¤¢¤Ê¤¿¤Ïʸ»ú¥³¡¼¥É `%s' ¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: g10/keygen.c:869
+#: g10/keygen.c:870
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1487,28 +1487,28 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:873
+#: g10/keygen.c:874
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:878
+#: g10/keygen.c:879
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:888
+#: g10/keygen.c:889
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 
-#: g10/keygen.c:889
+#: g10/keygen.c:890
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 
-#: g10/keygen.c:908
+#: g10/keygen.c:909
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:946
+#: g10/keygen.c:947
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1516,11 +1516,11 @@
 "ÈëÌ©¸°¤òÊݸ¤ë¤¿¤á¤Ë¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬É¬ÍפǤ¹¡£\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:954
+#: g10/keyedit.c:468 g10/keygen.c:955
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬°Û¤Ê¤ê¤Þ¤¹¡£¤â¤¦°ìÅÙÀßÄꤷ¤Æ²¼¤µ¤¤¡£\n"
 
-#: g10/keygen.c:960
+#: g10/keygen.c:961
 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"
@@ -1532,7 +1532,7 @@
 "¥ª¥×¥·¥ç¥ó¤Ë¤è¤Ã¤Æ¡¢¤¤¤Ä¤Ç¤âÊѹ¹¤Ç¤­¤Þ¤¹¡£\n"
 "\n"
 
-#: g10/keygen.c:981
+#: g10/keygen.c:982
 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"
@@ -1543,29 +1543,29 @@
 "¥Ç¥£¥¹¥¯¤Ë¥¢¥¯¥»¥¹¤¹¤ë¤Ê¤É¤Î¾¤Î¹ÔÆ°¤òƱ»þ¤Ë¹Ô¤¦¤È¡¢Íð¿ôÀ¸À®ÁõÃ֤ˤÆ\n"
 "Í𻨤µ¤ÎÂ礭¤ÊÎɤ¤Íð¿ô¤òÀ¸À®¤·¤ä¤¹¤¯¤Ê¤ê¤Þ¤¹¤Î¤Ç¡¢¤ª´«¤á¤·¤Þ¤¹¡£\n"
 
-#: g10/keygen.c:1430
+#: g10/keygen.c:1431
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA ¸°¥Ú¥¢¤Ï 1024 ¥Ó¥Ã¥È¤Ë¤Ê¤ê¤Þ¤¹\n"
 
-#: g10/keygen.c:1473
+#: g10/keygen.c:1474
 msgid "Key generation canceled.\n"
 msgstr "¸°¤ÎÀ¸À®¤¬Ãæ»ß¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: g10/keygen.c:1570
+#: g10/keygen.c:1571
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "`%s' ¤Ø¤Î¸ø³«¾ÚÌÀ½ñ¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n"
 
-#: g10/keygen.c:1571
+#: g10/keygen.c:1572
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "`%s' ¤Ø¤ÎÈëÌ©¾ÚÌÀ½ñ¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n"
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1668
 msgid "public and secret key created and signed.\n"
 msgstr "¸ø³«¸°¤ÈÈëÌ©¸°¤¬ºîÀ®¤µ¤ì¡¢½ð̾¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: g10/keygen.c:1672
+#: g10/keygen.c:1673
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1573,24 +1573,24 @@
 "¤³¤Î¸°¤Ï°Å¹æ²½¤Ë¤Ï»ÈÍѤǤ­¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£°Å¹æ²½¤ò¹Ô¤¦¤Ë¤Ï¡¢\n"
 "\"--edit-key\" ¥³¥Þ¥ó¥É¤òÍѤ¤¤ÆÉû¸°¤òºîÀ®¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: g10/keygen.c:1689 g10/keygen.c:1790
+#: g10/keygen.c:1690 g10/keygen.c:1791
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "¸°¤ÎºîÀ®¤Ë¼ºÇÔ: %s\n"
 
-#: g10/keygen.c:1733 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "¸°¤Ï %lu ÉÃ̤Íè¤ËºîÀ®¤µ¤ì¤Þ¤·¤¿ (»þ´Öι¹Ô¤«»þ·×¤Î¤¯¤ë¤¤¤Ç¤·¤ç¤¦)\n"
 
-#: g10/keygen.c:1735 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1736 g10/sig-check.c:317 g10/sign.c:114
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "¸°¤Ï %lu ÉÃ̤Íè¤ËºîÀ®¤µ¤ì¤Þ¤·¤¿ (»þ´Öι¹Ô¤«»þ·×¤Î¤¯¤ë¤¤¤Ç¤·¤ç¤¦)\n"
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1769
 msgid "Really create? "
 msgstr "ËÜÅö¤ËºîÀ®¤·¤Þ¤¹¤«? "
 
@@ -2031,7 +2031,7 @@
 msgid "Really sign? "
 msgstr "ËÜÅö¤Ë½ð̾¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1870 g10/keyedit.c:1932 g10/sign.c:136
+#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "½ð̾¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
@@ -2290,201 +2290,201 @@
 msgid "enable a key"
 msgstr "¸°¤ò»ÈÍѲĤˤ¹¤ë"
 
-#: g10/delkey.c:110 g10/keyedit.c:630
+#: g10/delkey.c:110 g10/keyedit.c:631
 msgid "can't do that in batchmode\n"
 msgstr "¤½¤ì¤Ï¥Ð¥Ã¥Á¥â¡¼¥É¤Ç¤Ï¼Â¹Ô¤Ç¤­¤Þ¤»¤ó\n"
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:668
+#: g10/keyedit.c:669
 msgid "Secret key is available.\n"
 msgstr "ÈëÌ©¸°¤¬»ÈÍѤǤ­¤Þ¤¹\n"
 
-#: g10/keyedit.c:697
+#: g10/keyedit.c:698
 msgid "Command> "
 msgstr "¥³¥Þ¥ó¥É> "
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Need the secret key to do this.\n"
 msgstr "¤³¤ì¤ò¼Â¹Ô¤¹¤ë¤Ë¤ÏÈëÌ©¸°¤¬É¬ÍפǤ¹¡£\n"
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:732
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:779
 msgid "Really sign all user IDs? "
 msgstr "Á´¤Æ¤Î¥æ¡¼¥¶ ID ¤Ë ËÜÅö¤Ë ½ð̾¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:780
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "¥Ò¥ó¥È: ½ð̾¤¹¤ë¥æ¡¼¥¶ ID  ¤òÁªÂò\n"
 
-#: g10/keyedit.c:811 g10/keyedit.c:993
+#: g10/keyedit.c:812 g10/keyedit.c:994
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î¹¹¿·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: g10/keyedit.c:822 g10/keyedit.c:843
+#: g10/keyedit.c:823 g10/keyedit.c:844
 msgid "You must select at least one user ID.\n"
 msgstr "¾¯¤Ê¤¯¤È¤â 1 ¸Ä¤Î¥æ¡¼¥¶ ID ¤òÁªÂò¤·¤Æ²¼¤µ¤¤¡£\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:825
 msgid "You can't delete the last user ID!\n"
 msgstr "ºÇ¸å¥æ¡¼¥¶ ID ¤Î½ð̾¤Ïºï½ü¤Ç¤­¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:828
 msgid "Really remove all selected user IDs? "
 msgstr "ÁªÂò¤·¤¿¥æ¡¼¥¶ ID ¤ò ËÜÅö¤Ë ºï½ü¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:829
 msgid "Really remove this user ID? "
 msgstr "¤³¤Î¥æ¡¼¥¶ ID ¤ò ËÜÅö¤Ë ºï½ü¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:864 g10/keyedit.c:886
+#: g10/keyedit.c:865 g10/keyedit.c:887
 msgid "You must select at least one key.\n"
 msgstr "¾¯¤Ê¤¯¤È¤â 1 ¸Ä¤Î¸°¤òÁªÂò¤·¤Æ²¼¤µ¤¤¡£\n"
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:869
 msgid "Do you really want to delete the selected keys? "
 msgstr "ÁªÂò¤·¤¿¸°¤ò ËÜÅö¤Ë ºï½ü¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:870
 msgid "Do you really want to delete this key? "
 msgstr "¤³¤Î¸°¤ò ËÜÅö¤Ë ºï½ü¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:891
 msgid "Do you really want to revoke the selected keys? "
 msgstr "ÁªÂò¤·¤¿¸°¤ò ËÜÅö¤Ë ÇË´þ¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:892
 msgid "Do you really want to revoke this key? "
 msgstr "¤³¤Î¸°¤ò ËÜÅö¤Ë ÇË´þ¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:958
 msgid "Save changes? "
 msgstr "Êѹ¹¤òÊݸ¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:961
 msgid "Quit without saving? "
 msgstr "Êݸ¤»¤º¤Ë½ªÎ»¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:972
 #, c-format
 msgid "update failed: %s\n"
 msgstr "¹¹¿·¤Ë¼ºÇÔ: %s\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:979
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "ÈëÌ©¸°¤Î¹¹¿·¤Ë¼ºÇÔ: %s\n"
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:986
 msgid "Key not changed so no update needed.\n"
 msgstr "¸°¤ÏÊѹ¹¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¤Î¤Ç¹¹¿·¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1001
 msgid "Invalid command  (try \"help\")\n"
 msgstr "̵¸ú¤Ê¥³¥Þ¥ó¥É (\"help\" ¤ò¸«¤è)\n"
 
-#: g10/keyedit.c:1080 g10/keyedit.c:1106
+#: g10/keyedit.c:1081 g10/keyedit.c:1107
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1089
+#: g10/keyedit.c:1090
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1093
+#: g10/keyedit.c:1094
 msgid "This key has been disabled"
 msgstr "¤³¤Î¸°¤Ï»ÈÍÑÉԲĤËÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: g10/keyedit.c:1122
+#: g10/keyedit.c:1123
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "¸° %08lX: Éû¸°¤ÏÇË´þºÑ¤ß¤Ç¤¹!\n"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1126
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "        ¿·¤¿¤Ê¸°¤ÎÇË´þ: %lu\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1128
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "Delete this good signature? (y/N/q)"
 msgstr "¤³¤ÎÀµ¤·¤¤½ð̾¤òºï½ü¤·¤Þ¤¹¤«? (y/N/q)"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1370
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "¤³¤Î̵¸ú¤Ê½ð̾¤òºï½ü¤·¤Þ¤¹¤«? (y/N/q)"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1374
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "¤³¤ÎÉÔÌÀ¤Ê½ð̾¤òºï½ü¤·¤Þ¤¹¤«? (y/N/q)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1380
 msgid "Really delete this self-signature? (y/N)"
 msgstr "¤³¤Î¼«¸Ê½ð̾¤ò ËÜÅö¤Ë ºï½ü¤·¤Þ¤¹¤«? (y/N)"
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1394
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d ¸Ä¤Î½ð̾¤òºï½ü¤·¤Þ¤·¤¿¡£\n"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d ¸Ä¤Î½ð̾¤òºï½ü¤·¤Þ¤·¤¿¡£\n"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1398
 msgid "Nothing deleted.\n"
 msgstr "²¿¤âºï½ü¤·¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#: g10/keyedit.c:1466
+#: g10/keyedit.c:1467
 msgid "Please remove selections from the secret keys.\n"
 msgstr "ÈëÌ©¸°¤ÎÁªÂò¤òºï½ü¤·¤Æ²¼¤µ¤¤¡£\n"
 
-#: g10/keyedit.c:1472
+#: g10/keyedit.c:1473
 msgid "Please select at most one secondary key.\n"
 msgstr "¿¤¯¤Æ¤â 1 ¸Ä¤ÎÉû¸°¤òÁªÂò¤·¤Æ²¼¤µ¤¤¡£\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1477
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Éû¸°¤ÎÍ­¸ú´ü¸Â¤òÊѹ¹¤·¤Þ¤¹¡£\n"
 
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1479
 msgid "Changing expiration time for the primary key.\n"
 msgstr "¼ç¸°¤ÎÍ­¸ú´ü¸Â¤òÊѹ¹¤·¤Þ¤¹¡£\n"
 
-#: g10/keyedit.c:1520
+#: g10/keyedit.c:1521
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3 ¸°¤ÎÍ­¸ú´ü¸Â¤òÊѹ¹¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹\n"
 
-#: g10/keyedit.c:1536
+#: g10/keyedit.c:1537
 msgid "No corresponding signature in secret ring\n"
 msgstr "ÈëÌ©¸°¥ê¥ó¥°¤ËÂбþ¤¹¤ë½ð̾¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:1597
+#: g10/keyedit.c:1598
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d È֤Υ桼¥¶ ID ¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:1643
+#: g10/keyedit.c:1644
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "%d ÈÖ¤ÎÉû¸°¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:1741
+#: g10/keyedit.c:1742
 msgid "user ID: \""
 msgstr "¥æ¡¼¥¶ ID: \""
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1745
 #, c-format
 msgid ""
 "\"\n"
@@ -2493,34 +2493,34 @@
 "\"\n"
 "¤¢¤Ê¤¿¤Î¸° %08lX ¤Ç %s ¤Ë½ð̾¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
 
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:1749
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "¤³¤Î½ð̾¤ËÂФ¹¤ëÇË´þ¾ÚÌÀ½ñ¤òºîÀ®¤·¤Þ¤¹¤«? (y/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1773
 msgid "You have signed these user IDs:\n"
 msgstr "¤³¤ì¤é¤Î¥æ¡¼¥¶ ID ¤Ë½ð̾¤·¤Þ¤·¤¿:\n"
 
-#: g10/keyedit.c:1786 g10/keyedit.c:1821
+#: g10/keyedit.c:1787 g10/keyedit.c:1822
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   %08lX ¤Ë¤è¤Ã¤Æ %s ¤Ë½ð̾¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
 
-#: g10/keyedit.c:1791
+#: g10/keyedit.c:1792
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   %08lX ¤Ë¤è¤Ã¤Æ %s ¤ËÇË´þ¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
 
-#: g10/keyedit.c:1811
+#: g10/keyedit.c:1812
 msgid "You are about to revoke these signatures:\n"
 msgstr "¤¢¤Ê¤¿¤Ï¤³¤ì¤é¤Î½ð̾¤òÇË´þ¤¹¤ë¤«Ì¤äƤ¤¤Þ¤¹:\n"
 
-#: g10/keyedit.c:1829
+#: g10/keyedit.c:1830
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "ÇË´þ¾ÚÌÀ½ñ¤ò ËÜÅö¤Ë ºîÀ®¤·¤Þ¤¹¤«? (y/N)"
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1859
 msgid "no secret key\n"
 msgstr "ÈëÌ©¸°¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
@@ -2535,136 +2535,136 @@
 msgstr "revkey"
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:760
+#: g10/keylist.c:400 g10/mainproc.c:790
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "¸°¤Ï %s ¤Ë¤Æ´ü¸ÂÀÚ¤ì¤Ë¤Ê¤ê¤Þ¤¹\n"
 
-#: g10/mainproc.c:213
+#: g10/mainproc.c:240
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "¸ø³«¸°¤Ï %08lX ¤Ç¤¹\n"
 
-#: g10/mainproc.c:257
+#: g10/mainproc.c:284
 msgid "public key encrypted data: good DEK\n"
 msgstr "¸ø³«¸°¤Ç°Å¹æ²½¤µ¤ì¤¿¥Ç¡¼¥¿: Àµ¤·¤¤ DEK ¤Ç¤¹\n"
 
-#: g10/mainproc.c:299
+#: g10/mainproc.c:326
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "%u ¥Ó¥Ã¥È %s ¸°, ID %08lX ¤Ë¤è¤Ã¤Æ°Å¹æ²½¤µ¤ì¤Þ¤·¤¿ %s\n"
 
-#: g10/mainproc.c:309
+#: g10/mainproc.c:336
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "%s ¸°, ID %08lX ¤Ë¤è¤Ã¤Æ°Å¹æ²½¤µ¤ì¤Þ¤·¤¿\n"
 
-#: g10/mainproc.c:315
+#: g10/mainproc.c:342
 msgid "no secret key for decryption available\n"
 msgstr "Éü¹æ¤ËɬÍפÊÈëÌ©¸°¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/mainproc.c:324
+#: g10/mainproc.c:351
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "¸ø³«¸°¤ÎÉü¹æ¤Ë¼ºÇÔ: %s\n"
 
-#: g10/mainproc.c:361
+#: g10/mainproc.c:388
 msgid "decryption okay\n"
 msgstr "Éü¹æ¤ËÀ®¸ù\n"
 
-#: g10/mainproc.c:366
+#: g10/mainproc.c:393
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "·Ù¹ð: °Å¹æ²½¤µ¤ì¤¿¥á¥Ã¥»¡¼¥¸¤Ï²þã⤵¤ì¤Æ¤¤¤Þ¤¹!\n"
 
-#: g10/mainproc.c:371
+#: g10/mainproc.c:398
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Éü¹æ¤Ë¼ºÇÔ: %s\n"
 
-#: g10/mainproc.c:390
+#: g10/mainproc.c:417
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "Ãí°Õ: Á÷¿®¼Ô¤Ï¡ÖÆɤ߽ª¤¨¤¿¤éºï½ü¤¹¤ë¡×¤è¤¦¤Ëµá¤á¤Æ¤¤¤Þ¤¹\n"
 
-#: g10/mainproc.c:392
+#: g10/mainproc.c:419
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "¸µ¤Î¥Õ¥¡¥¤¥ë̾='%.*s'\n"
 
-#: g10/mainproc.c:544
+#: g10/mainproc.c:574
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "ÆÈΩÇË´þ¡£¡Ögpg --import¡×¤ò»È¤Ã¤ÆŬÍѤ·¤Æ¤¯¤À¤µ¤¤\n"
 
-#: g10/mainproc.c:631 g10/mainproc.c:640
+#: g10/mainproc.c:661 g10/mainproc.c:670
 msgid "WARNING: invalid notation data found\n"
 msgstr "·Ù¹ð: ̵¸ú¤ÊÃí¼á¥Ç¡¼¥¿¤¬¤¢¤ê¤Þ¤¹\n"
 
-#: g10/mainproc.c:643
+#: g10/mainproc.c:673
 msgid "Notation: "
 msgstr "Ãí¼á: "
 
-#: g10/mainproc.c:650
+#: g10/mainproc.c:680
 msgid "Policy: "
 msgstr "¥Ý¥ê¥·¡¼: "
 
-#: g10/mainproc.c:1080
+#: g10/mainproc.c:1121
 msgid "signature verification suppressed\n"
 msgstr "½ð̾¤Î¸¡¾Ú¤¬¤Ç¤­¤Þ¤»¤ó\n"
 
-#: g10/mainproc.c:1086
+#: g10/mainproc.c:1158
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "%.*s ¤Î %s ¸° ID %08lX ¤Ë¤è¤ë½ð̾\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1112 g10/mainproc.c:1123
+#: g10/mainproc.c:1184 g10/mainproc.c:1195
 msgid "BAD signature from \""
 msgstr "ÉÔÀµ¤Ê½ð̾: \""
 
-#: g10/mainproc.c:1113 g10/mainproc.c:1124
+#: g10/mainproc.c:1185 g10/mainproc.c:1196
 msgid "Good signature from \""
 msgstr "Àµ¤·¤¤½ð̾: \""
 
-#: g10/mainproc.c:1115
+#: g10/mainproc.c:1187
 msgid "                aka \""
 msgstr "                ÊÌ̾ \""
 
-#: g10/mainproc.c:1171
+#: g10/mainproc.c:1243
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "½ð̾¤Î¸¡¾Ú¤¬¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: g10/mainproc.c:1235
+#: g10/mainproc.c:1318
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "¥¯¥é¥¹0x%02x¤ÎÆÈΩ½ð̾\n"
 
-#: g10/mainproc.c:1281
+#: g10/mainproc.c:1369
 msgid "old style (PGP 2.x) signature\n"
 msgstr "¸Å¤¤·Á¼° (PGP 2.x) ¤Ë¤è¤ë½ð̾\n"
 
-#: g10/mainproc.c:1286
+#: g10/mainproc.c:1374
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() ¤ÎÃæ¤Ë̵¸ú¤Ê¥Ñ¥±¥Ã¥È¤¬¸¡½Ð¤µ¤ì¤Þ¤·¤¿\n"
 
-#: g10/misc.c:96
+#: g10/misc.c:97
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "¥³¥¢¥À¥ó¥×¤ò̵¸ú¤Ë¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: g10/misc.c:206
+#: g10/misc.c:207
 msgid "Experimental algorithms should not be used!\n"
 msgstr "¼Â¸³Ãæ¤Î¥¢¥ë¥´¥ê¥º¥à¤Ï»ÈÍѤ¹¤Ù¤­¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó!\n"
 
-#: g10/misc.c:233
+#: g10/misc.c:234
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr "¤³¤Î°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤ÏÈ¿ÂФµ¤ì¤Æ¤¤¤Þ¤¹¡£°ìÈÌŪ¤ÊÊýË¡¤òÍѤ¤¤Æ²¼¤µ¤¤!\n"
 
-#: g10/parse-packet.c:117
+#: g10/parse-packet.c:119
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "¸ø³«¸°¤Î¥¢¥ë¥´¥ê¥º¥à %d ¤Ï»ÈÍѤǤ­¤Þ¤»¤ó\n"
 
-#: g10/parse-packet.c:986
+#: g10/parse-packet.c:991
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacket of type %d has critical bit set\n"
diff -urN gnupg-1.0.3/po/nl.po gnupg-1.0.4/po/nl.po
--- gnupg-1.0.3/po/nl.po	Mon Sep 18 12:18:06 2000
+++ gnupg-1.0.4/po/nl.po	Tue Oct 17 15:40:39 2000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-09-18 12:17+0200\n"
+"POT-Creation-Date: 2000-10-16 19:22+0200\n"
 "PO-Revision-Date: 2000-02-20 21:30+01:00\n"
 "Last-Translator: Ivo Timmermans <itimmermans@bigfoot.com>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -17,11 +17,11 @@
 msgid "Warning: using insecure memory!\n"
 msgstr "Let op: er wordt onveilig geheugen gebruikt!\n"
 
-#: util/secmem.c:289
+#: util/secmem.c:295
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "bewerking is niet mogelijk zonder initialisatie van veilig geheugen\n"
 
-#: util/secmem.c:290
+#: util/secmem.c:296
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(misschien heb je hiervoor het verkeerde programma gebruikt)\n"
 
@@ -255,7 +255,7 @@
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "u heeft een fout in het programma gevonden ... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1255
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
@@ -861,14 +861,14 @@
 msgid "can't open `%s'\n"
 msgstr "kan `%s' niet openen\n"
 
-#: g10/g10.c:1700
+#: g10/g10.c:1737
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "het eerste teken van een notitienaam moet een letter of laag liggend steepje "
 "zijn\n"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1743
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -876,11 +876,11 @@
 "een notitienaam mag alleen letters, cijfers, punten of underscores bevatten "
 "en eindig met een =\n"
 
-#: g10/g10.c:1712
+#: g10/g10.c:1749
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "punten in notitienamen moeten omgeven zijn door andere tekens\n"
 
-#: g10/g10.c:1720
+#: g10/g10.c:1757
 msgid "a notation value must not use any control characters\n"
 msgstr "een notitienaam mag geen controletekens bevatten\n"
 
@@ -945,20 +945,20 @@
 msgid "error in trailer line\n"
 msgstr "fout in de trailer regel\n"
 
-#: g10/armor.c:912
+#: g10/armor.c:906
 msgid "For info see http://www.gnupg.org"
 msgstr ""
 
-#: g10/armor.c:1033
+#: g10/armor.c:1027
 msgid "no valid OpenPGP data found.\n"
 msgstr "geen geldige OpenPGP gegevens gevonden.\n"
 
-#: g10/armor.c:1038
+#: g10/armor.c:1032
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ongeldige beveiliging: regel langer dan %d tekens\n"
 
-#: g10/armor.c:1042
+#: g10/armor.c:1036
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -967,7 +967,7 @@
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1188 g10/pkclist.c:53
+#: g10/keyedit.c:1189 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "            Vingerafdruk:"
 
@@ -1262,66 +1262,66 @@
 msgid "no valid addressees\n"
 msgstr "geen geldige adressen\n"
 
-#: g10/keygen.c:175
+#: g10/keygen.c:176
 msgid "writing self signature\n"
 msgstr "zelfondertekening wegschrijven\n"
 
-#: g10/keygen.c:213
+#: g10/keygen.c:214
 msgid "writing key binding signature\n"
 msgstr "schrijven van sleutelbindingsondertekening\n"
 
-#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:435
+#: g10/keygen.c:262 g10/keygen.c:346 g10/keygen.c:436
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Gevraagde sleutellengte is %u bits\n"
 
-#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:440
+#: g10/keygen.c:267 g10/keygen.c:351 g10/keygen.c:441
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "afgerond naar %u bits\n"
 
-#: g10/keygen.c:539
+#: g10/keygen.c:540
 msgid "Please select what kind of key you want:\n"
 msgstr "Selecteer aub wat voor sleutel u wilt:\n"
 
-#: g10/keygen.c:541
+#: g10/keygen.c:542
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA en ElGamal (standaard)\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:543
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (alleen ondertekenen)\n"
 
-#: g10/keygen.c:544
+#: g10/keygen.c:545
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (alleen versleutelen)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:546
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (ondertekenen en versleutelen)\n"
 
-#: g10/keygen.c:547
+#: g10/keygen.c:548
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (ondertekenen en versleutelen)\n"
 
-#: g10/keygen.c:551
+#: g10/keygen.c:552
 msgid "Your selection? "
 msgstr "Uw keuze? "
 
-#: g10/keygen.c:562 g10/keygen.c:570
+#: g10/keygen.c:563 g10/keygen.c:571
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "Wilt u echt een sleutel maken om mee te ondertekenen en versleutelen? "
 
-#: g10/keygen.c:584
+#: g10/keygen.c:585
 msgid "Invalid selection.\n"
 msgstr "Ongeldige keuze.\n"
 
-#: g10/keygen.c:596
+#: g10/keygen.c:597
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1334,19 +1334,19 @@
 "                standaard sleutellengte is 1024 bits\n"
 "     hoogste aan te raden sleutellengte is 2048 bits\n"
 
-#: g10/keygen.c:603
+#: g10/keygen.c:604
 msgid "What keysize do you want? (1024) "
 msgstr "Hoe lang wil je de sleutel maken? (1024) "
 
-#: g10/keygen.c:608
+#: g10/keygen.c:609
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA staat alleen sleutellengtes toe van 512 tot 1024\n"
 
-#: g10/keygen.c:610
+#: g10/keygen.c:611
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "sleutel te kort; 768 is de kleinste toegestane waarde.\n"
 
-#: g10/keygen.c:612
+#: g10/keygen.c:613
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "sleutel te kort; 768 is de kleinste toegestane waarde.\n"
@@ -1359,12 +1359,12 @@
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:623
+#: g10/keygen.c:624
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "sleutel te lang; %d is de maximumlengte.\n"
 
-#: g10/keygen.c:628
+#: g10/keygen.c:629
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1372,11 +1372,11 @@
 "Sleutels langer dan 2048 worden afgeraden omdat berekeningen dan ERG\n"
 "lang duren!\n"
 
-#: g10/keygen.c:631
+#: g10/keygen.c:632
 msgid "Are you sure that you want this keysize? "
 msgstr "Weet je zeker dat je deze sleutellengte wilt gebruiken? "
 
-#: g10/keygen.c:632
+#: g10/keygen.c:633
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1384,21 +1384,21 @@
 "Okee, maar houd er rekening mee dat straling van monitor en toetsenbord ook "
 "erg vatbaar zijn voor aanvallen!\n"
 
-#: g10/keygen.c:640
+#: g10/keygen.c:641
 msgid "Do you really need such a large keysize? "
 msgstr "Heb je echt een sleutel nodig die zo lang is? "
 
-#: g10/keygen.c:646
+#: g10/keygen.c:647
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Gevraagde sleutellengte is %u bits\n"
 
-#: g10/keygen.c:649 g10/keygen.c:653
+#: g10/keygen.c:650 g10/keygen.c:654
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "afgerond naar %u bits\n"
 
-#: g10/keygen.c:701
+#: g10/keygen.c:702
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1414,26 +1414,26 @@
 "    <n>m = sleutel verloopt over n maanden\n"
 "    <n>y = sleutel verloopt over n jaar\n"
 
-#: g10/keygen.c:716
+#: g10/keygen.c:717
 msgid "Key is valid for? (0) "
 msgstr "Sleutel is geldig gedurende? (0) "
 
-#: g10/keygen.c:721
+#: g10/keygen.c:722
 msgid "invalid value\n"
 msgstr "ongeldige waarde\n"
 
-#: g10/keygen.c:726
+#: g10/keygen.c:727
 msgid "Key does not expire at all\n"
 msgstr "Sleutel verloopt nooit\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:732
+#: g10/keygen.c:733
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Sleutel verloopt op %s\n"
 
 # fixme
-#: g10/keygen.c:735
+#: g10/keygen.c:736
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1441,11 +1441,11 @@
 "Uw systeem kan geen data weergeven van na 2038.\n"
 "Desondanks wordt het goed behandeld tot 2106.\n"
 
-#: g10/keygen.c:740
+#: g10/keygen.c:741
 msgid "Is this correct (y/n)? "
 msgstr "Klopt dit (j/n)? "
 
-#: g10/keygen.c:783
+#: g10/keygen.c:784
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1461,44 +1461,44 @@
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:795
+#: g10/keygen.c:796
 msgid "Real name: "
 msgstr "Echte naam: "
 
-#: g10/keygen.c:803
+#: g10/keygen.c:804
 msgid "Invalid character in name\n"
 msgstr "Ongeldig teken in naam\n"
 
-#: g10/keygen.c:805
+#: g10/keygen.c:806
 msgid "Name may not start with a digit\n"
 msgstr "Naam mag niet beginnen met een cijfer\n"
 
-#: g10/keygen.c:807
+#: g10/keygen.c:808
 msgid "Name must be at least 5 characters long\n"
 msgstr "Naam moet ten minste 5 tekens lang zijn\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:816
 msgid "Email address: "
 msgstr "Email Adres: "
 
-#: g10/keygen.c:826
+#: g10/keygen.c:827
 msgid "Not a valid email address\n"
 msgstr "Ongeldig email adres\n"
 
-#: g10/keygen.c:834
+#: g10/keygen.c:835
 msgid "Comment: "
 msgstr "Kommentaar: "
 
-#: g10/keygen.c:840
+#: g10/keygen.c:841
 msgid "Invalid character in comment\n"
 msgstr "Ongeldig teken in kommentaar\n"
 
-#: g10/keygen.c:863
+#: g10/keygen.c:864
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Je gebruik tekenverzameling `%s'.\n"
 
-#: g10/keygen.c:869
+#: g10/keygen.c:870
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1509,28 +1509,28 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:873
+#: g10/keygen.c:874
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:878
+#: g10/keygen.c:879
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoEe"
 
-#: g10/keygen.c:888
+#: g10/keygen.c:889
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Verander (N)aam, (K)ommentaar, (E)mail of (O)kee/ei(N)de? "
 
-#: g10/keygen.c:889
+#: g10/keygen.c:890
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Verander (N)aam, (K)ommentaar, (E)mail of (O)kee/ei(N)de? "
 
-#: g10/keygen.c:908
+#: g10/keygen.c:909
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:946
+#: g10/keygen.c:947
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1538,11 +1538,11 @@
 "Je hebt een sleuteltekst nodig om je geheime sleutel te bewaken.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:954
+#: g10/keyedit.c:468 g10/keygen.c:955
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "sleuteltekst is niet goed herhaald; probeer het opnieuw.\n"
 
-#: g10/keygen.c:960
+#: g10/keygen.c:961
 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"
@@ -1554,7 +1554,7 @@
 "nog aanpassen, gebruik dit programma met de optie \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:981
+#: g10/keygen.c:982
 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"
@@ -1567,29 +1567,29 @@
 "dit geeft de generator een grotere kans om genoeg entropie te\n"
 "verzamelen.\n"
 
-#: g10/keygen.c:1430
+#: g10/keygen.c:1431
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA sleutelpaar zal 1024 bits lang zijn.\n"
 
-#: g10/keygen.c:1473
+#: g10/keygen.c:1474
 msgid "Key generation canceled.\n"
 msgstr "Sleutelgeneratie afgebroken.\n"
 
-#: g10/keygen.c:1570
+#: g10/keygen.c:1571
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "Openbaar certificaat wordt geschreven naar `%s'\n"
 
-#: g10/keygen.c:1571
+#: g10/keygen.c:1572
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "Geheim certificaat wordt weggeschreven naar `%s'\n"
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1668
 msgid "public and secret key created and signed.\n"
 msgstr "openbare en geheime sleutels zijn gemaakt en getekend.\n"
 
-#: g10/keygen.c:1672
+#: g10/keygen.c:1673
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1598,12 +1598,12 @@
 "U wilt misschien het commando \"--edit-key\" gebruiken om een tweede\n"
 "sleutel te maken hiervoor.\n"
 
-#: g10/keygen.c:1689 g10/keygen.c:1790
+#: g10/keygen.c:1690 g10/keygen.c:1791
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Sleutelgeneratie is mislukt: %s\n"
 
-#: g10/keygen.c:1733 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1611,7 +1611,7 @@
 "Sleutel is %lu seconden in de toekomst gemaakt (tijdsverschuiving of\n"
 "klokprobleem)\n"
 
-#: g10/keygen.c:1735 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1736 g10/sig-check.c:317 g10/sign.c:114
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1619,7 +1619,7 @@
 "sleutel is %lu seconden in de toekomst gemaakt (tijdsverschuiving of\n"
 "klokprobleem)\n"
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1769
 msgid "Really create? "
 msgstr "Echt maken? "
 
@@ -2072,7 +2072,7 @@
 msgid "Really sign? "
 msgstr "Echt tekenen? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1870 g10/keyedit.c:1932 g10/sign.c:136
+#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "ondertekening mislukt: %s\n"
@@ -2331,201 +2331,201 @@
 msgid "enable a key"
 msgstr "sta gebruik van een sleutel toe"
 
-#: g10/delkey.c:110 g10/keyedit.c:630
+#: g10/delkey.c:110 g10/keyedit.c:631
 msgid "can't do that in batchmode\n"
 msgstr "kan dat niet doen in lopende band-modus\n"
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:668
+#: g10/keyedit.c:669
 msgid "Secret key is available.\n"
 msgstr "Geheime sleutel is beschikbaar.\n"
 
-#: g10/keyedit.c:697
+#: g10/keyedit.c:698
 msgid "Command> "
 msgstr "Commando> "
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Need the secret key to do this.\n"
 msgstr "Ik heb de geheime sleutel nodig om dat te doen.\n"
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:732
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:779
 msgid "Really sign all user IDs? "
 msgstr "Echt alle gebruikers tekenen? "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:780
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Hint: Selecteer de gebruikersidentificaties om te tekenen\n"
 
-#: g10/keyedit.c:811 g10/keyedit.c:993
+#: g10/keyedit.c:812 g10/keyedit.c:994
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "bijwerken van de vertrouwensdatabase ging niet goed: %s\n"
 
-#: g10/keyedit.c:822 g10/keyedit.c:843
+#: g10/keyedit.c:823 g10/keyedit.c:844
 msgid "You must select at least one user ID.\n"
 msgstr "U moet op zijn minst een gebruikersidentificatie opgeven.\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:825
 msgid "You can't delete the last user ID!\n"
 msgstr "U kunt de laatste gebruiker niet verwijderen!\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:828
 msgid "Really remove all selected user IDs? "
 msgstr "Al deze gebruikers echt verwijderen? "
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:829
 msgid "Really remove this user ID? "
 msgstr "Deze gebruiker echt verwijderen? "
 
-#: g10/keyedit.c:864 g10/keyedit.c:886
+#: g10/keyedit.c:865 g10/keyedit.c:887
 msgid "You must select at least one key.\n"
 msgstr "U moet op zijn minst een sleutel selecteren.\n"
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:869
 msgid "Do you really want to delete the selected keys? "
 msgstr "Wilt u echt alle geselecteerde sleutels verwijderen? "
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:870
 msgid "Do you really want to delete this key? "
 msgstr "Wilt u deze sleutel echt verwijderen? "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:891
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Wilt u echt alle geselecteerde sleutels intrekken? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:892
 msgid "Do you really want to revoke this key? "
 msgstr "Wilt u deze sleutel echt intrekken? "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:958
 msgid "Save changes? "
 msgstr "Veranderingen bewaren? "
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:961
 msgid "Quit without saving? "
 msgstr "Beëindigen zonder te bewaren? "
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:972
 #, c-format
 msgid "update failed: %s\n"
 msgstr "bijwerken ging niet: %s\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:979
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "bijwerken van de geheime sleutel mislukte: %s\n"
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:986
 msgid "Key not changed so no update needed.\n"
 msgstr "sleutel is niet veranderd en hoeft dus niet bijgewerkt te worden.\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1001
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Foutief commando (probeer \"help\")\n"
 
-#: g10/keyedit.c:1080 g10/keyedit.c:1106
+#: g10/keyedit.c:1081 g10/keyedit.c:1107
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1089
+#: g10/keyedit.c:1090
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1093
+#: g10/keyedit.c:1094
 msgid "This key has been disabled"
 msgstr "Deze sleutel is niet beschikbaar"
 
-#: g10/keyedit.c:1122
+#: g10/keyedit.c:1123
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "sleutel %08lx: subsleutel is teruggeroepen!\n"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1126
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "nieuwe sleutelterugtrekkingen: %lu\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1128
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Verwijder deze goede ondertekening? (j/N/q)"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1370
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Verwijder deze ongeldige ondertekening? (j/N/q)"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1374
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Verwijder deze onbekende ondertekening? (j/N/q)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1380
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Deze zelfondertekening echt verwijderen? (j/N)"
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1394
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d ondertekening verwijderd.\n"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d ondertekeningen verwijderd.\n"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1398
 msgid "Nothing deleted.\n"
 msgstr "Niets verwijderd.\n"
 
-#: g10/keyedit.c:1466
+#: g10/keyedit.c:1467
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Haal a.u.b. de selecties weg voor de geheime sleutels.\n"
 
-#: g10/keyedit.c:1472
+#: g10/keyedit.c:1473
 msgid "Please select at most one secondary key.\n"
 msgstr "Selecteer a.u.b. maximaal één secundaire sleutel.\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1477
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Vervaldatum voor secundaire sleutel instellen.\n"
 
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1479
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Vervaldatum voor primaire sleutel instellen.\n"
 
-#: g10/keyedit.c:1520
+#: g10/keyedit.c:1521
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "U kunt de vervaldatum van een v3 sleutel niet wijzigen\n"
 
-#: g10/keyedit.c:1536
+#: g10/keyedit.c:1537
 msgid "No corresponding signature in secret ring\n"
 msgstr "Geen overeenkomende ondertekening in de geheime sleutelbos\n"
 
-#: g10/keyedit.c:1597
+#: g10/keyedit.c:1598
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Geen gebruikersidentificatie met index %d\n"
 
-#: g10/keyedit.c:1643
+#: g10/keyedit.c:1644
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Geen secundaire sleutel met index %d\n"
 
-#: g10/keyedit.c:1741
+#: g10/keyedit.c:1742
 msgid "user ID: \""
 msgstr "gebruikersidentificatie: \""
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1745
 #, c-format
 msgid ""
 "\"\n"
@@ -2534,34 +2534,34 @@
 "\"\n"
 "tekende met uw sleutel %08lX op %s\n"
 
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:1749
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "Terugtrekkingscertificaat maken voor deze ondertekening? (j/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1773
 msgid "You have signed these user IDs:\n"
 msgstr "U heeft deze gebruikers ondertekend:\n"
 
-#: g10/keyedit.c:1786 g10/keyedit.c:1821
+#: g10/keyedit.c:1787 g10/keyedit.c:1822
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   getekend door %08lX op %s\n"
 
-#: g10/keyedit.c:1791
+#: g10/keyedit.c:1792
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   ingetrokken door %08lX op %s\n"
 
-#: g10/keyedit.c:1811
+#: g10/keyedit.c:1812
 msgid "You are about to revoke these signatures:\n"
 msgstr "U staat op het punt om deze ondertekeningen in te trekken:\n"
 
-#: g10/keyedit.c:1829
+#: g10/keyedit.c:1830
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Echt deze terugtrekkingscertificaten aanmaken? (j/N)"
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1859
 msgid "no secret key\n"
 msgstr "geen geheime sleutel\n"
 
@@ -2576,137 +2576,137 @@
 msgstr "revkey"
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:760
+#: g10/keylist.c:400 g10/mainproc.c:790
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "Sleutel verloopt op %s\n"
 
-#: g10/mainproc.c:213
+#: g10/mainproc.c:240
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "openbare sleutel is %08lX\n"
 
-#: g10/mainproc.c:257
+#: g10/mainproc.c:284
 msgid "public key encrypted data: good DEK\n"
 msgstr "gegevens versleuteld met een openbare sleutel: goede DEK\n"
 
-#: g10/mainproc.c:299
+#: g10/mainproc.c:326
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "versleuteld met %u-bit %s sleutel, nummer %08lX, gemaakt op %s\n"
 
-#: g10/mainproc.c:309
+#: g10/mainproc.c:336
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "versleuteld met %s sleutel, nummer %08lX\n"
 
-#: g10/mainproc.c:315
+#: g10/mainproc.c:342
 msgid "no secret key for decryption available\n"
 msgstr "geheime sleutel voor ontsleuteling is niet beschikbaar\n"
 
-#: g10/mainproc.c:324
+#: g10/mainproc.c:351
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "openbare sleutel-ontsleuteling ging niet: %s\n"
 
-#: g10/mainproc.c:361
+#: g10/mainproc.c:388
 msgid "decryption okay\n"
 msgstr "ontsleutelen ging goed\n"
 
-#: g10/mainproc.c:366
+#: g10/mainproc.c:393
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "LET OP: het versleutelde bericht is veranderd!\n"
 
-#: g10/mainproc.c:371
+#: g10/mainproc.c:398
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "ontsleuteling mislukte: %s\n"
 
 # Dit kan wel Engels blijven.. toch?
-#: g10/mainproc.c:390
+#: g10/mainproc.c:417
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "LET OP: afzender vroeg om \"for-your-eyes-only\"\n"
 
-#: g10/mainproc.c:392
+#: g10/mainproc.c:419
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "originele bestandsnaam='%.*s'\n"
 
-#: g10/mainproc.c:544
+#: g10/mainproc.c:574
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "alleenstaande intrekking - gebruik \"gpg --import\" om uit te voeren\n"
 
-#: g10/mainproc.c:631 g10/mainproc.c:640
+#: g10/mainproc.c:661 g10/mainproc.c:670
 msgid "WARNING: invalid notation data found\n"
 msgstr "LET OP: ongeldige aantekeningen gevonden\n"
 
-#: g10/mainproc.c:643
+#: g10/mainproc.c:673
 msgid "Notation: "
 msgstr "Aantekening: "
 
-#: g10/mainproc.c:650
+#: g10/mainproc.c:680
 msgid "Policy: "
 msgstr "Beleid: "
 
-#: g10/mainproc.c:1080
+#: g10/mainproc.c:1121
 msgid "signature verification suppressed\n"
 msgstr "controle van de ondertekening overgeslagen\n"
 
-#: g10/mainproc.c:1086
+#: g10/mainproc.c:1158
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Ondertekening gemaakt op %.*s met %s sleutel nummer %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1112 g10/mainproc.c:1123
+#: g10/mainproc.c:1184 g10/mainproc.c:1195
 msgid "BAD signature from \""
 msgstr "FOUTE ondertekening van \""
 
-#: g10/mainproc.c:1113 g10/mainproc.c:1124
+#: g10/mainproc.c:1185 g10/mainproc.c:1196
 msgid "Good signature from \""
 msgstr "Correcte ondertekening van \""
 
-#: g10/mainproc.c:1115
+#: g10/mainproc.c:1187
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1171
+#: g10/mainproc.c:1243
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ondertekening niet controleren: %s\n"
 
-#: g10/mainproc.c:1235
+#: g10/mainproc.c:1318
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "losstaande ondertekening van type 0x%02x\n"
 
-#: g10/mainproc.c:1281
+#: g10/mainproc.c:1369
 msgid "old style (PGP 2.x) signature\n"
 msgstr "oude stijl (PGP 2.x) ondertekening\n"
 
-#: g10/mainproc.c:1286
+#: g10/mainproc.c:1374
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ongeldig hoofdpakket gevonden in proc_tree()\n"
 
-#: g10/misc.c:96
+#: g10/misc.c:97
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "kan geheugendumps niet uitzetten: %s\n"
 
-#: g10/misc.c:206
+#: g10/misc.c:207
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Experimentele algoritmes dienen niet gebruikt te worden!\n"
 
-#: g10/misc.c:233
+#: g10/misc.c:234
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr "dit versleutelalgoritme is verouderd; gebruik een meer algemene!\n"
 
-#: g10/parse-packet.c:117
+#: g10/parse-packet.c:119
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "kan openbare sleutel-algoritme %d niet behandelen\n"
 
-#: g10/parse-packet.c:986
+#: g10/parse-packet.c:991
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpakket type %d heeft kritische bit gezet\n"
diff -urN gnupg-1.0.3/po/pl.po gnupg-1.0.4/po/pl.po
--- gnupg-1.0.3/po/pl.po	Mon Sep 18 12:18:06 2000
+++ gnupg-1.0.4/po/pl.po	Tue Oct 17 15:40:39 2000
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-09-18 12:17+0200\n"
+"POT-Creation-Date: 2000-10-16 19:22+0200\n"
 "PO-Revision-Date: 1999-12-05 21:29+01:00\n"
 "Last-Translator: Janusz A. Urbanowicz <alex@bofh.net.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -27,11 +27,11 @@
 msgid "Warning: using insecure memory!\n"
 msgstr "Ostrze¿enie: u¿ywana pamiêæ nie jest pamiêci± bezpieczn±!\n"
 
-#: util/secmem.c:289
+#: util/secmem.c:295
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operacja niemo¿liwa do wykonania bez dostêpnej pamiêci bezpiecznej\n"
 
-#: util/secmem.c:290
+#: util/secmem.c:296
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(prawdopodobnie u¿ywany program jest niew³a¶ciwy dla tego zadania)\n"
 
@@ -265,7 +265,7 @@
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "znalaz³e¶(a¶) b³±d w programie ... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1255
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nie mo¿na otworzyæ %s: %s\n"
@@ -871,12 +871,12 @@
 msgid "can't open `%s'\n"
 msgstr "nie mo¿na otworzyæ '%s'\n"
 
-#: g10/g10.c:1700
+#: g10/g10.c:1737
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "adnotacja musi zaczynaæ siê od litery lub podkre¶lenia\n"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1743
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -884,11 +884,11 @@
 "nazwa adnotacji mo¿e zawieraæ tylko litery, cyfry, kropki,\n"
 "podkre¶lenia, i musi koñczyæ siê '='\n"
 
-#: g10/g10.c:1712
+#: g10/g10.c:1749
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "kropki w adnotacji musz± znajdowaæ siê pomiêdzy innymi znakami\n"
 
-#: g10/g10.c:1720
+#: g10/g10.c:1757
 msgid "a notation value must not use any control characters\n"
 msgstr "warto¶æ adnotacji nie mo¿e zawieraæ znaków steruj±cych\n"
 
@@ -951,20 +951,20 @@
 msgid "error in trailer line\n"
 msgstr "b³±d w linii koñcz±cej\n"
 
-#: g10/armor.c:912
+#: g10/armor.c:906
 msgid "For info see http://www.gnupg.org"
 msgstr ""
 
-#: g10/armor.c:1033
+#: g10/armor.c:1027
 msgid "no valid OpenPGP data found.\n"
 msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
 
-#: g10/armor.c:1038
+#: g10/armor.c:1032
 #, 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:1042
+#: g10/armor.c:1036
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -973,7 +973,7 @@
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1188 g10/pkclist.c:53
+#: g10/keyedit.c:1189 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "                  Odcisk:"
 
@@ -1264,66 +1264,66 @@
 msgid "no valid addressees\n"
 msgstr "brak poprawnych adresów\n"
 
-#: g10/keygen.c:175
+#: g10/keygen.c:176
 msgid "writing self signature\n"
 msgstr "zapis podpisu klucza nim samym\n"
 
-#: g10/keygen.c:213
+#: g10/keygen.c:214
 msgid "writing key binding signature\n"
 msgstr "zapis podpisu wi±¿±cego klucz\n"
 
-#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:435
+#: g10/keygen.c:262 g10/keygen.c:346 g10/keygen.c:436
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "¯±dana d³ugo¶æ klucza to %u bity.\n"
 
-#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:440
+#: g10/keygen.c:267 g10/keygen.c:351 g10/keygen.c:441
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "zaokr±glono do %u bitów\n"
 
-#: g10/keygen.c:539
+#: g10/keygen.c:540
 msgid "Please select what kind of key you want:\n"
 msgstr "Proszê wybraæ rodzaj klucza:\n"
 
-#: g10/keygen.c:541
+#: g10/keygen.c:542
 #, 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:542
+#: g10/keygen.c:543
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (tylko do podpisywania)\n"
 
-#: g10/keygen.c:544
+#: g10/keygen.c:545
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) Klucz dla algorytmu ElGamala (tylko do szyfrowanie)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:546
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) Klucz dla algorytmu ElGamala (do szyfrowania i podpisywania)\n"
 
-#: g10/keygen.c:547
+#: g10/keygen.c:548
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) Klucz dla algorytmu ElGamala (do szyfrowania i podpisywania)\n"
 
-#: g10/keygen.c:551
+#: g10/keygen.c:552
 msgid "Your selection? "
 msgstr "Twój wybór? "
 
-#: g10/keygen.c:562 g10/keygen.c:570
+#: g10/keygen.c:563 g10/keygen.c:571
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "Czy na pewno chcesz stworzyæ klucz do szyfrowania i podpisywania? "
 
-#: g10/keygen.c:584
+#: g10/keygen.c:585
 msgid "Invalid selection.\n"
 msgstr "Niew³a¶ciwy wybór.\n"
 
-#: g10/keygen.c:596
+#: g10/keygen.c:597
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1336,19 +1336,19 @@
 "               domy¶lny rozmiar klucza wynosi 1024 bity\n"
 "  najwiêkszy sugerowany rozmiar klucza wynosi 2048 bitów\n"
 
-#: g10/keygen.c:603
+#: g10/keygen.c:604
 msgid "What keysize do you want? (1024) "
 msgstr "Jakiej d³ugo¶ci klucz wygenerowaæ? (1024) "
 
-#: g10/keygen.c:608
+#: g10/keygen.c:609
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "Klucz dla DSA musi mieæ d³ugo¶æ pomiêdzy 512 i 1024 bitow.\n"
 
-#: g10/keygen.c:610
+#: g10/keygen.c:611
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "D³ugo¶æ klucza zbyt ma³a; minimalna dopuszczona wynosi 768 bitów.\n"
 
-#: g10/keygen.c:612
+#: g10/keygen.c:613
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "D³ugo¶æ klucza zbyt ma³a; minimalna dopuszczona wynosi 768 bitów.\n"
@@ -1361,12 +1361,12 @@
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:623
+#: g10/keygen.c:624
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "zbyt du¿y rozmiar klucza, ograniczenie wynosi %d.\n"
 
-#: g10/keygen.c:628
+#: g10/keygen.c:629
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1374,11 +1374,11 @@
 "Klucze d³u¿sze ni¿ 2048 bitów s± odradzane, poniewa¿ obliczenia\n"
 "trwaj± wtedy BARDZO d³ugo!\n"
 
-#: g10/keygen.c:631
+#: g10/keygen.c:632
 msgid "Are you sure that you want this keysize? "
 msgstr "Na pewno wygenerowaæ klucz takiej d³ugo¶ci? "
 
-#: g10/keygen.c:632
+#: g10/keygen.c:633
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1386,21 +1386,21 @@
 "Nale¿y tak¿e pamiêtaæ o tym, ¿e informacje mog± byæ te¿ wykradzione z\n"
 "komputera przez pods³uch emisji elektromagnetycznej klawiatury i monitora!\n"
 
-#: g10/keygen.c:640
+#: g10/keygen.c:641
 msgid "Do you really need such a large keysize? "
 msgstr "Czy naprawdê potrzebujesz takiego d³ugiego klucza? "
 
-#: g10/keygen.c:646
+#: g10/keygen.c:647
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "¯±dana d³ugo¶æ klucza to %u bity.\n"
 
-#: g10/keygen.c:649 g10/keygen.c:653
+#: g10/keygen.c:650 g10/keygen.c:654
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokr±glono do %u bitów\n"
 
-#: g10/keygen.c:701
+#: g10/keygen.c:702
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1416,25 +1416,25 @@
 "      <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:716
+#: g10/keygen.c:717
 msgid "Key is valid for? (0) "
 msgstr "Okres wa¿no¶ci klucza ? (0) "
 
-#: g10/keygen.c:721
+#: g10/keygen.c:722
 msgid "invalid value\n"
 msgstr "niepoprawna warto¶æ\n"
 
-#: g10/keygen.c:726
+#: g10/keygen.c:727
 msgid "Key does not expire at all\n"
 msgstr "Klucz nie ma daty wa¿no¶ci (nie traci wa¿no¶ci z up³ywem czasu).\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:732
+#: g10/keygen.c:733
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Data wa¿no¶ci klucza: %s\n"
 
-#: g10/keygen.c:735
+#: g10/keygen.c:736
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1442,11 +1442,11 @@
 "Twój system nie potrafi poprawnie wy¶wietlaæ dat po roku 2036.\n"
 "Jednak¿e poprawnie obs³ugiwane s± daty do roku 2106.\n"
 
-#: g10/keygen.c:740
+#: g10/keygen.c:741
 msgid "Is this correct (y/n)? "
 msgstr "Dane poprawne (t/n)? "
 
-#: g10/keygen.c:783
+#: g10/keygen.c:784
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1462,44 +1462,44 @@
 "    \"Tadeusz ¯eleñski (Boy) <tzb@provider.com.pl>\"\n"
 "\n"
 
-#: g10/keygen.c:795
+#: g10/keygen.c:796
 msgid "Real name: "
 msgstr "Imiê i nazwisko: "
 
-#: g10/keygen.c:803
+#: g10/keygen.c:804
 msgid "Invalid character in name\n"
 msgstr "Niew³a¶ciwy znak w imieniu lub nazwisku\n"
 
-#: g10/keygen.c:805
+#: g10/keygen.c:806
 msgid "Name may not start with a digit\n"
 msgstr "Imiê lub nazwisko nie mo¿e zaczynaæ siê od cyfry\n"
 
-#: g10/keygen.c:807
+#: g10/keygen.c:808
 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:815
+#: g10/keygen.c:816
 msgid "Email address: "
 msgstr "Adres poczty elektronicznej: "
 
-#: g10/keygen.c:826
+#: g10/keygen.c:827
 msgid "Not a valid email address\n"
 msgstr "to nie jest poprawny adres poczty elektronicznej\n"
 
-#: g10/keygen.c:834
+#: g10/keygen.c:835
 msgid "Comment: "
 msgstr "Komentarz: "
 
-#: g10/keygen.c:840
+#: g10/keygen.c:841
 msgid "Invalid character in comment\n"
 msgstr "Niew³a¶ciwy znak w komentarzu\n"
 
-#: g10/keygen.c:863
+#: g10/keygen.c:864
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "U¿ywasz zestawu znaków %s.\n"
 
-#: g10/keygen.c:869
+#: g10/keygen.c:870
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1510,46 +1510,46 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:873
+#: g10/keygen.c:874
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:878
+#: g10/keygen.c:879
 msgid "NnCcEeOoQq"
 msgstr "IiKkEeDdWw"
 
-#: g10/keygen.c:888
+#: g10/keygen.c:889
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr ""
 "Zmieniæ (I)miê/nazwisko, (K)omentarz, adres (E)mail, \n"
 "przej¶æ (D)alej czy (W)yj¶æ z programu? "
 
-#: g10/keygen.c:889
+#: g10/keygen.c:890
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Zmieniæ (I)miê/nazwisko, (K)omentarz, adres (E)mail, \n"
 "przej¶æ (D)alej czy (W)yj¶æ z programu? "
 
-#: g10/keygen.c:908
+#: g10/keygen.c:909
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:946
+#: g10/keygen.c:947
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 msgstr ""
 "Musisz podaæ wyra¿enie przej¶ciowe (has³o) aby ochroniæ swój klucz tajny.\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:954
+#: g10/keyedit.c:468 g10/keygen.c:955
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr ""
 "Powtórzone wyra¿enie przej¶ciowe nie zgadza siê z podanym w pierwszej "
 "próbie;\n"
 "spróbuj jeszcze raz.\n"
 
-#: g10/keygen.c:960
+#: g10/keygen.c:961
 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"
@@ -1561,7 +1561,7 @@
 "i opcji \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:981
+#: g10/keygen.c:982
 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"
@@ -1575,29 +1575,29 @@
 "generator liczb losowych ma mo¿liwo¶æ zebrania odpowiedniej ilo¶ci entropii. "
 "\n"
 
-#: g10/keygen.c:1430
+#: g10/keygen.c:1431
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "Para kluczy dla DSA bêdzie mia³a 1024 bity d³ugo¶ci.\n"
 
-#: g10/keygen.c:1473
+#: g10/keygen.c:1474
 msgid "Key generation canceled.\n"
 msgstr "Procedura generacji klucza zosta³a anulowana.\n"
 
-#: g10/keygen.c:1570
+#: g10/keygen.c:1571
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapis certyfikatu publicznego w '%s'\n"
 
-#: g10/keygen.c:1571
+#: g10/keygen.c:1572
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapis tajnego certyfikatu w '%s'\n"
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1668
 msgid "public and secret key created and signed.\n"
 msgstr "klucze publiczny i tajny zosta³y stworzone i podpisane.\n"
 
-#: g10/keygen.c:1672
+#: g10/keygen.c:1673
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1605,12 +1605,12 @@
 "Ten klucz nie mo¿e byæ wykorzystany do szyfrowania. Komend± \"--edit-key\" \n"
 "mo¿na dodaæ do niego podklucz u¿ywany do szyfrowania.\n"
 
-#: g10/keygen.c:1689 g10/keygen.c:1790
+#: g10/keygen.c:1690 g10/keygen.c:1791
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generacja klucza nie powiod³a siê: %s\n"
 
-#: g10/keygen.c:1733 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1618,7 +1618,7 @@
 "klucz zosta³ stworzony %lu sekund w przysz³o¶ci (zaburzenia\n"
 "czasoprzestrzeni, lub ¼le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:1735 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1736 g10/sig-check.c:317 g10/sign.c:114
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1626,7 +1626,7 @@
 "klucz zosta³ stworzony %lu sekund w przysz³o¶ci (zaburzenia\n"
 "czasoprzestrzeni, lub ¼le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1769
 msgid "Really create? "
 msgstr "Na pewno generowaæ? "
 
@@ -2077,7 +2077,7 @@
 msgid "Really sign? "
 msgstr "Na pewno podpisaæ? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1870 g10/keyedit.c:1932 g10/sign.c:136
+#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "z³o¿enie podpisu nie powiod³o siê: %s\n"
@@ -2336,202 +2336,202 @@
 msgid "enable a key"
 msgstr "w³±czyæ klucz do u¿ycia"
 
-#: g10/delkey.c:110 g10/keyedit.c:630
+#: g10/delkey.c:110 g10/keyedit.c:631
 msgid "can't do that in batchmode\n"
 msgstr "nie dzia³a w trybie wsadowym\n"
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:668
+#: g10/keyedit.c:669
 msgid "Secret key is available.\n"
 msgstr "Dostêpny jest klucz tajny.\n"
 
-#: g10/keyedit.c:697
+#: g10/keyedit.c:698
 msgid "Command> "
 msgstr "Polecenie> "
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Need the secret key to do this.\n"
 msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n"
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:732
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:779
 msgid "Really sign all user IDs? "
 msgstr "Podpisaæ wszystkie identyfikatory u¿ytkownika na tym kluczu? "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:780
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Podpowied¼: wybierz identyfikatory u¿ytkownika do podpisania.\n"
 
-#: g10/keyedit.c:811 g10/keyedit.c:993
+#: g10/keyedit.c:812 g10/keyedit.c:994
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "naniesienie poprawek bazy zaufania nie powiod³o siê: %s\n"
 
-#: g10/keyedit.c:822 g10/keyedit.c:843
+#: g10/keyedit.c:823 g10/keyedit.c:844
 msgid "You must select at least one user ID.\n"
 msgstr "Musisz wybraæ co najmniej jeden identyfikator u¿ytkownika.\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:825
 msgid "You can't delete the last user ID!\n"
 msgstr "Nie mo¿esz usun±æ ostatniego identyfikatora u¿ytkownika!\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:828
 msgid "Really remove all selected user IDs? "
 msgstr "Czy na pewno usun±æ wszystkie wybrane identyfikatory u¿ytkownika? "
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:829
 msgid "Really remove this user ID? "
 msgstr "Czy na pewno usun±æ ten identyfikator u¿ytkownika? "
 
-#: g10/keyedit.c:864 g10/keyedit.c:886
+#: g10/keyedit.c:865 g10/keyedit.c:887
 msgid "You must select at least one key.\n"
 msgstr "Musisz wybraæ co najmniej jeden klucz.\n"
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:869
 msgid "Do you really want to delete the selected keys? "
 msgstr "Czy na pewno chcesz usun±æ wybrane klucze? "
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:870
 msgid "Do you really want to delete this key? "
 msgstr "Czy na pewno chcesz usun±æ ten klucz? "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:891
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Czy na pewno chcesz uniewa¿niæ wybrane klucze? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:892
 msgid "Do you really want to revoke this key? "
 msgstr "Czy na pewno chcesz uniewa¿niæ ten klucz? "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:958
 msgid "Save changes? "
 msgstr "Zapisaæ zmiany? "
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:961
 msgid "Quit without saving? "
 msgstr "Wyj¶æ bez zapisania zmian? "
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:972
 #, c-format
 msgid "update failed: %s\n"
 msgstr "naniesienie poprawek nie powiod³o siê: %s\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:979
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "naniesienie poprawek na kluczu tajnym nie powiod³o siê: %s\n"
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:986
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 "Klucz nie zosta³ zmieniony wiêc nanoszenie poprawek nie jest konieczne.\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1001
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Niepoprawne polecenie  (spróbuj \"help\")\n"
 
-#: g10/keyedit.c:1080 g10/keyedit.c:1106
+#: g10/keyedit.c:1081 g10/keyedit.c:1107
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1089
+#: g10/keyedit.c:1090
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1093
+#: g10/keyedit.c:1094
 msgid "This key has been disabled"
 msgstr "Ten klucz zosta³ wy³±czony z u¿ycia"
 
-#: g10/keyedit.c:1122
+#: g10/keyedit.c:1123
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "klucz %08lX: podklucz zosta³ uniewa¿niony!\n"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1126
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "   nowych uniewa¿nieñ kluczy: %lu\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1128
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Usun±æ ten poprawny podpis? (t/N/w)"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1370
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Usun±æ ten niepoprawny podpis? (t/N/w)"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1374
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Usun±æ ten nieznany podpis? (t/N/w)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1380
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Na pewno usun±æ ten podpis klucza nim samym? (t/N)"
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1394
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d podpis usuniêty.\n"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d podpisów usuniêtych.\n"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1398
 msgid "Nothing deleted.\n"
 msgstr "Nic nie zosta³o usuniête.\n"
 
-#: g10/keyedit.c:1466
+#: g10/keyedit.c:1467
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Proszê usun±æ znacznik wyboru z kluczy tajnych.\n"
 
-#: g10/keyedit.c:1472
+#: g10/keyedit.c:1473
 msgid "Please select at most one secondary key.\n"
 msgstr "Proszê wybraæ najwy¿ej jeden podklucz.\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1477
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Zmiana daty wa¿no¶ci podklucza.\n"
 
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1479
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Zmiana daty wa¿no¶ci g³ównego klucza.\n"
 
-#: g10/keyedit.c:1520
+#: g10/keyedit.c:1521
 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:1536
+#: g10/keyedit.c:1537
 msgid "No corresponding signature in secret ring\n"
 msgstr "Brak odpowiadaj±cego podpisu w zbiorze kluczy tajnych\n"
 
-#: g10/keyedit.c:1597
+#: g10/keyedit.c:1598
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Brak identyfikatora u¿ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:1643
+#: g10/keyedit.c:1644
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Brak podklucza o indeksie %d\n"
 
-#: g10/keyedit.c:1741
+#: g10/keyedit.c:1742
 msgid "user ID: \""
 msgstr "Identyfikator u¿ytkownika: "
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1745
 #, c-format
 msgid ""
 "\"\n"
@@ -2540,34 +2540,34 @@
 "\"\n"
 "podpisano Twoim kluczem %08lX w %s\n"
 
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:1749
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "Stworzyæ certyfikat uniewa¿nienia tego podpisu? (t/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1773
 msgid "You have signed these user IDs:\n"
 msgstr "Te identyfikatory s± podpisane przez ciebie:\n"
 
-#: g10/keyedit.c:1786 g10/keyedit.c:1821
+#: g10/keyedit.c:1787 g10/keyedit.c:1822
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   podpisany kluczem %08lX w %s\n"
 
-#: g10/keyedit.c:1791
+#: g10/keyedit.c:1792
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "uniewa¿niony kluczem %08lX w %s\n"
 
-#: g10/keyedit.c:1811
+#: g10/keyedit.c:1812
 msgid "You are about to revoke these signatures:\n"
 msgstr "Czy na pewno chcesz uniewa¿niæ te podpisy:\n"
 
-#: g10/keyedit.c:1829
+#: g10/keyedit.c:1830
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Na pewno utworzyæ certyfikaty uniewa¿nienia ? (t/N)"
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1859
 msgid "no secret key\n"
 msgstr "brak klucza tajnego\n"
 
@@ -2582,83 +2582,83 @@
 msgstr "unpkl"
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:760
+#: g10/keylist.c:400 g10/mainproc.c:790
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "Data wa¿no¶ci klucza: %s\n"
 
-#: g10/mainproc.c:213
+#: g10/mainproc.c:240
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "klucz publiczny %08lX\n"
 
-#: g10/mainproc.c:257
+#: g10/mainproc.c:284
 msgid "public key encrypted data: good DEK\n"
 msgstr "dane zaszyfrowane kluczem publicznym: poprawny klucz sesyjny\n"
 
-#: g10/mainproc.c:299
+#: g10/mainproc.c:326
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "d³ugo¶æ %u bitów, typ %s, klucz %08lX, stworzony %s\n"
 
-#: g10/mainproc.c:309
+#: g10/mainproc.c:336
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "zaszyfrowane kluczem %s, o identyfikatorze %08lX\n"
 
-#: g10/mainproc.c:315
+#: g10/mainproc.c:342
 msgid "no secret key for decryption available\n"
 msgstr "odszyfrowuj±cy klucz tajny do jest niedostêpny\n"
 
-#: g10/mainproc.c:324
+#: g10/mainproc.c:351
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "b³±d odszyfrowywania kluczem publicznym: %s\n"
 
-#: g10/mainproc.c:361
+#: g10/mainproc.c:388
 msgid "decryption okay\n"
 msgstr "odszyfrowane poprawnie\n"
 
-#: g10/mainproc.c:366
+#: g10/mainproc.c:393
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "OSTRZE¯ENIE: dokonano manipulacji zaszyfrowan± wiadomo¶ci±!\n"
 
-#: g10/mainproc.c:371
+#: g10/mainproc.c:398
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "b³±d odszyfrowywania: %s\n"
 
-#: g10/mainproc.c:390
+#: g10/mainproc.c:417
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "UWAGA: nadawca zaznaczy³ ¿e wiadomo¶æ nie powinna byæ zapisywana!\n"
 
-#: g10/mainproc.c:392
+#: g10/mainproc.c:419
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "pierwotna nazwa pliku='%.*s'\n"
 
-#: g10/mainproc.c:544
+#: g10/mainproc.c:574
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "oddzielony certyfikat uniewa¿nienia - wywo³aj \"gpg --import\" aby go u¿yæ\n"
 
-#: g10/mainproc.c:631 g10/mainproc.c:640
+#: g10/mainproc.c:661 g10/mainproc.c:670
 msgid "WARNING: invalid notation data found\n"
 msgstr "OSTRZE¯ENIE: niepoprawne dane w adnotacji\n"
 
-#: g10/mainproc.c:643
+#: g10/mainproc.c:673
 msgid "Notation: "
 msgstr "Adnotacja: "
 
-#: g10/mainproc.c:650
+#: g10/mainproc.c:680
 msgid "Policy: "
 msgstr "Regulamin: "
 
-#: g10/mainproc.c:1080
+#: g10/mainproc.c:1121
 msgid "signature verification suppressed\n"
 msgstr "wymuszono pominiêcie sprawdzenia podpisu\n"
 
-#: g10/mainproc.c:1086
+#: g10/mainproc.c:1158
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr ""
@@ -2666,57 +2666,57 @@
 "z u¿yciem klucza o identyfikatorze %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1112 g10/mainproc.c:1123
+#: g10/mainproc.c:1184 g10/mainproc.c:1195
 msgid "BAD signature from \""
 msgstr "NIEPOPRAWNY podpis z³o¿ony przez \""
 
-#: g10/mainproc.c:1113 g10/mainproc.c:1124
+#: g10/mainproc.c:1185 g10/mainproc.c:1196
 msgid "Good signature from \""
 msgstr "Poprawny podpis z³o¿ony przez \""
 
-#: g10/mainproc.c:1115
+#: g10/mainproc.c:1187
 msgid "                aka \""
 msgstr "                        alias \""
 
-#: g10/mainproc.c:1171
+#: g10/mainproc.c:1243
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nie mo¿na sprawdziæ podpisu: %s\n"
 
-#: g10/mainproc.c:1235
+#: g10/mainproc.c:1318
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "oddzielony podpis klasy 0x%02x\n"
 
-#: g10/mainproc.c:1281
+#: g10/mainproc.c:1369
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starego typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:1286
+#: g10/mainproc.c:1374
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n"
 
-#: g10/misc.c:96
+#: g10/misc.c:97
 #, 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:206
+#: g10/misc.c:207
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Nie nale¿y u¿ywaæ algorytmów do¶wiadczalnych!\n"
 
-#: g10/misc.c:233
+#: g10/misc.c:234
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 "ten algorytm szyfruj±cy jest odradzany; proszê u¿ywaæ bardziej "
 "standardowych!\n"
 
-#: g10/parse-packet.c:117
+#: g10/parse-packet.c:119
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "algorytm klucza publicznego niemo¿liwy do obs³u¿enia: %d\n"
 
-#: g10/parse-packet.c:986
+#: g10/parse-packet.c:991
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
diff -urN gnupg-1.0.3/po/pt_BR.po gnupg-1.0.4/po/pt_BR.po
--- gnupg-1.0.3/po/pt_BR.po	Mon Sep 18 12:18:07 2000
+++ gnupg-1.0.4/po/pt_BR.po	Tue Oct 17 15:40:40 2000
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-09-18 12:17+0200\n"
+"POT-Creation-Date: 2000-10-16 19:22+0200\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Date: 1998-11-20 23:46:36-0200\n"
 "From: Thiago Jung Bauermann <jungmann@usa.net>\n"
@@ -21,11 +21,11 @@
 msgid "Warning: using insecure memory!\n"
 msgstr "Aviso: usando memória insegura!\n"
 
-#: util/secmem.c:289
+#: util/secmem.c:295
 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:290
+#: util/secmem.c:296
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(você pode ter usado o programa errado para esta tarefa)\n"
 
@@ -261,7 +261,7 @@
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "você encontrou um bug ... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1255
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
@@ -887,14 +887,14 @@
 msgid "can't open `%s'\n"
 msgstr "impossível abrir `%s'\n"
 
-#: g10/g10.c:1700
+#: g10/g10.c:1737
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "o primeiro caractere de um nome de notação deve ser uma letra ou um "
 "sublinhado\n"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1743
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -902,12 +902,12 @@
 "um nome de notação deve ter apenas letras, dígitos, pontos ou sublinhados e "
 "terminar com '='\n"
 
-#: g10/g10.c:1712
+#: g10/g10.c:1749
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 "pontos em um nome de notação devem estar cercados por outros caracteres\n"
 
-#: g10/g10.c:1720
+#: g10/g10.c:1757
 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"
 
@@ -970,20 +970,20 @@
 msgid "error in trailer line\n"
 msgstr "erro na linha \"trailer\"\n"
 
-#: g10/armor.c:912
+#: g10/armor.c:906
 msgid "For info see http://www.gnupg.org"
 msgstr ""
 
-#: g10/armor.c:1033
+#: g10/armor.c:1027
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenhum dado OpenPGP válido encontrado.\n"
 
-#: g10/armor.c:1038
+#: g10/armor.c:1032
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura inválida: linha maior que %d caracteres\n"
 
-#: g10/armor.c:1042
+#: g10/armor.c:1036
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -992,7 +992,7 @@
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1188 g10/pkclist.c:53
+#: g10/keyedit.c:1189 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "       Impressão digital:"
 
@@ -1278,67 +1278,67 @@
 msgid "no valid addressees\n"
 msgstr "nenhum endereço válido\n"
 
-#: g10/keygen.c:175
+#: g10/keygen.c:176
 msgid "writing self signature\n"
 msgstr "escrevendo auto-assinatura\n"
 
 # key binding ???
-#: g10/keygen.c:213
+#: g10/keygen.c:214
 msgid "writing key binding signature\n"
 msgstr "escrevendo assinatura ligada a uma chave\n"
 
-#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:435
+#: g10/keygen.c:262 g10/keygen.c:346 g10/keygen.c:436
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "O tamanho de chave pedido é %u bits\n"
 
-#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:440
+#: g10/keygen.c:267 g10/keygen.c:351 g10/keygen.c:441
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:539
+#: g10/keygen.c:540
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/keygen.c:541
+#: g10/keygen.c:542
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (padrão)\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:543
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:544
+#: g10/keygen.c:545
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:546
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (assinatura e criptografia)\n"
 
-#: g10/keygen.c:547
+#: g10/keygen.c:548
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (assinatura e criptografia)\n"
 
-#: g10/keygen.c:551
+#: g10/keygen.c:552
 msgid "Your selection? "
 msgstr "Sua opção? "
 
-#: g10/keygen.c:562 g10/keygen.c:570
+#: g10/keygen.c:563 g10/keygen.c:571
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "Você realmente quer criar uma chave para assinatura e criptografia? "
 
-#: g10/keygen.c:584
+#: g10/keygen.c:585
 msgid "Invalid selection.\n"
 msgstr "Opção inválida.\n"
 
-#: g10/keygen.c:596
+#: g10/keygen.c:597
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1351,19 +1351,19 @@
 "              tamanho padrão é 1024 bits\n"
 "     tamanho máximo sugerido é 2048 bits\n"
 
-#: g10/keygen.c:603
+#: g10/keygen.c:604
 msgid "What keysize do you want? (1024) "
 msgstr "Que tamanho de chave você quer? (1024) "
 
-#: g10/keygen.c:608
+#: g10/keygen.c:609
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA permite apenas tamanhos de 512 a 1024\n"
 
-#: g10/keygen.c:610
+#: g10/keygen.c:611
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "tamanho muito pequeno; 768 é o valor mínimo permitido.\n"
 
-#: g10/keygen.c:612
+#: g10/keygen.c:613
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "tamanho muito pequeno; 768 é o valor mínimo permitido.\n"
@@ -1376,12 +1376,12 @@
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:623
+#: g10/keygen.c:624
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "tamanho muito grande; %d é o valor máximo permitido.\n"
 
-#: g10/keygen.c:628
+#: g10/keygen.c:629
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1389,11 +1389,11 @@
 "Tamanhos de chave maiores que 2048 não são recomendados\n"
 "porque o tempo de computação é REALMENTE longo!\n"
 
-#: g10/keygen.c:631
+#: g10/keygen.c:632
 msgid "Are you sure that you want this keysize? "
 msgstr "Você tem certeza de que quer este tamanho de chave? "
 
-#: g10/keygen.c:632
+#: g10/keygen.c:633
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1401,21 +1401,21 @@
 "Tudo bem, mas tenha em mente que a radiação de seu monitor e teclado também "
 "é vulnerável a ataques!\n"
 
-#: g10/keygen.c:640
+#: g10/keygen.c:641
 msgid "Do you really need such a large keysize? "
 msgstr "Você realmente precisa de uma chave tão grande? "
 
-#: g10/keygen.c:646
+#: g10/keygen.c:647
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido é %u bits\n"
 
-#: g10/keygen.c:649 g10/keygen.c:653
+#: g10/keygen.c:650 g10/keygen.c:654
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:701
+#: g10/keygen.c:702
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1431,25 +1431,25 @@
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:716
+#: g10/keygen.c:717
 msgid "Key is valid for? (0) "
 msgstr "A chave é valida por? (0) "
 
-#: g10/keygen.c:721
+#: g10/keygen.c:722
 msgid "invalid value\n"
 msgstr "valor inválido\n"
 
-#: g10/keygen.c:726
+#: g10/keygen.c:727
 msgid "Key does not expire at all\n"
 msgstr "A chave não expira nunca\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:732
+#: g10/keygen.c:733
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "A chave expira em %s\n"
 
-#: g10/keygen.c:735
+#: g10/keygen.c:736
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1457,11 +1457,11 @@
 "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:740
+#: g10/keygen.c:741
 msgid "Is this correct (y/n)? "
 msgstr "Está correto (s/n)? "
 
-#: g10/keygen.c:783
+#: g10/keygen.c:784
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1477,44 +1477,44 @@
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:795
+#: g10/keygen.c:796
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:803
+#: g10/keygen.c:804
 msgid "Invalid character in name\n"
 msgstr "Caractere inválido no nome\n"
 
-#: g10/keygen.c:805
+#: g10/keygen.c:806
 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:807
+#: g10/keygen.c:808
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:816
 msgid "Email address: "
 msgstr "Endereço de correio eletrônico: "
 
-#: g10/keygen.c:826
+#: g10/keygen.c:827
 msgid "Not a valid email address\n"
 msgstr "Endereço eletrônico inválido\n"
 
-#: g10/keygen.c:834
+#: g10/keygen.c:835
 msgid "Comment: "
 msgstr "Comentário: "
 
-#: g10/keygen.c:840
+#: g10/keygen.c:841
 msgid "Invalid character in comment\n"
 msgstr "Caractere inválido no comentário\n"
 
-#: g10/keygen.c:863
+#: g10/keygen.c:864
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Você está usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:869
+#: g10/keygen.c:870
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1525,28 +1525,28 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:873
+#: g10/keygen.c:874
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:878
+#: g10/keygen.c:879
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:888
+#: g10/keygen.c:889
 #, 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:889
+#: g10/keygen.c:890
 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:908
+#: g10/keygen.c:909
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:946
+#: g10/keygen.c:947
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1554,11 +1554,11 @@
 "Você precisa de uma frase secreta para proteger sua chave.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:954
+#: g10/keyedit.c:468 g10/keygen.c:955
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "A frase secreta não foi repetida corretamente; tente outra vez.\n"
 
-#: g10/keygen.c:960
+#: g10/keygen.c:961
 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"
@@ -1570,7 +1570,7 @@
 "qualquer hora, usando este programa com a opção \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:981
+#: g10/keygen.c:982
 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"
@@ -1582,29 +1582,29 @@
 "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:1430
+#: g10/keygen.c:1431
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "O par de chaves DSA terá 1024 bits.\n"
 
-#: g10/keygen.c:1473
+#: g10/keygen.c:1474
 msgid "Key generation canceled.\n"
 msgstr "Geração de chave cancelada.\n"
 
-#: g10/keygen.c:1570
+#: g10/keygen.c:1571
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escrevendo certificado público para `%s'\n"
 
-#: g10/keygen.c:1571
+#: g10/keygen.c:1572
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1668
 msgid "public and secret key created and signed.\n"
 msgstr "chaves pública e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:1672
+#: g10/keygen.c:1673
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1612,12 +1612,12 @@
 "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:1689 g10/keygen.c:1790
+#: g10/keygen.c:1690 g10/keygen.c:1791
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/keygen.c:1733 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1625,7 +1625,7 @@
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no relógio)\n"
 
-#: g10/keygen.c:1735 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1736 g10/sig-check.c:317 g10/sign.c:114
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1633,7 +1633,7 @@
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no relógio)\n"
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1769
 msgid "Really create? "
 msgstr "Realmente criar? "
 
@@ -2078,7 +2078,7 @@
 msgid "Really sign? "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1870 g10/keyedit.c:1932 g10/sign.c:136
+#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
@@ -2337,202 +2337,202 @@
 msgid "enable a key"
 msgstr "ativa uma chave"
 
-#: g10/delkey.c:110 g10/keyedit.c:630
+#: g10/delkey.c:110 g10/keyedit.c:631
 msgid "can't do that in batchmode\n"
 msgstr "impossível fazer isso em modo não-interativo\n"
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:668
+#: g10/keyedit.c:669
 msgid "Secret key is available.\n"
 msgstr "Chave secreta disponível.\n"
 
-#: g10/keyedit.c:697
+#: g10/keyedit.c:698
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta é necessária para fazer isto.\n"
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:732
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:779
 msgid "Really sign all user IDs? "
 msgstr "Realmente assinar todos os IDs de usuário? "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:780
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugestão: Selecione os IDs de usuário para assinar\n"
 
-#: g10/keyedit.c:811 g10/keyedit.c:993
+#: g10/keyedit.c:812 g10/keyedit.c:994
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "atualização do banco de dados de confiabilidade falhou: %s\n"
 
-#: g10/keyedit.c:822 g10/keyedit.c:843
+#: g10/keyedit.c:823 g10/keyedit.c:844
 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:824
+#: g10/keyedit.c:825
 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:827
+#: g10/keyedit.c:828
 msgid "Really remove all selected user IDs? "
 msgstr "Realmente remover todos os IDs de usuário selecionados? "
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:829
 msgid "Really remove this user ID? "
 msgstr "Realmente remover este ID de usuário? "
 
-#: g10/keyedit.c:864 g10/keyedit.c:886
+#: g10/keyedit.c:865 g10/keyedit.c:887
 msgid "You must select at least one key.\n"
 msgstr "Você deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:869
 msgid "Do you really want to delete the selected keys? "
 msgstr "Você realmente quer remover as chaves selecionadas? "
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:870
 msgid "Do you really want to delete this key? "
 msgstr "Você realmente quer remover esta chave? "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:891
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Você realmente quer revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:892
 msgid "Do you really want to revoke this key? "
 msgstr "Você realmente quer revogar esta chave? "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:958
 msgid "Save changes? "
 msgstr "Salvar alterações? "
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:961
 msgid "Quit without saving? "
 msgstr "Sair sem salvar? "
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:972
 #, c-format
 msgid "update failed: %s\n"
 msgstr "atualização falhou: %s\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:979
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "atualização da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:986
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave não alterada, nenhuma atualização é necessária.\n"
 
 # help ou ajuda ???
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1001
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inválido (tente \"help\")\n"
 
-#: g10/keyedit.c:1080 g10/keyedit.c:1106
+#: g10/keyedit.c:1081 g10/keyedit.c:1107
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1089
+#: g10/keyedit.c:1090
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1093
+#: g10/keyedit.c:1094
 msgid "This key has been disabled"
 msgstr "Esta chave foi desativada"
 
-#: g10/keyedit.c:1122
+#: g10/keyedit.c:1123
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "chave %08lX: a subchave foi revogada!\n"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1126
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "   novas revogações de chaves: %lu\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1128
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Deletar esta assinatura válida? (s/N/q)"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1370
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Deletar esta assinatura inválida? (s/N/q)"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1374
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Deletar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1380
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1394
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1398
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:1466
+#: g10/keyedit.c:1467
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as seleções das chaves secretas.\n"
 
-#: g10/keyedit.c:1472
+#: g10/keyedit.c:1473
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor selecione no máximo uma chave secundária.\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1477
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Modificando a data de validade para uma chave secundária.\n"
 
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1479
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificando a data de validade para uma chave primária.\n"
 
-#: g10/keyedit.c:1520
+#: g10/keyedit.c:1521
 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:1536
+#: g10/keyedit.c:1537
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/keyedit.c:1597
+#: g10/keyedit.c:1598
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de usuário com índice %d\n"
 
-#: g10/keyedit.c:1643
+#: g10/keyedit.c:1644
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nenhuma chave secundária com índice %d\n"
 
-#: g10/keyedit.c:1741
+#: g10/keyedit.c:1742
 msgid "user ID: \""
 msgstr "ID de usuário: \""
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1745
 #, c-format
 msgid ""
 "\"\n"
@@ -2541,34 +2541,34 @@
 "\"\n"
 "assinado com sua chave %08lX em %s\n"
 
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:1749
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1773
 msgid "You have signed these user IDs:\n"
 msgstr "Você assinou estes IDs de usuário:\n"
 
-#: g10/keyedit.c:1786 g10/keyedit.c:1821
+#: g10/keyedit.c:1787 g10/keyedit.c:1822
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   assinado por %08lX em %s\n"
 
-#: g10/keyedit.c:1791
+#: g10/keyedit.c:1792
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:1811
+#: g10/keyedit.c:1812
 msgid "You are about to revoke these signatures:\n"
 msgstr "Você está prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:1829
+#: g10/keyedit.c:1830
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Realmente gerar os certificados de revogação? (s/N)"
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1859
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
@@ -2583,138 +2583,138 @@
 msgstr "revkey"
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:760
+#: g10/keylist.c:400 g10/mainproc.c:790
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "A chave expira em %s\n"
 
-#: g10/mainproc.c:213
+#: g10/mainproc.c:240
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "a chave pública é %08lX\n"
 
-#: g10/mainproc.c:257
+#: g10/mainproc.c:284
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados criptografados com chave pública: DEK válido\n"
 
-#: g10/mainproc.c:299
+#: g10/mainproc.c:326
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "criptografado com chave %u-bit %s, ID %08lX, criada em %s\n"
 
-#: g10/mainproc.c:309
+#: g10/mainproc.c:336
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "criptografado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:315
+#: g10/mainproc.c:342
 msgid "no secret key for decryption available\n"
 msgstr "nenhuma chave secreta para descriptografia disponível\n"
 
-#: g10/mainproc.c:324
+#: g10/mainproc.c:351
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descriptografia de chave pública falhou: %s\n"
 
-#: g10/mainproc.c:361
+#: g10/mainproc.c:388
 msgid "decryption okay\n"
 msgstr "descriptografia correta\n"
 
-#: g10/mainproc.c:366
+#: g10/mainproc.c:393
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem criptografada foi manipulada!\n"
 
-#: g10/mainproc.c:371
+#: g10/mainproc.c:398
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/mainproc.c:390
+#: g10/mainproc.c:417
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:392
+#: g10/mainproc.c:419
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome de arquivo original='%.*s'\n"
 
-#: g10/mainproc.c:544
+#: g10/mainproc.c:574
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revogação isolada - use \"gpg --import\" para aplicá-la\n"
 
-#: g10/mainproc.c:631 g10/mainproc.c:640
+#: g10/mainproc.c:661 g10/mainproc.c:670
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: dados de notação inválidos encontrados\n"
 
-#: g10/mainproc.c:643
+#: g10/mainproc.c:673
 msgid "Notation: "
 msgstr "Notação: "
 
-#: g10/mainproc.c:650
+#: g10/mainproc.c:680
 msgid "Policy: "
 msgstr "Política: "
 
-#: g10/mainproc.c:1080
+#: g10/mainproc.c:1121
 msgid "signature verification suppressed\n"
 msgstr "verificação de assinatura suprimida\n"
 
-#: g10/mainproc.c:1086
+#: g10/mainproc.c:1158
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1112 g10/mainproc.c:1123
+#: g10/mainproc.c:1184 g10/mainproc.c:1195
 msgid "BAD signature from \""
 msgstr "Assinatura INCORRETA de \""
 
-#: g10/mainproc.c:1113 g10/mainproc.c:1124
+#: g10/mainproc.c:1185 g10/mainproc.c:1196
 msgid "Good signature from \""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1115
+#: g10/mainproc.c:1187
 msgid "                aka \""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1171
+#: g10/mainproc.c:1243
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossível verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1235
+#: g10/mainproc.c:1318
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura isolada da classe 0x%02x\n"
 
-#: g10/mainproc.c:1281
+#: g10/mainproc.c:1369
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:1286
+#: g10/mainproc.c:1374
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inválido detectado em proc_tree()\n"
 
-#: g10/misc.c:96
+#: g10/misc.c:97
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "impossível desativar core dumps: %s\n"
 
-#: g10/misc.c:206
+#: g10/misc.c:207
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Algoritmos experimentais não devem ser usados!\n"
 
-#: g10/misc.c:233
+#: g10/misc.c:234
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 "este algoritmo de criptografia é depreciado; por favor use algum\n"
 "algoritmo padrão!\n"
 
-#: g10/parse-packet.c:117
+#: g10/parse-packet.c:119
 #, 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:986
+#: g10/parse-packet.c:991
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit crítico ligado\n"
diff -urN gnupg-1.0.3/po/pt_PT.po gnupg-1.0.4/po/pt_PT.po
--- gnupg-1.0.3/po/pt_PT.po	Mon Sep 18 12:18:07 2000
+++ gnupg-1.0.4/po/pt_PT.po	Tue Oct 17 15:40:40 2000
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
-"POT-Creation-Date: 2000-09-18 12:17+0200\n"
+"POT-Creation-Date: 2000-10-16 19:22+0200\n"
 "PO-Revision-Date: 1999-09-09 20:28+0000\n"
 "Last-Translator: Pedro Morais <morais@poli.org>\n"
 "Language-Team: pt\n"
@@ -19,11 +19,11 @@
 msgid "Warning: using insecure memory!\n"
 msgstr "Aviso: a utilizar memória insegura!\n"
 
-#: util/secmem.c:289
+#: util/secmem.c:295
 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:290
+#: util/secmem.c:296
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(você pode ter usado o programa errado para esta tarefa)\n"
 
@@ -258,7 +258,7 @@
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "você encontrou um bug ... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1255
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
@@ -879,14 +879,14 @@
 msgid "can't open `%s'\n"
 msgstr "impossível abrir `%s'\n"
 
-#: g10/g10.c:1700
+#: g10/g10.c:1737
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "o primeiro caracter de um nome de notação deve ser uma letra ou um "
 "sublinhado\n"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1743
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -894,12 +894,12 @@
 "um nome de notação deve ter apenas letras, dígitos, pontos ou sublinhados e "
 "terminar com '='\n"
 
-#: g10/g10.c:1712
+#: g10/g10.c:1749
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 "pontos num nome de notação devem estar cercados por outros caracteres\n"
 
-#: g10/g10.c:1720
+#: g10/g10.c:1757
 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"
 
@@ -962,20 +962,20 @@
 msgid "error in trailer line\n"
 msgstr "erro na linha \"trailer\"\n"
 
-#: g10/armor.c:912
+#: g10/armor.c:906
 msgid "For info see http://www.gnupg.org"
 msgstr ""
 
-#: g10/armor.c:1033
+#: g10/armor.c:1027
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenhum dado OpenPGP válido encontrado.\n"
 
-#: g10/armor.c:1038
+#: g10/armor.c:1032
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura inválida: linha maior que %d caracteres\n"
 
-#: g10/armor.c:1042
+#: g10/armor.c:1036
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -984,7 +984,7 @@
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1188 g10/pkclist.c:53
+#: g10/keyedit.c:1189 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "       Impressão digital:"
 
@@ -1271,67 +1271,67 @@
 msgid "no valid addressees\n"
 msgstr "nenhum endereço válido\n"
 
-#: g10/keygen.c:175
+#: g10/keygen.c:176
 msgid "writing self signature\n"
 msgstr "escrevendo auto-assinatura\n"
 
 # key binding ???
-#: g10/keygen.c:213
+#: g10/keygen.c:214
 msgid "writing key binding signature\n"
 msgstr "escrevendo assinatura ligada a uma chave\n"
 
-#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:435
+#: g10/keygen.c:262 g10/keygen.c:346 g10/keygen.c:436
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "O tamanho de chave pedido é %u bits\n"
 
-#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:440
+#: g10/keygen.c:267 g10/keygen.c:351 g10/keygen.c:441
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:539
+#: g10/keygen.c:540
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/keygen.c:541
+#: g10/keygen.c:542
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (por omissão)\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:543
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:544
+#: g10/keygen.c:545
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas encripção)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:546
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (assinatura e encriptação)\n"
 
-#: g10/keygen.c:547
+#: g10/keygen.c:548
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (assinatura e encriptação)\n"
 
-#: g10/keygen.c:551
+#: g10/keygen.c:552
 msgid "Your selection? "
 msgstr "Opção? "
 
-#: g10/keygen.c:562 g10/keygen.c:570
+#: g10/keygen.c:563 g10/keygen.c:571
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "Você quer realmente criar uma chave para assinatura e criptografia? "
 
-#: g10/keygen.c:584
+#: g10/keygen.c:585
 msgid "Invalid selection.\n"
 msgstr "Opção inválida.\n"
 
-#: g10/keygen.c:596
+#: g10/keygen.c:597
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1344,19 +1344,19 @@
 "         tamanho por omissão é 1024 bits\n"
 "     tamanho máximo sugerido é 2048 bits\n"
 
-#: g10/keygen.c:603
+#: g10/keygen.c:604
 msgid "What keysize do you want? (1024) "
 msgstr "Qual o tamanho de chave desejado? (1024) "
 
-#: g10/keygen.c:608
+#: g10/keygen.c:609
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA permite apenas tamanhos de 512 a 1024\n"
 
-#: g10/keygen.c:610
+#: g10/keygen.c:611
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "tamanho muito pequeno; 768 é o valor mínimo permitido.\n"
 
-#: g10/keygen.c:612
+#: g10/keygen.c:613
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "tamanho muito pequeno; 768 é o valor mínimo permitido.\n"
@@ -1369,12 +1369,12 @@
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:623
+#: g10/keygen.c:624
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "tamanho muito grande; %d é o valor máximo permitido.\n"
 
-#: g10/keygen.c:628
+#: g10/keygen.c:629
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1382,11 +1382,11 @@
 "Tamanhos de chave maiores que 2048 não são recomendados\n"
 "porque o tempo de computação é REALMENTE longo!\n"
 
-#: g10/keygen.c:631
+#: g10/keygen.c:632
 msgid "Are you sure that you want this keysize? "
 msgstr "Você tem certeza de que quer este tamanho de chave? "
 
-#: g10/keygen.c:632
+#: g10/keygen.c:633
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1394,21 +1394,21 @@
 "Tudo bem, mas não se esqueça que a radiação do seu monitor e teclado também "
 "é extremamente vulnerável a ataques!\n"
 
-#: g10/keygen.c:640
+#: g10/keygen.c:641
 msgid "Do you really need such a large keysize? "
 msgstr "Você precisa realmente de uma chave tão grande? "
 
-#: g10/keygen.c:646
+#: g10/keygen.c:647
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido é %u bits\n"
 
-#: g10/keygen.c:649 g10/keygen.c:653
+#: g10/keygen.c:650 g10/keygen.c:654
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:701
+#: g10/keygen.c:702
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1424,25 +1424,25 @@
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:716
+#: g10/keygen.c:717
 msgid "Key is valid for? (0) "
 msgstr "A chave é valida por? (0) "
 
-#: g10/keygen.c:721
+#: g10/keygen.c:722
 msgid "invalid value\n"
 msgstr "valor inválido\n"
 
-#: g10/keygen.c:726
+#: g10/keygen.c:727
 msgid "Key does not expire at all\n"
 msgstr "A chave não expira nunca\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:732
+#: g10/keygen.c:733
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "A chave expira em %s\n"
 
-#: g10/keygen.c:735
+#: g10/keygen.c:736
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1450,11 +1450,11 @@
 "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:740
+#: g10/keygen.c:741
 msgid "Is this correct (y/n)? "
 msgstr "Está correto (s/n)? "
 
-#: g10/keygen.c:783
+#: g10/keygen.c:784
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1471,44 +1471,44 @@
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:795
+#: g10/keygen.c:796
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:803
+#: g10/keygen.c:804
 msgid "Invalid character in name\n"
 msgstr "Caracter inválido no nome\n"
 
-#: g10/keygen.c:805
+#: g10/keygen.c:806
 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:807
+#: g10/keygen.c:808
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:816
 msgid "Email address: "
 msgstr "Endereço de correio eletrónico: "
 
-#: g10/keygen.c:826
+#: g10/keygen.c:827
 msgid "Not a valid email address\n"
 msgstr "Endereço eletrónico inválido\n"
 
-#: g10/keygen.c:834
+#: g10/keygen.c:835
 msgid "Comment: "
 msgstr "Comentário: "
 
-#: g10/keygen.c:840
+#: g10/keygen.c:841
 msgid "Invalid character in comment\n"
 msgstr "Caracter inválido no comentário\n"
 
-#: g10/keygen.c:863
+#: g10/keygen.c:864
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Você está usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:869
+#: g10/keygen.c:870
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1519,28 +1519,28 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:873
+#: g10/keygen.c:874
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:878
+#: g10/keygen.c:879
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:888
+#: g10/keygen.c:889
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Mudar (N)ome, (C)omentário, (E)ndereço ou (O)k/(S)air? "
 
-#: g10/keygen.c:889
+#: g10/keygen.c:890
 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:908
+#: g10/keygen.c:909
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:946
+#: g10/keygen.c:947
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1548,11 +1548,11 @@
 "Você precisa de uma frase secreta para proteger a sua chave.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:954
+#: g10/keyedit.c:468 g10/keygen.c:955
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "a frase secreta não foi repetida corretamente; tente outra vez.\n"
 
-#: g10/keygen.c:960
+#: g10/keygen.c:961
 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"
@@ -1564,7 +1564,7 @@
 "qualquer hora, usando este programa com a opção \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:981
+#: g10/keygen.c:982
 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"
@@ -1576,29 +1576,29 @@
 "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:1430
+#: g10/keygen.c:1431
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "O par de chaves DSA terá 1024 bits.\n"
 
-#: g10/keygen.c:1473
+#: g10/keygen.c:1474
 msgid "Key generation canceled.\n"
 msgstr "Geração de chave cancelada.\n"
 
-#: g10/keygen.c:1570
+#: g10/keygen.c:1571
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escrevendo certificado público para `%s'\n"
 
-#: g10/keygen.c:1571
+#: g10/keygen.c:1572
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1668
 msgid "public and secret key created and signed.\n"
 msgstr "chaves pública e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:1672
+#: g10/keygen.c:1673
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1606,12 +1606,12 @@
 "Note que esta chave não pode ser usada para encriptação. Você pode usar\n"
 "o comando \"--edit-key\" para gerar uma chave secundária para esse fim.\n"
 
-#: g10/keygen.c:1689 g10/keygen.c:1790
+#: g10/keygen.c:1690 g10/keygen.c:1791
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/keygen.c:1733 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1619,7 +1619,7 @@
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no relógio)\n"
 
-#: g10/keygen.c:1735 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1736 g10/sig-check.c:317 g10/sign.c:114
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1627,7 +1627,7 @@
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no relógio)\n"
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1769
 msgid "Really create? "
 msgstr "Realmente criar? "
 
@@ -2072,7 +2072,7 @@
 msgid "Really sign? "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1870 g10/keyedit.c:1932 g10/sign.c:136
+#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
@@ -2331,202 +2331,202 @@
 msgid "enable a key"
 msgstr "activa uma chave"
 
-#: g10/delkey.c:110 g10/keyedit.c:630
+#: g10/delkey.c:110 g10/keyedit.c:631
 msgid "can't do that in batchmode\n"
 msgstr "impossível fazer isso em modo não-interativo\n"
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:668
+#: g10/keyedit.c:669
 msgid "Secret key is available.\n"
 msgstr "Chave secreta disponível.\n"
 
-#: g10/keyedit.c:697
+#: g10/keyedit.c:698
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta é necessária para fazer isto.\n"
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:732
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:779
 msgid "Really sign all user IDs? "
 msgstr "Realmente assinar todos os IDs de utilizador? "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:780
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugestão: Selecione os IDs de utilizador para assinar\n"
 
-#: g10/keyedit.c:811 g10/keyedit.c:993
+#: g10/keyedit.c:812 g10/keyedit.c:994
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "actualização da base de dados de confiança falhou: %s\n"
 
-#: g10/keyedit.c:822 g10/keyedit.c:843
+#: g10/keyedit.c:823 g10/keyedit.c:844
 msgid "You must select at least one user ID.\n"
 msgstr "Você precisa selecionar pelo menos um ID de utilizador.\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:825
 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:827
+#: g10/keyedit.c:828
 msgid "Really remove all selected user IDs? "
 msgstr "Realmente remover todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:829
 msgid "Really remove this user ID? "
 msgstr "Realmente remover este ID de utilizador? "
 
-#: g10/keyedit.c:864 g10/keyedit.c:886
+#: g10/keyedit.c:865 g10/keyedit.c:887
 msgid "You must select at least one key.\n"
 msgstr "Você deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:869
 msgid "Do you really want to delete the selected keys? "
 msgstr "Você quer realmente remover as chaves selecionadas? "
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:870
 msgid "Do you really want to delete this key? "
 msgstr "Você quer realmente remover esta chave? "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:891
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Você quer realmente revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:892
 msgid "Do you really want to revoke this key? "
 msgstr "Você quer realmente revogar esta chave? "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:958
 msgid "Save changes? "
 msgstr "Gravar alterações? "
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:961
 msgid "Quit without saving? "
 msgstr "Sair sem gravar? "
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:972
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualização falhou: %s\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:979
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualização da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:986
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave não alterada, nenhuma actualização é necessária.\n"
 
 # help ou ajuda ???
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1001
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inválido (tente \"help\")\n"
 
-#: g10/keyedit.c:1080 g10/keyedit.c:1106
+#: g10/keyedit.c:1081 g10/keyedit.c:1107
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1089
+#: g10/keyedit.c:1090
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1093
+#: g10/keyedit.c:1094
 msgid "This key has been disabled"
 msgstr "Esta chave foi desactivada"
 
-#: g10/keyedit.c:1122
+#: g10/keyedit.c:1123
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "chave %08lX: a subchave foi revogada!\n"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1126
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "   novas revogações de chaves: %lu\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1128
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Apagar esta assinatura válida? (s/N/q)"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1370
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Apagar esta assinatura inválida? (s/N/q)"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1374
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Apagar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1380
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1394
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1398
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:1466
+#: g10/keyedit.c:1467
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as selecções das chaves secretas.\n"
 
-#: g10/keyedit.c:1472
+#: g10/keyedit.c:1473
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor seleccione no máximo uma chave secundária.\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1477
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "A modificar a data de validade para uma chave secundária.\n"
 
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1479
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificar a data de validade para uma chave primária.\n"
 
-#: g10/keyedit.c:1520
+#: g10/keyedit.c:1521
 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:1536
+#: g10/keyedit.c:1537
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/keyedit.c:1597
+#: g10/keyedit.c:1598
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de utilizador com índice %d\n"
 
-#: g10/keyedit.c:1643
+#: g10/keyedit.c:1644
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nenhuma chave secundária com índice %d\n"
 
-#: g10/keyedit.c:1741
+#: g10/keyedit.c:1742
 msgid "user ID: \""
 msgstr "ID de utilizador: \""
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1745
 #, c-format
 msgid ""
 "\"\n"
@@ -2535,34 +2535,34 @@
 "\"\n"
 "assinado com sua chave %08lX em %s\n"
 
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:1749
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1773
 msgid "You have signed these user IDs:\n"
 msgstr "Assinou estes identificadores de utilizadores:\n"
 
-#: g10/keyedit.c:1786 g10/keyedit.c:1821
+#: g10/keyedit.c:1787 g10/keyedit.c:1822
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   assinado por %08lX em %s\n"
 
-#: g10/keyedit.c:1791
+#: g10/keyedit.c:1792
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:1811
+#: g10/keyedit.c:1812
 msgid "You are about to revoke these signatures:\n"
 msgstr "Está prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:1829
+#: g10/keyedit.c:1830
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Realmente gerar os certificados de revogação? (s/N)"
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1859
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
@@ -2577,138 +2577,138 @@
 msgstr "revkey"
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:760
+#: g10/keylist.c:400 g10/mainproc.c:790
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "A chave expira em %s\n"
 
-#: g10/mainproc.c:213
+#: g10/mainproc.c:240
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "a chave pública é %08lX\n"
 
-#: g10/mainproc.c:257
+#: g10/mainproc.c:284
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados encriptados com chave pública: DEK válido\n"
 
-#: g10/mainproc.c:299
+#: g10/mainproc.c:326
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "encriptado com chave %u-bit %s, ID %08lX, criada em %s\n"
 
-#: g10/mainproc.c:309
+#: g10/mainproc.c:336
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "encriptado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:315
+#: g10/mainproc.c:342
 msgid "no secret key for decryption available\n"
 msgstr "nenhuma chave secreta para desencriptação disponível\n"
 
-#: g10/mainproc.c:324
+#: g10/mainproc.c:351
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "desencriptação de chave pública falhou: %s\n"
 
-#: g10/mainproc.c:361
+#: g10/mainproc.c:388
 msgid "decryption okay\n"
 msgstr "desencriptação correcta\n"
 
-#: g10/mainproc.c:366
+#: g10/mainproc.c:393
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem encriptada foi manipulada!\n"
 
-#: g10/mainproc.c:371
+#: g10/mainproc.c:398
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "desencriptação falhou: %s\n"
 
-#: g10/mainproc.c:390
+#: g10/mainproc.c:417
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:392
+#: g10/mainproc.c:419
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro original='%.*s'\n"
 
-#: g10/mainproc.c:544
+#: g10/mainproc.c:574
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocação solitária - utilize \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:631 g10/mainproc.c:640
+#: g10/mainproc.c:661 g10/mainproc.c:670
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: dados de notação inválidos encontrados\n"
 
-#: g10/mainproc.c:643
+#: g10/mainproc.c:673
 msgid "Notation: "
 msgstr "Notação: "
 
-#: g10/mainproc.c:650
+#: g10/mainproc.c:680
 msgid "Policy: "
 msgstr "Política: "
 
-#: g10/mainproc.c:1080
+#: g10/mainproc.c:1121
 msgid "signature verification suppressed\n"
 msgstr "verificação de assinatura suprimida\n"
 
-#: g10/mainproc.c:1086
+#: g10/mainproc.c:1158
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1112 g10/mainproc.c:1123
+#: g10/mainproc.c:1184 g10/mainproc.c:1195
 msgid "BAD signature from \""
 msgstr "Assinatura INCORRECTA de \""
 
-#: g10/mainproc.c:1113 g10/mainproc.c:1124
+#: g10/mainproc.c:1185 g10/mainproc.c:1196
 msgid "Good signature from \""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1115
+#: g10/mainproc.c:1187
 msgid "                aka \""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1171
+#: g10/mainproc.c:1243
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossível verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1235
+#: g10/mainproc.c:1318
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura de classe 0x%02x\n"
 
-#: g10/mainproc.c:1281
+#: g10/mainproc.c:1369
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:1286
+#: g10/mainproc.c:1374
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inválido detectado em proc_tree()\n"
 
-#: g10/misc.c:96
+#: g10/misc.c:97
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "impossível desactivar core dumps: %s\n"
 
-#: g10/misc.c:206
+#: g10/misc.c:207
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Algoritmos experimentais não devem ser usados!\n"
 
-#: g10/misc.c:233
+#: g10/misc.c:234
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 "este algoritmo de criptografia não é recomendado;\n"
 "por favor use um algoritmo mais standard!\n"
 
-#: g10/parse-packet.c:117
+#: g10/parse-packet.c:119
 #, 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:986
+#: g10/parse-packet.c:991
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit crítico ligado\n"
diff -urN gnupg-1.0.3/po/ru.po gnupg-1.0.4/po/ru.po
--- gnupg-1.0.3/po/ru.po	Mon Sep 18 12:18:08 2000
+++ gnupg-1.0.4/po/ru.po	Tue Oct 17 15:40:41 2000
@@ -9,7 +9,7 @@
 # QingLong <qinglong@Bolizm> (couldn't send an email to let you know)
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-09-18 12:17+0200\n"
+"POT-Creation-Date: 2000-10-16 19:22+0200\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-01-26 22:08:36+0100\n"
 "From: Gregory Steuck <steuck@iname.com>\n"
@@ -28,11 +28,11 @@
 "üÔÕ ÐÒÏÂÌÅÍÕ ÍÏÖÎÏ ÒÅÛÉÔØ, ÕÓÔÁÎÏ×É× ÐÒÏÇÒÁÍÍÕ suid(root).\n"
 "ïÂÒÁÔÉÔÅÓØ ÄÌÑ ÜÔÏÇÏ Ë ÁÄÍÉÎÉÓÔÒÁÔÏÒÕ ÷ÁÛÅÊ ÓÉÓÔÅÍÙ.\n"
 
-#: util/secmem.c:289
+#: util/secmem.c:295
 msgid "operation is not possible without initialized secure memory\n"
 msgstr ""
 
-#: util/secmem.c:290
+#: util/secmem.c:296
 msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 
@@ -313,7 +313,7 @@
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "÷Ù ÎÁÛÌÉ ÏÛÉÂËÕ × ÐÒÏÇÒÁÍÍÅ ... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1255
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
 #, fuzzy, c-format
 msgid "can't open `%s': %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s': %s\n"
@@ -943,22 +943,22 @@
 msgid "can't open `%s'\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s'\n"
 
-#: g10/g10.c:1700
+#: g10/g10.c:1737
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 
-#: g10/g10.c:1706
+#: g10/g10.c:1743
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
 msgstr ""
 
-#: g10/g10.c:1712
+#: g10/g10.c:1749
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 
-#: g10/g10.c:1720
+#: g10/g10.c:1757
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 
@@ -1024,28 +1024,28 @@
 msgid "error in trailer line\n"
 msgstr "ÏÛÉÂËÁ × ÚÁ×ÅÒÛÁÀÝÅÊ ÓÔÒÏËÅ\n"
 
-#: g10/armor.c:912
+#: g10/armor.c:906
 msgid "For info see http://www.gnupg.org"
 msgstr ""
 
-#: g10/armor.c:1033
+#: g10/armor.c:1027
 #, fuzzy
 msgid "no valid OpenPGP data found.\n"
 msgstr "ÎÅ ÎÁÊÄÅÎÏ ÄÏÐÕÓÔÉÍÙÈ RFC1991 ÉÌÉ OpenPGP ÄÁÎÎÙÈ.\n"
 
-#: g10/armor.c:1038
+#: g10/armor.c:1032
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr ""
 
-#: g10/armor.c:1042
+#: g10/armor.c:1036
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1188 g10/pkclist.c:53
+#: g10/keyedit.c:1189 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr ""
 
@@ -1333,67 +1333,67 @@
 msgid "no valid addressees\n"
 msgstr "ÎÅÔ ÄÏÐÕÓÔÉÍÙÈ ÁÄÒÅÓÏ×\n"
 
-#: g10/keygen.c:175
+#: g10/keygen.c:176
 msgid "writing self signature\n"
 msgstr "ÐÉÛÅÔÓÑ ÓÁÍÏ-ÐÏÄÐÉÓØ\n"
 
-#: g10/keygen.c:213
+#: g10/keygen.c:214
 msgid "writing key binding signature\n"
 msgstr "ÐÉÛÅÔÓÑ \"key-binding\" ÐÏÄÐÉÓØ\n"
 
-#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:435
+#: g10/keygen.c:262 g10/keygen.c:346 g10/keygen.c:436
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "úÁÐÒÏÛÅÎÎÙÊ ËÌÀÞ ÉÍÅÅÔ ÄÌÉÎÕ %u ÂÉÔ\n"
 
-#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:440
+#: g10/keygen.c:267 g10/keygen.c:351 g10/keygen.c:441
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "ÏËÒÕÇÌÅÎÏ ÄÏ %u ÂÉÔ\n"
 
-#: g10/keygen.c:539
+#: g10/keygen.c:540
 msgid "Please select what kind of key you want:\n"
 msgstr "÷ÙÂÅÒÉÔÅ ÖÅÌÁÅÍÙÊ ÔÉÐ ËÌÀÞÁ:\n"
 
-#: g10/keygen.c:541
+#: g10/keygen.c:542
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA É ElGamal (ÐÏ ÕÍÏÌÞÁÎÉÀ)\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:543
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (ÔÏÌØËÏ ÐÏÄÐÉÓØ)\n"
 
-#: g10/keygen.c:544
+#: g10/keygen.c:545
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (ÔÏÌØËÏ ÛÉÆÒÏ×ÁÎÉÅ)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:546
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (ÐÏÄÐÉÓØ É ÛÉÆÒÏ×ÁÎÉÅ)\n"
 
-#: g10/keygen.c:547
+#: g10/keygen.c:548
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (ÐÏÄÐÉÓØ É ÛÉÆÒÏ×ÁÎÉÅ)\n"
 
-#: g10/keygen.c:551
+#: g10/keygen.c:552
 msgid "Your selection? "
 msgstr "÷ÁÛ ×ÙÂÏÒ? "
 
-#: g10/keygen.c:562 g10/keygen.c:570
+#: g10/keygen.c:563 g10/keygen.c:571
 #, fuzzy
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÕÄÁÌÉÔØ ×ÙÂÒÁÎÎÙÅ ËÌÀÞÉ? "
 
-#: g10/keygen.c:584
+#: g10/keygen.c:585
 msgid "Invalid selection.\n"
 msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ×ÙÂÏÒ.\n"
 
-#: g10/keygen.c:596
+#: g10/keygen.c:597
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1406,19 +1406,19 @@
 "               ÄÌÉÎÁ ËÌÀÞÁ ÐÏ ÕÍÏÌÞÁÎÉÀ: 1024 ÂÉÔÁ\n"
 " ÍÁËÓÉÍÁÌØÎÁÑ ÒÅËÏÍÅÎÄÕÅÍÁÑ ÄÌÉÎÁ ËÌÀÞÁ: 2048 ÂÉÔ\n"
 
-#: g10/keygen.c:603
+#: g10/keygen.c:604
 msgid "What keysize do you want? (1024) "
 msgstr "ëÁËÏÇÏ ÒÁÚÍÅÒÁ ËÌÀÞ ×Ù ÖÅÌÁÅÔÅ? (1024)"
 
-#: g10/keygen.c:608
+#: g10/keygen.c:609
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "äÏÐÕÓÔÉÍÙÊ ÒÁÚÍÅÒ DSA ËÌÀÞÅÊ - ÏÔ 512 ÄÏ 1024 ÂÉÔ\n"
 
-#: g10/keygen.c:610
+#: g10/keygen.c:611
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "ÓÌÉÛËÏÍ ÍÁÌÅÎØËÁÑ ÄÌÉÎÁ ËÌÀÞÁ, ÎÁÉÍÅÎØÛÅÅ ÚÎÁÞÅÎÉÅ - 768.\n"
 
-#: g10/keygen.c:612
+#: g10/keygen.c:613
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "ÓÌÉÛËÏÍ ÍÁÌÅÎØËÁÑ ÄÌÉÎÁ ËÌÀÞÁ, ÎÁÉÍÅÎØÛÅÅ ÚÎÁÞÅÎÉÅ - 768.\n"
@@ -1431,12 +1431,12 @@
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:623
+#: g10/keygen.c:624
 #, fuzzy, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "ÓÌÉÛËÏÍ ÍÁÌÅÎØËÁÑ ÄÌÉÎÁ ËÌÀÞÁ, ÎÁÉÍÅÎØÛÅÅ ÚÎÁÞÅÎÉÅ - 768.\n"
 
-#: g10/keygen.c:628
+#: g10/keygen.c:629
 #, fuzzy
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
@@ -1445,11 +1445,11 @@
 "ëÌÀÞÉ ÄÌÉÎÏÊ ÂÏÌØÛÅ 2048 ÎÅ ÒÅËÏÍÅÎÄÕÀÔÓÑ, ÐÏÔÏÍÕ ÞÔÏ ×ÙÞÉÓÌÅÎÉÑÚÁÎÉÍÁÀÔ "
 "ïþåîø ÍÎÏÇÏ ×ÒÅÍÅÎÉ!\n"
 
-#: g10/keygen.c:631
+#: g10/keygen.c:632
 msgid "Are you sure that you want this keysize? "
 msgstr "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ËÌÀÞ ÔÁËÏÊ ÄÌÉÎÙ? "
 
-#: g10/keygen.c:632
+#: g10/keygen.c:633
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1457,21 +1457,21 @@
 "ïË, ÔÏÌØËÏ ÎÅ ÚÁÂÙ×ÁÊÔÅ, ÞÔÏ ÉÚÌÕÞÅÎÉÅ ×ÁÛÉÈ ËÌÁ×ÉÁÔÕÒÙ É ÍÏÎÉÔÏÒÁ ÔÏÖÅ\n"
 "ÄÅÌÁÀÔ ×ÁÓ ÕÑÚ×ÉÍÙÍ ÄÌÑ ÁÔÁË.\n"
 
-#: g10/keygen.c:640
+#: g10/keygen.c:641
 msgid "Do you really need such a large keysize? "
 msgstr "÷ÁÍ ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÎÕÖÅÎ ÔÁËÏÊ ÄÌÉÎÎÙÊ ËÌÀÞ? "
 
-#: g10/keygen.c:646
+#: g10/keygen.c:647
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "úÁÐÒÏÛÅÎÎÙÊ ËÌÀÞ ÉÍÅÅÔ ÄÌÉÎÕ %u ÂÉÔ\n"
 
-#: g10/keygen.c:649 g10/keygen.c:653
+#: g10/keygen.c:650 g10/keygen.c:654
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "ÏËÒÕÇÌÅÎÏ ÄÏ %u ÂÉÔ\n"
 
-#: g10/keygen.c:701
+#: g10/keygen.c:702
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1487,35 +1487,35 @@
 "      <n>m = ÓÒÏË ÄÅÊÓÔ×ÉÑ ËÌÀÞÁ n ÍÅÓÑÃÅ×\n"
 "      <n>y = ÓÒÏË ÄÅÊÓÔ×ÉÑ ËÌÀÞÁ n ÌÅÔ\n"
 
-#: g10/keygen.c:716
+#: g10/keygen.c:717
 msgid "Key is valid for? (0) "
 msgstr "ëÌÀÞ ÄÅÊÓÔ×ÉÔÅÌÅÎ × ÔÅÞÅÎÉÅ? (0) "
 
-#: g10/keygen.c:721
+#: g10/keygen.c:722
 msgid "invalid value\n"
 msgstr "ÎÅÄÏÐÕÓÔÉÍÏÅ ÚÎÁÞÅÎÉÅ.\n"
 
-#: g10/keygen.c:726
+#: g10/keygen.c:727
 msgid "Key does not expire at all\n"
 msgstr "âÅÓÓÒÏÞÎÙÊ ËÌÀÞ.\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:732
+#: g10/keygen.c:733
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "ëÌÀÞ ÄÅÊÓÔ×ÕÅÔ ÄÏ %s\n"
 
-#: g10/keygen.c:735
+#: g10/keygen.c:736
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:740
+#: g10/keygen.c:741
 msgid "Is this correct (y/n)? "
 msgstr "üÔÏ ×ÅÒÎÏ? (y/n) "
 
-#: g10/keygen.c:783
+#: g10/keygen.c:784
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1531,44 +1531,44 @@
 "    \"Vasya Pupkin (KRUTOI) <vasya@mega-cool.ru>\"\n"
 "\n"
 
-#: g10/keygen.c:795
+#: g10/keygen.c:796
 msgid "Real name: "
 msgstr "÷ÁÛÅ ÉÍÑ (\"éÍÑ æÁÍÉÌÉÑ\"): "
 
-#: g10/keygen.c:803
+#: g10/keygen.c:804
 msgid "Invalid character in name\n"
 msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ × ÉÍÅÎÉ\n"
 
-#: g10/keygen.c:805
+#: g10/keygen.c:806
 msgid "Name may not start with a digit\n"
 msgstr "ðÏÌÎÏÅ ÉÍÑ ÎÅ ÍÏÖÅÔ ÎÁÞÉÎÁÔØÓÑ Ó ÃÉÆÒÙ.\n"
 
-#: g10/keygen.c:807
+#: g10/keygen.c:808
 msgid "Name must be at least 5 characters long\n"
 msgstr "ðÏÌÎÏÅ ÉÍÑ ÄÏÌÖÎÏ ÓÏÓÔÏÑÔØ ÎÅ ÍÅÎÅÅ ÞÅÍ ÉÚ 5ÔÉ ÓÉÍ×ÏÌÏ×.\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:816
 msgid "Email address: "
 msgstr "E-Mail: "
 
-#: g10/keygen.c:826
+#: g10/keygen.c:827
 msgid "Not a valid email address\n"
 msgstr "îÅÄÏÐÕÓÔÉÍÙÊ E-Mail\n"
 
-#: g10/keygen.c:834
+#: g10/keygen.c:835
 msgid "Comment: "
 msgstr "ëÏÍÍÅÎÔÁÒÉÊ: "
 
-#: g10/keygen.c:840
+#: g10/keygen.c:841
 msgid "Invalid character in comment\n"
 msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ × ËÏÍÍÅÎÔÁÒÉÉ.\n"
 
-#: g10/keygen.c:863
+#: g10/keygen.c:864
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr ""
 
-#: g10/keygen.c:869
+#: g10/keygen.c:870
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1579,29 +1579,29 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:873
+#: g10/keygen.c:874
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:878
+#: g10/keygen.c:879
 msgid "NnCcEeOoQq"
 msgstr ""
 
-#: g10/keygen.c:888
+#: g10/keygen.c:889
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "éÚÍÅÎÉÔØ: N=éÍÑ, C=ëÏÍÍÅÎÔÁÒÉÊ, E=E-Mail, O=Okay/Q=÷ÙÈÏÄ? "
 
-#: g10/keygen.c:889
+#: g10/keygen.c:890
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "éÚÍÅÎÉÔØ: N=éÍÑ, C=ëÏÍÍÅÎÔÁÒÉÊ, E=E-Mail, O=Okay/Q=÷ÙÈÏÄ? "
 
-#: g10/keygen.c:908
+#: g10/keygen.c:909
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:946
+#: g10/keygen.c:947
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1609,11 +1609,11 @@
 "äÌÑ ÚÁÝÉÔÙ ×ÁÛÅÇÏ ËÌÀÞÁ ÎÕÖÎÁ ËÌÀÞÅ×ÁÑ ÆÒÁÚÁ.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:954
+#: g10/keyedit.c:468 g10/keygen.c:955
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "ËÌÀÞÅ×ÁÑ ÆÒÁÚÁ ÎÅ ÂÙÌÁ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÁ, ÐÏÐÒÏÂÕÊÔÅ ÓÎÏ×Á.\n"
 
-#: g10/keygen.c:960
+#: g10/keygen.c:961
 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"
@@ -1625,7 +1625,7 @@
 "×ÒÅÍÑ, ÚÁÐÕÓÔÉ× ÜÔÕ ÐÒÏÇÒÁÍÍÕ Ó ÐÁÒÁÍÅÔÒÏÍ \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:981
+#: g10/keygen.c:982
 #, fuzzy
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
@@ -1638,30 +1638,30 @@
 "ÎÁÇÒÕÚÉÔØ ÓÅÔÅ×ÕÀ ÉÌÉ ÄÉÓËÏ×ÕÀ ÐÏÄÓÉÓÔÅÍÕ). üÔÏ ÄÁÓÔ ÇÅÎÅÒÁÔÏÒÕ ÓÌÕÞÁÊÎÙÈ\n"
 "ÞÉÓÅÌ ×ÏÚÍÏÖÎÏÓÔØ ÎÁÂÒÁÔØ ÄÏÓÔÁÔÏÞÎÏ ÜÎÔÒÏÐÉÉ.\n"
 
-#: g10/keygen.c:1430
+#: g10/keygen.c:1431
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "ëÌÀÞÅ×ÁÑ ÐÁÒÁ DSA ÂÕÄÅÔ ÉÍÅÔØ ÄÌÉÎÕ 1024 ÂÉÔÁ.\n"
 
-#: g10/keygen.c:1473
+#: g10/keygen.c:1474
 #, fuzzy
 msgid "Key generation canceled.\n"
 msgstr "çÅÎÅÒÁÃÉÑ ËÌÀÞÁ ÏÔÍÅÎÅÎÁ: %s\n"
 
-#: g10/keygen.c:1570
+#: g10/keygen.c:1571
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "ÏÔËÒÙÔÙÊ ÓÅÒÔÉÆÉËÁÔ ÚÁÐÉÓÙ×ÁÅÔÓÑ × `%s'\n"
 
-#: g10/keygen.c:1571
+#: g10/keygen.c:1572
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "ÓÅËÒÅÔÎÙÊ ÓÅÒÔÉÆÉËÁÔ ÚÁÐÉÓÙ×ÁÅÔÓÑ × `%s'\n"
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1668
 msgid "public and secret key created and signed.\n"
 msgstr "ÏÔËÒÙÔÙÊ É ÓÅËÒÅÔÎÙÊ ËÌÀÞÉ ÓÏÚÄÁÎÙ É ÐÏÄÐÉÓÁÎÙ.\n"
 
-#: g10/keygen.c:1672
+#: g10/keygen.c:1673
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -1672,12 +1672,12 @@
 "ÄÏÐÏÌÎÉÔÅÌØÎÏÇÏ\n"
 "ËÌÀÞÁ ÄÌÑ ÛÉÆÒÏ×ÁÎÉÑ.\n"
 
-#: g10/keygen.c:1689 g10/keygen.c:1790
+#: g10/keygen.c:1690 g10/keygen.c:1791
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "çÅÎÅÒÁÃÉÑ ËÌÀÞÁ ÎÅ ÕÄÁÌÁÓØ: %s\n"
 
-#: g10/keygen.c:1733 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112
 #, fuzzy, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1685,7 +1685,7 @@
 "ÏÔËÒÙÔÙÊ ËÌÀÞ ÓÇÅÎÅÒÉÒÏ×ÁÎ × ÂÕÄÕÝÅÍ (ÉÓËÒÉ×ÌÅÎÉÅ ×ÒÅÍÅÎÉ ÉÌÉ ÎÅÐÒÁ×ÉÌØÎÏ "
 "ÕÓÔÁÎÏ×ÌÅÎÙ ÞÁÓÙ)\n"
 
-#: g10/keygen.c:1735 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1736 g10/sig-check.c:317 g10/sign.c:114
 #, fuzzy, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1693,7 +1693,7 @@
 "ÏÔËÒÙÔÙÊ ËÌÀÞ ÓÇÅÎÅÒÉÒÏ×ÁÎ × ÂÕÄÕÝÅÍ (ÉÓËÒÉ×ÌÅÎÉÅ ×ÒÅÍÅÎÉ ÉÌÉ ÎÅÐÒÁ×ÉÌØÎÏ "
 "ÕÓÔÁÎÏ×ÌÅÎÙ ÞÁÓÙ)\n"
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1769
 #, fuzzy
 msgid "Really create? "
 msgstr "äÅÊÓÔ×ÉÔÅÌØÎÏ ÓÏÚÄÁÔØ? "
@@ -2145,7 +2145,7 @@
 msgid "Really sign? "
 msgstr "äÅÊÓÔ×ÉÔÅÌØÎÏ ÐÏÄÐÉÓÁÔØ? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1870 g10/keyedit.c:1932 g10/sign.c:136
+#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
 #, fuzzy, c-format
 msgid "signing failed: %s\n"
 msgstr "ÏÛÉÂËÁ ÐÏÄÐÉÓÙ×ÁÎÉÑ: %s\n"
@@ -2425,258 +2425,258 @@
 msgid "enable a key"
 msgstr "ðÌÏÈÏÊ ËÌÀÞ"
 
-#: g10/delkey.c:110 g10/keyedit.c:630
+#: g10/delkey.c:110 g10/keyedit.c:631
 msgid "can't do that in batchmode\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÄÅÌÁÔØ ÜÔÏ × ÐÁËÅÔÎÏÍ ÒÅÖÉÍÅ.\n"
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:668
+#: g10/keyedit.c:669
 #, fuzzy
 msgid "Secret key is available.\n"
 msgstr "éÍÅÅÔÓÑ ÓÅËÒÅÔÎÙÊ ËÌÀÞ.\n"
 
-#: g10/keyedit.c:697
+#: g10/keyedit.c:698
 #, fuzzy
 msgid "Command> "
 msgstr "ëÏÍÁÎÄÁ> "
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 #, fuzzy
 msgid "Need the secret key to do this.\n"
 msgstr "þÔÏÂÙ ÜÔÏ ÓÄÅÌÁÔØ, ÎÕÖÅÎ ÓÅËÒÅÔÎÙÊ ËÌÀÞ.\n"
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:732
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:779
 #, fuzzy
 msgid "Really sign all user IDs? "
 msgstr "äÅÊÓÔ×ÉÔÅÌØÎÏ ÐÏÄÐÉÓÁÔØ ×ÓÅ ÉÄÅÎÔÉÆÉËÁÔÏÒÙ ÐÏÌØÚÏ×ÁÔÅÌÑ? "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:780
 #, fuzzy
 msgid "Hint: Select the user IDs to sign\n"
 msgstr ""
 "ðÏÄÓËÁÚËÁ: ×ÙÂÅÒÉÔÅ ÉÄÅÎÔÉÆÉËÁÔÏÒÙ ÐÏÌØÚÏ×ÁÔÅÌÑ ËÏÔÏÒÙÅ ÈÏÔÉÔÅ ÐÏÄÐÉÓÁÔØ\n"
 
-#: g10/keyedit.c:811 g10/keyedit.c:993
+#: g10/keyedit.c:812 g10/keyedit.c:994
 #, fuzzy, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "ÏÂÎÏ×ÌÅÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ ÎÅ ÕÄÁÌÏÓØ: %s\n"
 
-#: g10/keyedit.c:822 g10/keyedit.c:843
+#: g10/keyedit.c:823 g10/keyedit.c:844
 #, fuzzy
 msgid "You must select at least one user ID.\n"
 msgstr "÷Ù ÄÏÌÖÎÙ ×ÙÂÒÁÔØ ÈÏÔÑ ÂÙ ÏÄÉÎ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ.\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:825
 #, fuzzy
 msgid "You can't delete the last user ID!\n"
 msgstr "÷Ù ÎÅ ÍÏÖÅÔÅ ÕÄÁÌÉÔØ ÐÏÓÌÅÄÎÉÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ!\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:828
 #, fuzzy
 msgid "Really remove all selected user IDs? "
 msgstr "äÅÊÓÔ×ÉÔÅÌØÎÏ ÕÄÁÌÉÔØ ×ÓÅ ×ÙÂÒÁÎÎÙÅ ÉÄÅÎÔÉÆÉËÁÔÏÒÙ ÐÏÌØÚÏ×ÁÔÅÌÑ? "
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:829
 #, fuzzy
 msgid "Really remove this user ID? "
 msgstr "äÅÊÓÔ×ÉÔÅÌØÎÏ ÕÄÁÌÉÔØ ÜÔÏÔ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ? "
 
-#: g10/keyedit.c:864 g10/keyedit.c:886
+#: g10/keyedit.c:865 g10/keyedit.c:887
 msgid "You must select at least one key.\n"
 msgstr "÷Ù ÄÏÌÖÎÙ ×ÙÂÒÁÔØ ÈÏÔÑ ÂÙ ÏÄÉÎ ËÌÀÞ.\n"
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:869
 #, fuzzy
 msgid "Do you really want to delete the selected keys? "
 msgstr "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÕÄÁÌÉÔØ ×ÙÂÒÁÎÎÙÅ ËÌÀÞÉ? "
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:870
 #, fuzzy
 msgid "Do you really want to delete this key? "
 msgstr "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÕÄÁÌÉÔØ ÜÔÏÔ ËÌÀÞ? "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:891
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? "
 msgstr "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÕÄÁÌÉÔØ ×ÙÂÒÁÎÎÙÅ ËÌÀÞÉ? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:892
 #, fuzzy
 msgid "Do you really want to revoke this key? "
 msgstr "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÕÄÁÌÉÔØ ÜÔÏÔ ËÌÀÞ? "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:958
 msgid "Save changes? "
 msgstr "óÏÈÒÁÎÉÔØ ÉÚÍÅÎÅÎÉÑ? "
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:961
 msgid "Quit without saving? "
 msgstr "÷ÙÊÔÉ ÂÅÚ ÓÏÈÒÁÎÅÎÉÑ? "
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:972
 #, fuzzy, c-format
 msgid "update failed: %s\n"
 msgstr "ÏÂÎÏ×ÌÅÎÉÅ ÎÅ ÕÄÁÌÏÓØ: %s\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:979
 #, fuzzy, c-format
 msgid "update secret failed: %s\n"
 msgstr "ÏÂÎÏ×ÌÅÎÉÅ ÓÅËÒÅÔÁ ÎÅ ÕÄÁÌÏÓØ: %s\n"
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:986
 msgid "Key not changed so no update needed.\n"
 msgstr "ëÌÀÞ ÎÅ ÉÚÍÅÎÉÌÓÑ, ÏÂÎÏ×ÌÅÎÉÅ ÎÅ ÎÕÖÎÏ.\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1001
 msgid "Invalid command  (try \"help\")\n"
 msgstr "îÅÄÏÐÕÓÔÉÍÁÑ ËÏÍÁÎÄÁ (ÐÏÐÒÏÂÕÊÔÅ \"help\")\n"
 
-#: g10/keyedit.c:1080 g10/keyedit.c:1106
+#: g10/keyedit.c:1081 g10/keyedit.c:1107
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1089
+#: g10/keyedit.c:1090
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1093
+#: g10/keyedit.c:1094
 #, fuzzy
 msgid "This key has been disabled"
 msgstr "úÁÍÅÞÁÎÉÅ: óÒÏË ÄÅÊÓÔ×ÉÑ ËÌÀÞÁ ÕÖÅ ÉÓÔÅË!\n"
 
-#: g10/keyedit.c:1122
+#: g10/keyedit.c:1123
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "build_sigrecs: ËÌÀÞ ist widerrufen\n"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1126
 msgid "rev- faked revocation found\n"
 msgstr ""
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1128
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1370
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1374
 #, fuzzy
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "ÓÇÅÎÅÒÉÒÏ×ÁÔØ ÏÔÚÙ×ÁÀÝÉÊ ÓÅÒÔÉÆÉËÁÔ"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1380
 #, fuzzy
 msgid "Really delete this self-signature? (y/N)"
 msgstr "ÓÇÅÎÅÒÉÒÏ×ÁÔØ ÏÔÚÙ×ÁÀÝÉÊ ÓÅÒÔÉÆÉËÁÔ"
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1394
 #, fuzzy, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d ÐÌÏÈÉÈ ÐÏÄÐÉÓÅÊ\n"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, fuzzy, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d ÐÌÏÈÉÈ ÐÏÄÐÉÓÅÊ\n"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1398
 #, fuzzy
 msgid "Nothing deleted.\n"
 msgstr "÷îéíáîéå: éÓÐÏÌØÚÕÅÔÓÑ ËÌÀÞ Ë ËÏÔÏÒÏÍÕ ÎÅÔ ÄÏ×ÅÒÉÑ!\n"
 
-#: g10/keyedit.c:1466
+#: g10/keyedit.c:1467
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:1472
+#: g10/keyedit.c:1473
 #, fuzzy
 msgid "Please select at most one secondary key.\n"
 msgstr "÷Ù ÄÏÌÖÎÙ ×ÙÂÒÁÔØ ÈÏÔÑ ÂÙ ÏÄÉÎ ËÌÀÞ.\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1477
 msgid "Changing expiration time for a secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1479
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1520
+#: g10/keyedit.c:1521
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:1536
+#: g10/keyedit.c:1537
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:1597
+#: g10/keyedit.c:1598
 #, fuzzy, c-format
 msgid "No user ID with index %d\n"
 msgstr "îÅÔ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ Ó ÉÎÄÅËÓÏÍ %d\n"
 
-#: g10/keyedit.c:1643
+#: g10/keyedit.c:1644
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "îÅÔ ÄÏÐÏÌÎÉÔÅÌØÎÏÇÏ ËÌÀÞÁ Ó ÉÎÄÅËÓÏÍ %d\n"
 
-#: g10/keyedit.c:1741
+#: g10/keyedit.c:1742
 #, fuzzy
 msgid "user ID: \""
 msgstr "÷×ÅÄÉÔÅ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ: "
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1745
 #, fuzzy, c-format
 msgid ""
 "\"\n"
 "signed with your key %08lX at %s\n"
 msgstr "îÅÞÅÇÏ ÐÏÄÐÉÓÙ×ÁÔØ ËÌÀÞÁÍ %08lX\n"
 
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:1749
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "ÓÇÅÎÅÒÉÒÏ×ÁÔØ ÏÔÚÙ×ÁÀÝÉÊ ÓÅÒÔÉÆÉËÁÔ"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1773
 #, fuzzy
 msgid "You have signed these user IDs:\n"
 msgstr "÷Ù ÎÅ ÍÏÖÅÔÅ ÕÄÁÌÉÔØ ÐÏÓÌÅÄÎÉÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ!\n"
 
-#: g10/keyedit.c:1786 g10/keyedit.c:1821
+#: g10/keyedit.c:1787 g10/keyedit.c:1822
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "îÅÞÅÇÏ ÐÏÄÐÉÓÙ×ÁÔØ ËÌÀÞÁÍ %08lX\n"
 
-#: g10/keyedit.c:1791
+#: g10/keyedit.c:1792
 #, fuzzy, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "îÅÞÅÇÏ ÐÏÄÐÉÓÙ×ÁÔØ ËÌÀÞÁÍ %08lX\n"
 
-#: g10/keyedit.c:1811
+#: g10/keyedit.c:1812
 #, fuzzy
 msgid "You are about to revoke these signatures:\n"
 msgstr "Möchten Sie einige der ungültigen Signaturen entfernen? "
 
-#: g10/keyedit.c:1829
+#: g10/keyedit.c:1830
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "ÓÇÅÎÅÒÉÒÏ×ÁÔØ ÏÔÚÙ×ÁÀÝÉÊ ÓÅÒÔÉÆÉËÁÔ"
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1859
 #, fuzzy
 msgid "no secret key\n"
 msgstr "ðÌÏÈÏÊ ÓÅËÒÅÔÎÙÊ ËÌÀÞ"
@@ -2692,141 +2692,141 @@
 msgstr "ËÌÀÞ"
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:760
+#: g10/keylist.c:400 g10/mainproc.c:790
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "ëÌÀÞ ÄÅÊÓÔ×ÕÅÔ ÄÏ %s\n"
 
-#: g10/mainproc.c:213
+#: g10/mainproc.c:240
 #, fuzzy, c-format
 msgid "public key is %08lX\n"
 msgstr "ïÔËÒÙÔÙÊ ËÌÀÞ ÎÅ ÎÁÊÄÅÎ"
 
-#: g10/mainproc.c:257
+#: g10/mainproc.c:284
 #, fuzzy
 msgid "public key encrypted data: good DEK\n"
 msgstr "ÒÁÓÛÉÆÒÏ×ËÁ ÏÔËÒÙÔÙÍ ËÌÀÞÏÍ ÎÅ ÕÄÁÌÁÓØ %s\n"
 
-#: g10/mainproc.c:299
+#: g10/mainproc.c:326
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "(%u-ÂÉÔ %s ËÌÀÞ, ID %08lX, ÓÏÚÄÁÎ %s)\n"
 
-#: g10/mainproc.c:309
+#: g10/mainproc.c:336
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "ðÏÄÐÉÓØ ÓÄÅÌÁÎÁ %.*s, ÉÓÐÏÌØÚÕÑ %s ËÌÀÞ %08lX\n"
 
-#: g10/mainproc.c:315
+#: g10/mainproc.c:342
 #, fuzzy
 msgid "no secret key for decryption available\n"
 msgstr "óÅËÒÅÔÎÙÊ ËÌÀÞ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ"
 
-#: g10/mainproc.c:324
+#: g10/mainproc.c:351
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "ÒÁÓÛÉÆÒÏ×ËÁ ÏÔËÒÙÔÙÍ ËÌÀÞÏÍ ÎÅ ÕÄÁÌÁÓØ %s\n"
 
-#: g10/mainproc.c:361
+#: g10/mainproc.c:388
 #, fuzzy
 msgid "decryption okay\n"
 msgstr "ÒÁÓÛÉÆÒÏ×ËÁ ÎÅ ÕÄÁÌÁÓØ: %s\n"
 
-#: g10/mainproc.c:366
+#: g10/mainproc.c:393
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:371
+#: g10/mainproc.c:398
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "ÒÁÓÛÉÆÒÏ×ËÁ ÎÅ ÕÄÁÌÁÓØ: %s\n"
 
-#: g10/mainproc.c:390
+#: g10/mainproc.c:417
 #, fuzzy
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "ÚÁÍÅÞÁÎÉÅ: ÏÔÐÒÁ×ÉÔÅÌØ ÚÁÐÒÏÓÉÌ \"ÔÏÌØËÏ-ÄÌÑ-÷ÁÛÉÈ-ÇÌÁÚ\"\n"
 
-#: g10/mainproc.c:392
+#: g10/mainproc.c:419
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:544
+#: g10/mainproc.c:574
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:631 g10/mainproc.c:640
+#: g10/mainproc.c:661 g10/mainproc.c:670
 #, fuzzy
 msgid "WARNING: invalid notation data found\n"
 msgstr "ÎÅ ÎÁÊÄÅÎÏ ÄÏÐÕÓÔÉÍÙÈ RFC1991 ÉÌÉ OpenPGP ÄÁÎÎÙÈ.\n"
 
-#: g10/mainproc.c:643
+#: g10/mainproc.c:673
 msgid "Notation: "
 msgstr ""
 
-#: g10/mainproc.c:650
+#: g10/mainproc.c:680
 msgid "Policy: "
 msgstr ""
 
-#: g10/mainproc.c:1080
+#: g10/mainproc.c:1121
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1086
+#: g10/mainproc.c:1158
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "ðÏÄÐÉÓØ ÓÄÅÌÁÎÁ %.*s, ÉÓÐÏÌØÚÕÑ %s ËÌÀÞ %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1112 g10/mainproc.c:1123
+#: g10/mainproc.c:1184 g10/mainproc.c:1195
 msgid "BAD signature from \""
 msgstr "ðìïèáñ ÐÏÄÐÉÓØ ÏÔ \""
 
-#: g10/mainproc.c:1113 g10/mainproc.c:1124
+#: g10/mainproc.c:1185 g10/mainproc.c:1196
 msgid "Good signature from \""
 msgstr "èÏÒÏÛÁÑ ÐÏÄÐÉÓØ ÏÔ \""
 
-#: g10/mainproc.c:1115
+#: g10/mainproc.c:1187
 msgid "                aka \""
 msgstr ""
 
-#: g10/mainproc.c:1171
+#: g10/mainproc.c:1243
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏ×ÅÒÉÔØ ÐÏÄÐÉÓØ: %s\n"
 
-#: g10/mainproc.c:1235
+#: g10/mainproc.c:1318
 #, fuzzy, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "ðÏÄÐÉÓØ ÎÅÉÚ×ÅÓÔÎÏÇÏ ÔÉÐÁ"
 
-#: g10/mainproc.c:1281
+#: g10/mainproc.c:1369
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
 
-#: g10/mainproc.c:1286
+#: g10/mainproc.c:1374
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
-#: g10/misc.c:96
+#: g10/misc.c:97
 #, fuzzy, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s': %s\n"
 
-#: g10/misc.c:206
+#: g10/misc.c:207
 msgid "Experimental algorithms should not be used!\n"
 msgstr ""
 
-#: g10/misc.c:233
+#: g10/misc.c:234
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 
-#: g10/parse-packet.c:117
+#: g10/parse-packet.c:119
 #, fuzzy, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÂÌÏËÉÒÏ×ÁÔØ Ó×ÑÚËÕ ÏÔËÒÙÔÙÈ ËÌÀÞÅÊ: %s\n"
 
-#: g10/parse-packet.c:986
+#: g10/parse-packet.c:991
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
diff -urN gnupg-1.0.3/po/sv.po gnupg-1.0.4/po/sv.po
--- gnupg-1.0.3/po/sv.po	Mon Sep 18 12:18:08 2000
+++ gnupg-1.0.4/po/sv.po	Tue Oct 17 15:40:41 2000
@@ -8,12 +8,12 @@
 # Also many thanks to my wife Olivia <olivia@resare.com> for
 # patience, help and suggestions
 #
-# $Id: sv.po,v 1.1.2.14 2000/09/15 16:40:20 wkoch Exp $
+# $Id: sv.po,v 1.1.2.17 2000/10/17 13:30:26 wkoch Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.1e\n"
-"POT-Creation-Date: 2000-09-18 12:17+0200\n"
+"POT-Creation-Date: 2000-10-16 19:22+0200\n"
 "PO-Revision-Date: 2000-04-23 16:43+02:00\n"
 "Last-Translator: Daniel Resare <daniel@resare.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -25,11 +25,11 @@
 msgid "Warning: using insecure memory!\n"
 msgstr "Varning: använder osäkert minne!\n"
 
-#: util/secmem.c:289
+#: util/secmem.c:295
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operationen är ej möjlig utan tillgång till säkert minne\n"
 
-#: util/secmem.c:290
+#: util/secmem.c:296
 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"
 
@@ -268,7 +268,7 @@
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "du har hittat en bugg ... (%s:%d)\\n\n"
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1255
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan inte öppna \"%s\": %s\n"
@@ -885,14 +885,14 @@
 msgid "can't open `%s'\n"
 msgstr "kan inte öppna \"%s\"\n"
 
-#: g10/g10.c:1700
+#: g10/g10.c:1737
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "det första tecknet i ett notationsnamn måste vara en bokstav eller\n"
 "ett understrykningstecken (_)\n"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1743
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -900,11 +900,11 @@
 "ett notationsnamn kan bara innehålla bokstäver, siffror, punkter eller\n"
 "understrykningstecken och sluta med ett likhetstecken\n"
 
-#: g10/g10.c:1712
+#: g10/g10.c:1749
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "punkter i ett notationsnamn måste vara omgivna av andra tecken\n"
 
-#: g10/g10.c:1720
+#: g10/g10.c:1757
 msgid "a notation value must not use any control characters\n"
 msgstr "ett notationsvärde får inte inehålla några kontrolltecken\n"
 
@@ -967,20 +967,20 @@
 msgid "error in trailer line\n"
 msgstr "fel i avslutande rad\n"
 
-#: g10/armor.c:912
+#: g10/armor.c:906
 msgid "For info see http://www.gnupg.org"
 msgstr "För information se http://www.gnupg.org/"
 
-#: g10/armor.c:1033
+#: g10/armor.c:1027
 msgid "no valid OpenPGP data found.\n"
 msgstr "hittade ingen giltig OpenPGP-data.\n"
 
-#: g10/armor.c:1038
+#: g10/armor.c:1032
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "felaktigt skal: raden är längre än %d tecken\n"
 
-#: g10/armor.c:1042
+#: g10/armor.c:1036
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -990,7 +990,7 @@
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1188 g10/pkclist.c:53
+#: g10/keyedit.c:1189 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "           Fingeravtryck:"
 
@@ -1281,66 +1281,66 @@
 msgid "no valid addressees\n"
 msgstr "inga giltiga adresser\n"
 
-#: g10/keygen.c:175
+#: g10/keygen.c:176
 msgid "writing self signature\n"
 msgstr "skriver självsignatur\n"
 
-#: g10/keygen.c:213
+#: g10/keygen.c:214
 msgid "writing key binding signature\n"
 msgstr "skriver signatur knuten till nyckeln\n"
 
-#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:435
+#: g10/keygen.c:262 g10/keygen.c:346 g10/keygen.c:436
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "ogiltig nyckelstorlek; använder %u bitar\n"
 
-#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:440
+#: g10/keygen.c:267 g10/keygen.c:351 g10/keygen.c:441
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "nyckelstorleken avrundad uppåt till %u bitar\n"
 
-#: g10/keygen.c:539
+#: g10/keygen.c:540
 msgid "Please select what kind of key you want:\n"
 msgstr "Välj vilken typ av nyckel du vill ha:\n"
 
-#: g10/keygen.c:541
+#: g10/keygen.c:542
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA och ElGamal (standardvalet)\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:543
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (endast signering)\n"
 
-#: g10/keygen.c:544
+#: g10/keygen.c:545
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (endast kryptering)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:546
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signering och kryptering)\n"
 
-#: g10/keygen.c:547
+#: g10/keygen.c:548
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signering och kryptering)\n"
 
-#: g10/keygen.c:551
+#: g10/keygen.c:552
 msgid "Your selection? "
 msgstr "Vad väljer du? "
 
-#: g10/keygen.c:562 g10/keygen.c:570
+#: g10/keygen.c:563 g10/keygen.c:571
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "Vill du verkligen skapa en nyckel för signering och kryptering? "
 
-#: g10/keygen.c:584
+#: g10/keygen.c:585
 msgid "Invalid selection.\n"
 msgstr "Felaktigt val.\n"
 
-#: g10/keygen.c:596
+#: g10/keygen.c:597
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1353,19 +1353,19 @@
 "              den förvalda nyckelstorleken är 1024 bitar\n"
 "    den största föreslagna nyckelstorleken är 2048 bitar\n"
 
-#: g10/keygen.c:603
+#: g10/keygen.c:604
 msgid "What keysize do you want? (1024) "
 msgstr "Vilken nyckelstorlek vill du ha? (1024) "
 
-#: g10/keygen.c:608
+#: g10/keygen.c:609
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA tillåter bara nyckelstorlekar från 512 till 1024\n"
 
-#: g10/keygen.c:610
+#: g10/keygen.c:611
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "nyckelstorleken är för liten; 768 är det minst tillåtna värdet.\n"
 
-#: g10/keygen.c:612
+#: g10/keygen.c:613
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "nyckelstorleken är för liten; 768 är det minst tillåtna värdet.\n"
@@ -1378,12 +1378,12 @@
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:623
+#: g10/keygen.c:624
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "nyckelstorleken är för stor; %d är det största tillåtna värdet\n"
 
-#: g10/keygen.c:628
+#: g10/keygen.c:629
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1391,11 +1391,11 @@
 "Nyckelstorlekar större än 2048 är inte att rekommendera\n"
 "eftersom beräkningar tar MYCKET lång tid!\n"
 
-#: g10/keygen.c:631
+#: g10/keygen.c:632
 msgid "Are you sure that you want this keysize? "
 msgstr "Är du säker på att du vill ha denna nyckelstorlek? "
 
-#: g10/keygen.c:632
+#: g10/keygen.c:633
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1403,22 +1403,22 @@
 "Ok, men kom ihåg att din bildskärm och ditt tangentbord också sänder\n"
 "avslöjande strålning som kan avlyssnas!\n"
 
-#: g10/keygen.c:640
+#: g10/keygen.c:641
 msgid "Do you really need such a large keysize? "
 msgstr "Behöver du verkligen en så stor nyckelstorlek? "
 
-#: g10/keygen.c:646
+#: g10/keygen.c:647
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Den efterfrågade nyckelstorleken är %u bitar\n"
 
-#: g10/keygen.c:649 g10/keygen.c:653
+#: g10/keygen.c:650 g10/keygen.c:654
 #, 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:701
+#: g10/keygen.c:702
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1434,25 +1434,25 @@
 "      <n>m = nyckeln blir ogiltig efter n månader\n"
 "      <n>y = nyckeln blir ogiltig efter n år\n"
 
-#: g10/keygen.c:716
+#: g10/keygen.c:717
 msgid "Key is valid for? (0) "
 msgstr "För hur lång tid är nyckeln giltig? (0) "
 
-#: g10/keygen.c:721
+#: g10/keygen.c:722
 msgid "invalid value\n"
 msgstr "ogiltigt värde\n"
 
-#: g10/keygen.c:726
+#: g10/keygen.c:727
 msgid "Key does not expire at all\n"
 msgstr "Nyckeln går aldrig ut\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:732
+#: g10/keygen.c:733
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Nyckeln går ut vid följande tidpunkt: %s\n"
 
-#: g10/keygen.c:735
+#: g10/keygen.c:736
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1460,11 +1460,11 @@
 "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:740
+#: g10/keygen.c:741
 msgid "Is this correct (y/n)? "
 msgstr "Stämmer detta (j/n)? "
 
-#: g10/keygen.c:783
+#: g10/keygen.c:784
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1480,44 +1480,44 @@
 "     \"Gustav Vasa (Brutal kung) <gustav@trekronor.se>\"\n"
 "\n"
 
-#: g10/keygen.c:795
+#: g10/keygen.c:796
 msgid "Real name: "
 msgstr "Namn: "
 
-#: g10/keygen.c:803
+#: g10/keygen.c:804
 msgid "Invalid character in name\n"
 msgstr "Ogiltigt tecken i namnet\n"
 
-#: g10/keygen.c:805
+#: g10/keygen.c:806
 msgid "Name may not start with a digit\n"
 msgstr "Namnet får inte börja med en siffra\n"
 
-#: g10/keygen.c:807
+#: g10/keygen.c:808
 msgid "Name must be at least 5 characters long\n"
 msgstr "Namnet måste vara åtminstone 5 tecken långt\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:816
 msgid "Email address: "
 msgstr "Epostadress: "
 
-#: g10/keygen.c:826
+#: g10/keygen.c:827
 msgid "Not a valid email address\n"
 msgstr "Epostadressen är ogiltig\n"
 
-#: g10/keygen.c:834
+#: g10/keygen.c:835
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:840
+#: g10/keygen.c:841
 msgid "Invalid character in comment\n"
 msgstr "Ogiltigt tecken i kommentaren\n"
 
-#: g10/keygen.c:863
+#: g10/keygen.c:864
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du använder teckenuppsättningen \"%s\"\n"
 
-#: g10/keygen.c:869
+#: g10/keygen.c:870
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1528,28 +1528,28 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:873
+#: g10/keygen.c:874
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Ange inte epostadressen som namn eller kommentar\n"
 
-#: g10/keygen.c:878
+#: g10/keygen.c:879
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoAa"
 
-#: g10/keygen.c:888
+#: g10/keygen.c:889
 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:889
+#: g10/keygen.c:890
 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:908
+#: g10/keygen.c:909
 msgid "Please correct the error first\n"
 msgstr "Rätta först felet\n"
 
 # fel kapitalisering i originalet?
-#: g10/keygen.c:946
+#: g10/keygen.c:947
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1557,11 +1557,11 @@
 "Du behöver en lösenordsfras för att skydda din hemliga nyckel\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:954
+#: g10/keyedit.c:468 g10/keygen.c:955
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "lösenordsfrasen upprepades ej korrekt; försök igen.\n"
 
-#: g10/keygen.c:960
+#: g10/keygen.c:961
 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"
@@ -1572,7 +1572,7 @@
 "Jag kommer att göra det ändå. Du kan ändra din lösenordsfras närsomhelst\n"
 "om du använder detta program med flaggan \"--edit-key\".\n"
 
-#: g10/keygen.c:981
+#: g10/keygen.c:982
 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"
@@ -1584,29 +1584,29 @@
 "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:1430
+#: g10/keygen.c:1431
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA-nyckelparet kommer att ha 1024 bitar.\n"
 
-#: g10/keygen.c:1473
+#: g10/keygen.c:1474
 msgid "Key generation canceled.\n"
 msgstr "Skapandet av nycklar avbröts.\n"
 
-#: g10/keygen.c:1570
+#: g10/keygen.c:1571
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver publik nyckel till \"%s\"\n"
 
-#: g10/keygen.c:1571
+#: g10/keygen.c:1572
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1668
 msgid "public and secret key created and signed.\n"
 msgstr "publik och hemlig nyckel skapad och signerad.\n"
 
-#: g10/keygen.c:1672
+#: g10/keygen.c:1673
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1615,13 +1615,13 @@
 "att vilja använda kommandot \"--edit-key\" för att generera en sekundär\n"
 "nyckel för detta syfte.\n"
 
-#: g10/keygen.c:1689 g10/keygen.c:1790
+#: g10/keygen.c:1690 g10/keygen.c:1791
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
 # c-format behövs inte i singularis
-#: g10/keygen.c:1733 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1629,7 +1629,7 @@
 "nyckeln är skapad %lu sekund in i framtiden (problemet är\n"
 "relaterat till tidsresande eller en felställd klocka)\n"
 
-#: g10/keygen.c:1735 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1736 g10/sig-check.c:317 g10/sign.c:114
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1637,7 +1637,7 @@
 "nyckeln är skapad %lu sekunder in i framtiden (problemet är\n"
 "relaterat till tidsresande eller en felställd klocka)\n"
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1769
 msgid "Really create? "
 msgstr "Vill du verkligen skapa? "
 
@@ -2083,7 +2083,7 @@
 msgid "Really sign? "
 msgstr "Vill du verkligen signera? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1870 g10/keyedit.c:1932 g10/sign.c:136
+#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signeringen misslyckades: %s\n"
@@ -2343,202 +2343,202 @@
 msgid "enable a key"
 msgstr "aktivera en nyckel"
 
-#: g10/delkey.c:110 g10/keyedit.c:630
+#: g10/delkey.c:110 g10/keyedit.c:631
 msgid "can't do that in batchmode\n"
 msgstr "kan ej göra detta i batch-läge\n"
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:668
+#: g10/keyedit.c:669
 msgid "Secret key is available.\n"
 msgstr "Den hemliga nyckeln finns tillgänglig.\n"
 
-#: g10/keyedit.c:697
+#: g10/keyedit.c:698
 msgid "Command> "
 msgstr "Kommando> "
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 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:731
+#: g10/keyedit.c:732
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Använd kommandot \"toggle\" först.\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:779
 msgid "Really sign all user IDs? "
 msgstr "Vill du verkligen signera alla användaridentiteter? "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:780
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tips: Välj det användarid du vill signera\n"
 
-#: g10/keyedit.c:811 g10/keyedit.c:993
+#: g10/keyedit.c:812 g10/keyedit.c:994
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "uppdateringen av tillitsdatabasen misslyckades: %s\n"
 
-#: g10/keyedit.c:822 g10/keyedit.c:843
+#: g10/keyedit.c:823 g10/keyedit.c:844
 msgid "You must select at least one user ID.\n"
 msgstr "Du måste välja åtminstone en användaridentitet.\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:825
 msgid "You can't delete the last user ID!\n"
 msgstr "Du kan inte ta bort den sista användaridentiteten!\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:828
 msgid "Really remove all selected user IDs? "
 msgstr "Vill du verkligen ta bort alla valda användaridentiteter? "
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:829
 msgid "Really remove this user ID? "
 msgstr "Vill du verkligen ta bort denna användaridentitet? "
 
-#: g10/keyedit.c:864 g10/keyedit.c:886
+#: g10/keyedit.c:865 g10/keyedit.c:887
 msgid "You must select at least one key.\n"
 msgstr "Du måste välja åtminstone en nyckel.\n"
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:869
 msgid "Do you really want to delete the selected keys? "
 msgstr "Vill du verkligen ta bort valda nycklar? "
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:870
 msgid "Do you really want to delete this key? "
 msgstr "Vill du verkligen ta bort denna nyckel? "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:891
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Vill du verkligen återkalla de valda nycklarna? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:892
 msgid "Do you really want to revoke this key? "
 msgstr "Vill du verkligen återkalla denna nyckel? "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:958
 msgid "Save changes? "
 msgstr "Spara ändringarna? "
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:961
 msgid "Quit without saving? "
 msgstr "Avsluta utan att spara? "
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:972
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uppdateringen misslyckades: %s\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:979
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "misslyckades med att uppdatera hemligheten: %s\n"
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:986
 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:1000
+#: g10/keyedit.c:1001
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ogiltigt kommando (försök med \"help\")\n"
 
-#: g10/keyedit.c:1080 g10/keyedit.c:1106
+#: g10/keyedit.c:1081 g10/keyedit.c:1107
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1089
+#: g10/keyedit.c:1090
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1093
+#: g10/keyedit.c:1094
 msgid "This key has been disabled"
 msgstr "Denna nyckel har deaktiverats"
 
-#: g10/keyedit.c:1122
+#: g10/keyedit.c:1123
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "nyckeln %08lX: en undernyckel har återkallats!\n"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1126
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "     nya återkallelser av nycklar: %lu\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1128
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Vill du radera denna korrekta signatur? (j/N/a)"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1370
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1374
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Vill du radera denna okända signatur? (j/N/a)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1380
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Vill du radera denna självsignatur? (j/N)"
 
 # skulle lika gärna kunna heta 1 signatur va?
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1394
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Raderade %d signatur.\n"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Raderade %d signaturer.\n"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1398
 msgid "Nothing deleted.\n"
 msgstr "Ingenting raderat.\n"
 
-#: g10/keyedit.c:1466
+#: g10/keyedit.c:1467
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Tag bort markeringar från de hemliga nycklarna.\n"
 
-#: g10/keyedit.c:1472
+#: g10/keyedit.c:1473
 msgid "Please select at most one secondary key.\n"
 msgstr "Välj som mest en sekundär nyckel.\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1477
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Ändrar giltighetstid för en sekundär nyckel.\n"
 
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1479
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändrar giltighetstid för den primära nyckeln.\n"
 
-#: g10/keyedit.c:1520
+#: g10/keyedit.c:1521
 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:1536
+#: g10/keyedit.c:1537
 msgid "No corresponding signature in secret ring\n"
 msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n"
 
-#: g10/keyedit.c:1597
+#: g10/keyedit.c:1598
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen användaridentitet med index %d\n"
 
-#: g10/keyedit.c:1643
+#: g10/keyedit.c:1644
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Ingen sekundär nyckel med index %d\n"
 
-#: g10/keyedit.c:1741
+#: g10/keyedit.c:1742
 msgid "user ID: \""
 msgstr "användaridentitet: \""
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1745
 #, c-format
 msgid ""
 "\"\n"
@@ -2547,34 +2547,34 @@
 "\"\n"
 "signerad med din nyckel %08lX %s\n"
 
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:1749
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "Vill du skapa ett återkallelsecertifikat för denna signatur? (j/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1773
 msgid "You have signed these user IDs:\n"
 msgstr "Du har signerat följande användaridentiteter:\n"
 
-#: g10/keyedit.c:1786 g10/keyedit.c:1821
+#: g10/keyedit.c:1787 g10/keyedit.c:1822
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   signerad av %08lX %s\n"
 
-#: g10/keyedit.c:1791
+#: g10/keyedit.c:1792
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   återkallad av %08lX %s\n"
 
-#: g10/keyedit.c:1811
+#: g10/keyedit.c:1812
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du står i begrepp att återkalla dessa signaturer:\n"
 
-#: g10/keyedit.c:1829
+#: g10/keyedit.c:1830
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Vill du verkligen skapa återkallelsecertifikaten? (j/N)"
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1859
 msgid "no secret key\n"
 msgstr "ingen hemlig nyckel\n"
 
@@ -2589,12 +2589,12 @@
 msgstr "revkey"
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:760
+#: g10/keylist.c:400 g10/mainproc.c:790
 #, c-format
 msgid " [expires: %s]"
 msgstr "[går ut: %s]"
 
-#: g10/mainproc.c:213
+#: g10/mainproc.c:240
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "den publika nyckeln är %08lX\n"
@@ -2606,131 +2606,131 @@
 # rätt publik nyckel att kryptera datat med. Jag tycker
 # inte att svenska översättningen är mycket obskyrare än engelska
 # originalet iallafall.
-#: g10/mainproc.c:257
+#: g10/mainproc.c:284
 msgid "public key encrypted data: good DEK\n"
 msgstr "data krypterad med publik nyckel: korrekt krypteringsnyckel\n"
 
-#: g10/mainproc.c:299
+#: g10/mainproc.c:326
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "krypterad med %u-bitars %s-nyckel, ID %08lX, skapad %s\n"
 
-#: g10/mainproc.c:309
+#: g10/mainproc.c:336
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "krypterad med %s-nyckel, ID %08lX\n"
 
-#: g10/mainproc.c:315
+#: g10/mainproc.c:342
 msgid "no secret key for decryption available\n"
 msgstr "det finns ingen hemlig nyckel tillgänglig för dekryptering\n"
 
-#: g10/mainproc.c:324
+#: g10/mainproc.c:351
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "dekryptering med publik nyckel misslyckades: %s\n"
 
-#: g10/mainproc.c:361
+#: g10/mainproc.c:388
 msgid "decryption okay\n"
 msgstr "dekrypteringen lyckades\n"
 
-#: g10/mainproc.c:366
+#: g10/mainproc.c:393
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VARNING: det krypterade meddelandet har ändrats!\n"
 
-#: g10/mainproc.c:371
+#: g10/mainproc.c:398
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekrypteringen misslyckades: %s\n"
 
-#: g10/mainproc.c:390
+#: g10/mainproc.c:417
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTERA: avsändaren efterfrågade \"endast-för-dina-ögon\"\n"
 
-#: g10/mainproc.c:392
+#: g10/mainproc.c:419
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "ursprungligt filnamn=\"%.*s\"\n"
 
-#: g10/mainproc.c:544
+#: g10/mainproc.c:574
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "fristående återkallelsecertifikat - använd \"gpg --import\" för\n"
 "att applicera\n"
 
-#: g10/mainproc.c:631 g10/mainproc.c:640
+#: g10/mainproc.c:661 g10/mainproc.c:670
 msgid "WARNING: invalid notation data found\n"
 msgstr "VARNING: ogiltig notationsdata hittades\n"
 
-#: g10/mainproc.c:643
+#: g10/mainproc.c:673
 msgid "Notation: "
 msgstr "Notation: "
 
 # finns det någon bra svensk översättning av policy?
-#: g10/mainproc.c:650
+#: g10/mainproc.c:680
 msgid "Policy: "
 msgstr "Policy: "
 
-#: g10/mainproc.c:1080
+#: g10/mainproc.c:1121
 msgid "signature verification suppressed\n"
 msgstr "signaturen verifierades inte\n"
 
-#: g10/mainproc.c:1086
+#: g10/mainproc.c:1158
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Signerades %.*s med hjälp av %s-nyckeln med ID %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1112 g10/mainproc.c:1123
+#: g10/mainproc.c:1184 g10/mainproc.c:1195
 msgid "BAD signature from \""
 msgstr "FELAKTIG signatur från \""
 
-#: g10/mainproc.c:1113 g10/mainproc.c:1124
+#: g10/mainproc.c:1185 g10/mainproc.c:1196
 msgid "Good signature from \""
 msgstr "Korrekt signatur från \""
 
-#: g10/mainproc.c:1115
+#: g10/mainproc.c:1187
 msgid "                aka \""
 msgstr "      även känd som \""
 
-#: g10/mainproc.c:1171
+#: g10/mainproc.c:1243
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan inte verifiera signaturen: %s\n"
 
-#: g10/mainproc.c:1235
+#: g10/mainproc.c:1318
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "fristående signatur av klassen 0x%02x\n"
 
-#: g10/mainproc.c:1281
+#: g10/mainproc.c:1369
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatur av den gamla (PGP 2.x) typen\n"
 
-#: g10/mainproc.c:1286
+#: g10/mainproc.c:1374
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "felaktigt rotpaket hittades i proc_tree()\n"
 
-#: g10/misc.c:96
+#: g10/misc.c:97
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "kan inte deaktivera minnesutskrifter: %s\n"
 
-#: g10/misc.c:206
+#: g10/misc.c:207
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Experimentella algoritmer bör inte användas!\n"
 
 # XXX
-#: g10/misc.c:233
+#: g10/misc.c:234
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 "avråder från denna chifferalgoritm, använd istället en mer normal algoritm!\n"
 
-#: g10/parse-packet.c:117
+#: g10/parse-packet.c:119
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "kan inte hantera algoritm %d för publik nyckelhantering\n"
 
-#: g10/parse-packet.c:986
+#: g10/parse-packet.c:991
 #, 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"
diff -urN gnupg-1.0.3/scripts/gnupg.spec gnupg-1.0.4/scripts/gnupg.spec
--- gnupg-1.0.3/scripts/gnupg.spec	Mon Sep 18 12:18:20 2000
+++ gnupg-1.0.4/scripts/gnupg.spec	Tue Oct 17 15:40:57 2000
@@ -2,7 +2,7 @@
 # gnupg -- gnu privacy guard
 # This is a template.  The dist target uses it to create the real file.
 #
-%define version 1.0.3
+%define version 1.0.4
 %define name gnupg
 Summary: GNU Utility for data encryption and digital signatures
 Summary(it): Utility GNU per la sicurezza nelle comunicazioni e nell'archiviazione dei dati.
diff -urN gnupg-1.0.3/tools/mail-signed-keys gnupg-1.0.4/tools/mail-signed-keys
--- gnupg-1.0.3/tools/mail-signed-keys	Wed Jul  5 13:24:37 2000
+++ gnupg-1.0.4/tools/mail-signed-keys	Wed Sep 27 14:24:35 2000
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# FIXME: Add --dry-run,  use only valid email addreses, extract only given keys
+
 if [ -z "$1" -o -z "$2" ]; then
    echo "usage: mail-signed-keys keyring signedby" >&2
    exit 1
@@ -71,5 +73,18 @@
        uidcount=0
 }
 '
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
diff -urN gnupg-1.0.3/util/ChangeLog gnupg-1.0.4/util/ChangeLog
--- gnupg-1.0.3/util/ChangeLog	Thu Sep 14 14:20:39 2000
+++ gnupg-1.0.4/util/ChangeLog	Mon Oct 16 17:47:27 2000
@@ -1,3 +1,8 @@
+2000-10-16  Werner Koch  <wk@gnupg.org>
+
+	* secmem.c (lock_pool): Fixed error checking for Linux.
+	By James Troup.
+
 Thu Sep 14 14:20:38 CEST 2000  Werner Koch  <wk@openit.de>
 
         * miscutil.c (answer_is_yes_no_quit): Swapped order of yes/no test
diff -urN gnupg-1.0.3/util/Makefile.in gnupg-1.0.4/util/Makefile.in
--- gnupg-1.0.3/util/Makefile.in	Mon Sep 18 12:17:51 2000
+++ gnupg-1.0.4/util/Makefile.in	Tue Oct 17 15:40:11 2000
@@ -244,7 +244,10 @@
 g10u.o: g10u.c ../config.h ../g10defs.h ../include/mpi.h \
 	../include/iobuf.h ../include/types.h ../include/memory.h \
 	../include/util.h ../include/errors.h
-http.o: http.c ../config.h ../g10defs.h
+http.o: http.c ../config.h ../g10defs.h ../include/util.h \
+	../include/types.h ../include/errors.h ../include/mpi.h \
+	../include/iobuf.h ../include/memory.h ../include/i18n.h \
+	../include/http.h
 iobuf.o: iobuf.c ../config.h ../g10defs.h ../include/memory.h \
 	../include/util.h ../include/types.h ../include/errors.h \
 	../include/mpi.h ../include/iobuf.h
@@ -260,18 +263,14 @@
 secmem.o: secmem.c ../config.h ../g10defs.h ../include/types.h \
 	../include/memory.h ../include/util.h ../include/errors.h \
 	../include/mpi.h ../include/iobuf.h ../include/i18n.h
-simple-gettext.o: simple-gettext.c ../config.h ../g10defs.h \
-	../include/types.h ../include/util.h ../include/errors.h \
-	../include/mpi.h ../include/iobuf.h ../include/memory.h
+simple-gettext.o: simple-gettext.c ../config.h ../g10defs.h
 strgutil.o: strgutil.c ../config.h ../g10defs.h ../include/types.h \
 	../include/util.h ../include/errors.h ../include/mpi.h \
 	../include/iobuf.h ../include/memory.h
 ttyio.o: ttyio.c ../config.h ../g10defs.h ../include/util.h \
 	../include/types.h ../include/errors.h ../include/mpi.h \
 	../include/iobuf.h ../include/memory.h ../include/ttyio.h
-w32reg.o: w32reg.c ../config.h ../g10defs.h ../include/util.h \
-	../include/types.h ../include/errors.h ../include/mpi.h \
-	../include/iobuf.h ../include/memory.h
+w32reg.o: w32reg.c ../config.h ../g10defs.h
 
 info-am:
 info: info-am
diff -urN gnupg-1.0.3/util/secmem.c gnupg-1.0.4/util/secmem.c
--- gnupg-1.0.3/util/secmem.c	Thu Aug 31 10:01:52 2000
+++ gnupg-1.0.4/util/secmem.c	Mon Oct 16 17:43:41 2000
@@ -100,6 +100,9 @@
 	  #ifdef ENOSYS  /* Some SCOs return this (function not implemented) */
 	    && errno != ENOSYS
 	  #endif
+          #ifdef ENOMEM  /* Linux can return this */
+            && errno != ENOMEM
+          #endif
 	  )
 	    log_error("can't lock memory: %s\n", strerror(err));
 	show_warning = 1;
@@ -142,6 +145,9 @@
 	  #ifdef ENOSYS  /* Some SCOs return this (function not implemented) */
 	    && errno != ENOSYS
 	  #endif
+          #ifdef ENOMEM  /* Linux can return this */
+            && errno != ENOMEM
+          #endif
 	  )
 	    log_error("can't lock memory: %s\n", strerror(err));
 	show_warning = 1;
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.3 (GNU/Linux)
Comment: For info see http://www.gnupg.org

iD8DBQE57GxwaLeriVdUjc0RAqEoAJ0biQCyW/TemnA8i2X016AZhvKJ0QCcDAEw
lZsQyGFKdle7RjdyMNEh/xI=
=EQBM
-----END PGP SIGNATURE-----