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


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

Please check the signature of this patch file:

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

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

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

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



Prereq: 1.0.2

diff -urN gnupg-1.0.2/VERSION gnupg-1.0.3/VERSION
--- gnupg-1.0.2/VERSION	Wed Jul 12 13:27:33 2000
+++ gnupg-1.0.3/VERSION	Mon Sep 18 12:15:03 2000
@@ -1 +1 @@
-1.0.2
+1.0.3

diff -urN gnupg-1.0.2/AUTHORS gnupg-1.0.3/AUTHORS
--- gnupg-1.0.2/AUTHORS	Wed Jul 12 11:19:15 2000
+++ gnupg-1.0.3/AUTHORS	Tue Aug  1 19:57:30 2000
@@ -30,6 +30,9 @@
 Niklas Hernaeus <nh@df.lth.se> Disclaimer
     (weak key patches)
 
+Nils Ellmenreich  <nils@infosun.fmi.uni-passau.de> Assignment
+    (configure.in, cipher/rndlinux.c)
+
 Pedro Morais <morais@poli.org> Translations [pt_BR]
 
 Rémi Guyomarch	<rguyom@mail.dotcom.fr> Assignment
diff -urN gnupg-1.0.2/ChangeLog gnupg-1.0.3/ChangeLog
--- gnupg-1.0.2/ChangeLog	Wed Jul 12 13:32:09 2000
+++ gnupg-1.0.3/ChangeLog	Thu Sep 14 14:20:39 2000
@@ -1,4 +1,37 @@
-Wed Jul 12 13:32:06 CEST 2000  Werner Koch  <wk@>
+Thu Sep 14 14:20:38 CEST 2000  Werner Koch  <wk@openit.de>
+
+        * acinclude.m4 (GNUPG_CHECK_FAQPROG): New.
+        * configure.in: Test for this.
+
+        * configure.in (DYNLINK_MOD_CFLAGS): Fix by David Champion.
+
+Wed Sep  6 17:55:47 CEST 2000  Werner Koch  <wk@openit.de>
+
+        * configure.in: Check for fstat64 and fopen64
+
+Wed Sep  6 14:59:09 CEST 2000  Werner Koch  <wk@openit.de>
+
+        * configure.in (GNUPG_HOMEDIR): New.
+
+Fri Aug 25 16:05:38 CEST 2000  Werner Koch  <wk@openit.de>
+
+        * configure.in:  Changes to allow for Solaris random device.
+        By Nils Ellmenreich.
+        (--with-egd-socket): New.
+
+Wed Aug 23 19:52:51 CEST 2000  Werner Koch  <wk@openit.de>
+
+        * acinclude.m4 (GNUPG_CHECK_MLOCK):  Removed that silly mkdir().
+
+Wed Jul 19 11:26:43 CEST 2000  Werner Koch  <wk@openit.de>
+
+  * configure.in (mingw32): Changes to allow for mingw32msvc
+
+Fri Jul 14 10:17:30 CEST 2000  Werner Koch  <wk@openit.de>
+
+  * acinclude.m4 (GNUPG_CHECK_MLOCK): Fixed syntax error in C code.
+
+Wed Jul 12 13:32:06 CEST 2000  Werner Koch  <wk@openit.de>
 
   Version 1.0.2
 
diff -urN gnupg-1.0.2/INSTALL gnupg-1.0.3/INSTALL
--- gnupg-1.0.2/INSTALL	Thu Mar  2 15:45:04 2000
+++ gnupg-1.0.3/INSTALL	Fri Aug 25 16:04:02 2000
@@ -18,6 +18,15 @@
 		      none - Do not linkl any module in but rely on
 			     a dynmically loaded modules.
 
+--with-egd-socket=<name>  This is only used when EGD is used as random
+                     gatherer. GnuPG uses by default "~/.gnupg/entropy"
+                     as the socket to connect EGD.  Using this option the
+                     socket name can be changed.  You may use any filename
+                     here with 2 exceptions:  a filename starting with
+                     "~/" uses the socket in the homedirectory of the user
+                     and one starting with a "=" uses a socket in the
+                     GnuPG homedirectory which is bye default "~/.gnupg".
+   
 --with-included-zlib Forces usage of the local zlib sources. Default is
 		     to use the (shared) library of the system.
 
diff -urN gnupg-1.0.2/Makefile.in gnupg-1.0.3/Makefile.in
--- gnupg-1.0.2/Makefile.in	Wed Jul 12 14:59:25 2000
+++ gnupg-1.0.3/Makefile.in	Mon Sep 18 12:17:47 2000
@@ -75,6 +75,7 @@
 DYNAMIC_CIPHER_MODS = @DYNAMIC_CIPHER_MODS@
 DYNLINK_LDFLAGS = @DYNLINK_LDFLAGS@
 DYNLINK_MOD_CFLAGS = @DYNLINK_MOD_CFLAGS@
+FAQPROG = @FAQPROG@
 GENCAT = @GENCAT@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
diff -urN gnupg-1.0.2/NEWS gnupg-1.0.3/NEWS
--- gnupg-1.0.2/NEWS	Wed Jul 12 13:27:25 2000
+++ gnupg-1.0.3/NEWS	Mon Sep 18 12:17:34 2000
@@ -1,3 +1,35 @@
+Noteworthy changes in version 1.0.3 (2000-09-18)
+------------------------------------------------
+
+    * Fixed problems with piping to/from other MS-Windows software
+
+    * Expiration time of the primary key can be changed again.
+
+    * Revoked user IDs are now marked in the output of --list-key
+
+    * New options --show-session-key and --override-session-key
+      to help the British folks to somewhat minimize the danger
+      of this Orwellian RIP bill.
+
+    * New options --merge-only and --try-all-secrets.
+
+    * New configuration option --with-egd-socket.
+
+    * The --trusted-key option is back after it left us with 0.9.5
+     
+    * RSA is supported. Key generation does not yet work but will come
+      soon. 
+    
+    * CAST5 and SHA-1 are now the default algorithms to protect the key
+      and for symmetric-only encryption. This should solve a couple
+      of compatibility problems because the old algorithms are optional
+      according to RFC2440
+
+    * Twofish and MDC enhanced encryption is now used.  PGP 7 supports 
+      this.  Older versions of GnuPG don't support it, so they should be
+      upgraded to at least 1.0.2
+      
+
 Noteworthy changes in version 1.0.2 (2000-07-12)
 ----------------------------------------------
 
diff -urN gnupg-1.0.2/PROJECTS gnupg-1.0.3/PROJECTS
--- gnupg-1.0.2/PROJECTS	Wed Sep  1 15:39:55 1999
+++ gnupg-1.0.3/PROJECTS	Mon Aug  7 10:48:01 2000
@@ -15,8 +15,9 @@
 
     * add an option to re-create a public key from a secret key; we
       can do this in trustdb.c:verify_own_keys. (special tool?)
-
-    * rewrite --list-packets or put it into another tool.
+      Hmmm, we better drop the duplication of the public part and just keep
+      the secrets in the "secring" - this has the additional that we can
+      put those secrets on a hardware token.
 
     * write a tool to extract selected keys from a file.
 
diff -urN gnupg-1.0.2/THANKS gnupg-1.0.3/THANKS
--- gnupg-1.0.2/THANKS	Mon Jul 10 15:55:52 2000
+++ gnupg-1.0.3/THANKS	Thu Sep 14 13:34:28 2000
@@ -7,8 +7,10 @@
 Alec Habig		   habig@budoe2.bu.edu
 Allan Clark		   allanc@sco.com
 Anand Kumria		   wildfire@progsoc.uts.edu.au
+Anthony Mulcahy 	   anthony@kcn.ne.jp
 Ariel T Glenn		   ariel@columbia.edu
 Bodo Moeller		   Bodo_Moeller@public.uni-hamburg.de
+Brendan O'Dea              bod@debian.org
 Brenno de Winter	   brenno@dewinter.com
 Brian Moore		   bem@cmc.net
 Brian Warner		   warner@lothar.com
@@ -24,10 +26,12 @@
 Daniel Eisenbud 	   eisenbud@cs.swarthmore.edu
 Daniel Koening		   dan@mail.isis.de
 Daniel Resare		   daniel@resare.com
-Detlef Lannert		   lannert@lannert.rz.uni-duesseldorf.de
 Dave Dykstra		   dwd@bell-labs.com
+David Champion             dgc@uchicago.edu
 David Ellement		   ellement@sdd.hp.com
 David Hallinan		   hallinan@rtd.com
+David Mathog               MATHOG@seqaxp.bio.caltech.edu
+Detlef Lannert		   lannert@lannert.rz.uni-duesseldorf.de
 Dimitri 		   dmitri@advantrix.com
 Dirk Lattermann 	   dlatt@t-online.de
 Ed Boraas		   ecxjo@esperanto.org
@@ -40,7 +44,9 @@
 Frank Heckenbach	   heckenb@mi.uni-erlangen.de
 Frank Stajano		   frank.stajano@cl.cam.ac.uk
 Frank Tobin		   ftobin@uiuc.edu
+Gabriel Rosenkoetter	   gr@eclipsed.net
 Gaël Quéri		   gqueri@mail.dotcom.fr
+Giampaolo Tomassoni        g.tomassoni@libero.it
 Greg Louis		   glouis@dynamicro.on.ca
 Greg Troxel		   gdt@ir.bbn.com
 Gregory Steuck		   steuck@iname.com
@@ -60,7 +66,9 @@
 Jean-loup Gailly	   gzip@prep.ai.mit.edu
 Jeff Long		   long@kestrel.cc.ukans.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
 Joachim Backes		   backes@rhrk.uni-kl.de
 John A. Martin		   jam@jamux.com
 Johnny Teveßen		   j.tevessen@gmx.de
@@ -80,11 +88,14 @@
 Martin Kahlert		   martin.kahlert@provi.de
 Martin Hamilton
 Martin Schulte		   schulte@thp.uni-koeln.de
+Matt Kraai                 kraai@alumni.carnegiemellon.edu
 Matthew Skala		   mskala@ansuz.sooke.bc.ca
+Matthias Urlichs	   smurf@noris.de
 Max Valianskiy		   maxcom@maxcom.ml.org
 Michael Fischer v. Mollard mfvm@gmx.de
 Michael Roth		   mroth@nessie.de
 Michael Sobolev 	   mss@despair.transas.com
+Michael Tokarev 	   mjt@tls.msk.ru
 Nicolas Graner		   Nicolas.Graner@cri.u-psud.fr
 Mike McEwan		   mike@lotusland.demon.co.uk
 NIIBE Yutaka		   gniibe@chroot.org
diff -urN gnupg-1.0.2/TODO gnupg-1.0.3/TODO
--- gnupg-1.0.2/TODO	Mon Jul 10 17:33:12 2000
+++ gnupg-1.0.3/TODO	Thu Sep 14 13:15:51 2000
@@ -1,4 +1,12 @@
 
+  * add a way to set expiration time for key signatures.
+
+  * add some minor things vor VMS.
+
+  * Don't get the ultimately trusted keys from the secring but store
+    it permanently in the trustdb.  This way we don't need a secring at all.
+    [ Solved by re-introducing --trusted-key ]
+
   * Use DSA keys with the test suite.
 
   * g10/trustdb.c (make_sig_records): fix the fixme.
@@ -14,6 +22,8 @@
 
   * Replace Valid/Invalid by Known/Unknown?
 
+  * Fix the bug in the mips assembler code
+
 Scheduled for 1.1
 -----------------
   * export by user-IDs does only export the first matching name which leads
@@ -35,6 +45,7 @@
   * Skip RO keyrings when importing a key.
 
   * Use the newest encryption key if only the main key has been given.
+    [already in the gpg 1.1 codebase]
 
   * replace the keyserver stuff either by a call to a specialized
     utility and SOCKSify this utility.
@@ -45,6 +56,8 @@
   * Delay the read of the passphrase-fd after a NEED_PASSPHRASE.  But this
     may break some scripts.
 
+  * Get new assembler stuff from gmgp 3.1
+
 
 Nice to have
 ------------
@@ -73,4 +86,6 @@
     trustdb.
   * Evaluate whether it make sense to replace the namehashs either by
     using the user ID directly or by using pointers into the trustdb.
+
+
 
diff -urN gnupg-1.0.2/acconfig.h gnupg-1.0.3/acconfig.h
--- gnupg-1.0.2/acconfig.h	Wed Jun  7 18:00:18 2000
+++ gnupg-1.0.3/acconfig.h	Fri Aug 25 13:17:14 2000
@@ -72,6 +72,9 @@
 /* Linux has an ioctl */
 #undef HAVE_DEV_RANDOM_IOCTL
 
+/* see cipher/rndegd.c */
+#undef EGD_SOCKET_NAME
+
 
 #undef USE_DYNAMIC_LINKING
 #undef HAVE_DL_DLOPEN
diff -urN gnupg-1.0.2/acinclude.m4 gnupg-1.0.3/acinclude.m4
--- gnupg-1.0.2/acinclude.m4	Wed Jun  7 18:00:18 2000
+++ gnupg-1.0.3/acinclude.m4	Thu Sep 14 11:24:02 2000
@@ -30,7 +30,7 @@
 dnl GNUPG_CHECK_GNUMAKE
 dnl
 AC_DEFUN(GNUPG_CHECK_GNUMAKE,
-  [
+  [ 
     if ${MAKE-make} --version 2>/dev/null | grep '^GNU ' >/dev/null 2>&1; then
         :
     else
@@ -45,6 +45,32 @@
   ])
 
 
+dnl GNUPG_CHECK_FAQPROG
+dnl
+AC_DEFUN(GNUPG_CHECK_FAQPROG,
+  [ AC_MSG_CHECKING(for faqprog.pl)
+    if faqprog.pl -V 2>/dev/null | grep '^faqprog.pl ' >/dev/null 2>&1; then
+        working_faqprog=yes
+        FAQPROG="faqprog.pl"
+    else 
+	working_faqprog=no
+        FAQPROG=": "
+    fi
+    AC_MSG_RESULT($working_faqprog)
+    AC_SUBST(FAQPROG)
+    AM_CONDITIONAL(WORKING_FAQPROG, test "$working_faqprog" = "yes" )
+
+    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
+***]])
+    fi
+  ])       
+
 
 dnl GNUPG_LINK_FILES( SRC, DEST )
 dnl same as AC_LINK_FILES, but collect the files to link in
@@ -332,8 +358,8 @@
                     #include <sys/mman.h>
                     #endif
                 ], [
-                    mkdir ("foo", 0);
                     int i;
+
                     /* glibc defines this for functions which it implements
                      * to always fail with ENOSYS.  Some functions are actually
                      * named something starting with __ and the normal name
diff -urN gnupg-1.0.2/aclocal.m4 gnupg-1.0.3/aclocal.m4
--- gnupg-1.0.2/aclocal.m4	Wed Jul 12 13:42:38 2000
+++ gnupg-1.0.3/aclocal.m4	Thu Sep 14 14:22:51 2000
@@ -42,7 +42,7 @@
 dnl GNUPG_CHECK_GNUMAKE
 dnl
 AC_DEFUN(GNUPG_CHECK_GNUMAKE,
-  [
+  [ 
     if ${MAKE-make} --version 2>/dev/null | grep '^GNU ' >/dev/null 2>&1; then
         :
     else
@@ -57,6 +57,32 @@
   ])
 
 
+dnl GNUPG_CHECK_FAQPROG
+dnl
+AC_DEFUN(GNUPG_CHECK_FAQPROG,
+  [ AC_MSG_CHECKING(for faqprog.pl)
+    if faqprog.pl -V 2>/dev/null | grep '^faqprog.pl ' >/dev/null 2>&1; then
+        working_faqprog=yes
+        FAQPROG="faqprog.pl"
+    else 
+	working_faqprog=no
+        FAQPROG=": "
+    fi
+    AC_MSG_RESULT($working_faqprog)
+    AC_SUBST(FAQPROG)
+    AM_CONDITIONAL(WORKING_FAQPROG, test "$working_faqprog" = "yes" )
+
+    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
+***]])
+    fi
+  ])       
+
 
 dnl GNUPG_LINK_FILES( SRC, DEST )
 dnl same as AC_LINK_FILES, but collect the files to link in
@@ -336,8 +362,8 @@
                     #include <sys/mman.h>
                     #endif
                 ], [
-                    mkdir ("foo", 0);
                     int i;
+
                     /* glibc defines this for functions which it implements
                      * to always fail with ENOSYS.  Some functions are actually
                      * named something starting with __ and the normal name
@@ -698,6 +724,19 @@
 
 dnl *-*wedit:notab*-*  Please keep this as the last line.
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
 # Like AC_CONFIG_HEADER, but automatically create stamp file.
 
 AC_DEFUN(AM_CONFIG_HEADER,
@@ -832,19 +871,6 @@
   AC_SUBST(MAINT)dnl
 ]
 )
-
-# Define a conditional.
-
-AC_DEFUN(AM_CONDITIONAL,
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
 
 # Macro to add for using GNU gettext.
 # Ulrich Drepper <drepper@cygnus.com>, 1995.
diff -urN gnupg-1.0.2/checks/Makefile.in gnupg-1.0.3/checks/Makefile.in
--- gnupg-1.0.2/checks/Makefile.in	Wed Jul 12 14:59:51 2000
+++ gnupg-1.0.3/checks/Makefile.in	Mon Sep 18 12:18:17 2000
@@ -75,6 +75,7 @@
 DYNAMIC_CIPHER_MODS = @DYNAMIC_CIPHER_MODS@
 DYNLINK_LDFLAGS = @DYNLINK_LDFLAGS@
 DYNLINK_MOD_CFLAGS = @DYNLINK_MOD_CFLAGS@
+FAQPROG = @FAQPROG@
 GENCAT = @GENCAT@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
diff -urN gnupg-1.0.2/cipher/ChangeLog gnupg-1.0.3/cipher/ChangeLog
--- gnupg-1.0.2/cipher/ChangeLog	Wed Jun 28 11:54:47 2000
+++ gnupg-1.0.3/cipher/ChangeLog	Thu Sep 14 14:20:39 2000
@@ -1,3 +1,28 @@
+Thu Sep 14 14:20:38 CEST 2000  Werner Koch  <wk@openit.de>
+
+        * random.c (fast_random_poll): Check ENOSYS for getrusage.
+        * rndunix.c:  Add 2 sources for QNX. By Sam Roberts.
+
+Wed Sep 13 18:12:34 CEST 2000  Werner Koch  <wk@openit.de>
+
+        * rsa.c (secret): Speed up by using the CRT.  For a 2k keys this
+        is about 3 times faster.
+        (stronger_key_check): New but unused code to check the secret key.
+
+Wed Sep  6 17:55:47 CEST 2000  Werner Koch  <wk@openit.de>
+
+        * rsa.c: Changed the comment about the patent.
+        * Makefile.am: Included rsa.[ch].
+        * pubkey.c: Enabled RSA support.
+        (pubkey_get_npkey): Removed RSA workaround.
+
+Fri Aug 25 16:05:38 CEST 2000  Werner Koch  <wk@openit.de>
+
+        * rndlinux.c (open_device): Loose random device checking.
+        By Nils Ellmenreich.
+
+        * rndegd.c (gather_random): Name of socket is nom configurable.
+
 Wed Jun 28 11:54:44 CEST 2000  Werner Koch  <wk@>
 
   * rsa.c, rsa.h: New based on the old module version (only in CVS for now).
diff -urN gnupg-1.0.2/cipher/Makefile.am gnupg-1.0.3/cipher/Makefile.am
--- gnupg-1.0.2/cipher/Makefile.am	Wed Jun 28 11:47:28 2000
+++ gnupg-1.0.3/cipher/Makefile.am	Wed Sep  6 16:14:14 2000
@@ -43,6 +43,7 @@
 		 cast5.h	\
 		 elgamal.c	\
 		 elgamal.h	\
+		 rsa.c rsa.h    \
 		 primegen.c	\
 		 random.h	\
 		 random.c	\
diff -urN gnupg-1.0.2/cipher/Makefile.in gnupg-1.0.3/cipher/Makefile.in
--- gnupg-1.0.2/cipher/Makefile.in	Wed Jul 12 14:59:34 2000
+++ gnupg-1.0.3/cipher/Makefile.in	Mon Sep 18 12:17:55 2000
@@ -74,6 +74,7 @@
 DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
 DYNAMIC_CIPHER_MODS = @DYNAMIC_CIPHER_MODS@
 DYNLINK_LDFLAGS = @DYNLINK_LDFLAGS@
+FAQPROG = @FAQPROG@
 GENCAT = @GENCAT@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
@@ -125,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			 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			 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
@@ -144,7 +145,7 @@
 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 primegen.o random.o dsa.o g10c.o \
+blowfish.o cast5.o elgamal.o rsa.o primegen.o random.o dsa.o g10c.o \
 smallprime.o construct.o
 AR = ar
 PROGRAMS =  $(pkglib_PROGRAMS)
@@ -374,7 +375,7 @@
 pubkey.o: pubkey.c ../config.h ../g10defs.h ../include/util.h \
 	../include/types.h ../include/errors.h ../include/mpi.h \
 	../include/iobuf.h ../include/memory.h ../include/cipher.h \
-	../include/../cipher/random.h elgamal.h dsa.h dynload.h
+	../include/../cipher/random.h elgamal.h dsa.h rsa.h dynload.h
 random.o: random.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 ../include/ttyio.h \
@@ -388,6 +389,10 @@
 	../include/util.h ../include/errors.h ../include/mpi.h \
 	../include/iobuf.h ../include/memory.h ../include/ttyio.h \
 	dynload.h ../include/i18n.h
+rndw32.o: rndw32.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 \
+	../include/i18n.h
 rsa.o: rsa.c ../config.h ../g10defs.h ../include/util.h \
 	../include/types.h ../include/errors.h ../include/mpi.h \
 	../include/iobuf.h ../include/memory.h ../include/cipher.h \
diff -urN gnupg-1.0.2/cipher/pubkey.c gnupg-1.0.3/cipher/pubkey.c
--- gnupg-1.0.2/cipher/pubkey.c	Wed Jun 28 11:47:01 2000
+++ gnupg-1.0.3/cipher/pubkey.c	Wed Sep  6 16:37:17 2000
@@ -30,9 +30,7 @@
 #include "cipher.h"
 #include "elgamal.h"
 #include "dsa.h"
-#if 0
 #include "rsa.h"
-#endif
 #include "dynload.h"
 
 
@@ -153,7 +151,6 @@
 	BUG();
     i++;
 
-  #if 0
     pubkey_table[i].algo = PUBKEY_ALGO_RSA;
     pubkey_table[i].name = rsa_get_info( pubkey_table[i].algo,
 					 &pubkey_table[i].npkey,
@@ -205,7 +202,6 @@
     if( !pubkey_table[i].name )
 	BUG();
     i++;
-  #endif
 
     for( ; i < TABLE_SIZE; i++ )
 	pubkey_table[i].name = NULL;
@@ -388,8 +384,6 @@
 	    if( pubkey_table[i].algo == algo )
 		return pubkey_table[i].npkey;
     } while( load_pubkey_modules() );
-    if( is_RSA(algo) )	  /* special hack, so that we are able to */
-	return 2;	  /* see the RSA keyids */
     return 0;
 }
 
diff -urN gnupg-1.0.2/cipher/random.c gnupg-1.0.3/cipher/random.c
--- gnupg-1.0.2/cipher/random.c	Sun May 28 12:35:54 2000
+++ gnupg-1.0.3/cipher/random.c	Thu Sep 14 12:59:59 2000
@@ -594,8 +594,11 @@
       #endif
     #else
     {	struct rusage buf;
-	if( getrusage( RUSAGE_SELF, &buf ) )
+        /* QNX/Neutrino does return ENOSYS - so we just ignore it and
+         * add whatever is in buf */
+        if( getrusage( RUSAGE_SELF, &buf ) && errno != ENOSYS )
 	    BUG();
+        
 	add_randomness( &buf, sizeof buf, 1 );
 	memset( &buf, 0, sizeof buf );
     }
diff -urN gnupg-1.0.2/cipher/rndegd.c gnupg-1.0.3/cipher/rndegd.c
--- gnupg-1.0.2/cipher/rndegd.c	Thu Mar  2 15:45:05 2000
+++ gnupg-1.0.3/cipher/rndegd.c	Fri Aug 25 16:00:14 2000
@@ -114,13 +114,28 @@
 	}
     }
     if( fd == -1 ) {
-	char *name = make_filename( g10_opt_homedir, "entropy", NULL );
+        const char *bname = NULL;
+	char *name;
 	struct sockaddr_un addr;
 	int addr_len;
+      
+      #ifdef EGD_SOCKET_NAME
+        bname = EGD_SOCKET_NAME;
+      #endif
+        if ( !bname || !*bname )
+            bname = "entropy";
+
+        if ( *bname == '=' && bname[1] )
+            name = make_filename( g10_opt_homedir, bname+1 , NULL );
+        else
+            name = make_filename( bname , NULL );
+
+        if ( strlen(name)+1 >= sizeof addr.sun_path ) 
+            g10_log_fatal ("EGD socketname is too long\n");
 
 	memset( &addr, 0, sizeof addr );
 	addr.sun_family = AF_UNIX;
-	strcpy( addr.sun_path, name );	  /* fixme: check that it is long enough */
+	strcpy( addr.sun_path, name );	  
 	addr_len = offsetof( struct sockaddr_un, sun_path )
 		   + strlen( addr.sun_path );
 
@@ -195,7 +210,7 @@
 #ifndef IS_MODULE
 static
 #endif
-const char * const gnupgext_version = "RNDEGD ($Revision: 1.7.2.1 $)";
+const char * const gnupgext_version = "RNDEGD ($Revision: 1.7.2.2 $)";
 
 static struct {
     int class;
diff -urN gnupg-1.0.2/cipher/rndlinux.c gnupg-1.0.3/cipher/rndlinux.c
--- gnupg-1.0.2/cipher/rndlinux.c	Thu Mar  2 15:45:05 2000
+++ gnupg-1.0.3/cipher/rndlinux.c	Fri Aug 25 16:00:14 2000
@@ -70,7 +70,7 @@
 #endif
 
 /****************
- * Used to open the Linux and xBSD /dev/random devices
+ * Used to open the /dev/random devices (Linux, xBSD, Solaris (if it exists), ...)
  */
 static int
 open_device( const char *name, int minor )
@@ -83,8 +83,9 @@
 	g10_log_fatal("can't open %s: %s\n", name, strerror(errno) );
     if( fstat( fd, &sb ) )
 	g10_log_fatal("stat() off %s failed: %s\n", name, strerror(errno) );
-    if( !S_ISCHR(sb.st_mode) )
-	g10_log_fatal("invalid random device!\n" );
+    /* Don't check device type for better portability */
+    /*  if( (!S_ISCHR(sb.st_mode)) && (!S_ISFIFO(sb.st_mode)) )
+	  g10_log_fatal("invalid random device!\n" ); */
     return fd;
 }
 
@@ -177,7 +178,7 @@
 #ifndef IS_MODULE
 static
 #endif
-const char * const gnupgext_version = "RNDLINUX ($Revision: 1.9.2.1 $)";
+const char * const gnupgext_version = "RNDLINUX ($Revision: 1.9.2.2 $)";
 
 static struct {
     int class;
diff -urN gnupg-1.0.2/cipher/rndunix.c gnupg-1.0.3/cipher/rndunix.c
--- gnupg-1.0.2/cipher/rndunix.c	Fri Jun  9 09:56:19 2000
+++ gnupg-1.0.3/cipher/rndunix.c	Thu Sep 14 14:20:27 2000
@@ -242,6 +242,7 @@
     {	"/usr/ucb/ps", "aux", SC(0.3), NULL, 0, 0, 0, 1       },
     {	"/usr/bin/ps", "aux", SC(0.3), NULL, 0, 0, 0, 1       },
     {	"/bin/ps", "aux", SC(0.3), NULL, 0, 0, 0, 0          },
+    {   "/bin/ps", "-A", SC(0.3), NULL, 0, 0, 0, 0           }, /*QNX*/
     {	"/usr/bin/ipcs", "-a", SC(0.5), NULL, 0, 0, 0, 1      },
     {	"/bin/ipcs", "-a", SC(0.5), NULL, 0, 0, 0, 0         },
     /* Unreliable source, depends on system usage */
@@ -290,6 +291,10 @@
     /* This is a complex and screwball program.  Some systems have things
      * like rX_dmn, x = integer, for RAID systems, but the statistics are
      * pretty dodgy */
+#ifdef __QNXNTO__                                                             
+    { "/bin/pidin", "-F%A%B%c%d%E%I%J%K%m%M%n%N%p%P%S%s%T", SC(0.3),
+             NULL, 0, 0, 0, 0       },
+#endif     
 #if 0
     /* The following aren't enabled since they're somewhat slow and not very
      * unpredictable, however they give an indication of the sort of sources
@@ -845,7 +850,7 @@
 #ifndef IS_MODULE
 static
 #endif
-const char * const gnupgext_version = "RNDUNIX ($Revision: 1.14.2.3 $)";
+const char * const gnupgext_version = "RNDUNIX ($Revision: 1.14.2.4 $)";
 
 
 static struct {
diff -urN gnupg-1.0.2/cipher/rndw32.c gnupg-1.0.3/cipher/rndw32.c
--- gnupg-1.0.2/cipher/rndw32.c	Sun May 28 13:43:41 2000
+++ gnupg-1.0.3/cipher/rndw32.c	Mon Sep 18 12:11:42 2000
@@ -299,16 +299,21 @@
  * Definitions which are missing from the current GNU Windows32Api
  */
 
+#ifndef TH32CS_SNAPHEAPLIST
 #define TH32CS_SNAPHEAPLIST 1
 #define TH32CS_SNAPPROCESS  2
 #define TH32CS_SNAPTHREAD   4
 #define TH32CS_SNAPMODULE   8
 #define TH32CS_SNAPALL	    (1|2|4|8)
 #define TH32CS_INHERIT	    0x80000000
+#endif /*TH32CS_SNAPHEAPLIST*/
 
+#ifndef IOCTL_DISK_PERFORMANCE
 #define IOCTL_DISK_PERFORMANCE	0x00070020
-#define VER_PLATFORM_WIN32_WINDOWS 1
-
+#endif
+#ifndef IOCTL_DISK_PERFORMANCE
+#define VER_PLATFORM_WIN32_WINDOWSw 1
+#endif
 
 typedef struct {
     DWORD dwSize;
@@ -910,7 +915,7 @@
 #ifndef IS_MODULE
 static
 #endif
-const char * const gnupgext_version = "RNDW32 ($Revision: 1.1.4.5 $)";
+const char * const gnupgext_version = "RNDW32 ($Revision: 1.1.4.6 $)";
 
 static struct {
     int class;
diff -urN gnupg-1.0.2/cipher/rsa.c gnupg-1.0.3/cipher/rsa.c
--- gnupg-1.0.2/cipher/rsa.c	Thu Jan  1 01:00:00 1970
+++ gnupg-1.0.3/cipher/rsa.c	Wed Sep 13 15:49:23 2000
@@ -0,0 +1,463 @@
+/* rsa.c  -  RSA function
+ *	Copyright (C) 1997, 1998, 1999 by Werner Koch (dd9jn)
+ *	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 code uses an algorithm protected by U.S. Patent #4,405,829
+   which expires on September 20, 2000.  The patent holder placed that
+   patent into the public domain on Sep 6th, 2000.
+*/
+ 
+#include <config.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "util.h"
+#include "mpi.h"
+#include "cipher.h"
+#include "rsa.h"
+
+
+typedef struct {
+    MPI n;	    /* modulus */
+    MPI e;	    /* exponent */
+} RSA_public_key;
+
+
+typedef struct {
+    MPI n;	    /* public modulus */
+    MPI e;	    /* public exponent */
+    MPI d;	    /* exponent */
+    MPI p;	    /* prime  p. */
+    MPI q;	    /* prime  q. */
+    MPI u;	    /* inverse of p mod q. */
+} RSA_secret_key;
+
+
+static void test_keys( RSA_secret_key *sk, unsigned nbits );
+static void generate( RSA_secret_key *sk, unsigned nbits );
+static int  check_secret_key( RSA_secret_key *sk );
+static void public(MPI output, MPI input, RSA_public_key *skey );
+static void secret(MPI output, MPI input, RSA_secret_key *skey );
+
+
+static void
+test_keys( RSA_secret_key *sk, unsigned nbits )
+{
+    RSA_public_key pk;
+    MPI test = mpi_alloc( (nbits+BITS_PER_MPI_LIMB-1)/BITS_PER_MPI_LIMB );
+    MPI out1 = mpi_alloc( (nbits+BITS_PER_MPI_LIMB-1)/BITS_PER_MPI_LIMB );
+    MPI out2 = mpi_alloc( (nbits+BITS_PER_MPI_LIMB-1)/BITS_PER_MPI_LIMB );
+
+    pk.n = sk->n;
+    pk.e = sk->e;
+    {	char *p = get_random_bits( nbits, 0, 0 );
+	mpi_set_buffer( test, p, (nbits+7)/8, 0 );
+	m_free(p);
+    }
+
+    public( out1, test, &pk );
+    secret( out2, out1, sk );
+    if( mpi_cmp( test, out2 ) )
+	log_fatal("RSA operation: public, secret failed\n");
+    secret( out1, test, sk );
+    public( out2, out1, &pk );
+    if( mpi_cmp( test, out2 ) )
+	log_fatal("RSA operation: secret, public failed\n");
+    mpi_free( test );
+    mpi_free( out1 );
+    mpi_free( out2 );
+}
+
+/****************
+ * Generate a key pair with a key of size NBITS
+ * Returns: 2 structures filles with all needed values
+ */
+static void
+generate( RSA_secret_key *sk, unsigned nbits )
+{
+    MPI p, q; /* the two primes */
+    MPI d;    /* the private key */
+    MPI u;
+    MPI t1, t2;
+    MPI n;    /* the public key */
+    MPI e;    /* the exponent */
+    MPI phi;  /* helper: (p-1)(q-1) */
+    MPI g;
+    MPI f;
+
+    /* select two (very secret) primes */
+    p = generate_secret_prime( nbits / 2 );
+    q = generate_secret_prime( nbits / 2 );
+    if( mpi_cmp( p, q ) > 0 ) /* p shall be smaller than q (for calc of u)*/
+	mpi_swap(p,q);
+    /* calculate Euler totient: phi = (p-1)(q-1) */
+    t1 = mpi_alloc_secure( mpi_get_nlimbs(p) );
+    t2 = mpi_alloc_secure( mpi_get_nlimbs(p) );
+    phi = mpi_alloc_secure( (nbits+BITS_PER_MPI_LIMB-1)/BITS_PER_MPI_LIMB );
+    g	= mpi_alloc_secure( (nbits+BITS_PER_MPI_LIMB-1)/BITS_PER_MPI_LIMB  );
+    f	= mpi_alloc_secure( (nbits+BITS_PER_MPI_LIMB-1)/BITS_PER_MPI_LIMB  );
+    mpi_sub_ui( t1, p, 1 );
+    mpi_sub_ui( t2, q, 1 );
+    mpi_mul( phi, t1, t2 );
+    mpi_gcd(g, t1, t2);
+    mpi_fdiv_q(f, phi, g);
+    /* multiply them to make the private key */
+    n = mpi_alloc( (nbits+BITS_PER_MPI_LIMB-1)/BITS_PER_MPI_LIMB );
+    mpi_mul( n, p, q );
+    /* find a public exponent  */
+    e = mpi_alloc( (6+BITS_PER_MPI_LIMB-1)/BITS_PER_MPI_LIMB );
+    mpi_set_ui( e, 17); /* start with 17 */
+    while( !mpi_gcd(t1, e, phi) ) /* (while gcd is not 1) */
+	mpi_add_ui( e, e, 2);
+    /* calculate the secret key d = e^1 mod phi */
+    d = mpi_alloc( (nbits+BITS_PER_MPI_LIMB-1)/BITS_PER_MPI_LIMB );
+    mpi_invm(d, e, f );
+    /* calculate the inverse of p and q (used for chinese remainder theorem)*/
+    u = mpi_alloc( (nbits+BITS_PER_MPI_LIMB-1)/BITS_PER_MPI_LIMB );
+    mpi_invm(u, p, q );
+
+    if( DBG_CIPHER ) {
+	log_mpidump("  p= ", p );
+	log_mpidump("  q= ", q );
+	log_mpidump("phi= ", phi );
+	log_mpidump("  g= ", g );
+	log_mpidump("  f= ", f );
+	log_mpidump("  n= ", n );
+	log_mpidump("  e= ", e );
+	log_mpidump("  d= ", d );
+	log_mpidump("  u= ", u );
+    }
+
+    mpi_free(t1);
+    mpi_free(t2);
+    mpi_free(phi);
+    mpi_free(f);
+    mpi_free(g);
+
+    sk->n = n;
+    sk->e = e;
+    sk->p = p;
+    sk->q = q;
+    sk->d = d;
+    sk->u = u;
+
+    /* now we can test our keys (this should never fail!) */
+    test_keys( sk, nbits - 64 );
+}
+
+
+/****************
+ * Test wether the secret key is valid.
+ * Returns: true if this is a valid key.
+ */
+static int
+check_secret_key( RSA_secret_key *sk )
+{
+    int rc;
+    MPI temp = mpi_alloc( mpi_get_nlimbs(sk->p)*2 );
+
+    mpi_mul(temp, sk->p, sk->q );
+    rc = mpi_cmp( temp, sk->n );
+    mpi_free(temp);
+    return !rc;
+}
+
+
+
+/****************
+ * Public key operation. Encrypt INPUT with PKEY and put result into OUTPUT.
+ *
+ *	c = m^e mod n
+ *
+ * Where c is OUTPUT, m is INPUT and e,n are elements of PKEY.
+ */
+static void
+public(MPI output, MPI input, RSA_public_key *pkey )
+{
+    if( output == input ) { /* powm doesn't like output and input the same */
+	MPI x = mpi_alloc( mpi_get_nlimbs(input)*2 );
+	mpi_powm( x, input, pkey->e, pkey->n );
+	mpi_set(output, x);
+	mpi_free(x);
+    }
+    else
+	mpi_powm( output, input, pkey->e, pkey->n );
+}
+
+#if 0
+static void
+stronger_key_check ( RSA_secret_key *skey )
+{
+    MPI t = mpi_alloc_secure ( 0 );
+    MPI t1 = mpi_alloc_secure ( 0 );
+    MPI t2 = mpi_alloc_secure ( 0 );
+    MPI phi = mpi_alloc_secure ( 0 );
+
+    /* check that n == p * q */
+    mpi_mul( t, skey->p, skey->q);
+    if (mpi_cmp( t, skey->n) )
+        log_info ( "RSA Oops: n != p * q\n" );
+
+    /* check that p is less than q */
+    if( mpi_cmp( skey->p, skey->q ) > 0 )
+	log_info ("RSA Oops: p >= q\n");
+
+
+    /* check that e divides neither p-1 nor q-1 */
+    mpi_sub_ui(t, skey->p, 1 );
+    mpi_fdiv_r(t, t, skey->e );
+    if ( !mpi_cmp_ui( t, 0) )
+        log_info ( "RSA Oops: e divides p-1\n" );
+    mpi_sub_ui(t, skey->q, 1 );
+    mpi_fdiv_r(t, t, skey->e );
+    if ( !mpi_cmp_ui( t, 0) )
+        log_info ( "RSA Oops: e divides q-1\n" );
+
+    /* check that d is correct */
+    mpi_sub_ui( t1, skey->p, 1 );
+    mpi_sub_ui( t2, skey->q, 1 );
+    mpi_mul( phi, t1, t2 );
+    mpi_gcd(t, t1, t2);
+    mpi_fdiv_q(t, phi, t);
+    mpi_invm(t, skey->e, t );
+    if ( mpi_cmp(t, skey->d ) )
+        log_info ( "RSA Oops: d is wrong\n");
+
+    /* check for crrectness of u */
+    mpi_invm(t, skey->p, skey->q );
+    if ( mpi_cmp(t, skey->u ) )
+        log_info ( "RSA Oops: u is wrong\n");
+   
+    log_info ( "RSA secret key check finished\n");
+
+    mpi_free (t);
+    mpi_free (t1);
+    mpi_free (t2);
+    mpi_free (phi);
+}
+#endif
+
+
+/****************
+ * Secret key operation. Encrypt INPUT with SKEY and put result into OUTPUT.
+ *
+ *	m = c^d mod n
+ *
+ * Or faster:
+ *
+ *      m1 = c ^ (d mod (p-1)) mod p 
+ *      m2 = c ^ (d mod (q-1)) mod q 
+ *      h = u * (m2 - m1) mod q 
+ *      m = m1 + h * p
+ *
+ * Where m is OUTPUT, c is INPUT and d,n,p,q,u are elements of SKEY.
+ */
+static void
+secret(MPI output, MPI input, RSA_secret_key *skey )
+{
+  #if 0
+    mpi_powm( output, input, skey->d, skey->n );
+  #else
+    MPI m1   = mpi_alloc_secure( mpi_get_nlimbs(skey->n)+1 );
+    MPI m2   = mpi_alloc_secure( mpi_get_nlimbs(skey->n)+1 );
+    MPI h    = mpi_alloc_secure( mpi_get_nlimbs(skey->n)+1 );
+
+    /* m1 = c ^ (d mod (p-1)) mod p */
+    mpi_sub_ui( h, skey->p, 1  );
+    mpi_fdiv_r( h, skey->d, h );   
+    mpi_powm( m1, input, h, skey->p );
+    /* m2 = c ^ (d mod (q-1)) mod q */
+    mpi_sub_ui( h, skey->q, 1  );
+    mpi_fdiv_r( h, skey->d, h );
+    mpi_powm( m2, input, h, skey->q );
+    /* h = u * ( m2 - m1 ) mod q */
+    mpi_sub( h, m2, m1 );
+    if ( mpi_is_neg( h ) ) 
+        mpi_add ( h, h, skey->q );
+    mpi_mulm( h, skey->u, h, skey->q ); 
+    /* m = m2 + h * p */
+    mpi_mul ( h, h, skey->p );
+    mpi_add ( output, m1, h );
+    /* ready */
+    
+    mpi_free ( h );
+    mpi_free ( m1 );
+    mpi_free ( m2 );
+  #endif
+}
+
+
+/*********************************************
+ **************  interface  ******************
+ *********************************************/
+
+int
+rsa_generate( int algo, unsigned nbits, MPI *skey, MPI **retfactors )
+{
+    RSA_secret_key sk;
+
+    if( !is_RSA(algo) )
+	return G10ERR_PUBKEY_ALGO;
+
+    generate( &sk, nbits );
+    skey[0] = sk.n;
+    skey[1] = sk.e;
+    skey[2] = sk.d;
+    skey[3] = sk.p;
+    skey[4] = sk.q;
+    skey[5] = sk.u;
+    /* make an empty list of factors */
+    *retfactors = m_alloc_clear( 1 * sizeof **retfactors );
+    return 0;
+}
+
+
+int
+rsa_check_secret_key( int algo, MPI *skey )
+{
+    RSA_secret_key sk;
+
+    if( !is_RSA(algo) )
+	return G10ERR_PUBKEY_ALGO;
+
+    sk.n = skey[0];
+    sk.e = skey[1];
+    sk.d = skey[2];
+    sk.p = skey[3];
+    sk.q = skey[4];
+    sk.u = skey[5];
+    if( !check_secret_key( &sk ) )
+	return G10ERR_BAD_SECKEY;
+
+    return 0;
+}
+
+
+
+int
+rsa_encrypt( int algo, MPI *resarr, MPI data, MPI *pkey )
+{
+    RSA_public_key pk;
+
+    if( algo != 1 && algo != 2 )
+	return G10ERR_PUBKEY_ALGO;
+
+    pk.n = pkey[0];
+    pk.e = pkey[1];
+    resarr[0] = mpi_alloc( mpi_get_nlimbs( pk.n ) );
+    public( resarr[0], data, &pk );
+    return 0;
+}
+
+int
+rsa_decrypt( int algo, MPI *result, MPI *data, MPI *skey )
+{
+    RSA_secret_key sk;
+
+    if( algo != 1 && algo != 2 )
+	return G10ERR_PUBKEY_ALGO;
+
+    sk.n = skey[0];
+    sk.e = skey[1];
+    sk.d = skey[2];
+    sk.p = skey[3];
+    sk.q = skey[4];
+    sk.u = skey[5];
+    *result = mpi_alloc_secure( mpi_get_nlimbs( sk.n ) );
+    secret( *result, data[0], &sk );
+    return 0;
+}
+
+int
+rsa_sign( int algo, MPI *resarr, MPI data, MPI *skey )
+{
+    RSA_secret_key sk;
+
+    if( algo != 1 && algo != 3 )
+	return G10ERR_PUBKEY_ALGO;
+
+    sk.n = skey[0];
+    sk.e = skey[1];
+    sk.d = skey[2];
+    sk.p = skey[3];
+    sk.q = skey[4];
+    sk.u = skey[5];
+    resarr[0] = mpi_alloc( mpi_get_nlimbs( sk.n ) );
+    secret( resarr[0], data, &sk );
+
+    return 0;
+}
+
+int
+rsa_verify( int algo, MPI hash, MPI *data, MPI *pkey,
+	   int (*cmp)(void *opaque, MPI tmp), void *opaquev )
+{
+    RSA_public_key pk;
+    MPI result;
+    int rc;
+
+    if( algo != 1 && algo != 3 )
+	return G10ERR_PUBKEY_ALGO;
+    pk.n = pkey[0];
+    pk.e = pkey[1];
+    result = mpi_alloc( (160+BITS_PER_MPI_LIMB-1)/BITS_PER_MPI_LIMB);
+    public( result, data[0], &pk );
+    /*rc = (*cmp)( opaquev, result );*/
+    rc = mpi_cmp( result, hash )? G10ERR_BAD_SIGN:0;
+    mpi_free(result);
+
+    return rc;
+}
+
+
+unsigned int
+rsa_get_nbits( int algo, MPI *pkey )
+{
+    if( !is_RSA(algo) )
+	return 0;
+    return mpi_get_nbits( pkey[0] );
+}
+
+
+/****************
+ * Return some information about the algorithm.  We need algo here to
+ * distinguish different flavors of the algorithm.
+ * Returns: A pointer to string describing the algorithm or NULL if
+ *	    the ALGO is invalid.
+ * Usage: Bit 0 set : allows signing
+ *	      1 set : allows encryption
+ */
+const char *
+rsa_get_info( int algo,
+	      int *npkey, int *nskey, int *nenc, int *nsig, int *usage )
+{
+    *npkey = 2;
+    *nskey = 6;
+    *nenc = 1;
+    *nsig = 1;
+
+    switch( algo ) {
+      case 1: *usage = PUBKEY_USAGE_SIG | PUBKEY_USAGE_ENC; return "RSA";
+      case 2: *usage = PUBKEY_USAGE_ENC; return "RSA-E";
+      case 3: *usage = PUBKEY_USAGE_SIG; return "RSA-S";
+      default:*usage = 0; return NULL;
+    }
+}
+
diff -urN gnupg-1.0.2/cipher/rsa.h gnupg-1.0.3/cipher/rsa.h
--- gnupg-1.0.2/cipher/rsa.h	Thu Jan  1 01:00:00 1970
+++ gnupg-1.0.3/cipher/rsa.h	Tue Jun 27 16:59:06 2000
@@ -0,0 +1,36 @@
+/* rsa.h
+ *	Copyright (C) 1997,1998 by Werner Koch (dd9jn)
+ *	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
+ */
+#ifndef G10_RSA_H
+#define G10_RSA_H
+
+int rsa_generate( int algo, unsigned nbits, MPI *skey, MPI **retfactors );
+int rsa_check_secret_key( int algo, MPI *skey );
+int rsa_encrypt( int algo, MPI *resarr, MPI data, MPI *pkey );
+int rsa_decrypt( int algo, MPI *result, MPI *data, MPI *skey );
+int rsa_sign( int algo, MPI *resarr, MPI data, MPI *skey );
+int rsa_verify( int algo, MPI hash, MPI *data, MPI *pkey,
+		    int (*cmp)(void *, MPI), void *opaquev );
+unsigned rsa_get_nbits( int algo, MPI *pkey );
+const char *rsa_get_info( int algo, int *npkey, int *nskey,
+				    int *nenc, int *nsig, int *use );
+
+
+#endif /*G10_RSA_H*/
diff -urN gnupg-1.0.2/config.h.in gnupg-1.0.3/config.h.in
--- gnupg-1.0.2/config.h.in	Thu Jun  8 22:31:25 2000
+++ gnupg-1.0.3/config.h.in	Wed Sep  6 17:23:46 2000
@@ -122,6 +122,9 @@
 /* Linux has an ioctl */
 #undef HAVE_DEV_RANDOM_IOCTL
 
+/* see cipher/rndegd.c */
+#undef EGD_SOCKET_NAME
+
 #undef USE_DYNAMIC_LINKING
 #undef HAVE_DL_DLOPEN
 #undef HAVE_DL_SHL_LOAD
@@ -184,6 +187,12 @@
 
 /* Define if you have the dlopen function.  */
 #undef HAVE_DLOPEN
+
+/* Define if you have the fopen64 function.  */
+#undef HAVE_FOPEN64
+
+/* Define if you have the fstat64 function.  */
+#undef HAVE_FSTAT64
 
 /* Define if you have the getcwd function.  */
 #undef HAVE_GETCWD
diff -urN gnupg-1.0.2/configure gnupg-1.0.3/configure
--- gnupg-1.0.2/configure	Wed Jul 12 13:42:41 2000
+++ gnupg-1.0.3/configure	Thu Sep 14 14:22:53 2000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# From configure.in Revision: 1.103.2.19 
+# From configure.in Revision: 1.103.2.24 
 CDPATH=
 
 
@@ -18,6 +18,8 @@
 
 
 
+       
+
 
 
 
@@ -69,6 +71,10 @@
 
 
 
+# Define a conditional.
+
+
+
 # Like AC_CONFIG_HEADER, but automatically create stamp file.
 
 
@@ -97,10 +103,6 @@
 
 
 
-# Define a conditional.
-
-
-
 # Macro to add for using GNU gettext.
 # Ulrich Drepper <drepper@cygnus.com>, 1995.
 #
@@ -153,6 +155,8 @@
 ac_help="$ac_help
   --enable-static-rnd=[egd|unix|linux|none]  "
 ac_help="$ac_help
+  --with-egd-socket=NAME  Use NAME for the EGD socket)"
+ac_help="$ac_help
   --disable-dev-random    disable the use of dev random"
 ac_help="$ac_help
   --disable-dynload       disable use of extensions"
@@ -735,7 +739,7 @@
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:739: checking host system type" >&5
+echo "configure:743: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -756,7 +760,7 @@
 echo "$ac_t""$host" 1>&6
 
 echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:760: checking target system type" >&5
+echo "configure:764: checking target system type" >&5
 
 target_alias=$target
 case "$target_alias" in
@@ -774,7 +778,7 @@
 echo "$ac_t""$target" 1>&6
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:778: checking build system type" >&5
+echo "configure:782: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -808,7 +812,7 @@
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:812: checking for a BSD compatible install" >&5
+echo "configure:816: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -861,7 +865,7 @@
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:865: checking whether build environment is sane" >&5
+echo "configure:869: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -918,7 +922,7 @@
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:922: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:926: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -964,7 +968,7 @@
 
 missing_dir=`cd $ac_aux_dir && pwd`
 echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:968: checking for working aclocal" >&5
+echo "configure:972: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -977,7 +981,7 @@
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:981: checking for working autoconf" >&5
+echo "configure:985: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -990,7 +994,7 @@
 fi
 
 echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:994: checking for working automake" >&5
+echo "configure:998: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1003,7 +1007,7 @@
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1007: checking for working autoheader" >&5
+echo "configure:1011: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1016,7 +1020,7 @@
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1020: checking for working makeinfo" >&5
+echo "configure:1024: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1040,7 +1044,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1044: checking for $ac_word" >&5
+echo "configure:1048: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1075,7 +1079,7 @@
 
 
 echo $ac_n "checking which static random module to use""... $ac_c" 1>&6
-echo "configure:1079: checking which static random module to use" >&5
+echo "configure:1083: checking which static random module to use" >&5
 # Check whether --enable-static-rnd or --disable-static-rnd was given.
 if test "${enable_static_rnd+set}" = set; then
   enableval="$enable_static_rnd"
@@ -1099,11 +1103,23 @@
       ;;
 esac
 
+# Check whether --with-egd-socket or --without-egd-socket was given.
+if test "${with_egd_socket+set}" = set; then
+  withval="$with_egd_socket"
+  egd_socket_name="$withval"
+else
+  egd_socket_name="" 
+fi
+
+cat >> confdefs.h <<EOF
+#define EGD_SOCKET_NAME "$egd_socket_name"
+EOF
+
 
 
 
 echo $ac_n "checking whether use of /dev/random is requested""... $ac_c" 1>&6
-echo "configure:1107: checking whether use of /dev/random is requested" >&5
+echo "configure:1123: checking whether use of /dev/random is requested" >&5
 # Check whether --enable-dev-random or --disable-dev-random was given.
 if test "${enable_dev_random+set}" = set; then
   enableval="$enable_dev_random"
@@ -1117,7 +1133,7 @@
 
 
 echo $ac_n "checking whether use of extensions is requested""... $ac_c" 1>&6
-echo "configure:1121: checking whether use of extensions is requested" >&5
+echo "configure:1137: checking whether use of extensions is requested" >&5
 # Check whether --enable-dynload or --disable-dynload was given.
 if test "${enable_dynload+set}" = set; then
   enableval="$enable_dynload"
@@ -1129,7 +1145,7 @@
 echo "$ac_t""$try_dynload" 1>&6
 
 echo $ac_n "checking whether assembler modules are requested""... $ac_c" 1>&6
-echo "configure:1133: checking whether assembler modules are requested" >&5
+echo "configure:1149: checking whether assembler modules are requested" >&5
 # Check whether --enable-asm or --disable-asm was given.
 if test "${enable_asm+set}" = set; then
   enableval="$enable_asm"
@@ -1141,7 +1157,7 @@
 echo "$ac_t""$try_asm_modules" 1>&6
 
 echo $ac_n "checking whether memory debugging is requested""... $ac_c" 1>&6
-echo "configure:1145: checking whether memory debugging is requested" >&5
+echo "configure:1161: checking whether memory debugging is requested" >&5
 # Check whether --enable-m-debug or --disable-m-debug was given.
 if test "${enable_m_debug+set}" = set; then
   enableval="$enable_m_debug"
@@ -1159,7 +1175,7 @@
     use_m_guard=yes
 else
     echo $ac_n "checking whether memory guard is requested""... $ac_c" 1>&6
-echo "configure:1163: checking whether memory guard is requested" >&5
+echo "configure:1179: checking whether memory guard is requested" >&5
     # Check whether --enable-m-guard or --disable-m-guard was given.
 if test "${enable_m_guard+set}" = set; then
   enableval="$enable_m_guard"
@@ -1179,7 +1195,7 @@
 
 
 echo $ac_n "checking whether included zlib is requested""... $ac_c" 1>&6
-echo "configure:1183: checking whether included zlib is requested" >&5
+echo "configure:1199: checking whether included zlib is requested" >&5
 # Check whether --with-included-zlib or --without-included-zlib was given.
 if test "${with_included_zlib+set}" = set; then
   withval="$with_included_zlib"
@@ -1192,7 +1208,7 @@
 
 
 echo $ac_n "checking whether use of capabilities is requested""... $ac_c" 1>&6
-echo "configure:1196: checking whether use of capabilities is requested" >&5
+echo "configure:1212: checking whether use of capabilities is requested" >&5
 # Check whether --with-capabilities or --without-capabilities was given.
 if test "${with_capabilities+set}" = set; then
   withval="$with_capabilities"
@@ -1208,7 +1224,7 @@
 
 
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1212: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1228: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1233,7 +1249,7 @@
 
 
 case "${target}" in
-    *-*-mingw32)
+    *-*-mingw32*)
         # special stuff for Windoze NT
         # Do we need to set cross_compiling here or is it sufficient
         # to rely on AC_PROG_CC which is called later?
@@ -1267,7 +1283,7 @@
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:1271: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:1287: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1294,7 +1310,7 @@
 fi
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:1298: checking whether build environment is sane" >&5
+echo "configure:1314: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -1333,7 +1349,7 @@
 echo "$ac_t""yes" 1>&6
 missing_dir=`cd $ac_aux_dir && pwd`
 echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:1337: checking for working aclocal" >&5
+echo "configure:1353: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1346,7 +1362,7 @@
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1350: checking for working autoconf" >&5
+echo "configure:1366: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1359,7 +1375,7 @@
 fi
 
 echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:1363: checking for working automake" >&5
+echo "configure:1379: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1372,7 +1388,7 @@
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1376: checking for working autoheader" >&5
+echo "configure:1392: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1387,7 +1403,7 @@
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1391: checking for $ac_word" >&5
+echo "configure:1407: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1417,7 +1433,7 @@
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1421: checking for $ac_word" >&5
+echo "configure:1437: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1468,7 +1484,7 @@
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1472: checking for $ac_word" >&5
+echo "configure:1488: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1500,7 +1516,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1504: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1520: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1511,12 +1527,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 1515 "configure"
+#line 1531 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1542,12 +1558,12 @@
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1546: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1562: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1551: checking whether we are using GNU C" >&5
+echo "configure:1567: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1556,7 +1572,7 @@
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1560: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1576: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1575,7 +1591,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1579: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1595: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1607,7 +1623,7 @@
 fi
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1611: checking how to run the C preprocessor" >&5
+echo "configure:1627: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1622,13 +1638,13 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1626 "configure"
+#line 1642 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1632: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1648: \"$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
   :
@@ -1639,13 +1655,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1643 "configure"
+#line 1659 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1649: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1665: \"$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
   :
@@ -1656,13 +1672,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 1660 "configure"
+#line 1676 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1666: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1682: \"$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
   :
@@ -1687,7 +1703,7 @@
 echo "$ac_t""$CPP" 1>&6
 
 echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
-echo "configure:1691: checking for POSIXized ISC" >&5
+echo "configure:1707: checking for POSIXized ISC" >&5
 if test -d /etc/conf/kconfig.d &&
   grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
 then
@@ -1719,7 +1735,7 @@
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1723: checking for a BSD compatible install" >&5
+echo "configure:1739: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1776,7 +1792,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1780: checking for $ac_word" >&5
+echo "configure:1796: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1808,7 +1824,7 @@
 # Extract the first word of "docbook-to-man", so it can be a program name with args.
 set dummy docbook-to-man; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1812: checking for $ac_word" >&5
+echo "configure:1828: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DOCBOOK_TO_MAN'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1844,7 +1860,37 @@
   HAVE_DOCBOOK_TO_MAN_TRUE='#'
   HAVE_DOCBOOK_TO_MAN_FALSE=
 fi
+ echo $ac_n "checking for faqprog.pl""... $ac_c" 1>&6
+echo "configure:1865: checking for faqprog.pl" >&5
+    if faqprog.pl -V 2>/dev/null | grep '^faqprog.pl ' >/dev/null 2>&1; then
+        working_faqprog=yes
+        FAQPROG="faqprog.pl"
+    else 
+	working_faqprog=no
+        FAQPROG=": "
+    fi
+    echo "$ac_t""$working_faqprog" 1>&6
+    
+    
 
+if test "$working_faqprog" = "yes" ; then
+  WORKING_FAQPROG_TRUE=
+  WORKING_FAQPROG_FALSE='#'
+else
+  WORKING_FAQPROG_TRUE='#'
+  WORKING_FAQPROG_FALSE=
+fi
+
+    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
+***" 1>&2
+    fi
+  
 
 MPI_OPT_FLAGS=""
 
@@ -1852,7 +1898,7 @@
 try_gettext=yes
 try_gdbm=yes
 case "${target}" in
-    *-*-mingw32)
+    *-*-mingw32*)
         # special stuff for Windoze NT
         ac_cv_have_dev_random=no
         cat >> confdefs.h <<\EOF
@@ -1930,7 +1976,7 @@
 
 
 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1934: checking for BSD-compatible nm" >&5
+echo "configure:1980: 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
@@ -1966,7 +2012,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:1970: checking command to parse $NM output" >&5
+echo "configure:2016: 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
@@ -2029,10 +2075,10 @@
 #endif
 int main(){nm_test_var='a';nm_test_func;return 0;}
 EOF
-if { (eval echo configure:2033: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2079: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   # Now try to grab the symbols.
   ac_nlist=conftest.nm
-  if { (eval echo configure:2036: \"$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: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
 
     # Try sorting and uniquifying the output.
     if sort "$ac_nlist" | uniq > "$ac_nlist"T; then
@@ -2090,7 +2136,7 @@
         ac_save_CFLAGS="$CFLAGS"
         LIBS="conftestm.$ac_objext"
         CFLAGS="$CFLAGS$no_builtin_flag"
-        if { (eval echo configure:2094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+        if { (eval echo configure:2140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
           ac_pipe_works=yes
         else
           echo "configure: failed program was:" >&5
@@ -2141,7 +2187,7 @@
 
 if test "$tmp_do_check" = "yes"; then
 echo $ac_n "checking for _ prefix in compiled symbols""... $ac_c" 1>&6
-echo "configure:2145: checking for _ prefix in compiled symbols" >&5
+echo "configure:2191: 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
@@ -2150,10 +2196,10 @@
 void nm_test_func(){}
 int main(){nm_test_func;return 0;}
 EOF
-if { (eval echo configure:2154: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2200: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   # Now try to grab the symbols.
   ac_nlist=conftest.nm
-  if { (eval echo configure:2157: \"$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: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
     # See whether the symbols have a leading underscore.
     if egrep '^_nm_test_func' "$ac_nlist" >/dev/null; then
       ac_cv_sys_symbol_underscore=yes
@@ -2177,7 +2223,7 @@
 
 else
 echo $ac_n "checking for _ prefix in compiled symbols""... $ac_c" 1>&6
-echo "configure:2181: checking for _ prefix in compiled symbols" >&5
+echo "configure:2227: 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
@@ -2188,7 +2234,7 @@
 fi
 
  echo $ac_n "checking for option to create PIC""... $ac_c" 1>&6
-echo "configure:2192: checking for option to create PIC" >&5
+echo "configure:2238: checking for option to create PIC" >&5
     CFLAGS_PIC=
     NO_PIC=no
     if test "$cross_compiling" = yes; then
@@ -2253,7 +2299,7 @@
     fi
   
  echo $ac_n "checking how to specify -export-dynamic""... $ac_c" 1>&6
-echo "configure:2257: checking how to specify -export-dynamic" >&5
+echo "configure:2303: checking how to specify -export-dynamic" >&5
     if test "$cross_compiling" = yes; then
       echo "$ac_t""assume none" 1>&6
       CFLAGS_EXPORTDYNAMIC=""
@@ -2263,7 +2309,7 @@
 else
   
       if { ac_try='${CC-cc} $CFLAGS -Wl,--version 2>&1 |
-                                          grep "GNU ld" >/dev/null'; { (eval echo configure:2267: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
+                                          grep "GNU ld" >/dev/null'; { (eval echo configure:2313: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
           # using gnu's linker
           gnupg_cv_export_dynamic="-Wl,-export-dynamic"
       else
@@ -2289,7 +2335,7 @@
 
 
 case "${target}" in
-    *-*-mingw32)
+    *-*-mingw32*)
         PRINTABLE_OS_NAME="MingW32"
         ;;
     i?86-emx-os2 | i?86-*-os2*emx )
@@ -2318,19 +2364,30 @@
     *-openbsd*)
         NAME_OF_DEV_RANDOM="/dev/srandom"
         NAME_OF_DEV_URANDOM="/dev/urandom"
-        DYNLINK_MOD_CFLAGS="-shared -rdynamic -fpic -Wl,-Bshareable -Wl,-x"
+        DYNLINK_MOD_CFLAGS="-shared -rdynamic $CFLAGS_PIC -Wl,-Bshareable -Wl,-x"
         ;;
 
     *-netbsd*)
         NAME_OF_DEV_RANDOM="/dev/random"
         NAME_OF_DEV_URANDOM="/dev/urandom"
-        DYNLINK_MOD_CFLAGS="-shared -rdynamic -fpic -Wl,-Bshareable -Wl,-x"
+        DYNLINK_MOD_CFLAGS="-shared -rdynamic $CFLAGS_PIC -Wl,-Bshareable -Wl,-x"
+        ;;
+
+    *-solaris*)
+        NAME_OF_DEV_RANDOM="/dev/random"
+        NAME_OF_DEV_URANDOM="/dev/random"
+        DYNLINK_MOD_CFLAGS="-shared $CFLAGS_PIC"
         ;;
 
     *)
         NAME_OF_DEV_RANDOM="/dev/random"
         NAME_OF_DEV_URANDOM="/dev/urandom"
-        DYNLINK_MOD_CFLAGS="-shared $CFLAGS_PIC"
+        # -shared is a gcc-ism.  Find pic flags from GNUPG_CHECK_PIC.
+        if test -n "$GCC" ; then
+           DYNLINK_MOD_CFLAGS="-shared $CFLAGS_PIC"                            
+        else
+           DYNLINK_MOD_CFLAGS="$CFLAGS_PIC"
+        fi
         ;;
 esac
 cat >> confdefs.h <<EOF
@@ -2349,7 +2406,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:2353: checking for $ac_word" >&5
+echo "configure:2410: 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
@@ -2377,12 +2434,12 @@
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2381: checking for ANSI C header files" >&5
+echo "configure:2438: 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 2386 "configure"
+#line 2443 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -2390,7 +2447,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2394: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2451: \"$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*
@@ -2407,7 +2464,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 2411 "configure"
+#line 2468 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -2425,7 +2482,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 2429 "configure"
+#line 2486 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -2446,7 +2503,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 2450 "configure"
+#line 2507 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -2457,7 +2514,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:2461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -2481,12 +2538,12 @@
 fi
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:2485: checking for working const" >&5
+echo "configure:2542: 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 2490 "configure"
+#line 2547 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -2535,7 +2592,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2539: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2596: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -2556,21 +2613,21 @@
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:2560: checking for inline" >&5
+echo "configure:2617: 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 2567 "configure"
+#line 2624 "configure"
 #include "confdefs.h"
 
 int main() {
 } int $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:2574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2631: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -2596,12 +2653,12 @@
 esac
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:2600: checking for off_t" >&5
+echo "configure:2657: 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 2605 "configure"
+#line 2662 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2629,12 +2686,12 @@
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:2633: checking for size_t" >&5
+echo "configure:2690: 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 2638 "configure"
+#line 2695 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2664,19 +2721,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:2668: checking for working alloca.h" >&5
+echo "configure:2725: 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 2673 "configure"
+#line 2730 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 void *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:2680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2737: \"$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
@@ -2697,12 +2754,12 @@
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:2701: checking for alloca" >&5
+echo "configure:2758: 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 2706 "configure"
+#line 2763 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -2730,7 +2787,7 @@
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:2734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2791: \"$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
@@ -2762,12 +2819,12 @@
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:2766: checking whether alloca needs Cray hooks" >&5
+echo "configure:2823: 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 2771 "configure"
+#line 2828 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -2792,12 +2849,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:2796: checking for $ac_func" >&5
+echo "configure:2853: 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 2801 "configure"
+#line 2858 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2820,7 +2877,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2881: \"$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
@@ -2847,7 +2904,7 @@
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:2851: checking stack direction for C alloca" >&5
+echo "configure:2908: 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
@@ -2855,7 +2912,7 @@
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 2859 "configure"
+#line 2916 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -2874,7 +2931,7 @@
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:2878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2935: \"$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
@@ -2899,17 +2956,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2903: checking for $ac_hdr" >&5
+echo "configure:2960: 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 2908 "configure"
+#line 2965 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2913: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2970: \"$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*
@@ -2938,12 +2995,12 @@
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2942: checking for $ac_func" >&5
+echo "configure:2999: 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 2947 "configure"
+#line 3004 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2966,7 +3023,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3027: \"$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
@@ -2991,7 +3048,7 @@
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:2995: checking for working mmap" >&5
+echo "configure:3052: 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
@@ -2999,7 +3056,7 @@
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 3003 "configure"
+#line 3060 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -3142,7 +3199,7 @@
 }
 
 EOF
-if { (eval echo configure:3146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3203: \"$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
@@ -3170,17 +3227,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3174: checking for $ac_hdr" >&5
+echo "configure:3231: 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 3179 "configure"
+#line 3236 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3184: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3241: \"$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*
@@ -3210,12 +3267,12 @@
 strdup __argz_count __argz_stringify __argz_next
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3214: checking for $ac_func" >&5
+echo "configure:3271: 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 3219 "configure"
+#line 3276 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3238,7 +3295,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3299: \"$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
@@ -3267,12 +3324,12 @@
      for ac_func in stpcpy
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3271: checking for $ac_func" >&5
+echo "configure:3328: 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 3333 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3295,7 +3352,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:3356: \"$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
@@ -3329,19 +3386,19 @@
 
    if test $ac_cv_header_locale_h = yes; then
     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:3333: checking for LC_MESSAGES" >&5
+echo "configure:3390: 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 3338 "configure"
+#line 3395 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 return LC_MESSAGES
 ; return 0; }
 EOF
-if { (eval echo configure:3345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3402: \"$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
@@ -3362,7 +3419,7 @@
     fi
   fi
    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-echo "configure:3366: checking whether NLS is requested" >&5
+echo "configure:3423: 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"
@@ -3382,7 +3439,7 @@
 EOF
 
       echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
-echo "configure:3386: checking whether included gettext is requested" >&5
+echo "configure:3443: 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"
@@ -3401,17 +3458,17 @@
 
 	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
-echo "configure:3405: checking for libintl.h" >&5
+echo "configure:3462: 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 3410 "configure"
+#line 3467 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3415: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3472: \"$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*
@@ -3428,19 +3485,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:3432: checking for gettext in libc" >&5
+echo "configure:3489: 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 3437 "configure"
+#line 3494 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 int main() {
 return (int) gettext ("")
 ; return 0; }
 EOF
-if { (eval echo configure:3444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3501: \"$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
@@ -3456,7 +3513,7 @@
 
 	   if test "$gt_cv_func_gettext_libc" != "yes"; then
 	     echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
-echo "configure:3460: checking for bindtextdomain in -lintl" >&5
+echo "configure:3517: 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
@@ -3464,7 +3521,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3468 "configure"
+#line 3525 "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
@@ -3475,7 +3532,7 @@
 bindtextdomain()
 ; return 0; }
 EOF
-if { (eval echo configure:3479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3536: \"$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
@@ -3491,12 +3548,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:3495: checking for gettext in libintl" >&5
+echo "configure:3552: 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:3500: checking for gettext in -lintl" >&5
+echo "configure:3557: 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
@@ -3504,7 +3561,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3508 "configure"
+#line 3565 "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
@@ -3515,7 +3572,7 @@
 gettext()
 ; return 0; }
 EOF
-if { (eval echo configure:3519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3576: \"$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
@@ -3554,7 +3611,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:3558: checking for $ac_word" >&5
+echo "configure:3615: 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
@@ -3588,12 +3645,12 @@
 		for ac_func in dcgettext
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3592: checking for $ac_func" >&5
+echo "configure:3649: 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 3597 "configure"
+#line 3654 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3616,7 +3673,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3677: \"$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
@@ -3643,7 +3700,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:3647: checking for $ac_word" >&5
+echo "configure:3704: 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
@@ -3679,7 +3736,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:3683: checking for $ac_word" >&5
+echo "configure:3740: 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
@@ -3711,7 +3768,7 @@
 fi
 
 		cat > conftest.$ac_ext <<EOF
-#line 3715 "configure"
+#line 3772 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -3719,7 +3776,7 @@
 			       return _nl_msg_cat_cntr
 ; return 0; }
 EOF
-if { (eval echo configure:3723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   CATOBJEXT=.gmo
 		   DATADIRNAME=share
@@ -3742,7 +3799,7 @@
 
         if test "$CATOBJEXT" = "NONE"; then
 	  echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6
-echo "configure:3746: checking whether catgets can be used" >&5
+echo "configure:3803: 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"
@@ -3755,7 +3812,7 @@
 
 	  if test "$nls_cv_use_catgets" = "yes"; then
 	    	    echo $ac_n "checking for main in -li""... $ac_c" 1>&6
-echo "configure:3759: checking for main in -li" >&5
+echo "configure:3816: 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
@@ -3763,14 +3820,14 @@
   ac_save_LIBS="$LIBS"
 LIBS="-li  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3767 "configure"
+#line 3824 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:3774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3831: \"$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
@@ -3798,12 +3855,12 @@
 fi
 
 	    echo $ac_n "checking for catgets""... $ac_c" 1>&6
-echo "configure:3802: checking for catgets" >&5
+echo "configure:3859: 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 3807 "configure"
+#line 3864 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char catgets(); below.  */
@@ -3826,7 +3883,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3887: \"$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
@@ -3848,7 +3905,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:3852: checking for $ac_word" >&5
+echo "configure:3909: 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
@@ -3884,7 +3941,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:3888: checking for $ac_word" >&5
+echo "configure:3945: 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
@@ -3921,7 +3978,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:3925: checking for $ac_word" >&5
+echo "configure:3982: 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
@@ -3956,7 +4013,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:3960: checking for $ac_word" >&5
+echo "configure:4017: 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
@@ -4014,7 +4071,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:4018: checking for $ac_word" >&5
+echo "configure:4075: 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
@@ -4048,7 +4105,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:4052: checking for $ac_word" >&5
+echo "configure:4109: 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
@@ -4084,7 +4141,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:4088: checking for $ac_word" >&5
+echo "configure:4145: 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
@@ -4177,7 +4234,7 @@
        LINGUAS=
      else
        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
-echo "configure:4181: checking for catalogs to be installed" >&5
+echo "configure:4238: checking for catalogs to be installed" >&5
        NEW_LINGUAS=
        for lang in ${LINGUAS=$ALL_LINGUAS}; do
          case "$ALL_LINGUAS" in
@@ -4205,17 +4262,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:4209: checking for linux/version.h" >&5
+echo "configure:4266: 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 4214 "configure"
+#line 4271 "configure"
 #include "confdefs.h"
 #include <linux/version.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4219: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4276: \"$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*
@@ -4291,17 +4348,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4295: checking for $ac_hdr" >&5
+echo "configure:4352: 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 4300 "configure"
+#line 4357 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4305: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4362: \"$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*
@@ -4329,7 +4386,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:4333: checking for gdbm_firstkey in -lgdbm" >&5
+echo "configure:4390: 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
@@ -4337,7 +4394,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgdbm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4341 "configure"
+#line 4398 "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
@@ -4348,7 +4405,7 @@
 gdbm_firstkey()
 ; return 0; }
 EOF
-if { (eval echo configure:4352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4409: \"$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
@@ -4380,7 +4437,7 @@
 
 
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:4384: checking for gethostbyname in -lnsl" >&5
+echo "configure:4441: 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
@@ -4388,7 +4445,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4392 "configure"
+#line 4449 "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
@@ -4399,7 +4456,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:4403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4460: \"$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
@@ -4427,7 +4484,7 @@
 fi
 
 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:4431: checking for socket in -lsocket" >&5
+echo "configure:4488: 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
@@ -4435,7 +4492,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4439 "configure"
+#line 4496 "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
@@ -4446,7 +4503,7 @@
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:4450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4507: \"$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
@@ -4472,7 +4529,7 @@
 fi
 if test x$ac_try_nsl = x1; then
     echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:4476: checking for gethostbyname in -lnsl" >&5
+echo "configure:4533: 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
@@ -4480,7 +4537,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4484 "configure"
+#line 4541 "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
@@ -4491,7 +4548,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:4495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4552: \"$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
@@ -4520,7 +4577,7 @@
 
 if test "$try_dynload" = yes ; then
   echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:4524: checking for dlopen in -ldl" >&5
+echo "configure:4581: 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
@@ -4528,7 +4585,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4532 "configure"
+#line 4589 "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
@@ -4539,7 +4596,7 @@
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:4543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4600: \"$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
@@ -4581,12 +4638,12 @@
     for ac_func in dlopen
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4585: checking for $ac_func" >&5
+echo "configure:4642: 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 4590 "configure"
+#line 4647 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4609,7 +4666,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4670: \"$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
@@ -4646,7 +4703,7 @@
       use_gnupg_extensions=yes
     else
       echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:4650: checking for shl_load in -ldld" >&5
+echo "configure:4707: 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
@@ -4654,7 +4711,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldld  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4658 "configure"
+#line 4715 "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
@@ -4665,7 +4722,7 @@
 shl_load()
 ; return 0; }
 EOF
-if { (eval echo configure:4669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4726: \"$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
@@ -4708,7 +4765,7 @@
   fi
 else
   echo $ac_n "checking for dynamic loading""... $ac_c" 1>&6
-echo "configure:4712: checking for dynamic loading" >&5
+echo "configure:4769: checking for dynamic loading" >&5
   DYNLINK_LDFLAGS=
   DYNLINK_MOD_CFLAGS=
   use_gnupg_extensions=no
@@ -4729,12 +4786,12 @@
 
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:4733: checking for ANSI C header files" >&5
+echo "configure:4790: 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 4738 "configure"
+#line 4795 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -4742,7 +4799,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4746: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4803: \"$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*
@@ -4759,7 +4816,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 4763 "configure"
+#line 4820 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -4777,7 +4834,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 4781 "configure"
+#line 4838 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -4798,7 +4855,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 4802 "configure"
+#line 4859 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -4809,7 +4866,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:4813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -4836,17 +4893,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4840: checking for $ac_hdr" >&5
+echo "configure:4897: 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 4845 "configure"
+#line 4902 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4850: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4907: \"$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*
@@ -4875,12 +4932,12 @@
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:4879: checking for working const" >&5
+echo "configure:4936: 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 4884 "configure"
+#line 4941 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -4929,7 +4986,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4933: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4990: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -4950,21 +5007,21 @@
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:4954: checking for inline" >&5
+echo "configure:5011: 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 4961 "configure"
+#line 5018 "configure"
 #include "confdefs.h"
 
 int main() {
 } int $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:4968: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5025: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -4990,12 +5047,12 @@
 esac
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:4994: checking for size_t" >&5
+echo "configure:5051: 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 4999 "configure"
+#line 5056 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -5023,12 +5080,12 @@
 fi
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:5027: checking return type of signal handlers" >&5
+echo "configure:5084: 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 5032 "configure"
+#line 5089 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -5045,7 +5102,7 @@
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:5049: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5106: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -5064,12 +5121,12 @@
 
 
 echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
-echo "configure:5068: checking for sys_siglist declaration in signal.h or unistd.h" >&5
+echo "configure:5125: 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 5073 "configure"
+#line 5130 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -5081,7 +5138,7 @@
 char *msg = *(sys_siglist + 1);
 ; return 0; }
 EOF
-if { (eval echo configure:5085: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_decl_sys_siglist=yes
 else
@@ -5106,14 +5163,14 @@
         echo "configure: warning: cross compiling; assuming little endianess" 1>&2
     fi
     echo $ac_n "checking endianess""... $ac_c" 1>&6
-echo "configure:5110: checking endianess" >&5
+echo "configure:5167: 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 5117 "configure"
+#line 5174 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
         #include <sys/param.h>
@@ -5124,11 +5181,11 @@
         #endif
 ; return 0; }
 EOF
-if { (eval echo configure:5128: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5185: \"$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 5132 "configure"
+#line 5189 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
         #include <sys/param.h>
@@ -5139,7 +5196,7 @@
         #endif
 ; return 0; }
 EOF
-if { (eval echo configure:5143: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5200: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   gnupg_cv_c_endian=big
 else
@@ -5160,7 +5217,7 @@
             
 else
   cat > conftest.$ac_ext <<EOF
-#line 5164 "configure"
+#line 5221 "configure"
 #include "confdefs.h"
 main () {
               /* Are we little or big endian?  From Harbison&Steele.  */
@@ -5173,7 +5230,7 @@
               exit (u.c[sizeof (long) - 1] == 1);
               }
 EOF
-if { (eval echo configure:5177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5234: \"$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
@@ -5205,12 +5262,12 @@
 
 
  echo $ac_n "checking for byte typedef""... $ac_c" 1>&6
-echo "configure:5209: checking for byte typedef" >&5
+echo "configure:5266: 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 5214 "configure"
+#line 5271 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
     #include <sys/types.h>
@@ -5221,7 +5278,7 @@
     
 ; return 0; }
 EOF
-if { (eval echo configure:5225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5282: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   gnupg_cv_typedef_byte=yes
 else
@@ -5242,12 +5299,12 @@
     fi
   
  echo $ac_n "checking for ushort typedef""... $ac_c" 1>&6
-echo "configure:5246: checking for ushort typedef" >&5
+echo "configure:5303: 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 5251 "configure"
+#line 5308 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
     #include <sys/types.h>
@@ -5258,7 +5315,7 @@
     
 ; return 0; }
 EOF
-if { (eval echo configure:5262: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   gnupg_cv_typedef_ushort=yes
 else
@@ -5279,12 +5336,12 @@
     fi
   
  echo $ac_n "checking for ulong typedef""... $ac_c" 1>&6
-echo "configure:5283: checking for ulong typedef" >&5
+echo "configure:5340: 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 5288 "configure"
+#line 5345 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
     #include <sys/types.h>
@@ -5295,7 +5352,7 @@
     
 ; return 0; }
 EOF
-if { (eval echo configure:5299: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5356: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   gnupg_cv_typedef_ulong=yes
 else
@@ -5316,12 +5373,12 @@
     fi
   
  echo $ac_n "checking for u16 typedef""... $ac_c" 1>&6
-echo "configure:5320: checking for u16 typedef" >&5
+echo "configure:5377: 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 5325 "configure"
+#line 5382 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
     #include <sys/types.h>
@@ -5332,7 +5389,7 @@
     
 ; return 0; }
 EOF
-if { (eval echo configure:5336: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5393: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   gnupg_cv_typedef_u16=yes
 else
@@ -5353,12 +5410,12 @@
     fi
   
  echo $ac_n "checking for u32 typedef""... $ac_c" 1>&6
-echo "configure:5357: checking for u32 typedef" >&5
+echo "configure:5414: 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 5362 "configure"
+#line 5419 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
     #include <sys/types.h>
@@ -5369,7 +5426,7 @@
     
 ; return 0; }
 EOF
-if { (eval echo configure:5373: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5430: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   gnupg_cv_typedef_u32=yes
 else
@@ -5391,7 +5448,7 @@
   
 
 echo $ac_n "checking size of unsigned short""... $ac_c" 1>&6
-echo "configure:5395: checking size of unsigned short" >&5
+echo "configure:5452: 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
@@ -5399,7 +5456,7 @@
   ac_cv_sizeof_unsigned_short=2
 else
   cat > conftest.$ac_ext <<EOF
-#line 5403 "configure"
+#line 5460 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -5410,7 +5467,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:5414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5471: \"$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
@@ -5430,7 +5487,7 @@
 
 
 echo $ac_n "checking size of unsigned int""... $ac_c" 1>&6
-echo "configure:5434: checking size of unsigned int" >&5
+echo "configure:5491: 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
@@ -5438,7 +5495,7 @@
   ac_cv_sizeof_unsigned_int=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 5442 "configure"
+#line 5499 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -5449,7 +5506,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:5453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5510: \"$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
@@ -5469,7 +5526,7 @@
 
 
 echo $ac_n "checking size of unsigned long""... $ac_c" 1>&6
-echo "configure:5473: checking size of unsigned long" >&5
+echo "configure:5530: 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
@@ -5477,7 +5534,7 @@
   ac_cv_sizeof_unsigned_long=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 5481 "configure"
+#line 5538 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -5488,7 +5545,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:5492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5549: \"$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
@@ -5508,7 +5565,7 @@
 
 
 echo $ac_n "checking size of unsigned long long""... $ac_c" 1>&6
-echo "configure:5512: checking size of unsigned long long" >&5
+echo "configure:5569: 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
@@ -5516,7 +5573,7 @@
   ac_cv_sizeof_unsigned_long_long=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 5520 "configure"
+#line 5577 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -5527,7 +5584,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:5531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5588: \"$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
@@ -5556,12 +5613,12 @@
 
 
 echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:5560: checking for vprintf" >&5
+echo "configure:5617: 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 5565 "configure"
+#line 5622 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vprintf(); below.  */
@@ -5584,7 +5641,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5645: \"$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
@@ -5608,12 +5665,12 @@
 
 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:5612: checking for _doprnt" >&5
+echo "configure:5669: 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 5617 "configure"
+#line 5674 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt(); below.  */
@@ -5636,7 +5693,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5697: \"$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
@@ -5663,12 +5720,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:5667: checking for $ac_func" >&5
+echo "configure:5724: 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 5672 "configure"
+#line 5729 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5691,7 +5748,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5752: \"$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
@@ -5718,12 +5775,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:5722: checking for $ac_func" >&5
+echo "configure:5779: 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 5727 "configure"
+#line 5784 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5746,7 +5803,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5807: \"$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
@@ -5773,12 +5830,12 @@
 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:5777: checking for $ac_func" >&5
+echo "configure:5834: 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 5782 "configure"
+#line 5839 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5801,7 +5858,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5862: \"$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
@@ -5825,15 +5882,15 @@
 fi
 done
 
-for ac_func in waitpid wait4 sigaction sigprocmask
+for ac_func in waitpid wait4 sigaction sigprocmask fopen64 fstat64
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5832: checking for $ac_func" >&5
+echo "configure:5889: 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 5837 "configure"
+#line 5894 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5856,7 +5913,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5917: \"$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
@@ -5884,12 +5941,12 @@
  for ac_func in mlock
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5888: checking for $ac_func" >&5
+echo "configure:5945: 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 5893 "configure"
+#line 5950 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5912,7 +5969,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5973: \"$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
@@ -5941,17 +5998,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5945: checking for $ac_hdr" >&5
+echo "configure:6002: 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 5950 "configure"
+#line 6007 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5955: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6012: \"$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*
@@ -5980,7 +6037,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:5984: checking for memlk in -lrt" >&5
+echo "configure:6041: 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
@@ -5988,7 +6045,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lrt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5992 "configure"
+#line 6049 "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
@@ -5999,7 +6056,7 @@
 memlk()
 ; return 0; }
 EOF
-if { (eval echo configure:6003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6060: \"$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
@@ -6027,12 +6084,12 @@
 fi
 
             echo $ac_n "checking whether mlock is in sys/mman.h""... $ac_c" 1>&6
-echo "configure:6031: checking whether mlock is in sys/mman.h" >&5
+echo "configure:6088: 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 6036 "configure"
+#line 6093 "configure"
 #include "confdefs.h"
 
                     #include <assert.h>
@@ -6042,8 +6099,8 @@
                 
 int main() {
 
-                    mkdir ("foo", 0);
                     int i;
+
                     /* glibc defines this for functions which it implements
                      * to always fail with ENOSYS.  Some functions are actually
                      * named something starting with __ and the normal name
@@ -6057,7 +6114,7 @@
                 
 ; return 0; }
 EOF
-if { (eval echo configure:6061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6118: \"$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
@@ -6080,7 +6137,7 @@
     fi
     if test "$ac_cv_func_mlock" = "yes"; then
         echo $ac_n "checking whether mlock is broken""... $ac_c" 1>&6
-echo "configure:6084: checking whether mlock is broken" >&5
+echo "configure:6141: 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
@@ -6089,7 +6146,7 @@
            
 else
   cat > conftest.$ac_ext <<EOF
-#line 6093 "configure"
+#line 6150 "configure"
 #include "confdefs.h"
 
                 #include <stdlib.h>
@@ -6119,7 +6176,7 @@
 
             
 EOF
-if { (eval echo configure:6123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6180: \"$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
@@ -6153,17 +6210,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6157: checking for $ac_hdr" >&5
+echo "configure:6214: 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 6162 "configure"
+#line 6219 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6167: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6224: \"$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*
@@ -6190,12 +6247,12 @@
 done
 
 echo $ac_n "checking if mkdir takes one argument""... $ac_c" 1>&6
-echo "configure:6194: checking if mkdir takes one argument" >&5
+echo "configure:6251: 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 6199 "configure"
+#line 6256 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6212,7 +6269,7 @@
 mkdir ("foo", 0);
 ; return 0; }
 EOF
-if { (eval echo configure:6216: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6273: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   gnupg_cv_mkdir_takes_one_arg=no
 else
@@ -6239,17 +6296,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6243: checking for $ac_hdr" >&5
+echo "configure:6300: 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 6248 "configure"
+#line 6305 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6253: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6310: \"$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*
@@ -6277,7 +6334,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:6281: checking for cap_init in -lcap" >&5
+echo "configure:6338: 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
@@ -6285,7 +6342,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lcap  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6289 "configure"
+#line 6346 "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
@@ -6296,7 +6353,7 @@
 cap_init()
 ; return 0; }
 EOF
-if { (eval echo configure:6300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6357: \"$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
@@ -6344,17 +6401,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6348: checking for $ac_hdr" >&5
+echo "configure:6405: 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 6353 "configure"
+#line 6410 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6358: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6415: \"$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*
@@ -6382,7 +6439,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:6386: checking whether IPC_RMID allowes subsequent attaches" >&5
+echo "configure:6443: 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
@@ -6390,7 +6447,7 @@
   gnupg_cv_ipc_rmid_deferred_release="assume-no"
 else
   cat > conftest.$ac_ext <<EOF
-#line 6394 "configure"
+#line 6451 "configure"
 #include "confdefs.h"
 
              #include <sys/types.h>
@@ -6416,7 +6473,7 @@
              }
          
 EOF
-if { (eval echo configure:6420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6477: \"$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
@@ -6446,12 +6503,12 @@
        fi
 
        echo $ac_n "checking whether SHM_LOCK is available""... $ac_c" 1>&6
-echo "configure:6450: checking whether SHM_LOCK is available" >&5
+echo "configure:6507: 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 6455 "configure"
+#line 6512 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
              #include <sys/ipc.h>
@@ -6463,7 +6520,7 @@
              
 ; return 0; }
 EOF
-if { (eval echo configure:6467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6524: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   gnupg_cv_ipc_have_shm_lock="yes"
 else
@@ -6497,11 +6554,11 @@
 
 if test "$try_dev_random" = yes ; then
     echo $ac_n "checking for random device""... $ac_c" 1>&6
-echo "configure:6501: checking for random device" >&5
+echo "configure:6558: 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
-  if test -c "$NAME_OF_DEV_RANDOM" && test -c "$NAME_OF_DEV_URANDOM" ; then
+  if test -r "$NAME_OF_DEV_RANDOM" && test -r "$NAME_OF_DEV_URANDOM" ; then
       ac_cv_have_dev_random=yes; else ac_cv_have_dev_random=no; fi
 fi
 
@@ -6514,7 +6571,7 @@
     fi
 else
     echo $ac_n "checking for random device""... $ac_c" 1>&6
-echo "configure:6518: checking for random device" >&5
+echo "configure:6575: checking for random device" >&5
     ac_cv_have_dev_random=no
     echo "$ac_t""has been disabled" 1>&6
 fi
@@ -6524,17 +6581,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6528: checking for $ac_hdr" >&5
+echo "configure:6585: 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 6533 "configure"
+#line 6590 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6538: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6595: \"$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*
@@ -6561,7 +6618,7 @@
 done
 
     echo $ac_n "checking for random device ioctl""... $ac_c" 1>&6
-echo "configure:6565: checking for random device ioctl" >&5
+echo "configure:6622: 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
@@ -6589,7 +6646,7 @@
       static_random_module="rndlinux"
   else
       case "${target}" in
-          *-*-mingw32)
+          *-*-mingw32*)
               static_random_module="rndw32"
               cat >> confdefs.h <<\EOF
 #define USE_STATIC_RNDW32 1
@@ -6715,7 +6772,7 @@
 
 
 echo $ac_n "checking for mpi assembler functions""... $ac_c" 1>&6
-echo "configure:6719: checking for mpi assembler functions" >&5
+echo "configure:6776: 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
@@ -6757,17 +6814,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6761: checking for $ac_hdr" >&5
+echo "configure:6818: 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 6766 "configure"
+#line 6823 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6771: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6828: \"$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*
@@ -6795,7 +6852,7 @@
 
   if test "$ac_cv_header_zlib_h" = yes ; then
       echo $ac_n "checking for deflateInit2_ in -lz""... $ac_c" 1>&6
-echo "configure:6799: checking for deflateInit2_ in -lz" >&5
+echo "configure:6856: 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
@@ -6803,7 +6860,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lz  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6807 "configure"
+#line 6864 "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
@@ -6814,7 +6871,7 @@
 deflateInit2_()
 ; return 0; }
 EOF
-if { (eval echo configure:6818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6875: \"$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
@@ -6905,7 +6962,7 @@
  
   
 
-
+ 
     if ${MAKE-make} --version 2>/dev/null | grep '^GNU ' >/dev/null 2>&1; then
         :
     else
@@ -7110,6 +7167,9 @@
 s%@DOCBOOK_TO_MAN@%$DOCBOOK_TO_MAN%g
 s%@HAVE_DOCBOOK_TO_MAN_TRUE@%$HAVE_DOCBOOK_TO_MAN_TRUE%g
 s%@HAVE_DOCBOOK_TO_MAN_FALSE@%$HAVE_DOCBOOK_TO_MAN_FALSE%g
+s%@FAQPROG@%$FAQPROG%g
+s%@WORKING_FAQPROG_TRUE@%$WORKING_FAQPROG_TRUE%g
+s%@WORKING_FAQPROG_FALSE@%$WORKING_FAQPROG_FALSE%g
 s%@MPI_OPT_FLAGS@%$MPI_OPT_FLAGS%g
 s%@NM@%$NM%g
 s%@RANLIB@%$RANLIB%g
@@ -7437,10 +7497,16 @@
   #define G10_LOCALEDIR "c:/lib/gnupg/locale"
   #define GNUPG_LIBDIR  "c:/lib/gnupg"
   #define GNUPG_DATADIR "c:/lib/gnupg"
+  #define GNUPG_HOMEDIR "c:/gnupg"
 #else
   #define G10_LOCALEDIR "${prefix}/${DATADIRNAME}/locale"
   #define GNUPG_LIBDIR  "${libdir}/gnupg"
   #define GNUPG_DATADIR "${datadir}/gnupg"
+  #ifdef __VMS
+    #define GNUPG_HOMEDIR "/SYS\$LOGIN/gnupg" 
+  #else
+    #define GNUPG_HOMEDIR "~/.gnupg" 
+  #endif
 #endif
 G10EOF
 if cmp -s g10defs.h g10defs.tmp 2>/dev/null; then
diff -urN gnupg-1.0.2/configure.in gnupg-1.0.3/configure.in
--- gnupg-1.0.2/configure.in	Wed Jul 12 13:34:58 2000
+++ gnupg-1.0.3/configure.in	Thu Sep 14 14:20:26 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.19 $)dnl
+AC_REVISION($Revision: 1.103.2.24 $)dnl
 
 dnl Must reset CDPATH so that bash's cd does not print to stdout
 CDPATH=
@@ -49,6 +49,10 @@
       ;;
 esac
 
+AC_ARG_WITH(egd-socket,
+    [  --with-egd-socket=NAME  Use NAME for the EGD socket)],
+            egd_socket_name="$withval", egd_socket_name="" )
+AC_DEFINE_UNQUOTED(EGD_SOCKET_NAME, "$egd_socket_name")
 
 
 dnl
@@ -125,7 +129,7 @@
 dnl Setup some stuff depending on host/target.
 dnl
 case "${target}" in
-    *-*-mingw32)
+    *-*-mingw32*)
         # special stuff for Windoze NT
         # Do we need to set cross_compiling here or is it sufficient
         # to rely on AC_PROG_CC which is called later?
@@ -155,7 +159,7 @@
 AC_PROG_AWK
 AC_CHECK_PROG(DOCBOOK_TO_MAN, docbook-to-man, yes, no)
 AM_CONDITIONAL(HAVE_DOCBOOK_TO_MAN, test "$ac_cv_prog_DOCBOOK_TO_MAN" = yes)
-
+GNUPG_CHECK_FAQPROG
 
 MPI_OPT_FLAGS=""
 
@@ -163,7 +167,7 @@
 try_gettext=yes
 try_gdbm=yes
 case "${target}" in
-    *-*-mingw32)
+    *-*-mingw32*)
         # special stuff for Windoze NT
         ac_cv_have_dev_random=no
         AC_DEFINE(USE_ONLY_8DOT3)
@@ -225,7 +229,7 @@
 
 
 case "${target}" in
-    *-*-mingw32)
+    *-*-mingw32*)
         PRINTABLE_OS_NAME="MingW32"
         ;;
     i?86-emx-os2 | i?86-*-os2*emx )
@@ -253,19 +257,30 @@
     *-openbsd*)
         NAME_OF_DEV_RANDOM="/dev/srandom"
         NAME_OF_DEV_URANDOM="/dev/urandom"
-        DYNLINK_MOD_CFLAGS="-shared -rdynamic -fpic -Wl,-Bshareable -Wl,-x"
+        DYNLINK_MOD_CFLAGS="-shared -rdynamic $CFLAGS_PIC -Wl,-Bshareable -Wl,-x"
         ;;
 
     *-netbsd*)
         NAME_OF_DEV_RANDOM="/dev/random"
         NAME_OF_DEV_URANDOM="/dev/urandom"
-        DYNLINK_MOD_CFLAGS="-shared -rdynamic -fpic -Wl,-Bshareable -Wl,-x"
+        DYNLINK_MOD_CFLAGS="-shared -rdynamic $CFLAGS_PIC -Wl,-Bshareable -Wl,-x"
+        ;;
+
+    *-solaris*)
+        NAME_OF_DEV_RANDOM="/dev/random"
+        NAME_OF_DEV_URANDOM="/dev/random"
+        DYNLINK_MOD_CFLAGS="-shared $CFLAGS_PIC"
         ;;
 
     *)
         NAME_OF_DEV_RANDOM="/dev/random"
         NAME_OF_DEV_URANDOM="/dev/urandom"
-        DYNLINK_MOD_CFLAGS="-shared $CFLAGS_PIC"
+        # -shared is a gcc-ism.  Find pic flags from GNUPG_CHECK_PIC.
+        if test -n "$GCC" ; then
+           DYNLINK_MOD_CFLAGS="-shared $CFLAGS_PIC"                            
+        else
+           DYNLINK_MOD_CFLAGS="$CFLAGS_PIC"
+        fi
         ;;
 esac
 AC_DEFINE_UNQUOTED(NAME_OF_DEV_RANDOM, "$NAME_OF_DEV_RANDOM")
@@ -398,7 +413,7 @@
 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)
+AC_CHECK_FUNCS(waitpid wait4 sigaction sigprocmask fopen64 fstat64)
 
 GNUPG_CHECK_MLOCK
 GNUPG_FUNC_MKDIR_TAKES_ONE_ARG
@@ -442,7 +457,7 @@
 dnl
 if test "$try_dev_random" = yes ; then
     AC_CACHE_CHECK(for random device, ac_cv_have_dev_random,
-    [if test -c "$NAME_OF_DEV_RANDOM" && test -c "$NAME_OF_DEV_URANDOM" ; then
+    [if test -r "$NAME_OF_DEV_RANDOM" && test -r "$NAME_OF_DEV_URANDOM" ; then
       ac_cv_have_dev_random=yes; else ac_cv_have_dev_random=no; fi])
     if test "$ac_cv_have_dev_random" = yes; then
         AC_DEFINE(HAVE_DEV_RANDOM)
@@ -481,7 +496,7 @@
       static_random_module="rndlinux"
   else
       case "${target}" in
-          *-*-mingw32)
+          *-*-mingw32*)
               static_random_module="rndw32"
               AC_DEFINE(USE_STATIC_RNDW32)
               ;;
@@ -692,10 +707,16 @@
   #define G10_LOCALEDIR "c:/lib/gnupg/locale"
   #define GNUPG_LIBDIR  "c:/lib/gnupg"
   #define GNUPG_DATADIR "c:/lib/gnupg"
+  #define GNUPG_HOMEDIR "c:/gnupg"
 #else
   #define G10_LOCALEDIR "${prefix}/${DATADIRNAME}/locale"
   #define GNUPG_LIBDIR  "${libdir}/gnupg"
   #define GNUPG_DATADIR "${datadir}/gnupg"
+  #ifdef __VMS
+    #define GNUPG_HOMEDIR "/SYS\$LOGIN/gnupg" 
+  #else
+    #define GNUPG_HOMEDIR "~/.gnupg" 
+  #endif
 #endif
 G10EOF
 if cmp -s g10defs.h g10defs.tmp 2>/dev/null; then
diff -urN gnupg-1.0.2/doc/ChangeLog gnupg-1.0.3/doc/ChangeLog
--- gnupg-1.0.2/doc/ChangeLog	Wed Jul 12 13:32:09 2000
+++ gnupg-1.0.3/doc/ChangeLog	Thu Sep 14 14:20:39 2000
@@ -1,3 +1,8 @@
+Thu Sep 14 14:20:38 CEST 2000  Werner Koch  <wk@openit.de>
+
+        * faq.raw: New.
+        * Makefile.am: Support to build FAQs
+
 Wed Jul 12 13:32:06 CEST 2000  Werner Koch  <wk@>
 
   * gpg.sgml: Add a note about the availability of the GPH.
diff -urN gnupg-1.0.2/doc/DETAILS gnupg-1.0.3/doc/DETAILS
--- gnupg-1.0.2/doc/DETAILS	Mon Jul  3 13:59:08 2000
+++ gnupg-1.0.3/doc/DETAILS	Wed Sep  6 16:26:45 2000
@@ -125,9 +125,11 @@
 	The ASCII armor is corrupted.  No arguments yet.
 
     RSA_OR_IDEA
-	The RSA or IDEA algorithms has been used in the data.  A
+	The IDEA algorithms has been used in the data.  A
 	program might want to fallback to another program to handle
-	the data if GnuPG failed.
+	the data if GnuPG failed.  This status message used to be emitted
+        also for RSA but this has been dropped after the RSA patent expired.
+        However we can't change the name of the message.
 
     SHM_INFO
     SHM_GET
@@ -214,7 +216,7 @@
 	"char" is the character displayed with no --status-fd enabled, with
 	the linefeed replaced by an 'X'.  "cur" is the current amount
 	done and "total" is amount to be done; a "total" of 0 indicates that
-	the total amount is not known.  100/100 may be used to detect the
+	the total amount is not known.	100/100 may be used to detect the
 	end of operation.
 
     SIG_CREATED <type> <pubkey algo> <hash algo> <class> <timestamp> <key fpr>
@@ -225,6 +227,11 @@
 		   (only the first character should be checked)
 	    class: 2 hex digits with the signature class
 
+    SESSION_KEY  <algo>:<hexdigits>
+	The session key used to decrypt the message.  This message will
+	only be emmited when the special option --show-session-key
+	is used.  The format is suitable to be passed to the option
+	--override-session-key
 
 
 Key generation
diff -urN gnupg-1.0.2/doc/FAQ gnupg-1.0.3/doc/FAQ
--- gnupg-1.0.2/doc/FAQ	Tue Jul  4 18:53:44 2000
+++ gnupg-1.0.3/doc/FAQ	Thu Sep 14 11:35:29 2000
@@ -1,413 +1,660 @@
-	    GNU Privacy Guard -- Frequently Asked Questions
-	   =================================================
 
-  This FAQ is partly compiled from messages of the developers mailing list.
 
-  Many thanks to Kirk Fort, Brian Warner, ...
+GNUPG FREQUENTLY ASKED QUESTIONS
 
+Version: 0.1
+Last-Modified: Sep 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>
+
+The index is generated automatically, so there may be errors here.  Not
+all questions may be in the section they belong to. Suggestions about
+how to improve the structure of this FAQ are welcome.
+
+Please send additions and corrections to the maintainer. Don't send
+message like "This should be a FAQ - what's the answer?". If it hasn't
+been asked before, it isn't a FAQ. Otherwise, please provide the answer
+to be included here.
+
+
+
+ 1. GENERAL
+   1.1) What is GnuPG?
+   1.2) Is GnuPG compatible with PGP?
+
+ 2. SOURCES OF INFORMATION
+   2.1) Where can I find more information?
+   2.2) Where do I get GnuPG?
+
+ 3. INSTALLATION 
+   3.1) Which OSes does GnuPG run on?
+   3.2) Which random gatherer should I use?
+   3.3) How do I include support for RSA and IDEA?
+
+ 4. USAGE
+   4.1) What is the recommended key size?
+   4.2) Why does it sometimes take so long to create keys?
+   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?
+   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?
+   4.9) How can I get rid of the Version and Comment headers in armored
+	messages?
+   4.10) What does the "You are using the xxxx character set." mean?
+   4.11) How can a get list of key IDs used to encrypt a message?
+   4.12) I can't decrypt my symmetrical only (-c) encrypted message with
+	a new version of GnuPG.
+   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
+	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.
+
+ 6. PROBLEMS and ERROR MESSAGES
+   6.1) Why do I get "gpg: Warning: using insecure memory!"
+   6.2) In the edit menu the trust values is not displayed correctly after
+	signing uids - why?
+   6.3) An ElGamal signature does not verify anymore since version 1.0.2 ...
+   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?
+
+ 7. ADVANCED TOPICS
+   7.1) How does this whole thing work?
+   7.2) Why are some signatures with an ELG-E key valid?
+   7.3) How does the whole trust thing work?
+   7.4) What kind of output is this: "key C26EE891.298, uid 09FB: ...."?
+   7.5) How do I interpret some of the informational outputs?
+   7.6) Are the header lines of a cleartext signature part of the signed
+	material?
+
+ 8. ACKNOWLEDGEMENTS
+
+
+1. GENERAL
+
+1.1) What is GnuPG?
+
+    GnuPG stands for GNU Privacy Guard and <http://www.gnupg.org>
+    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
+    RFC 2440. As <http://www.gnupg.org/rfc2440.html>
+    such, it is aimed to be compatible with PGP from NAI Inc.
+
+1.2) Is GnuPG compatible with PGP?
+
+    In general, yes. GnuPG and newer PGP releases should be implementing
+    the OpenPGP standard. But there are some interoperability
+    problems. See questions 5.1ff. for details.
+
+2. SOURCES OF INFORMATION
+
+2.1) Where can I find more information?
+
+    Here's a list of on-line resources:  
+
+     <http://www.gnupg.org/docs.html> is the
+    documentation page. Have a look at the HOWTOs and the GNU Privacy
+    Handbook (GPH, available in English, Spanish and Russian). The
+    latter provides a detailed user's guide to GnuPG. You'll also find a
+    document about how to convert from PGP 2.x to GnuPG.
+
+     On <http://lists.gnupg.org> 
+    you'll find a searchable online archive of the GnuPG mailing lists.
+
+    *PLEASE:*
+    Before posting to a list, read this FAQ and the available
+    documentation. This way you help people focus on topics that have
+    not yet been resolved.
+
+2.2) Where do I get GnuPG?
+
+    You can download the GNU Privacy Guard from it's primary FTP server
+    ftp.gnupg.org or from
+    one of the mirrors: <http://www.gnupg.org/mirror.html>
+
+
+
+3. INSTALLATION 
+
+3.1) Which OSes does GnuPG run on?
+
+    It should run on most Unices as well as Windows 95 and Windows NT. A
+    list of OSes reported to be OK is presented at 
+    http://www.gnupg.org/gnupg.html#supsys .
+
+3.2) Which random gatherer should I use?
+
+    "Good" random numbers are crucial for the security of your
+    encryption. Different operating systems provide a variety of more or
+    less quality random data. Linux and *BSD provide kernel generated
+    random data through /dev/random - this should be the preferred
+    choice on these systems. Also Solaris users with the SUNWski package
+    installed have a /dev/random. In these cases, use the configure
+    option --enable-static-rnd=linux.
+
+    On other systems, the Entropy Gathering Daemon (EGD) is a good
+    choice. It is a perl-daemon that monitors system activity nad hashes
+    it into random data. See the download page <http://www.gnupg.org/download.html> 
+    how to obtain egd. Use --enable-static-rnd=egd here.
+
+    If the above options do not work, you can use the random number
+    generator "unix". This is *very* slow and should be
+    avoided. The random quality isn't very good so don't use it on
+    sensitive data.
+
+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.
+
+    However, there are unofficial modules to include both of them even
+    in earlier version of GnuPG. They're 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:
+    load-extension idea 
+    load-extension rsa
 
-  Q: How does this whole thing work?
-  A: To generate a secret/public keypair, run
-
-      gpg --gen-key
-
-  and choose the default values.
-
-  Data that is encrypted with a public key can only be decrypted by the
-  matching secret key.	The secret key is protected by a password, the
-  public key is not.
-
-  So to send your friend a message, you would encrypt your message with his
-  public key, and he would only be able to decrypt it by having the secret
-  key and putting in the password to use his secret key.
-
-  GnuPG is also useful for signing things.  Things that are encrypted with
-  the secret key can be decrypted with the public key. To sign something, a
-  hash is taken of the data, and then the hash is in some form encoded with
-  the secret key. If someone has your public key, they can verify that it
-  is from you and that it hasn't changed by checking the encoded form of
-  the hash with the public key.
-
-  A keyring is just a large file that stores keys. You have a public keyring
-  where you store yours and your friend's public keys.  You have a secret
-  keyring that you keep your secret key on, and be very careful with this
-  secret keyring: Never ever give anyone else access to it and use a *good*
-  passphrase to protect the data in it.
-
-  You can 'conventionally' encrypt something by using the option 'gpg -c'.
-  It is encrypted using a passphrase, and does not use public and secret
-  keys.  If the person you send the data to knows that passphrase, they can
-  decrypt it. This is usually most useful for encrypting things to
-  yourself, although you can encrypt things to your own public key in the
-  same way.  It should be used for communication with partners you know and
-  where it is easy to exchange the passphrases (e.g. with your boy friend or
-  your wife).  The advantage is that you can change the passphrase from time
-  to time and decrease the risk, that many old messages may be decrypted by
-  people who accidently got your passphrase.
-
-  You can add and copy keys to and from your keyring with the 'gpg --import'
-  and 'gpg --export' option. 'gpg --export-secret-keys' will export secret
-  keys. This is normally not useful, but you can generate the key on one
-  machine then move it to another machine.
-
-  Keys can be signed under the 'gpg --edit-key' option.  When you sign a
-  key, you are saying that you are certain that the key belongs to the
-  person it says it comes from.  You should be very sure that is really
-  that person:	You should verify the key fingerprint
-
-      gpg --fingerprint user-id
-
-  over phone (if you really know the voice of the other person) or at
-  a key signing party (which are often held at computer conferences)
-  or at a meeting of your local GNU/Linux User Group.
-
-  Hmm, what else.  You may use the option  "-o filename" to force output
-  to this filename (use "-" to force output to stdout). "-r" just lets you
-  specify the recipient (which public key you encrypt with) on the command
-  line instead of typing it interactively.
-
-  Oh yeah, this is important. By default all data is encrypted in some weird
-  binary format.  If you want to have things appear in ASCII text that is
-  readable, just add the '-a' option.  But the preferred method is to use
-  a MIME aware mail reader (Mutt, Pine and many more).
-
-  There is a small security glitch in the OpenPGP (and therefore GnuPG) system;
-  to avoid this you should always sign and encrypt a message instead of only
-  encrypting it.
+    These extensions are not available for the Windows version of GnuPG.
 
 
- Q: What is the recommended key size?
- A: 1024 bit for DSA signatures; even for plain ElGamal
+4. USAGE
+
+4.1) What is the recommended key size?
+
+    1024 bit for DSA signatures; even for plain ElGamal
     signatures this is sufficient as the size of the hash
-    is probably the weakest link if the keysize is larger
+    is probably the weakest link if the key size is larger
     than 1024 bits.  Encryption keys may have greater sizes,
     but you should than check the fingerprint of this key:
     "gpg --fingerprint --fingerprint <user ID>".
 
- Q: Why are some signatures with an ELG-E key valid?
- A: These are ElGamal Key generated by GnuPG in v3 (rfc1991)
-    packets.  The OpenPGP draft later changed the algorithm
-    identifier for ElGamal keys which are usable for signatures
-    and encryption from 16 to 20.  GnuPG now uses 20 when it
-    generates new ElGamal keys but still accept 16 (which is
-    according to OpenPGP "encryption only") if this key is in
-    a v3 packet.  GnuPG is the only program which had used
+4.2) Why does it sometimes take so long to create keys?
+
+    The problem here is that we need a lot of random bytes and for that
+    we (on Linux the /dev/random device) must collect some random data.
+    It is really not easy to fill the Linux internal entropy buffer; I
+    talked to Ted Ts'o and he commented that the best way to fill the
+    buffer is to play with your keyboard.  Good security has its price.
+    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).
+
+    Another problem might be another program which eats up your random
+    bytes (a program (look at your daemons) that reads from
+    /dev/[u]random).
+
+4.3) And it really takes long when I work on a remote system. Why?
+
+    Don't do this at all! You should never create keys or even use GnuPG
+    on a remote system because you normally have no physical control
+    over your secret key ring (which is in most cases vulnerable to
+    advanced dictionary attacks) - I strongly encourage everyone to only
+    create keys on a local computer (a disconnected laptop is probably
+    the best choice) and if you need it on your connected box (I know:
+    We all do this) be sure to have a strong password for your account
+    and for your secret key and that you can trust your system
+    administrator.
+
+    When I check GnuPG on a remote system via ssh (I have no Alpha here
+    ;-) I have the same problem.  It takes a *very* long time to create
+    the keys, so I use a special option, --quick-random, to generate
+    insecure keys which are only good for some tests.
+
+4.4) What is the difference between options and commands?
+
+    If you do a 'gpg --help', you will get two separate lists. The first
+    is a list of commands. The second is a list of options. Whenever you
+    run GPG, you *must* pick exactly one command (with one
+    exception, see below). You *may* pick one or more options.
+    The command should, just by convention, come at the end of the
+    argument list, after all the options. If the command takes a file
+    (all the basic ones do), the filename comes at the very end. So the
+    basic way to run gpg is: 
+
+    gpg [--option something] [--option2] [--option3 something] --command file 
+
+    Some options take arguments, for example the --output option (which
+    can be abbreviated -o) is an option that takes a filename. The
+    option's argument must follow immediately after the option itself,
+    otherwise gpg doesn't know which option the argument is supposed to
+    go with. As an option, --output and its filename must come before
+    the command. The --recipient (-r) option takes a name or keyid to
+    encrypt the message to, which must come right after the -r argument.
+    The --encrypt (or -e) command comes after all the options followed
+    by the file you wish to encrypt. So use 
+
+    gpg -r alice -o secret.txt -e test.txt 
+
+    If you write the options out in full, it is easier to read 
+
+    gpg --recipient alice --output secret.txt --encrypt test.txt 
+
+    If you're saving it in a file called ".txt" then you'd probably
+    expect to see ASCII-armored text in there, so you need to add the
+    --armor (-a) option, which doesn't take any arguments.  
+
+    gpg --armor --recipient alice --output secret.txt --encrypt test.txt
+
+    If you imagine square brackets around the optional parts, it becomes
+    a bit clearer: 
+
+    gpg [--armor] [--recipient alice] [--output secret.txt] --encrypt test.txt 
+
+    The optional parts can be rearranged any way you want.  
+
+    gpg --output secret.txt --recipient alice --armor --encrypt test.txt
+
+    If your filename begins with a hyphen (e.g. "-a.txt"), gnupg assumes
+    this is an option and may complain.  To avoid this you have either
+    to use "./-a.txt" or stop the option and command processing with two
+    hyphens: "-- -a.txt".
+
+    *The exception:* signing and encrypting at the same time. Use
+     gpg [--options] --sign --encrypt foo.txt 
+
+
+4.5) I can't delete an user id because it is already deleted on my public
+keying?
+
+    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
+    anyway.  Create a new user id with exactly the same name and you
+    will see that there are now two identical user ids on the secret
+    ring.  Now select this user id and delete it.  Both user ids will be
+    removed from the secret ring.
+
+4.6) What are trust, validity and ownertrust?
+
+    "ownertrust" is used instead of "trust" to make clear that this is
+    the value you have assigned to a key to express how much you trust
+    the owner of this key to correctly sign (and so introduce) other
+    keys.  "validity", or calculated trust, is a value which says how
+    much GnuPG thinks a key is valid (that it really belongs to the one
+    who claims to be the owner of the key).  For more see the chapter
+    "The Web of Trust" in the Manual.
+
+4.7) How do I sign a patch file?
+
+    Use "gpg --clearsign --not-dash-escaped ...".  The problem with
+    --clearsign is that all lines starting with a dash are quoted with
+    "- "; obviously diff produces many of lines starting with a dash and
+    these are then quoted and that is not good for patch ;-).  To use a
+    patch file without removing the cleartext signature, the special
+    option --not-dash-escaped may be used to suppress generation of
+    these escape sequences.  You should not mail such a patch because
+    spaces and line endings are also subject to the signature and a
+    mailer may not preserve these.  If you want to mail a file you can
+    simply sign it using your MUA.
+
+4.8) Where is the "encrypt-to-self" option?
+
+    Use "--encrypt-to your_keyid".  You can use more than one of these
+    options. To temporary override the use of this additional keys, you
+    can use the option "--no-encrypt-to".
+
+4.9) How can I get rid of the Version and Comment headers in armored
+messages?
+
+    Use "--no-version --comment ''".  Note that the left over blank line
+    is required by the protocol.
+
+4.10) What does the "You are using the xxxx character set." mean?
+
+    This note is printed when UTF8 mapping has to be done.  Make sure
+    that the displayed charset is the one you have activated on your
+    system "iso-8859-1" is the most used one, so this is the default.
+    You can change the charset with the option "--charset".  It is
+    important that you active character set matches the one displayed -
+    if not, restrict yourself to plain 7 bit ASCII and no mapping has to
+    be done.
+
+4.11) How can a get list of key IDs used to encrypt a message?
+
+     gpg --batch --decrypt --list-only --status-fd 1 2>/dev/null
+    \ | awk '/^\[GNUPG:\] ENC_TO / { print $3 }' 
+
+4.12) I can't decrypt my symmetrical only (-c) encrypted message with
+    a new version of GnuPG.
+
+    There used to be a bug in GnuPG < 1.0.1 which happens only if 3DES
+    or Twofish has been used for symmetric only encryption (this has
+    never been the default).  The bug has been fixed but to enable you
+    to decrypt old messages, you should run gpg with the option
+    "--emulate-3des-s2k-bug", decrypt the message and encrypt it again
+    without this option.  The option will be removed in 1.1, so better
+    re-encrypt your message now.
+
+4.13) How can I used GnuPG in an automated environment?
+
+    You should use the option --batch and don't use pass phrases as
+    there is usually no way to store it more secure than the secret
+    keyring itself. The suggested way to create the keys for the
+    automated environment is:
+
+     On a secure machine:
+      If you want to do automatic signing, create a signing
+    subkey for your key (edit menu, choose "addkey" and the DSA).  [H
+    LI] Make sure that you use a passphrase (Needed by the current
+    implementation)  gpg --export-secret-subkeys --no-comment foo
+    >secring.auto  Copy secring.auto and the public keyring to a
+    test directory.   Cd to this directory.   gpg --homedir
+    . --edit foo and use "passwd" to remove the pass-phrase from the
+    subkeys.  You may also want to remove all unused subkeys.  
+    copy secring.auto to a floppy and carry it to the target box 
+    On the target machine:   Install secring.auto as secret
+    keyring.   Now you can start your new service.  It is a good
+    idea to install some intrusion detection system so that you
+    hopefully get a notice of an successful intrusion, so that you in
+    turn can revoke all the subkeys installed on that machine and
+    install new subkeys.  
+
+
+
+5. COMPATIBILITY ISSUES 
+
+
+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:
+
+     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.
+
+5.2) 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: 
+
+    gpg -c --cipher-algo 3des --compress-algo 1 myfile 
+
+    You may replace "3des" by "cast5". "blowfish" does not work with all
+    versions of pgp5.  You may also want to put  compress-algo 1
+     into your ~/.gnupg/options file - this does not affect
+    normal gnupg operation.
+
+
+5.3) 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
+    for decryption).  To be more inter-operable, GnuPG (starting with
+    version 0.3.3) now also uses type 16 for the ElGamal subkey which is
+    created if the default key algorithm is chosen.  You may add an type
+    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?
+
+    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?
+
+    There is a script in the tools directory to help you: After you have
+    imported the PGP keyring you can give this command: 
+
+    $ lspgpot pgpkeyring | gpg --import-ownertrust 
+
+    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.
+
+    PGP probably bails out on some private comment packets used by
+    GnuPG.  These packets are fully in compliance with OpenPGP; however
+    PGP is not really OpenPGP aware.  A workaround is to export the
+    secret keys with this command: 
+     gpg --export-secret-keys --no-comment -a your-key-id 
+
+
+
+6. PROBLEMS and ERROR MESSAGES
+
+6.1) Why do I get "gpg: Warning: using insecure memory!"
+
+    On many systems this program should be installed as
+    setuid(root). This is necessary to lock memory pages.  Locking
+    memory pages prevents the operating system from writing memory pages
+    to disk and thereby keeping your secret keys really secret. If you
+    get no warning message about insecure memory your operating system
+    supports locking without being root. The program drops root
+    privileges as soon as locked memory is allocated.
+
+    If you can't or don't want to install GnuPG setuid(root), you can
+    use the option "--no-secmem-warning" or put 
+    no-secmem-warning  in your ~/.gnupg/options file.
+
+6.2) In the edit menu the trust values is not displayed correctly after
+signing uids - why?
+
+    This happens because the some informations are stored immediately in
+    the trustdb, but the actual trust calculation can be done after the
+    save command.  This is a not easy to fix design bug which will be
+    addressed in some future release.
+
+6.3) An ElGamal signature does not verify anymore since version 1.0.2 ...
+
+    Use the option --emulate-md-encode-bug.
+
+6.4) Old versions of GnuPG can't verify ElGamal signatures
+
+    Update to GnuPG 1.0.2 or newer.
+
+
+6.5) When I use --clearsign, the plain text has sometimes extra dashes 
+in it - why?
+
+    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. 
+
+    If you use GnuPG to process those emessage, the extra dashes are removed.
+    Good mail clients remove those extra dashes when displaying such a 
+    message.      
+
+
+
+7. ADVANCED TOPICS
+
+7.1) How does this whole thing work?
+
+    To generate a secret/public keypair, run  gpg --gen-key
+     and choose the default values.
+
+    Data that is encrypted with a public key can only be decrypted by
+    the matching secret key.  The secret key is protected by a password,
+    the public key is not.
+
+    So to send your friend a message, you would encrypt your message
+    with his public key, and he would only be able to decrypt it by
+    having the secret key and putting in the password to use his secret
+    key.
+
+    GnuPG is also useful for signing things.  Things that are encrypted
+    with the secret key can be decrypted with the public key. To sign
+    something, a hash is taken of the data, and then the hash is in some
+    form encoded with the secret key. If someone has your public key, they
+    can verify that it is from you and that it hasn't changed by checking
+    the encoded form of the hash with the public key.
+
+    A keyring is just a large file that stores keys. You have a public
+    keyring where you store yours and your friend's public keys.  You have
+    a secret keyring that you keep your secret key on, and be very careful
+    with this secret keyring: Never ever give anyone else access to it and
+    use a *good* passphrase to protect the data in it.
+
+    You can 'conventionally' encrypt something by using the option 'gpg
+    -c'.  It is encrypted using a passphrase, and does not use public and
+    secret keys.  If the person you send the data to knows that
+    passphrase, they can decrypt it. This is usually most useful for
+    encrypting things to yourself, although you can encrypt things to your
+    own public key in the same way.  It should be used for communication
+    with partners you know and where it is easy to exchange the
+    passphrases (e.g. with your boy friend or your wife).  The advantage
+    is that you can change the passphrase from time to time and decrease
+    the risk, that many old messages may be decrypted by people who
+    accidently got your passphrase.
+
+    You can add and copy keys to and from your keyring with the 'gpg
+    --import' and 'gpg --export' option. 'gpg --export-secret-keys' will
+    export secret keys. This is normally not useful, but you can generate
+    the key on one machine then move it to another machine.
+
+    Keys can be signed under the 'gpg --edit-key' option.  When you sign a
+    key, you are saying that you are certain that the key belongs to the
+    person it says it comes from.  You should be very sure that is really
+    that person: You should verify the key fingerprint
+        gpg --fingerprint user-id
+    over phone (if you really know the voice of the other person) or at a
+    key signing party (which are often held at computer conferences) or at
+    a meeting of your local GNU/Linux User Group.
+
+    Hmm, what else.  You may use the option "-o filename" to force output
+    to this filename (use "-" to force output to stdout). "-r" just lets
+    you specify the recipient (which public key you encrypt with) on the
+    command line instead of typing it interactively.
+
+    Oh yeah, this is important. By default all data is encrypted in some
+    weird binary format.  If you want to have things appear in ASCII text
+    that is readable, just add the '-a' option.  But the preferred method
+    is to use a MIME aware mail reader (Mutt, Pine and many more).
+
+    There is a small security glitch in the OpenPGP (and therefore GnuPG)
+    system; to avoid this you should always sign and encrypt a message
+    instead of only encrypting it.
+
+
+7.2) Why are some signatures with an ELG-E key valid?
+
+    These are ElGamal Key generated by GnuPG in v3 (rfc1991) packets.
+    The OpenPGP draft later changed the algorithm identifier for ElGamal
+    keys which are usable for signatures and encryption from 16 to 20.
+    GnuPG now uses 20 when it generates new ElGamal keys but still
+    accept 16 (which is according to OpenPGP "encryption only") if this
+    key is in a v3 packet.  GnuPG is the only program which had used
     these v3 ElGamal keys - so this assumption is quite safe.
 
- Q: Why is PGP 5.x not able to encrypt messages with some keys?
- A: PGP Inc refuses to accept ElGamal keys of type 20 even for
-    encryption.  They only support type 16 (which is identical
-    at least for decryption).  To be more inter-operable, GnuPG
-    (starting with version 0.3.3) now also uses type 16 for the
-    ElGamal subkey which is created if the default key algorithm
-    is chosen.	You may add an type 16 ElGamal key to your public
-    key which is easy as your key signatures are still valid.
-
- Q: Why is PGP 5.x not able to verify my messages?
- A: 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.
-
- Q: I can't delete an user id because it is already deleted on my
-    public keyring?
- A: 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 anyway.  Create a new user id with exactly the same name
-    and you will see that there are now two identical user ids on the
-    secret ring.  Now select this user id and delete it.  Both user
-    ids will be removed from the secret ring.
-
- Q: How can I encrypt a message so that pgp 2.x is able to decrypt it?
- A: 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:
-
-       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.
-
- Q: How can I conventional encrypt a message, so that PGP can decrypt it?
- A: You can't do this for PGP 2.  For PGP 5 you should use this:
-
-       gpg -c --cipher-algo 3des --compress-algo 1 myfile
-
-    You may replace "3des" by "cast5". "blowfish" does not work with
-    all versions of pgp5.  You may also want to put
-       compress-algo 1
-    into your ~/.gnupg/options file - this does not affect normal
-    gnupg operation.
-
-
-  Q: Why does it sometimes take so long to create keys?
-  A: The problem here is that we need a lot of random bytes and for that
-  we (on Linux the /dev/random device) must collect some random data.
-  It is really not easy to fill the Linux internal entropy buffer; I
-  talked to Ted Ts'o and he commented that the best way to fill the buffer
-  is to play with your keyboard.  Good security has its price.	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).
-
-  Another problem might be another program which eats up your random bytes
-  (a program (look at your daemons) that reads from /dev/[u]random).
-
-  Q: And it really takes long when I work on a remote system. Why?
-  A: Don't do this at all! You should never create keys or even use GnuPG
-  on a remote system because you normally have no physical control over
-  your secret keyring (which is in most cases vulnerable to advanced
-  dictionary attacks) - I strongly encourage everyone to only create keys
-  on a local computer (a disconnected laptop is probably the best choice)
-  and if you need it on your connected box (I know: We all do this) be
-  sure to have a strong password for your account and for your secret key
-  and that you can trust your system administrator.
-
-  When I check GnuPG on a remote system via ssh (I have no Alpha here ;-)
-  I have the same problem.  It takes a *very* long time to create the
-  keys, so I use a special option, --quick-random, to generate insecure
-  keys which are only good for some tests.
-
-
-  Q: How does the whole trust thing work?
-  A: It works more or less like PGP.  The difference is that the trust is
-  computed at the time it is needed. This is one of the reasons for the
-  trustdb which holds a list of valid key signatures.  If you are not
-  running in batch mode you will be asked to assign a trust parameter
-  (ownertrust) to a key.
-
-  You can see the validity (calculated trust value) using this command.
-
-      gpg --list-keys --with-colons
-
-  If the first field is "pub" or "uid", the second field shows you the trust:
-
-     o = Unknown (this key is new to the system)
-     e = The key has expired
-     q = Undefined (no value assigned)
-     n = Don't trust this key at all
-     m = There is marginal trust in this key
-     f = The key is full trusted
-     u = The key is ultimately trusted; this
-	 is only used for keys for which
-	 the secret key is also available.
-     r = The key has been revoked
-     d = The key has been disabled
-
-  The value in the "pub" record is the best one of all "uid" records.
-
-  You can get a list of the assigned trust values (how much you trust
-  the owner to correctly sign another person's key)
-
-      gpg --list-ownertrust
-
-  The first field is the fingerprint of the primary key, the second field
-  is the assigned value:
-
-      - = No Ownertrust value yet assigned.
-      n = Never trust this keyholder to correctly verify others signatures.
-      m = Have marginal trust in the keyholders capability to sign other keys.
-      f = Assume that the key holder really knows how to sign keys.
-      u = No need to trust ourself because we have the secret key.
-
-  Keep these values confidential because they express your opinions
-  about others.  PGP stores this information with the keyring thus
-  it is not a good idea to publish a PGP keyring instead of exporting the
-  keyring.  gnupg stores the trust in the trust-DB so it is okay
-  to give a gpg keyring away (but we have a --export command too).
-
-
-  Q: What is the difference between options and commands?
-  A: If you do a "gpg --help", you will get two separate lists. The first is
-  a list of commands. The second is a list of options. Whenever you run GPG,
-  you *must* pick exactly one command (**with one exception, see below). You
-  *may* pick one or more options.  The command should, just by convention,
-  come at the end of the argument list, after all the options. If the
-  command takes a file (all the basic ones do), the filename comes at the
-  very end. So the basic way to run gpg is:
-
-   gpg [--option something] [--option2] [--option3 something] --command file
-
-  Some options take arguments, for example the --output option (which can be
-  abbreviated -o) is an option that takes a filename. The option's argument
-  must follow immediately after the option itself, otherwise gpg doesn't know
-  which option the argument is supposed to go with. As an option, --output and
-  its filename must come before the command. The --recipient (-r) option takes
-  a name or keyid to encrypt the message to, which must come right after the -r
-  argument.  The --encrypt (or -e) command comes after all the options followed
-  by the file you wish to encrypt. So use
-
-   gpg -r alice -o secret.txt -e test.txt
-
-  If you write the options out in full, it is easier to read
-
-   gpg --recipient alice --output secret.txt --encrypt test.txt
-
-  If you're saving it in a file called ".txt" then you'd probably expect to see
-  ASCII-armored text in there, so you need to add the --armor (-a) option,
-  which doesn't take any arguments.
-
-   gpg --armor --recipient alice --output secret.txt --encrypt test.txt
-
-  If you imagine square brackets around the optional parts, it becomes a bit
-  clearer:
-
-   gpg [--armor] [--recipient alice] [--output secret.txt] --encrypt test.txt
-
-  The optional parts can be rearranged any way you want.
-
-   gpg --output secret.txt --recipient alice --armor --encrypt test.txt
-
-  If your filename begins with a hyphen (e.g. "-a.txt"), gnupg assumes this is
-  an option and may complain.  To avoid this you have either to use
-  "./-a.txt" or stop the option and command processing  with two hyphens:
-  "-- -a.txt".
-
-  ** the exception: signing and encrypting at the same time. Use
-
-   gpg [--options] --sign --encrypt foo.txt
-
-
-  Q: What kind of output is this: "key C26EE891.298, uid 09FB: ...."?
-  A: This is the internal representation of an user id in the trustdb.
-     "C26EE891" is the keyid, "298" is the local id (a record number
-     in the trustdb) and "09FB" is the last two bytes of a ripe-md-160
-     hash of the user id for this key.
-
-
-  Q: What is trust, validity and ownertrust?
-  A: "ownertrust" is used instead of "trust" to make clear that
-     this is the value you have assigned to a key to express how much you
-     trust the owner of this key to correctly sign (and so introduce)
-     other keys.  "validity", or calculated trust, is a value which
-     says how much GnuPG thinks a key is valid (that it really belongs
-     to the one who claims to be the owner of the key).
-     For more see the chapter "The Web of Trust" in the Manual.
-
-  Q: How do I interpret some of the informational outputs?
-  A: While checking the validity of a key, GnuPG sometimes prints
-     some information which is prefixed with information about
-     the checked item.
-	"key 12345678.3456"
-     This is about the key with key ID 12345678 and the internal
-     number 3456, which is the record number of the so called
-     directory record in the trustdb.
-	"uid 12345678.3456/ACDE"
-     This is about the user ID for the same key.  To identify the
-     user ID the last two bytes of a ripe-md-160 over the user ID
-     ring is printed.
-	"sig 12345678.3456/ACDE/9A8B7C6D"
-     This is about the signature with key ID 9A8B7C6D for the
-     above key and user ID, if it is a signature which is direct
-     on a key, the user ID part is empty (..//..).
-
-
-  Q: How do I sign a patch file?
-  A: Use "gpg --clearsign --not-dash-escaped ...".
-     The problem with --clearsign is that all lines starting with a dash are
-     quoted with "- "; obviously diff produces many of lines starting with a
-     dash and these are then quoted and that is not good for patch ;-).  To
-     use a patch file without removing the cleartext signature, the special
-     option --not-dash-escaped may be used to suppress generation of these
-     escape sequences.	You should not mail such a patch because spaces and
-     line endings are also subject to the signature and a mailer may not
-     preserve these.  If you want to mail a file you can simply sign it
-     using your MUA.
-
-
-  Q: Where is the "encrypt-to-self" option?
-  A: Use "--encrypt-to your_keyid".  You can use more than one
-     of these options. To temporary override the use of this additional
-     keys, you can use the option "--no-encrypt-to".
-
-
-  Q: How can I get rid of the Version and Comment headers in
-     armored messages?
-  A: Use "--no-version --comment ''".  Note that the left over blank line
-     is required by the protocol.
-
-
-  Q: What does the "You are using the xxxx character set." mean?
-  A: This note is printed when UTF8 mapping has to be done.  Make sure that
-     the displayed charset is the one you have activated on your system
-     "iso-8859-1" is the most used one, so this is the default.  You can
-     change the charset with the option "--charset".  It is important that
-     you active character set matches the one displayed - if not, restrict
-     yourself to plain 7 bit ASCII and no mapping has to be done.
-
-  Q: How do I transfer owner trust values from PGP to GnuPG?
-  A: There is a script in the tools directory to help you:
-     After you have imported the PGP keyring you can give this command:
-	$ lspgpot pgpkeyring | gpg --import-ownertrust
-     where pgpkeyring is the original keyring and not the GnuPG one you
-     might have created in the first step.
-
-  Q: Are the headerlines of a cleartext signature part of the signed
-     material?
-  A: No.  For example you can add or remove "Comment:" lines.  They
-     have a purpose like the mail header lines.  However a "Hash:"
-     line is needed for OpenPGG signatures to tell the parser which
-     hash algorithm to use.
-
-  Q: How can a get list of key IDs used to encrypt a message?
-  A: gpg --batch --decrypt --list-only --status-fd 1 2>/dev/null \
-	      | awk '/^\[GNUPG:\] ENC_TO / { print $3 }'
-
-
-  Q: PGP 5.x, 6.x does not like my secret key.
-  A: PGP probably bails out on some private comment packets used by GnuPG.
-     These packets are fully in compliance with OpenPGP; however PGP is not
-     really OpenPGP aware.  A workaround is to export the secret keys with
-     this command:
-
-	gpg --export-secret-keys --no-comment -a your-key-id
-
-  Q: I can't decrypt my symmetrical only (-c) encrypted message with
-     a new version of GnuPG.
-  A: There used to be a bug in GnuPG < 1.0.1 which happens only if 3DES or
-     Twofish has been used for symmetric only encryption (this has never been
-     the default).
-     The bug has been fixed but to enable you to decrypt old messages, you
-     should run gpg with the option "--emulate-3des-s2k-bug", decrypt the
-     message and encrypt it again without this option.	The option will
-     be removed in 1.1, so better re-encrypt your message now.
-
-  Q: How can I used GnuPG in an automated environment?
-  A: You should use the option --batch and don't use passphrases as
-     there is usually no way to store it more secure than the secret
-     keyring itself.  The suggested way to create the keys for the
-     automated environment is:
-	On a secure machine:
-	1. If you want to do automatic signing, create a signing subkey
-	   for your key (edit menu, choose "addkey" and the DSA).
-	2. Make sure that you use a passphrase (Needed by the current
-	   implementation)
-	3. gpg --export-secret-subkeys --no-comment foo >secring.auto
-	4. Copy secring.auto and the public keyring to a test directory.
-	5. Cd to this directory.
-	6. gpg --homedir . --edit foo
-	   and use "passwd" to remove the passphrase from the subkeys.
-	   You may also want to remove all unused subkeys.
-	7. copy secring.auto to a floppy and carry it to the
-	   target box
-	On the target machine:
-	8. Install secring.auto as secret keyring.
-	9. Now you can start your new service.	It is a good idea to
-	   install some intrusion detection system so that you hopefully
-	   get a notice of an successful intrusion, so that you in turn can
-	   revoke all the subkeys installed on that machine and install new
-	   subkeys.
-
-  Q: In the edit menu the trust values is not displayed correctly after
-     signing uids - why?
-  A: This happens because the some informations are stored immediately
-     in the trustdb, but the actual trust calculation can be done after
-     the save command.	This is a not easy to fix design bug which will be
-     addressed in GnuPG 1.1
 
-  Q: An Elgamal signature does not verify anymore since version 1.0.2
-  A: Use the option --emulate-md-encode-bug.
+7.3) How does the whole trust thing work?
+
+    It works more or less like PGP.  The difference is that the trust is
+    computed at the time it is needed. This is one of the reasons for
+    the trustdb which holds a list of valid key signatures.  If you are
+    not running in batch mode you will be asked to assign a trust
+    parameter (ownertrust) to a key.
+
+
+
+    You can see the validity (calculated trust value) using this
+    command.
+     gpg --list-keys --with-colons  
+
+    If the first field is "pub" or "uid", the second field shows you the
+    trust: 
+
+     o = Unknown (this key is new to the system) 
+     e = The key has expired 
+     q = Undefined (no value assigned) 
+     n = Don't trust    this key at all
+     m = There is marginal trust in this key 
+     f = The key    is full trusted 
+     u = The key is ultimately trusted; this is only used
+         for keys for which the secret key is also available.  
+     r = The key    has been revoked 
+     d = The key has been disabled 
+
+    The value in the "pub" record is the best one of all "uid" records.
+
+    You can get a list of the assigned trust values (how much you trust
+    the owner to correctly sign another person's key)
+
+     gpg --list-ownertrust  The first field is the
+    fingerprint of the primary key, the second field is the assigned
+    value: 
+
+     - = No Ownertrust value yet assigned.  
+     n = Never trust this keyholder to correctly verify others signatures.  
+     m = Have marginal trust in the keyholders capability to sign other
+         keys.  
+     f = Assume that the key holder really knows how to sign keys.  
+     u = No need to trust ourself because we have the secret key.  
+
+    Keep these values confidential because they express your opinions
+    about others.  PGP stores this information with the keyring thus it
+    is not a good idea to publish a PGP keyring instead of exporting the
+    keyring.  gnupg stores the trust in the trust-DB so it is okay to
+    give a gpg keyring away (but we have a --export command too).
+
+7.4) What kind of output is this: "key C26EE891.298, uid 09FB: ...."?
+
+    This is the internal representation of an user id in the trustdb.
+    "C26EE891" is the keyid, "298" is the local id (a record number in
+    the trustdb) and "09FB" is the last two bytes of a ripe-md-160 hash
+    of the user id for this key.
+
+7.5) How do I interpret some of the informational outputs?
+
+    While checking the validity of a key, GnuPG sometimes prints some
+    information which is prefixed with information about the checked
+    item.   "key 12345678.3456"  This is about the key
+    with key ID 12345678 and the internal number 3456, which is the
+    record number of the so called directory record in the trustdb.  
+     "uid 12345678.3456/ACDE"  This is about the user ID for
+    the same key.  To identify the user ID the last two bytes of a
+    ripe-md-160 over the user ID ring is printed.   "sig
+    12345678.3456/ACDE/9A8B7C6D"  This is about the signature
+    with key ID 9A8B7C6D for the above key and user ID, if it is a
+    signature which is direct on a key, the user ID part is empty
+    (..//..).
+
+7.6) Are the header lines of a cleartext signature part of the signed
+material?
+
+    No.  For example you can add or remove "Comment:" lines.  They have
+    a purpose like the mail header lines.  However a "Hash:" line is
+    needed for OpenPGP signatures to tell the parser which hash
+    algorithm to use.
+
+
+
+
+8. ACKNOWLEDGEMENTS
+
+    Many thanks to Werner Koch for the original FAQ file and to all
+    posters to gnupg-users and gnupg-devel. They all provided most of
+    the answers.
+
+    Also thanks to Casper Dik for providing me with a script to generate
+    this FAQ (he uses it for the excellent Solaris2 FAQ).
+
 
-  Q: Old versions of GnuPG can't verify ElGamal signatures
-  A: Update to GnuPG 1.0.2
+Copyright (C) 2000 Free Software Foundation, Inc. , 
+59 Temple Place - Suite 330, Boston, MA 02111, USA 
 
+Verbatim copying and distribution of this entire article is permitted in
+any medium, provided this notice is preserved.
diff -urN gnupg-1.0.2/doc/Makefile.am gnupg-1.0.3/doc/Makefile.am
--- gnupg-1.0.2/doc/Makefile.am	Wed Apr 19 10:47:50 2000
+++ gnupg-1.0.3/doc/Makefile.am	Thu Sep 14 16:34:45 2000
@@ -1,9 +1,17 @@
 ## Process this file with automake to create Makefile.in
 
-EXTRA_DIST = DETAILS gpg.sgml gpg.1 FAQ HACKING OpenPGP  README.W32
+EXTRA_DIST = DETAILS gpg.sgml gpg.1 faq.raw FAQ faq.html \
+             HACKING OpenPGP README.W32 
 
 man_MANS = gpg.1
 
+pkgdata_DATA = FAQ faq.html
+
+BUILT_SOURCES = FAQ faq.html
+
+CLEANFILES = faq.raw.xref
+
+
 
 %.1 : %.sgml
 if HAVE_DOCBOOK_TO_MAN
@@ -15,6 +23,12 @@
 endif
 
 
+FAQ : faq.raw
+	$(FAQPROG) -f $<  $@ || $(FAQPROG) -f $< $@
+
+faq.html : faq.raw
+	$(FAQPROG) -h -f $< $@ 2>&1 || $(FAQPROG) -h -f $< $@
+
 %.dvi: %.sgml
 	db2dvi $<
 
@@ -28,4 +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.2/doc/Makefile.in gnupg-1.0.3/doc/Makefile.in
--- gnupg-1.0.2/doc/Makefile.in	Wed Jul 12 14:59:50 2000
+++ gnupg-1.0.3/doc/Makefile.in	Mon Sep 18 12:18:15 2000
@@ -75,6 +75,7 @@
 DYNAMIC_CIPHER_MODS = @DYNAMIC_CIPHER_MODS@
 DYNLINK_LDFLAGS = @DYNLINK_LDFLAGS@
 DYNLINK_MOD_CFLAGS = @DYNLINK_MOD_CFLAGS@
+FAQPROG = @FAQPROG@
 GENCAT = @GENCAT@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
@@ -105,9 +106,16 @@
 ZLIBS = @ZLIBS@
 l = @l@
 
-EXTRA_DIST = DETAILS gpg.sgml gpg.1 FAQ HACKING OpenPGP  README.W32
+EXTRA_DIST = DETAILS gpg.sgml gpg.1 faq.raw FAQ faq.html              HACKING OpenPGP README.W32 
+
 
 man_MANS = gpg.1
+
+pkgdata_DATA = FAQ faq.html
+
+BUILT_SOURCES = FAQ faq.html
+
+CLEANFILES = faq.raw.xref
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
@@ -115,6 +123,8 @@
 MANS = $(man_MANS)
 
 NROFF = nroff
+DATA =  $(pkgdata_DATA)
+
 DIST_COMMON =  ChangeLog Makefile.am Makefile.in
 
 
@@ -170,6 +180,25 @@
 uninstall-man:
 	@$(NORMAL_UNINSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) uninstall-man1
+
+install-pkgdataDATA: $(pkgdata_DATA)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
+	@list='$(pkgdata_DATA)'; for p in $$list; do \
+	  if test -f $(srcdir)/$$p; then \
+	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p"; \
+	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p; \
+	  else if test -f $$p; then \
+	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p"; \
+	    $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p; \
+	  fi; fi; \
+	done
+
+uninstall-pkgdataDATA:
+	@$(NORMAL_UNINSTALL)
+	list='$(pkgdata_DATA)'; for p in $$list; do \
+	  rm -f $(DESTDIR)$(pkgdatadir)/$$p; \
+	done
 tags: TAGS
 TAGS:
 
@@ -201,31 +230,33 @@
 install-exec-am:
 install-exec: install-exec-am
 
-install-data-am: install-man
+install-data-am: install-man install-pkgdataDATA
 install-data: install-data-am
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am
-uninstall-am: uninstall-man
+uninstall-am: uninstall-man uninstall-pkgdataDATA
 uninstall: uninstall-am
-all-am: Makefile $(MANS)
+all-am: Makefile $(MANS) $(DATA)
 all-redirect: all-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(mandir)/man1
+	$(mkinstalldirs)  $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(pkgdatadir)
 
 
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-rm -f Makefile $(CONFIG_CLEAN_FILES)
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean-am:  mostlyclean-generic
 
 mostlyclean: mostlyclean-am
@@ -244,11 +275,12 @@
 
 maintainer-clean: maintainer-clean-am
 
-.PHONY: install-man1 uninstall-man1 install-man uninstall-man tags \
-distdir info-am info dvi-am dvi check check-am installcheck-am \
-installcheck install-exec-am install-exec install-data-am install-data \
-install-am install uninstall-am uninstall all-redirect all-am all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
+.PHONY: install-man1 uninstall-man1 install-man uninstall-man \
+uninstall-pkgdataDATA install-pkgdataDATA tags distdir info-am info \
+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
+install-exec install-data-am install-data install-am install \
+uninstall-am uninstall all-redirect all-am all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
@@ -257,6 +289,12 @@
 @HAVE_DOCBOOK_TO_MAN_FALSE@	: Warning: missing docbook-to-man, cannot make $@
 @HAVE_DOCBOOK_TO_MAN_FALSE@	echo ".TH $< 1"   >$@
 @HAVE_DOCBOOK_TO_MAN_FALSE@	echo "No man page due to missing docbook-to-man" >>$@
+
+FAQ : faq.raw
+	$(FAQPROG) -f $<  $@ || $(FAQPROG) -f $< $@
+
+faq.html : faq.raw
+	$(FAQPROG) -h -f $< $@ 2>&1 || $(FAQPROG) -h -f $< $@
 
 %.dvi: %.sgml
 	db2dvi $<
diff -urN gnupg-1.0.2/doc/faq.html gnupg-1.0.3/doc/faq.html
--- gnupg-1.0.2/doc/faq.html	Thu Jan  1 01:00:00 1970
+++ gnupg-1.0.3/doc/faq.html	Thu Sep 14 11:35:30 2000
@@ -0,0 +1,823 @@
+<html><head>
+<title>GnuPG FAQ</title>
+</head>
+<body>
+<P>
+<H1>GNUPG FREQUENTLY ASKED QUESTIONS</H1>
+<P>
+<pre>
+Version: 0.1
+Last-Modified: Sep 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>.  
+<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
+how to improve the structure of this FAQ are welcome.
+<P>
+Please send additions and corrections to the maintainer. Don't send
+message like &quot;This should be a FAQ - what's the answer?&quot;. If it hasn't
+been asked before, it isn't a FAQ. Otherwise, please provide the answer
+to be included here.
+<P>
+<HR>
+<P>
+<menu>
+<h2><A HREF=#q1>1. GENERAL
+</A></h2>
+<LI><a HREF=#q1.1>1.1) What is GnuPG?
+</a>
+<LI><a HREF=#q1.2>1.2) Is GnuPG compatible with PGP?
+</a>
+<h2><A HREF=#q2>2. SOURCES OF INFORMATION
+</A></h2>
+<LI><a HREF=#q2.1>2.1) Where can I find more information?
+</a>
+<LI><a HREF=#q2.2>2.2) Where do I get GnuPG?
+</a>
+<h2><A HREF=#q3>3. INSTALLATION 
+</A></h2>
+<LI><a HREF=#q3.1>3.1) Which OSes does GnuPG run on?
+</a>
+<LI><a HREF=#q3.2>3.2) Which random gatherer should I use?
+</a>
+<LI><a HREF=#q3.3>3.3) How do I include support for RSA and IDEA?
+</a>
+<h2><A HREF=#q4>4. USAGE
+</A></h2>
+<LI><a HREF=#q4.1>4.1) What is the recommended key size?
+</a>
+<LI><a HREF=#q4.2>4.2) Why does it sometimes take so long to create keys?
+</a>
+<LI><a HREF=#q4.3>4.3) And it really takes long when I work on a remote system. Why?
+</a>
+<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?
+</a>
+<LI><a HREF=#q4.6>4.6) What are trust, validity and ownertrust?
+</a>
+<LI><a HREF=#q4.7>4.7) How do I sign a patch file?
+</a>
+<LI><a HREF=#q4.8>4.8) Where is the &quot;encrypt-to-self&quot; option?
+</a>
+<LI><a HREF=#q4.9>4.9) How can I get rid of the Version and Comment headers in armored
+messages?
+</a>
+<LI><a HREF=#q4.10>4.10) What does the &quot;You are using the xxxx character set.&quot; mean?
+</a>
+<LI><a HREF=#q4.11>4.11) How can a get list of key IDs used to encrypt a message?
+</a>
+<LI><a HREF=#q4.12>4.12) I can't decrypt my symmetrical only (-c) encrypted message with
+    a new version of GnuPG.
+</a>
+<LI><a HREF=#q4.13>4.13) How can I used GnuPG in an automated environment?
+</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?
+</a>
+<LI><a HREF=#q5.2>5.2) 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?
+</a>
+<LI><a HREF=#q5.4>5.4) 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?
+</a>
+<LI><a HREF=#q5.6>5.6) PGP 5.x, 6.x do not like my secret key.
+</a>
+<h2><A HREF=#q6>6. PROBLEMS and ERROR MESSAGES
+</A></h2>
+<LI><a HREF=#q6.1>6.1) Why do I get &quot;gpg: Warning: using insecure memory!&quot;
+</a>
+<LI><a HREF=#q6.2>6.2) In the edit menu the trust values is not displayed correctly after
+signing uids - why?
+</a>
+<LI><a HREF=#q6.3>6.3) An ElGamal signature does not verify anymore since version 1.0.2 ...
+</a>
+<LI><a HREF=#q6.4>6.4) Old versions of GnuPG can't verify ElGamal signatures
+</a>
+<LI><a HREF=#q6.5>6.5) When I use --clearsign, the plain text has sometimes extra dashes 
+in it - why?
+</a>
+<h2><A HREF=#q7>7. ADVANCED TOPICS
+</A></h2>
+<LI><a HREF=#q7.1>7.1) How does this whole thing work?
+</a>
+<LI><a HREF=#q7.2>7.2) Why are some signatures with an ELG-E key valid?
+</a>
+<LI><a HREF=#q7.3>7.3) How does the whole trust thing work?
+</a>
+<LI><a HREF=#q7.4>7.4) What kind of output is this: &quot;key C26EE891.298, uid 09FB: ....&quot;?
+</a>
+<LI><a HREF=#q7.5>7.5) How do I interpret some of the informational outputs?
+</a>
+<LI><a HREF=#q7.6>7.6) Are the header lines of a cleartext signature part of the signed
+material?
+</a>
+<h2><A HREF=#q8>8. ACKNOWLEDGEMENTS
+</A></h2>
+</menu>
+<P>
+<HR>
+<P>
+<h2>
+<A NAME=q1>1. GENERAL
+</A></h2>
+<P>
+<h3>
+<a NAME=q1.1>1.1)</a> What is GnuPG?
+</h3>
+<P>
+<a href=http://www.gnupg.org>GnuPG</a> stands for GNU Privacy Guard and
+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
+<a href=http://www.gnupg.org/rfc2440.html>RFC 2440</a>. As
+such, it is aimed to be compatible with PGP from NAI Inc.
+<P>
+<h3>
+<a NAME=q1.2>1.2)</a> Is GnuPG compatible with PGP?
+</h3>
+<P>
+In general, yes. GnuPG and newer PGP releases should be implementing
+the OpenPGP standard. But there are some interoperability
+problems. See questions <a HREF=#q5.1>5.1</a>ff. for details.
+<P>
+<h2>
+<A NAME=q2>2. SOURCES OF INFORMATION
+</A></h2>
+<P>
+<h3>
+<a NAME=q2.1>2.1)</a> Where can I find more information?
+</h3>
+<P>
+Here's a list of on-line resources: <UL> 
+<P>
+<LI> <a href=http://www.gnupg.org/docs.html>&lt;http://www.gnupg.org/docs.html&gt;</a> is the
+documentation page. Have a look at the HOWTOs and the GNU Privacy
+Handbook (GPH, available in English, Spanish and Russian). The
+latter provides a detailed user's guide to GnuPG. You'll also find a
+document about how to convert from PGP 2.x to GnuPG.
+<P>
+<LI> On <a href=http://lists.gnupg.org>&lt;http://lists.gnupg.org&gt;</a> 
+you'll find a searchable online archive of the GnuPG mailing lists.
+<P>
+<B>PLEASE:</B>
+Before posting to a list, read this FAQ and the available
+documentation. This way you help people focus on topics that have
+not yet been resolved.
+</UL>
+<P>
+<h3>
+<a NAME=q2.2>2.2)</a> Where do I get GnuPG?
+</h3>
+<P>
+You can download the GNU Privacy Guard from it's primary FTP server
+<a href=ftp://ftp.gnupg.org/pub/gcrypt>ftp.gnupg.org</a> or from
+one of the mirrors: <a href=http://www.gnupg.org/mirrors.html>&lt;http://www.gnupg.org/mirror.html&gt;</a>
+<P>
+<P>
+<P>
+<h2>
+<A NAME=q3>3. INSTALLATION 
+</A></h2>
+<P>
+<h3>
+<a NAME=q3.1>3.1)</a> Which OSes does GnuPG run on?
+</h3>
+<P>
+It should run on most Unices as well as Windows 95 and Windows NT. A
+list of OSes reported to be OK is presented at 
+<a href=http://www.gnupg.org/gnupg.html#supsys>
+http://www.gnupg.org/gnupg.html#supsys </a>.
+<P>
+<h3>
+<a NAME=q3.2>3.2)</a> Which random gatherer should I use?
+</h3>
+<P>
+&quot;Good&quot; random numbers are crucial for the security of your
+encryption. Different operating systems provide a variety of more or
+less quality random data. Linux and *BSD provide kernel generated
+random data through /dev/random - this should be the preferred
+choice on these systems. Also Solaris users with the SUNWski package
+installed have a /dev/random. In these cases, use the configure
+option <pre>--enable-static-rnd=linux</pre>.
+<P>
+On other systems, the Entropy Gathering Daemon (EGD) is a good
+choice. It is a perl-daemon that monitors system activity nad hashes
+it into random data. See the download page <a href=http://www.gnupg.org/download.html>&lt;http://www.gnupg.org/download.html&gt;</a> 
+how to obtain egd. Use <pre>--enable-static-rnd=egd</pre> here.
+<P>
+If the above options do not work, you can use the random number
+generator &quot;unix&quot;. This is <B>very</B> slow and should be
+avoided. The random quality isn't very good so don't use it on
+sensitive data.
+<P>
+<h3>
+<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:
+<pre>
+load-extension idea 
+load-extension rsa
+</pre>
+<P>
+These extensions are not available for the Windows version of GnuPG.
+<P>
+<P>
+<h2>
+<A NAME=q4>4. USAGE
+</A></h2>
+<P>
+<h3>
+<a NAME=q4.1>4.1)</a> What is the recommended key size?
+</h3>
+<P>
+1024 bit for DSA signatures; even for plain ElGamal
+signatures this is sufficient as the size of the hash
+is probably the weakest link if the key size is larger
+than 1024 bits.  Encryption keys may have greater sizes,
+but you should than check the fingerprint of this key:
+&quot;gpg --fingerprint --fingerprint &lt;user ID&gt;&quot;.
+<P>
+<h3>
+<a NAME=q4.2>4.2)</a> Why does it sometimes take so long to create keys?
+</h3>
+<P>
+The problem here is that we need a lot of random bytes and for that
+we (on Linux the /dev/random device) must collect some random data.
+It is really not easy to fill the Linux internal entropy buffer; I
+talked to Ted Ts'o and he commented that the best way to fill the
+buffer is to play with your keyboard.  Good security has its price.
+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).
+<P>
+Another problem might be another program which eats up your random
+bytes (a program (look at your daemons) that reads from
+/dev/[u]random).
+<P>
+<h3>
+<a NAME=q4.3>4.3)</a> And it really takes long when I work on a remote system. Why?
+</h3>
+<P>
+Don't do this at all! You should never create keys or even use GnuPG
+on a remote system because you normally have no physical control
+over your secret key ring (which is in most cases vulnerable to
+advanced dictionary attacks) - I strongly encourage everyone to only
+create keys on a local computer (a disconnected laptop is probably
+the best choice) and if you need it on your connected box (I know:
+We all do this) be sure to have a strong password for your account
+and for your secret key and that you can trust your system
+administrator.
+<P>
+When I check GnuPG on a remote system via ssh (I have no Alpha here
+;-) I have the same problem.  It takes a *very* long time to create
+the keys, so I use a special option, --quick-random, to generate
+insecure keys which are only good for some tests.
+<P>
+<h3>
+<a NAME=q4.4>4.4)</a> What is the difference between options and commands?
+</h3>
+<P>
+If you do a 'gpg --help', you will get two separate lists. The first
+is a list of commands. The second is a list of options. Whenever you
+run GPG, you <B>must</B> pick exactly one command (with one
+exception, see below). You <B>may</B> pick one or more options.
+The command should, just by convention, come at the end of the
+argument list, after all the options. If the command takes a file
+(all the basic ones do), the filename comes at the very end. So the
+basic way to run gpg is: 
+<P>
+<pre> 
+gpg [--option something] [--option2] [--option3 something] --command file 
+</pre> 
+<P>
+Some options take arguments, for example the --output option (which
+can be abbreviated -o) is an option that takes a filename. The
+option's argument must follow immediately after the option itself,
+otherwise gpg doesn't know which option the argument is supposed to
+go with. As an option, --output and its filename must come before
+the command. The --recipient (-r) option takes a name or keyid to
+encrypt the message to, which must come right after the -r argument.
+The --encrypt (or -e) command comes after all the options followed
+by the file you wish to encrypt. So use 
+<P>
+<pre> 
+gpg -r alice -o secret.txt -e test.txt 
+</pre> 
+<P>
+If you write the options out in full, it is easier to read 
+<P>
+<pre>
+gpg --recipient alice --output secret.txt --encrypt test.txt 
+</pre>
+<P>
+If you're saving it in a file called &quot;.txt&quot; then you'd probably
+expect to see ASCII-armored text in there, so you need to add the
+--armor (-a) option, which doesn't take any arguments.  
+<P>
+<pre> 
+gpg --armor --recipient alice --output secret.txt --encrypt test.txt
+</pre> 
+<P>
+If you imagine square brackets around the optional parts, it becomes
+a bit clearer: 
+<P>
+<pre> 
+gpg [--armor] [--recipient alice] [--output secret.txt] --encrypt test.txt 
+</pre> 
+<P>
+The optional parts can be rearranged any way you want.  
+<P>
+<pre> 
+gpg --output secret.txt --recipient alice --armor --encrypt test.txt
+</pre> 
+<P>
+If your filename begins with a hyphen (e.g. &quot;-a.txt&quot;), gnupg assumes
+this is an option and may complain.  To avoid this you have either
+to use &quot;./-a.txt&quot; or stop the option and command processing with two
+hyphens: &quot;-- -a.txt&quot;.
+  
+<B>The exception:</B> signing and encrypting at the same time. Use
+<pre> gpg [--options] --sign --encrypt foo.txt </pre>
+<P>
+<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?
+</h3>
+<P>
+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
+anyway.  Create a new user id with exactly the same name and you
+will see that there are now two identical user ids on the secret
+ring.  Now select this user id and delete it.  Both user ids will be
+removed from the secret ring.
+<P>
+<h3>
+<a NAME=q4.6>4.6)</a> What are trust, validity and ownertrust?
+</h3>
+<P>
+&quot;ownertrust&quot; is used instead of &quot;trust&quot; to make clear that this is
+the value you have assigned to a key to express how much you trust
+the owner of this key to correctly sign (and so introduce) other
+keys.  &quot;validity&quot;, or calculated trust, is a value which says how
+much GnuPG thinks a key is valid (that it really belongs to the one
+who claims to be the owner of the key).  For more see the chapter
+&quot;The Web of Trust&quot; in the Manual.
+<P>
+<h3>
+<a NAME=q4.7>4.7)</a> How do I sign a patch file?
+</h3>
+<P>
+Use &quot;gpg --clearsign --not-dash-escaped ...&quot;.  The problem with
+--clearsign is that all lines starting with a dash are quoted with
+&quot;- &quot;; obviously diff produces many of lines starting with a dash and
+these are then quoted and that is not good for patch ;-).  To use a
+patch file without removing the cleartext signature, the special
+option --not-dash-escaped may be used to suppress generation of
+these escape sequences.  You should not mail such a patch because
+spaces and line endings are also subject to the signature and a
+mailer may not preserve these.  If you want to mail a file you can
+simply sign it using your MUA.
+<P>
+<h3>
+<a NAME=q4.8>4.8)</a> Where is the &quot;encrypt-to-self&quot; option?
+</h3>
+<P>
+Use &quot;--encrypt-to your_keyid&quot;.  You can use more than one of these
+options. To temporary override the use of this additional keys, you
+can use the option &quot;--no-encrypt-to&quot;.
+<P>
+<h3>
+<a NAME=q4.9>4.9)</a> How can I get rid of the Version and Comment headers in armored
+messages?
+</h3>
+<P>
+Use &quot;--no-version --comment ''&quot;.  Note that the left over blank line
+is required by the protocol.
+<P>
+<h3>
+<a NAME=q4.10>4.10)</a> What does the &quot;You are using the xxxx character set.&quot; mean?
+</h3>
+<P>
+This note is printed when UTF8 mapping has to be done.  Make sure
+that the displayed charset is the one you have activated on your
+system &quot;iso-8859-1&quot; is the most used one, so this is the default.
+You can change the charset with the option &quot;--charset&quot;.  It is
+important that you active character set matches the one displayed -
+if not, restrict yourself to plain 7 bit ASCII and no mapping has to
+be done.
+<P>
+<h3>
+<a NAME=q4.11>4.11)</a> How can a get list of key IDs used to encrypt a message?
+</h3>
+<P>
+<pre> gpg --batch --decrypt --list-only --status-fd 1 2&gt;/dev/null
+\ | awk '/^\[GNUPG:\] ENC_TO / { print $3 }' </pre>
+<P>
+<h3>
+<a NAME=q4.12>4.12)</a> I can't decrypt my symmetrical only (-c) encrypted message with
+    a new version of GnuPG.
+</h3>
+<P>
+There used to be a bug in GnuPG &lt; 1.0.1 which happens only if 3DES
+or Twofish has been used for symmetric only encryption (this has
+never been the default).  The bug has been fixed but to enable you
+to decrypt old messages, you should run gpg with the option
+&quot;--emulate-3des-s2k-bug&quot;, decrypt the message and encrypt it again
+without this option.  The option will be removed in 1.1, so better
+re-encrypt your message now.
+<P>
+<h3>
+<a NAME=q4.13>4.13)</a> How can I used GnuPG in an automated environment?
+</h3>
+<P>
+You should use the option --batch and don't use pass phrases as
+there is usually no way to store it more secure than the secret
+keyring itself. The suggested way to create the keys for the
+automated environment is:
+<P>
+ On a secure machine:
+<OL> <LI> If you want to do automatic signing, create a signing
+subkey for your key (edit menu, choose &quot;addkey&quot; and the DSA).  [H
+LI] Make sure that you use a passphrase (Needed by the current
+implementation) <LI> gpg --export-secret-subkeys --no-comment foo
+&gt;secring.auto <LI> Copy secring.auto and the public keyring to a
+test directory.  <LI> Cd to this directory.  <LI> gpg --homedir
+. --edit foo and use &quot;passwd&quot; to remove the pass-phrase from the
+subkeys.  You may also want to remove all unused subkeys.  <LI>
+copy secring.auto to a floppy and carry it to the target box </OL>
+On the target machine: <OL> <LI> Install secring.auto as secret
+keyring.  <LI> Now you can start your new service.  It is a good
+idea to install some intrusion detection system so that you
+hopefully get a notice of an successful intrusion, so that you in
+turn can revoke all the subkeys installed on that machine and
+install new subkeys.  </OL>
+<P>
+<P>
+<P>
+<h2>
+<A NAME=q5>5. COMPATIBILITY ISSUES 
+</A></h2>
+<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?
+</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:
+<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.
+<P>
+<h3>
+<a NAME=q5.2>5.2)</a> How can I conventional encrypt a message, so that PGP can decrypt
+it?
+</h3>
+<P>
+You can't do this for PGP 2.  For PGP 5 you should use this: 
+<P>
+<pre>
+gpg -c --cipher-algo 3des --compress-algo 1 myfile 
+</pre> 
+<P>
+You may replace &quot;3des&quot; by &quot;cast5&quot;. &quot;blowfish&quot; does not work with all
+versions of pgp5.  You may also want to put <pre> compress-algo 1
+</pre> into your ~/.gnupg/options file - this does not affect
+normal gnupg operation.
+<P>
+<P>
+<h3>
+<a NAME=q5.3>5.3)</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
+encryption.  They only support type 16 (which is identical at least
+for decryption).  To be more inter-operable, GnuPG (starting with
+version 0.3.3) now also uses type 16 for the ElGamal subkey which is
+created if the default key algorithm is chosen.  You may add an type
+16 ElGamal key to your public key which is easy as your key
+signatures are still valid.
+<P>
+<h3>
+<a NAME=q5.4>5.4)</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
+requires generation of V4 signatures for all kind of data.  Use the
+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?
+</h3>
+<P>
+There is a script in the tools directory to help you: After you have
+imported the PGP keyring you can give this command: 
+<P>
+<pre> 
+$ lspgpot pgpkeyring | gpg --import-ownertrust 
+</pre> 
+<P>
+where pgpkeyring is the original keyring and not the GnuPG one you
+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.
+</h3>
+<P>
+PGP probably bails out on some private comment packets used by
+GnuPG.  These packets are fully in compliance with OpenPGP; however
+PGP is not really OpenPGP aware.  A workaround is to export the
+secret keys with this command: 
+<pre> gpg --export-secret-keys --no-comment -a your-key-id </pre>
+<P>
+<P>
+<P>
+<h2>
+<A NAME=q6>6. PROBLEMS and ERROR MESSAGES
+</A></h2>
+<P>
+<h3>
+<a NAME=q6.1>6.1)</a> Why do I get &quot;gpg: Warning: using insecure memory!&quot;
+</h3>
+<P>
+On many systems this program should be installed as
+setuid(root). This is necessary to lock memory pages.  Locking
+memory pages prevents the operating system from writing memory pages
+to disk and thereby keeping your secret keys really secret. If you
+get no warning message about insecure memory your operating system
+supports locking without being root. The program drops root
+privileges as soon as locked memory is allocated.
+<P>
+If you can't or don't want to install GnuPG setuid(root), you can
+use the option &quot;--no-secmem-warning&quot; or put <pre>
+no-secmem-warning </pre> in your ~/.gnupg/options file.
+<P>
+<h3>
+<a NAME=q6.2>6.2)</a> In the edit menu the trust values is not displayed correctly after
+signing uids - why?
+</h3>
+<P>
+This happens because the some informations are stored immediately in
+the trustdb, but the actual trust calculation can be done after the
+save command.  This is a not easy to fix design bug which will be
+addressed in some future release.
+<P>
+<h3>
+<a NAME=q6.3>6.3)</a> An ElGamal signature does not verify anymore since version 1.0.2 ...
+</h3>
+<P>
+Use the option --emulate-md-encode-bug.
+<P>
+<h3>
+<a NAME=q6.4>6.4)</a> Old versions of GnuPG can't verify ElGamal signatures
+</h3>
+<P>
+Update to GnuPG 1.0.2 or newer.
+<P>
+<P>
+<h3>
+<a NAME=q6.5>6.5)</a> When I use --clearsign, the plain text has sometimes extra dashes 
+in it - why?
+</h3>
+<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. 
+<P>
+If you use GnuPG to process those emessage, the extra dashes are removed.
+Good mail clients remove those extra dashes when displaying such a 
+message.      
+<P>
+<P>
+<P>
+<h2>
+<A NAME=q7>7. ADVANCED TOPICS
+</A></h2>
+<P>
+<h3>
+<a NAME=q7.1>7.1)</a> How does this whole thing work?
+</h3>
+<P>
+To generate a secret/public keypair, run <pre> gpg --gen-key
+</pre> and choose the default values.
+<P>
+Data that is encrypted with a public key can only be decrypted by
+the matching secret key.  The secret key is protected by a password,
+the public key is not.
+<P>
+So to send your friend a message, you would encrypt your message
+with his public key, and he would only be able to decrypt it by
+having the secret key and putting in the password to use his secret
+key.
+<P>
+GnuPG is also useful for signing things.  Things that are encrypted
+with the secret key can be decrypted with the public key. To sign
+something, a hash is taken of the data, and then the hash is in some
+form encoded with the secret key. If someone has your public key, they
+can verify that it is from you and that it hasn't changed by checking
+the encoded form of the hash with the public key.
+  
+A keyring is just a large file that stores keys. You have a public
+keyring where you store yours and your friend's public keys.  You have
+a secret keyring that you keep your secret key on, and be very careful
+with this secret keyring: Never ever give anyone else access to it and
+use a *good* passphrase to protect the data in it.
+  
+You can 'conventionally' encrypt something by using the option 'gpg
+-c'.  It is encrypted using a passphrase, and does not use public and
+secret keys.  If the person you send the data to knows that
+passphrase, they can decrypt it. This is usually most useful for
+encrypting things to yourself, although you can encrypt things to your
+own public key in the same way.  It should be used for communication
+with partners you know and where it is easy to exchange the
+passphrases (e.g. with your boy friend or your wife).  The advantage
+is that you can change the passphrase from time to time and decrease
+the risk, that many old messages may be decrypted by people who
+accidently got your passphrase.
+  
+You can add and copy keys to and from your keyring with the 'gpg
+--import' and 'gpg --export' option. 'gpg --export-secret-keys' will
+export secret keys. This is normally not useful, but you can generate
+the key on one machine then move it to another machine.
+  
+Keys can be signed under the 'gpg --edit-key' option.  When you sign a
+key, you are saying that you are certain that the key belongs to the
+person it says it comes from.  You should be very sure that is really
+that person: You should verify the key fingerprint
+<pre>
+    gpg --fingerprint user-id
+</pre>
+over phone (if you really know the voice of the other person) or at a
+key signing party (which are often held at computer conferences) or at
+a meeting of your local GNU/Linux User Group.
+  
+Hmm, what else.  You may use the option &quot;-o filename&quot; to force output
+to this filename (use &quot;-&quot; to force output to stdout). &quot;-r&quot; just lets
+you specify the recipient (which public key you encrypt with) on the
+command line instead of typing it interactively.
+  
+Oh yeah, this is important. By default all data is encrypted in some
+weird binary format.  If you want to have things appear in ASCII text
+that is readable, just add the '-a' option.  But the preferred method
+is to use a MIME aware mail reader (Mutt, Pine and many more).
+  
+There is a small security glitch in the OpenPGP (and therefore GnuPG)
+system; to avoid this you should always sign and encrypt a message
+instead of only encrypting it.
+<P>
+<P>
+<h3>
+<a NAME=q7.2>7.2)</a> Why are some signatures with an ELG-E key valid?
+</h3>
+<P>
+These are ElGamal Key generated by GnuPG in v3 (rfc1991) packets.
+The OpenPGP draft later changed the algorithm identifier for ElGamal
+keys which are usable for signatures and encryption from 16 to 20.
+GnuPG now uses 20 when it generates new ElGamal keys but still
+accept 16 (which is according to OpenPGP &quot;encryption only&quot;) if this
+key is in a v3 packet.  GnuPG is the only program which had used
+these v3 ElGamal keys - so this assumption is quite safe.
+<P>
+<P>
+<h3>
+<a NAME=q7.3>7.3)</a> How does the whole trust thing work?
+</h3>
+<P>
+It works more or less like PGP.  The difference is that the trust is
+computed at the time it is needed. This is one of the reasons for
+the trustdb which holds a list of valid key signatures.  If you are
+not running in batch mode you will be asked to assign a trust
+parameter (ownertrust) to a key.
+<P>
+<P>
+<P>
+You can see the validity (calculated trust value) using this
+command.
+<pre> gpg --list-keys --with-colons </pre> 
+<P>
+If the first field is &quot;pub&quot; or &quot;uid&quot;, the second field shows you the
+trust: 
+<P>
+<pre> 
+ o = Unknown (this key is new to the system) 
+ e = The key has expired 
+ q = Undefined (no value assigned) 
+ n = Don't trust    this key at all
+ m = There is marginal trust in this key 
+ f = The key    is full trusted 
+ u = The key is ultimately trusted; this is only used
+     for keys for which the secret key is also available.  
+ r = The key    has been revoked 
+ d = The key has been disabled 
+</pre> 
+<P>
+The value in the &quot;pub&quot; record is the best one of all &quot;uid&quot; records.
+  
+You can get a list of the assigned trust values (how much you trust
+the owner to correctly sign another person's key)
+  
+<pre> gpg --list-ownertrust </pre> The first field is the
+fingerprint of the primary key, the second field is the assigned
+value: 
+<P>
+<pre> 
+ - = No Ownertrust value yet assigned.  
+ n = Never trust this keyholder to correctly verify others signatures.  
+ m = Have marginal trust in the keyholders capability to sign other
+     keys.  
+ f = Assume that the key holder really knows how to sign keys.  
+ u = No need to trust ourself because we have the secret key.  
+</pre> 
+<P>
+Keep these values confidential because they express your opinions
+about others.  PGP stores this information with the keyring thus it
+is not a good idea to publish a PGP keyring instead of exporting the
+keyring.  gnupg stores the trust in the trust-DB so it is okay to
+give a gpg keyring away (but we have a --export command too).
+<P>
+<h3>
+<a NAME=q7.4>7.4)</a> What kind of output is this: &quot;key C26EE891.298, uid 09FB: ....&quot;?
+</h3>
+<P>
+This is the internal representation of an user id in the trustdb.
+&quot;C26EE891&quot; is the keyid, &quot;298&quot; is the local id (a record number in
+the trustdb) and &quot;09FB&quot; is the last two bytes of a ripe-md-160 hash
+of the user id for this key.
+<P>
+<h3>
+<a NAME=q7.5>7.5)</a> How do I interpret some of the informational outputs?
+</h3>
+<P>
+While checking the validity of a key, GnuPG sometimes prints some
+information which is prefixed with information about the checked
+item.  <pre> &quot;key 12345678.3456&quot; </pre> This is about the key
+with key ID 12345678 and the internal number 3456, which is the
+record number of the so called directory record in the trustdb.  
+<pre> &quot;uid 12345678.3456/ACDE&quot; </pre> This is about the user ID for
+the same key.  To identify the user ID the last two bytes of a
+ripe-md-160 over the user ID ring is printed.  <pre> &quot;sig
+12345678.3456/ACDE/9A8B7C6D&quot; </pre> This is about the signature
+with key ID 9A8B7C6D for the above key and user ID, if it is a
+signature which is direct on a key, the user ID part is empty
+(..//..).
+<P>
+<h3>
+<a NAME=q7.6>7.6)</a> Are the header lines of a cleartext signature part of the signed
+material?
+</h3>
+<P>
+No.  For example you can add or remove &quot;Comment:&quot; lines.  They have
+a purpose like the mail header lines.  However a &quot;Hash:&quot; line is
+needed for OpenPGP signatures to tell the parser which hash
+algorithm to use.
+<P>
+<P>
+<P>
+<P>
+<h2>
+<A NAME=q8>8. ACKNOWLEDGEMENTS
+</A></h2>
+<P>
+Many thanks to Werner Koch for the original FAQ file and to all
+posters to gnupg-users and gnupg-devel. They all provided most of
+the answers.
+<P>
+Also thanks to Casper Dik for providing me with a script to generate
+this FAQ (he uses it for the excellent Solaris2 FAQ).
+<P>
+<HR>
+<P>
+Copyright (C) 2000 Free Software Foundation, Inc. , 
+59 Temple Place - Suite 330, Boston, MA 02111, USA 
+<P>
+Verbatim copying and distribution of this entire article is permitted in
+any medium, provided this notice is preserved.
+</body></html>
diff -urN gnupg-1.0.2/doc/faq.raw gnupg-1.0.3/doc/faq.raw
--- gnupg-1.0.2/doc/faq.raw	Thu Jan  1 01:00:00 1970
+++ gnupg-1.0.3/doc/faq.raw	Thu Sep 14 11:35:27 2000
@@ -0,0 +1,646 @@
+[$htmltitle=GnuPG FAQ]
+[$sfaqheader=The GnuPG FAQ says:]
+[$sfaqfooter=
+The most recent version of the FAQ is available from
+<http://www.gnupg.org/>
+]
+[$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 H1]GNUPG FREQUENTLY ASKED QUESTIONS[H /H1]
+
+[H pre]
+Version: 0.1
+Last-Modified: Sep 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].  
+
+The index is generated automatically, so there may be errors here.  Not
+all questions may be in the section they belong to. Suggestions about
+how to improve the structure of this FAQ are welcome.
+
+Please send additions and corrections to the maintainer. Don't send
+message like "This should be a FAQ - what's the answer?". If it hasn't
+been asked before, it isn't a FAQ. Otherwise, please provide the answer
+to be included here.
+
+[H HR]
+
+<C>
+
+[H HR]
+
+<S> GENERAL
+
+<Q> What is GnuPG?
+
+    [H a href=[$hGPG]]GnuPG[H /a] stands for GNU Privacy Guard and
+    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
+    [H a href=http://www.gnupg.org/rfc2440.html]RFC 2440[H/a]. As
+    such, it is aimed to be compatible with PGP from NAI Inc.
+
+<Q> Is GnuPG compatible with PGP?
+
+    In general, yes. GnuPG and newer PGP releases should be implementing
+    the OpenPGP standard. But there are some interoperability
+    problems. See questions <Rcompat>ff. for details.
+
+<S> SOURCES OF INFORMATION
+
+<Q> Where can I find more information?
+
+    Here's a list of on-line resources: [H UL] 
+
+    [H LI] [H a href=[$hGPG]/docs.html]<[$hGPG]/docs.html>[H/a] is the
+    documentation page. Have a look at the HOWTOs and the GNU Privacy
+    Handbook (GPH, available in English, Spanish and Russian). The
+    latter provides a detailed user's guide to GnuPG. You'll also find a
+    document about how to convert from PGP 2.x to GnuPG.
+
+    [H LI] On [H a href=http://lists.gnupg.org]<http://lists.gnupg.org>[H/a] 
+    you'll find a searchable online archive of the GnuPG mailing lists.
+
+    [H B]PLEASE:[H/B]
+    Before posting to a list, read this FAQ and the available
+    documentation. This way you help people focus on topics that have
+    not yet been resolved.
+    [H /UL]
+
+<Q> Where do I get GnuPG?
+
+    You can download the GNU Privacy Guard from it's primary FTP server
+    [H a href=ftp://ftp.gnupg.org/pub/gcrypt]ftp.gnupg.org[H /a] or from
+    one of the mirrors: [H a href=[$hGPG]/mirrors.html]<[$hGPG]/mirror.html>[H /a]
+
+
+
+<S> INSTALLATION 
+
+<Q> Which OSes does GnuPG run on?
+
+    It should run on most Unices as well as Windows 95 and Windows NT. A
+    list of OSes reported to be OK is presented at 
+    [H a href=http://www.gnupg.org/gnupg.html#supsys]
+    http://www.gnupg.org/gnupg.html#supsys [H /a].
+
+<Q> Which random gatherer should I use?
+
+    "Good" random numbers are crucial for the security of your
+    encryption. Different operating systems provide a variety of more or
+    less quality random data. Linux and *BSD provide kernel generated
+    random data through /dev/random - this should be the preferred
+    choice on these systems. Also Solaris users with the SUNWski package
+    installed have a /dev/random. In these cases, use the configure
+    option [H pre]--enable-static-rnd=linux[H/pre].
+
+    On other systems, the Entropy Gathering Daemon (EGD) is a good
+    choice. It is a perl-daemon that monitors system activity nad hashes
+    it into random data. See the download page [H a href=http://www.gnupg.org/download.html]<http://www.gnupg.org/download.html>[H /a] 
+    how to obtain egd. Use [H pre]--enable-static-rnd=egd[H/pre] here.
+
+    If the above options do not work, you can use the random number
+    generator "unix". This is [H B]very[H /B] slow and should be
+    avoided. The random quality isn't very good so don't use it on
+    sensitive data.
+
+<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:
+    [H pre]
+    load-extension idea 
+    load-extension rsa
+    [H /pre]
+
+    These extensions are not available for the Windows version of GnuPG.
+
+
+<S> USAGE
+
+<Q> What is the recommended key size?
+
+    1024 bit for DSA signatures; even for plain ElGamal
+    signatures this is sufficient as the size of the hash
+    is probably the weakest link if the key size is larger
+    than 1024 bits.  Encryption keys may have greater sizes,
+    but you should than check the fingerprint of this key:
+    "gpg --fingerprint --fingerprint <user ID>".
+
+<Q> Why does it sometimes take so long to create keys?
+
+    The problem here is that we need a lot of random bytes and for that
+    we (on Linux the /dev/random device) must collect some random data.
+    It is really not easy to fill the Linux internal entropy buffer; I
+    talked to Ted Ts'o and he commented that the best way to fill the
+    buffer is to play with your keyboard.  Good security has its price.
+    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).
+
+    Another problem might be another program which eats up your random
+    bytes (a program (look at your daemons) that reads from
+    /dev/[u]random).
+
+<Q> And it really takes long when I work on a remote system. Why?
+
+    Don't do this at all! You should never create keys or even use GnuPG
+    on a remote system because you normally have no physical control
+    over your secret key ring (which is in most cases vulnerable to
+    advanced dictionary attacks) - I strongly encourage everyone to only
+    create keys on a local computer (a disconnected laptop is probably
+    the best choice) and if you need it on your connected box (I know:
+    We all do this) be sure to have a strong password for your account
+    and for your secret key and that you can trust your system
+    administrator.
+
+    When I check GnuPG on a remote system via ssh (I have no Alpha here
+    ;-) I have the same problem.  It takes a *very* long time to create
+    the keys, so I use a special option, --quick-random, to generate
+    insecure keys which are only good for some tests.
+
+<Q> What is the difference between options and commands?
+
+    If you do a 'gpg --help', you will get two separate lists. The first
+    is a list of commands. The second is a list of options. Whenever you
+    run GPG, you [H B]must[H /B] pick exactly one command (with one
+    exception, see below). You [H B]may[H /B] pick one or more options.
+    The command should, just by convention, come at the end of the
+    argument list, after all the options. If the command takes a file
+    (all the basic ones do), the filename comes at the very end. So the
+    basic way to run gpg is: 
+
+    [H pre] 
+    gpg [--option something] [--option2] [--option3 something] --command file 
+    [H/pre] 
+
+    Some options take arguments, for example the --output option (which
+    can be abbreviated -o) is an option that takes a filename. The
+    option's argument must follow immediately after the option itself,
+    otherwise gpg doesn't know which option the argument is supposed to
+    go with. As an option, --output and its filename must come before
+    the command. The --recipient (-r) option takes a name or keyid to
+    encrypt the message to, which must come right after the -r argument.
+    The --encrypt (or -e) command comes after all the options followed
+    by the file you wish to encrypt. So use 
+
+    [H pre] 
+    gpg -r alice -o secret.txt -e test.txt 
+    [H/pre] 
+
+    If you write the options out in full, it is easier to read 
+
+    [H pre]
+    gpg --recipient alice --output secret.txt --encrypt test.txt 
+    [H/pre]
+
+    If you're saving it in a file called ".txt" then you'd probably
+    expect to see ASCII-armored text in there, so you need to add the
+    --armor (-a) option, which doesn't take any arguments.  
+
+    [H pre] 
+    gpg --armor --recipient alice --output secret.txt --encrypt test.txt
+    [H/pre] 
+
+    If you imagine square brackets around the optional parts, it becomes
+    a bit clearer: 
+
+    [H pre] 
+    gpg [--armor] [--recipient alice] [--output secret.txt] --encrypt test.txt 
+    [H/pre] 
+
+    The optional parts can be rearranged any way you want.  
+
+    [H pre] 
+    gpg --output secret.txt --recipient alice --armor --encrypt test.txt
+    [H/pre] 
+
+    If your filename begins with a hyphen (e.g. "-a.txt"), gnupg assumes
+    this is an option and may complain.  To avoid this you have either
+    to use "./-a.txt" or stop the option and command processing with two
+    hyphens: "-- -a.txt".
+  
+    [H B]The exception:[H /B] signing and encrypting at the same time. Use
+    [H pre] gpg [--options] --sign --encrypt foo.txt [H/pre]
+
+
+<Q> I can't delete an user id because it is already deleted on my public
+keying?
+
+    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
+    anyway.  Create a new user id with exactly the same name and you
+    will see that there are now two identical user ids on the secret
+    ring.  Now select this user id and delete it.  Both user ids will be
+    removed from the secret ring.
+
+<Q> What are trust, validity and ownertrust?
+
+    "ownertrust" is used instead of "trust" to make clear that this is
+    the value you have assigned to a key to express how much you trust
+    the owner of this key to correctly sign (and so introduce) other
+    keys.  "validity", or calculated trust, is a value which says how
+    much GnuPG thinks a key is valid (that it really belongs to the one
+    who claims to be the owner of the key).  For more see the chapter
+    "The Web of Trust" in the Manual.
+
+<Q> How do I sign a patch file?
+
+    Use "gpg --clearsign --not-dash-escaped ...".  The problem with
+    --clearsign is that all lines starting with a dash are quoted with
+    "- "; obviously diff produces many of lines starting with a dash and
+    these are then quoted and that is not good for patch ;-).  To use a
+    patch file without removing the cleartext signature, the special
+    option --not-dash-escaped may be used to suppress generation of
+    these escape sequences.  You should not mail such a patch because
+    spaces and line endings are also subject to the signature and a
+    mailer may not preserve these.  If you want to mail a file you can
+    simply sign it using your MUA.
+
+<Q> Where is the "encrypt-to-self" option?
+
+    Use "--encrypt-to your_keyid".  You can use more than one of these
+    options. To temporary override the use of this additional keys, you
+    can use the option "--no-encrypt-to".
+
+<Q> How can I get rid of the Version and Comment headers in armored
+messages?
+
+    Use "--no-version --comment ''".  Note that the left over blank line
+    is required by the protocol.
+
+<Q> What does the "You are using the xxxx character set." mean?
+
+    This note is printed when UTF8 mapping has to be done.  Make sure
+    that the displayed charset is the one you have activated on your
+    system "iso-8859-1" is the most used one, so this is the default.
+    You can change the charset with the option "--charset".  It is
+    important that you active character set matches the one displayed -
+    if not, restrict yourself to plain 7 bit ASCII and no mapping has to
+    be done.
+
+<Q> How can a get list of key IDs used to encrypt a message?
+
+    [H pre] gpg --batch --decrypt --list-only --status-fd 1 2>/dev/null
+    \ | awk '/^\[GNUPG:\] ENC_TO / { print $3 }' [H /pre]
+
+<Q> I can't decrypt my symmetrical only (-c) encrypted message with
+    a new version of GnuPG.
+
+    There used to be a bug in GnuPG < 1.0.1 which happens only if 3DES
+    or Twofish has been used for symmetric only encryption (this has
+    never been the default).  The bug has been fixed but to enable you
+    to decrypt old messages, you should run gpg with the option
+    "--emulate-3des-s2k-bug", decrypt the message and encrypt it again
+    without this option.  The option will be removed in 1.1, so better
+    re-encrypt your message now.
+
+<Q> How can I used GnuPG in an automated environment?
+
+    You should use the option --batch and don't use pass phrases as
+    there is usually no way to store it more secure than the secret
+    keyring itself. The suggested way to create the keys for the
+    automated environment is:
+
+     On a secure machine:
+    [H OL] [H LI] If you want to do automatic signing, create a signing
+    subkey for your key (edit menu, choose "addkey" and the DSA).  [H
+    LI] Make sure that you use a passphrase (Needed by the current
+    implementation) [H LI] gpg --export-secret-subkeys --no-comment foo
+    >secring.auto [H LI] Copy secring.auto and the public keyring to a
+    test directory.  [H LI] Cd to this directory.  [H LI] gpg --homedir
+    . --edit foo and use "passwd" to remove the pass-phrase from the
+    subkeys.  You may also want to remove all unused subkeys.  [H LI]
+    copy secring.auto to a floppy and carry it to the target box [H /OL]
+    On the target machine: [H OL] [H LI] Install secring.auto as secret
+    keyring.  [H LI] Now you can start your new service.  It is a good
+    idea to install some intrusion detection system so that you
+    hopefully get a notice of an successful intrusion, so that you in
+    turn can revoke all the subkeys installed on that machine and
+    install new subkeys.  [H /OL]
+
+
+
+<S> COMPATIBILITY ISSUES 
+
+<Dcompat>
+
+<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:
+
+    [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.
+
+<Q> 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: 
+
+    [H pre]
+    gpg -c --cipher-algo 3des --compress-algo 1 myfile 
+    [H/pre] 
+
+    You may replace "3des" by "cast5". "blowfish" does not work with all
+    versions of pgp5.  You may also want to put [H pre] compress-algo 1
+    [H/pre] into your ~/.gnupg/options file - this does not affect
+    normal gnupg operation.
+
+
+<Q> 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
+    for decryption).  To be more inter-operable, GnuPG (starting with
+    version 0.3.3) now also uses type 16 for the ElGamal subkey which is
+    created if the default key algorithm is chosen.  You may add an type
+    16 ElGamal key to your public key which is easy as your key
+    signatures are still valid.
+
+<Q> 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.
+
+<Q> 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: 
+
+    [H pre] 
+    $ lspgpot pgpkeyring | gpg --import-ownertrust 
+    [H /pre] 
+
+    where pgpkeyring is the original keyring and not the GnuPG one you
+    might have created in the first step.
+
+<Q> 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
+    PGP is not really OpenPGP aware.  A workaround is to export the
+    secret keys with this command: 
+    [H pre] gpg --export-secret-keys --no-comment -a your-key-id [H /pre]
+
+
+
+<S> PROBLEMS and ERROR MESSAGES
+
+<Q> Why do I get "gpg: Warning: using insecure memory!"
+
+    On many systems this program should be installed as
+    setuid(root). This is necessary to lock memory pages.  Locking
+    memory pages prevents the operating system from writing memory pages
+    to disk and thereby keeping your secret keys really secret. If you
+    get no warning message about insecure memory your operating system
+    supports locking without being root. The program drops root
+    privileges as soon as locked memory is allocated.
+
+    If you can't or don't want to install GnuPG setuid(root), you can
+    use the option "--no-secmem-warning" or put [H pre]
+    no-secmem-warning [H /pre] in your ~/.gnupg/options file.
+
+<Q> In the edit menu the trust values is not displayed correctly after
+signing uids - why?
+
+    This happens because the some informations are stored immediately in
+    the trustdb, but the actual trust calculation can be done after the
+    save command.  This is a not easy to fix design bug which will be
+    addressed in some future release.
+
+<Q> An ElGamal signature does not verify anymore since version 1.0.2 ...
+
+    Use the option --emulate-md-encode-bug.
+
+<Q> Old versions of GnuPG can't verify ElGamal signatures
+
+    Update to GnuPG 1.0.2 or newer.
+
+
+<Q> When I use --clearsign, the plain text has sometimes extra dashes 
+in it - why?
+
+    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. 
+    
+    If you use GnuPG to process those emessage, the extra dashes are removed.
+    Good mail clients remove those extra dashes when displaying such a 
+    message.      
+
+
+
+<S> ADVANCED TOPICS
+
+<Q> How does this whole thing work?
+
+    To generate a secret/public keypair, run [H pre] gpg --gen-key
+    [H/pre] and choose the default values.
+
+    Data that is encrypted with a public key can only be decrypted by
+    the matching secret key.  The secret key is protected by a password,
+    the public key is not.
+
+    So to send your friend a message, you would encrypt your message
+    with his public key, and he would only be able to decrypt it by
+    having the secret key and putting in the password to use his secret
+    key.
+
+    GnuPG is also useful for signing things.  Things that are encrypted
+    with the secret key can be decrypted with the public key. To sign
+    something, a hash is taken of the data, and then the hash is in some
+    form encoded with the secret key. If someone has your public key, they
+    can verify that it is from you and that it hasn't changed by checking
+    the encoded form of the hash with the public key.
+  
+    A keyring is just a large file that stores keys. You have a public
+    keyring where you store yours and your friend's public keys.  You have
+    a secret keyring that you keep your secret key on, and be very careful
+    with this secret keyring: Never ever give anyone else access to it and
+    use a *good* passphrase to protect the data in it.
+  
+    You can 'conventionally' encrypt something by using the option 'gpg
+    -c'.  It is encrypted using a passphrase, and does not use public and
+    secret keys.  If the person you send the data to knows that
+    passphrase, they can decrypt it. This is usually most useful for
+    encrypting things to yourself, although you can encrypt things to your
+    own public key in the same way.  It should be used for communication
+    with partners you know and where it is easy to exchange the
+    passphrases (e.g. with your boy friend or your wife).  The advantage
+    is that you can change the passphrase from time to time and decrease
+    the risk, that many old messages may be decrypted by people who
+    accidently got your passphrase.
+  
+    You can add and copy keys to and from your keyring with the 'gpg
+    --import' and 'gpg --export' option. 'gpg --export-secret-keys' will
+    export secret keys. This is normally not useful, but you can generate
+    the key on one machine then move it to another machine.
+  
+    Keys can be signed under the 'gpg --edit-key' option.  When you sign a
+    key, you are saying that you are certain that the key belongs to the
+    person it says it comes from.  You should be very sure that is really
+    that person: You should verify the key fingerprint
+    [H pre]
+        gpg --fingerprint user-id
+    [H/pre]
+    over phone (if you really know the voice of the other person) or at a
+    key signing party (which are often held at computer conferences) or at
+    a meeting of your local GNU/Linux User Group.
+  
+    Hmm, what else.  You may use the option "-o filename" to force output
+    to this filename (use "-" to force output to stdout). "-r" just lets
+    you specify the recipient (which public key you encrypt with) on the
+    command line instead of typing it interactively.
+  
+    Oh yeah, this is important. By default all data is encrypted in some
+    weird binary format.  If you want to have things appear in ASCII text
+    that is readable, just add the '-a' option.  But the preferred method
+    is to use a MIME aware mail reader (Mutt, Pine and many more).
+  
+    There is a small security glitch in the OpenPGP (and therefore GnuPG)
+    system; to avoid this you should always sign and encrypt a message
+    instead of only encrypting it.
+
+
+<Q> Why are some signatures with an ELG-E key valid?
+
+    These are ElGamal Key generated by GnuPG in v3 (rfc1991) packets.
+    The OpenPGP draft later changed the algorithm identifier for ElGamal
+    keys which are usable for signatures and encryption from 16 to 20.
+    GnuPG now uses 20 when it generates new ElGamal keys but still
+    accept 16 (which is according to OpenPGP "encryption only") if this
+    key is in a v3 packet.  GnuPG is the only program which had used
+    these v3 ElGamal keys - so this assumption is quite safe.
+
+
+<Q> How does the whole trust thing work?
+
+    It works more or less like PGP.  The difference is that the trust is
+    computed at the time it is needed. This is one of the reasons for
+    the trustdb which holds a list of valid key signatures.  If you are
+    not running in batch mode you will be asked to assign a trust
+    parameter (ownertrust) to a key.
+
+
+
+    You can see the validity (calculated trust value) using this
+    command.
+    [H pre] gpg --list-keys --with-colons [H/pre] 
+
+    If the first field is "pub" or "uid", the second field shows you the
+    trust: 
+
+    [H pre] 
+     o = Unknown (this key is new to the system) 
+     e = The key has expired 
+     q = Undefined (no value assigned) 
+     n = Don't trust    this key at all
+     m = There is marginal trust in this key 
+     f = The key    is full trusted 
+     u = The key is ultimately trusted; this is only used
+         for keys for which the secret key is also available.  
+     r = The key    has been revoked 
+     d = The key has been disabled 
+    [H/pre] 
+
+    The value in the "pub" record is the best one of all "uid" records.
+  
+    You can get a list of the assigned trust values (how much you trust
+    the owner to correctly sign another person's key)
+  
+    [H pre] gpg --list-ownertrust [H/pre] The first field is the
+    fingerprint of the primary key, the second field is the assigned
+    value: 
+
+    [H pre] 
+     - = No Ownertrust value yet assigned.  
+     n = Never trust this keyholder to correctly verify others signatures.  
+     m = Have marginal trust in the keyholders capability to sign other
+         keys.  
+     f = Assume that the key holder really knows how to sign keys.  
+     u = No need to trust ourself because we have the secret key.  
+    [H/pre] 
+
+    Keep these values confidential because they express your opinions
+    about others.  PGP stores this information with the keyring thus it
+    is not a good idea to publish a PGP keyring instead of exporting the
+    keyring.  gnupg stores the trust in the trust-DB so it is okay to
+    give a gpg keyring away (but we have a --export command too).
+
+<Q> What kind of output is this: "key C26EE891.298, uid 09FB: ...."?
+
+    This is the internal representation of an user id in the trustdb.
+    "C26EE891" is the keyid, "298" is the local id (a record number in
+    the trustdb) and "09FB" is the last two bytes of a ripe-md-160 hash
+    of the user id for this key.
+
+<Q> How do I interpret some of the informational outputs?
+
+    While checking the validity of a key, GnuPG sometimes prints some
+    information which is prefixed with information about the checked
+    item.  [H pre] "key 12345678.3456" [H/pre] This is about the key
+    with key ID 12345678 and the internal number 3456, which is the
+    record number of the so called directory record in the trustdb.  
+    [H pre] "uid 12345678.3456/ACDE" [H/pre] This is about the user ID for
+    the same key.  To identify the user ID the last two bytes of a
+    ripe-md-160 over the user ID ring is printed.  [H pre] "sig
+    12345678.3456/ACDE/9A8B7C6D" [H/pre] This is about the signature
+    with key ID 9A8B7C6D for the above key and user ID, if it is a
+    signature which is direct on a key, the user ID part is empty
+    (..//..).
+
+<Q> Are the header lines of a cleartext signature part of the signed
+material?
+
+    No.  For example you can add or remove "Comment:" lines.  They have
+    a purpose like the mail header lines.  However a "Hash:" line is
+    needed for OpenPGP signatures to tell the parser which hash
+    algorithm to use.
+
+
+
+
+<S> ACKNOWLEDGEMENTS
+
+    Many thanks to Werner Koch for the original FAQ file and to all
+    posters to gnupg-users and gnupg-devel. They all provided most of
+    the answers.
+
+    Also thanks to Casper Dik for providing me with a script to generate
+    this FAQ (he uses it for the excellent Solaris2 FAQ).
+
+[H HR]
+
+Copyright (C) 2000 Free Software Foundation, Inc. , 
+59 Temple Place - Suite 330, Boston, MA 02111, USA 
+
+Verbatim copying and distribution of this entire article is permitted in
+any medium, provided this notice is preserved.
diff -urN gnupg-1.0.2/doc/gpg.1 gnupg-1.0.3/doc/gpg.1
--- gnupg-1.0.2/doc/gpg.1	Wed Jul 12 12:09:57 2000
+++ gnupg-1.0.3/doc/gpg.1	Wed Sep  6 16:38:47 2000
@@ -235,6 +235,13 @@
 .IP "--lsign-key \fBname\fR" 10 
 Sign a public key with you secret key but mark it as non-exportable. 
 This is a shortcut version of the subcommand "lsign" from --edit. 
+.IP "--trusted-key \fBlong key ID\fR" 10 
+Assume that the specified key (which must be given 
+as a  full 8 byte key ID) is as trustworthy as one of 
+your own secret keys. This option is useful if you 
+don't want to keep your secret keys (or one of them) 
+online but still be able to check the validity of a given 
+recipient's or signator's key.  
 .IP "--delete-key \fBname\fR" 10 
 Remove key from the public keyring 
 .IP "--delete-secret-key  \fBname\fR" 10 
@@ -273,6 +280,10 @@
 The fast version does not build 
 the trustdb; this can be done at any time with the 
 command --update-trustdb. 
+.IP "" 10 
+There are a few other options which control how this command works. 
+Most notable here is the --merge-only options which does not insert new keys 
+but does only the merging of new signatures, user-IDs and subkeys. 
 .IP "--recv-keys \fBkey IDs\fR" 10 
 Import the keys with the given key IDs from a HKP 
 keyserver. Option --keyserver must be used to 
@@ -467,10 +478,11 @@
 Write log output to file descriptor \fBn\fR and not to stderr. 
 .IP "--no-comment" 10 
 Do not write comment packets.  This option affects only 
-the generation of secret keys.	Output of option packets 
-is disabled since version 0.4.2. 
+the generation of secret keys.	Please note, that this has nothing 
+to do with the comments in clear text signatures. 
 .IP "--comment \fBstring\fR" 10 
 Use \fBstring\fR as comment string in clear text signatures. 
+To suppress those comment strings entirely, use an empty string here. 
 .IP "--default-comment" 10 
 Force to write the standard comment string in clear 
 text signatures.  Use this to overwrite a --comment 
@@ -537,8 +549,8 @@
 for conventional encryption. 
 .IP "--compress-algo \fBn\fR" 10 
 Use compress algorithm	\fBn\fR. Default is 2 which is 
-RFC1950 compression. You may use 1 to use the old zlib 
-version which is used by PGP. The default algorithm may 
+RFC1950 compression. You may use 1 to use the old zlib  
+version (RFC1951) which is used by PGP. The default algorithm may 
 give better results because the window size is not limited 
 to 8K. If this is not used the OpenPGP behavior is used, 
 i.e. the compression algorithm is selected from the 
@@ -608,6 +620,10 @@
 needed for some German keys generated with pgp 2.6.3in. You should really 
 avoid using it, because OpenPGP has better mechanics to do separate signing 
 and encryption keys. 
+.IP "--allow-freeform-uid" 10 
+Disable all checks on the form of the user ID while generating a new 
+one.  This option should only be used in very special environments as 
+it does not ensure the de-facto standard format of user IDs. 
 .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 
@@ -675,6 +691,27 @@
 This options enables a workaround by checking faulty signatures again with 
 the encoding used in old versions.  This may only happen for ElGamal signatures 
 which are not widely used. 
+.IP "--show-session-key" 10 
+Display the session key used for one message. See --override-session-key 
+for the counterpart of this option. 
+.IP "" 10 
+We think that Key-Escrow is a Bad Thing; however the user should 
+have the freedom to decide whether to go to prison or to reveal the content of 
+one specific message without compromising all messages ever encrypted for one 
+secret key. DON'T USE IT UNLESS YOU ARE REALLY FORCED TO DO SO. 
+.IP "--override-session-key \fBstring\fR " 10 
+Don't use the public key but the session key \fBstring\fR.  The format of this 
+string is the same as the one printed by --show-session-key.  This option 
+is normally not used but comes handy in case someone forces you to reveal the 
+content of an encrypted message; using this option you can do this without 
+handing out the secret key. 
+.IP "--merge-only" 10 
+Don't insert new keys into the keyrings while doing an import. 
+.IP "--try-all-secrets" 10 
+Don't look at the key ID as stored in the message but try all secret keys in 
+turn to find the right decryption key.	This option forces the behaviour as 
+used by anonymous recipients (created by using --throw-keyid) and might come 
+handy in case where an encrypted message contains a bogus key ID. 
 .SH "How to specify a user ID" 
 .PP 
 There are different ways on how to specify a user ID to GnuPG; 
@@ -788,4 +825,4 @@
 warning message about insecure memory 3our operating system supports 
 locking without being root. The program drops root privileges as soon 
 as locked memory is allocated. 
-...\" created by instant / docbook-to-man, Wed 12 Jul 2000, 12:09 
+...\" created by instant / docbook-to-man, Wed 06 Sep 2000, 16:38 
diff -urN gnupg-1.0.2/doc/gpg.sgml gnupg-1.0.3/doc/gpg.sgml
--- gnupg-1.0.2/doc/gpg.sgml	Wed Jul 12 12:09:53 2000
+++ gnupg-1.0.3/doc/gpg.sgml	Wed Sep  6 13:57:34 2000
@@ -390,6 +390,17 @@
 </para></listitem></varlistentry>
 
 <varlistentry>
+<term>--trusted-key <parameter>long key ID</parameter></term>
+<listitem><para>
+Assume that the specified key (which must be given
+as a  full 8 byte key ID) is as trustworthy as one of
+your own secret keys. This option is useful if you
+don't want to keep your secret keys (or one of them)
+online but still be able to check the validity of a given
+recipient's or signator's key. 
+</para></listitem></varlistentry>
+
+<varlistentry>
 <term>--delete-key &ParmName;</term>
 <listitem><para>
 Remove key from the public keyring
@@ -462,6 +473,11 @@
 The fast version does not build
 the trustdb; this can be done at any time with the
 command --update-trustdb.
+</para>
+<para>
+There are a few other options which control how this command works.
+Most notable here is the --merge-only options which does not insert new keys
+but does only the merging of new signatures, user-IDs and subkeys.
 </para></listitem></varlistentry>
 
 
@@ -899,8 +915,8 @@
 <term>--no-comment</term>
 <listitem><para>
 Do not write comment packets.  This option affects only
-the generation of secret keys.	Output of option packets
-is disabled since version 0.4.2.
+the generation of secret keys.	Please note, that this has nothing
+to do with the comments in clear text signatures.
 </para></listitem></varlistentry>
 
 
@@ -908,6 +924,7 @@
 <term>--comment &ParmString;</term>
 <listitem><para>
 Use &ParmString; as comment string in clear text signatures.
+To suppress those comment strings entirely, use an empty string here.
 </para></listitem></varlistentry>
 
 
@@ -1054,8 +1071,8 @@
 <term>--compress-algo &ParmN;</term>
 <listitem><para>
 Use compress algorithm	&ParmN;. Default is 2 which is
-RFC1950 compression. You may use 1 to use the old zlib
-version which is used by PGP. The default algorithm may
+RFC1950 compression. You may use 1 to use the old zlib 
+version (RFC1951) which is used by PGP. The default algorithm may
 give better results because the window size is not limited
 to 8K. If this is not used the OpenPGP behavior is used,
 i.e. the compression algorithm is selected from the
@@ -1183,6 +1200,14 @@
 avoid using it, because OpenPGP has better mechanics to do separate signing
 and encryption keys.
 </para></listitem></varlistentry>
+<varlistentry>
+
+<term>--allow-freeform-uid</term>
+<listitem><para>
+Disable all checks on the form of the user ID while generating a new
+one.  This option should only be used in very special environments as
+it does not ensure the de-facto standard format of user IDs.
+</para></listitem></varlistentry>
 
 
 <varlistentry>
@@ -1335,6 +1360,44 @@
 This options enables a workaround by checking faulty signatures again with
 the encoding used in old versions.  This may only happen for ElGamal signatures
 which are not widely used.
+</para></listitem></varlistentry>
+
+<varlistentry>
+<term>--show-session-key</term>
+<listitem><para>
+Display the session key used for one message. See --override-session-key
+for the counterpart of this option.
+</para>
+<para>
+We think that Key-Escrow is a Bad Thing; however the user should
+have the freedom to decide whether to go to prison or to reveal the content of
+one specific message without compromising all messages ever encrypted for one
+secret key. DON'T USE IT UNLESS YOU ARE REALLY FORCED TO DO SO.
+</para></listitem></varlistentry>
+
+<varlistentry>
+<term>--override-session-key &ParmString; </term>
+<listitem><para>
+Don't use the public key but the session key &ParmString;.  The format of this
+string is the same as the one printed by --show-session-key.  This option
+is normally not used but comes handy in case someone forces you to reveal the
+content of an encrypted message; using this option you can do this without
+handing out the secret key.
+</para></listitem></varlistentry>
+
+<varlistentry>
+<term>--merge-only</term>
+<listitem><para>
+Don't insert new keys into the keyrings while doing an import.
+</para></listitem></varlistentry>
+
+<varlistentry>
+<term>--try-all-secrets</term>
+<listitem><para>
+Don't look at the key ID as stored in the message but try all secret keys in
+turn to find the right decryption key.	This option forces the behaviour as
+used by anonymous recipients (created by using --throw-keyid) and might come
+handy in case where an encrypted message contains a bogus key ID.
 </para></listitem></varlistentry>
 
 
diff -urN gnupg-1.0.2/g10/ChangeLog gnupg-1.0.3/g10/ChangeLog
--- gnupg-1.0.2/g10/ChangeLog	Wed Jul 12 13:32:09 2000
+++ gnupg-1.0.3/g10/ChangeLog	Mon Sep 18 12:13:54 2000
@@ -1,20 +1,137 @@
-Wed Jul 12 13:32:06 CEST 2000  Werner Koch  <wk@>
+Mon Sep 18 12:13:52 CEST 2000  Werner Koch  <wk@openit.de>
+
+        * hkp.c (not_implemented): Print a notice for W32
+
+Fri Sep 15 18:40:36 CEST 2000  Werner Koch  <wk@openit.de>
+
+        * keygen.c (keygen_add_std_prefs): Changed order of preferences to
+        twofish, cast5, blowfish.
+
+        * pkclist.c (algo_available): Removed hack to disable Twofish.
+
+Thu Sep 14 17:45:11 CEST 2000  Werner Koch  <wk@openit.de>
+
+        * parse-packet.c (dump_sig_subpkt): Dump key flags. Print special
+        warning in case of faked ARRs.
+
+        * getkey.c (finsih_lookup): Hack so that for v4 RSA keys the subkey
+        is used for encryption.
+
+Thu Sep 14 14:20:38 CEST 2000  Werner Koch  <wk@openit.de>
+
+        * g10.c (main): Default S2K algorithms are now SHA1 and CAST5 - this
+        should solve a lot of compatibility problems with other OpenPGP
+        apps because those algorithms are SHOULD and not optional.  The old
+        way to force it was by using the --openpgp option whith the drawback 
+        that this would disable a couple of workarounds for PGP.
+
+        * g10.c (main): Don't set --quite along with --no-tty.  By Frank Tobin.
+
+        * misc.c (disable_core_dump): Don't display a warning here but a return
+        a status value and ...
+        * g10.c (main): ...print warnining here. Suggested by Sam Roberts.
+
+Wed Sep 13 18:12:34 CEST 2000  Werner Koch  <wk@openit.de>
+
+        * keyedit.c (keyedit_menu): Allow to use "debug" on the secret key.
+
+        * ringedit.c (cmp_seckey): Fix for v4 RSA keys.
+        * seckey-cert.c (do_check): Workaround for PGP 7 bug.
+
+Wed Sep  6 17:55:47 CEST 2000  Werner Koch  <wk@openit.de>
+
+        * misc.c (print_pubkey_algo_note): Do not print the RSA notice.
+        * sig-check.c (do_signature_check): Do not emit the RSA status message.
+        * pubkey-enc.c (get_session_key): Ditto.
+
+        * encode.c (encode_simple, encode_crypt): Fix for large files.
+        * sign.c (sign_file): Ditto.
+
+Wed Sep  6 14:59:09 CEST 2000  Werner Koch  <wk@openit.de>
+
+        * passphrase.c (hash_passphrase): Removed funny assert.  Reported by
+        David Mathog.
+
+        * openfile.c (try_make_homedir): Changes for non-Posix systems.
+        * g10.c (main): Take the default homedir from macro.
+
+        * g10.c: The --trusted-key option is back.
+        * trustdb.c (verify_own_key): Handle this option.
+        (add_ultimate_key): Moved stuff from verify_own_key to this new func.
+        (register_trusted_key): New.
+
+Fri Aug 25 16:05:38 CEST 2000  Werner Koch  <wk@openit.de>
+
+        * parse-packet.c (dump_sig_subpkt): Print info about the ARR.
+
+        * openfile.c (overwrite_filep): Always return okay if the file is
+        called /dev/null. 
+        (make_outfile_name): Add ".sign" to the list of know extensions.
+        (open_sigfile): Ditto.
+
+Wed Aug 23 19:52:51 CEST 2000  Werner Koch  <wk@openit.de>
+
+        * g10.c: New option --allow-freeform-uid. By Jeroen C. van Gelderen.
+        * keygen.c (ask_user_id): Implemented here.
+
+Fri Aug  4 14:23:05 CEST 2000  Werner Koch  <wk@openit.de>
+
+  * status.c (do_get_from_fd): Ooops, we used fd instead of opt.command_fd.
+  Thanks to Michael Tokarev.
+
+Tue Aug  1 20:06:23 CEST 2000  Werner Koch  <wk@openit.de>
+
+  * g10.c: New opttion --try-all-secrets on suggestion from Matthias Urlichs.
+  * pubkey-enc.c (get_session_key): Quite easy to implement here.
+
+Thu Jul 27 17:33:04 CEST 2000  Werner Koch  <wk@openit.de>
+
+  * g10.c: New option --merge-only.  Suggested by Brendan O'Dea.
+  * import.c (import_one): Implemented it here
+  (import_secret_one): Ditto.
+  (print_stats): and give some stats.
+
+Thu Jul 27 12:01:00 CEST 2000  Werner Koch  <wk@openit.de>
+
+  * g10.c: New options --show-session-key and --override-session-key
+  * pubkey-enc.c (hextobyte): New.
+  (get_override_session_key): New.
+  * mainproc.c (proc_pubkey_enc): Add session-key stuff.
+  * status.h, status.c (STATUS_SESSION_KEY): New.
+
+Thu Jul 27 10:02:38 CEST 2000  Werner Koch  <wk@openit.de>
+
+  * g10.c (main): Use setmode(O_BINARY) for MSDOS while generating random bytes
+  (print_mds): Likewise for stdin.
+  * plaintext.c (handle_plaintext): Likewise for stdout.
+
+Mon Jul 24 10:30:17 CEST 2000  Werner Koch  <wk@openit.de>
+
+  * keyedit.c (menu_expire): expire date for primary key can be set again.
+
+Wed Jul 19 11:26:43 CEST 2000  Werner Koch  <wk@openit.de>
+
+  * keylist.c (is_uid_valid): New.
+  (list_keyblock): Print validity information for all user IDs.  Note, this
+  has to be done at other places too; for now we have only minimal support.
+
+Wed Jul 12 13:32:06 CEST 2000  Werner Koch  <wk@openit.de>
 
   * helptext.c, pkclist.c: s/superseeded/superseded/
 
-Mon Jul 10 16:08:57 CEST 2000  Werner Koch  <wk@>
+Mon Jul 10 16:08:57 CEST 2000  Werner Koch  <wk@openit.de>
 
   * parse-packet.c (enum_sig_subpkt): Fixed testing on crtitical bit in case
   of a NULL buffer.  Reported by Peter Marschall.
 
-Wed Jul  5 13:28:45 CEST 2000  Werner Koch  <wk@>
+Wed Jul  5 13:28:45 CEST 2000  Werner Koch  <wk@openit.de>
 
   * keyedit.c, keyid.c: Add some _()
 
   * argparse.c:  Changed the flag to suppress --version handling to also
   suppress --help.
 
-Wed Jun 28 11:54:44 CEST 2000  Werner Koch  <wk@>
+Wed Jun 28 11:54:44 CEST 2000  Werner Koch  <wk@openit.de>
 
   * armor.c (armor_filter): Set sigclass to 0 in case of non-dash-escaped
   clearsig.  This makes this mode work again.
@@ -52,7 +169,7 @@
 
 Wed Jun  7 19:19:09 CEST 2000  Werner Koch  <wk@openit.de>
 
-  * sig-check.c (do_check): Use EMULATE_MDENCODE also on v4 paclets.
+  * sig-check.c (do_check): Use EMULATE_MDENCODE also on v4 packets.
 
 Wed Jun  7 17:25:38 CEST 2000  Werner Koch  <wk@openit.de>
 
diff -urN gnupg-1.0.2/g10/Makefile.in gnupg-1.0.3/g10/Makefile.in
--- gnupg-1.0.2/g10/Makefile.in	Wed Jul 12 14:59:38 2000
+++ gnupg-1.0.3/g10/Makefile.in	Mon Sep 18 12:17:59 2000
@@ -75,6 +75,7 @@
 DYNAMIC_CIPHER_MODS = @DYNAMIC_CIPHER_MODS@
 DYNLINK_LDFLAGS = @DYNLINK_LDFLAGS@
 DYNLINK_MOD_CFLAGS = @DYNLINK_MOD_CFLAGS@
+FAQPROG = @FAQPROG@
 GENCAT = @GENCAT@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
diff -urN gnupg-1.0.2/g10/encode.c gnupg-1.0.3/g10/encode.c
--- gnupg-1.0.2/g10/encode.c	Wed May 31 21:22:33 2000
+++ gnupg-1.0.3/g10/encode.c	Wed Sep  6 17:21:35 2000
@@ -169,6 +169,11 @@
     if( filename && !opt.textmode && !mode ) {
 	if( !(filesize = iobuf_get_filelength(inp)) )
 	    log_info(_("%s: WARNING: empty file\n"), filename );
+        /* we can't yet encode the length of very large files,
+         * so we switch to partial lengthn encoding in this case */
+        if ( filesize >= IOBUF_FILELENGTH_LIMIT )
+            filesize = 0;
+
     }
     else
 	filesize = opt.set_filesize ? opt.set_filesize : 0; /* stdin */
@@ -317,6 +322,10 @@
     if( filename && !opt.textmode ) {
 	if( !(filesize = iobuf_get_filelength(inp)) )
 	    log_info(_("%s: WARNING: empty file\n"), filename );
+        /* we can't yet encode the length of very large files,
+         * so we switch to partial lengthn encoding in this case */
+        if ( filesize >= IOBUF_FILELENGTH_LIMIT )
+            filesize = 0;
     }
     else
 	filesize = opt.set_filesize ? opt.set_filesize : 0; /* stdin */
diff -urN gnupg-1.0.2/g10/g10.c gnupg-1.0.3/g10/g10.c
--- gnupg-1.0.2/g10/g10.c	Tue Jun 27 10:17:35 2000
+++ gnupg-1.0.3/g10/g10.c	Thu Sep 14 12:45:01 2000
@@ -25,6 +25,9 @@
 #include <string.h>
 #include <ctype.h>
 #include <unistd.h>
+#ifdef HAVE_DOSISH_SYSTEM
+  #include <fcntl.h> /* for setmode() */
+#endif
 
 
 #include "packet.h"
@@ -179,14 +182,20 @@
     oDisableCipherAlgo,
     oDisablePubkeyAlgo,
     oAllowNonSelfsignedUID,
+    oAllowFreeformUID,
     oNoLiteral,
     oSetFilesize,
     oHonorHttpProxy,
     oFastListMode,
     oListOnly,
     oIgnoreTimeConflict,
+    oShowSessionKey,
+    oOverrideSessionKey,
     oNoRandomSeedFile,
     oNoAutoKeyRetrieve,
+    oMergeOnly,
+    oTryAllSecrets,
+    oTrustedKey,
     oEmu3DESS2KBug,  /* will be removed in 1.1 */
     oEmuMDEncodeBug,
 aTest };
@@ -287,6 +296,7 @@
     { oCompletesNeeded, "completes-needed", 1, "@"},
     { oMarginalsNeeded, "marginals-needed", 1, "@"},
     { oMaxCertDepth,	"max-cert-depth", 1, "@" },
+    { oTrustedKey, "trusted-key", 2, N_("|KEYID|ulimately trust this key")},
     { oLoadExtension, "load-extension" ,2, N_("|FILE|load extension module FILE")},
     { oRFC1991, "rfc1991",   0, N_("emulate the mode described in RFC1991")},
     { oOpenPGP, "openpgp", 0, N_("set all packet, cipher and digest options to OpenPGP behavior")},
@@ -361,14 +371,19 @@
     { oDisableCipherAlgo,  "disable-cipher-algo", 2, "@" },
     { oDisablePubkeyAlgo,  "disable-pubkey-algo", 2, "@" },
     { oAllowNonSelfsignedUID, "allow-non-selfsigned-uid", 0, "@" },
+    { oAllowFreeformUID, "allow-freeform-uid", 0, "@" },
     { oNoLiteral, "no-literal", 0, "@" },
     { oSetFilesize, "set-filesize", 20, "@" },
     { oHonorHttpProxy,"honor-http-proxy", 0, "@" },
     { oFastListMode,"fast-list-mode", 0, "@" },
     { oListOnly, "list-only", 0, "@"},
     { oIgnoreTimeConflict, "ignore-time-conflict", 0, "@" },
+    { oShowSessionKey, "show-session-key", 0, "@" },
+    { oOverrideSessionKey, "override-session-key", 2, "@" },
     { oNoRandomSeedFile,  "no-random-seed-file", 0, "@" },
     { oNoAutoKeyRetrieve, "no-auto-key-retrieve", 0, "@" },
+    { oMergeOnly,	  "merge-only", 0, "@" },
+    { oTryAllSecrets,  "try-all-secrets", 0, "@" },
     { oEmu3DESS2KBug,  "emulate-3des-s2k-bug", 0, "@"},
     { oEmuMDEncodeBug,	"emulate-md-encode-bug", 0, "@"},
 {0} };
@@ -565,6 +580,7 @@
     char **orig_argv;
     const char *fname;
     char *username;
+    int may_coredump;
     STRLIST sl, remusr= NULL, locusr=NULL;
     STRLIST nrings=NULL, sec_nrings=NULL;
     armor_filter_context_t afx;
@@ -598,7 +614,7 @@
      */
     log_set_name("gpg");
     secure_random_alloc(); /* put random number into secure memory */
-    disable_core_dumps();
+    may_coredump = disable_core_dumps();
     init_signals();
     create_dotlock(NULL); /* register locking cleanup */
     i18n_init();
@@ -609,8 +625,8 @@
     opt.def_digest_algo = 0;
     opt.def_compress_algo = 2;
     opt.s2k_mode = 3; /* iterated+salted */
-    opt.s2k_digest_algo = DIGEST_ALGO_RMD160;
-    opt.s2k_cipher_algo = CIPHER_ALGO_BLOWFISH;
+    opt.s2k_digest_algo = DIGEST_ALGO_SHA1;
+    opt.s2k_cipher_algo = CIPHER_ALGO_CAST5;
     opt.completes_needed = 1;
     opt.marginals_needed = 3;
     opt.max_cert_depth = 5;
@@ -622,11 +638,7 @@
     opt.homedir = getenv("GNUPGHOME");
   #endif
     if( !opt.homedir || !*opt.homedir ) {
-      #ifdef HAVE_DRIVE_LETTERS
-	opt.homedir = "c:/gnupg";
-      #else
-	opt.homedir = "~/.gnupg";
-      #endif
+	opt.homedir = GNUPG_HOMEDIR;
     }
 
     /* check whether we have a config file on the commandline */
@@ -756,7 +768,7 @@
 	  case oArmor: opt.armor = 1; opt.no_armor=0; break;
 	  case oOutput: opt.outfile = pargs.r.ret_str; break;
 	  case oQuiet: opt.quiet = 1; break;
-	  case oNoTTY: opt.quiet = 1; tty_no_terminal(1); break;
+	  case oNoTTY: tty_no_terminal(1); break;
 	  case oDryRun: opt.dry_run = 1; break;
 	  case oInteractive: opt.interactive = 1; break;
 	  case oVerbose: g10_opt_verbose++;
@@ -842,7 +854,7 @@
 	    opt.def_cipher_algo = 0;
 	    opt.def_digest_algo = 0;
 	    opt.def_compress_algo = 1;
-	    opt.s2k_mode = 3; /* iterated+salted */
+            opt.s2k_mode = 3; /* iterated+salted */
 	    opt.s2k_digest_algo = DIGEST_ALGO_SHA1;
 	    opt.s2k_cipher_algo = CIPHER_ALGO_CAST5;
 	    break;
@@ -909,6 +921,7 @@
 		disable_pubkey_algo( string_to_pubkey_algo(pargs.r.ret_str) );
 		break;
 	  case oAllowNonSelfsignedUID: opt.allow_non_selfsigned_uid = 1; break;
+	  case oAllowFreeformUID: opt.allow_freeform_uid = 1; break;
 	  case oNoLiteral: opt.no_literal = 1; break;
 	  case oSetFilesize: opt.set_filesize = pargs.r.ret_ulong; break;
 	  case oHonorHttpProxy: opt.honor_http_proxy = 1; break;
@@ -917,6 +930,13 @@
 	  case oIgnoreTimeConflict: opt.ignore_time_conflict = 1; break;
 	  case oNoRandomSeedFile: use_random_seed = 0; break;
 	  case oNoAutoKeyRetrieve: opt.auto_key_retrieve = 0; break;
+	  case oShowSessionKey: opt.show_session_key = 1; break;
+	  case oOverrideSessionKey:
+		opt.override_session_key = pargs.r.ret_str;
+		break;
+	  case oMergeOnly: opt.merge_only = 1; break;
+	  case oTryAllSecrets: opt.try_all_secrets = 1; break;
+          case oTrustedKey: register_trusted_key( pargs.r.ret_str ); break;
 
 	  default : pargs.err = configfp? 1:2; break;
 	}
@@ -945,6 +965,11 @@
 	log_info("used in a production environment or with production keys!\n");
     }
   #endif
+
+    if( may_coredump && !opt.quiet )
+	log_info(_("WARNING: program may create a core file!\n"));
+
+
     if (opt.no_literal) {
 	log_info(_("NOTE: %s is not for normal use!\n"), "--no-literal");
 	if (opt.textmode)
@@ -1392,6 +1417,9 @@
 		size_t n = !endless && count < 100? count : 100;
 
 		p = get_random_bits( n*8, level, 0);
+	      #ifdef HAVE_DOSISH_SYSTEM
+		setmode ( fileno(stdout), O_BINARY );
+	      #endif
 		fwrite( p, n, 1, stdout );
 		m_free(p);
 		if( !endless )
@@ -1590,6 +1618,9 @@
 
     if( !fname ) {
 	fp = stdin;
+      #ifdef HAVE_DOSISH_SYSTEM
+	setmode ( fileno(fp) , O_BINARY );
+      #endif
 	pname = m_strdup("[stdin]: ");
     }
     else {
diff -urN gnupg-1.0.2/g10/getkey.c gnupg-1.0.3/g10/getkey.c
--- gnupg-1.0.2/g10/getkey.c	Tue May  9 08:59:26 2000
+++ gnupg-1.0.3/g10/getkey.c	Thu Sep 14 16:50:39 2000
@@ -1598,7 +1598,40 @@
 	merge_one_pk_and_selfsig( keyblock, keyblock, pk );
     }
     else {
-	if( primary && pk->pubkey_usage
+	if( primary && pk->pubkey_usage == PUBKEY_USAGE_ENC
+            && keyblock->pkt->pkt.public_key->version > 3
+            && keyblock->pkt->pkt.public_key->pubkey_algo == PUBKEY_ALGO_RSA
+            && k->pkt->pkttype == PKT_PUBLIC_KEY ) {
+	    /* Ugly hack to support v4 RSA keys.  Here we assume that the
+               primary key should be used only for signing and a subkey
+               should be used for encryption.  So now look for a subkey.
+            */
+            KBNODE save_k = k;
+	    u32 mainkid[2];
+	    u32 cur_time = make_timestamp();
+
+	    keyid_from_pk( keyblock->pkt->pkt.public_key, mainkid );
+
+            for(k = save_k ; k; k = k->next ) {
+                if( k->pkt->pkttype == PKT_PUBLIC_SUBKEY
+                    && !check_pubkey_algo2(
+                        k->pkt->pkt.public_key->pubkey_algo,
+                        pk->pubkey_usage )
+                    && !has_expired( k, mainkid, cur_time )
+                    )
+                    break;
+            }
+	    
+	    if( !k )
+		k = save_k; /* not found: better use the main key instead */
+	    else
+		log_info(_("using secondary key %08lX "
+			   "instead of primary key %08lX\n"),
+		      (ulong)keyid_from_pk( k->pkt->pkt.public_key, NULL),
+		      (ulong)keyid_from_pk( save_k->pkt->pkt.public_key, NULL)
+			);
+	}
+	else if( primary && pk->pubkey_usage
 	    && check_pubkey_algo2( k->pkt->pkt.public_key->pubkey_algo,
 		       pk->pubkey_usage ) == G10ERR_WR_PUBKEY_ALGO ) {
 	    /* if the usage is not correct, try to use a subkey */
diff -urN gnupg-1.0.2/g10/hkp.c gnupg-1.0.3/g10/hkp.c
--- gnupg-1.0.2/g10/hkp.c	Mon May 22 11:33:33 2000
+++ gnupg-1.0.3/g10/hkp.c	Mon Sep 18 11:32:27 2000
@@ -38,6 +38,15 @@
 static int urlencode_filter( void *opaque, int control,
 			     IOBUF a, byte *buf, size_t *ret_len);
 
+#ifdef HAVE_DOSISH_SYSTEM
+static void
+not_implemented(void)
+{
+    log_error("keyserver access ist not yet available for MS-Windows\n");
+}
+#endif
+
+
 /****************
  * Try to import the key with KEYID from a keyserver but ask the user
  * before doing so.
@@ -50,6 +59,7 @@
 hkp_ask_import( u32 *keyid )
 {
   #ifdef HAVE_DOSISH_SYSTEM
+    not_implemented();
     return -1;
   #else
     struct http_context hd;
@@ -92,6 +102,7 @@
 hkp_import( STRLIST users )
 {
   #ifdef HAVE_DOSISH_SYSTEM
+    not_implemented();
     return -1;
   #else
     if( !opt.keyserver_name ) {
@@ -122,6 +133,7 @@
 hkp_export( STRLIST users )
 {
   #ifdef HAVE_DOSISH_SYSTEM
+    not_implemented();
     return -1;
   #else
     int rc;
diff -urN gnupg-1.0.2/g10/import.c gnupg-1.0.3/g10/import.c
--- gnupg-1.0.2/g10/import.c	Tue May  9 08:59:58 2000
+++ gnupg-1.0.3/g10/import.c	Thu Jul 27 17:31:09 2000
@@ -50,6 +50,7 @@
     ulong secret_read;
     ulong secret_imported;
     ulong secret_dups;
+    ulong skipped_new_keys;
 } stats;
 
 
@@ -201,6 +202,9 @@
 {
     if( !opt.quiet ) {
 	log_info(_("Total number processed: %lu\n"), stats.count );
+	if( stats.skipped_new_keys )
+	    log_info(_("      skipped new keys: %lu\n"),
+						stats.skipped_new_keys );
 	if( stats.no_user_id )
 	    log_info(_("          w/o user IDs: %lu\n"), stats.no_user_id );
 	if( stats.imported || stats.imported_rsa ) {
@@ -228,8 +232,8 @@
     }
 
     if( is_status_enabled() ) {
-	char buf[12*20];
-	sprintf(buf, "%lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu",
+	char buf[13*20];
+	sprintf(buf, "%lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu",
 		stats.count,
 		stats.no_user_id,
 		stats.imported,
@@ -241,7 +245,8 @@
 		stats.n_revoc,
 		stats.secret_read,
 		stats.secret_imported,
-		stats.secret_dups);
+		stats.secret_dups,
+		stats.skipped_new_keys );
 	write_status_text( STATUS_IMPORT_RES, buf );
     }
 }
@@ -413,6 +418,13 @@
 	log_error( _("key %08lX: public key not found: %s\n"),
 				(ulong)keyid[1], g10_errstr(rc));
     }
+    else if ( rc && opt.merge_only ) {
+	if( opt.verbose )
+	    log_info( _("key %08lX: new key - skipped\n"), (ulong)keyid[1] );
+	rc = 0;
+	fast = 1; /* so that we don't get into the trustdb update */
+	stats.skipped_new_keys++;
+    }
     else if( rc ) { /* insert this key */
 	/* get default resource */
 	if( get_keyblock_handle( NULL, 0, &kbpos ) ) {
@@ -583,7 +595,7 @@
 
     /* do we have this key already in one of our secrings ? */
     rc = seckey_available( keyid );
-    if( rc == G10ERR_NO_SECKEY ) { /* simply insert this key */
+    if( rc == G10ERR_NO_SECKEY && !opt.merge_only ) { /* simply insert this key */
 	/* get default resource */
 	if( get_keyblock_handle( NULL, 1, &kbpos ) ) {
 	    log_error("no default secret keyring\n");
diff -urN gnupg-1.0.2/g10/keyedit.c gnupg-1.0.3/g10/keyedit.c
--- gnupg-1.0.2/g10/keyedit.c	Fri Jun 30 07:54:39 2000
+++ gnupg-1.0.3/g10/keyedit.c	Wed Sep 13 16:07:22 2000
@@ -592,7 +592,7 @@
 	{ N_("sign")    , cmdSIGN      , 0,1,1, N_("sign the key") },
 	{ N_("s")       , cmdSIGN      , 0,1,1, NULL },
 	{ N_("lsign")   , cmdLSIGN     , 0,1,1, N_("sign the key locally") },
-	{ N_("debug")   , cmdDEBUG     , 0,1,0, NULL },
+	{ N_("debug")   , cmdDEBUG     , 0,0,0, NULL },
 	{ N_("adduid")  , cmdADDUID    , 1,1,0, N_("add a user ID") },
 	{ N_("deluid")  , cmdDELUID    , 0,1,0, N_("delete user ID") },
 	{ N_("addkey")  , cmdADDKEY    , 1,1,0, N_("add a secondary key") },
@@ -1501,7 +1501,7 @@
 	else if( node->pkt->pkttype == PKT_USER_ID )
 	    uid = node->pkt->pkt.user_id;
 	else if( main_pk && node->pkt->pkttype == PKT_SIGNATURE
-		 && sub_pk != NULL ) {
+		 && ( mainkey || sub_pk ) ) {
 	    PKT_signature *sig = node->pkt->pkt.signature;
 	    if( keyid[0] == sig->keyid[0] && keyid[1] == sig->keyid[1]
 		&& (	(mainkey && uid && (sig->sig_class&~3) == 0x10)
diff -urN gnupg-1.0.2/g10/keygen.c gnupg-1.0.3/g10/keygen.c
--- gnupg-1.0.2/g10/keygen.c	Wed Jun 28 11:47:50 2000
+++ gnupg-1.0.3/g10/keygen.c	Fri Sep 15 18:38:14 2000
@@ -136,8 +136,8 @@
     keygen_add_key_expire( sig, opaque );
 
     buf[0] = CIPHER_ALGO_TWOFISH;
-    buf[1] = CIPHER_ALGO_BLOWFISH;
-    buf[2] = CIPHER_ALGO_CAST5;
+    buf[1] = CIPHER_ALGO_CAST5;
+    buf[2] = CIPHER_ALGO_BLOWFISH;
     build_sig_subpkt( sig, SIGSUBPKT_PREF_SYM, buf, 3 );
 
     buf[0] = DIGEST_ALGO_RMD160;
@@ -415,6 +415,8 @@
 }
 
 #if 0
+/* we can't enable generation right now, becuase we first need to implement
+ * the keyflags */
 static int
 gen_rsa(int algo, unsigned nbits, KBNODE pub_root, KBNODE sec_root, DEK *dek,
 	STRING2KEY *s2k, PKT_secret_key **ret_sk, u32 expireval )
@@ -793,7 +795,11 @@
 		aname = cpr_get("keygen.name",_("Real name: "));
 		trim_spaces(aname);
 		cpr_kill_prompt();
-		if( strpbrk( aname, "<([])>" ) )
+
+		if( opt.allow_freeform_uid )
+		    break;
+
+		if( strpbrk( aname, "<>" ) )
 		    tty_printf(_("Invalid character in name\n"));
 		else if( isdigit(*aname) )
 		    tty_printf(_("Name may not start with a digit\n"));
diff -urN gnupg-1.0.2/g10/keylist.c gnupg-1.0.3/g10/keylist.c
--- gnupg-1.0.2/g10/keylist.c	Tue May  9 09:00:38 2000
+++ gnupg-1.0.3/g10/keylist.c	Mon Jul 24 10:11:30 2000
@@ -105,6 +105,84 @@
 }
 
 
+/****************
+ * Check whether the user ID at NODE is valid; that is it has a
+ * valid self-signature but no later valid revocation.
+ * Caller has to pass the keyID of the primary in mainkey.
+ * Returns: NULL = valid
+ *	    string with the reason why it is invalid
+ */
+static const char *
+is_uid_valid ( KBNODE keyblock, KBNODE uidnode, u32 *mainkid )
+{
+    KBNODE node;
+    PKT_signature *selfsig = NULL; /* the latest valid self signature */
+
+    /* The key signature verify function can's handle secret keys yet and
+     * becuase we are not sure whether the duplication of user IDs and
+     * self-signatures should be kept on secret keys we are not going to fix
+     * it there. */
+    if ( keyblock->pkt->pkttype == PKT_SECRET_KEY )
+	return NULL;
+
+    assert ( uidnode->pkt->pkttype == PKT_USER_ID
+	     || uidnode->pkt->pkttype == PKT_PHOTO_ID );
+
+    /* first find out about the latest valid self-signature */
+    for ( node = uidnode->next; node; node = node->next ) {
+	PKT_signature *sig;
+
+	if ( node->pkt->pkttype == PKT_USER_ID
+	     || node->pkt->pkttype == PKT_PHOTO_ID
+	     || node->pkt->pkttype == PKT_PUBLIC_SUBKEY
+	     || node->pkt->pkttype == PKT_SECRET_SUBKEY )
+	    break;
+	if ( node->pkt->pkttype != PKT_SIGNATURE )
+	    continue;
+	sig = node->pkt->pkt.signature;
+	if ( mainkid[0] != sig->keyid[0] || mainkid[1] != sig->keyid[1] )
+	    continue; /* we only care about self-signatures for now */
+
+	if ( (sig->sig_class&~3) == 0x10 ) { /* regular self signature */
+	    if ( !check_key_signature( keyblock, node, NULL ) ) {
+		if ( !selfsig )
+		    selfsig = sig; /* use the first valid sig */
+		else if ( sig->timestamp > selfsig->timestamp
+			  && sig->sig_class >= selfsig->sig_class )
+		    selfsig = sig; /* but this one is newer */
+	    }
+	}
+    }
+
+    if ( !selfsig )
+	return _("invalid"); /* no valid self signature */
+
+    /* watch out for a newer revocation */
+    for ( node = uidnode->next; node; node = node->next ) {
+	PKT_signature *sig;
+
+	if ( node->pkt->pkttype == PKT_USER_ID
+	     || node->pkt->pkttype == PKT_PHOTO_ID
+	     || node->pkt->pkttype == PKT_PUBLIC_SUBKEY
+	     || node->pkt->pkttype == PKT_SECRET_SUBKEY )
+	    break;
+	if ( node->pkt->pkttype != PKT_SIGNATURE )
+	    continue;
+	sig = node->pkt->pkt.signature;
+	if ( mainkid[0] != sig->keyid[0] || mainkid[1] != sig->keyid[1] )
+	    continue; /* we only care about self-signatures for now */
+
+	if ( sig->sig_class == 0x30
+	     && sig->timestamp >= selfsig->timestamp ) {
+	    if ( !check_key_signature( keyblock, node, NULL ) )
+		return _("revoked");
+	}
+    }
+
+    return NULL; /* UID is valid */
+}
+
+
 
 static void
 list_one( STRLIST names, int secret )
@@ -257,14 +335,18 @@
 		    printf("uid%*s", 28, "");
 	    }
 	    if( opt.with_colons ) {
+		/* FIXME: check that uID is valid here too */
 		print_string( stdout,  node->pkt->pkt.user_id->name,
 			      node->pkt->pkt.user_id->len, ':' );
 		putchar(':');
 	    }
-	    else
+	    else {
+		const char *s = is_uid_valid ( keyblock, node, keyid );
+		if ( s )
+		    printf ("[%s] ", s );
 		print_utf8_string( stdout,  node->pkt->pkt.user_id->name,
 				   node->pkt->pkt.user_id->len );
-
+	    }
 	    putchar('\n');
 	    if( !any ) {
 		if( opt.fingerprint )
diff -urN gnupg-1.0.2/g10/main.h gnupg-1.0.3/g10/main.h
--- gnupg-1.0.2/g10/main.h	Mon Jun  5 23:15:02 2000
+++ gnupg-1.0.3/g10/main.h	Thu Sep 14 14:00:55 2000
@@ -54,7 +54,7 @@
 
 /*-- misc.c --*/
 void trap_unaligned(void);
-void disable_core_dumps(void);
+int disable_core_dumps(void);
 u16 checksum_u16( unsigned n );
 u16 checksum( byte *p, unsigned n );
 u16 checksum_mpi( MPI a );
diff -urN gnupg-1.0.2/g10/mainproc.c gnupg-1.0.3/g10/mainproc.c
--- gnupg-1.0.2/g10/mainproc.c	Tue Jun 27 10:36:45 2000
+++ gnupg-1.0.3/g10/mainproc.c	Thu Jul 27 11:25:40 2000
@@ -219,8 +219,17 @@
 	write_status_text( STATUS_ENC_TO, buf );
     }
 
-
-    if( is_ELGAMAL(enc->pubkey_algo)
+    if( !opt.list_only && opt.override_session_key ) {
+	/* It does not make nuch sense to store the session key in
+	 * secure memory because it has already been passed on the
+	 * command line and the GCHQ knows about it */
+	c->dek = m_alloc( sizeof *c->dek );
+	result = get_override_session_key ( c->dek, opt.override_session_key );
+	if ( result ) {
+	    m_free(c->dek); c->dek = NULL;
+	}
+    }
+    else if( is_ELGAMAL(enc->pubkey_algo)
 	|| enc->pubkey_algo == PUBKEY_ALGO_DSA
 	|| is_RSA(enc->pubkey_algo)  ) {
 	if ( !c->dek && ((!enc->keyid[0] && !enc->keyid[1])
@@ -246,6 +255,15 @@
     else if( !result ) {
 	if( opt.verbose > 1 )
 	    log_info( _("public key encrypted data: good DEK\n") );
+	if ( opt.show_session_key ) {
+	    int i;
+	    char *buf = m_alloc ( c->dek->keylen*2 + 20 );
+	    sprintf ( buf, "%d:", c->dek->algo );
+	    for(i=0; i < c->dek->keylen; i++ )
+		sprintf(buf+strlen(buf), "%02X", c->dek->key[i] );
+	    log_info( "session key: \"%s\"\n", buf );
+	    write_status_text ( STATUS_SESSION_KEY, buf );
+	}
     }
     else { /* store it for later display */
 	struct kidlist_item *x = m_alloc( sizeof *x );
diff -urN gnupg-1.0.2/g10/misc.c gnupg-1.0.3/g10/misc.c
--- gnupg-1.0.2/g10/misc.c	Tue May  9 09:03:14 2000
+++ gnupg-1.0.3/g10/misc.c	Thu Sep 14 12:59:24 2000
@@ -79,22 +79,23 @@
 #endif
 
 
-void
+int
 disable_core_dumps()
 {
- #ifndef HAVE_DOSISH_SYSTEM
+ #ifdef HAVE_DOSISH_SYSTEM
+    return 0;
+ #else
   #ifdef HAVE_SETRLIMIT
     struct rlimit limit;
 
     limit.rlim_cur = 0;
     limit.rlim_max = 0;
     if( !setrlimit( RLIMIT_CORE, &limit ) )
-	return;
-    if( errno != EINVAL )
+	return 0;
+    if( errno != EINVAL && errno != ENOSYS )
 	log_fatal(_("can't disable core dumps: %s\n"), strerror(errno) );
   #endif
-    if( !opt.quiet )
-	log_info(_("WARNING: program may create a core file!\n"));
+    return 1;
  #endif
 }
 
@@ -211,15 +212,6 @@
 {
     if( algo >= 100 && algo <= 110 )
 	no_exp_algo();
-    else if( is_RSA( algo ) ) {
-	static int did_note = 0;
-
-	if( !did_note ) {
-	    did_note = 1;
-	    log_info(_("RSA keys are deprecated; please consider "
-		       "creating a new key and use this key in the future\n"));
-	}
-    }
 }
 
 void
@@ -250,6 +242,8 @@
     if( algo >= 100 && algo <= 110 )
 	no_exp_algo();
 }
+
+
 
 
 
diff -urN gnupg-1.0.2/g10/openfile.c gnupg-1.0.3/g10/openfile.c
--- gnupg-1.0.2/g10/openfile.c	Tue May  9 09:03:09 2000
+++ gnupg-1.0.3/g10/openfile.c	Tue Sep  5 17:31:57 2000
@@ -70,6 +70,11 @@
     if( access( fname, F_OK ) )
 	return 1; /* does not exist */
 
+#ifndef HAVE_DOSISH_SYSTEM
+    if ( !strcmp ( fname, "/dev/null" ) )
+        return 1; /* does not do any harm */
+#endif
+
     /* fixme: add some backup stuff in case of overwrite */
     if( opt.answer_yes )
 	return 1;
@@ -105,6 +110,11 @@
 	buf[n-4] = 0;
 	return buf;
     }
+    else if( n > 5 && !CMP_FILENAME(iname+n-5,".sign") ) {
+	char *buf = m_strdup( iname );
+	buf[n-5] = 0;
+	return buf;
+    }
 
     log_info(_("%s: unknown suffix\n"), iname );
     return NULL;
@@ -241,7 +251,8 @@
     if( iname && !(*iname == '-' && !iname[1]) ) {
 	len = strlen(iname);
 	if( len > 4 && ( !strcmp(iname + len - 4, ".sig")
-			|| !strcmp(iname + len - 4, ".asc")) ) {
+                        || ( len > 5 && !strcmp(iname + len - 5, ".sign") )
+                        || !strcmp(iname + len - 4, ".asc")) ) {
 	    char *buf;
 	    buf = m_strdup(iname);
 	    buf[len-4] = 0 ;
@@ -305,10 +316,24 @@
 void
 try_make_homedir( const char *fname )
 {
+    const char *defhome = GNUPG_HOMEDIR;
+
+    /* Create the directory only if the supplied directory name
+     * is the same as the default one.  This way we avoid to create
+     * arbitrary directories when a non-default homedirectory is used.
+     * To cope with HOME, we do compare only the suffix if we see that
+     * the default homedir does start with a tilde.
+     */
     if( opt.dry_run )
 	return;
-    if( strlen(fname) >= 7
-	&& !strcmp(fname+strlen(fname)-7, "/.gnupg" ) ) {
+
+    if ( ( *defhome == '~'
+           && ( strlen(fname) >= strlen (defhome+1)
+                && !strcmp(fname+strlen(defhome+1)-strlen(defhome+1),
+                           defhome+1 ) ))
+         || ( *defhome != '~'
+              && !compare_filenames( fname, defhome ) )
+        ) {
 	if( mkdir( fname, S_IRUSR|S_IWUSR|S_IXUSR ) )
 	    log_fatal( _("%s: can't create directory: %s\n"),
 					fname,	strerror(errno) );
@@ -320,4 +345,7 @@
 	g10_exit(1);
     }
 }
+
+
+
 
diff -urN gnupg-1.0.2/g10/options.h gnupg-1.0.3/g10/options.h
--- gnupg-1.0.2/g10/options.h	Tue Jun 27 10:27:53 2000
+++ gnupg-1.0.3/g10/options.h	Wed Aug 23 19:40:24 2000
@@ -84,6 +84,7 @@
     const char *set_policy_url;
     int use_embedded_filename;
     int allow_non_selfsigned_uid;
+    int allow_freeform_uid;
     int no_literal;
     ulong set_filesize;
     int honor_http_proxy;
@@ -91,6 +92,10 @@
     int ignore_time_conflict;
     int command_fd;
     int auto_key_retrieve;
+    const char *override_session_key;
+    int show_session_key;
+    int merge_only;
+    int try_all_secrets;
 } opt;
 
 
diff -urN gnupg-1.0.2/g10/packet.h gnupg-1.0.3/g10/packet.h
--- gnupg-1.0.2/g10/packet.h	Fri Jun  2 14:54:25 2000
+++ gnupg-1.0.3/g10/packet.h	Thu Jul 27 11:26:29 2000
@@ -332,6 +332,7 @@
 
 /*-- pubkey-enc.c --*/
 int get_session_key( PKT_pubkey_enc *k, DEK *dek );
+int get_override_session_key( DEK *dek, const char *string );
 
 /*-- compress.c --*/
 int handle_compressed( void *ctx, PKT_compressed *cd,
diff -urN gnupg-1.0.2/g10/parse-packet.c gnupg-1.0.3/g10/parse-packet.c
--- gnupg-1.0.2/g10/parse-packet.c	Mon Jul 10 15:57:05 2000
+++ gnupg-1.0.3/g10/parse-packet.c	Thu Sep 14 17:29:47 2000
@@ -702,6 +702,18 @@
     const char *p=NULL;
     int i;
 
+    /* The CERT has warning out with explains how to use GNUPG to
+     * detect the ARRs - we print our old message here when it is a faked
+     * ARR and add an additional notice */
+    if ( type == SIGSUBPKT_ARR && !hashed ) {
+        printf("\tsubpkt %d len %u (additional recipient request)\n"
+               "WARNING: PGP versions > 5.0 and < 6.5.8 will automagically "
+               "encrypt to this key and thereby reveal the plaintext to "
+               "the owner of this ARR key. Detailed info follows:\n",
+               type, (unsigned)length );
+    }
+    
+   
     printf("\t%s%ssubpkt %d len %u (", /*)*/
 	      critical ? "critical ":"",
 	      hashed ? "hashed ":"", type, (unsigned)length );
@@ -739,9 +751,6 @@
 	    printf("key expires after %s",
 				    strtimevalue( buffer_to_u32(buffer) ) );
 	break;
-      case SIGSUBPKT_ARR:
-	p = "additional recipient request";
-	break;
       case SIGSUBPKT_PREF_SYM:
 	fputs("pref-sym-algos:", stdout );
 	for( i=0; i < length; i++ )
@@ -811,18 +820,30 @@
 	print_string( stdout, buffer, length, ')' );
 	break;
       case SIGSUBPKT_KEY_FLAGS:
-	p = "key flags";
+        fputs ( "key flags:", stdout );
+        for( i=0; i < length; i++ )
+            printf(" %02X", buffer[i] );
 	break;
       case SIGSUBPKT_SIGNERS_UID:
 	p = "signer's user ID";
 	break;
       case SIGSUBPKT_REVOC_REASON:
-	if( length ) {
+        if( length ) {
 	    printf("revocation reason 0x%02x (", *buffer );
 	    print_string( stdout, buffer+1, length-1, ')' );
 	    p = ")";
 	}
 	break;
+      case SIGSUBPKT_ARR:
+        fputs("Big Brother's key (ignored): ", stdout );
+	if( length < 22 )
+	    p = "[too short]";
+	else {
+	    printf("c=%02x a=%d f=", buffer[0], buffer[1] );
+	    for( i=2; i < length; i++ )
+		printf("%02X", buffer[i] );
+	}
+        break;
       case SIGSUBPKT_PRIV_ADD_SIG:
 	p = "signs additional user ID";
 	break;
diff -urN gnupg-1.0.2/g10/passphrase.c gnupg-1.0.3/g10/passphrase.c
--- gnupg-1.0.2/g10/passphrase.c	Tue May  9 09:02:59 2000
+++ gnupg-1.0.3/g10/passphrase.c	Tue Sep  5 17:12:29 2000
@@ -279,8 +279,7 @@
 	    else {
 		md_write( md, s2k->salt, 8 );
 		count -= 8;
-		assert( count >= 0 );
-		md_write( md, pw, count );
+                md_write( md, pw, count );
 	    }
 	}
 	else
diff -urN gnupg-1.0.2/g10/pkclist.c gnupg-1.0.3/g10/pkclist.c
--- gnupg-1.0.2/g10/pkclist.c	Wed Jul 12 11:32:05 2000
+++ gnupg-1.0.3/g10/pkclist.c	Fri Sep 15 15:50:59 2000
@@ -349,9 +349,9 @@
 	      case '4': trust = TRUST_FULLY    ; break;
 	      default: BUG();
 	    }
-	    *new_trust = trust;
-	    changed = 1;
-	    break;
+            *new_trust = trust;
+            changed = 1;
+            break;
 	}
 	else if( *p == ans[0] || *p == ans[1] ) {
 	    tty_printf(_(
@@ -1032,8 +1032,6 @@
 algo_available( int preftype, int algo )
 {
     if( preftype == PREFTYPE_SYM ) {
-	if( algo == CIPHER_ALGO_TWOFISH )
-	    return 0;  /* we don't want to generate Twofish messages for now*/
 	return algo && !check_cipher_algo( algo );
     }
     else if( preftype == PREFTYPE_HASH ) {
diff -urN gnupg-1.0.2/g10/plaintext.c gnupg-1.0.3/g10/plaintext.c
--- gnupg-1.0.2/g10/plaintext.c	Tue May  9 09:02:40 2000
+++ gnupg-1.0.3/g10/plaintext.c	Wed Jul 26 11:21:58 2000
@@ -24,6 +24,10 @@
 #include <string.h>
 #include <errno.h>
 #include <assert.h>
+#ifdef HAVE_DOSISH_SYSTEM
+  #include <fcntl.h> /* for setmode() */
+#endif
+
 #include "util.h"
 #include "memory.h"
 #include "options.h"
@@ -81,6 +85,9 @@
     else if( !*fname || (*fname=='-' && !fname[1])) {
 	/* no filename or "-" given; write to stdout */
 	fp = stdout;
+      #ifdef HAVE_DOSISH_SYSTEM
+	setmode ( fileno(fp) , O_BINARY );
+      #endif
     }
     else if( !overwrite_filep( fname ) ) {
 	rc = G10ERR_CREATE_FILE;
diff -urN gnupg-1.0.2/g10/pubkey-enc.c gnupg-1.0.3/g10/pubkey-enc.c
--- gnupg-1.0.2/g10/pubkey-enc.c	Tue May  9 09:02:35 2000
+++ gnupg-1.0.3/g10/pubkey-enc.c	Wed Sep  6 16:24:39 2000
@@ -47,14 +47,11 @@
     PKT_secret_key *sk = NULL;
     int rc;
 
-    if( is_RSA(k->pubkey_algo) ) /* warn about that */
-	write_status(STATUS_RSA_OR_IDEA);
-
     rc = check_pubkey_algo( k->pubkey_algo );
     if( rc )
 	goto leave;
 
-    if( k->keyid[0] || k->keyid[1] ) {
+    if( (k->keyid[0] || k->keyid[1]) && !opt.try_all_secrets ) {
 	sk = m_alloc_clear( sizeof *sk );
 	sk->pubkey_algo = k->pubkey_algo; /* we want a pubkey with this algo*/
 	if( !(rc = get_seckey( sk, k->keyid )) )
@@ -220,4 +217,60 @@
     return rc;
 }
 
+
+static int
+hextobyte( const char *s )
+{
+    int c;
+
+    if( *s >= '0' && *s <= '9' )
+	c = 16 * (*s - '0');
+    else if( *s >= 'A' && *s <= 'F' )
+	c = 16 * (10 + *s - 'A');
+    else if( *s >= 'a' && *s <= 'f' )
+	c = 16 * (10 + *s - 'a');
+    else
+	return -1;
+    s++;
+    if( *s >= '0' && *s <= '9' )
+	c += *s - '0';
+    else if( *s >= 'A' && *s <= 'F' )
+	c += 10 + *s - 'A';
+    else if( *s >= 'a' && *s <= 'f' )
+	c += 10 + *s - 'a';
+    else
+	return -1;
+    return c;
+}
+
+/****************
+ * Get the session key from the given string.
+ * String is supposed to be formatted as this:
+ *  <algo-id>:<even-number-of-hex-digits>
+ */
+int
+get_override_session_key( DEK *dek, const char *string )
+{
+    const char *s;
+    int i;
+
+    if ( !string )
+	return G10ERR_BAD_KEY;
+    dek->algo = atoi(string);
+    if ( dek->algo < 1 )
+	return G10ERR_BAD_KEY;
+    if ( !(s = strchr ( string, ':' )) )
+	return G10ERR_BAD_KEY;
+    s++;
+    for(i=0; i < DIM(dek->key) && *s; i++, s +=2 ) {
+	int c = hextobyte ( s );
+	if (c == -1)
+	    return G10ERR_BAD_KEY;
+	dek->key[i] = c;
+    }
+    if ( *s )
+	return G10ERR_BAD_KEY;
+    dek->keylen = i;
+    return 0;
+}
 
diff -urN gnupg-1.0.2/g10/ringedit.c gnupg-1.0.3/g10/ringedit.c
--- gnupg-1.0.2/g10/ringedit.c	Thu Apr 13 16:58:28 2000
+++ gnupg-1.0.3/g10/ringedit.c	Wed Sep 13 16:05:42 2000
@@ -1070,7 +1070,13 @@
 
     n = pubkey_get_nskey( req_sk->pubkey_algo );
     for(i=0; i < n; i++ ) {
-	if( mpi_cmp( req_sk->skey[i], sk->skey[i] ) )
+        /* Note: becuase v4 protected keys have nothing in the
+         * mpis except for the first one, we skip all NULL MPIs.
+         * This might not be always correct in cases where the both
+         * keys do not match in their secret parts but we can ignore that
+         * because the need for this function is quite ugly. */
+	if( req_sk->skey[1] && sk->skey[i]
+             && mpi_cmp( req_sk->skey[i], sk->skey[i] ) )
 	    return -1;
     }
     return 0;
diff -urN gnupg-1.0.2/g10/seckey-cert.c gnupg-1.0.3/g10/seckey-cert.c
--- gnupg-1.0.2/g10/seckey-cert.c	Wed Jun 28 11:50:05 2000
+++ gnupg-1.0.3/g10/seckey-cert.c	Wed Sep 13 18:12:19 2000
@@ -80,10 +80,13 @@
 	if( sk->version >= 4 ) {
 	    int ndata;
 	    byte *p, *data;
+            u16 csumc = 0;
 
 	    i = pubkey_get_npkey(sk->pubkey_algo);
 	    assert( mpi_is_opaque( sk->skey[i] ) );
 	    p = mpi_get_opaque( sk->skey[i], &ndata );
+            if ( ndata > 1 )
+                csumc = p[ndata-2] << 8 | p[ndata-1];
 	    data = m_alloc_secure( ndata );
 	    cipher_decrypt( cipher_hd, data, p, ndata );
 	    mpi_free( sk->skey[i] ); sk->skey[i] = NULL ;
@@ -96,9 +99,14 @@
 	    else {
 		csum = checksum( data, ndata-2);
 		sk->csum = data[ndata-2] << 8 | data[ndata-1];
+                if ( sk->csum != csum ) {
+                    /* This is a PGP 7.0.0 workaround */
+                    sk->csum = csumc; /* take the encrypted one */
+                }
 	    }
+            
 	    /* must check it here otherwise the mpi_read_xx would fail
-	     * because the length das an abritary value */
+	     * because the length may have an arbitrary value */
 	    if( sk->csum == csum ) {
 		for( ; i < pubkey_get_nskey(sk->pubkey_algo); i++ ) {
 		    nbytes = ndata;
@@ -106,6 +114,7 @@
 		    ndata -= nbytes;
 		    p += nbytes;
 		}
+                /* at this point ndata should be equal to 2 (the checksum) */
 	    }
 	    m_free(data);
 	}
@@ -237,9 +246,7 @@
 	    randomize_buffer(sk->protect.iv, sk->protect.ivlen, 1);
 	    cipher_setiv( cipher_hd, sk->protect.iv, sk->protect.ivlen );
 	    if( sk->version >= 4 ) {
-		/* FIXME: There is a bug in this function for all algorithms
-		 * where the secret MPIs are more than 1 */
-		byte *bufarr[PUBKEY_MAX_NSKEY];
+                byte *bufarr[PUBKEY_MAX_NSKEY];
 		unsigned narr[PUBKEY_MAX_NSKEY];
 		unsigned nbits[PUBKEY_MAX_NSKEY];
 		int ndata=0;
diff -urN gnupg-1.0.2/g10/sig-check.c gnupg-1.0.3/g10/sig-check.c
--- gnupg-1.0.2/g10/sig-check.c	Wed Jun  7 19:16:23 2000
+++ gnupg-1.0.3/g10/sig-check.c	Wed Sep  6 16:37:15 2000
@@ -66,9 +66,6 @@
     PKT_public_key *pk = m_alloc_clear( sizeof *pk );
     int rc=0;
 
-    if( is_RSA(sig->pubkey_algo) )
-	write_status(STATUS_RSA_OR_IDEA);
-
     *r_expiredate = 0;
     if( get_pubkey( pk, sig->keyid ) )
 	rc = G10ERR_NO_PUBKEY;
diff -urN gnupg-1.0.2/g10/sign.c gnupg-1.0.3/g10/sign.c
--- gnupg-1.0.2/g10/sign.c	Tue Jun 27 11:59:12 2000
+++ gnupg-1.0.3/g10/sign.c	Wed Sep 13 15:42:09 2000
@@ -429,6 +429,10 @@
 	if( fname ) {
 	    if( !(filesize = iobuf_get_filelength(inp)) )
 		log_info(_("WARNING: `%s' is an empty file\n"), fname );
+            /* we can't yet encode the length of very large files,
+             * so we switch to partial lengthn encoding in this case */
+            if ( filesize >= IOBUF_FILELENGTH_LIMIT )
+                filesize = 0;
 
 	    /* because the text_filter modifies the length of the
 	     * data, it is not possible to know the used length
diff -urN gnupg-1.0.2/g10/status.c gnupg-1.0.3/g10/status.c
--- gnupg-1.0.2/g10/status.c	Tue Jun 27 11:25:15 2000
+++ gnupg-1.0.3/g10/status.c	Fri Aug  4 14:22:46 2000
@@ -151,6 +151,7 @@
       case STATUS_DELETE_PROBLEM : s = "DELETE_PROBLEM\n"; break;
       case STATUS_PROGRESS	 : s = "PROGRESS\n"; break;
       case STATUS_SIG_CREATED	 : s = "SIG_CREATED\n"; break;
+      case STATUS_SESSION_KEY	 : s = "SESSION_KEY\n"; break;
       default: s = "?\n"; break;
     }
 
@@ -364,7 +365,7 @@
 		i=0;
 	}
 	/* Hmmm: why not use our read_line function here */
-	if( read( fd, string+i, 1) != 1 || string[i] == '\n' )
+	if( read( opt.command_fd, string+i, 1) != 1 || string[i] == '\n' )
 	    break;
     }
     string[i] = 0;
diff -urN gnupg-1.0.2/g10/status.h gnupg-1.0.3/g10/status.h
--- gnupg-1.0.2/g10/status.h	Tue Jun 27 11:24:11 2000
+++ gnupg-1.0.3/g10/status.h	Thu Jul 27 11:07:08 2000
@@ -81,6 +81,8 @@
 #define STATUS_GOT_IT		49
 #define STATUS_PROGRESS 	50
 #define STATUS_SIG_CREATED	51
+#define STATUS_SESSION_KEY	52
+
 
 /*-- status.c --*/
 void set_status_fd ( int fd );
diff -urN gnupg-1.0.2/g10/trustdb.c gnupg-1.0.3/g10/trustdb.c
--- gnupg-1.0.2/g10/trustdb.c	Tue May  9 08:49:42 2000
+++ gnupg-1.0.3/g10/trustdb.c	Wed Sep  6 14:00:41 2000
@@ -109,6 +109,7 @@
 static int alloced_tns;
 static int max_alloced_tns;
 
+static struct keyid_list *trusted_key_list;
 
 static LOCAL_ID_TABLE new_lid_table(void);
 static int ins_lid_table_item( LOCAL_ID_TABLE tbl, ulong lid, unsigned flag );
@@ -463,6 +464,63 @@
  *************	Initialization	****************
  ***********************************************/
 
+void
+register_trusted_key( const char *string )
+{
+    u32 keyid[2];
+    struct keyid_list *r;
+
+    if( classify_user_id( string, keyid, NULL, NULL, NULL ) != 11 ) {
+        log_error(_("'%s' is not a valid long keyID\n"), string );
+        return;
+    }
+
+    for( r = trusted_key_list; r; r = r->next )
+        if( r->keyid[0] == keyid[0] && r->keyid[1] == keyid[1] )
+            return;
+    r = m_alloc( sizeof *r );
+    r->keyid[0] = keyid[0];
+    r->keyid[1] = keyid[1];
+    r->next = trusted_key_list;
+    trusted_key_list = r;
+}
+
+
+static void
+add_ultimate_key( PKT_public_key *pk, u32 *keyid )
+{
+    int rc;
+
+    /* first make sure that the pubkey is in the trustdb */
+    rc = query_trust_record( pk );
+    if( rc == -1 && opt.dry_run )
+	return;
+    if( rc == -1 ) { /* put it into the trustdb */
+        rc = insert_trust_record_by_pk( pk );
+        if( rc ) {
+            log_error(_("key %08lX: can't put it into the trustdb\n"),
+                      (ulong)keyid[1] );
+            return;
+        }
+    }
+    else if( rc ) {
+        log_error(_("key %08lX: query record failed\n"), (ulong)keyid[1] );
+        return;
+    }
+
+    if( DBG_TRUST )
+        log_debug("key %08lX.%lu: stored into ultikey_table\n",
+                  (ulong)keyid[1], pk->local_id );
+
+    if( ins_lid_table_item( ultikey_table, pk->local_id, 0 ) )
+        log_error(_("key %08lX: already in trusted key table\n"),
+                  (ulong)keyid[1]);
+    else if( opt.verbose > 1 )
+        log_info(_("key %08lX: accepted as trusted key.\n"),
+                 (ulong)keyid[1]);
+
+}
+
 /****************
  * Verify that all our public keys are in the trustdb.
  */
@@ -474,7 +532,27 @@
     PKT_secret_key *sk = m_alloc_clear( sizeof *sk );
     PKT_public_key *pk = m_alloc_clear( sizeof *pk );
     u32 keyid[2];
+    struct keyid_list *kl;
 
+
+    /* put the trusted keys into the ultikey table */
+    for( kl = trusted_key_list; kl; kl = kl->next ) {
+        keyid[0] = kl->keyid[0];
+        keyid[1] = kl->keyid[1];
+        /* get the public key */
+        memset( pk, 0, sizeof *pk );
+        rc = get_pubkey( pk, keyid );
+        if( rc ) {
+            log_info(_("key %08lX: no public key for trusted key - skipped\n"),
+                                                            (ulong)keyid[1] );
+        }
+        else {
+            add_ultimate_key( pk, keyid );
+            release_public_key_parts( pk );
+        }
+    }
+
+    /* And now add all secret keys to the ultikey table */
     while( !(rc=enum_secret_keys( &enum_context, sk, 0 ) ) ) {
 	int have_pk = 0;
 
@@ -487,6 +565,10 @@
 	    log_info(_("NOTE: secret key %08lX is NOT protected.\n"),
 							    (ulong)keyid[1] );
 
+        for( kl = trusted_key_list; kl; kl = kl->next ) {
+            if( kl->keyid[0] == keyid[0] && kl->keyid[1] == keyid[1] )
+                goto skip; /* already in trusted key table */
+        }
 
 	/* see whether we can access the public key of this secret key */
 	memset( pk, 0, sizeof *pk );
@@ -504,33 +586,8 @@
 	    goto skip;
 	}
 
-	/* make sure that the pubkey is in the trustdb */
-	rc = query_trust_record( pk );
-	if( rc == -1 && opt.dry_run )
-	    goto skip;
-	if( rc == -1 ) { /* put it into the trustdb */
-	    rc = insert_trust_record_by_pk( pk );
-	    if( rc ) {
-		log_error(_("key %08lX: can't put it into the trustdb\n"),
-							    (ulong)keyid[1] );
-		goto skip;
-	    }
-	}
-	else if( rc ) {
-	    log_error(_("key %08lX: query record failed\n"), (ulong)keyid[1] );
-	    goto skip;
-
-	}
+	add_ultimate_key( pk, keyid );
 
-	if( DBG_TRUST )
-	    log_debug("key %08lX.%lu: stored into ultikey_table\n",
-				    (ulong)keyid[1], pk->local_id );
-	if( ins_lid_table_item( ultikey_table, pk->local_id, 0 ) )
-	    log_error(_("key %08lX: already in trusted key table\n"),
-							(ulong)keyid[1]);
-	else if( opt.verbose > 1 )
-	    log_info(_("key %08lX: accepted as trusted key.\n"),
-							(ulong)keyid[1]);
       skip:
 	release_secret_key_parts( sk );
 	if( have_pk )
@@ -540,6 +597,15 @@
 	log_error(_("enumerate secret keys failed: %s\n"), g10_errstr(rc) );
     else
 	rc = 0;
+
+    /* release the trusted keyid table */
+    {   struct keyid_list *kl2;
+        for( kl = trusted_key_list; kl; kl = kl2 ) {
+            kl2 = kl->next;
+            m_free( kl );
+        }
+        trusted_key_list = NULL;
+    }
 
     enum_secret_keys( &enum_context, NULL, 0 ); /* free context */
     free_secret_key( sk );
diff -urN gnupg-1.0.2/include/ChangeLog gnupg-1.0.3/include/ChangeLog
--- gnupg-1.0.2/include/ChangeLog	Tue Mar 14 14:04:16 2000
+++ gnupg-1.0.3/include/ChangeLog	Wed Sep  6 17:55:50 2000
@@ -1,3 +1,7 @@
+Wed Sep  6 17:55:47 CEST 2000  Werner Koch  <wk@openit.de>
+
+        * iobuf.c (IOBUF_FILELENGTH_LIMIT): New.
+
 2000-03-14 14:03:43  Werner Koch  (wk@habibti.openit.de)
 
 	* types.h (HAVE_U64_TYPEDEF): Defined depending on configure test.
diff -urN gnupg-1.0.2/include/iobuf.h gnupg-1.0.3/include/iobuf.h
--- gnupg-1.0.2/include/iobuf.h	Sat Dec  4 12:33:42 1999
+++ gnupg-1.0.3/include/iobuf.h	Wed Sep  6 17:15:25 2000
@@ -116,6 +116,7 @@
 void iobuf_unget_and_close_temp( IOBUF a, IOBUF temp );
 
 u32 iobuf_get_filelength( IOBUF a );
+#define IOBUF_FILELENGTH_LIMIT 0xffffffff
 const char *iobuf_get_real_fname( IOBUF a );
 const char *iobuf_get_fname( IOBUF a );
 
diff -urN gnupg-1.0.2/intl/explodename.c gnupg-1.0.3/intl/explodename.c
--- gnupg-1.0.2/intl/explodename.c	Tue Jan 11 19:24:48 2000
+++ gnupg-1.0.3/intl/explodename.c	Tue Jan 25 18:44:13 2000
@@ -44,7 +44,8 @@
 /* @@ end of prolog @@ */
 
 char *
-_nl_find_language (const char *name)
+_nl_find_language (name)
+     const char *name;
 {
   while (name[0] != '\0' && name[0] != '_' && name[0] != '@'
 	 && name[0] != '+' && name[0] != ',')
diff -urN gnupg-1.0.2/mpi/ChangeLog gnupg-1.0.3/mpi/ChangeLog
--- gnupg-1.0.2/mpi/ChangeLog	Wed Mar 22 13:50:26 2000
+++ gnupg-1.0.3/mpi/ChangeLog	Wed Jul 19 11:26:45 2000
@@ -1,3 +1,7 @@
+Wed Jul 19 11:26:43 CEST 2000  Werner Koch  <wk@>
+
+  * config.links: Support for powerpc--netbsd by Gabriel Rosenkoetter.
+
 Wed Mar 22 13:50:24 CET 2000  Werner Koch  <wk@openit.de>
 
 	* config.links: Add support for FreeBSD 5 and made the case stmt
diff -urN gnupg-1.0.2/mpi/Makefile.in gnupg-1.0.3/mpi/Makefile.in
--- gnupg-1.0.2/mpi/Makefile.in	Wed Jul 12 14:59:31 2000
+++ gnupg-1.0.3/mpi/Makefile.in	Mon Sep 18 12:17:53 2000
@@ -75,6 +75,7 @@
 DYNAMIC_CIPHER_MODS = @DYNAMIC_CIPHER_MODS@
 DYNLINK_LDFLAGS = @DYNLINK_LDFLAGS@
 DYNLINK_MOD_CFLAGS = @DYNLINK_MOD_CFLAGS@
+FAQPROG = @FAQPROG@
 GENCAT = @GENCAT@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
diff -urN gnupg-1.0.2/mpi/config.links gnupg-1.0.3/mpi/config.links
--- gnupg-1.0.2/mpi/config.links	Tue Mar 21 16:24:45 2000
+++ gnupg-1.0.3/mpi/config.links	Tue Jul 18 10:31:39 2000
@@ -178,6 +178,15 @@
 	cat   $srcdir/mpi/powerpc32/syntax.h	>>./mpi/asm-syntax.h
 	path="powerpc32"
 	;;
+
+    powerpc*-*-netbsd*)
+       echo '/* configured NetBSD on powerpc */' >>./mpi/asm-syntax.h
+       echo '#define ELF_SYNTAX'                 >>./mpi/asm-syntax.h
+       cat   $srcdir/mpi/powerpc32/syntax.h	 >>./mpi/asm-syntax.h
+       mpi_sflags="-Wa,-mppc"
+       path="powerpc32"
+       ;;
+
     rs6000-*-aix[456789]*    | \
     rs6000-*-aix3.2.[456789])
 	mpi_sflags="-Wa,-mpwr"
diff -urN gnupg-1.0.2/po/ChangeLog gnupg-1.0.3/po/ChangeLog
--- gnupg-1.0.2/po/ChangeLog	Wed Jul 12 13:32:09 2000
+++ gnupg-1.0.3/po/ChangeLog	Thu Sep 14 17:45:13 2000
@@ -1,3 +1,7 @@
+Thu Sep 14 17:45:11 CEST 2000  Werner Koch  <wk@openit.de>
+
+        * eo.po: Updated.
+
 Wed Jul 12 13:32:06 CEST 2000  Werner Koch  <wk@>
 
   * da.po: New from the TP server
diff -urN gnupg-1.0.2/po/cat-id-tbl.c gnupg-1.0.3/po/cat-id-tbl.c
--- gnupg-1.0.2/po/cat-id-tbl.c	Wed Jul 12 12:13:32 2000
+++ gnupg-1.0.3/po/cat-id-tbl.c	Thu Sep 14 13:26:57 2000
@@ -154,20 +154,21 @@
   {"|NAME|set terminal charset to NAME", 132},
   {"read options from file", 133},
   {"|FD|write status info to this FD", 134},
-  {"|FILE|load extension module FILE", 135},
-  {"emulate the mode described in RFC1991", 136},
-  {"set all packet, cipher and digest options to OpenPGP behavior", 137},
-  {"|N|use passphrase mode N", 138},
-  {"|NAME|use message digest algorithm NAME for passphrases", 139},
-  {"|NAME|use cipher algorithm NAME for passphrases", 140},
-  {"|NAME|use cipher algorithm NAME", 141},
-  {"|NAME|use message digest algorithm NAME", 142},
-  {"|N|use compress algorithm N", 143},
-  {"throw keyid field of encrypted packets", 144},
-  {"|NAME=VALUE|use this notation data", 145},
+  {"|KEYID|ulimately trust this key", 135},
+  {"|FILE|load extension module FILE", 136},
+  {"emulate the mode described in RFC1991", 137},
+  {"set all packet, cipher and digest options to OpenPGP behavior", 138},
+  {"|N|use passphrase mode N", 139},
+  {"|NAME|use message digest algorithm NAME for passphrases", 140},
+  {"|NAME|use cipher algorithm NAME for passphrases", 141},
+  {"|NAME|use cipher algorithm NAME", 142},
+  {"|NAME|use message digest algorithm NAME", 143},
+  {"|N|use compress algorithm N", 144},
+  {"throw keyid field of encrypted packets", 145},
+  {"|NAME=VALUE|use this notation data", 146},
   {"\
 @\n\
-(See the man page for a complete listing of all commands and options)\n", 146},
+(See the man page for a complete listing of all commands and options)\n", 147},
   {"\
 @\n\
 Examples:\n\
@@ -176,94 +177,95 @@
  --clearsign [file]         make a clear text signature\n\
  --detach-sign [file]       make a detached signature\n\
  --list-keys [names]        show keys\n\
- --fingerprint [names]      show fingerprints\n", 147},
-  {"Please report bugs to <gnupg-bugs@gnu.org>.\n", 148},
-  {"Usage: gpg [options] [files] (-h for help)", 149},
+ --fingerprint [names]      show fingerprints\n", 148},
+  {"Please report bugs to <gnupg-bugs@gnu.org>.\n", 149},
+  {"Usage: gpg [options] [files] (-h for help)", 150},
   {"\
 Syntax: gpg [options] [files]\n\
 sign, check, encrypt or decrypt\n\
-default operation depends on the input data\n", 150},
+default operation depends on the input data\n", 151},
   {"\
 \n\
-Supported algorithms:\n", 151},
-  {"usage: gpg [options] ", 152},
-  {"conflicting commands\n", 153},
-  {"NOTE: no default option file `%s'\n", 154},
-  {"option file `%s': %s\n", 155},
-  {"reading options from `%s'\n", 156},
-  {"%s is not a valid character set\n", 157},
-  {"NOTE: %s is not for normal use!\n", 158},
-  {"%s not allowed with %s!\n", 159},
-  {"%s makes no sense with %s!\n", 160},
-  {"selected cipher algorithm is invalid\n", 161},
-  {"selected digest algorithm is invalid\n", 162},
-  {"the given policy URL is invalid\n", 163},
-  {"compress algorithm must be in range %d..%d\n", 164},
-  {"completes-needed must be greater than 0\n", 165},
-  {"marginals-needed must be greater than 1\n", 166},
-  {"max-cert-depth must be in range 1 to 255\n", 167},
-  {"NOTE: simple S2K mode (0) is strongly discouraged\n", 168},
-  {"invalid S2K mode; must be 0, 1 or 3\n", 169},
-  {"failed to initialize the TrustDB: %s\n", 170},
-  {"--store [filename]", 171},
-  {"--symmetric [filename]", 172},
-  {"--encrypt [filename]", 173},
-  {"--sign [filename]", 174},
-  {"--sign --encrypt [filename]", 175},
-  {"--clearsign [filename]", 176},
-  {"--decrypt [filename]", 177},
-  {"--sign-key user-id", 178},
-  {"--lsign-key user-id", 179},
-  {"--edit-key user-id [commands]", 180},
-  {"--delete-secret-key user-id", 181},
-  {"--delete-key user-id", 182},
-  {"can't open %s: %s\n", 183},
-  {"-k[v][v][v][c] [user-id] [keyring]", 184},
-  {"dearmoring failed: %s\n", 185},
-  {"enarmoring failed: %s\n", 186},
-  {"invalid hash algorithm `%s'\n", 187},
-  {"[filename]", 188},
-  {"Go ahead and type your message ...\n", 189},
-  {"can't open `%s'\n", 190},
+Supported algorithms:\n", 152},
+  {"usage: gpg [options] ", 153},
+  {"conflicting commands\n", 154},
+  {"NOTE: no default option file `%s'\n", 155},
+  {"option file `%s': %s\n", 156},
+  {"reading options from `%s'\n", 157},
+  {"%s is not a valid character set\n", 158},
+  {"WARNING: program may create a core file!\n", 159},
+  {"NOTE: %s is not for normal use!\n", 160},
+  {"%s not allowed with %s!\n", 161},
+  {"%s makes no sense with %s!\n", 162},
+  {"selected cipher algorithm is invalid\n", 163},
+  {"selected digest algorithm is invalid\n", 164},
+  {"the given policy URL is invalid\n", 165},
+  {"compress algorithm must be in range %d..%d\n", 166},
+  {"completes-needed must be greater than 0\n", 167},
+  {"marginals-needed must be greater than 1\n", 168},
+  {"max-cert-depth must be in range 1 to 255\n", 169},
+  {"NOTE: simple S2K mode (0) is strongly discouraged\n", 170},
+  {"invalid S2K mode; must be 0, 1 or 3\n", 171},
+  {"failed to initialize the TrustDB: %s\n", 172},
+  {"--store [filename]", 173},
+  {"--symmetric [filename]", 174},
+  {"--encrypt [filename]", 175},
+  {"--sign [filename]", 176},
+  {"--sign --encrypt [filename]", 177},
+  {"--clearsign [filename]", 178},
+  {"--decrypt [filename]", 179},
+  {"--sign-key user-id", 180},
+  {"--lsign-key user-id", 181},
+  {"--edit-key user-id [commands]", 182},
+  {"--delete-secret-key user-id", 183},
+  {"--delete-key user-id", 184},
+  {"can't open %s: %s\n", 185},
+  {"-k[v][v][v][c] [user-id] [keyring]", 186},
+  {"dearmoring failed: %s\n", 187},
+  {"enarmoring failed: %s\n", 188},
+  {"invalid hash algorithm `%s'\n", 189},
+  {"[filename]", 190},
+  {"Go ahead and type your message ...\n", 191},
+  {"can't open `%s'\n", 192},
   {"\
-the first character of a notation name must be a letter or an underscore\n", 191},
+the first character of a notation name must be a letter or an underscore\n", 193},
   {"\
 a notation name must have only letters, digits, dots or underscores and end \
-with an '='\n", 192},
-  {"dots in a notation name must be surrounded by other characters\n", 193},
-  {"a notation value must not use any control characters\n", 194},
-  {"armor: %s\n", 195},
-  {"invalid armor header: ", 196},
-  {"armor header: ", 197},
-  {"invalid clearsig header\n", 198},
-  {"nested clear text signatures\n", 199},
-  {"invalid dash escaped line: ", 200},
-  {"unexpected armor:", 201},
-  {"invalid radix64 character %02x skipped\n", 202},
-  {"premature eof (no CRC)\n", 203},
-  {"premature eof (in CRC)\n", 204},
-  {"malformed CRC\n", 205},
-  {"CRC error; %06lx - %06lx\n", 206},
-  {"premature eof (in Trailer)\n", 207},
-  {"error in trailer line\n", 208},
-  {"For info see http://www.gnupg.org", 209},
-  {"no valid OpenPGP data found.\n", 210},
-  {"invalid armor: line longer than %d characters\n", 211},
-  {"\
-quoted printable character in armor - probably a buggy MTA has been used\n", 212},
-  {"             Fingerprint:", 213},
-  {"Fingerprint:", 214},
-  {"No reason specified", 215},
-  {"Key is superseded", 216},
-  {"Key has been compromised", 217},
-  {"Key is no longer used", 218},
-  {"User ID is no longer valid", 219},
-  {"Reason for revocation: ", 220},
-  {"Revocation comment: ", 221},
-  {"sSmMqQ", 222},
+with an '='\n", 194},
+  {"dots in a notation name must be surrounded by other characters\n", 195},
+  {"a notation value must not use any control characters\n", 196},
+  {"armor: %s\n", 197},
+  {"invalid armor header: ", 198},
+  {"armor header: ", 199},
+  {"invalid clearsig header\n", 200},
+  {"nested clear text signatures\n", 201},
+  {"invalid dash escaped line: ", 202},
+  {"unexpected armor:", 203},
+  {"invalid radix64 character %02x skipped\n", 204},
+  {"premature eof (no CRC)\n", 205},
+  {"premature eof (in CRC)\n", 206},
+  {"malformed CRC\n", 207},
+  {"CRC error; %06lx - %06lx\n", 208},
+  {"premature eof (in Trailer)\n", 209},
+  {"error in trailer line\n", 210},
+  {"For info see http://www.gnupg.org", 211},
+  {"no valid OpenPGP data found.\n", 212},
+  {"invalid armor: line longer than %d characters\n", 213},
+  {"\
+quoted printable character in armor - probably a buggy MTA has been used\n", 214},
+  {"             Fingerprint:", 215},
+  {"Fingerprint:", 216},
+  {"No reason specified", 217},
+  {"Key is superseded", 218},
+  {"Key has been compromised", 219},
+  {"Key is no longer used", 220},
+  {"User ID is no longer valid", 221},
+  {"Reason for revocation: ", 222},
+  {"Revocation comment: ", 223},
+  {"sSmMqQ", 224},
   {"\
 No trust value assigned to %lu:\n\
-%4u%c/%08lX %s \"", 223},
+%4u%c/%08lX %s \"", 225},
   {"\
 Please decide how far you trust this user to correctly\n\
 verify other users' keys (by looking at passports,\n\
@@ -273,587 +275,589 @@
  2 = I do NOT trust\n\
  3 = I trust marginally\n\
  4 = I trust fully\n\
- s = please show me more information\n", 224},
-  {" m = back to the main menu\n", 225},
-  {" q = quit\n", 226},
-  {"Your decision? ", 227},
-  {"Certificates leading to an ultimately trusted key:\n", 228},
+ s = please show me more information\n", 226},
+  {" m = back to the main menu\n", 227},
+  {" q = quit\n", 228},
+  {"Your decision? ", 229},
+  {"Certificates leading to an ultimately trusted key:\n", 230},
   {"\
 Could not find a valid trust path to the key.  Let's see whether we\n\
 can assign some missing owner trust values.\n\
-\n", 229},
+\n", 231},
   {"\
 No path leading to one of our keys found.\n\
-\n", 230},
+\n", 232},
   {"\
 No certificates with undefined trust found.\n\
-\n", 231},
+\n", 233},
   {"\
 No trust values changed.\n\
-\n", 232},
-  {"key %08lX: key has been revoked!\n", 233},
-  {"Use this key anyway? ", 234},
-  {"key %08lX: subkey has been revoked!\n", 235},
-  {"%08lX: key has expired\n", 236},
-  {"%08lX: no info to calculate a trust probability\n", 237},
-  {"%08lX: We do NOT trust this key\n", 238},
+\n", 234},
+  {"key %08lX: key has been revoked!\n", 235},
+  {"Use this key anyway? ", 236},
+  {"key %08lX: subkey has been revoked!\n", 237},
+  {"%08lX: key has expired\n", 238},
+  {"%08lX: no info to calculate a trust probability\n", 239},
+  {"%08lX: We do NOT trust this key\n", 240},
   {"\
 %08lX: It is not sure that this key really belongs to the owner\n\
-but it is accepted anyway\n", 239},
-  {"This key probably belongs to the owner\n", 240},
-  {"This key belongs to us\n", 241},
+but it is accepted anyway\n", 241},
+  {"This key probably belongs to the owner\n", 242},
+  {"This key belongs to us\n", 243},
   {"\
 It is NOT certain that the key belongs to its owner.\n\
 If you *really* know what you are doing, you may answer\n\
 the next question with yes\n\
-\n", 242},
-  {"WARNING: Using untrusted key!\n", 243},
-  {"WARNING: This key has been revoked by its owner!\n", 244},
-  {"         This could mean that the signature is forgery.\n", 245},
-  {"WARNING: This subkey has been revoked by its owner!\n", 246},
-  {"Note: This key has expired!\n", 247},
-  {"WARNING: This key is not certified with a trusted signature!\n", 248},
-  {"\
-         There is no indication that the signature belongs to the owner.\n", 249},
-  {"WARNING: We do NOT trust this key!\n", 250},
-  {"         The signature is probably a FORGERY.\n", 251},
-  {"\
-WARNING: This key is not certified with sufficiently trusted signatures!\n", 252},
-  {"         It is not certain that the signature belongs to the owner.\n", 253},
-  {"%s: skipped: %s\n", 254},
-  {"%s: skipped: public key already present\n", 255},
+\n", 244},
+  {"WARNING: Using untrusted key!\n", 245},
+  {"WARNING: This key has been revoked by its owner!\n", 246},
+  {"         This could mean that the signature is forgery.\n", 247},
+  {"WARNING: This subkey has been revoked by its owner!\n", 248},
+  {"Note: This key has expired!\n", 249},
+  {"WARNING: This key is not certified with a trusted signature!\n", 250},
+  {"\
+         There is no indication that the signature belongs to the owner.\n", 251},
+  {"WARNING: We do NOT trust this key!\n", 252},
+  {"         The signature is probably a FORGERY.\n", 253},
+  {"\
+WARNING: This key is not certified with sufficiently trusted signatures!\n", 254},
+  {"         It is not certain that the signature belongs to the owner.\n", 255},
+  {"%s: skipped: %s\n", 256},
+  {"%s: skipped: public key already present\n", 257},
   {"\
 You did not specify a user ID. (you may use \"-r\")\n\
-\n", 256},
-  {"Enter the user ID: ", 257},
-  {"No such user ID.\n", 258},
-  {"skipped: public key already set as default recipient\n", 259},
-  {"Public key is disabled.\n", 260},
-  {"skipped: public key already set with --encrypt-to\n", 261},
-  {"unknown default recipient `%s'\n", 262},
-  {"%s: error checking key: %s\n", 263},
-  {"%s: skipped: public key is disabled\n", 264},
-  {"no valid addressees\n", 265},
-  {"writing self signature\n", 266},
-  {"writing key binding signature\n", 267},
-  {"keysize invalid; using %u bits\n", 268},
-  {"keysize rounded up to %u bits\n", 269},
-  {"Please select what kind of key you want:\n", 270},
-  {"   (%d) DSA and ElGamal (default)\n", 271},
-  {"   (%d) DSA (sign only)\n", 272},
-  {"   (%d) ElGamal (encrypt only)\n", 273},
-  {"   (%d) ElGamal (sign and encrypt)\n", 274},
-  {"   (%d) RSA (sign and encrypt)\n", 275},
-  {"Your selection? ", 276},
-  {"Do you really want to create a sign and encrypt key? ", 277},
-  {"Invalid selection.\n", 278},
+\n", 258},
+  {"Enter the user ID: ", 259},
+  {"No such user ID.\n", 260},
+  {"skipped: public key already set as default recipient\n", 261},
+  {"Public key is disabled.\n", 262},
+  {"skipped: public key already set with --encrypt-to\n", 263},
+  {"unknown default recipient `%s'\n", 264},
+  {"%s: error checking key: %s\n", 265},
+  {"%s: skipped: public key is disabled\n", 266},
+  {"no valid addressees\n", 267},
+  {"writing self signature\n", 268},
+  {"writing key binding signature\n", 269},
+  {"keysize invalid; using %u bits\n", 270},
+  {"keysize rounded up to %u bits\n", 271},
+  {"Please select what kind of key you want:\n", 272},
+  {"   (%d) DSA and ElGamal (default)\n", 273},
+  {"   (%d) DSA (sign only)\n", 274},
+  {"   (%d) ElGamal (encrypt only)\n", 275},
+  {"   (%d) ElGamal (sign and encrypt)\n", 276},
+  {"   (%d) RSA (sign and encrypt)\n", 277},
+  {"Your selection? ", 278},
+  {"Do you really want to create a sign and encrypt key? ", 279},
+  {"Invalid selection.\n", 280},
   {"\
 About to generate a new %s keypair.\n\
               minimum keysize is  768 bits\n\
               default keysize is 1024 bits\n\
-    highest suggested keysize is 2048 bits\n", 279},
-  {"What keysize do you want? (1024) ", 280},
-  {"DSA only allows keysizes from 512 to 1024\n", 281},
-  {"keysize too small; 768 is smallest value allowed.\n", 282},
-  {"keysize too small; 1024 is smallest value allowed for RSA.\n", 283},
-  {"keysize too large; %d is largest value allowed.\n", 284},
+    highest suggested keysize is 2048 bits\n", 281},
+  {"What keysize do you want? (1024) ", 282},
+  {"DSA only allows keysizes from 512 to 1024\n", 283},
+  {"keysize too small; 768 is smallest value allowed.\n", 284},
+  {"keysize too small; 1024 is smallest value allowed for RSA.\n", 285},
+  {"keysize too large; %d is largest value allowed.\n", 286},
   {"\
 Keysizes larger than 2048 are not suggested because\n\
-computations take REALLY long!\n", 285},
-  {"Are you sure that you want this keysize? ", 286},
+computations take REALLY long!\n", 287},
+  {"Are you sure that you want this keysize? ", 288},
   {"\
 Okay, but keep in mind that your monitor and keyboard radiation is also very \
-vulnerable to attacks!\n", 287},
-  {"Do you really need such a large keysize? ", 288},
-  {"Requested keysize is %u bits\n", 289},
-  {"rounded up to %u bits\n", 290},
+vulnerable to attacks!\n", 289},
+  {"Do you really need such a large keysize? ", 290},
+  {"Requested keysize is %u bits\n", 291},
+  {"rounded up to %u bits\n", 292},
   {"\
 Please specify how long the key should be valid.\n\
          0 = key does not expire\n\
       <n>  = key expires in n days\n\
       <n>w = key expires in n weeks\n\
       <n>m = key expires in n months\n\
-      <n>y = key expires in n years\n", 291},
-  {"Key is valid for? (0) ", 292},
-  {"invalid value\n", 293},
-  {"Key does not expire at all\n", 294},
-  {"Key expires at %s\n", 295},
+      <n>y = key expires in n years\n", 293},
+  {"Key is valid for? (0) ", 294},
+  {"invalid value\n", 295},
+  {"Key does not expire at all\n", 296},
+  {"Key expires at %s\n", 297},
   {"\
 Your system can't display dates beyond 2038.\n\
-However, it will be correctly handled up to 2106.\n", 296},
-  {"Is this correct (y/n)? ", 297},
+However, it will be correctly handled up to 2106.\n", 298},
+  {"Is this correct (y/n)? ", 299},
   {"\
 \n\
 You need a User-ID to identify your key; the software constructs the user \
 id\n\
 from Real Name, Comment and Email Address in this form:\n\
     \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n\
-\n", 298},
-  {"Real name: ", 299},
-  {"Invalid character in name\n", 300},
-  {"Name may not start with a digit\n", 301},
-  {"Name must be at least 5 characters long\n", 302},
-  {"Email address: ", 303},
-  {"Not a valid email address\n", 304},
-  {"Comment: ", 305},
-  {"Invalid character in comment\n", 306},
-  {"You are using the `%s' character set.\n", 307},
+\n", 300},
+  {"Real name: ", 301},
+  {"Invalid character in name\n", 302},
+  {"Name may not start with a digit\n", 303},
+  {"Name must be at least 5 characters long\n", 304},
+  {"Email address: ", 305},
+  {"Not a valid email address\n", 306},
+  {"Comment: ", 307},
+  {"Invalid character in comment\n", 308},
+  {"You are using the `%s' character set.\n", 309},
   {"\
 You selected this USER-ID:\n\
     \"%s\"\n\
-\n", 308},
-  {"Please don't put the email address into the real name or the comment\n", 309},
-  {"NnCcEeOoQq", 310},
-  {"Change (N)ame, (C)omment, (E)mail or (Q)uit? ", 311},
-  {"Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? ", 312},
-  {"Please correct the error first\n", 313},
+\n", 310},
+  {"Please don't put the email address into the real name or the comment\n", 311},
+  {"NnCcEeOoQq", 312},
+  {"Change (N)ame, (C)omment, (E)mail or (Q)uit? ", 313},
+  {"Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? ", 314},
+  {"Please correct the error first\n", 315},
   {"\
 You need a Passphrase to protect your secret key.\n\
-\n", 314},
-  {"passphrase not correctly repeated; try again.\n", 315},
+\n", 316},
+  {"passphrase not correctly repeated; try again.\n", 317},
   {"\
 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\
 using this program with the option \"--edit-key\".\n\
-\n", 316},
+\n", 318},
   {"\
 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\
 disks) during the prime generation; this gives the random number\n\
-generator a better chance to gain enough entropy.\n", 317},
-  {"DSA keypair will have 1024 bits.\n", 318},
-  {"Key generation canceled.\n", 319},
-  {"writing public key to `%s'\n", 320},
-  {"writing secret key to `%s'\n", 321},
-  {"public and secret key created and signed.\n", 322},
+generator a better chance to gain enough entropy.\n", 319},
+  {"DSA keypair will have 1024 bits.\n", 320},
+  {"Key generation canceled.\n", 321},
+  {"writing public key to `%s'\n", 322},
+  {"writing secret key to `%s'\n", 323},
+  {"public and secret key created and signed.\n", 324},
   {"\
 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", 323},
-  {"Key generation failed: %s\n", 324},
+the command \"--edit-key\" to generate a secondary key for this purpose.\n", 325},
+  {"Key generation failed: %s\n", 326},
   {"\
-key has been created %lu second in future (time warp or clock problem)\n", 325},
+key has been created %lu second in future (time warp or clock problem)\n", 327},
   {"\
-key has been created %lu seconds in future (time warp or clock problem)\n", 326},
-  {"Really create? ", 327},
-  {"%s: can't open: %s\n", 328},
-  {"error creating passphrase: %s\n", 329},
-  {"%s: WARNING: empty file\n", 330},
-  {"reading from `%s'\n", 331},
-  {"%s/%s encrypted for: %s\n", 332},
-  {"%s: user not found: %s\n", 333},
-  {"certificate read problem: %s\n", 334},
-  {"key %08lX: not a rfc2440 key - skipped\n", 335},
-  {"key %08lX: not protected - skipped\n", 336},
-  {"WARNING: nothing exported\n", 337},
-  {"too many entries in pk cache - disabled\n", 338},
-  {"too many entries in unk cache - disabled\n", 339},
-  {"RSA key cannot be used in this version\n", 340},
-  {"No key for user ID\n", 341},
-  {"No user ID for key\n", 342},
-  {"using secondary key %08lX instead of primary key %08lX\n", 343},
-  {"[User id not found]", 344},
-  {"skipping block of type %d\n", 345},
-  {"%lu keys so far processed\n", 346},
-  {"error reading `%s': %s\n", 347},
-  {"Total number processed: %lu\n", 348},
-  {"          w/o user IDs: %lu\n", 349},
-  {"              imported: %lu", 350},
-  {"             unchanged: %lu\n", 351},
-  {"          new user IDs: %lu\n", 352},
-  {"           new subkeys: %lu\n", 353},
-  {"        new signatures: %lu\n", 354},
-  {"   new key revocations: %lu\n", 355},
-  {"      secret keys read: %lu\n", 356},
-  {"  secret keys imported: %lu\n", 357},
-  {" secret keys unchanged: %lu\n", 358},
-  {"key %08lX: no user ID\n", 359},
-  {"key %08lX: no valid user IDs\n", 360},
-  {"this may be caused by a missing self-signature\n", 361},
-  {"key %08lX: public key not found: %s\n", 362},
-  {"no default public keyring\n", 363},
-  {"writing to `%s'\n", 364},
-  {"can't lock keyring `%s': %s\n", 365},
-  {"error writing keyring `%s': %s\n", 366},
-  {"key %08lX: public key imported\n", 367},
-  {"key %08lX: doesn't match our copy\n", 368},
-  {"key %08lX: can't locate original keyblock: %s\n", 369},
-  {"key %08lX: can't read original keyblock: %s\n", 370},
-  {"key %08lX: 1 new user ID\n", 371},
-  {"key %08lX: %d new user IDs\n", 372},
-  {"key %08lX: 1 new signature\n", 373},
-  {"key %08lX: %d new signatures\n", 374},
-  {"key %08lX: 1 new subkey\n", 375},
-  {"key %08lX: %d new subkeys\n", 376},
-  {"key %08lX: not changed\n", 377},
-  {"key %08lX: secret key imported\n", 378},
-  {"key %08lX: already in secret keyring\n", 379},
-  {"key %08lX: secret key not found: %s\n", 380},
-  {"key %08lX: no public key - can't apply revocation certificate\n", 381},
-  {"key %08lX: invalid revocation certificate: %s - rejected\n", 382},
-  {"key %08lX: revocation certificate imported\n", 383},
-  {"key %08lX: no user ID for signature\n", 384},
-  {"key %08lX: unsupported public key algorithm\n", 385},
-  {"key %08lX: invalid self-signature\n", 386},
-  {"key %08lX: no subkey for key binding\n", 387},
-  {"key %08lX: invalid subkey binding\n", 388},
-  {"key %08lX: accepted non self-signed user ID '", 389},
-  {"key %08lX: skipped user ID '", 390},
-  {"key %08lX: skipped subkey\n", 391},
-  {"key %08lX: non exportable signature (class %02x) - skipped\n", 392},
-  {"key %08lX: revocation certificate at wrong place - skipped\n", 393},
-  {"key %08lX: invalid revocation certificate: %s - skipped\n", 394},
-  {"key %08lX: duplicated user ID detected - merged\n", 395},
-  {"key %08lX: revocation certificate added\n", 396},
-  {"key %08lX: our copy has no self-signature\n", 397},
-  {"%s: user not found\n", 398},
-  {"[revocation]", 399},
-  {"[self-signature]", 400},
-  {"1 bad signature\n", 401},
-  {"%d bad signatures\n", 402},
-  {"1 signature not checked due to a missing key\n", 403},
-  {"%d signatures not checked due to missing keys\n", 404},
-  {"1 signature not checked due to an error\n", 405},
-  {"%d signatures not checked due to errors\n", 406},
-  {"1 user ID without valid self-signature detected\n", 407},
-  {"%d user IDs without valid self-signatures detected\n", 408},
-  {"Already signed by key %08lX\n", 409},
-  {"Nothing to sign with key %08lX\n", 410},
+key has been created %lu seconds in future (time warp or clock problem)\n", 328},
+  {"Really create? ", 329},
+  {"%s: can't open: %s\n", 330},
+  {"error creating passphrase: %s\n", 331},
+  {"%s: WARNING: empty file\n", 332},
+  {"reading from `%s'\n", 333},
+  {"%s/%s encrypted for: %s\n", 334},
+  {"%s: user not found: %s\n", 335},
+  {"certificate read problem: %s\n", 336},
+  {"key %08lX: not a rfc2440 key - skipped\n", 337},
+  {"key %08lX: not protected - skipped\n", 338},
+  {"WARNING: nothing exported\n", 339},
+  {"too many entries in pk cache - disabled\n", 340},
+  {"too many entries in unk cache - disabled\n", 341},
+  {"RSA key cannot be used in this version\n", 342},
+  {"No key for user ID\n", 343},
+  {"No user ID for key\n", 344},
+  {"using secondary key %08lX instead of primary key %08lX\n", 345},
+  {"[User id not found]", 346},
+  {"skipping block of type %d\n", 347},
+  {"%lu keys so far processed\n", 348},
+  {"error reading `%s': %s\n", 349},
+  {"Total number processed: %lu\n", 350},
+  {"      skipped new keys: %lu\n", 351},
+  {"          w/o user IDs: %lu\n", 352},
+  {"              imported: %lu", 353},
+  {"             unchanged: %lu\n", 354},
+  {"          new user IDs: %lu\n", 355},
+  {"           new subkeys: %lu\n", 356},
+  {"        new signatures: %lu\n", 357},
+  {"   new key revocations: %lu\n", 358},
+  {"      secret keys read: %lu\n", 359},
+  {"  secret keys imported: %lu\n", 360},
+  {" secret keys unchanged: %lu\n", 361},
+  {"key %08lX: no user ID\n", 362},
+  {"key %08lX: no valid user IDs\n", 363},
+  {"this may be caused by a missing self-signature\n", 364},
+  {"key %08lX: public key not found: %s\n", 365},
+  {"key %08lX: new key - skipped\n", 366},
+  {"no default public keyring\n", 367},
+  {"writing to `%s'\n", 368},
+  {"can't lock keyring `%s': %s\n", 369},
+  {"error writing keyring `%s': %s\n", 370},
+  {"key %08lX: public key imported\n", 371},
+  {"key %08lX: doesn't match our copy\n", 372},
+  {"key %08lX: can't locate original keyblock: %s\n", 373},
+  {"key %08lX: can't read original keyblock: %s\n", 374},
+  {"key %08lX: 1 new user ID\n", 375},
+  {"key %08lX: %d new user IDs\n", 376},
+  {"key %08lX: 1 new signature\n", 377},
+  {"key %08lX: %d new signatures\n", 378},
+  {"key %08lX: 1 new subkey\n", 379},
+  {"key %08lX: %d new subkeys\n", 380},
+  {"key %08lX: not changed\n", 381},
+  {"key %08lX: secret key imported\n", 382},
+  {"key %08lX: already in secret keyring\n", 383},
+  {"key %08lX: secret key not found: %s\n", 384},
+  {"key %08lX: no public key - can't apply revocation certificate\n", 385},
+  {"key %08lX: invalid revocation certificate: %s - rejected\n", 386},
+  {"key %08lX: revocation certificate imported\n", 387},
+  {"key %08lX: no user ID for signature\n", 388},
+  {"key %08lX: unsupported public key algorithm\n", 389},
+  {"key %08lX: invalid self-signature\n", 390},
+  {"key %08lX: no subkey for key binding\n", 391},
+  {"key %08lX: invalid subkey binding\n", 392},
+  {"key %08lX: accepted non self-signed user ID '", 393},
+  {"key %08lX: skipped user ID '", 394},
+  {"key %08lX: skipped subkey\n", 395},
+  {"key %08lX: non exportable signature (class %02x) - skipped\n", 396},
+  {"key %08lX: revocation certificate at wrong place - skipped\n", 397},
+  {"key %08lX: invalid revocation certificate: %s - skipped\n", 398},
+  {"key %08lX: duplicated user ID detected - merged\n", 399},
+  {"key %08lX: revocation certificate added\n", 400},
+  {"key %08lX: our copy has no self-signature\n", 401},
+  {"%s: user not found\n", 402},
+  {"[revocation]", 403},
+  {"[self-signature]", 404},
+  {"1 bad signature\n", 405},
+  {"%d bad signatures\n", 406},
+  {"1 signature not checked due to a missing key\n", 407},
+  {"%d signatures not checked due to missing keys\n", 408},
+  {"1 signature not checked due to an error\n", 409},
+  {"%d signatures not checked due to errors\n", 410},
+  {"1 user ID without valid self-signature detected\n", 411},
+  {"%d user IDs without valid self-signatures detected\n", 412},
+  {"Already signed by key %08lX\n", 413},
+  {"Nothing to sign with key %08lX\n", 414},
   {"\
 Are you really sure that you want to sign this key\n\
-with your key: \"", 411},
+with your key: \"", 415},
   {"\
 The signature will be marked as non-exportable.\n\
-\n", 412},
-  {"Really sign? ", 413},
-  {"signing failed: %s\n", 414},
-  {"This key is not protected.\n", 415},
-  {"Secret parts of primary key are not available.\n", 416},
-  {"Key is protected.\n", 417},
-  {"Can't edit this key: %s\n", 418},
+\n", 416},
+  {"Really sign? ", 417},
+  {"signing failed: %s\n", 418},
+  {"This key is not protected.\n", 419},
+  {"Secret parts of primary key are not available.\n", 420},
+  {"Key is protected.\n", 421},
+  {"Can't edit this key: %s\n", 422},
   {"\
 Enter the new passphrase for this secret key.\n\
-\n", 419},
+\n", 423},
   {"\
 You don't want a passphrase - this is probably a *bad* idea!\n\
-\n", 420},
-  {"Do you really want to do this? ", 421},
-  {"moving a key signature to the correct place\n", 422},
-  {"quit this menu", 423},
-  {"q", 424},
-  {"save", 425},
-  {"save and quit", 426},
-  {"help", 427},
-  {"show this help", 428},
-  {"fpr", 429},
-  {"show fingerprint", 430},
-  {"list", 431},
-  {"list key and user IDs", 432},
-  {"l", 433},
-  {"uid", 434},
-  {"select user ID N", 435},
-  {"key", 436},
-  {"select secondary key N", 437},
-  {"check", 438},
-  {"list signatures", 439},
-  {"c", 440},
-  {"sign", 441},
-  {"sign the key", 442},
-  {"s", 443},
-  {"lsign", 444},
-  {"sign the key locally", 445},
-  {"debug", 446},
-  {"adduid", 447},
-  {"add a user ID", 448},
-  {"deluid", 449},
-  {"delete user ID", 450},
-  {"addkey", 451},
-  {"add a secondary key", 452},
-  {"delkey", 453},
-  {"delete a secondary key", 454},
-  {"delsig", 455},
-  {"delete signatures", 456},
-  {"expire", 457},
-  {"change the expire date", 458},
-  {"toggle", 459},
-  {"toggle between secret and public key listing", 460},
-  {"t", 461},
-  {"pref", 462},
-  {"list preferences", 463},
-  {"passwd", 464},
-  {"change the passphrase", 465},
-  {"trust", 466},
-  {"change the ownertrust", 467},
-  {"revsig", 468},
-  {"revoke signatures", 469},
-  {"revkey", 470},
-  {"revoke a secondary key", 471},
-  {"disable", 472},
-  {"disable a key", 473},
-  {"enable", 474},
-  {"enable a key", 475},
-  {"can't do that in batchmode\n", 476},
-  {"Secret key is available.\n", 477},
-  {"Command> ", 478},
-  {"Need the secret key to do this.\n", 479},
-  {"Please use the command \"toggle\" first.\n", 480},
-  {"Really sign all user IDs? ", 481},
-  {"Hint: Select the user IDs to sign\n", 482},
-  {"update of trustdb failed: %s\n", 483},
-  {"You must select at least one user ID.\n", 484},
-  {"You can't delete the last user ID!\n", 485},
-  {"Really remove all selected user IDs? ", 486},
-  {"Really remove this user ID? ", 487},
-  {"You must select at least one key.\n", 488},
-  {"Do you really want to delete the selected keys? ", 489},
-  {"Do you really want to delete this key? ", 490},
-  {"Do you really want to revoke the selected keys? ", 491},
-  {"Do you really want to revoke this key? ", 492},
-  {"Save changes? ", 493},
-  {"Quit without saving? ", 494},
-  {"update failed: %s\n", 495},
-  {"update secret failed: %s\n", 496},
-  {"Key not changed so no update needed.\n", 497},
-  {"Invalid command  (try \"help\")\n", 498},
-  {"%s%c %4u%c/%08lX  created: %s expires: %s", 499},
-  {" trust: %c/%c", 500},
-  {"This key has been disabled", 501},
-  {"rev! subkey has been revoked: %s\n", 502},
-  {"rev- faked revocation found\n", 503},
-  {"rev? problem checking revocation: %s\n", 504},
-  {"Delete this good signature? (y/N/q)", 505},
-  {"Delete this invalid signature? (y/N/q)", 506},
-  {"Delete this unknown signature? (y/N/q)", 507},
-  {"Really delete this self-signature? (y/N)", 508},
-  {"Deleted %d signature.\n", 509},
-  {"Deleted %d signatures.\n", 510},
-  {"Nothing deleted.\n", 511},
-  {"Please remove selections from the secret keys.\n", 512},
-  {"Please select at most one secondary key.\n", 513},
-  {"Changing expiration time for a secondary key.\n", 514},
-  {"Changing expiration time for the primary key.\n", 515},
-  {"You can't change the expiration date of a v3 key\n", 516},
-  {"No corresponding signature in secret ring\n", 517},
-  {"No user ID with index %d\n", 518},
-  {"No secondary key with index %d\n", 519},
-  {"user ID: \"", 520},
+\n", 424},
+  {"Do you really want to do this? ", 425},
+  {"moving a key signature to the correct place\n", 426},
+  {"quit this menu", 427},
+  {"q", 428},
+  {"save", 429},
+  {"save and quit", 430},
+  {"help", 431},
+  {"show this help", 432},
+  {"fpr", 433},
+  {"show fingerprint", 434},
+  {"list", 435},
+  {"list key and user IDs", 436},
+  {"l", 437},
+  {"uid", 438},
+  {"select user ID N", 439},
+  {"key", 440},
+  {"select secondary key N", 441},
+  {"check", 442},
+  {"list signatures", 443},
+  {"c", 444},
+  {"sign", 445},
+  {"sign the key", 446},
+  {"s", 447},
+  {"lsign", 448},
+  {"sign the key locally", 449},
+  {"debug", 450},
+  {"adduid", 451},
+  {"add a user ID", 452},
+  {"deluid", 453},
+  {"delete user ID", 454},
+  {"addkey", 455},
+  {"add a secondary key", 456},
+  {"delkey", 457},
+  {"delete a secondary key", 458},
+  {"delsig", 459},
+  {"delete signatures", 460},
+  {"expire", 461},
+  {"change the expire date", 462},
+  {"toggle", 463},
+  {"toggle between secret and public key listing", 464},
+  {"t", 465},
+  {"pref", 466},
+  {"list preferences", 467},
+  {"passwd", 468},
+  {"change the passphrase", 469},
+  {"trust", 470},
+  {"change the ownertrust", 471},
+  {"revsig", 472},
+  {"revoke signatures", 473},
+  {"revkey", 474},
+  {"revoke a secondary key", 475},
+  {"disable", 476},
+  {"disable a key", 477},
+  {"enable", 478},
+  {"enable a key", 479},
+  {"can't do that in batchmode\n", 480},
+  {"Secret key is available.\n", 481},
+  {"Command> ", 482},
+  {"Need the secret key to do this.\n", 483},
+  {"Please use the command \"toggle\" first.\n", 484},
+  {"Really sign all user IDs? ", 485},
+  {"Hint: Select the user IDs to sign\n", 486},
+  {"update of trustdb failed: %s\n", 487},
+  {"You must select at least one user ID.\n", 488},
+  {"You can't delete the last user ID!\n", 489},
+  {"Really remove all selected user IDs? ", 490},
+  {"Really remove this user ID? ", 491},
+  {"You must select at least one key.\n", 492},
+  {"Do you really want to delete the selected keys? ", 493},
+  {"Do you really want to delete this key? ", 494},
+  {"Do you really want to revoke the selected keys? ", 495},
+  {"Do you really want to revoke this key? ", 496},
+  {"Save changes? ", 497},
+  {"Quit without saving? ", 498},
+  {"update failed: %s\n", 499},
+  {"update secret failed: %s\n", 500},
+  {"Key not changed so no update needed.\n", 501},
+  {"Invalid command  (try \"help\")\n", 502},
+  {"%s%c %4u%c/%08lX  created: %s expires: %s", 503},
+  {" trust: %c/%c", 504},
+  {"This key has been disabled", 505},
+  {"rev! subkey has been revoked: %s\n", 506},
+  {"rev- faked revocation found\n", 507},
+  {"rev? problem checking revocation: %s\n", 508},
+  {"Delete this good signature? (y/N/q)", 509},
+  {"Delete this invalid signature? (y/N/q)", 510},
+  {"Delete this unknown signature? (y/N/q)", 511},
+  {"Really delete this self-signature? (y/N)", 512},
+  {"Deleted %d signature.\n", 513},
+  {"Deleted %d signatures.\n", 514},
+  {"Nothing deleted.\n", 515},
+  {"Please remove selections from the secret keys.\n", 516},
+  {"Please select at most one secondary key.\n", 517},
+  {"Changing expiration time for a secondary key.\n", 518},
+  {"Changing expiration time for the primary key.\n", 519},
+  {"You can't change the expiration date of a v3 key\n", 520},
+  {"No corresponding signature in secret ring\n", 521},
+  {"No user ID with index %d\n", 522},
+  {"No secondary key with index %d\n", 523},
+  {"user ID: \"", 524},
   {"\
 \"\n\
-signed with your key %08lX at %s\n", 521},
-  {"Create a revocation certificate for this signature? (y/N)", 522},
-  {"You have signed these user IDs:\n", 523},
-  {"   signed by %08lX at %s\n", 524},
-  {"   revoked by %08lX at %s\n", 525},
-  {"You are about to revoke these signatures:\n", 526},
-  {"Really create the revocation certificates? (y/N)", 527},
-  {"no secret key\n", 528},
-  {" [expires: %s]", 529},
-  {"public key is %08lX\n", 530},
-  {"public key encrypted data: good DEK\n", 531},
-  {"encrypted with %u-bit %s key, ID %08lX, created %s\n", 532},
-  {"encrypted with %s key, ID %08lX\n", 533},
-  {"no secret key for decryption available\n", 534},
-  {"public key decryption failed: %s\n", 535},
-  {"decryption okay\n", 536},
-  {"WARNING: encrypted message has been manipulated!\n", 537},
-  {"decryption failed: %s\n", 538},
-  {"NOTE: sender requested \"for-your-eyes-only\"\n", 539},
-  {"original file name='%.*s'\n", 540},
-  {"standalone revocation - use \"gpg --import\" to apply\n", 541},
-  {"WARNING: invalid notation data found\n", 542},
-  {"Notation: ", 543},
-  {"Policy: ", 544},
-  {"signature verification suppressed\n", 545},
-  {"Signature made %.*s using %s key ID %08lX\n", 546},
-  {"BAD signature from \"", 547},
-  {"Good signature from \"", 548},
-  {"                aka \"", 549},
-  {"Can't check signature: %s\n", 550},
-  {"standalone signature of class 0x%02x\n", 551},
-  {"old style (PGP 2.x) signature\n", 552},
-  {"invalid root packet detected in proc_tree()\n", 553},
-  {"can't disable core dumps: %s\n", 554},
-  {"WARNING: program may create a core file!\n", 555},
-  {"Experimental algorithms should not be used!\n", 556},
-  {"\
-RSA keys are deprecated; please consider creating a new key and use this key \
-in the future\n", 557},
-  {"this cipher algorithm is depreciated; please use a more standard one!\n", 558},
-  {"can't handle public key algorithm %d\n", 559},
-  {"subpacket of type %d has critical bit set\n", 560},
+signed with your key %08lX at %s\n", 525},
+  {"Create a revocation certificate for this signature? (y/N)", 526},
+  {"You have signed these user IDs:\n", 527},
+  {"   signed by %08lX at %s\n", 528},
+  {"   revoked by %08lX at %s\n", 529},
+  {"You are about to revoke these signatures:\n", 530},
+  {"Really create the revocation certificates? (y/N)", 531},
+  {"no secret key\n", 532},
+  {"invalid", 533},
+  {"revoked", 534},
+  {" [expires: %s]", 535},
+  {"public key is %08lX\n", 536},
+  {"public key encrypted data: good DEK\n", 537},
+  {"encrypted with %u-bit %s key, ID %08lX, created %s\n", 538},
+  {"encrypted with %s key, ID %08lX\n", 539},
+  {"no secret key for decryption available\n", 540},
+  {"public key decryption failed: %s\n", 541},
+  {"decryption okay\n", 542},
+  {"WARNING: encrypted message has been manipulated!\n", 543},
+  {"decryption failed: %s\n", 544},
+  {"NOTE: sender requested \"for-your-eyes-only\"\n", 545},
+  {"original file name='%.*s'\n", 546},
+  {"standalone revocation - use \"gpg --import\" to apply\n", 547},
+  {"WARNING: invalid notation data found\n", 548},
+  {"Notation: ", 549},
+  {"Policy: ", 550},
+  {"signature verification suppressed\n", 551},
+  {"Signature made %.*s using %s key ID %08lX\n", 552},
+  {"BAD signature from \"", 553},
+  {"Good signature from \"", 554},
+  {"                aka \"", 555},
+  {"Can't check signature: %s\n", 556},
+  {"standalone signature of class 0x%02x\n", 557},
+  {"old style (PGP 2.x) signature\n", 558},
+  {"invalid root packet detected in proc_tree()\n", 559},
+  {"can't disable core dumps: %s\n", 560},
+  {"Experimental algorithms should not be used!\n", 561},
+  {"this cipher algorithm is depreciated; please use a more standard one!\n", 562},
+  {"can't handle public key algorithm %d\n", 563},
+  {"subpacket of type %d has critical bit set\n", 564},
   {"\
 \n\
 You need a passphrase to unlock the secret key for\n\
-user: \"", 561},
-  {"%u-bit %s key, ID %08lX, created %s", 562},
-  {" (main key ID %08lX)", 563},
-  {"can't query password in batchmode\n", 564},
-  {"Enter passphrase: ", 565},
-  {"Repeat passphrase: ", 566},
-  {"data not saved; use option \"--output\" to save it\n", 567},
-  {"Detached signature.\n", 568},
-  {"Please enter name of data file: ", 569},
-  {"reading stdin ...\n", 570},
-  {"can't open signed data `%s'\n", 571},
-  {"anonymous receiver; trying secret key %08lX ...\n", 572},
-  {"okay, we are the anonymous recipient.\n", 573},
-  {"old encoding of the DEK is not supported\n", 574},
-  {"cipher algorithm %d is unknown or disabled\n", 575},
-  {"NOTE: cipher algorithm %d not found in preferences\n", 576},
-  {"NOTE: secret key %08lX expired at %s\n", 577},
-  {"requesting key %08lX from %s ...\n", 578},
-  {"can't get key from keyserver: %s\n", 579},
-  {"no keyserver known (use option --keyserver)\n", 580},
-  {"%s: not a valid key ID\n", 581},
-  {"can't connect to `%s': %s\n", 582},
-  {"error sending to `%s': %s\n", 583},
-  {"success sending to `%s' (status=%u)\n", 584},
-  {"failed sending to `%s': status=%u\n", 585},
-  {"secret key parts are not available\n", 586},
-  {"protection algorithm %d is not supported\n", 587},
-  {"Invalid passphrase; please try again ...\n", 588},
-  {"WARNING: Weak key detected - please change passphrase again.\n", 589},
-  {"assuming bad MDC due to an unknown critical bit\n", 590},
-  {"\
-this is a PGP generated ElGamal key which is NOT secure for signatures!\n", 591},
-  {"public key is %lu second newer than the signature\n", 592},
-  {"public key is %lu seconds newer than the signature\n", 593},
-  {"NOTE: signature key expired %s\n", 594},
-  {"assuming bad signature due to an unknown critical bit\n", 595},
-  {"%s signature from: %s\n", 596},
-  {"can't create %s: %s\n", 597},
-  {"signing:", 598},
-  {"WARNING: `%s' is an empty file\n", 599},
-  {"can't handle text lines longer than %d characters\n", 600},
-  {"input line longer than %d characters\n", 601},
-  {"trustdb rec %lu: lseek failed: %s\n", 602},
-  {"trustdb rec %lu: write failed (n=%d): %s\n", 603},
-  {"trustdb transaction too large\n", 604},
-  {"%s: can't access: %s\n", 605},
-  {"%s: directory does not exist!\n", 606},
-  {"%s: can't create: %s\n", 607},
-  {"%s: can't create lock\n", 608},
-  {"%s: failed to create version record: %s", 609},
-  {"%s: invalid trustdb created\n", 610},
-  {"%s: trustdb created\n", 611},
-  {"%s: invalid trustdb\n", 612},
-  {"%s: failed to create hashtable: %s\n", 613},
-  {"%s: error updating version record: %s\n", 614},
-  {"%s: error reading version record: %s\n", 615},
-  {"%s: error writing version record: %s\n", 616},
-  {"trustdb: lseek failed: %s\n", 617},
-  {"trustdb: read failed (n=%d): %s\n", 618},
-  {"%s: not a trustdb file\n", 619},
-  {"%s: version record with recnum %lu\n", 620},
-  {"%s: invalid file version %d\n", 621},
-  {"%s: error reading free record: %s\n", 622},
-  {"%s: error writing dir record: %s\n", 623},
-  {"%s: failed to zero a record: %s\n", 624},
-  {"%s: failed to append a record: %s\n", 625},
-  {"the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n", 626},
-  {"trust record %lu, req type %d: read failed: %s\n", 627},
-  {"trust record %lu, type %d: write failed: %s\n", 628},
-  {"trust record %lu: delete failed: %s\n", 629},
-  {"trustdb: sync failed: %s\n", 630},
-  {"error reading dir record for LID %lu: %s\n", 631},
-  {"lid %lu: expected dir record, got type %d\n", 632},
-  {"no primary key for LID %lu\n", 633},
-  {"error reading primary key for LID %lu: %s\n", 634},
-  {"get_dir_record: search_record failed: %s\n", 635},
-  {"NOTE: secret key %08lX is NOT protected.\n", 636},
-  {"key %08lX: secret key without public key - skipped\n", 637},
-  {"key %08lX: secret and public key don't match\n", 638},
-  {"key %08lX: can't put it into the trustdb\n", 639},
-  {"key %08lX: query record failed\n", 640},
-  {"key %08lX: already in trusted key table\n", 641},
-  {"key %08lX: accepted as trusted key.\n", 642},
-  {"enumerate secret keys failed: %s\n", 643},
-  {"key %08lX.%lu: Good subkey binding\n", 644},
-  {"key %08lX.%lu: Invalid subkey binding: %s\n", 645},
-  {"key %08lX.%lu: Valid key revocation\n", 646},
-  {"key %08lX.%lu: Invalid key revocation: %s\n", 647},
-  {"key %08lX.%lu: Valid subkey revocation\n", 648},
-  {"Good self-signature", 649},
-  {"Invalid self-signature", 650},
-  {"Valid user ID revocation skipped due to a newer self signature", 651},
-  {"Valid user ID revocation", 652},
-  {"Invalid user ID revocation", 653},
-  {"Valid certificate revocation", 654},
-  {"Good certificate", 655},
-  {"Invalid certificate revocation", 656},
-  {"Invalid certificate", 657},
-  {"sig record %lu[%d] points to wrong record.\n", 658},
-  {"duplicated certificate - deleted", 659},
-  {"tdbio_search_dir failed: %s\n", 660},
-  {"lid ?: insert failed: %s\n", 661},
-  {"lid %lu: insert failed: %s\n", 662},
-  {"lid %lu: inserted\n", 663},
-  {"error reading dir record: %s\n", 664},
-  {"%lu keys processed\n", 665},
-  {"\t%lu keys with errors\n", 666},
-  {"\t%lu keys inserted\n", 667},
-  {"enumerate keyblocks failed: %s\n", 668},
-  {"lid %lu: dir record w/o key - skipped\n", 669},
-  {"\t%lu due to new pubkeys\n", 670},
-  {"\t%lu keys skipped\n", 671},
-  {"\t%lu keys updated\n", 672},
-  {"Ooops, no keys\n", 673},
-  {"Ooops, no user IDs\n", 674},
-  {"check_trust: search dir record failed: %s\n", 675},
-  {"key %08lX: insert trust record failed: %s\n", 676},
-  {"key %08lX.%lu: inserted into trustdb\n", 677},
-  {"key %08lX.%lu: created in future (time warp or clock problem)\n", 678},
-  {"key %08lX.%lu: expired at %s\n", 679},
-  {"key %08lX.%lu: trust check failed: %s\n", 680},
-  {"user '%s' not found: %s\n", 681},
-  {"problem finding '%s' in trustdb: %s\n", 682},
-  {"user '%s' not in trustdb - inserting\n", 683},
-  {"failed to put '%s' into trustdb: %s\n", 684},
-  {"WARNING: can't yet handle long pref records\n", 685},
+user: \"", 565},
+  {"%u-bit %s key, ID %08lX, created %s", 566},
+  {" (main key ID %08lX)", 567},
+  {"can't query password in batchmode\n", 568},
+  {"Enter passphrase: ", 569},
+  {"Repeat passphrase: ", 570},
+  {"data not saved; use option \"--output\" to save it\n", 571},
+  {"Detached signature.\n", 572},
+  {"Please enter name of data file: ", 573},
+  {"reading stdin ...\n", 574},
+  {"can't open signed data `%s'\n", 575},
+  {"anonymous receiver; trying secret key %08lX ...\n", 576},
+  {"okay, we are the anonymous recipient.\n", 577},
+  {"old encoding of the DEK is not supported\n", 578},
+  {"cipher algorithm %d is unknown or disabled\n", 579},
+  {"NOTE: cipher algorithm %d not found in preferences\n", 580},
+  {"NOTE: secret key %08lX expired at %s\n", 581},
+  {"requesting key %08lX from %s ...\n", 582},
+  {"can't get key from keyserver: %s\n", 583},
+  {"no keyserver known (use option --keyserver)\n", 584},
+  {"%s: not a valid key ID\n", 585},
+  {"can't connect to `%s': %s\n", 586},
+  {"error sending to `%s': %s\n", 587},
+  {"success sending to `%s' (status=%u)\n", 588},
+  {"failed sending to `%s': status=%u\n", 589},
+  {"secret key parts are not available\n", 590},
+  {"protection algorithm %d is not supported\n", 591},
+  {"Invalid passphrase; please try again ...\n", 592},
+  {"WARNING: Weak key detected - please change passphrase again.\n", 593},
+  {"assuming bad MDC due to an unknown critical bit\n", 594},
+  {"\
+this is a PGP generated ElGamal key which is NOT secure for signatures!\n", 595},
+  {"public key is %lu second newer than the signature\n", 596},
+  {"public key is %lu seconds newer than the signature\n", 597},
+  {"NOTE: signature key expired %s\n", 598},
+  {"assuming bad signature due to an unknown critical bit\n", 599},
+  {"%s signature from: %s\n", 600},
+  {"can't create %s: %s\n", 601},
+  {"signing:", 602},
+  {"WARNING: `%s' is an empty file\n", 603},
+  {"can't handle text lines longer than %d characters\n", 604},
+  {"input line longer than %d characters\n", 605},
+  {"trustdb rec %lu: lseek failed: %s\n", 606},
+  {"trustdb rec %lu: write failed (n=%d): %s\n", 607},
+  {"trustdb transaction too large\n", 608},
+  {"%s: can't access: %s\n", 609},
+  {"%s: directory does not exist!\n", 610},
+  {"%s: can't create: %s\n", 611},
+  {"%s: can't create lock\n", 612},
+  {"%s: failed to create version record: %s", 613},
+  {"%s: invalid trustdb created\n", 614},
+  {"%s: trustdb created\n", 615},
+  {"%s: invalid trustdb\n", 616},
+  {"%s: failed to create hashtable: %s\n", 617},
+  {"%s: error updating version record: %s\n", 618},
+  {"%s: error reading version record: %s\n", 619},
+  {"%s: error writing version record: %s\n", 620},
+  {"trustdb: lseek failed: %s\n", 621},
+  {"trustdb: read failed (n=%d): %s\n", 622},
+  {"%s: not a trustdb file\n", 623},
+  {"%s: version record with recnum %lu\n", 624},
+  {"%s: invalid file version %d\n", 625},
+  {"%s: error reading free record: %s\n", 626},
+  {"%s: error writing dir record: %s\n", 627},
+  {"%s: failed to zero a record: %s\n", 628},
+  {"%s: failed to append a record: %s\n", 629},
+  {"the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n", 630},
+  {"trust record %lu, req type %d: read failed: %s\n", 631},
+  {"trust record %lu, type %d: write failed: %s\n", 632},
+  {"trust record %lu: delete failed: %s\n", 633},
+  {"trustdb: sync failed: %s\n", 634},
+  {"error reading dir record for LID %lu: %s\n", 635},
+  {"lid %lu: expected dir record, got type %d\n", 636},
+  {"no primary key for LID %lu\n", 637},
+  {"error reading primary key for LID %lu: %s\n", 638},
+  {"get_dir_record: search_record failed: %s\n", 639},
+  {"'%s' is not a valid long keyID\n", 640},
+  {"key %08lX: can't put it into the trustdb\n", 641},
+  {"key %08lX: query record failed\n", 642},
+  {"key %08lX: already in trusted key table\n", 643},
+  {"key %08lX: accepted as trusted key.\n", 644},
+  {"key %08lX: no public key for trusted key - skipped\n", 645},
+  {"NOTE: secret key %08lX is NOT protected.\n", 646},
+  {"key %08lX: secret key without public key - skipped\n", 647},
+  {"key %08lX: secret and public key don't match\n", 648},
+  {"enumerate secret keys failed: %s\n", 649},
+  {"key %08lX.%lu: Good subkey binding\n", 650},
+  {"key %08lX.%lu: Invalid subkey binding: %s\n", 651},
+  {"key %08lX.%lu: Valid key revocation\n", 652},
+  {"key %08lX.%lu: Invalid key revocation: %s\n", 653},
+  {"key %08lX.%lu: Valid subkey revocation\n", 654},
+  {"Good self-signature", 655},
+  {"Invalid self-signature", 656},
+  {"Valid user ID revocation skipped due to a newer self signature", 657},
+  {"Valid user ID revocation", 658},
+  {"Invalid user ID revocation", 659},
+  {"Valid certificate revocation", 660},
+  {"Good certificate", 661},
+  {"Invalid certificate revocation", 662},
+  {"Invalid certificate", 663},
+  {"sig record %lu[%d] points to wrong record.\n", 664},
+  {"duplicated certificate - deleted", 665},
+  {"tdbio_search_dir failed: %s\n", 666},
+  {"lid ?: insert failed: %s\n", 667},
+  {"lid %lu: insert failed: %s\n", 668},
+  {"lid %lu: inserted\n", 669},
+  {"error reading dir record: %s\n", 670},
+  {"%lu keys processed\n", 671},
+  {"\t%lu keys with errors\n", 672},
+  {"\t%lu keys inserted\n", 673},
+  {"enumerate keyblocks failed: %s\n", 674},
+  {"lid %lu: dir record w/o key - skipped\n", 675},
+  {"\t%lu due to new pubkeys\n", 676},
+  {"\t%lu keys skipped\n", 677},
+  {"\t%lu keys updated\n", 678},
+  {"Ooops, no keys\n", 679},
+  {"Ooops, no user IDs\n", 680},
+  {"check_trust: search dir record failed: %s\n", 681},
+  {"key %08lX: insert trust record failed: %s\n", 682},
+  {"key %08lX.%lu: inserted into trustdb\n", 683},
+  {"key %08lX.%lu: created in future (time warp or clock problem)\n", 684},
+  {"key %08lX.%lu: expired at %s\n", 685},
+  {"key %08lX.%lu: trust check failed: %s\n", 686},
+  {"user '%s' not found: %s\n", 687},
+  {"problem finding '%s' in trustdb: %s\n", 688},
+  {"user '%s' not in trustdb - inserting\n", 689},
+  {"failed to put '%s' into trustdb: %s\n", 690},
+  {"WARNING: can't yet handle long pref records\n", 691},
   {"\
 the signature could not be verified.\n\
 Please remember that the signature file (.sig or .asc)\n\
-should be the first file given on the command line.\n", 686},
-  {"input line %u too long or missing LF\n", 687},
-  {"%s: can't create keyring: %s\n", 688},
-  {"%s: keyring created\n", 689},
-  {"WARNING: 2 files with confidential information exists.\n", 690},
-  {"%s is the unchanged one\n", 691},
-  {"%s is the new one\n", 692},
-  {"Please fix this possible security flaw\n", 693},
-  {"key is not flagged as insecure - can't use it with the faked RNG!\n", 694},
-  {"skipped `%s': %s\n", 695},
+should be the first file given on the command line.\n", 692},
+  {"input line %u too long or missing LF\n", 693},
+  {"%s: can't create keyring: %s\n", 694},
+  {"%s: keyring created\n", 695},
+  {"WARNING: 2 files with confidential information exists.\n", 696},
+  {"%s is the unchanged one\n", 697},
+  {"%s is the new one\n", 698},
+  {"Please fix this possible security flaw\n", 699},
+  {"key is not flagged as insecure - can't use it with the faked RNG!\n", 700},
+  {"skipped `%s': %s\n", 701},
   {"\
 skipped `%s': this is a PGP generated ElGamal key which is not secure for \
-signatures!\n", 696},
-  {"File `%s' exists. ", 697},
-  {"Overwrite (y/N)? ", 698},
-  {"%s: unknown suffix\n", 699},
-  {"Enter new filename", 700},
-  {"writing to stdout\n", 701},
-  {"assuming signed data in `%s'\n", 702},
-  {"%s: new options file created\n", 703},
-  {"%s: can't create directory: %s\n", 704},
-  {"%s: directory created\n", 705},
-  {"you have to start GnuPG again, so it can read the new options file\n", 706},
-  {"%s encrypted data\n", 707},
-  {"encrypted with unknown algorithm %d\n", 708},
-  {"\
-WARNING: message was encrypted with a weak key in the symmetric cipher.\n", 709},
-  {"weak key created - retrying\n", 710},
-  {"cannot avoid weak key for symmetric cipher; tried %d times!\n", 711},
-  {"there is a secret key for this public key!\n", 712},
-  {"use option \"--delete-secret-key\" to delete it first.\n", 713},
-  {"can't do that in batchmode without \"--yes\"\n", 714},
-  {"Delete this key from the keyring? ", 715},
-  {"This is a secret key! - really delete? ", 716},
+signatures!\n", 702},
+  {"File `%s' exists. ", 703},
+  {"Overwrite (y/N)? ", 704},
+  {"%s: unknown suffix\n", 705},
+  {"Enter new filename", 706},
+  {"writing to stdout\n", 707},
+  {"assuming signed data in `%s'\n", 708},
+  {"%s: new options file created\n", 709},
+  {"%s: can't create directory: %s\n", 710},
+  {"%s: directory created\n", 711},
+  {"you have to start GnuPG again, so it can read the new options file\n", 712},
+  {"%s encrypted data\n", 713},
+  {"encrypted with unknown algorithm %d\n", 714},
+  {"\
+WARNING: message was encrypted with a weak key in the symmetric cipher.\n", 715},
+  {"weak key created - retrying\n", 716},
+  {"cannot avoid weak key for symmetric cipher; tried %d times!\n", 717},
+  {"there is a secret key for this public key!\n", 718},
+  {"use option \"--delete-secret-key\" to delete it first.\n", 719},
+  {"can't do that in batchmode without \"--yes\"\n", 720},
+  {"Delete this key from the keyring? ", 721},
+  {"This is a secret key! - really delete? ", 722},
   {"\
 It's up to you to assign a value here; this value will never be exported\n\
 to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n\
-to do with the (implicitly created) web-of-certificates.", 717},
-  {"If you want to use this revoked key anyway, answer \"yes\".", 718},
-  {"If you want to use this untrusted key anyway, answer \"yes\".", 719},
+to do with the (implicitly created) web-of-certificates.", 723},
+  {"If you want to use this revoked key anyway, answer \"yes\".", 724},
+  {"If you want to use this untrusted key anyway, answer \"yes\".", 725},
   {"\
-Enter the user ID of the addressee to whom you want to send the message.", 720},
+Enter the user ID of the addressee to whom you want to send the message.", 726},
   {"\
 Select the algorithm to use.\n\
 \n\
@@ -871,60 +875,60 @@
 \n\
 The first (primary) key must always be a key which is capable of signing;\n\
 this is the reason why the encryption only ElGamal key is not available in\n\
-this menu.", 721},
+this menu.", 727},
   {"\
 Although these keys are defined in RFC2440 they are not suggested\n\
 because they are not supported by all programs and signatures created\n\
-with them are quite large and very slow to verify.", 722},
-  {"Enter the size of the key", 723},
-  {"Answer \"yes\" or \"no\"", 724},
+with them are quite large and very slow to verify.", 728},
+  {"Enter the size of the key", 729},
+  {"Answer \"yes\" or \"no\"", 730},
   {"\
 Enter the required value as shown in the prompt.\n\
 It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n\
 get a good error response - instead the system tries to interpret\n\
-the given value as an interval.", 725},
-  {"Enter the name of the key holder", 726},
-  {"please enter an optional but highly suggested email address", 727},
-  {"Please enter an optional comment", 728},
+the given value as an interval.", 731},
+  {"Enter the name of the key holder", 732},
+  {"please enter an optional but highly suggested email address", 733},
+  {"Please enter an optional comment", 734},
   {"\
 N  to change the name.\n\
 C  to change the comment.\n\
 E  to change the email address.\n\
 O  to continue with key generation.\n\
-Q  to to quit the key generation.", 729},
-  {"Answer \"yes\" (or just \"y\") if it is okay to generate the sub key.", 730},
-  {"Answer \"yes\" is you want to sign ALL the user IDs", 731},
+Q  to to quit the key generation.", 735},
+  {"Answer \"yes\" (or just \"y\") if it is okay to generate the sub key.", 736},
+  {"Answer \"yes\" is you want to sign ALL the user IDs", 737},
   {"\
 Answer \"yes\" if you really want to delete this user ID.\n\
-All certificates are then also lost!", 732},
-  {"Answer \"yes\" if it is okay to delete the subkey", 733},
+All certificates are then also lost!", 738},
+  {"Answer \"yes\" if it is okay to delete the subkey", 739},
   {"\
 This is a valid signature on the key; you normally don't want\n\
 to delete this signature because it may be important to establish a\n\
-trust connection to the key or another key certified by this key.", 734},
+trust connection to the key or another key certified by this key.", 740},
   {"\
 This signature can't be checked because you don't have the\n\
 corresponding key.  You should postpone its deletion until you\n\
 know which key was used because this signing key might establish\n\
-a trust connection through another already certified key.", 735},
+a trust connection through another already certified key.", 741},
   {"\
 The signature is not valid.  It does make sense to remove it from\n\
-your keyring.", 736},
+your keyring.", 742},
   {"\
 This is a signature which binds the user ID to the key. It is\n\
 usually not a good idea to remove such a signature.  Actually\n\
 GnuPG might not be able to use this key anymore.  So do this\n\
 only if this self-signature is for some reason not valid and\n\
-a second one is available.", 737},
+a second one is available.", 743},
   {"\
 Please enter the passhrase; this is a secret sentence \n\
-  Blurb, blurb,.... ", 738},
-  {"Please repeat the last passphrase, so you are sure what you typed in.", 739},
-  {"Give the name of the file to which the signature applies", 740},
-  {"Answer \"yes\" if it is okay to overwrite the file", 741},
+  Blurb, blurb,.... ", 744},
+  {"Please repeat the last passphrase, so you are sure what you typed in.", 745},
+  {"Give the name of the file to which the signature applies", 746},
+  {"Answer \"yes\" if it is okay to overwrite the file", 747},
   {"\
 Please enter a new filename. If you just hit RETURN the default\n\
-file (which is shown in brackets) will be used.", 742},
+file (which is shown in brackets) will be used.", 748},
   {"\
 You should specify a reason for the certification.  Depending on the\n\
 context you have the ability to choose from this list:\n\
@@ -937,13 +941,13 @@
       Use this if you have retired this key.\n\
   \"User ID is no longer valid\"\n\
       Use this to state that the user ID should not longer be used;\n\
-      this is normally used to mark an email address invalid.\n", 743},
+      this is normally used to mark an email address invalid.\n", 749},
   {"\
 If you like, you can enter a text describing why you issue this\n\
 revocation certificate.  Please keep this text concise.\n\
-An empty line ends the text.\n", 744},
-  {"No help available", 745},
-  {"No help available for `%s'", 746},
+An empty line ends the text.\n", 750},
+  {"No help available", 751},
+  {"No help available for `%s'", 752},
 };
 
-int _msg_tbl_length = 746;
+int _msg_tbl_length = 752;
diff -urN gnupg-1.0.2/po/da.po gnupg-1.0.3/po/da.po
--- gnupg-1.0.2/po/da.po	Wed Jul 12 14:59:39 2000
+++ gnupg-1.0.3/po/da.po	Mon Sep 18 12:18:01 2000
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-07-12 12:13+0200\n"
+"POT-Creation-Date: 2000-09-18 12:17+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"
@@ -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:127 g10/keygen.c:1249
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1255
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke ĺbne '%s': %s\n"
@@ -309,11 +309,11 @@
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:647
+#: cipher/random.c:650
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "ADVARSEL: bruger usikker tilfćldig-nummer-generator!!!\n"
 
-#: cipher/random.c:648
+#: cipher/random.c:651
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -327,7 +327,7 @@
 "BENYT IKKE DATA GENERERET AF DETTE PROGRAM!!!\n"
 "\n"
 
-#: cipher/rndlinux.c:141
+#: cipher/rndlinux.c:142
 #, c-format
 msgid ""
 "\n"
@@ -338,7 +338,7 @@
 "Ikke nok tilfćldige byte tilgćngelig.  Please do some other work to give\n"
 "the OS a chance to collect more entropy! (Krćver %d byte mere)\n"
 
-#: g10/g10.c:197
+#: g10/g10.c:206
 msgid ""
 "@Commands:\n"
 " "
@@ -346,139 +346,139 @@
 "@Kommandoer:\n"
 " "
 
-#: g10/g10.c:199
+#: g10/g10.c:208
 msgid "|[file]|make a signature"
 msgstr "|[filer]|opret en signatur"
 
-#: g10/g10.c:200
+#: g10/g10.c:209
 msgid "|[file]|make a clear text signature"
 msgstr "|[filer]|opret rentekst signatur"
 
-#: g10/g10.c:201
+#: g10/g10.c:210
 msgid "make a detached signature"
 msgstr "opret en separat signatur"
 
-#: g10/g10.c:202
+#: g10/g10.c:211
 msgid "encrypt data"
 msgstr "kryptér data"
 
-#: g10/g10.c:203
+#: g10/g10.c:212
 msgid "encryption only with symmetric cipher"
 msgstr "kryptér kun med symmetriske cifre"
 
-#: g10/g10.c:204
+#: g10/g10.c:213
 msgid "store only"
 msgstr "gem kun"
 
-#: g10/g10.c:205
+#: g10/g10.c:214
 msgid "decrypt data (default)"
 msgstr "afkryptér data (standard)"
 
-#: g10/g10.c:206
+#: g10/g10.c:215
 msgid "verify a signature"
 msgstr "godkend en signatur"
 
-#: g10/g10.c:208
+#: g10/g10.c:217
 msgid "list keys"
 msgstr "vis nřgler"
 
-#: g10/g10.c:210
+#: g10/g10.c:219
 msgid "list keys and signatures"
 msgstr "vis nřgler og signaturer"
 
-#: g10/g10.c:211
+#: g10/g10.c:220
 msgid "check key signatures"
 msgstr "tjek nřglesignaturer"
 
-#: g10/g10.c:212
+#: g10/g10.c:221
 msgid "list keys and fingerprints"
 msgstr "vis nřgle og fingeraftryk"
 
-#: g10/g10.c:213
+#: g10/g10.c:222
 msgid "list secret keys"
 msgstr "vis hemmelige nřgler"
 
-#: g10/g10.c:214
+#: g10/g10.c:223
 msgid "generate a new key pair"
 msgstr "generér et nyt nřglepar"
 
-#: g10/g10.c:215
+#: g10/g10.c:224
 msgid "remove key from the public keyring"
 msgstr "fjern nřgle fra den offentlige nřglering"
 
-#: g10/g10.c:217
+#: g10/g10.c:226
 msgid "remove key from the secret keyring"
 msgstr "fjern nřgle fra den hemmelige nřglering"
 
-#: g10/g10.c:218
+#: g10/g10.c:227
 msgid "sign a key"
 msgstr "signér en nřgle"
 
-#: g10/g10.c:219
+#: g10/g10.c:228
 msgid "sign a key locally"
 msgstr "signér en nřgle lokalt"
 
-#: g10/g10.c:220
+#: g10/g10.c:229
 msgid "sign or edit a key"
 msgstr "signér eller redigér en nřgle"
 
-#: g10/g10.c:221
+#: g10/g10.c:230
 msgid "generate a revocation certificate"
 msgstr "Generér en annullérbar certifikat"
 
-#: g10/g10.c:222
+#: g10/g10.c:231
 msgid "export keys"
 msgstr "eksportér nřgler"
 
-#: g10/g10.c:223
+#: g10/g10.c:232
 msgid "export keys to a key server"
 msgstr "eksportér nřgler til en nřgletjener"
 
-#: g10/g10.c:224
+#: g10/g10.c:233
 msgid "import keys from a key server"
 msgstr "importér nřgler fra en nřgleserver"
 
-#: g10/g10.c:228
+#: g10/g10.c:237
 msgid "import/merge keys"
 msgstr "importér/fusionér nřgler"
 
-#: g10/g10.c:230
+#: g10/g10.c:239
 msgid "list only the sequence of packets"
 msgstr "vis kun pakkesekvensen"
 
-#: g10/g10.c:232
+#: g10/g10.c:241
 msgid "export the ownertrust values"
 msgstr "eksportér ejertillidsvćrdierne"
 
-#: g10/g10.c:234
+#: g10/g10.c:243
 msgid "import ownertrust values"
 msgstr "importér ejertillidsvćrdierne"
 
-#: g10/g10.c:236
+#: g10/g10.c:245
 msgid "update the trust database"
 msgstr "opdatér tillidsdatabasen"
 
-#: g10/g10.c:238
+#: g10/g10.c:247
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMES]|tjek tillidsdatabasen"
 
-#: g10/g10.c:239
+#: g10/g10.c:248
 msgid "fix a corrupted trust database"
 msgstr "reparér en řdelagt tillidsdatabase"
 
-#: g10/g10.c:240
+#: g10/g10.c:249
 msgid "De-Armor a file or stdin"
 msgstr "De-beskydt en fil el. stdin"
 
-#: g10/g10.c:242
+#: g10/g10.c:251
 msgid "En-Armor a file or stdin"
 msgstr "Beskydt en fil el. stdin"
 
-#: g10/g10.c:244
+#: g10/g10.c:253
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|print meddelelsesresumé"
 
-#: g10/g10.c:248
+#: g10/g10.c:257
 msgid ""
 "@\n"
 "Options:\n"
@@ -488,154 +488,158 @@
 "Indstillinger:\n"
 " "
 
-#: g10/g10.c:250
+#: g10/g10.c:259
 msgid "create ascii armored output"
 msgstr "opret ascii beskyttet uddata"
 
-#: g10/g10.c:252
+#: g10/g10.c:261
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|kryptér for NAME"
 
-#: g10/g10.c:255
+#: g10/g10.c:264
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|brug NAME som standard modtager"
 
-#: g10/g10.c:257
+#: g10/g10.c:266
 msgid "use the default key as default recipient"
 msgstr "brug standard nřglen som standard modtager"
 
-#: g10/g10.c:261
+#: g10/g10.c:270
 msgid "use this user-id to sign or decrypt"
 msgstr "brug denne bruger-id til at signere eller dekryptere"
 
-#: g10/g10.c:262
+#: g10/g10.c:271
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|sćt kompresningsniveau N (0 = slĺet fra)"
 
-#: g10/g10.c:264
+#: g10/g10.c:273
 msgid "use canonical text mode"
 msgstr "brug kanonisk tekstmodus"
 
-#: g10/g10.c:265
+#: g10/g10.c:274
 msgid "use as output file"
 msgstr "brug som uddatafil"
 
-#: g10/g10.c:266
+#: g10/g10.c:275
 msgid "verbose"
 msgstr "meddelsom"
 
-#: g10/g10.c:267
+#: g10/g10.c:276
 msgid "be somewhat more quiet"
 msgstr "vćr mere stille"
 
-#: g10/g10.c:268
+#: g10/g10.c:277
 msgid "don't use the terminal at all"
 msgstr "brug overhovedet ikke terminalen"
 
-#: g10/g10.c:269
+#: g10/g10.c:278
 msgid "force v3 signatures"
 msgstr "tving v3 signaturer"
 
-#: g10/g10.c:270
+#: g10/g10.c:279
 msgid "always use a MDC for encryption"
 msgstr "brug altid en MDC for kryptering"
 
-#: g10/g10.c:271
+#: g10/g10.c:280
 msgid "do not make any changes"
 msgstr "lav ingen ćndringer"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:273
+#: g10/g10.c:282
 msgid "batch mode: never ask"
 msgstr "křrselsmodus: spřrg aldrig"
 
-#: g10/g10.c:274
+#: g10/g10.c:283
 msgid "assume yes on most questions"
 msgstr "forvent ja til de fleste sprřgsmĺl"
 
-#: g10/g10.c:275
+#: g10/g10.c:284
 msgid "assume no on most questions"
 msgstr "forvent nej til de fleste sprřgsmĺl"
 
-#: g10/g10.c:276
+#: g10/g10.c:285
 msgid "add this keyring to the list of keyrings"
 msgstr "tilfřj denne nřglering til nřgleringslisten"
 
-#: g10/g10.c:277
+#: g10/g10.c:286
 msgid "add this secret keyring to the list"
 msgstr "tilfřj denne hemmeligenřglering til listen"
 
-#: g10/g10.c:278
+#: g10/g10.c:287
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|brug NAME som standard hemmelignřgle"
 
-#: g10/g10.c:279
+#: g10/g10.c:288
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|brug denne nřgletjener til at slĺ nřgler op"
 
-#: g10/g10.c:280
+#: g10/g10.c:289
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|sćt terminal karaktersćt til NAME"
 
-#: g10/g10.c:281
+#: g10/g10.c:290
 msgid "read options from file"
 msgstr "lćs indstillinger fra fil"
 
-#: g10/g10.c:285
+#: g10/g10.c:294
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinfo til denne FD"
 
-#: g10/g10.c:290
+#: g10/g10.c:299
+msgid "|KEYID|ulimately trust this key"
+msgstr ""
+
+#: g10/g10.c:300
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|indlćs udvidelsesmodul FILE"
 
-#: g10/g10.c:291
+#: g10/g10.c:301
 msgid "emulate the mode described in RFC1991"
 msgstr "emulér modusen beskrevet i RFC1991"
 
-#: g10/g10.c:292
+#: g10/g10.c:302
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "sćt alle pakker, cifre og resumé flag til OpenPGP standard"
 
-#: g10/g10.c:293
+#: g10/g10.c:303
 msgid "|N|use passphrase mode N"
 msgstr "|N|brug pasfrasemodus N"
 
-#: g10/g10.c:295
+#: g10/g10.c:305
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAME|brug meddelelses resuméalgoritme NAME for pasfrase"
 
-#: g10/g10.c:297
+#: g10/g10.c:307
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAME|brug cifrealgoritme NAME for pasfrase"
 
-#: g10/g10.c:298
+#: g10/g10.c:308
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|brug cifferalgoritme NAME"
 
-#: g10/g10.c:299
+#: g10/g10.c:309
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|brug meddelelsesresumé algoritme NAME"
 
-#: g10/g10.c:300
+#: g10/g10.c:310
 msgid "|N|use compress algorithm N"
 msgstr "|N|brug kompresalgoritme N"
 
-#: g10/g10.c:301
+#: g10/g10.c:311
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 
-#: g10/g10.c:302
+#: g10/g10.c:312
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAME=VALUE|brug denne notationsdata"
 
-#: g10/g10.c:305
+#: g10/g10.c:315
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:308
+#: g10/g10.c:318
 msgid ""
 "@\n"
 "Examples:\n"
@@ -655,16 +659,16 @@
 " --list-keys [navne]        vis nřgler\n"
 " --fingerprint [navne]      vis fingeraftryk\n"
 
-#: g10/g10.c:403
+#: g10/g10.c:418
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Rapportér venligst fejl til <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:407
+#: g10/g10.c:422
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hjćlp)"
 
 # Skal alt dette oversćttes eller er det flagene?
-#: g10/g10.c:410
+#: g10/g10.c:425
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -674,7 +678,7 @@
 "sign, check, encrypt eller decrypt\n"
 "standard operation afhćnger af inddata\n"
 
-#: g10/g10.c:417
+#: g10/g10.c:432
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -682,195 +686,199 @@
 "\n"
 "Understřttede algoritmer:\n"
 
-#: g10/g10.c:496
+#: g10/g10.c:511
 msgid "usage: gpg [options] "
 msgstr "brug: gpg [flag] "
 
-#: g10/g10.c:549
+#: g10/g10.c:564
 msgid "conflicting commands\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/g10.c:692
+#: g10/g10.c:704
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/g10.c:696
+#: g10/g10.c:708
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "alternativfil`%s': %s\n"
 
-#: g10/g10.c:703
+#: g10/g10.c:715
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lćser indstillinger fra `%s'\n"
 
-#: g10/g10.c:893
+#: g10/g10.c:905
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s er ikke et gyldigt tegnsćt\n"
 
-#: g10/g10.c:949 g10/g10.c:958
+#: g10/g10.c:970
+msgid "WARNING: program may create a core file!\n"
+msgstr ""
+
+#: g10/g10.c:974 g10/g10.c:983
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTITS: %s er ikke til normal brug!\n"
 
-#: g10/g10.c:951
+#: g10/g10.c:976
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/g10.c:954
+#: g10/g10.c:979
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningslřs sammen med %s!\n"
 
-#: g10/g10.c:973 g10/g10.c:985
+#: g10/g10.c:998 g10/g10.c:1010
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/g10.c:979 g10/g10.c:991
+#: g10/g10.c:1004 g10/g10.c:1016
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgte resuméalgoritme er ugyldig\n"
 
-#: g10/g10.c:995
+#: g10/g10.c:1020
 msgid "the given policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/g10.c:998
+#: g10/g10.c:1023
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr ""
 
-#: g10/g10.c:1000
+#: g10/g10.c:1025
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/g10.c:1002
+#: g10/g10.c:1027
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/g10.c:1004
+#: g10/g10.c:1029
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:1007
+#: g10/g10.c:1032
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: simpel S2K modus (0) frarĺdes pĺ det skarpeste\n"
 
-#: g10/g10.c:1011
+#: g10/g10.c:1036
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ugyldig S2K modus; skal vćre 0, 1 el. 3\n"
 
 # er det klogt at oversćtte TrustDB?
-#: g10/g10.c:1096
+#: g10/g10.c:1121
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/g10.c:1102
+#: g10/g10.c:1127
 msgid "--store [filename]"
 msgstr "--store [filnavn (som gemmes)]"
 
-#: g10/g10.c:1109
+#: g10/g10.c:1134
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/g10.c:1117
+#: g10/g10.c:1142
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn (som krypteres)]"
 
-#: g10/g10.c:1130
+#: g10/g10.c:1155
 msgid "--sign [filename]"
 msgstr "--sign [filnavn (som signeres)]"
 
-#: g10/g10.c:1143
+#: g10/g10.c:1168
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/g10.c:1157
+#: g10/g10.c:1182
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/g10.c:1174
+#: g10/g10.c:1199
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn (som dekrypteres)]"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1207
 msgid "--sign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/g10.c:1190
+#: g10/g10.c:1215
 msgid "--lsign-key user-id"
 msgstr "--lsign-key bruger-id"
 
-#: g10/g10.c:1198
+#: g10/g10.c:1223
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key bruger-id [kommandoer]"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1239
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key bruger-id"
 
-#: g10/g10.c:1217
+#: g10/g10.c:1242
 msgid "--delete-key user-id"
 msgstr "--delete-key bruger-id"
 
-#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393
+#: g10/encode.c:265 g10/g10.c:1279 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "kan ikke ĺbne %s: %s\n"
 
-#: g10/g10.c:1269
+#: g10/g10.c:1294
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [bruger-id] [nřglering]"
 
-#: g10/g10.c:1335
+#: g10/g10.c:1360
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:1343
+#: g10/g10.c:1368
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "pĺklćdning af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:1411
+#: g10/g10.c:1439
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hash-algoritme `%s'\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1520
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/g10.c:1496
+#: g10/g10.c:1524
 msgid "Go ahead and type your message ...\n"
 msgstr "Gĺ til sagen og skriv meddelelsen ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1499 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1527 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke ĺbne `%s'\n"
 
-#: g10/g10.c:1669
+#: g10/g10.c:1700
 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:1675
+#: g10/g10.c:1706
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
 msgstr ""
 
-#: g10/g10.c:1681
+#: g10/g10.c:1712
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 
-#: g10/g10.c:1689
+#: g10/g10.c:1720
 msgid "a notation value must not use any control characters\n"
 msgstr "en notationsvćrdi mĺ ikke bruge nogen kontroltegn\n"
 
@@ -1221,58 +1229,58 @@
 msgid "writing key binding signature\n"
 msgstr ""
 
-#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:433
+#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:435
 #, 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:438
+#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:440
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
 
-#: g10/keygen.c:537
+#: g10/keygen.c:539
 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:539
+#: g10/keygen.c:541
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA og ElGamal (standard)\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:542
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (signér kun)\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:544
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (kryptér kun)\n"
 
-#: g10/keygen.c:543
+#: g10/keygen.c:545
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signér og kryptér)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:547
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signér og kryptér)\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:551
 msgid "Your selection? "
 msgstr "Dit valg? "
 
-#: g10/keygen.c:560 g10/keygen.c:568
+#: g10/keygen.c:562 g10/keygen.c:570
 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:582
+#: g10/keygen.c:584
 msgid "Invalid selection.\n"
 msgstr "Ugyldigt valg.\n"
 
-#: g10/keygen.c:594
+#: g10/keygen.c:596
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1281,19 +1289,19 @@
 "    highest suggested keysize is 2048 bits\n"
 msgstr ""
 
-#: g10/keygen.c:601
+#: g10/keygen.c:603
 msgid "What keysize do you want? (1024) "
 msgstr "Hvilken nřglestřrrelse řnsker du? (1024) "
 
-#: g10/keygen.c:606
+#: g10/keygen.c:608
 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:608
+#: g10/keygen.c:610
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr ""
 
-#: g10/keygen.c:610
+#: g10/keygen.c:612
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr ""
 
@@ -1305,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:621
+#: g10/keygen.c:623
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr ""
 
-#: g10/keygen.c:626
+#: g10/keygen.c:628
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
 msgstr ""
 
-#: g10/keygen.c:629
+#: g10/keygen.c:631
 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:630
+#: g10/keygen.c:632
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
 msgstr ""
 
-#: g10/keygen.c:638
+#: g10/keygen.c:640
 msgid "Do you really need such a large keysize? "
 msgstr ""
 
-#: g10/keygen.c:644
+#: g10/keygen.c:646
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Řnsket nřglestřrrelse er %u bit\n"
 
-#: g10/keygen.c:647 g10/keygen.c:651
+#: g10/keygen.c:649 g10/keygen.c:653
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
 
-#: g10/keygen.c:699
+#: g10/keygen.c:701
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1350,36 +1358,36 @@
 "      <n>y = key expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:714
+#: g10/keygen.c:716
 msgid "Key is valid for? (0) "
 msgstr "Nřgle er gyldig for? (0) "
 
-#: g10/keygen.c:719
+#: g10/keygen.c:721
 msgid "invalid value\n"
 msgstr "ugyldig vćrdi\n"
 
-#: g10/keygen.c:724
+#: g10/keygen.c:726
 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:730
+#: g10/keygen.c:732
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Nřgle udlřber d. %s\n"
 
-#: g10/keygen.c:733
+#: g10/keygen.c:735
 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:738
+#: g10/keygen.c:740
 msgid "Is this correct (y/n)? "
 msgstr "Er dette korrekt (j/n)? "
 
-#: g10/keygen.c:781
+#: g10/keygen.c:783
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1389,44 +1397,44 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:793
+#: g10/keygen.c:795
 msgid "Real name: "
 msgstr "Rigtige navn: "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:803
 msgid "Invalid character in name\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/keygen.c:799
+#: g10/keygen.c:805
 msgid "Name may not start with a digit\n"
 msgstr "Navn mĺ ikke starte med et tal\n"
 
-#: g10/keygen.c:801
+#: g10/keygen.c:807
 msgid "Name must be at least 5 characters long\n"
 msgstr "Navn skal vćre mindst 5 bogstaver langt\n"
 
-#: g10/keygen.c:809
+#: g10/keygen.c:815
 msgid "Email address: "
 msgstr "Epostadresse: "
 
-#: g10/keygen.c:820
+#: g10/keygen.c:826
 msgid "Not a valid email address\n"
 msgstr "Ikke en gyldig epostadresse\n"
 
-#: g10/keygen.c:828
+#: g10/keygen.c:834
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:834
+#: g10/keygen.c:840
 msgid "Invalid character in comment\n"
 msgstr "Ugyldigt tegn i kommentar\n"
 
-#: g10/keygen.c:857
+#: g10/keygen.c:863
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du bruger '%s' tegnsćttet.\n"
 
-#: g10/keygen.c:863
+#: g10/keygen.c:869
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1437,28 +1445,28 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:867
+#: g10/keygen.c:873
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:872
+#: g10/keygen.c:878
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:882
+#: g10/keygen.c:888
 #, 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:883
+#: g10/keygen.c:889
 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:902
+#: g10/keygen.c:908
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:940
+#: g10/keygen.c:946
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1466,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:948
+#: g10/keyedit.c:468 g10/keygen.c:954
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "kodesćtningen blev ikke ordentlig gentaget; prřv igen.\n"
 
-#: g10/keygen.c:954
+#: g10/keygen.c:960
 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"
@@ -1478,7 +1486,7 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:975
+#: g10/keygen.c:981
 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"
@@ -1486,56 +1494,56 @@
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:1424
+#: g10/keygen.c:1430
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA nřglepar vil have 1024 bit.\n"
 
-#: g10/keygen.c:1467
+#: g10/keygen.c:1473
 msgid "Key generation canceled.\n"
 msgstr "Nřgleoprettelse annulleret.\n"
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1570
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/keygen.c:1565
+#: g10/keygen.c:1571
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1667
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig nřgle oprettet og signeret.\n"
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1672
 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:1683 g10/keygen.c:1784
+#: g10/keygen.c:1689 g10/keygen.c:1790
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:1727 g10/sig-check.c:318 g10/sign.c:112
+#: g10/keygen.c:1733 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:1729 g10/sig-check.c:320 g10/sign.c:114
+#: g10/keygen.c:1735 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:1762
+#: g10/keygen.c:1768
 msgid "Really create? "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/encode.c:91 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/encode.c:91 g10/openfile.c:178 g10/openfile.c:288 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1546,17 +1554,17 @@
 msgid "error creating passphrase: %s\n"
 msgstr "fejl ved oprettelse af kodesćtning: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:319
+#: g10/encode.c:171 g10/encode.c:324
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ADVARSEL: tom fil\n"
 
-#: g10/encode.c:266
+#: g10/encode.c:271
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lćser fra '%s'\n"
 
-#: g10/encode.c:483
+#: g10/encode.c:492
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s krypteret for: %s\n"
@@ -1605,246 +1613,256 @@
 msgid "No user ID for key\n"
 msgstr "Ingen bruger-ID for nřgle\n"
 
-#: g10/getkey.c:1642 g10/getkey.c:1698
+#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "bruger sekundćr nřgle %08lX istedetfor primćr nřgle %08lX\n"
 
-#: g10/getkey.c:2017
+#: g10/getkey.c:2050
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: bruger ikke fundet\n"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "sprang over blok af typen %d\n"
 
-#: g10/import.c:188 g10/trustdb.c:1740 g10/trustdb.c:1781
+#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu nřgler behandlet indtil nu\n"
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fejl ved lćsning af '%s': %s\n"
 
-#: g10/import.c:203
+#: g10/import.c:204
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Totalt antal behandlede: %lu\n"
 
-#: g10/import.c:205
+#: g10/import.c:206
+#, fuzzy, c-format
+msgid "      skipped new keys: %lu\n"
+msgstr "       nye undernřgler: %lu\n"
+
+#: g10/import.c:209
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:207
+#: g10/import.c:211
 #, c-format
 msgid "              imported: %lu"
 msgstr "           importerede: %lu"
 
-#: g10/import.c:213
+#: g10/import.c:217
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "              ućndrede: %lu\n"
 
-#: g10/import.c:215
+#: g10/import.c:219
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      nye bruger-id'er: %lu\n"
 
-#: g10/import.c:217
+#: g10/import.c:221
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "       nye undernřgler: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:223
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        nye signaturer: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:225
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  nye nřgletilbagekald: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:227
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " hemmelige nřgler lćst: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:229
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "hemmelige nřgler import: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:231
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "hemmelige nřgler ućndre: %lu\n"
 
-#: g10/import.c:386 g10/import.c:578
+#: g10/import.c:391 g10/import.c:590
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "nřgle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:400
+#: g10/import.c:405
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "nřgle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:402
+#: g10/import.c:407
 msgid "this may be caused by a missing self-signature\n"
 msgstr ""
 
-#: g10/import.c:413 g10/import.c:645
+#: g10/import.c:418 g10/import.c:657
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "nřgle %08lX: offentlig nřgle ikke fundet: %s\n"
 
-#: g10/import.c:419
+#: g10/import.c:423
+#, fuzzy, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "nřgle %08lX: ikke en rfc2440 nřgle - udeladt\n"
+
+#: g10/import.c:431
 msgid "no default public keyring\n"
 msgstr "ingen standard offentlig nřglering\n"
 
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
+#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver til `%s'\n"
 
-#: g10/import.c:426 g10/import.c:484 g10/import.c:593 g10/import.c:694
+#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "kan ikke lĺse nřglering `%s': %s\n"
 
-#: g10/import.c:429 g10/import.c:487 g10/import.c:596 g10/import.c:697
+#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fejl ved skrivning af nřglering `%s': %s\n"
 
-#: g10/import.c:434
+#: g10/import.c:446
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "nřgle %08lX: offentlig nřgle importeret\n"
 
-#: g10/import.c:451
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "nřgle %08lX: stemmer ikke med vores kopi\n"
 
-#: g10/import.c:460 g10/import.c:653
+#: g10/import.c:472 g10/import.c:665
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "nřgle %08lX: kan ikke lokalisere original nřgleblok: %s\n"
 
-#: g10/import.c:466 g10/import.c:659
+#: g10/import.c:478 g10/import.c:671
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "nřgle %08lX: kan ikke lćse original nřgleblok: %s\n"
 
-#: g10/import.c:493
+#: g10/import.c:505
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr ""
 
-#: g10/import.c:496
+#: g10/import.c:508
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr ""
 
-#: g10/import.c:499
+#: g10/import.c:511
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr ""
 
-#: g10/import.c:502
+#: g10/import.c:514
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr ""
 
-#: g10/import.c:505
+#: g10/import.c:517
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr ""
 
-#: g10/import.c:508
+#: g10/import.c:520
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr ""
 
-#: g10/import.c:518
+#: g10/import.c:530
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr ""
 
-#: g10/import.c:601
+#: g10/import.c:613
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr ""
 
 #. we can't merge secret keys
-#: g10/import.c:605
+#: g10/import.c:617
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr ""
 
-#: g10/import.c:610
+#: g10/import.c:622
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr ""
 
-#: g10/import.c:639
+#: g10/import.c:651
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 
-#: g10/import.c:670
+#: g10/import.c:682
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 
-#: g10/import.c:702
+#: g10/import.c:714
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr ""
 
-#: g10/import.c:744
+#: g10/import.c:756
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr ""
 
-#: g10/import.c:751 g10/import.c:775
+#: g10/import.c:763 g10/import.c:787
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr ""
 
-#: g10/import.c:752
+#: g10/import.c:764
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr ""
 
-#: g10/import.c:767
+#: g10/import.c:779
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr ""
 
-#: g10/import.c:776
+#: g10/import.c:788
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr ""
 
-#: g10/import.c:803
+#: g10/import.c:815
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr ""
 
-#: g10/import.c:832
+#: g10/import.c:844
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr ""
 
-#: g10/import.c:855
+#: g10/import.c:867
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr ""
@@ -1853,32 +1871,32 @@
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:880
+#: g10/import.c:892
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr ""
 
-#: g10/import.c:889
+#: g10/import.c:901
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr ""
 
-#: g10/import.c:897
+#: g10/import.c:909
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr ""
 
-#: g10/import.c:997
+#: g10/import.c:1009
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:1048
+#: g10/import.c:1060
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr ""
 
-#: g10/import.c:1162 g10/import.c:1215
+#: g10/import.c:1174 g10/import.c:1227
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr ""
@@ -2447,8 +2465,17 @@
 msgid "no secret key\n"
 msgstr ""
 
+#: g10/keylist.c:158
+#, fuzzy
+msgid "invalid"
+msgstr "ugyldig rustning"
+
+#: g10/keylist.c:178
+msgid "revoked"
+msgstr ""
+
 #. of subkey
-#: g10/keylist.c:318 g10/mainproc.c:742
+#: g10/keylist.c:400 g10/mainproc.c:760
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "Nřgle udlřber d. %s\n"
@@ -2458,127 +2485,117 @@
 msgid "public key is %08lX\n"
 msgstr ""
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:257
 msgid "public key encrypted data: good DEK\n"
 msgstr ""
 
-#: g10/mainproc.c:281
+#: g10/mainproc.c:299
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr ""
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:309
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr ""
 
-#: g10/mainproc.c:297
+#: g10/mainproc.c:315
 msgid "no secret key for decryption available\n"
 msgstr ""
 
-#: g10/mainproc.c:306
+#: g10/mainproc.c:324
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:343
+#: g10/mainproc.c:361
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:348
+#: g10/mainproc.c:366
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:353
+#: g10/mainproc.c:371
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:372
+#: g10/mainproc.c:390
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:374
+#: g10/mainproc.c:392
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:544
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:613 g10/mainproc.c:622
+#: g10/mainproc.c:631 g10/mainproc.c:640
 msgid "WARNING: invalid notation data found\n"
 msgstr ""
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:643
 msgid "Notation: "
 msgstr ""
 
-#: g10/mainproc.c:632
+#: g10/mainproc.c:650
 msgid "Policy: "
 msgstr "Politik: "
 
-#: g10/mainproc.c:1062
+#: g10/mainproc.c:1080
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1068
+#: g10/mainproc.c:1086
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr ""
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1094 g10/mainproc.c:1105
+#: g10/mainproc.c:1112 g10/mainproc.c:1123
 msgid "BAD signature from \""
 msgstr "DĹRLIG signatur fra \""
 
-#: g10/mainproc.c:1095 g10/mainproc.c:1106
+#: g10/mainproc.c:1113 g10/mainproc.c:1124
 msgid "Good signature from \""
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1097
+#: g10/mainproc.c:1115
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1153
+#: g10/mainproc.c:1171
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1235
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:1263
+#: g10/mainproc.c:1281
 msgid "old style (PGP 2.x) signature\n"
 msgstr "gammeldags (PGP 2.x) signatur\n"
 
-#: g10/mainproc.c:1268
+#: g10/mainproc.c:1286
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
-#: g10/misc.c:94
+#: g10/misc.c:96
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "kan ikke slĺ core-dump fra: %s\n"
 
-#: g10/misc.c:97
-msgid "WARNING: program may create a core file!\n"
-msgstr ""
-
-#: g10/misc.c:205
+#: g10/misc.c:206
 msgid "Experimental algorithms should not be used!\n"
 msgstr ""
 
-#: g10/misc.c:219
-msgid ""
-"RSA keys are deprecated; please consider creating a new key and use this key "
-"in the future\n"
-msgstr ""
-
-#: g10/misc.c:241
+#: g10/misc.c:233
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 
@@ -2587,7 +2604,7 @@
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:965
+#: g10/parse-packet.c:986
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
@@ -2621,90 +2638,90 @@
 msgid "Repeat passphrase: "
 msgstr "Gentag kodesćtning: "
 
-#: g10/plaintext.c:63
+#: g10/plaintext.c:67
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 
-#: g10/plaintext.c:317
+#: g10/plaintext.c:324
 msgid "Detached signature.\n"
 msgstr ""
 
-#: g10/plaintext.c:321
+#: g10/plaintext.c:328
 msgid "Please enter name of data file: "
 msgstr ""
 
-#: g10/plaintext.c:342
+#: g10/plaintext.c:349
 msgid "reading stdin ...\n"
 msgstr "lćser stdin ...\n"
 
-#: g10/plaintext.c:385
+#: g10/plaintext.c:392
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:79
+#: g10/pubkey-enc.c:76
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:85
+#: g10/pubkey-enc.c:82
 msgid "okay, we are the anonymous recipient.\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:137
+#: g10/pubkey-enc.c:134
 msgid "old encoding of the DEK is not supported\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:156
+#: g10/pubkey-enc.c:153
 #, fuzzy, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/pubkey-enc.c:195
+#: g10/pubkey-enc.c:192
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:201
+#: g10/pubkey-enc.c:198
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr ""
 
-#: g10/hkp.c:62
+#: g10/hkp.c:72
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
 msgstr ""
 
-#: g10/hkp.c:75
+#: g10/hkp.c:85
 #, fuzzy, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "importér nřgler fra en nřgleserver"
 
-#: g10/hkp.c:98 g10/hkp.c:136
+#: g10/hkp.c:109 g10/hkp.c:148
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/hkp.c:106
+#: g10/hkp.c:117
 #, fuzzy, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "%s er ikke et gyldigt tegnsćt\n"
 
-#: g10/hkp.c:158
+#: g10/hkp.c:170
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan ikke ĺbne '%s': %s\n"
 
-#: g10/hkp.c:182
+#: g10/hkp.c:194
 #, fuzzy, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "fejl ved lćsning af '%s': %s\n"
 
-#: g10/hkp.c:194
+#: g10/hkp.c:206
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr ""
 
-#: g10/hkp.c:197
+#: g10/hkp.c:209
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
@@ -2719,39 +2736,39 @@
 msgid "protection algorithm %d is not supported\n"
 msgstr ""
 
-#: g10/seckey-cert.c:175
+#: g10/seckey-cert.c:184
 msgid "Invalid passphrase; please try again ...\n"
 msgstr ""
 
-#: g10/seckey-cert.c:231
+#: g10/seckey-cert.c:240
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 
-#: g10/sig-check.c:202
+#: g10/sig-check.c:199
 msgid "assuming bad MDC due to an unknown critical bit\n"
 msgstr ""
 
-#: g10/sig-check.c:300
+#: g10/sig-check.c:297
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 
-#: g10/sig-check.c:308
+#: g10/sig-check.c:305
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr ""
 
-#: g10/sig-check.c:309
+#: g10/sig-check.c:306
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr ""
 
-#: g10/sig-check.c:327
+#: g10/sig-check.c:324
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr ""
 
-#: g10/sig-check.c:396
+#: g10/sig-check.c:393
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 
@@ -2760,7 +2777,7 @@
 msgid "%s signature from: %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:606
+#: g10/sign.c:290 g10/sign.c:610
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "kan ikke oprette %s: %s\n"
@@ -2808,7 +2825,7 @@
 msgid "%s: directory does not exist!\n"
 msgstr ""
 
-#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1363 g10/tdbio.c:444
+#: g10/openfile.c:226 g10/openfile.c:295 g10/ringedit.c:1369 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr ""
@@ -2908,285 +2925,295 @@
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 
-#: g10/trustdb.c:168
+#: g10/trustdb.c:169
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:183
+#: g10/trustdb.c:184
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:197
+#: g10/trustdb.c:198
 #, c-format
 msgid "trust record %lu: delete failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:211
+#: g10/trustdb.c:212
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:376
+#: g10/trustdb.c:377
 #, c-format
 msgid "error reading dir record for LID %lu: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:383
+#: g10/trustdb.c:384
 #, c-format
 msgid "lid %lu: expected dir record, got type %d\n"
 msgstr ""
 
-#: g10/trustdb.c:388
+#: g10/trustdb.c:389
 #, c-format
 msgid "no primary key for LID %lu\n"
 msgstr ""
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:394
 #, c-format
 msgid "error reading primary key for LID %lu: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:432
+#: g10/trustdb.c:433
 #, c-format
 msgid "get_dir_record: search_record failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:487
+#: g10/trustdb.c:474
+#, fuzzy, c-format
+msgid "'%s' is not a valid long keyID\n"
+msgstr "%s er ikke et gyldigt tegnsćt\n"
+
+#: g10/trustdb.c:501
 #, c-format
-msgid "NOTE: secret key %08lX is NOT protected.\n"
+msgid "key %08lX: can't put it into the trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:495
+#: g10/trustdb.c:507
 #, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
+msgid "key %08lX: query record failed\n"
 msgstr ""
 
-#: g10/trustdb.c:502
+#: g10/trustdb.c:516
 #, c-format
-msgid "key %08lX: secret and public key don't match\n"
+msgid "key %08lX: already in trusted key table\n"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:519
 #, c-format
-msgid "key %08lX: can't put it into the trustdb\n"
+msgid "key %08lX: accepted as trusted key.\n"
 msgstr ""
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:546
+#, fuzzy, c-format
+msgid "key %08lX: no public key for trusted key - skipped\n"
+msgstr "nřgle %08lX: ikke en rfc2440 nřgle - udeladt\n"
+
+#: g10/trustdb.c:565
 #, c-format
-msgid "key %08lX: query record failed\n"
+msgid "NOTE: secret key %08lX is NOT protected.\n"
 msgstr ""
 
-#: g10/trustdb.c:529
+#: g10/trustdb.c:577
 #, c-format
-msgid "key %08lX: already in trusted key table\n"
+msgid "key %08lX: secret key without public key - skipped\n"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:584
 #, c-format
-msgid "key %08lX: accepted as trusted key.\n"
+msgid "key %08lX: secret and public key don't match\n"
 msgstr ""
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:597
 #, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:921
+#: g10/trustdb.c:987
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr ""
 
-#: g10/trustdb.c:927 g10/trustdb.c:962
+#: g10/trustdb.c:993 g10/trustdb.c:1028
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:939
+#: g10/trustdb.c:1005
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr ""
 
-#: g10/trustdb.c:945
+#: g10/trustdb.c:1011
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:956
+#: g10/trustdb.c:1022
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr ""
 
-#: g10/trustdb.c:1067
+#: g10/trustdb.c:1133
 msgid "Good self-signature"
 msgstr ""
 
-#: g10/trustdb.c:1077
+#: g10/trustdb.c:1143
 msgid "Invalid self-signature"
 msgstr ""
 
-#: g10/trustdb.c:1104
+#: g10/trustdb.c:1170
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 
-#: g10/trustdb.c:1110
+#: g10/trustdb.c:1176
 msgid "Valid user ID revocation"
 msgstr ""
 
-#: g10/trustdb.c:1115
+#: g10/trustdb.c:1181
 msgid "Invalid user ID revocation"
 msgstr ""
 
-#: g10/trustdb.c:1157
+#: g10/trustdb.c:1223
 msgid "Valid certificate revocation"
 msgstr ""
 
-#: g10/trustdb.c:1158
+#: g10/trustdb.c:1224
 msgid "Good certificate"
 msgstr "Godt certifikat"
 
-#: g10/trustdb.c:1186
+#: g10/trustdb.c:1252
 msgid "Invalid certificate revocation"
 msgstr ""
 
-#: g10/trustdb.c:1187
+#: g10/trustdb.c:1253
 msgid "Invalid certificate"
 msgstr ""
 
-#: g10/trustdb.c:1204 g10/trustdb.c:1208
+#: g10/trustdb.c:1270 g10/trustdb.c:1274
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr ""
 
-#: g10/trustdb.c:1267
+#: g10/trustdb.c:1333
 msgid "duplicated certificate - deleted"
 msgstr ""
 
-#: g10/trustdb.c:1584
+#: g10/trustdb.c:1650
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:1718
+#: g10/trustdb.c:1784
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:1723
+#: g10/trustdb.c:1789
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:1729
+#: g10/trustdb.c:1795
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr ""
 
-#: g10/trustdb.c:1734
+#: g10/trustdb.c:1800
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:1742 g10/trustdb.c:1805
+#: g10/trustdb.c:1808 g10/trustdb.c:1871
 #, c-format
 msgid "%lu keys processed\n"
 msgstr ""
 
-#: g10/trustdb.c:1744 g10/trustdb.c:1811
+#: g10/trustdb.c:1810 g10/trustdb.c:1877
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr ""
 
-#: g10/trustdb.c:1746
+#: g10/trustdb.c:1812
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr ""
 
-#: g10/trustdb.c:1749
+#: g10/trustdb.c:1815
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:1797
+#: g10/trustdb.c:1863
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr ""
 
-#: g10/trustdb.c:1807
+#: g10/trustdb.c:1873
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr ""
 
-#: g10/trustdb.c:1809
+#: g10/trustdb.c:1875
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr ""
 
-#: g10/trustdb.c:1813
+#: g10/trustdb.c:1879
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr ""
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2224
 msgid "Ooops, no keys\n"
 msgstr ""
 
-#: g10/trustdb.c:2162
+#: g10/trustdb.c:2228
 msgid "Ooops, no user IDs\n"
 msgstr ""
 
-#: g10/trustdb.c:2320
+#: g10/trustdb.c:2386
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2395
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:2333
+#: g10/trustdb.c:2399
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:2341
+#: g10/trustdb.c:2407
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2422
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr ""
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2430
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:2515
+#: g10/trustdb.c:2581
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:2517
+#: g10/trustdb.c:2583
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:2520
+#: g10/trustdb.c:2586
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr ""
 
-#: g10/trustdb.c:2523
+#: g10/trustdb.c:2589
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:2709 g10/trustdb.c:2739
+#: g10/trustdb.c:2775 g10/trustdb.c:2805
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr ""
 
@@ -3207,26 +3234,26 @@
 msgid "%s: can't create keyring: %s\n"
 msgstr ""
 
-#: g10/ringedit.c:319 g10/ringedit.c:1368
+#: g10/ringedit.c:319 g10/ringedit.c:1374
 #, c-format
 msgid "%s: keyring created\n"
 msgstr ""
 
-#: g10/ringedit.c:1545
+#: g10/ringedit.c:1551
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 
-#: g10/ringedit.c:1546
+#: g10/ringedit.c:1552
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr ""
 
-#: g10/ringedit.c:1547
+#: g10/ringedit.c:1553
 #, c-format
 msgid "%s is the new one\n"
 msgstr ""
 
-#: g10/ringedit.c:1548
+#: g10/ringedit.c:1554
 msgid "Please fix this possible security flaw\n"
 msgstr ""
 
@@ -3247,49 +3274,49 @@
 msgstr ""
 
 #. do not overwrite
-#: g10/openfile.c:79
+#: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Fil `%s' eksisterer. "
 
-#: g10/openfile.c:81
+#: g10/openfile.c:86
 msgid "Overwrite (y/N)? "
 msgstr "Overskriv (j/N)? "
 
-#: g10/openfile.c:109
+#: g10/openfile.c:119
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: ukendt suffiks\n"
 
-#: g10/openfile.c:131
+#: g10/openfile.c:141
 msgid "Enter new filename"
 msgstr "Indtast nyt filnavn"
 
-#: g10/openfile.c:172
+#: g10/openfile.c:182
 msgid "writing to stdout\n"
 msgstr "skriver til stdout\n"
 
-#: g10/openfile.c:250
+#: g10/openfile.c:261
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr ""
 
-#: g10/openfile.c:300
+#: g10/openfile.c:311
 #, c-format
 msgid "%s: new options file created\n"
 msgstr ""
 
-#: g10/openfile.c:313
+#: g10/openfile.c:338
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: kan ikke oprette mappe: %s\n"
 
-#: g10/openfile.c:316
+#: g10/openfile.c:341
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: mappe oprettet\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:343
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr ""
 
diff -urN gnupg-1.0.2/po/de.po gnupg-1.0.3/po/de.po
--- gnupg-1.0.2/po/de.po	Wed Jul 12 14:59:40 2000
+++ gnupg-1.0.3/po/de.po	Mon Sep 18 12:18:02 2000
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-07-12 12:13+0200\n"
+"POT-Creation-Date: 2000-09-18 12:17+0200\n"
 "PO-Revision-Date: 2000-06-12  12:50+0200\n"
 "Last-Translator: Walter Koch <koch@hsp.de>\n"
 "Language-Team: German <de@li.org>\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:127 g10/keygen.c:1249
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1255
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "'%s' kann nicht geöffnet werden: %s\n"
@@ -310,11 +310,11 @@
 msgid "too many random bits requested; the limit is %d\n"
 msgstr "Zu viele Zufallswerte angefordert: Die Grenze liegt bei %d\n"
 
-#: cipher/random.c:647
+#: cipher/random.c:650
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "WARNUNG: Der Zufallsgenerator erzeugt keine echten Zufallszahlen!\n"
 
-#: cipher/random.c:648
+#: cipher/random.c:651
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -328,7 +328,7 @@
 "BENUTZEN SIE DIE DURCH DIESES PROGRAMM ERZEUGTEN DATEN NICHT!\n"
 "\n"
 
-#: cipher/rndlinux.c:141
+#: cipher/rndlinux.c:142
 #, c-format
 msgid ""
 "\n"
@@ -340,7 +340,7 @@
 "Arbeiten durch, damit das Betriebssystem weitere Entropie sammeln kann!\n"
 "(Es werden noch %d Byte benötigt.)\n"
 
-#: g10/g10.c:197
+#: g10/g10.c:206
 msgid ""
 "@Commands:\n"
 " "
@@ -348,139 +348,139 @@
 "@Befehle:\n"
 " "
 
-#: g10/g10.c:199
+#: g10/g10.c:208
 msgid "|[file]|make a signature"
 msgstr "|[Datei]|Eine Unterschrift erzeugen"
 
-#: g10/g10.c:200
+#: g10/g10.c:209
 msgid "|[file]|make a clear text signature"
 msgstr "|[Datei]|Eine Klartextunterschrift erzeugen"
 
-#: g10/g10.c:201
+#: g10/g10.c:210
 msgid "make a detached signature"
 msgstr "Eine abgetrennte Unterschrift erzeugen"
 
-#: g10/g10.c:202
+#: g10/g10.c:211
 msgid "encrypt data"
 msgstr "Daten verschlüsseln"
 
-#: g10/g10.c:203
+#: g10/g10.c:212
 msgid "encryption only with symmetric cipher"
 msgstr "Daten symmetrisch verschlüsseln"
 
-#: g10/g10.c:204
+#: g10/g10.c:213
 msgid "store only"
 msgstr "Nur speichern"
 
-#: g10/g10.c:205
+#: g10/g10.c:214
 msgid "decrypt data (default)"
 msgstr "Daten entschlüsseln (Voreinstellung)"
 
-#: g10/g10.c:206
+#: g10/g10.c:215
 msgid "verify a signature"
 msgstr "Signatur prüfen"
 
-#: g10/g10.c:208
+#: g10/g10.c:217
 msgid "list keys"
 msgstr "Liste der Schlüssel"
 
-#: g10/g10.c:210
+#: g10/g10.c:219
 msgid "list keys and signatures"
 msgstr "Liste der Schlüssel und ihrer Signaturen"
 
-#: g10/g10.c:211
+#: g10/g10.c:220
 msgid "check key signatures"
 msgstr "Signaturen der Schlüssel prüfen"
 
-#: g10/g10.c:212
+#: g10/g10.c:221
 msgid "list keys and fingerprints"
 msgstr "Liste der Schlüssel und ihrer \"Fingerabdrücke\""
 
-#: g10/g10.c:213
+#: g10/g10.c:222
 msgid "list secret keys"
 msgstr "Liste der geheimen Schlüssel"
 
-#: g10/g10.c:214
+#: g10/g10.c:223
 msgid "generate a new key pair"
 msgstr "Ein neues Schlüsselpaar erzeugen"
 
-#: g10/g10.c:215
+#: g10/g10.c:224
 msgid "remove key from the public keyring"
 msgstr "Schlüssel aus dem öff. Schlüsselbund entfernen"
 
-#: g10/g10.c:217
+#: g10/g10.c:226
 msgid "remove key from the secret keyring"
 msgstr "Schlüssel aus dem geh. Schlüsselbund entfernen"
 
-#: g10/g10.c:218
+#: g10/g10.c:227
 msgid "sign a key"
 msgstr "Schlüssel signieren"
 
-#: g10/g10.c:219
+#: g10/g10.c:228
 msgid "sign a key locally"
 msgstr "Schlüssel nur auf diesem Rechner signieren"
 
-#: g10/g10.c:220
+#: g10/g10.c:229
 msgid "sign or edit a key"
 msgstr "Unterschreiben oder Bearbeiten eines Schl."
 
-#: g10/g10.c:221
+#: g10/g10.c:230
 msgid "generate a revocation certificate"
 msgstr "Ein Schlüsselwiderruf-Zertifikat erzeugen"
 
-#: g10/g10.c:222
+#: g10/g10.c:231
 msgid "export keys"
 msgstr "Schlüssel exportieren"
 
-#: g10/g10.c:223
+#: g10/g10.c:232
 msgid "export keys to a key server"
 msgstr "Schlüssel zu einem Schlü.server exportieren"
 
-#: g10/g10.c:224
+#: g10/g10.c:233
 msgid "import keys from a key server"
 msgstr "Schlüssel von einem Schlü.server importieren"
 
-#: g10/g10.c:228
+#: g10/g10.c:237
 msgid "import/merge keys"
 msgstr "Schlüssel importieren/kombinieren"
 
-#: g10/g10.c:230
+#: g10/g10.c:239
 msgid "list only the sequence of packets"
 msgstr "Lediglich Struktur der Datenpakete anzeigen"
 
-#: g10/g10.c:232
+#: g10/g10.c:241
 msgid "export the ownertrust values"
 msgstr "Exportieren der \"Owner trust\" Werte"
 
-#: g10/g10.c:234
+#: g10/g10.c:243
 msgid "import ownertrust values"
 msgstr "Importieren der \"Owner trust\" Werte"
 
-#: g10/g10.c:236
+#: g10/g10.c:245
 msgid "update the trust database"
 msgstr "Ändern der \"Trust\"-Datenbank"
 
-#: g10/g10.c:238
+#: g10/g10.c:247
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMEN]|Überprüfen der \"Trust\"-Datenbank"
 
-#: g10/g10.c:239
+#: g10/g10.c:248
 msgid "fix a corrupted trust database"
 msgstr "Reparieren einer beschädigten \"Trust\"-Datenb."
 
-#: g10/g10.c:240
+#: g10/g10.c:249
 msgid "De-Armor a file or stdin"
 msgstr "Datei oder stdin von der ASCII-Hülle befreien"
 
-#: g10/g10.c:242
+#: g10/g10.c:251
 msgid "En-Armor a file or stdin"
 msgstr "Datei oder stdin in eine ASCII-Hülle einpacken"
 
-#: g10/g10.c:244
+#: g10/g10.c:253
 msgid "|algo [files]|print message digests"
 msgstr "|algo [Dateien]|Message-Digests für die Dateien ausgeben"
 
-#: g10/g10.c:248
+#: g10/g10.c:257
 msgid ""
 "@\n"
 "Options:\n"
@@ -490,152 +490,156 @@
 "Optionen:\n"
 " "
 
-#: g10/g10.c:250
+#: g10/g10.c:259
 msgid "create ascii armored output"
 msgstr "Ausgabe mit ASCII-Hülle versehen"
 
-#: g10/g10.c:252
+#: g10/g10.c:261
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|Verschlüsseln für NAME"
 
-#: g10/g10.c:255
+#: g10/g10.c:264
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|NAME als voreingestellten Empfänger benutzen"
 
-#: g10/g10.c:257
+#: g10/g10.c:266
 msgid "use the default key as default recipient"
 msgstr ""
 "Den Standardschlüssel als voreingestellten\n"
 "Empfänger benutzen"
 
-#: g10/g10.c:261
+#: g10/g10.c:270
 msgid "use this user-id to sign or decrypt"
 msgstr "Mit dieser User-ID signieren"
 
-#: g10/g10.c:262
+#: g10/g10.c:271
 msgid "|N|set compress level N (0 disables)"
 msgstr "Kompressionsstufe auf N setzen (0=keine)"
 
-#: g10/g10.c:264
+#: g10/g10.c:273
 msgid "use canonical text mode"
 msgstr "Textmodus benutzen"
 
-#: g10/g10.c:265
+#: g10/g10.c:274
 msgid "use as output file"
 msgstr "Als Ausgabedatei benutzen"
 
-#: g10/g10.c:266
+#: g10/g10.c:275
 msgid "verbose"
 msgstr "Detaillierte Informationen"
 
-#: g10/g10.c:267
+#: g10/g10.c:276
 msgid "be somewhat more quiet"
 msgstr "Etwas weniger Infos"
 
-#: g10/g10.c:268
+#: g10/g10.c:277
 msgid "don't use the terminal at all"
 msgstr "das Terminal gar nicht benutzen"
 
-#: g10/g10.c:269
+#: g10/g10.c:278
 msgid "force v3 signatures"
 msgstr "v3 Signaturen erzwingen"
 
-#: g10/g10.c:270
+#: g10/g10.c:279
 msgid "always use a MDC for encryption"
 msgstr "Beim Verschlüsseln ein Siegel (MDC) verwenden"
 
-#: g10/g10.c:271
+#: g10/g10.c:280
 msgid "do not make any changes"
 msgstr "Keine wirklichen Änderungen durchführen"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:273
+#: g10/g10.c:282
 msgid "batch mode: never ask"
 msgstr "Stapelmodus: Keine Abfragen"
 
-#: g10/g10.c:274
+#: g10/g10.c:283
 msgid "assume yes on most questions"
 msgstr "\"Ja\" als Standardantwort annehmen"
 
-#: g10/g10.c:275
+#: g10/g10.c:284
 msgid "assume no on most questions"
 msgstr "\"Nein\" als Standardantwort annehmen"
 
-#: g10/g10.c:276
+#: g10/g10.c:285
 msgid "add this keyring to the list of keyrings"
 msgstr "Als öffentlichen Schlüsselbund mitbenutzen"
 
-#: g10/g10.c:277
+#: g10/g10.c:286
 msgid "add this secret keyring to the list"
 msgstr "Als geheimen Schlüsselbund mitbenutzen"
 
-#: g10/g10.c:278
+#: g10/g10.c:287
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|NAME als voreingestellten Schlüssel benutzen"
 
-#: g10/g10.c:279
+#: g10/g10.c:288
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|Schlüssel bei diesem Server nachschlagen"
 
-#: g10/g10.c:280
+#: g10/g10.c:289
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|Terminalzeichensatz NAME benutzen"
 
-#: g10/g10.c:281
+#: g10/g10.c:290
 msgid "read options from file"
 msgstr "Optionen aus der Datei lesen"
 
-#: g10/g10.c:285
+#: g10/g10.c:294
 msgid "|FD|write status info to this FD"
 msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
 
-#: g10/g10.c:290
+#: g10/g10.c:299
+msgid "|KEYID|ulimately trust this key"
+msgstr ""
+
+#: g10/g10.c:300
 msgid "|FILE|load extension module FILE"
 msgstr "|DATEI|Erweiterungsmodul DATEI laden"
 
-#: g10/g10.c:291
+#: g10/g10.c:301
 msgid "emulate the mode described in RFC1991"
 msgstr "Den in RFC1991 beschriebenen Modus nachahmen"
 
-#: g10/g10.c:292
+#: g10/g10.c:302
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "alle Paket-, Verschlüsselungs- und\n"
 "Hashoptionen auf OpenPGP-Verhalten einstellen"
 
-#: g10/g10.c:293
+#: g10/g10.c:303
 msgid "|N|use passphrase mode N"
 msgstr "|N|Verwenden des Mantra-Modus N"
 
-#: g10/g10.c:295
+#: g10/g10.c:305
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAME|Hashverfahren NAME für Mantras benutzen"
 
-#: g10/g10.c:297
+#: g10/g10.c:307
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAME|Verschlü.verfahren NAME für Mantras benutzen"
 
-#: g10/g10.c:298
+#: g10/g10.c:308
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|Verschlü.verfahren NAME benutzen"
 
-#: g10/g10.c:299
+#: g10/g10.c:309
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|Hashverfahren NAME benutzen"
 
-#: g10/g10.c:300
+#: g10/g10.c:310
 msgid "|N|use compress algorithm N"
 msgstr "|N|Komprimierverfahren N benutzen"
 
-#: g10/g10.c:301
+#: g10/g10.c:311
 msgid "throw keyid field of encrypted packets"
 msgstr "Entferne Empfänger-ID verschlüsselter Pakete"
 
-#: g10/g10.c:302
+#: g10/g10.c:312
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAME=WERT|verwende diese \"notation\"-Daten"
 
-#: g10/g10.c:305
+#: g10/g10.c:315
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -644,7 +648,7 @@
 "(Auf der \"man\"-Seite ist eine vollständige Liste aller Kommandos und "
 "Optionen)\n"
 
-#: g10/g10.c:308
+#: g10/g10.c:318
 msgid ""
 "@\n"
 "Examples:\n"
@@ -664,17 +668,17 @@
 " --list-keys [Namen]        Schlüssel anzeigen\n"
 " --fingerprint [Namen]      \"Fingerabdrücke\" anzeigen\n"
 
-#: g10/g10.c:403
+#: g10/g10.c:418
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Berichte über Bugs (Programmfehler) bitte an <gnupg-bugs@gnu.org>.\n"
 "Sinn- oder Schreibfehler in den deutschen Texten bitte an <de@li.org>.\n"
 
-#: g10/g10.c:407
+#: g10/g10.c:422
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Aufruf: gpg [Optionen] [Dateien] (-h für Hilfe)"
 
-#: g10/g10.c:410
+#: g10/g10.c:425
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -684,7 +688,7 @@
 "Signieren, prüfen, verschlüsseln, entschlüsseln\n"
 "Die voreingestellte Operation ist abhängig von den Eingabedaten\n"
 
-#: g10/g10.c:417
+#: g10/g10.c:432
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -692,184 +696,188 @@
 "\n"
 "Unterstützte Verfahren:\n"
 
-#: g10/g10.c:496
+#: g10/g10.c:511
 msgid "usage: gpg [options] "
 msgstr "Aufruf: gpg [Optionen] "
 
-#: g10/g10.c:549
+#: g10/g10.c:564
 msgid "conflicting commands\n"
 msgstr "Widersprüchliche Befehle\n"
 
-#: g10/g10.c:692
+#: g10/g10.c:704
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: g10/g10.c:696
+#: g10/g10.c:708
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: g10/g10.c:703
+#: g10/g10.c:715
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: g10/g10.c:893
+#: g10/g10.c:905
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ist kein gültiger Zeichensatz.\n"
 
-#: g10/g10.c:949 g10/g10.c:958
+#: g10/g10.c:970
+msgid "WARNING: program may create a core file!\n"
+msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n"
+
+#: g10/g10.c:974 g10/g10.c:983
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "Hinweis: %s ist nicht für den üblichen Gebrauch gedacht!\n"
 
-#: g10/g10.c:951
+#: g10/g10.c:976
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
 
-#: g10/g10.c:954
+#: g10/g10.c:979
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/g10.c:973 g10/g10.c:985
+#: g10/g10.c:998 g10/g10.c:1010
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgewählte Verschlüsslungsverfahren ist ungültig\n"
 
-#: g10/g10.c:979 g10/g10.c:991
+#: g10/g10.c:1004 g10/g10.c:1016
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/g10.c:995
+#: g10/g10.c:1020
 msgid "the given policy URL is invalid\n"
 msgstr "Die angegebene URL für Richtlinien ist ungültig\n"
 
-#: g10/g10.c:998
+#: g10/g10.c:1023
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "Das Komprimierverfahren muß im Bereich %d bis %d liegen\n"
 
-#: g10/g10.c:1000
+#: g10/g10.c:1025
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed müssen größer als 0 sein\n"
 
-#: g10/g10.c:1002
+#: g10/g10.c:1027
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed müssen größer als 1 sein\n"
 
-#: g10/g10.c:1004
+#: g10/g10.c:1029
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth muß im Bereich 1 bis 255 liegen\n"
 
-#: g10/g10.c:1007
+#: g10/g10.c:1032
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/g10.c:1011
+#: g10/g10.c:1036
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ungültiger \"simple S2K\"-Modus; Wert muß 0, 1 oder 3 sein\n"
 
-#: g10/g10.c:1096
+#: g10/g10.c:1121
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/g10.c:1102
+#: g10/g10.c:1127
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/g10.c:1109
+#: g10/g10.c:1134
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/g10.c:1117
+#: g10/g10.c:1142
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/g10.c:1130
+#: g10/g10.c:1155
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/g10.c:1143
+#: g10/g10.c:1168
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/g10.c:1157
+#: g10/g10.c:1182
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/g10.c:1174
+#: g10/g10.c:1199
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1207
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/g10.c:1190
+#: g10/g10.c:1215
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/g10.c:1198
+#: g10/g10.c:1223
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1239
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key User-ID"
 
-#: g10/g10.c:1217
+#: g10/g10.c:1242
 msgid "--delete-key user-id"
 msgstr "--delete-key User-ID"
 
-#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393
+#: g10/encode.c:265 g10/g10.c:1279 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "'%s' kann nicht geöffnet werden: %s\n"
 
-#: g10/g10.c:1269
+#: g10/g10.c:1294
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [User-ID] [Schlüsselbund]"
 
-#: g10/g10.c:1335
+#: g10/g10.c:1360
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:1343
+#: g10/g10.c:1368
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:1411
+#: g10/g10.c:1439
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ungültiges Hashverfahren '%s'\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1520
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/g10.c:1496
+#: g10/g10.c:1524
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1499 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1527 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "'%s' kann nicht geöffnet werden\n"
 
-#: g10/g10.c:1669
+#: g10/g10.c:1700
 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:1675
+#: g10/g10.c:1706
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -877,12 +885,12 @@
 "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
 "enthalten und muß mit einem '=' enden\n"
 
-#: g10/g10.c:1681
+#: g10/g10.c:1712
 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:1689
+#: g10/g10.c:1720
 msgid "a notation value must not use any control characters\n"
 msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
 
@@ -1273,60 +1281,60 @@
 msgid "writing key binding signature\n"
 msgstr "Schreiben der \"key-binding\" Signatur\n"
 
-#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:433
+#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:435
 #, 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:438
+#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:440
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Schlüssellänge auf %u Bit aufgerundet\n"
 
-#: g10/keygen.c:537
+#: g10/keygen.c:539
 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:539
+#: g10/keygen.c:541
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA und ElGamal (voreingestellt)\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:542
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nur signieren/beglaubigen)\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:544
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (nur verschlüsseln)\n"
 
-#: g10/keygen.c:543
+#: g10/keygen.c:545
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signieren/beglaubigen und verschlüsseln)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:547
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signieren/beglaubigen und verschlüsseln)\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:551
 msgid "Your selection? "
 msgstr "Ihre Auswahl? "
 
-#: g10/keygen.c:560 g10/keygen.c:568
+#: g10/keygen.c:562 g10/keygen.c:570
 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:582
+#: g10/keygen.c:584
 msgid "Invalid selection.\n"
 msgstr "Ungültige Auswahl.\n"
 
-#: g10/keygen.c:594
+#: g10/keygen.c:596
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1339,19 +1347,19 @@
 "              standard Schlüssellänge ist 1024 Bit\n"
 "      größte sinnvolle Schlüssellänge ist 2048 Bit\n"
 
-#: g10/keygen.c:601
+#: g10/keygen.c:603
 msgid "What keysize do you want? (1024) "
 msgstr "Welche Schlüssellänge wünschen Sie? (1024) "
 
-#: g10/keygen.c:606
+#: g10/keygen.c:608
 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:608
+#: g10/keygen.c:610
 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:610
+#: g10/keygen.c:612
 #, fuzzy
 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"
@@ -1364,12 +1372,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:621
+#: g10/keygen.c:623
 #, 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:626
+#: g10/keygen.c:628
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1377,11 +1385,11 @@
 "Schlüssellängen größer als 2048 werden nicht empfohlen, da die\n"
 "Berechnungen dann WIRKLICH lange brauchen!\n"
 
-#: g10/keygen.c:629
+#: g10/keygen.c:631
 msgid "Are you sure that you want this keysize? "
 msgstr "Sind Sie sicher, daß Sie diese Schlüssellänge wünschen? "
 
-#: g10/keygen.c:630
+#: g10/keygen.c:632
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1389,21 +1397,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:638
+#: g10/keygen.c:640
 msgid "Do you really need such a large keysize? "
 msgstr "Brauchen Sie wirklich einen derartig langen Schlüssel? "
 
-#: g10/keygen.c:644
+#: g10/keygen.c:646
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Die verlangte Schlüssellänge beträgt %u Bit\n"
 
-#: g10/keygen.c:647 g10/keygen.c:651
+#: g10/keygen.c:649 g10/keygen.c:653
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "aufgerundet auf %u Bit\n"
 
-#: g10/keygen.c:699
+#: g10/keygen.c:701
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1419,25 +1427,25 @@
 "      <n>m = Schlüssel verfällt nach n Monaten\n"
 "      <n>y = Schlüssel verfällt nach n Jahren\n"
 
-#: g10/keygen.c:714
+#: g10/keygen.c:716
 msgid "Key is valid for? (0) "
 msgstr "Der Schlüssel bleibt wie lange gültig? (0) "
 
-#: g10/keygen.c:719
+#: g10/keygen.c:721
 msgid "invalid value\n"
 msgstr "Ungültiger Wert.\n"
 
-#: g10/keygen.c:724
+#: g10/keygen.c:726
 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:730
+#: g10/keygen.c:732
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Der Schlüssel verfällt am %s\n"
 
-#: g10/keygen.c:733
+#: g10/keygen.c:735
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1445,11 +1453,11 @@
 "Ihr Rechner kann Daten jenseits des Jahres 2038 nicht anzeigen.\n"
 "Trotzdem werden Daten bis 2106 korrekt verarbeitet.\n"
 
-#: g10/keygen.c:738
+#: g10/keygen.c:740
 msgid "Is this correct (y/n)? "
 msgstr "Ist dies richtig? (j/n) "
 
-#: g10/keygen.c:781
+#: g10/keygen.c:783
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1465,44 +1473,44 @@
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:793
+#: g10/keygen.c:795
 msgid "Real name: "
 msgstr "Ihr Name (\"Vorname Nachname\"): "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:803
 msgid "Invalid character in name\n"
 msgstr "Ungültiges Zeichen im Namen\n"
 
-#: g10/keygen.c:799
+#: g10/keygen.c:805
 msgid "Name may not start with a digit\n"
 msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
 
-#: g10/keygen.c:801
+#: g10/keygen.c:807
 msgid "Name must be at least 5 characters long\n"
 msgstr "Der Name muß min. 5 Zeichen lang sein.\n"
 
-#: g10/keygen.c:809
+#: g10/keygen.c:815
 msgid "Email address: "
 msgstr "E-Mail-Adresse: "
 
-#: g10/keygen.c:820
+#: g10/keygen.c:826
 msgid "Not a valid email address\n"
 msgstr "Diese E-Mail-Adresse ist ungültig\n"
 
-#: g10/keygen.c:828
+#: g10/keygen.c:834
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:834
+#: g10/keygen.c:840
 msgid "Invalid character in comment\n"
 msgstr "Ungültiges Zeichen im Kommentar.\n"
 
-#: g10/keygen.c:857
+#: g10/keygen.c:863
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Sie benutzen den Zeichensatz `%s'\n"
 
-#: g10/keygen.c:863
+#: g10/keygen.c:869
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1513,27 +1521,27 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:867
+#: g10/keygen.c:873
 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:872
+#: g10/keygen.c:878
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeFfBb"
 
-#: g10/keygen.c:882
+#: g10/keygen.c:888
 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:883
+#: g10/keygen.c:889
 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:902
+#: g10/keygen.c:908
 msgid "Please correct the error first\n"
 msgstr "Bitte beseitigen Sie zuerst den Fehler\n"
 
-#: g10/keygen.c:940
+#: g10/keygen.c:946
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1541,11 +1549,11 @@
 "Sie benötigen ein Mantra, um den geheimen Schlüssel zu schützen.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:948
+#: g10/keyedit.c:468 g10/keygen.c:954
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "Mantra wurde nicht richtig wiederholt; noch einmal versuchen.\n"
 
-#: g10/keygen.c:954
+#: g10/keygen.c:960
 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"
@@ -1558,7 +1566,7 @@
 "aufrufen.\n"
 "\n"
 
-#: g10/keygen.c:975
+#: g10/keygen.c:981
 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"
@@ -1569,29 +1577,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:1424
+#: g10/keygen.c:1430
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "Der DSA Schlüssel wird 1024 Bit haben.\n"
 
-#: g10/keygen.c:1467
+#: g10/keygen.c:1473
 msgid "Key generation canceled.\n"
 msgstr "Schlüsselerzeugung abgebrochen.\n"
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1570
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "schreiben des öffentlichen Schlüssels nach '%s'\n"
 
-#: g10/keygen.c:1565
+#: g10/keygen.c:1571
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "schreiben des geheimen Schlüssels nach '%s'\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1667
 msgid "public and secret key created and signed.\n"
 msgstr "Öffentlichen und geheimen Schlüssel erzeugt und signiert.\n"
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1672
 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"
@@ -1600,12 +1608,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:1683 g10/keygen.c:1784
+#: g10/keygen.c:1689 g10/keygen.c:1790
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Schlüsselerzeugung fehlgeschlagen: %s\n"
 
-#: g10/keygen.c:1727 g10/sig-check.c:318 g10/sign.c:112
+#: g10/keygen.c:1733 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"
@@ -1613,7 +1621,7 @@
 "Der Schlüssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht überein)\n"
 
-#: g10/keygen.c:1729 g10/sig-check.c:320 g10/sign.c:114
+#: g10/keygen.c:1735 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"
@@ -1621,11 +1629,11 @@
 "Der Schlüssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
 "Uhren stimmen nicht überein)\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1768
 msgid "Really create? "
 msgstr "Wirklich erzeugen? "
 
-#: g10/encode.c:91 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/encode.c:91 g10/openfile.c:178 g10/openfile.c:288 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1636,17 +1644,17 @@
 msgid "error creating passphrase: %s\n"
 msgstr "Fehler beim Erzeugen des Mantras: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:319
+#: g10/encode.c:171 g10/encode.c:324
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: WARNUNG: Leere Datei\n"
 
-#: g10/encode.c:266
+#: g10/encode.c:271
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "Lesen von '%s'\n"
 
-#: g10/encode.c:483
+#: g10/encode.c:492
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s verschlüsselt für: %s\n"
@@ -1695,251 +1703,261 @@
 msgid "No user ID for key\n"
 msgstr "Keine User-ID für Schlüssel\n"
 
-#: g10/getkey.c:1642 g10/getkey.c:1698
+#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr ""
 "der Zweitschlüssel %08lX wird anstelle des Hauptschlüssels %08lX verwendet\n"
 
-#: g10/getkey.c:2017
+#: g10/getkey.c:2050
 msgid "[User id not found]"
 msgstr "[User-ID nicht gefunden]"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "überspringe den Block vom Typ %d\n"
 
-#: g10/import.c:188 g10/trustdb.c:1740 g10/trustdb.c:1781
+#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu Schlüssel bislang bearbeitet\n"
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Fehler beim Lesen von `%s': %s\n"
 
-#: g10/import.c:203
+#: g10/import.c:204
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Anzahl insgesamt bearbeiteter Schlüssel: %lu\n"
 
-#: g10/import.c:205
+#: g10/import.c:206
+#, fuzzy, c-format
+msgid "      skipped new keys: %lu\n"
+msgstr "  neue Unterschlüssel: %lu\n"
+
+#: g10/import.c:209
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         ohne User-ID: %lu\n"
 
-#: g10/import.c:207
+#: g10/import.c:211
 #, c-format
 msgid "              imported: %lu"
 msgstr "           importiert: %lu"
 
-#: g10/import.c:213
+#: g10/import.c:217
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "          unverändert: %lu\n"
 
-#: g10/import.c:215
+#: g10/import.c:219
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "        neue User-IDs: %lu\n"
 
-#: g10/import.c:217
+#: g10/import.c:221
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "  neue Unterschlüssel: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:223
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        neue Signaturen: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:225
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "neue Schlüsselwiderrufe: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:227
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " gelesene geheime Schl.: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:229
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "geheime Schlüssel importiert: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:231
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " unveränderte geh.Schl.: %lu\n"
 
-#: g10/import.c:386 g10/import.c:578
+#: g10/import.c:391 g10/import.c:590
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "Schlüssel %08lX: Keine User-ID\n"
 
-#: g10/import.c:400
+#: g10/import.c:405
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "Schlüssel %08lX: Keine gültigen User-IDs\n"
 
-#: g10/import.c:402
+#: g10/import.c:407
 msgid "this may be caused by a missing self-signature\n"
 msgstr "dies könnte durch fehlende Eigenbeglaubigung verursacht worden sein\n"
 
-#: g10/import.c:413 g10/import.c:645
+#: g10/import.c:418 g10/import.c:657
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "Schlüssel %08lX: Öffentlicher Schlüssel nicht gefunden: %s\n"
 
-#: g10/import.c:419
+#: g10/import.c:423
+#, fuzzy, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "Schlüssel %08lX: dies ist kein rfc2440-Schüssel - übersprungen\n"
+
+#: g10/import.c:431
 msgid "no default public keyring\n"
 msgstr "Kein voreingestellter öffentlicher Schlüsselbund\n"
 
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
+#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "Schreiben nach '%s'\n"
 
-#: g10/import.c:426 g10/import.c:484 g10/import.c:593 g10/import.c:694
+#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "kann Schlüsselbund `%s' nicht sperren: %s\n"
 
-#: g10/import.c:429 g10/import.c:487 g10/import.c:596 g10/import.c:697
+#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des Schlüsselbundes `%s': %s\n"
 
-#: g10/import.c:434
+#: g10/import.c:446
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "Schlüssel %08lX: Öffentlicher Schlüssel importiert\n"
 
-#: g10/import.c:451
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "Schlüssel %08lX: Stimmt nicht mit unserer Kopie überein\n"
 
-#: g10/import.c:460 g10/import.c:653
+#: g10/import.c:472 g10/import.c:665
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr ""
 "Schlüssel %08lX: der lokale originale Schlüsselblocks wurde nicht gefunden: "
 "%s\n"
 
-#: g10/import.c:466 g10/import.c:659
+#: g10/import.c:478 g10/import.c:671
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr ""
 "Schlüssel %08lX: Lesefehler im lokalen originalen Schlüsselblocks: %s\n"
 
-#: g10/import.c:493
+#: g10/import.c:505
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "Schlüssel %08lX: 1 neue User-ID\n"
 
-#: g10/import.c:496
+#: g10/import.c:508
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "Schlüssel %08lX: %d neue User-IDs\n"
 
-#: g10/import.c:499
+#: g10/import.c:511
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "Schlüssel %08lX: 1 neue Signatur\n"
 
-#: g10/import.c:502
+#: g10/import.c:514
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "Schlüssel %08lX: %d neue Signaturen\n"
 
-#: g10/import.c:505
+#: g10/import.c:517
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "Schlüssel %08lX: 1 neuer Unterschlüssel\n"
 
-#: g10/import.c:508
+#: g10/import.c:520
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "Schlüssel %08lX: %d neue Unterschlüssel\n"
 
-#: g10/import.c:518
+#: g10/import.c:530
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "Schlüssel %08lX: Nicht geändert\n"
 
-#: g10/import.c:601
+#: g10/import.c:613
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "Schlüssel %08lX: Geheimer Schlüssel importiert\n"
 
 #. we can't merge secret keys
-#: g10/import.c:605
+#: g10/import.c:617
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "Schlüssel %08lX: Ist bereits im geheimen Schlüsselbund\n"
 
-#: g10/import.c:610
+#: g10/import.c:622
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "Schlüssel %08lX: geheimer Schlüssel nicht gefunden: %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:651
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "Schlüssel %08lX: Kein öffentlicher Schlüssel - der Schlüsselwiderruf kann "
 "nicht angebracht werden\n"
 
-#: g10/import.c:670
+#: g10/import.c:682
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "Schlüssel %08lX: Ungültiges Widerrufzertifikat: %s - zurückgewiesen\n"
 
-#: g10/import.c:702
+#: g10/import.c:714
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "Schlüssel %08lX: Widerrufzertifikat importiert\n"
 
-#: g10/import.c:744
+#: g10/import.c:756
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "Schlüssel %08lX: Keine User-ID für Signatur\n"
 
-#: g10/import.c:751 g10/import.c:775
+#: g10/import.c:763 g10/import.c:787
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "Schlüssel %08lX: Nicht unterstütztes Public-Key-Verfahren\n"
 
-#: g10/import.c:752
+#: g10/import.c:764
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "Schlüssel %08lX: Ungültige Eigenbeglaubigung\n"
 
-#: g10/import.c:767
+#: g10/import.c:779
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "Schlüssel %08lX: Kein Unterschlüssel für die Schlüsselanbindung\n"
 
-#: g10/import.c:776
+#: g10/import.c:788
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "Schlüssel %08lX: Ungültige Unterschlüssel-Anbindung\n"
 
-#: g10/import.c:803
+#: g10/import.c:815
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "Schlüssel %08lX: Nicht eigenbeglaubigte User-ID übernommen'"
 
-#: g10/import.c:832
+#: g10/import.c:844
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "Schlüssel %08lX: User-ID übergangen '"
 
-#: g10/import.c:855
+#: g10/import.c:867
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "Schlüssel %08lX: Unterschlüssel ignoriert\n"
@@ -1948,33 +1966,33 @@
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:880
+#: g10/import.c:892
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr ""
 "Schlüssel %08lX: Nicht exportfähige Unterschrift (Klasse %02x) - übergangen\n"
 
-#: g10/import.c:889
+#: g10/import.c:901
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "Schlüssel %08lX: Widerrufzertifikat an falschem Platz - übergangen\n"
 
-#: g10/import.c:897
+#: g10/import.c:909
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "Schlüssel %08lX: Ungültiges Widerrufzertifikat: %s - übergangen\n"
 
-#: g10/import.c:997
+#: g10/import.c:1009
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "Schlüssel %08lX: Doppelte User-ID entdeckt - zusammengeführt\n"
 
-#: g10/import.c:1048
+#: g10/import.c:1060
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "Schlüssel %08lX: Widerrufzertifikat hinzugefügt\n"
 
-#: g10/import.c:1162 g10/import.c:1215
+#: g10/import.c:1174 g10/import.c:1227
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "Schlüssel %08lX: Unsere Kopie hat keine Eigenbeglaubigung\n"
@@ -2552,8 +2570,18 @@
 msgid "no secret key\n"
 msgstr "Kein geheimer Schlüssel\n"
 
+#: g10/keylist.c:158
+#, fuzzy
+msgid "invalid"
+msgstr "Ungültige ASCII-Hülle"
+
+#: g10/keylist.c:178
+#, fuzzy
+msgid "revoked"
+msgstr "revkey"
+
 #. of subkey
-#: g10/keylist.c:318 g10/mainproc.c:742
+#: g10/keylist.c:400 g10/mainproc.c:760
 #, c-format
 msgid " [expires: %s]"
 msgstr " [verfällt: %s]"
@@ -2563,134 +2591,122 @@
 msgid "public key is %08lX\n"
 msgstr "Öffentlicher Schlüssel ist %08lX\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:257
 msgid "public key encrypted data: good DEK\n"
 msgstr "Mit öffentlichem Schüssel verschlüsselte Daten: Korrekte DEK\n"
 
-#: g10/mainproc.c:281
+#: g10/mainproc.c:299
 #, 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:291
+#: g10/mainproc.c:309
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "verschlüsselt mit %s Schlüssel, ID %08lX\n"
 
-#: g10/mainproc.c:297
+#: g10/mainproc.c:315
 msgid "no secret key for decryption available\n"
 msgstr "kein geheimer Schlüssel zur Entschlüsselung vorhanden\n"
 
-#: g10/mainproc.c:306
+#: g10/mainproc.c:324
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Entschlüsselung mit öffentlichem Schlüssel fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:343
+#: g10/mainproc.c:361
 msgid "decryption okay\n"
 msgstr "Enschlüsselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:348
+#: g10/mainproc.c:366
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "Warnung: Verschlüsselte Botschaft ist manipuliert worden!\n"
 
-#: g10/mainproc.c:353
+#: g10/mainproc.c:371
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Enschlüsselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:372
+#: g10/mainproc.c:390
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 "Hinweis: Der Absender verlangte Vertraulichkeit(\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:374
+#: g10/mainproc.c:392
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "Ursprünglicher Dateiname='%.*s'\n"
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:544
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "Einzelner Widerruf - verwenden Sie \"gpg --import\" um ihn anzuwenden\n"
 
-#: g10/mainproc.c:613 g10/mainproc.c:622
+#: g10/mainproc.c:631 g10/mainproc.c:640
 msgid "WARNING: invalid notation data found\n"
 msgstr "WARNUNG: Ungültige \"Notation\"-Daten gefunden\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:643
 msgid "Notation: "
 msgstr "\"Notation\": "
 
-#: g10/mainproc.c:632
+#: g10/mainproc.c:650
 msgid "Policy: "
 msgstr "Richtlinie: "
 
-#: g10/mainproc.c:1062
+#: g10/mainproc.c:1080
 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:1068
+#: g10/mainproc.c:1086
 #, 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:1094 g10/mainproc.c:1105
+#: g10/mainproc.c:1112 g10/mainproc.c:1123
 msgid "BAD signature from \""
 msgstr "FALSCHE Unterschrift von \""
 
-#: g10/mainproc.c:1095 g10/mainproc.c:1106
+#: g10/mainproc.c:1113 g10/mainproc.c:1124
 msgid "Good signature from \""
 msgstr "Korrekte Unterschrift von \""
 
-#: g10/mainproc.c:1097
+#: g10/mainproc.c:1115
 msgid "                aka \""
 msgstr "                    alias \""
 
-#: g10/mainproc.c:1153
+#: g10/mainproc.c:1171
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Unterschrift kann nicht geprüft werden: %s\n"
 
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1235
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "Einzelne Unterschrift der Klasse 0x%02x\n"
 
-#: g10/mainproc.c:1263
+#: g10/mainproc.c:1281
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
 
-#: g10/mainproc.c:1268
+#: g10/mainproc.c:1286
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ungültiges root-Paket in proc_tree() entdeckt\n"
 
-#: g10/misc.c:94
+#: g10/misc.c:96
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "core-dump-Dateierzeugung kann nicht abgeschaltet werden: %s\n"
 
-#: g10/misc.c:97
-msgid "WARNING: program may create a core file!\n"
-msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n"
-
-#: g10/misc.c:205
+#: g10/misc.c:206
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Experimentiermethoden sollten nicht benutzt werden!\n"
 
-#: g10/misc.c:219
-msgid ""
-"RSA keys are deprecated; please consider creating a new key and use this key "
-"in the future\n"
-msgstr ""
-"RSA Schlüssel sind nicht erwünscht; bitte denken Sie darüber nach, einen\n"
-"neuen Schlüssel zu erzeugen und diesen in Zukunft zu benutzen\n"
-
-#: g10/misc.c:241
+#: g10/misc.c:233
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 "Diese Verschlüsselungsmethode taugt nicht mehr viel; verwenden Sie eine "
@@ -2701,7 +2717,7 @@
 msgid "can't handle public key algorithm %d\n"
 msgstr "dieses Public-Key Verfahren %d kann nicht benutzt werden\n"
 
-#: g10/parse-packet.c:965
+#: g10/parse-packet.c:986
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
@@ -2738,91 +2754,91 @@
 msgid "Repeat passphrase: "
 msgstr "Geben Sie das Mantra nochmal ein: "
 
-#: g10/plaintext.c:63
+#: g10/plaintext.c:67
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "Daten wurden nicht gespeichert; verwenden Sie dafür die Option \"--output\"\n"
 
-#: g10/plaintext.c:317
+#: g10/plaintext.c:324
 msgid "Detached signature.\n"
 msgstr "Abgetrennte Beglaubigungen.\n"
 
-#: g10/plaintext.c:321
+#: g10/plaintext.c:328
 msgid "Please enter name of data file: "
 msgstr "Bitte geben Sie den Namen der Datendatei ein: "
 
-#: g10/plaintext.c:342
+#: g10/plaintext.c:349
 msgid "reading stdin ...\n"
 msgstr "lese stdin ...\n"
 
-#: g10/plaintext.c:385
+#: g10/plaintext.c:392
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "kann signierte Datei '%s' nicht öffnen.\n"
 
-#: g10/pubkey-enc.c:79
+#: g10/pubkey-enc.c:76
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "Ungenannter Empfänger: Versuch mit geheimen Schlüssel %08lX ...\n"
 
-#: g10/pubkey-enc.c:85
+#: g10/pubkey-enc.c:82
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "Alles klar, wir sind der ungenannte Empfänger.\n"
 
-#: g10/pubkey-enc.c:137
+#: g10/pubkey-enc.c:134
 msgid "old encoding of the DEK is not supported\n"
 msgstr "alte Kodierung des DEK wird nicht unterstützt\n"
 
-#: g10/pubkey-enc.c:156
+#: g10/pubkey-enc.c:153
 #, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "Verschüsselungsverfahren %d ist unbekannt oder abgeschaltet\n"
 
-#: g10/pubkey-enc.c:195
+#: g10/pubkey-enc.c:192
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "Hinweis: Verfahren %d ist kein bevorzugtes Verschlüsselungsverfahren\n"
 
-#: g10/pubkey-enc.c:201
+#: g10/pubkey-enc.c:198
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "Hinweis: geheimer Schlüssel %08lX verfällt am %s\n"
 
-#: g10/hkp.c:62
+#: g10/hkp.c:72
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
 msgstr "Schlüssel %08lX von %s wird angefordert ...\n"
 
-#: g10/hkp.c:75
+#: g10/hkp.c:85
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "Schlüssel ist beim Schlüsselserver nicht erhältlich: %s\n"
 
-#: g10/hkp.c:98 g10/hkp.c:136
+#: g10/hkp.c:109 g10/hkp.c:148
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "Kein Schlüsselserver bekannt (Option --keyserver verwenden)\n"
 
-#: g10/hkp.c:106
+#: g10/hkp.c:117
 #, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "%s: Dies ist keine gültige Schlüssel-ID\n"
 
-#: g10/hkp.c:158
+#: g10/hkp.c:170
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "Verbindung zu '%s' kann nicht aufgebaut werden: %s\n"
 
-#: g10/hkp.c:182
+#: g10/hkp.c:194
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "Fehler beim Senden an `%s': %s\n"
 
-#: g10/hkp.c:194
+#: g10/hkp.c:206
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "Senden an `%s' erfolgreich (status=%u)\n"
 
-#: g10/hkp.c:197
+#: g10/hkp.c:209
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "Senden an `%s' erfolglos (status=%u)\n"
@@ -2836,47 +2852,47 @@
 msgid "protection algorithm %d is not supported\n"
 msgstr "Schutzverfahren %d wird nicht unterstützt\n"
 
-#: g10/seckey-cert.c:175
+#: g10/seckey-cert.c:184
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Ungültiges Mantra; versuchen Sie's doch noch einmal ...\n"
 
-#: g10/seckey-cert.c:231
+#: g10/seckey-cert.c:240
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "WARNUNG: Unsicherer Schlüssel entdeckt -\n"
 "         bitte Mantra nochmals wechseln.\n"
 
-#: g10/sig-check.c:202
+#: g10/sig-check.c:199
 msgid "assuming bad MDC due to an unknown critical bit\n"
 msgstr ""
 "Vermutlich ist das Siegel (MDC) BESCHÄDIGT (wegen unbekanntem \"critical "
 "bit\")\n"
 
-#: g10/sig-check.c:300
+#: g10/sig-check.c:297
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "Dieser durch PGP erzeugte ElGamal-Schlüssel ist für Signaturen NICHT sicher "
 "genug!\n"
 
-#: g10/sig-check.c:308
+#: g10/sig-check.c:305
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr ""
 "Öffentlicher Schlüssel ist um %lu Sekunde jünger als die Unterschrift\n"
 
-#: g10/sig-check.c:309
+#: g10/sig-check.c:306
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr ""
 "Öffentlicher Schlüssel ist um %lu Sekunden jünger als die Unterschrift\n"
 
-#: g10/sig-check.c:327
+#: g10/sig-check.c:324
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "Hinweis: Schlüssel der Signatur ist verfallen am %s.\n"
 
-#: g10/sig-check.c:396
+#: g10/sig-check.c:393
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "Vermutlich eine FALSCHE Unterschrift, wegen unbekanntem \"critical bit\"\n"
@@ -2886,7 +2902,7 @@
 msgid "%s signature from: %s\n"
 msgstr "%s Unterschrift von: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:606
+#: g10/sign.c:290 g10/sign.c:610
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s kann nicht erzeugt werden: %s\n"
@@ -2934,7 +2950,7 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: Verzeichnis existiert nicht!\n"
 
-#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1363 g10/tdbio.c:444
+#: g10/openfile.c:226 g10/openfile.c:295 g10/ringedit.c:1369 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: kann nicht erzeugt werden: %s\n"
@@ -3036,292 +3052,302 @@
 "Die \"Trust\"-Datenbank ist beschädigt; verwenden Sie \"gpg "
 "--fix-trustdb\".\n"
 
-#: g10/trustdb.c:168
+#: g10/trustdb.c:169
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "trust record %lu, req type %d: read failed: %s\n"
 
-#: g10/trustdb.c:183
+#: g10/trustdb.c:184
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "trust record %lu, type %d: write failed: %s\n"
 
-#: g10/trustdb.c:197
+#: g10/trustdb.c:198
 #, c-format
 msgid "trust record %lu: delete failed: %s\n"
 msgstr "Vertrauenssatz %lu: löschen fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:211
+#: g10/trustdb.c:212
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "\"Trust-DB\": sync fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:376
+#: g10/trustdb.c:377
 #, c-format
 msgid "error reading dir record for LID %lu: %s\n"
 msgstr "Fehler beim Lesen des Dir-Satzes für LID %lu: %s\n"
 
-#: g10/trustdb.c:383
+#: g10/trustdb.c:384
 #, c-format
 msgid "lid %lu: expected dir record, got type %d\n"
 msgstr "lid %lu: Dir-Satz erwartet, aber es kam Typ %d\n"
 
-#: g10/trustdb.c:388
+#: g10/trustdb.c:389
 #, c-format
 msgid "no primary key for LID %lu\n"
 msgstr "Kein Hauptschlüssel für LID %lu\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:394
 #, c-format
 msgid "error reading primary key for LID %lu: %s\n"
 msgstr "Fehler beim Lesen den Hauptschlüssels der LID %lu: %s\n"
 
-#: g10/trustdb.c:432
+#: g10/trustdb.c:433
 #, c-format
 msgid "get_dir_record: search_record failed: %s\n"
 msgstr "get_dir_record: search_record fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:487
-#, c-format
-msgid "NOTE: secret key %08lX is NOT protected.\n"
-msgstr "HINWEIS: Geheimer Schlüssel %08lX ist NICHT geschützt.\n"
-
-#: g10/trustdb.c:495
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr ""
-"Schlüssel %08lX: geheimer Schlüssel, aber ohne öffentlichen Schlüssel - "
-"übersprungen\n"
-
-#: g10/trustdb.c:502
-#, c-format
-msgid "key %08lX: secret and public key don't match\n"
-msgstr ""
-"Schlüssel %08lX: geheimer und öffentlicher Schlüssel passen nicht zusammen.\n"
+#: g10/trustdb.c:474
+#, fuzzy, c-format
+msgid "'%s' is not a valid long keyID\n"
+msgstr "%s: Dies ist keine gültige Schlüssel-ID\n"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:501
 #, c-format
 msgid "key %08lX: can't put it into the trustdb\n"
 msgstr "Schlüssel %08lX kann nicht in die \"trustdb\" eingefügt werden\n"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:507
 #, c-format
 msgid "key %08lX: query record failed\n"
 msgstr "Schlüssel %08lX: Satzabfrage fehlgeschlagen\n"
 
-#: g10/trustdb.c:529
+#: g10/trustdb.c:516
 #, c-format
 msgid "key %08lX: already in trusted key table\n"
 msgstr "Schlüssel %08lX: Ist bereits in geheimer Schlüsseltabelle\n"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:519
 #, c-format
 msgid "key %08lX: accepted as trusted key.\n"
 msgstr "Schlüssel %08lX: Akzeptiert als vertrauenswürdiger Schlüssel.\n"
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:546
+#, fuzzy, c-format
+msgid "key %08lX: no public key for trusted key - skipped\n"
+msgstr "Schlüssel %08lX: ungeschützt - übersprungen\n"
+
+#: g10/trustdb.c:565
+#, c-format
+msgid "NOTE: secret key %08lX is NOT protected.\n"
+msgstr "HINWEIS: Geheimer Schlüssel %08lX ist NICHT geschützt.\n"
+
+#: g10/trustdb.c:577
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr ""
+"Schlüssel %08lX: geheimer Schlüssel, aber ohne öffentlichen Schlüssel - "
+"übersprungen\n"
+
+#: g10/trustdb.c:584
+#, c-format
+msgid "key %08lX: secret and public key don't match\n"
+msgstr ""
+"Schlüssel %08lX: geheimer und öffentlicher Schlüssel passen nicht zusammen.\n"
+
+#: g10/trustdb.c:597
 #, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr "enum_secret_keys fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:921
+#: g10/trustdb.c:987
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "Schlüssel %08lX.%lu: Korrekte Unterschlüssel-Anbindung\n"
 
-#: g10/trustdb.c:927 g10/trustdb.c:962
+#: g10/trustdb.c:993 g10/trustdb.c:1028
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "Schlüssel %08lX.%lu: Ungültige Unterschlüssel-Anbindung: %s\n"
 
-#: g10/trustdb.c:939
+#: g10/trustdb.c:1005
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "Schlüssel %08lX.%lu: Gültiger Schlüsselwiderruf\n"
 
-#: g10/trustdb.c:945
+#: g10/trustdb.c:1011
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "Schlüssel %08lX.%lu: Ungültiger Schlüsselwiderruf: %s\n"
 
-#: g10/trustdb.c:956
+#: g10/trustdb.c:1022
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "Schlüssel %08lX.%lu: Gültiger Unterschlüsselwiderruf\n"
 
-#: g10/trustdb.c:1067
+#: g10/trustdb.c:1133
 msgid "Good self-signature"
 msgstr "Korrekte Eigenbeglaubigung"
 
-#: g10/trustdb.c:1077
+#: g10/trustdb.c:1143
 msgid "Invalid self-signature"
 msgstr "Ungültige Eigenbeglaubigung"
 
-#: g10/trustdb.c:1104
+#: g10/trustdb.c:1170
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 "Gültiger User-ID-Widerruf ignoriert, da eine neuere Eigenbeglaubigung "
 "vorliegt"
 
-#: g10/trustdb.c:1110
+#: g10/trustdb.c:1176
 msgid "Valid user ID revocation"
 msgstr "Gültiger User-ID-Widerruf"
 
-#: g10/trustdb.c:1115
+#: g10/trustdb.c:1181
 msgid "Invalid user ID revocation"
 msgstr "Ungültiger User-ID-Widerruf"
 
-#: g10/trustdb.c:1157
+#: g10/trustdb.c:1223
 msgid "Valid certificate revocation"
 msgstr "Gültiger Zerifikat-Widerruf"
 
-#: g10/trustdb.c:1158
+#: g10/trustdb.c:1224
 msgid "Good certificate"
 msgstr "Korrektes Zertifikat"
 
-#: g10/trustdb.c:1186
+#: g10/trustdb.c:1252
 msgid "Invalid certificate revocation"
 msgstr "Ungültiger Zertifikatswiderruf"
 
-#: g10/trustdb.c:1187
+#: g10/trustdb.c:1253
 msgid "Invalid certificate"
 msgstr "Ungültiges Zertifikat"
 
-#: g10/trustdb.c:1204 g10/trustdb.c:1208
+#: g10/trustdb.c:1270 g10/trustdb.c:1274
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "Signatursatz %lu[%d] zeigt auf falschen Satz.\n"
 
-#: g10/trustdb.c:1267
+#: g10/trustdb.c:1333
 msgid "duplicated certificate - deleted"
 msgstr "Doppelte Zertifikate - entfernt"
 
-#: g10/trustdb.c:1584
+#: g10/trustdb.c:1650
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:1718
+#: g10/trustdb.c:1784
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: Einfügen fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:1723
+#: g10/trustdb.c:1789
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: Einfügen fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:1729
+#: g10/trustdb.c:1795
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: eingefügt\n"
 
-#: g10/trustdb.c:1734
+#: g10/trustdb.c:1800
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "Fehler beim Lesen des Verz.Satzes: %s\n"
 
-#: g10/trustdb.c:1742 g10/trustdb.c:1805
+#: g10/trustdb.c:1808 g10/trustdb.c:1871
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu Schlüssel bearbeitet\n"
 
-#: g10/trustdb.c:1744 g10/trustdb.c:1811
+#: g10/trustdb.c:1810 g10/trustdb.c:1877
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu Schlüssel mit Fehlern\n"
 
-#: g10/trustdb.c:1746
+#: g10/trustdb.c:1812
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu Schlüssel eingefügt\n"
 
-#: g10/trustdb.c:1749
+#: g10/trustdb.c:1815
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "enumerate Schlüsselblock fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:1797
+#: g10/trustdb.c:1863
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: Dir-Satz ohne Schlüssel - übergangen\n"
 
-#: g10/trustdb.c:1807
+#: g10/trustdb.c:1873
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "\t%lu wegen neuer Schlüssel\n"
 
-#: g10/trustdb.c:1809
+#: g10/trustdb.c:1875
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu Schlüssel übersprungen\n"
 
-#: g10/trustdb.c:1813
+#: g10/trustdb.c:1879
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu Schlüssel geändert\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2224
 msgid "Ooops, no keys\n"
 msgstr "Huch, keine Schlüssel\n"
 
-#: g10/trustdb.c:2162
+#: g10/trustdb.c:2228
 msgid "Ooops, no user IDs\n"
 msgstr "Huch, keine User-IDs\n"
 
-#: g10/trustdb.c:2320
+#: g10/trustdb.c:2386
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: Suche nach Dir-Satz fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2395
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "Schlüssel %08lX: 'trust record' einfügen fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:2333
+#: g10/trustdb.c:2399
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "Schlüssel %08lX.%lu: in \"trustdb\" eingefügt\n"
 
-#: g10/trustdb.c:2341
+#: g10/trustdb.c:2407
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "Schlüssel %08lX.%lu: wurde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht überein)\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2422
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "Schlüssel %08lX.%lu: verfallen am %s\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2430
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "Schlüssel %08lX.%lu: Vertrauensprüfung fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:2515
+#: g10/trustdb.c:2581
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "Benutzer '%s' nicht gefunden: %s\n"
 
-#: g10/trustdb.c:2517
+#: g10/trustdb.c:2583
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "Problem, '%s' in der Trust-DB zu finden: %s\n"
 
-#: g10/trustdb.c:2520
+#: g10/trustdb.c:2586
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "User '%s' ist nicht in der 'Trust'-Datenbank - wird eingefügt\n"
 
-#: g10/trustdb.c:2523
+#: g10/trustdb.c:2589
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "konnte '%s' nicht in die 'Trust'-Datenbank hineintun: %s\n"
 
-#: g10/trustdb.c:2709 g10/trustdb.c:2739
+#: g10/trustdb.c:2775 g10/trustdb.c:2805
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "WARNUNG: Lange 'Pref'-Records können noch nicht benutzt werden\n"
 
@@ -3345,26 +3371,26 @@
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: Schlüsselbund kann nicht erzeugt werden: %s\n"
 
-#: g10/ringedit.c:319 g10/ringedit.c:1368
+#: g10/ringedit.c:319 g10/ringedit.c:1374
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: Schlüsselbund erstellt\n"
 
-#: g10/ringedit.c:1545
+#: g10/ringedit.c:1551
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "Warnung: Zwei Dateien mit vertraulichem Inhalt vorhanden.\n"
 
-#: g10/ringedit.c:1546
+#: g10/ringedit.c:1552
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s ist der Unveränderte\n"
 
-#: g10/ringedit.c:1547
+#: g10/ringedit.c:1553
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s ist der Neue\n"
 
-#: g10/ringedit.c:1548
+#: g10/ringedit.c:1554
 msgid "Please fix this possible security flaw\n"
 msgstr "Bitte diesen potentiellen Sicherheitsmangel beseitigen\n"
 
@@ -3389,49 +3415,49 @@
 "ist für Signaturen NICHT sicher genug!\n"
 
 #. do not overwrite
-#: g10/openfile.c:79
+#: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Datei '%s' existiert bereits. "
 
-#: g10/openfile.c:81
+#: g10/openfile.c:86
 msgid "Overwrite (y/N)? "
 msgstr "Überschreiben (j/N)? "
 
-#: g10/openfile.c:109
+#: g10/openfile.c:119
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: unbekannte Dateinamenerweiterung\n"
 
-#: g10/openfile.c:131
+#: g10/openfile.c:141
 msgid "Enter new filename"
 msgstr "Neuen Dateinamen eingeben"
 
-#: g10/openfile.c:172
+#: g10/openfile.c:182
 msgid "writing to stdout\n"
 msgstr "Schreiben auf die Standardausgabe\n"
 
-#: g10/openfile.c:250
+#: g10/openfile.c:261
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "die unterzeichneten Daten sind wohl in '%s'\n"
 
-#: g10/openfile.c:300
+#: g10/openfile.c:311
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: neue Optionendatei erstellt\n"
 
-#: g10/openfile.c:313
+#: g10/openfile.c:338
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: Verzeichnis kann nicht erzeugt werden: %s\n"
 
-#: g10/openfile.c:316
+#: g10/openfile.c:341
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: Verzeichnis erzeugt\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:343
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr ""
 "Sie müssen GnuPG noch einmal starten, damit es die neue Optionsdatei liest\n"
@@ -3777,6 +3803,13 @@
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Keine Hilfe für '%s' vorhanden."
+
+#~ msgid ""
+#~ "RSA keys are deprecated; please consider creating a new key and use this key "
+#~ "in the future\n"
+#~ msgstr ""
+#~ "RSA Schlüssel sind nicht erwünscht; bitte denken Sie darüber nach, einen\n"
+#~ "neuen Schlüssel zu erzeugen und diesen in Zukunft zu benutzen\n"
 
 #~ msgid "   (%d) ElGamal in a v3 packet\n"
 #~ msgstr "   (%d) ElGamal in einem v3-Paket\n"
diff -urN gnupg-1.0.2/po/eo.po gnupg-1.0.3/po/eo.po
--- gnupg-1.0.2/po/eo.po	Wed Jul 12 14:59:40 2000
+++ gnupg-1.0.3/po/eo.po	Mon Sep 18 12:18:02 2000
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.1e\n"
-"POT-Creation-Date: 2000-07-12 12:13+0200\n"
-"PO-Revision-Date: 2000-06-02 21:04+01:00\n"
+"POT-Creation-Date: 2000-09-18 12:17+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"
 "MIME-Version: 1.0\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:127 g10/keygen.c:1249
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1255
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
@@ -307,11 +307,11 @@
 msgid "too many random bits requested; the limit is %d\n"
 msgstr "tro da stokastaj bitoj petitaj; la limo estas %d\n"
 
-#: cipher/random.c:647
+#: cipher/random.c:650
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVERTO: uzas malsekuran stokastilon!!\n"
 
-#: cipher/random.c:648
+#: cipher/random.c:651
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -325,7 +325,7 @@
 "NE UZU DATENOJN KREITAJN DE ĆI TIU PROGRAMO!!\n"
 "\n"
 
-#: cipher/rndlinux.c:141
+#: cipher/rndlinux.c:142
 #, c-format
 msgid ""
 "\n"
@@ -336,7 +336,7 @@
 "Nesufiće da stokastaj datenoj. Bonvolu fari ion por ebligi al la\n"
 "mastruma sistemo kolekti pli da entropio! (Mankas %d bitokoj)\n"
 
-#: g10/g10.c:197
+#: g10/g10.c:206
 msgid ""
 "@Commands:\n"
 " "
@@ -344,139 +344,139 @@
 "@Komandoj:\n"
 " "
 
-#: g10/g10.c:199
+#: g10/g10.c:208
 msgid "|[file]|make a signature"
 msgstr "|[dosiero]|fari subskribon"
 
-#: g10/g10.c:200
+#: g10/g10.c:209
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosiero]|fari klartekstan subskribon"
 
-#: g10/g10.c:201
+#: g10/g10.c:210
 msgid "make a detached signature"
 msgstr "fari apartan subskribon"
 
-#: g10/g10.c:202
+#: g10/g10.c:211
 msgid "encrypt data"
 msgstr "ćifri datenojn"
 
-#: g10/g10.c:203
+#: g10/g10.c:212
 msgid "encryption only with symmetric cipher"
 msgstr "ćifri nur kun simetria ćifro"
 
-#: g10/g10.c:204
+#: g10/g10.c:213
 msgid "store only"
 msgstr "nur skribi"
 
-#: g10/g10.c:205
+#: g10/g10.c:214
 msgid "decrypt data (default)"
 msgstr "malćifri datenojn (implicita elekto)"
 
-#: g10/g10.c:206
+#: g10/g10.c:215
 msgid "verify a signature"
 msgstr "kontroli subskribon"
 
-#: g10/g10.c:208
+#: g10/g10.c:217
 msgid "list keys"
 msgstr "listigi ţlosilojn"
 
-#: g10/g10.c:210
+#: g10/g10.c:219
 msgid "list keys and signatures"
 msgstr "listigi ţlosilojn kaj subskribojn"
 
-#: g10/g10.c:211
+#: g10/g10.c:220
 msgid "check key signatures"
 msgstr "kontroli ţlosilsubskribojn"
 
-#: g10/g10.c:212
+#: g10/g10.c:221
 msgid "list keys and fingerprints"
 msgstr "listigi ţlosilojn kaj fingroţpurojn"
 
-#: g10/g10.c:213
+#: g10/g10.c:222
 msgid "list secret keys"
 msgstr "listigi sekretajn ţlosilojn"
 
-#: g10/g10.c:214
+#: g10/g10.c:223
 msgid "generate a new key pair"
 msgstr "krei novan ţlosilparon"
 
-#: g10/g10.c:215
+#: g10/g10.c:224
 msgid "remove key from the public keyring"
 msgstr "forigi ţlosilon de la publika ţlosilaro"
 
-#: g10/g10.c:217
+#: g10/g10.c:226
 msgid "remove key from the secret keyring"
 msgstr "forigi ţlosilon de la sekreta ţlosilaro"
 
-#: g10/g10.c:218
+#: g10/g10.c:227
 msgid "sign a key"
 msgstr "subskribi ţlosilon"
 
-#: g10/g10.c:219
+#: g10/g10.c:228
 msgid "sign a key locally"
 msgstr "subskribi ţlosilon loke"
 
-#: g10/g10.c:220
+#: g10/g10.c:229
 msgid "sign or edit a key"
 msgstr "subskribi aý redakti ţlosilon"
 
-#: g10/g10.c:221
+#: g10/g10.c:230
 msgid "generate a revocation certificate"
 msgstr "krei revokatestilon"
 
-#: g10/g10.c:222
+#: g10/g10.c:231
 msgid "export keys"
 msgstr "eksporti ţlosilojn"
 
-#: g10/g10.c:223
+#: g10/g10.c:232
 msgid "export keys to a key server"
 msgstr "eksporti ţlosilojn al ţlosilservilo"
 
-#: g10/g10.c:224
+#: g10/g10.c:233
 msgid "import keys from a key server"
 msgstr "importi ţlosilojn de ţlosilservilo"
 
-#: g10/g10.c:228
+#: g10/g10.c:237
 msgid "import/merge keys"
 msgstr "importi/kunfandi ţlosilojn"
 
-#: g10/g10.c:230
+#: g10/g10.c:239
 msgid "list only the sequence of packets"
 msgstr "listigi nur la sinsekvon de paketoj"
 
-#: g10/g10.c:232
+#: g10/g10.c:241
 msgid "export the ownertrust values"
 msgstr "eksporti la posedantofido-valorojn"
 
-#: g10/g10.c:234
+#: g10/g10.c:243
 msgid "import ownertrust values"
 msgstr "importi posedantofido-valorojn"
 
-#: g10/g10.c:236
+#: g10/g10.c:245
 msgid "update the trust database"
 msgstr "aktualigi la fido-datenaron"
 
-#: g10/g10.c:238
+#: g10/g10.c:247
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMOJ]|kontroli la fido-datenaron"
 
-#: g10/g10.c:239
+#: g10/g10.c:248
 msgid "fix a corrupted trust database"
 msgstr "ripari fuţitan fido-datenaron"
 
-#: g10/g10.c:240
+#: g10/g10.c:249
 msgid "De-Armor a file or stdin"
 msgstr "elkirasigi dosieron aý la normalan enigon"
 
-#: g10/g10.c:242
+#: g10/g10.c:251
 msgid "En-Armor a file or stdin"
 msgstr "enkirasigi dosieron aý la normalan enigon"
 
-#: g10/g10.c:244
+#: g10/g10.c:253
 msgid "|algo [files]|print message digests"
 msgstr "|metodo [dosieroj]|presi mesařo-kompendiojn"
 
-#: g10/g10.c:248
+#: g10/g10.c:257
 msgid ""
 "@\n"
 "Options:\n"
@@ -486,148 +486,152 @@
 "Opcioj:\n"
 " "
 
-#: g10/g10.c:250
+#: g10/g10.c:259
 msgid "create ascii armored output"
 msgstr "krei eligon en askia kiraso"
 
-#: g10/g10.c:252
+#: g10/g10.c:261
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMO|ćifri por NOMO"
 
-#: g10/g10.c:255
+#: g10/g10.c:264
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
 
-#: g10/g10.c:257
+#: g10/g10.c:266
 msgid "use the default key as default recipient"
 msgstr "uzi la implicitan ţlosilon kiel implicitan ricevonton"
 
-#: g10/g10.c:261
+#: g10/g10.c:270
 msgid "use this user-id to sign or decrypt"
 msgstr "uzi ći tiun uzantidentigilon por subskribi aý malćifri"
 
-#: g10/g10.c:262
+#: g10/g10.c:271
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|difini densig-nivelon N (0=nenia)"
 
-#: g10/g10.c:264
+#: g10/g10.c:273
 msgid "use canonical text mode"
 msgstr "uzi tekstan reřimon"
 
-#: g10/g10.c:265
+#: g10/g10.c:274
 msgid "use as output file"
 msgstr "uzi dosieron por eligo"
 
-#: g10/g10.c:266
+#: g10/g10.c:275
 msgid "verbose"
 msgstr "detala eligo"
 
-#: g10/g10.c:267
+#: g10/g10.c:276
 msgid "be somewhat more quiet"
 msgstr "iom malpli da informoj"
 
-#: g10/g10.c:268
+#: g10/g10.c:277
 msgid "don't use the terminal at all"
 msgstr "tute ne uzi la terminalon"
 
-#: g10/g10.c:269
+#: g10/g10.c:278
 msgid "force v3 signatures"
 msgstr "devigi v3-subskribojn"
 
-#: g10/g10.c:270
+#: g10/g10.c:279
 msgid "always use a MDC for encryption"
 msgstr "ćiam uzi sigelon (MDC) por ćifrado"
 
-#: g10/g10.c:271
+#: g10/g10.c:280
 msgid "do not make any changes"
 msgstr "fari neniajn ţanřojn"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:273
+#: g10/g10.c:282
 msgid "batch mode: never ask"
 msgstr "neinteraga reřimo: neniam demandi"
 
-#: g10/g10.c:274
+#: g10/g10.c:283
 msgid "assume yes on most questions"
 msgstr "supozi \"jes\" će la plej multaj demandoj"
 
-#: g10/g10.c:275
+#: g10/g10.c:284
 msgid "assume no on most questions"
 msgstr "supozi \"ne\" će la plej multaj demandoj"
 
-#: g10/g10.c:276
+#: g10/g10.c:285
 msgid "add this keyring to the list of keyrings"
 msgstr "aldoni ći tiun ţlosilaron al la listo de ţlosilaroj"
 
-#: g10/g10.c:277
+#: g10/g10.c:286
 msgid "add this secret keyring to the list"
 msgstr "aldoni ći tiun sekretan ţlosilaron al la listo"
 
-#: g10/g10.c:278
+#: g10/g10.c:287
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan ţlosilon"
 
-#: g10/g10.c:279
+#: g10/g10.c:288
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVILO|uzi ći tiun ţlosilservilon por serći ţlosilojn"
 
-#: g10/g10.c:280
+#: g10/g10.c:289
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOMO|difini NOMOn kiel la signaron de la terminalo"
 
-#: g10/g10.c:281
+#: g10/g10.c:290
 msgid "read options from file"
 msgstr "legi la opciojn el dosiero"
 
-#: g10/g10.c:285
+#: g10/g10.c:294
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
 
-#: g10/g10.c:290
+#: g10/g10.c:299
+msgid "|KEYID|ulimately trust this key"
+msgstr ""
+
+#: g10/g10.c:300
 msgid "|FILE|load extension module FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: g10/g10.c:291
+#: g10/g10.c:301
 msgid "emulate the mode described in RFC1991"
 msgstr "imiti la reřimon priskribitan en RFC 1991"
 
-#: g10/g10.c:292
+#: g10/g10.c:302
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "ţalti ćiujn paket-, ćifrad- kaj kompendi-opciojn al OpenPGP-konduto"
 
-#: g10/g10.c:293
+#: g10/g10.c:303
 msgid "|N|use passphrase mode N"
 msgstr "|N|uzi pasfraz-reřimon N"
 
-#: g10/g10.c:295
+#: g10/g10.c:305
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOMO|uzi kompendi-metodon NOMO por pasfrazoj"
 
-#: g10/g10.c:297
+#: g10/g10.c:307
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOMO|uzi ćifrad-metodon NOMO por pasfrazoj"
 
-#: g10/g10.c:298
+#: g10/g10.c:308
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMO|uzi ćifrad-metodon NOMO"
 
-#: g10/g10.c:299
+#: g10/g10.c:309
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMO|uzi kompendi-metodon NOMO"
 
-#: g10/g10.c:300
+#: g10/g10.c:310
 msgid "|N|use compress algorithm N"
 msgstr "|N|uzi densig-metodon N"
 
-#: g10/g10.c:301
+#: g10/g10.c:311
 msgid "throw keyid field of encrypted packets"
 msgstr "forigi la ţlosilidentigilon de ćifritaj paketoj"
 
-#: g10/g10.c:302
+#: g10/g10.c:312
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOMO=VALORO|uzi ći tiun notacian datenon"
 
-#: g10/g10.c:305
+#: g10/g10.c:315
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -635,7 +639,7 @@
 "@\n"
 "(Vidu la manpařon por kompleta listo de ćiuj komandoj kaj opcioj)\n"
 
-#: g10/g10.c:308
+#: g10/g10.c:318
 msgid ""
 "@\n"
 "Examples:\n"
@@ -655,15 +659,15 @@
 " --list-keys [nomoj]        montri ţlosilojn\n"
 " --fingerprint [nomoj]      montri fingroţpurojn\n"
 
-#: g10/g10.c:403
+#: g10/g10.c:418
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Bonvolu raporti cimojn al <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:407
+#: g10/g10.c:422
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: g10/g10.c:410
+#: g10/g10.c:425
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -673,7 +677,7 @@
 "subskribi, kontroli, ćifri aý malćifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: g10/g10.c:417
+#: g10/g10.c:432
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -681,182 +685,186 @@
 "\n"
 "Realigitaj metodoj:\n"
 
-#: g10/g10.c:496
+#: g10/g10.c:511
 msgid "usage: gpg [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: g10/g10.c:549
+#: g10/g10.c:564
 msgid "conflicting commands\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/g10.c:692
+#: g10/g10.c:704
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/g10.c:696
+#: g10/g10.c:708
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "opcio-dosiero '%s': %s\n"
 
-#: g10/g10.c:703
+#: g10/g10.c:715
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/g10.c:893
+#: g10/g10.c:905
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/g10.c:949 g10/g10.c:958
+#: g10/g10.c:970
+msgid "WARNING: program may create a core file!\n"
+msgstr "AVERTO: programo povas krei core-dosieron!\n"
+
+#: g10/g10.c:974 g10/g10.c:983
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTO: %s ne estas por normala uzado!\n"
 
-#: g10/g10.c:951
+#: g10/g10.c:976
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/g10.c:954
+#: g10/g10.c:979
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/g10.c:973 g10/g10.c:985
+#: g10/g10.c:998 g10/g10.c:1010
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita ćifrad-metodo ne validas\n"
 
-#: g10/g10.c:979 g10/g10.c:991
+#: g10/g10.c:1004 g10/g10.c:1016
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/g10.c:995
+#: g10/g10.c:1020
 msgid "the given policy URL is invalid\n"
 msgstr "la donita gvidlinia URL ne validas\n"
 
-#: g10/g10.c:998
+#: g10/g10.c:1023
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "la densig-metodo devas esti inter %d kaj %d\n"
 
-#: g10/g10.c:1000
+#: g10/g10.c:1025
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/g10.c:1002
+#: g10/g10.c:1027
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/g10.c:1004
+#: g10/g10.c:1029
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth devas esti inter 1 kaj 255\n"
 
-#: g10/g10.c:1007
+#: g10/g10.c:1032
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTO: simpla S2K-reřimo (0) estas forte malrekomendata\n"
 
-#: g10/g10.c:1011
+#: g10/g10.c:1036
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "nevalida S2K-reřimo; devas esti 0, 1 aý 3\n"
 
-#: g10/g10.c:1096
+#: g10/g10.c:1121
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/g10.c:1102
+#: g10/g10.c:1127
 msgid "--store [filename]"
 msgstr "--store [dosiero]"
 
-#: g10/g10.c:1109
+#: g10/g10.c:1134
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosiero]"
 
-#: g10/g10.c:1117
+#: g10/g10.c:1142
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosiero]"
 
-#: g10/g10.c:1130
+#: g10/g10.c:1155
 msgid "--sign [filename]"
 msgstr "--sign [dosiero]"
 
-#: g10/g10.c:1143
+#: g10/g10.c:1168
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/g10.c:1157
+#: g10/g10.c:1182
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosiero]"
 
-#: g10/g10.c:1174
+#: g10/g10.c:1199
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosiero]"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1207
 msgid "--sign-key user-id"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/g10.c:1190
+#: g10/g10.c:1215
 msgid "--lsign-key user-id"
 msgstr "--lsign-key uzantidentigilo"
 
-#: g10/g10.c:1198
+#: g10/g10.c:1223
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key uzantidentigilo [komandoj]"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1239
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key uzantidentigilo"
 
-#: g10/g10.c:1217
+#: g10/g10.c:1242
 msgid "--delete-key user-id"
 msgstr "--delete-key uzantidentigilo"
 
-#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393
+#: g10/encode.c:265 g10/g10.c:1279 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: g10/g10.c:1269
+#: g10/g10.c:1294
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [uzantidentigilo] [ţlosilaro]"
 
-#: g10/g10.c:1335
+#: g10/g10.c:1360
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/g10.c:1343
+#: g10/g10.c:1368
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/g10.c:1411
+#: g10/g10.c:1439
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1520
 msgid "[filename]"
 msgstr "[dosiero]"
 
-#: g10/g10.c:1496
+#: g10/g10.c:1524
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesařon ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1499 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1527 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "ne povas malfermi '%s'\n"
 
-#: g10/g10.c:1669
+#: g10/g10.c:1700
 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:1675
+#: g10/g10.c:1706
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -864,11 +872,11 @@
 "notacia nomo devas enhavi nur literojn, ciferojn, punktojn aý substrekojn "
 "kaj fini per '='\n"
 
-#: g10/g10.c:1681
+#: g10/g10.c:1712
 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:1689
+#: g10/g10.c:1720
 msgid "a notation value must not use any control characters\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
@@ -978,7 +986,6 @@
 msgstr "Ţlosilo estas ne plu uzata"
 
 #: g10/pkclist.c:124
-#, fuzzy
 msgid "User ID is no longer valid"
 msgstr "Uzantidentigilo ne plu validas"
 
@@ -1247,58 +1254,58 @@
 msgid "writing key binding signature\n"
 msgstr "skribas ţlosilbindan subskribon\n"
 
-#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:433
+#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:435
 #, 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:438
+#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:440
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "ţlosilgrando rondigita řis %u bitoj\n"
 
-#: g10/keygen.c:537
+#: g10/keygen.c:539
 msgid "Please select what kind of key you want:\n"
 msgstr "Bonvolu elekti, kian ţlosilon vi deziras:\n"
 
-#: g10/keygen.c:539
+#: g10/keygen.c:541
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA kaj ElGamal (implicita elekto)\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:542
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nur subskribi)\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:544
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (nur ćifri)\n"
 
-#: g10/keygen.c:543
+#: g10/keygen.c:545
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (subskribi kaj ćifri)\n"
 
-#: g10/keygen.c:545
-#, fuzzy, c-format
+#: g10/keygen.c:547
+#, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
-msgstr "   (%d) ElGamal (subskribi kaj ćifri)\n"
+msgstr "   (%d) RSA (subskribi kaj ćifri)\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:551
 msgid "Your selection? "
 msgstr "Via elekto? "
 
-#: g10/keygen.c:560 g10/keygen.c:568
+#: g10/keygen.c:562 g10/keygen.c:570
 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:582
+#: g10/keygen.c:584
 msgid "Invalid selection.\n"
 msgstr "Nevalida elekto.\n"
 
-#: g10/keygen.c:594
+#: g10/keygen.c:596
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1311,22 +1318,21 @@
 "               implicita ţlosilgrando estas 1024 bitoj\n"
 " plej granda rekomendata ţlosilgrando estas 2048 bitoj\n"
 
-#: g10/keygen.c:601
+#: g10/keygen.c:603
 msgid "What keysize do you want? (1024) "
 msgstr "Kiun ţlosilgrandon vi deziras? (1024) "
 
-#: g10/keygen.c:606
+#: g10/keygen.c:608
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA permesas ţlosilgrandon nur inter 512 kaj 1024\n"
 
-#: g10/keygen.c:608
+#: g10/keygen.c:610
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "ţlosilgrando tro malgranda; 768 estas plej eta permesata valoro.\n"
 
-#: g10/keygen.c:610
-#, fuzzy
+#: g10/keygen.c:612
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-msgstr "ţlosilgrando tro malgranda; 768 estas plej eta permesata valoro.\n"
+msgstr "ţlosilgrando tro malgranda; 1024 estas plej eta valoro por RSA.\n"
 
 #. It is ridiculous and an annoyance to use larger key sizes!
 #. * GnuPG can handle much larger sizes; but it takes an eternity
@@ -1336,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:621
+#: g10/keygen.c:623
 #, 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:626
+#: g10/keygen.c:628
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1349,11 +1355,11 @@
 "Ţlosilgrandoj pli grandaj ol 2048 ne estas rekomendataj,\n"
 "ćar la komputado daýras TRE longe!\n"
 
-#: g10/keygen.c:629
+#: g10/keygen.c:631
 msgid "Are you sure that you want this keysize? "
 msgstr "Ću vi estas certa, ke vi deziras ći tiun ţlosilgrandon? "
 
-#: g10/keygen.c:630
+#: g10/keygen.c:632
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1361,21 +1367,21 @@
 "Bone, sed pripensu, ke la elradiado de viaj ekrano kaj klavaro estas tre "
 "facile kaptebla!\n"
 
-#: g10/keygen.c:638
+#: g10/keygen.c:640
 msgid "Do you really need such a large keysize? "
 msgstr "Ću vi vere bezonas tiom grandan ţlosilgrandon? "
 
-#: g10/keygen.c:644
+#: g10/keygen.c:646
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Petita ţlosilgrando estas %u bitoj\n"
 
-#: g10/keygen.c:647 g10/keygen.c:651
+#: g10/keygen.c:649 g10/keygen.c:653
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rondigita řis %u bitoj\n"
 
-#: g10/keygen.c:699
+#: g10/keygen.c:701
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1391,25 +1397,25 @@
 "      <n>m = ţlosilo eksvalidiřos post n monatoj\n"
 "      <n>y = ţlosilo eksvalidiřos post n jaroj\n"
 
-#: g10/keygen.c:714
+#: g10/keygen.c:716
 msgid "Key is valid for? (0) "
 msgstr "Ţlosilo validu ...? (0) "
 
-#: g10/keygen.c:719
+#: g10/keygen.c:721
 msgid "invalid value\n"
 msgstr "nevalida valoro\n"
 
-#: g10/keygen.c:724
+#: g10/keygen.c:726
 msgid "Key does not expire at all\n"
 msgstr "Ţlosilo neniam eksvalidiřos\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:730
+#: g10/keygen.c:732
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Ţlosilo eksvalidiřos je %s\n"
 
-#: g10/keygen.c:733
+#: g10/keygen.c:735
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1417,11 +1423,11 @@
 "Via sistemo ne povas montri datojn post 2038.\n"
 "Tamen, ři estos řuste traktata řis 2106.\n"
 
-#: g10/keygen.c:738
+#: g10/keygen.c:740
 msgid "Is this correct (y/n)? "
 msgstr "Ću tio estas řusta (j/n)? "
 
-#: g10/keygen.c:781
+#: g10/keygen.c:783
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1436,44 +1442,44 @@
 "    \"Heinrich Heine (la poeto) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:793
+#: g10/keygen.c:795
 msgid "Real name: "
 msgstr "Vera nomo: "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:803
 msgid "Invalid character in name\n"
 msgstr "Nevalida signo en nomo\n"
 
-#: g10/keygen.c:799
+#: g10/keygen.c:805
 msgid "Name may not start with a digit\n"
 msgstr "Nomo ne povas komenciři per cifero\n"
 
-#: g10/keygen.c:801
+#: g10/keygen.c:807
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nomo devas havi almenaý 5 signojn\n"
 
-#: g10/keygen.c:809
+#: g10/keygen.c:815
 msgid "Email address: "
 msgstr "Retadreso: "
 
-#: g10/keygen.c:820
+#: g10/keygen.c:826
 msgid "Not a valid email address\n"
 msgstr "Nevalida retadreso\n"
 
-#: g10/keygen.c:828
+#: g10/keygen.c:834
 msgid "Comment: "
 msgstr "Komento: "
 
-#: g10/keygen.c:834
+#: g10/keygen.c:840
 msgid "Invalid character in comment\n"
 msgstr "Nevalida signo en komento\n"
 
-#: g10/keygen.c:857
+#: g10/keygen.c:863
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vi uzas la signaron '%s'.\n"
 
-#: g10/keygen.c:863
+#: g10/keygen.c:869
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1484,27 +1490,27 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:867
+#: g10/keygen.c:873
 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:872
+#: g10/keygen.c:878
 msgid "NnCcEeOoQq"
 msgstr "NnKkAaBbFf"
 
-#: g10/keygen.c:882
+#: g10/keygen.c:888
 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:883
+#: g10/keygen.c:889
 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:902
+#: g10/keygen.c:908
 msgid "Please correct the error first\n"
 msgstr "Bonvolu korekti la eraron unue\n"
 
-#: g10/keygen.c:940
+#: g10/keygen.c:946
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1512,11 +1518,11 @@
 "Vi bezonas pasfrazon por protekti vian sekretan ţlosilon.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:948
+#: g10/keyedit.c:468 g10/keygen.c:954
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "la pasfrazo ne estis řuste ripetita; provu denove.\n"
 
-#: g10/keygen.c:954
+#: g10/keygen.c:960
 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"
@@ -1528,7 +1534,7 @@
 "uzante ći tiun programon kun la opcio \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:975
+#: g10/keygen.c:981
 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"
@@ -1540,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:1424
+#: g10/keygen.c:1430
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA-ţlosilparo havos 1024 bitojn.\n"
 
-#: g10/keygen.c:1467
+#: g10/keygen.c:1473
 msgid "Key generation canceled.\n"
 msgstr "Kreado de ţlosiloj nuligita.\n"
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1570
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skribas publikan ţlosilon al '%s'\n"
 
-#: g10/keygen.c:1565
+#: g10/keygen.c:1571
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skribas sekretan ţlosilon al '%s'\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1667
 msgid "public and secret key created and signed.\n"
 msgstr "publika kaj sekreta ţlosiloj kreitaj kaj subskribitaj.\n"
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1672
 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"
@@ -1570,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:1683 g10/keygen.c:1784
+#: g10/keygen.c:1689 g10/keygen.c:1790
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kreado de ţlosiloj malsukcesis: %s\n"
 
-#: g10/keygen.c:1727 g10/sig-check.c:318 g10/sign.c:112
+#: g10/keygen.c:1733 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"
@@ -1583,7 +1589,7 @@
 "ţlosilo estis kreita %lu sekundon en la estonteco (tempotordo aý "
 "horlořeraro)\n"
 
-#: g10/keygen.c:1729 g10/sig-check.c:320 g10/sign.c:114
+#: g10/keygen.c:1735 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"
@@ -1591,11 +1597,11 @@
 "ţlosilo estis kreita %lu sekundojn en la estonteco (tempotordo aý "
 "horlořeraro)\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1768
 msgid "Really create? "
 msgstr "Ću vere krei? "
 
-#: g10/encode.c:91 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/encode.c:91 g10/openfile.c:178 g10/openfile.c:288 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1606,17 +1612,17 @@
 msgid "error creating passphrase: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:319
+#: g10/encode.c:171 g10/encode.c:324
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: AVERTO: malplena dosiero\n"
 
-#: g10/encode.c:266
+#: g10/encode.c:271
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "legas el '%s'\n"
 
-#: g10/encode.c:483
+#: g10/encode.c:492
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s-ćifrita por: %s\n"
@@ -1665,247 +1671,256 @@
 msgid "No user ID for key\n"
 msgstr "Mankas uzantidentigilo por ţlosilo\n"
 
-#: g10/getkey.c:1642 g10/getkey.c:1698
+#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "uzas flankan ţlosilon %08lX anstataý la ćefa ţlosilo %08lX\n"
 
-#: g10/getkey.c:2017
-#, fuzzy
+#: g10/getkey.c:2050
 msgid "[User id not found]"
-msgstr "%s: uzanto ne trovita\n"
+msgstr "[Uzantidentigilo ne trovita]"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignoras blokon de speco %d\n"
 
-#: g10/import.c:188 g10/trustdb.c:1740 g10/trustdb.c:1781
+#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu ţlosiloj jam traktitaj\n"
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: g10/import.c:203
+#: g10/import.c:204
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "      Nombro traktita entute: %lu\n"
 
-#: g10/import.c:205
+#: g10/import.c:206
+#, fuzzy, c-format
+msgid "      skipped new keys: %lu\n"
+msgstr "           novaj subţlosiloj: %lu\n"
+
+#: g10/import.c:209
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         sen uzantidentigilo: %lu\n"
 
-#: g10/import.c:207
+#: g10/import.c:211
 #, c-format
 msgid "              imported: %lu"
 msgstr "                  importitaj: %lu"
 
-#: g10/import.c:213
+#: g10/import.c:217
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                  neţanřitaj: %lu\n"
 
-#: g10/import.c:215
+#: g10/import.c:219
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      novaj uzantidentigiloj: %lu\n"
 
-#: g10/import.c:217
+#: g10/import.c:221
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novaj subţlosiloj: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:223
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "            novaj subskriboj: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:225
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "         novaj ţlosilrevokoj: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:227
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   sekretaj ţlosiloj legitaj: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:229
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "sekretaj ţlosiloj importitaj: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:231
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "sekretaj ţlosiloj neţanřitaj: %lu\n"
 
-#: g10/import.c:386 g10/import.c:578
+#: g10/import.c:391 g10/import.c:590
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "ţlosilo %08lX: mankas uzantidentigilo\n"
 
-#: g10/import.c:400
+#: g10/import.c:405
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "ţlosilo %08lX: mankas valida uzantidentigilo\n"
 
-#: g10/import.c:402
+#: g10/import.c:407
 msgid "this may be caused by a missing self-signature\n"
 msgstr "tio povas esti kaýzata de mankanta mem-subskribo\n"
 
-#: g10/import.c:413 g10/import.c:645
+#: g10/import.c:418 g10/import.c:657
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "ţlosilo %08lX: publika ţlosilo ne trovita: %s\n"
 
-#: g10/import.c:419
+#: g10/import.c:423
+#, fuzzy, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "ţlosilo %08lX: ne estas RFC-2440-ţlosilo - ignorita\n"
+
+#: g10/import.c:431
 msgid "no default public keyring\n"
 msgstr "mankas implicita publika ţlosilaro\n"
 
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
+#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skribas al '%s'\n"
 
-#: g10/import.c:426 g10/import.c:484 g10/import.c:593 g10/import.c:694
+#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "ne povas ţlosi la ţlosilaron '%s': %s\n"
 
-#: g10/import.c:429 g10/import.c:487 g10/import.c:596 g10/import.c:697
+#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "eraro dum skribado de ţlosilaro '%s': %s\n"
 
-#: g10/import.c:434
+#: g10/import.c:446
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "ţlosilo %08lX: publika ţlosilo importita\n"
 
-#: g10/import.c:451
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "ţlosilo %08lX: diferencas de nia kopio\n"
 
-#: g10/import.c:460 g10/import.c:653
+#: g10/import.c:472 g10/import.c:665
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "ţlosilo %08lX: ne povas trovi originalan ţlosilblokon: %s\n"
 
-#: g10/import.c:466 g10/import.c:659
+#: g10/import.c:478 g10/import.c:671
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "ţlosilo %08lX: ne povas legi originalan ţlosilblokon: %s\n"
 
-#: g10/import.c:493
+#: g10/import.c:505
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "ţlosilo %08lX: 1 nova uzantidentigilo\n"
 
-#: g10/import.c:496
+#: g10/import.c:508
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "ţlosilo %08lX: %d novaj uzantidentigiloj\n"
 
-#: g10/import.c:499
+#: g10/import.c:511
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "ţlosilo %08lX: 1 nova subskribo\n"
 
-#: g10/import.c:502
+#: g10/import.c:514
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "ţlosilo %08lX: %d novaj subskriboj\n"
 
-#: g10/import.c:505
+#: g10/import.c:517
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "ţlosilo %08lX: 1 nova subţlosilo\n"
 
-#: g10/import.c:508
+#: g10/import.c:520
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "ţlosilo %08lX: %d novaj subţlosiloj\n"
 
-#: g10/import.c:518
+#: g10/import.c:530
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "ţlosilo %08lX: ne ţanřita\n"
 
-#: g10/import.c:601
+#: g10/import.c:613
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "ţlosilo %08lX: sekreta ţlosilo importita\n"
 
 #. we can't merge secret keys
-#: g10/import.c:605
+#: g10/import.c:617
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "ţlosilo %08lX: jam en sekreta ţlosilaro\n"
 
-#: g10/import.c:610
+#: g10/import.c:622
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "ţlosilo %08lX: sekreta ţlosilo ne trovita: %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:651
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "ţlosilo %08lX: publika ţlosilo mankas - ne povas apliki revokatestilon\n"
 
-#: g10/import.c:670
+#: g10/import.c:682
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "ţlosilo %08lX: nevalida revokatestilo: %s - malakceptita\n"
 
-#: g10/import.c:702
+#: g10/import.c:714
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "ţlosilo %08lX: revokatestilo importita\n"
 
-#: g10/import.c:744
+#: g10/import.c:756
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "ţlosilo %08lX: mankas uzantidentigilo por subskribo\n"
 
-#: g10/import.c:751 g10/import.c:775
+#: g10/import.c:763 g10/import.c:787
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "ţlosilo %08lX: nerealigita publikţlosila metodo\n"
 
-#: g10/import.c:752
+#: g10/import.c:764
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "ţlosilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/import.c:767
+#: g10/import.c:779
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "ţlosilo %08lX: mankas subţlosilo por ţlosilbindado\n"
 
-#: g10/import.c:776
+#: g10/import.c:788
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "ţlosilo %08lX: nevalida subţlosila bindado\n"
 
-#: g10/import.c:803
+#: g10/import.c:815
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "ţlosilo %08lX: akceptis ne-mem-subskribitan uzantidentigilon '"
 
-#: g10/import.c:832
+#: g10/import.c:844
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "ţlosilo %08lX: ignoris uzantidentigilon '"
 
-#: g10/import.c:855
+#: g10/import.c:867
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "ţlosilo %08lX: ignoris subţlosilon\n"
@@ -1914,32 +1929,32 @@
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:880
+#: g10/import.c:892
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "ţlosilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
 
-#: g10/import.c:889
+#: g10/import.c:901
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "ţlosilo %08lX: revokatestilo en malřusta loko - ignorita\n"
 
-#: g10/import.c:897
+#: g10/import.c:909
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "ţlosilo %08lX: nevalida revokatestilo: %s - ignorita\n"
 
-#: g10/import.c:997
+#: g10/import.c:1009
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "ţlosilo %08lX: trovis ripetitan uzantidentigilon - kunfandita\n"
 
-#: g10/import.c:1048
+#: g10/import.c:1060
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "ţlosilo %08lX: revokatestilo aldonita\n"
 
-#: g10/import.c:1162 g10/import.c:1215
+#: g10/import.c:1174 g10/import.c:1227
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "ţlosilo %08lX: nia kopio ne havas mem-subskribon\n"
@@ -2383,31 +2398,30 @@
 #: g10/keyedit.c:1080 g10/keyedit.c:1106
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
-msgstr ""
+msgstr "%s%c %4u%c/%08lX  kreita: %s eksvalidiřos: %s"
 
 #: g10/keyedit.c:1089
 #, c-format
 msgid " trust: %c/%c"
-msgstr ""
+msgstr " fido: %c/%c"
 
 #: g10/keyedit.c:1093
 msgid "This key has been disabled"
 msgstr "Ći tiu ţlosilo estas malţaltita"
 
 #: g10/keyedit.c:1122
-#, fuzzy, c-format
+#, c-format
 msgid "rev! subkey has been revoked: %s\n"
-msgstr "ţlosilo %08lX: subţlosilo estas revokita!\n"
+msgstr "rev! subţlosilo estas revokita: %s\n"
 
 #: g10/keyedit.c:1125
-#, fuzzy
 msgid "rev- faked revocation found\n"
-msgstr "         novaj ţlosilrevokoj: %lu\n"
+msgstr "rev- falsita revoko trovita\n"
 
 #: g10/keyedit.c:1127
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
-msgstr ""
+msgstr "rev? problemo en kontrolo de revoko: %s\n"
 
 #: g10/keyedit.c:1365
 msgid "Delete this good signature? (y/N/q)"
@@ -2517,8 +2531,18 @@
 msgid "no secret key\n"
 msgstr "mankas sekreta ţlosilo\n"
 
+#: g10/keylist.c:158
+#, fuzzy
+msgid "invalid"
+msgstr "nevalida kiraso"
+
+#: g10/keylist.c:178
+#, fuzzy
+msgid "revoked"
+msgstr "rev"
+
 #. of subkey
-#: g10/keylist.c:318 g10/mainproc.c:742
+#: g10/keylist.c:400 g10/mainproc.c:760
 #, c-format
 msgid " [expires: %s]"
 msgstr " [eksvalidiřos: %s]"
@@ -2528,129 +2552,117 @@
 msgid "public key is %08lX\n"
 msgstr "publika ţlosilo estas %08lX\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:257
 msgid "public key encrypted data: good DEK\n"
 msgstr "publikţlosile ćifritaj datenoj: bona DEK\n"
 
-#: g10/mainproc.c:281
+#: g10/mainproc.c:299
 #, 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:291
+#: g10/mainproc.c:309
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "ćifrita per %s-ţlosilo, %08lX\n"
 
-#: g10/mainproc.c:297
+#: g10/mainproc.c:315
 msgid "no secret key for decryption available\n"
 msgstr "mankas sekreta ţlosilo por malćifrado\n"
 
-#: g10/mainproc.c:306
+#: g10/mainproc.c:324
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "publikţlosila malćifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:343
+#: g10/mainproc.c:361
 msgid "decryption okay\n"
 msgstr "malćifrado sukcesis\n"
 
-#: g10/mainproc.c:348
+#: g10/mainproc.c:366
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTO: ćifrita mesařo estis manipulita!\n"
 
-#: g10/mainproc.c:353
+#: g10/mainproc.c:371
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "malćifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:372
+#: g10/mainproc.c:390
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTO: sendinto petis konfidencon (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:374
+#: g10/mainproc.c:392
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "originala dosiernomo='%.*s'\n"
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:544
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "memstara revoko - uzu \"gpg --import\" por apliki řin\n"
 
-#: g10/mainproc.c:613 g10/mainproc.c:622
+#: g10/mainproc.c:631 g10/mainproc.c:640
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVERTO: nevalida notacia dateno trovita\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:643
 msgid "Notation: "
 msgstr "Notacio: "
 
-#: g10/mainproc.c:632
+#: g10/mainproc.c:650
 msgid "Policy: "
 msgstr "Gvidlinio: "
 
-#: g10/mainproc.c:1062
+#: g10/mainproc.c:1080
 msgid "signature verification suppressed\n"
 msgstr "kontrolo de subskribo estas malţaltita\n"
 
-#: g10/mainproc.c:1068
+#: g10/mainproc.c:1086
 #, 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:1094 g10/mainproc.c:1105
+#: g10/mainproc.c:1112 g10/mainproc.c:1123
 msgid "BAD signature from \""
 msgstr "MALBONA subskribo de \""
 
-#: g10/mainproc.c:1095 g10/mainproc.c:1106
+#: g10/mainproc.c:1113 g10/mainproc.c:1124
 msgid "Good signature from \""
 msgstr "Bona subskribo de \""
 
-#: g10/mainproc.c:1097
+#: g10/mainproc.c:1115
 msgid "                aka \""
 msgstr "            alinome \""
 
-#: g10/mainproc.c:1153
+#: g10/mainproc.c:1171
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Ne povas kontroli subskribon: %s\n"
 
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1235
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "memstara subskribo de klaso 0x%02x\n"
 
-#: g10/mainproc.c:1263
+#: g10/mainproc.c:1281
 msgid "old style (PGP 2.x) signature\n"
 msgstr "malnovstila subskribo (PGP 2.x)\n"
 
-#: g10/mainproc.c:1268
+#: g10/mainproc.c:1286
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nevalida radikpaketo trovita en proc_tree()\n"
 
-#: g10/misc.c:94
+#: g10/misc.c:96
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "ne povas malţalti kreadon de core-dosieroj: %s\n"
 
-#: g10/misc.c:97
-msgid "WARNING: program may create a core file!\n"
-msgstr "AVERTO: programo povas krei core-dosieron!\n"
-
-#: g10/misc.c:205
+#: g10/misc.c:206
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Eksperimentaj metodoj ne estu uzataj!\n"
 
-#: g10/misc.c:219
-msgid ""
-"RSA keys are deprecated; please consider creating a new key and use this key "
-"in the future\n"
-msgstr ""
-"RSA-ţlosiloj estas malrekomendataj; bonvolu pripensi krei novan ţlosilon kaj "
-"uzi tiun en la estonteco\n"
-
-#: g10/misc.c:241
+#: g10/misc.c:233
 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"
 
@@ -2659,7 +2671,7 @@
 msgid "can't handle public key algorithm %d\n"
 msgstr "ne povas trakti publikţlosilan metodon %d\n"
 
-#: g10/parse-packet.c:965
+#: g10/parse-packet.c:986
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaketo de speco %d havas ţaltitan \"critical bit\"\n"
@@ -2696,90 +2708,90 @@
 msgid "Repeat passphrase: "
 msgstr "Ripetu pasfrazon: "
 
-#: g10/plaintext.c:63
+#: g10/plaintext.c:67
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "datenoj ne savitaj; uzu la opcion \"--output\" por savi ilin\n"
 
-#: g10/plaintext.c:317
+#: g10/plaintext.c:324
 msgid "Detached signature.\n"
 msgstr "Aparta subskribo.\n"
 
-#: g10/plaintext.c:321
+#: g10/plaintext.c:328
 msgid "Please enter name of data file: "
 msgstr "Bonvolu doni la nomon de la dosiero: "
 
-#: g10/plaintext.c:342
+#: g10/plaintext.c:349
 msgid "reading stdin ...\n"
 msgstr "legas la normalan enigon ...\n"
 
-#: g10/plaintext.c:385
+#: g10/plaintext.c:392
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "ne povas malfermi subskribitan dosieron '%s'\n"
 
-#: g10/pubkey-enc.c:79
+#: g10/pubkey-enc.c:76
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "nenomita ricevonto; provas per sekreta ţlosilo %08lX ...\n"
 
-#: g10/pubkey-enc.c:85
+#: g10/pubkey-enc.c:82
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "bone; ni estas la nenomita ricevonto.\n"
 
-#: g10/pubkey-enc.c:137
+#: g10/pubkey-enc.c:134
 msgid "old encoding of the DEK is not supported\n"
 msgstr "malnova kodado de DEK ne estas realigita\n"
 
-#: g10/pubkey-enc.c:156
+#: g10/pubkey-enc.c:153
 #, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "ćifrad-metodo %d estas nekonata aý malţaltita\n"
 
-#: g10/pubkey-enc.c:195
+#: g10/pubkey-enc.c:192
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "NOTO: ćifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/pubkey-enc.c:201
+#: g10/pubkey-enc.c:198
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTO: sekreta ţlosilo %08lX eksvalidiřis je %s\n"
 
-#: g10/hkp.c:62
+#: g10/hkp.c:72
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
 msgstr "petas la ţlosilon %08lX de %s ...\n"
 
-#: g10/hkp.c:75
+#: g10/hkp.c:85
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "ne povas akiri ţlosilon de ţlosilservilo: %s\n"
 
-#: g10/hkp.c:98 g10/hkp.c:136
+#: g10/hkp.c:109 g10/hkp.c:148
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "neniu ţlosilservilo konata (uzu la opcion --keyserver)\n"
 
-#: g10/hkp.c:106
+#: g10/hkp.c:117
 #, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "%s: ne valida ţlosilidentigilo\n"
 
-#: g10/hkp.c:158
+#: g10/hkp.c:170
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "ne povas konektiři al '%s': %s\n"
 
-#: g10/hkp.c:182
+#: g10/hkp.c:194
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: g10/hkp.c:194
+#: g10/hkp.c:206
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "sukceso dum sendo al '%s' (statuso=%u)\n"
 
-#: g10/hkp.c:197
+#: g10/hkp.c:209
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "malsukceso dum sendo al '%s': statuso=%u\n"
@@ -2793,42 +2805,42 @@
 msgid "protection algorithm %d is not supported\n"
 msgstr "protekto-metodo %d ne estas realigita\n"
 
-#: g10/seckey-cert.c:175
+#: g10/seckey-cert.c:184
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Nevalida pasfrazo; bonvolu provi denove ...\n"
 
-#: g10/seckey-cert.c:231
+#: g10/seckey-cert.c:240
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVERTO: Malforta ţlosilo trovita - bonvolu ţanři la pasfrazon denove.\n"
 
-#: g10/sig-check.c:202
+#: g10/sig-check.c:199
 msgid "assuming bad MDC due to an unknown critical bit\n"
 msgstr "supozas malbonan sigelon (MDC) pro nekonata \"critical bit\"\n"
 
-#: g10/sig-check.c:300
+#: g10/sig-check.c:297
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "ći tio estas PGP-kreita ElGamal-ţlosilo, kiu NE estas sekura por "
 "subskribado!\n"
 
-#: g10/sig-check.c:308
+#: g10/sig-check.c:305
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "la publika ţlosilo estas %lu sekundon pli nova ol la subskribo\n"
 
-#: g10/sig-check.c:309
+#: g10/sig-check.c:306
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "la publika ţlosilo estas %lu sekundojn pli nova ol la subskribo\n"
 
-#: g10/sig-check.c:327
+#: g10/sig-check.c:324
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "NOTO: subskribo-ţlosilo eksvalidiřis je %s\n"
 
-#: g10/sig-check.c:396
+#: g10/sig-check.c:393
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "supozas malbonan subskribon pro nekonata \"critical bit\"\n"
 
@@ -2837,7 +2849,7 @@
 msgid "%s signature from: %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:606
+#: g10/sign.c:290 g10/sign.c:610
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "ne povas krei %s: %s\n"
@@ -2885,7 +2897,7 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: dosierujo ne ekzistas!\n"
 
-#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1363 g10/tdbio.c:444
+#: g10/openfile.c:226 g10/openfile.c:295 g10/ringedit.c:1369 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: ne povas krei: %s\n"
@@ -2985,286 +2997,296 @@
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "la fido-datenaro estas fuţita; bonvolu ruli \"gpg --fix-trustdb\".\n"
 
-#: g10/trustdb.c:168
+#: g10/trustdb.c:169
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "fido-datenaro loko %lu, petospeco %d: lego malsukcesis: %s\n"
 
-#: g10/trustdb.c:183
+#: g10/trustdb.c:184
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n"
 
-#: g10/trustdb.c:197
+#: g10/trustdb.c:198
 #, c-format
 msgid "trust record %lu: delete failed: %s\n"
 msgstr "fido-registro %lu: forviţo malsukcesis: %s\n"
 
-#: g10/trustdb.c:211
+#: g10/trustdb.c:212
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "fido-datenaro: sync malsukcesis: %s\n"
 
-#: g10/trustdb.c:376
+#: g10/trustdb.c:377
 #, c-format
 msgid "error reading dir record for LID %lu: %s\n"
 msgstr "eraro dum legado de dosieruja registro por LID %lu: %s\n"
 
-#: g10/trustdb.c:383
+#: g10/trustdb.c:384
 #, c-format
 msgid "lid %lu: expected dir record, got type %d\n"
 msgstr "lid %lu: atendis dosierujan registron, trovis specon %d\n"
 
-#: g10/trustdb.c:388
+#: g10/trustdb.c:389
 #, c-format
 msgid "no primary key for LID %lu\n"
 msgstr "mankas ćefa ţlosilo por LID %lu\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:394
 #, c-format
 msgid "error reading primary key for LID %lu: %s\n"
 msgstr "eraro dum legado de ćefa ţlosilo por LID %lu: %s\n"
 
-#: g10/trustdb.c:432
+#: g10/trustdb.c:433
 #, c-format
 msgid "get_dir_record: search_record failed: %s\n"
 msgstr "get_dir_record: search_record malsukcesis: %s\n"
 
-#: g10/trustdb.c:487
-#, c-format
-msgid "NOTE: secret key %08lX is NOT protected.\n"
-msgstr "NOTO: sekreta ţlosilo %08lX NE estas protektita.\n"
-
-#: g10/trustdb.c:495
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr "ţlosilo %08lX: sekreta ţlosilo sen publika ţlosilo - ignorita\n"
-
-#: g10/trustdb.c:502
-#, c-format
-msgid "key %08lX: secret and public key don't match\n"
-msgstr "ţlosilo %08lX: sekreta kaj publika ţlosiloj ne kongruas\n"
+#: g10/trustdb.c:474
+#, fuzzy, c-format
+msgid "'%s' is not a valid long keyID\n"
+msgstr "%s: ne valida ţlosilidentigilo\n"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:501
 #, c-format
 msgid "key %08lX: can't put it into the trustdb\n"
 msgstr "ţlosilo %08lX: ne povas meti řin en la fido-datenaron\n"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:507
 #, c-format
 msgid "key %08lX: query record failed\n"
 msgstr "ţlosilo %08lX: peto-registro malsukcesis\n"
 
-#: g10/trustdb.c:529
+#: g10/trustdb.c:516
 #, c-format
 msgid "key %08lX: already in trusted key table\n"
 msgstr "ţlosilo %08lX: jam en tabelo de fidataj ţlosiloj\n"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:519
 #, c-format
 msgid "key %08lX: accepted as trusted key.\n"
 msgstr "ţlosilo %08lX: akceptita kiel fidata ţlosilo.\n"
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:546
+#, fuzzy, c-format
+msgid "key %08lX: no public key for trusted key - skipped\n"
+msgstr "ţlosilo %08lX: ne protektita - ignorita\n"
+
+#: g10/trustdb.c:565
+#, c-format
+msgid "NOTE: secret key %08lX is NOT protected.\n"
+msgstr "NOTO: sekreta ţlosilo %08lX NE estas protektita.\n"
+
+#: g10/trustdb.c:577
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr "ţlosilo %08lX: sekreta ţlosilo sen publika ţlosilo - ignorita\n"
+
+#: g10/trustdb.c:584
+#, c-format
+msgid "key %08lX: secret and public key don't match\n"
+msgstr "ţlosilo %08lX: sekreta kaj publika ţlosiloj ne kongruas\n"
+
+#: g10/trustdb.c:597
 #, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr "listigo de sekretaj ţlosiloj malsukcesis: %s\n"
 
-#: g10/trustdb.c:921
+#: g10/trustdb.c:987
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "ţlosilo %08lX.%lu: Bona subţlosila bindado\n"
 
-#: g10/trustdb.c:927 g10/trustdb.c:962
+#: g10/trustdb.c:993 g10/trustdb.c:1028
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "ţlosilo %08lX.%lu: Nevalida subţlosila bindado: %s\n"
 
-#: g10/trustdb.c:939
+#: g10/trustdb.c:1005
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "ţlosilo %08lX.%lu: Valida ţlosilrevoko\n"
 
-#: g10/trustdb.c:945
+#: g10/trustdb.c:1011
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "ţlosilo %08lX.%lu: Nevalida ţlosilrevoko: %s\n"
 
-#: g10/trustdb.c:956
+#: g10/trustdb.c:1022
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "ţlosilo %08lX.%lu: Valida subţlosilrevoko\n"
 
-#: g10/trustdb.c:1067
+#: g10/trustdb.c:1133
 msgid "Good self-signature"
 msgstr "Bona mem-subskribo"
 
-#: g10/trustdb.c:1077
+#: g10/trustdb.c:1143
 msgid "Invalid self-signature"
 msgstr "Nevalida mem-subskribo"
 
-#: g10/trustdb.c:1104
+#: g10/trustdb.c:1170
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr "Valida uzantidentigil-revoko ignorita pro pli nova mem-subskribo"
 
-#: g10/trustdb.c:1110
+#: g10/trustdb.c:1176
 msgid "Valid user ID revocation"
 msgstr "Valida uzantidentigil-revoko"
 
-#: g10/trustdb.c:1115
+#: g10/trustdb.c:1181
 msgid "Invalid user ID revocation"
 msgstr "Nevalida uzantidentigil-revoko"
 
-#: g10/trustdb.c:1157
+#: g10/trustdb.c:1223
 msgid "Valid certificate revocation"
 msgstr "Valida atestilrevoko"
 
-#: g10/trustdb.c:1158
+#: g10/trustdb.c:1224
 msgid "Good certificate"
 msgstr "Bona atestilo"
 
-#: g10/trustdb.c:1186
+#: g10/trustdb.c:1252
 msgid "Invalid certificate revocation"
 msgstr "Nevalida atestilrevoko"
 
-#: g10/trustdb.c:1187
+#: g10/trustdb.c:1253
 msgid "Invalid certificate"
 msgstr "Nevalida atestilo"
 
-#: g10/trustdb.c:1204 g10/trustdb.c:1208
+#: g10/trustdb.c:1270 g10/trustdb.c:1274
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "subskribo-registro %lu[%d] montras al malřusta registro.\n"
 
-#: g10/trustdb.c:1267
+#: g10/trustdb.c:1333
 msgid "duplicated certificate - deleted"
 msgstr "ripetita atestilo - forviţita"
 
-#: g10/trustdb.c:1584
+#: g10/trustdb.c:1650
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir malsukcesis: %s\n"
 
-#: g10/trustdb.c:1718
+#: g10/trustdb.c:1784
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: enţovo malsukcesis: %s\n"
 
-#: g10/trustdb.c:1723
+#: g10/trustdb.c:1789
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: enţovo malsukcesis: %s\n"
 
-#: g10/trustdb.c:1729
+#: g10/trustdb.c:1795
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: enţovita\n"
 
-#: g10/trustdb.c:1734
+#: g10/trustdb.c:1800
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "eraro dum legado de dosieruja registro: %s\n"
 
-#: g10/trustdb.c:1742 g10/trustdb.c:1805
+#: g10/trustdb.c:1808 g10/trustdb.c:1871
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu ţlosiloj traktitaj\n"
 
-#: g10/trustdb.c:1744 g10/trustdb.c:1811
+#: g10/trustdb.c:1810 g10/trustdb.c:1877
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu ţlosiloj kun eraroj\n"
 
-#: g10/trustdb.c:1746
+#: g10/trustdb.c:1812
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu ţlosiloj enţovitaj\n"
 
-#: g10/trustdb.c:1749
+#: g10/trustdb.c:1815
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "listigo de ţlosilblokoj malsukcesis: %s\n"
 
-#: g10/trustdb.c:1797
+#: g10/trustdb.c:1863
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: dosieruja registro sen ţlosilo - ignorita\n"
 
-#: g10/trustdb.c:1807
+#: g10/trustdb.c:1873
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "\t%lu pro novaj publikaj ţlosiloj\n"
 
-#: g10/trustdb.c:1809
+#: g10/trustdb.c:1875
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu ţlosiloj ignoritaj\n"
 
-#: g10/trustdb.c:1813
+#: g10/trustdb.c:1879
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu ţlosiloj aktualigitaj\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2224
 msgid "Ooops, no keys\n"
 msgstr "Hu, mankas ţlosiloj\n"
 
-#: g10/trustdb.c:2162
+#: g10/trustdb.c:2228
 msgid "Ooops, no user IDs\n"
 msgstr "Hu, mankas uzantidentigiloj\n"
 
-#: g10/trustdb.c:2320
+#: g10/trustdb.c:2386
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: serćo pri dosieruja registro malsukcesis: %s\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2395
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "ţlosilo %08lX: enţovo de fidoregistro malsukcesis: %s\n"
 
-#: g10/trustdb.c:2333
+#: g10/trustdb.c:2399
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "ţlosilo %08lX.%lu: enţovis en fido-datenaron\n"
 
-#: g10/trustdb.c:2341
+#: g10/trustdb.c:2407
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "ţlosilo %08lX.%lu: kreita en la estonteco (tempotordo aý horlořeraro)\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2422
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "ţlosilo %08lX.%lu: eksvalidiřis je %s\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2430
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "ţlosilo %08lX.%lu: fido-kontrolo malsukcesis: %s\n"
 
-#: g10/trustdb.c:2515
+#: g10/trustdb.c:2581
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "uzanto '%s' ne trovita: %s\n"
 
-#: g10/trustdb.c:2517
+#: g10/trustdb.c:2583
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problemo dum trovo de '%s' en fido-datenaro: %s\n"
 
-#: g10/trustdb.c:2520
+#: g10/trustdb.c:2586
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "uzanto '%s' ne estas en fido-datenaro - enţovas\n"
 
-#: g10/trustdb.c:2523
+#: g10/trustdb.c:2589
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "malsukcesis meti '%s' en fido-datenaron: %s\n"
 
-#: g10/trustdb.c:2709 g10/trustdb.c:2739
+#: g10/trustdb.c:2775 g10/trustdb.c:2805
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "AVERTO: ne povas trakti longajn preferoregistrojn\n"
 
@@ -3288,26 +3310,26 @@
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: ne povas krei ţlosilaron: %s\n"
 
-#: g10/ringedit.c:319 g10/ringedit.c:1368
+#: g10/ringedit.c:319 g10/ringedit.c:1374
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: ţlosilaro kreita\n"
 
-#: g10/ringedit.c:1545
+#: g10/ringedit.c:1551
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVERTO: ekzistas 2 dosieroj kun sekretaj informoj.\n"
 
-#: g10/ringedit.c:1546
+#: g10/ringedit.c:1552
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s estas la neţanřita\n"
 
-#: g10/ringedit.c:1547
+#: g10/ringedit.c:1553
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s estas la nova\n"
 
-#: g10/ringedit.c:1548
+#: g10/ringedit.c:1554
 msgid "Please fix this possible security flaw\n"
 msgstr "Bonvolu ripari ći tiun eblan sekurecproblemon\n"
 
@@ -3332,49 +3354,49 @@
 "por subskribado!\n"
 
 #. do not overwrite
-#: g10/openfile.c:79
+#: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Dosiero '%s' ekzistas. "
 
-#: g10/openfile.c:81
+#: g10/openfile.c:86
 msgid "Overwrite (y/N)? "
 msgstr "Ću surskribi (j/N)? "
 
-#: g10/openfile.c:109
+#: g10/openfile.c:119
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: nekonata sufikso\n"
 
-#: g10/openfile.c:131
+#: g10/openfile.c:141
 msgid "Enter new filename"
 msgstr "Donu novan dosiernomon"
 
-#: g10/openfile.c:172
+#: g10/openfile.c:182
 msgid "writing to stdout\n"
 msgstr "skribas al la normala eligo\n"
 
-#: g10/openfile.c:250
+#: g10/openfile.c:261
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "supozas subskribitajn datenojn en '%s'\n"
 
-#: g10/openfile.c:300
+#: g10/openfile.c:311
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: g10/openfile.c:313
+#: g10/openfile.c:338
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: g10/openfile.c:316
+#: g10/openfile.c:341
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: dosierujo kreita\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:343
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr ""
 "vi devas restartigi GnuPG, por ke ři povu legi la novan opcio-dosieron\n"
@@ -3638,7 +3660,6 @@
 "dosiero (montrita en parentezo) estos uzata."
 
 #: g10/helptext.c:229
-#, fuzzy
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -3684,3 +3705,10 @@
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Nenia helpo disponata por '%s'"
+
+#~ msgid ""
+#~ "RSA keys are deprecated; please consider creating a new key and use this key "
+#~ "in the future\n"
+#~ msgstr ""
+#~ "RSA-ţlosiloj estas malrekomendataj; bonvolu pripensi krei novan ţlosilon kaj "
+#~ "uzi tiun en la estonteco\n"
diff -urN gnupg-1.0.2/po/es_ES.po gnupg-1.0.3/po/es_ES.po
--- gnupg-1.0.2/po/es_ES.po	Wed Jul 12 14:59:41 2000
+++ gnupg-1.0.3/po/es_ES.po	Mon Sep 18 12:18:03 2000
@@ -7,7 +7,7 @@
 # GPG version: 1.0.0
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-07-12 12:13+0200\n"
+"POT-Creation-Date: 2000-09-18 12:17+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"
@@ -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:127 g10/keygen.c:1249
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1255
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no puede abrirse `%s': %s\n"
@@ -317,12 +317,12 @@
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:647
+#: cipher/random.c:650
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "ATENCIÓN: ˇse está usando un generador de números aleatorios inseguro!\n"
 
-#: cipher/random.c:648
+#: cipher/random.c:651
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -336,7 +336,7 @@
 "ˇNO USE NINGÚN DATO GENERADO POR ESTE PROGRAMA!\n"
 "\n"
 
-#: cipher/rndlinux.c:141
+#: cipher/rndlinux.c:142
 #, c-format
 msgid ""
 "\n"
@@ -348,7 +348,7 @@
 "otro trabajo para que el sistema pueda recolectar más entropía\n"
 "(se necesitan %d bytes más).\n"
 
-#: g10/g10.c:197
+#: g10/g10.c:206
 msgid ""
 "@Commands:\n"
 " "
@@ -356,140 +356,140 @@
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:199
+#: g10/g10.c:208
 msgid "|[file]|make a signature"
 msgstr "|[file]|hace una firma"
 
-#: g10/g10.c:200
+#: g10/g10.c:209
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|hace una firma en texto claro"
 
-#: g10/g10.c:201
+#: g10/g10.c:210
 msgid "make a detached signature"
 msgstr "hace una firma separada"
 
-#: g10/g10.c:202
+#: g10/g10.c:211
 msgid "encrypt data"
 msgstr "cifra datos"
 
-#: g10/g10.c:203
+#: g10/g10.c:212
 msgid "encryption only with symmetric cipher"
 msgstr "cifra sólo con un cifrado simétrico"
 
-#: g10/g10.c:204
+#: g10/g10.c:213
 msgid "store only"
 msgstr "sólo almacenar"
 
-#: g10/g10.c:205
+#: g10/g10.c:214
 msgid "decrypt data (default)"
 msgstr "descifra datos (predefinido)"
 
-#: g10/g10.c:206
+#: g10/g10.c:215
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:208
+#: g10/g10.c:217
 msgid "list keys"
 msgstr "lista claves"
 
-#: g10/g10.c:210
+#: g10/g10.c:219
 msgid "list keys and signatures"
 msgstr "lista claves y firmas"
 
-#: g10/g10.c:211
+#: g10/g10.c:220
 msgid "check key signatures"
 msgstr "comprueba las firmas de las claves"
 
-#: g10/g10.c:212
+#: g10/g10.c:221
 msgid "list keys and fingerprints"
 msgstr "lista claves y huellas dactilares"
 
-#: g10/g10.c:213
+#: g10/g10.c:222
 msgid "list secret keys"
 msgstr "lista claves secretas"
 
-#: g10/g10.c:214
+#: g10/g10.c:223
 msgid "generate a new key pair"
 msgstr "genera un nuevo par de claves"
 
-#: g10/g10.c:215
+#: g10/g10.c:224
 msgid "remove key from the public keyring"
 msgstr "elimina la clave del anillo público"
 
-#: g10/g10.c:217
+#: g10/g10.c:226
 #, fuzzy
 msgid "remove key from the secret keyring"
 msgstr "elimina la clave del anillo público"
 
-#: g10/g10.c:218
+#: g10/g10.c:227
 msgid "sign a key"
 msgstr "firma la clave"
 
-#: g10/g10.c:219
+#: g10/g10.c:228
 msgid "sign a key locally"
 msgstr "firma la clave localmente"
 
-#: g10/g10.c:220
+#: g10/g10.c:229
 msgid "sign or edit a key"
 msgstr "firma o modifica una clave"
 
-#: g10/g10.c:221
+#: g10/g10.c:230
 msgid "generate a revocation certificate"
 msgstr "genera un certificado de revocación"
 
-#: g10/g10.c:222
+#: g10/g10.c:231
 msgid "export keys"
 msgstr "exporta claves"
 
-#: g10/g10.c:223
+#: g10/g10.c:232
 msgid "export keys to a key server"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/g10.c:224
+#: g10/g10.c:233
 msgid "import keys from a key server"
 msgstr "importa claves desde un servidor de claves"
 
-#: g10/g10.c:228
+#: g10/g10.c:237
 msgid "import/merge keys"
 msgstr "importa/fusiona claves"
 
-#: g10/g10.c:230
+#: g10/g10.c:239
 msgid "list only the sequence of packets"
 msgstr "lista sólo la secuencia de paquetes"
 
-#: g10/g10.c:232
+#: g10/g10.c:241
 msgid "export the ownertrust values"
 msgstr "exporta los valores de confianza"
 
-#: g10/g10.c:234
+#: g10/g10.c:243
 msgid "import ownertrust values"
 msgstr "importa los valores de confianza"
 
-#: g10/g10.c:236
+#: g10/g10.c:245
 msgid "update the trust database"
 msgstr "actualiza la base de datos de confianza"
 
-#: g10/g10.c:238
+#: g10/g10.c:247
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMBRES]|comprueba la base de datos de confianza"
 
-#: g10/g10.c:239
+#: g10/g10.c:248
 msgid "fix a corrupted trust database"
 msgstr "arregla una base de datos de confianza dańada"
 
-#: g10/g10.c:240
+#: g10/g10.c:249
 msgid "De-Armor a file or stdin"
 msgstr "quita la armadura de un fichero o stdin"
 
-#: g10/g10.c:242
+#: g10/g10.c:251
 msgid "En-Armor a file or stdin"
 msgstr "crea la armadura a un fichero o stdin"
 
-#: g10/g10.c:244
+#: g10/g10.c:253
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheros]|imprime resúmenes de mensaje"
 
-#: g10/g10.c:248
+#: g10/g10.c:257
 msgid ""
 "@\n"
 "Options:\n"
@@ -499,160 +499,164 @@
 "Opciones:\n"
 " "
 
-#: g10/g10.c:250
+#: g10/g10.c:259
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
-#: g10/g10.c:252
+#: g10/g10.c:261
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMBRE|cifra para NOMBRE"
 
-#: g10/g10.c:255
+#: g10/g10.c:264
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOMBRE|usa NOMBRE como destinatario por defecto"
 
-#: g10/g10.c:257
+#: g10/g10.c:266
 msgid "use the default key as default recipient"
 msgstr "usa la clave por defecto como destinatario"
 
-#: g10/g10.c:261
+#: g10/g10.c:270
 msgid "use this user-id to sign or decrypt"
 msgstr "usa este usuario para firmar o descifrar"
 
-#: g10/g10.c:262
+#: g10/g10.c:271
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivel de compresión N (0 no comprime)"
 
-#: g10/g10.c:264
+#: g10/g10.c:273
 msgid "use canonical text mode"
 msgstr "usa modo de texto canónico"
 
-#: g10/g10.c:265
+#: g10/g10.c:274
 msgid "use as output file"
 msgstr "usa como fichero de salida"
 
-#: g10/g10.c:266
+#: g10/g10.c:275
 msgid "verbose"
 msgstr "prolijo"
 
-#: g10/g10.c:267
+#: g10/g10.c:276
 msgid "be somewhat more quiet"
 msgstr "algo más discreto"
 
-#: g10/g10.c:268
+#: g10/g10.c:277
 msgid "don't use the terminal at all"
 msgstr "no usa la terminal en absoluto"
 
-#: g10/g10.c:269
+#: g10/g10.c:278
 msgid "force v3 signatures"
 msgstr "fuerza firmas v3"
 
-#: g10/g10.c:270
+#: g10/g10.c:279
 msgid "always use a MDC for encryption"
 msgstr "siempre usa un MCD para cifrar"
 
-#: g10/g10.c:271
+#: g10/g10.c:280
 msgid "do not make any changes"
 msgstr "no hace ningún cambio"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:273
+#: g10/g10.c:282
 msgid "batch mode: never ask"
 msgstr "proceso por lotes: nunca preguntar"
 
-#: g10/g10.c:274
+#: g10/g10.c:283
 msgid "assume yes on most questions"
 msgstr "asume \"sí\" en casi todas las preguntas"
 
-#: g10/g10.c:275
+#: g10/g10.c:284
 msgid "assume no on most questions"
 msgstr "asume \"no\" en casi todas las preguntas"
 
-#: g10/g10.c:276
+#: g10/g10.c:285
 msgid "add this keyring to the list of keyrings"
 msgstr "ańade este anillo a la lista de anillos"
 
-#: g10/g10.c:277
+#: g10/g10.c:286
 msgid "add this secret keyring to the list"
 msgstr "ańade este anillo secreto a la lista"
 
-#: g10/g10.c:278
+#: g10/g10.c:287
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
 
-#: g10/g10.c:279
+#: g10/g10.c:288
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVIDOR|usa este servidor de claves"
 
-#: g10/g10.c:280
+#: g10/g10.c:289
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOMBRE|usa el juego de caracteres NOMBRE"
 
-#: g10/g10.c:281
+#: g10/g10.c:290
 msgid "read options from file"
 msgstr "lee opciones del fichero"
 
-#: g10/g10.c:285
+#: g10/g10.c:294
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribe información de estado en descriptor DF"
 
-#: g10/g10.c:290
+#: g10/g10.c:299
+msgid "|KEYID|ulimately trust this key"
+msgstr "|ID-CLAVE|confía plenamente en esta clave"
+
+#: g10/g10.c:300
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHERO|carga módulo de extensiones FICHERO"
 
-#: g10/g10.c:291
+#: g10/g10.c:301
 msgid "emulate the mode described in RFC1991"
 msgstr "emula el modo descrito en la RFC1991"
 
-#: g10/g10.c:292
+#: g10/g10.c:302
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "todas las opciones de paquete, cifrado y\n"
 "resumen tipo OpenPGP"
 
-#: g10/g10.c:293
+#: g10/g10.c:303
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa modo de contraseńa N"
 
-#: g10/g10.c:295
+#: g10/g10.c:305
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE\n"
 "para las contraseńas"
 
-#: g10/g10.c:297
+#: g10/g10.c:307
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOMBRE|usa el algoritmo de cifrado NOMBRE para las\n"
 "contraseńas"
 
-#: g10/g10.c:298
+#: g10/g10.c:308
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE"
 
-#: g10/g10.c:299
+#: g10/g10.c:309
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE"
 
-#: g10/g10.c:300
+#: g10/g10.c:310
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa el algoritmo de compresión N"
 
-#: g10/g10.c:301
+#: g10/g10.c:311
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina campo keyid de los paquetes cifrados"
 
-#: g10/g10.c:302
+#: g10/g10.c:312
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOMBRE=VALOR|usa estos datos de notación"
 
-#: g10/g10.c:305
+#: g10/g10.c:315
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:308
+#: g10/g10.c:318
 msgid ""
 "@\n"
 "Examples:\n"
@@ -672,15 +676,15 @@
 " --list-keys [nombres]      muestra las claves\n"
 " --fingerprint [nombres]    muestra las huellas dactilares\n"
 
-#: g10/g10.c:403
+#: g10/g10.c:418
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Por favor, informe de posibles \"bugs\" a <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:407
+#: g10/g10.c:422
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/g10.c:410
+#: g10/g10.c:425
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -690,7 +694,7 @@
 "Firma, comprueba, cifra o descifra.\n"
 "La operación por defecto depende del tipo de datos de entrada.\n"
 
-#: g10/g10.c:417
+#: g10/g10.c:432
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -698,182 +702,186 @@
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/g10.c:496
+#: g10/g10.c:511
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/g10.c:549
+#: g10/g10.c:564
 msgid "conflicting commands\n"
 msgstr "comandos incompatibles\n"
 
-#: g10/g10.c:692
+#: g10/g10.c:704
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
 
-#: g10/g10.c:696
+#: g10/g10.c:708
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: g10/g10.c:703
+#: g10/g10.c:715
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: g10/g10.c:893
+#: g10/g10.c:905
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s no es un juego de caracteres válido\n"
 
-#: g10/g10.c:949 g10/g10.c:958
+#: g10/g10.c:970
+msgid "WARNING: program may create a core file!\n"
+msgstr "ATENCIÓN: ˇel programa podría crear un fichero core dump!\n"
+
+#: g10/g10.c:974 g10/g10.c:983
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: ˇ%s no es para uso normal!\n"
 
-#: g10/g10.c:951
+#: g10/g10.c:976
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "ˇ%s no permitido con %s!\n"
 
-#: g10/g10.c:954
+#: g10/g10.c:979
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "ˇ%s no tiene sentido con %s!\n"
 
-#: g10/g10.c:973 g10/g10.c:985
+#: g10/g10.c:998 g10/g10.c:1010
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado no es válido\n"
 
-#: g10/g10.c:979 g10/g10.c:991
+#: g10/g10.c:1004 g10/g10.c:1016
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no es válido\n"
 
-#: g10/g10.c:995
+#: g10/g10.c:1020
 msgid "the given policy URL is invalid\n"
 msgstr "URL de política no válida\n"
 
-#: g10/g10.c:998
+#: g10/g10.c:1023
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "el algoritmo de compresión debe estar en el rango %d-%d\n"
 
-#: g10/g10.c:1000
+#: g10/g10.c:1025
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/g10.c:1002
+#: g10/g10.c:1027
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/g10.c:1004
+#: g10/g10.c:1029
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth debe estar en el rango 1-255\n"
 
-#: g10/g10.c:1007
+#: g10/g10.c:1032
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n"
 
-#: g10/g10.c:1011
+#: g10/g10.c:1036
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n"
 
-#: g10/g10.c:1096
+#: g10/g10.c:1121
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicialización de la base de datos de confianza fallida: %s\n"
 
-#: g10/g10.c:1102
+#: g10/g10.c:1127
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/g10.c:1109
+#: g10/g10.c:1134
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/g10.c:1117
+#: g10/g10.c:1142
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/g10.c:1130
+#: g10/g10.c:1155
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/g10.c:1143
+#: g10/g10.c:1168
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/g10.c:1157
+#: g10/g10.c:1182
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/g10.c:1174
+#: g10/g10.c:1199
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1207
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/g10.c:1190
+#: g10/g10.c:1215
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/g10.c:1198
+#: g10/g10.c:1223
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuario [comandos]"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1239
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-usuario"
 
-#: g10/g10.c:1217
+#: g10/g10.c:1242
 msgid "--delete-key user-id"
 msgstr "--delete-key id-usuario"
 
-#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393
+#: g10/encode.c:265 g10/g10.c:1279 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
-#: g10/g10.c:1269
+#: g10/g10.c:1294
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usuario] [anillo]"
 
-#: g10/g10.c:1335
+#: g10/g10.c:1360
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminación de armadura fallida: %s\n"
 
-#: g10/g10.c:1343
+#: g10/g10.c:1368
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creación de armadura fallida: %s\n"
 
-#: g10/g10.c:1411
+#: g10/g10.c:1439
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribución no válido `%s'\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1520
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
-#: g10/g10.c:1496
+#: g10/g10.c:1524
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1499 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1527 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no puede abrirse `%s'\n"
 
-#: g10/g10.c:1669
+#: g10/g10.c:1700
 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:1675
+#: g10/g10.c:1706
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -881,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:1681
+#: g10/g10.c:1712
 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:1689
+#: g10/g10.c:1720
 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"
 
@@ -1267,58 +1275,58 @@
 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:433
+#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:435
 #, 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:438
+#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:440
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "redondeados a %u bits\n"
 
-#: g10/keygen.c:537
+#: g10/keygen.c:539
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor seleccione tipo de clave deseado:\n"
 
-#: g10/keygen.c:539
+#: g10/keygen.c:541
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA y ElGamal (por defecto)\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:542
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (sólo firma)\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:544
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (sólo cifrado)\n"
 
-#: g10/keygen.c:543
+#: g10/keygen.c:545
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (firma y cifrado)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:547
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (firma y cifrado)\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:551
 msgid "Your selection? "
 msgstr "Su elección: "
 
-#: g10/keygen.c:560 g10/keygen.c:568
+#: g10/keygen.c:562 g10/keygen.c:570
 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:582
+#: g10/keygen.c:584
 msgid "Invalid selection.\n"
 msgstr "Elección no válida.\n"
 
-#: g10/keygen.c:594
+#: g10/keygen.c:596
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1331,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:601
+#: g10/keygen.c:603
 msgid "What keysize do you want? (1024) "
 msgstr "żDe qué tamańo quiere la clave (1024)? "
 
-#: g10/keygen.c:606
+#: g10/keygen.c:608
 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:608
+#: g10/keygen.c:610
 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:610
+#: g10/keygen.c:612
 #, 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"
@@ -1356,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:621
+#: g10/keygen.c:623
 #, 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:626
+#: g10/keygen.c:628
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1369,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:629
+#: g10/keygen.c:631
 msgid "Are you sure that you want this keysize? "
 msgstr "żSeguro que quiere una clave de este tamańo? "
 
-#: g10/keygen.c:630
+#: g10/keygen.c:632
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1382,21 +1390,21 @@
 "teclado\n"
 "también son vulnerables a un ataque!\n"
 
-#: g10/keygen.c:638
+#: g10/keygen.c:640
 msgid "Do you really need such a large keysize? "
 msgstr "żDe verdad necesita una clave tan grande? "
 
-#: g10/keygen.c:644
+#: g10/keygen.c:646
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "El tamańo requerido es de %u bits\n"
 
-#: g10/keygen.c:647 g10/keygen.c:651
+#: g10/keygen.c:649 g10/keygen.c:653
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeados a %u bits\n"
 
-#: g10/keygen.c:699
+#: g10/keygen.c:701
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1412,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:714
+#: g10/keygen.c:716
 msgid "Key is valid for? (0) "
 msgstr "żValidez de la clave (0)? "
 
-#: g10/keygen.c:719
+#: g10/keygen.c:721
 msgid "invalid value\n"
 msgstr "valor no válido\n"
 
-#: g10/keygen.c:724
+#: g10/keygen.c:726
 msgid "Key does not expire at all\n"
 msgstr "La clave nunca caduca\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:730
+#: g10/keygen.c:732
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La clave caduca el %s\n"
 
-#: g10/keygen.c:733
+#: g10/keygen.c:735
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:738
+#: g10/keygen.c:740
 msgid "Is this correct (y/n)? "
 msgstr "żEs correcto (s/n)? "
 
-#: g10/keygen.c:781
+#: g10/keygen.c:783
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1458,44 +1466,44 @@
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:793
+#: g10/keygen.c:795
 msgid "Real name: "
 msgstr "Nombre y apellidos: "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:803
 msgid "Invalid character in name\n"
 msgstr "Caracter no válido en el nombre\n"
 
-#: g10/keygen.c:799
+#: g10/keygen.c:805
 msgid "Name may not start with a digit\n"
 msgstr "El nombre no puede empezar con un número\n"
 
-#: g10/keygen.c:801
+#: g10/keygen.c:807
 msgid "Name must be at least 5 characters long\n"
 msgstr "El nombre debe tener al menos 5 caracteres\n"
 
-#: g10/keygen.c:809
+#: g10/keygen.c:815
 msgid "Email address: "
 msgstr "Dirección de correo electrónico: "
 
-#: g10/keygen.c:820
+#: g10/keygen.c:826
 msgid "Not a valid email address\n"
 msgstr "Dirección no válida\n"
 
-#: g10/keygen.c:828
+#: g10/keygen.c:834
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:834
+#: g10/keygen.c:840
 msgid "Invalid character in comment\n"
 msgstr "Caracter no válido en el comentario\n"
 
-#: g10/keygen.c:857
+#: g10/keygen.c:863
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Está usando el juego de caracteres `%s'.\n"
 
-#: g10/keygen.c:863
+#: g10/keygen.c:869
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1506,28 +1514,28 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:867
+#: g10/keygen.c:873
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:872
+#: g10/keygen.c:878
 msgid "NnCcEeOoQq"
 msgstr "NnCcDdVvSs"
 
-#: g10/keygen.c:882
+#: g10/keygen.c:888
 #, 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:883
+#: g10/keygen.c:889
 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:902
+#: g10/keygen.c:908
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:940
+#: g10/keygen.c:946
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1535,11 +1543,11 @@
 "Necesita una contraseńa para proteger su clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:948
+#: g10/keyedit.c:468 g10/keygen.c:954
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "contraseńa repetida incorrecta, inténtelo de nuevo.\n"
 
-#: g10/keygen.c:954
+#: g10/keygen.c:960
 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"
@@ -1551,7 +1559,7 @@
 "la opción \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:975
+#: g10/keygen.c:981
 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"
@@ -1564,29 +1572,29 @@
 "generador de números aleatorios mayor oportunidad de recoger suficiente\n"
 "entropía.\n"
 
-#: g10/keygen.c:1424
+#: g10/keygen.c:1430
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "El par de claves DSA tendrá 1024 bits.\n"
 
-#: g10/keygen.c:1467
+#: g10/keygen.c:1473
 msgid "Key generation canceled.\n"
 msgstr "Creación de claves cancelada.\n"
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1570
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escribiendo certificado público en `%s'\n"
 
-#: g10/keygen.c:1565
+#: g10/keygen.c:1571
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escribiendo certificado privado en `%s'\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1667
 msgid "public and secret key created and signed.\n"
 msgstr "Claves pública y secreta creadas y firmadas.\n"
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1672
 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"
@@ -1595,12 +1603,12 @@
 "el comando \"--edit-key\" para crear una clave secundaria con este "
 "propósito.\n"
 
-#: g10/keygen.c:1683 g10/keygen.c:1784
+#: g10/keygen.c:1689 g10/keygen.c:1790
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Creación de la clave fallida: %s\n"
 
-#: g10/keygen.c:1727 g10/sig-check.c:318 g10/sign.c:112
+#: g10/keygen.c:1733 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"
@@ -1608,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:1729 g10/sig-check.c:320 g10/sign.c:114
+#: g10/keygen.c:1735 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"
@@ -1616,11 +1624,11 @@
 "clave pública creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1768
 msgid "Really create? "
 msgstr "żCrear de verdad? "
 
-#: g10/encode.c:91 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/encode.c:91 g10/openfile.c:178 g10/openfile.c:288 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1631,17 +1639,17 @@
 msgid "error creating passphrase: %s\n"
 msgstr "error creando contraseńa: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:319
+#: g10/encode.c:171 g10/encode.c:324
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ATENCIÓN: fichero vacío\n"
 
-#: g10/encode.c:266
+#: g10/encode.c:271
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "leyendo desde `%s'\n"
 
-#: g10/encode.c:483
+#: g10/encode.c:492
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s cifrado para: %s\n"
@@ -1690,248 +1698,258 @@
 msgid "No user ID for key\n"
 msgstr "No hay clave secreta para tal usuario\n"
 
-#: g10/getkey.c:1642 g10/getkey.c:1698
+#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "usando clave secundaria %08lX en vez de clave primaria %08lX\n"
 
-#: g10/getkey.c:2017
+#: g10/getkey.c:2050
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: usuario no encontrado\n"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloque de tipo %d\n"
 
-#: g10/import.c:188 g10/trustdb.c:1740 g10/trustdb.c:1781
+#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "hasta ahora se han procesado %lu claves\n"
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: g10/import.c:203
+#: g10/import.c:204
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "   Cantidad total procesada: %lu\n"
 
-#: g10/import.c:205
+#: g10/import.c:206
+#, fuzzy, c-format
+msgid "      skipped new keys: %lu\n"
+msgstr "           nuevas subclaves: %lu\n"
+
+#: g10/import.c:209
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         sin identificativo: %lu\n"
 
-#: g10/import.c:207
+#: g10/import.c:211
 #, c-format
 msgid "              imported: %lu"
 msgstr "                 importadas: %lu"
 
-#: g10/import.c:213
+#: g10/import.c:217
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                sin cambios: %lu\n"
 
-#: g10/import.c:215
+#: g10/import.c:219
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "     nuevos identificativos: %lu\n"
 
-#: g10/import.c:217
+#: g10/import.c:221
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nuevas subclaves: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:223
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "              nuevas firmas: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:225
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "        nuevas revocaciones: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:227
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     claves secretas leídas: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:229
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr " claves secretas importadas: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:231
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "claves secretas sin cambios: %lu\n"
 
-#: g10/import.c:386 g10/import.c:578
+#: g10/import.c:391 g10/import.c:590
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "clave %08lX: no hay identificativo de usuario\n"
 
-#: g10/import.c:400
+#: g10/import.c:405
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "clave %08lX: no hay identificativos de usuario válidos\n"
 
-#: g10/import.c:402
+#: g10/import.c:407
 msgid "this may be caused by a missing self-signature\n"
 msgstr "esto puede ser debido a la ausencia de autofirma\n"
 
-#: g10/import.c:413 g10/import.c:645
+#: g10/import.c:418 g10/import.c:657
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "clave %08lX: clave pública no encontrada: %s\n"
 
-#: g10/import.c:419
+#: g10/import.c:423
+#, fuzzy, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "clave %08lX: no es conforme a rfc2440 - ignorada\n"
+
+#: g10/import.c:431
 msgid "no default public keyring\n"
 msgstr "no hay anillo público por defecto\n"
 
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
+#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribiendo en `%s'\n"
 
-#: g10/import.c:426 g10/import.c:484 g10/import.c:593 g10/import.c:694
+#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "no puede bloquearse el anillo `%s': %s\n"
 
-#: g10/import.c:429 g10/import.c:487 g10/import.c:596 g10/import.c:697
+#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: g10/import.c:434
+#: g10/import.c:446
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "clave %08lX: clave pública importada\n"
 
-#: g10/import.c:451
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "clave %08lX: no se corresponde con nuestra copia\n"
 
-#: g10/import.c:460 g10/import.c:653
+#: g10/import.c:472 g10/import.c:665
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "clave %08lX: no puede localizarse el bloque de claves original: %s\n"
 
-#: g10/import.c:466 g10/import.c:659
+#: g10/import.c:478 g10/import.c:671
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "clave %08lX: no puede leerse el bloque de claves original: %s\n"
 
-#: g10/import.c:493
+#: g10/import.c:505
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "clave %08lX: 1 nuevo identificativo de usuario\n"
 
-#: g10/import.c:496
+#: g10/import.c:508
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "clave %08lX: %d nuevos identificativos de usuario\n"
 
-#: g10/import.c:499
+#: g10/import.c:511
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "clave %08lX: 1 nueva firma\n"
 
-#: g10/import.c:502
+#: g10/import.c:514
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "clave %08lX: %d nuevas firmas\n"
 
-#: g10/import.c:505
+#: g10/import.c:517
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "clave %08lX: 1 nueva subclave\n"
 
-#: g10/import.c:508
+#: g10/import.c:520
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "clave %08lX: %d nuevas subclaves\n"
 
-#: g10/import.c:518
+#: g10/import.c:530
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "clave %08lX: sin cambios\n"
 
-#: g10/import.c:601
+#: g10/import.c:613
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "clave %08lX: clave secreta importada\n"
 
 #. we can't merge secret keys
-#: g10/import.c:605
+#: g10/import.c:617
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "clave %08lX: ya estaba en el anillo secreto\n"
 
-#: g10/import.c:610
+#: g10/import.c:622
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "clave %08lX: clave secreta no encontrada: %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:651
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "clave %08lX: falta la clave pública - imposibile applicar el\n"
 "certificado de revocación\n"
 
-#: g10/import.c:670
+#: g10/import.c:682
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "clave %08lX: certificado de revocación no válido: %s - rechazado\n"
 
-#: g10/import.c:702
+#: g10/import.c:714
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "clave %08lX: certificado de revocación importado\n"
 
-#: g10/import.c:744
+#: g10/import.c:756
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "clave %08lX: no hay identificativo de usuario para la firma\n"
 
-#: g10/import.c:751 g10/import.c:775
+#: g10/import.c:763 g10/import.c:787
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "clave %08lX: algoritmo de clave pública no soportado\n"
 
-#: g10/import.c:752
+#: g10/import.c:764
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "clave %08lX: autofirma no válida\n"
 
-#: g10/import.c:767
+#: g10/import.c:779
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "clave %08lX: no hay subclave para unir\n"
 
-#: g10/import.c:776
+#: g10/import.c:788
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "clave %08lX.%lu: unión de subclave no válida\n"
 
-#: g10/import.c:803
+#: g10/import.c:815
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "clave %08lX: aceptado ID de usuario sin autofirma '"
 
-#: g10/import.c:832
+#: g10/import.c:844
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "clave %08lX: ignorado ID de usuario '"
 
-#: g10/import.c:855
+#: g10/import.c:867
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "clave %08lX: subclave ignorada\n"
@@ -1940,33 +1958,33 @@
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:880
+#: g10/import.c:892
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "clave %08lX: firma no exportable (clase %02x) - ignorada\n"
 
-#: g10/import.c:889
+#: g10/import.c:901
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "clave %08lX: certificado de revocación en lugar equivocado - ignorado\n"
 
-#: g10/import.c:897
+#: g10/import.c:909
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "clave %08lX: certificado de revocación no valido: %s - ignorado\n"
 
-#: g10/import.c:997
+#: g10/import.c:1009
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "clave %08lX: detectado usuario duplicado - fusionada\n"
 
-#: g10/import.c:1048
+#: g10/import.c:1060
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "clave %08lX: certificado de revocación ańadido\n"
 
-#: g10/import.c:1162 g10/import.c:1215
+#: g10/import.c:1174 g10/import.c:1227
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "clave %08lX: nuestra copia no tiene autofirma\n"
@@ -2545,8 +2563,17 @@
 msgid "no secret key\n"
 msgstr "no hay clave secreta\n"
 
+#: g10/keylist.c:158
+#, fuzzy
+msgid "invalid"
+msgstr "Armadura no válida"
+
+#: g10/keylist.c:178
+msgid "revoked"
+msgstr ""
+
 #. of subkey
-#: g10/keylist.c:318 g10/mainproc.c:742
+#: g10/keylist.c:400 g10/mainproc.c:760
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "La clave caduca el %s\n"
@@ -2556,129 +2583,117 @@
 msgid "public key is %08lX\n"
 msgstr "la clave pública es %08lX\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:257
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados de la clave pública: DEK bueno\n"
 
-#: g10/mainproc.c:281
+#: g10/mainproc.c:299
 #, 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:291
+#: g10/mainproc.c:309
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "cifrado con clave %s, ID %08lX\n"
 
-#: g10/mainproc.c:297
+#: g10/mainproc.c:315
 msgid "no secret key for decryption available\n"
 msgstr "clave secreta para descifrado no disponible\n"
 
-#: g10/mainproc.c:306
+#: g10/mainproc.c:324
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descifrado de la clave pública fallido: %s\n"
 
-#: g10/mainproc.c:343
+#: g10/mainproc.c:361
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:348
+#: g10/mainproc.c:366
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATENCIÓN: ˇel mensaje cifrado ha sido manipulado!\n"
 
-#: g10/mainproc.c:353
+#: g10/mainproc.c:371
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descifrado fallido: %s\n"
 
-#: g10/mainproc.c:372
+#: g10/mainproc.c:390
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: el remitente solicitó \"sólo-para-tus-ojos\"\n"
 
-#: g10/mainproc.c:374
+#: g10/mainproc.c:392
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nombre fichero original='%.*s'\n"
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:544
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:613 g10/mainproc.c:622
+#: g10/mainproc.c:631 g10/mainproc.c:640
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATENCIÓN: encontrados datos de notación no válidos\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:643
 msgid "Notation: "
 msgstr "Notación: "
 
-#: g10/mainproc.c:632
+#: g10/mainproc.c:650
 msgid "Policy: "
 msgstr "Política: "
 
-#: g10/mainproc.c:1062
+#: g10/mainproc.c:1080
 msgid "signature verification suppressed\n"
 msgstr "suprimida la verificación de la firma\n"
 
-#: g10/mainproc.c:1068
+#: g10/mainproc.c:1086
 #, 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:1094 g10/mainproc.c:1105
+#: g10/mainproc.c:1112 g10/mainproc.c:1123
 msgid "BAD signature from \""
 msgstr "Firma INCORRECTA de \""
 
-#: g10/mainproc.c:1095 g10/mainproc.c:1106
+#: g10/mainproc.c:1113 g10/mainproc.c:1124
 msgid "Good signature from \""
 msgstr "Firma correcta de \""
 
-#: g10/mainproc.c:1097
+#: g10/mainproc.c:1115
 msgid "                aka \""
 msgstr "también conocido como \""
 
-#: g10/mainproc.c:1153
+#: g10/mainproc.c:1171
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposible comprobar la firma: %s\n"
 
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1235
 #, fuzzy, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "Clase de firma desconocida"
 
-#: g10/mainproc.c:1263
+#: g10/mainproc.c:1281
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma viejo estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:1268
+#: g10/mainproc.c:1286
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete raíz no válido detectado en proc_tree()\n"
 
-#: g10/misc.c:94
+#: g10/misc.c:96
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "no se pueden desactivar los core dumps: %s\n"
 
-#: g10/misc.c:97
-msgid "WARNING: program may create a core file!\n"
-msgstr "ATENCIÓN: ˇel programa podría crear un fichero core dump!\n"
-
-#: g10/misc.c:205
+#: g10/misc.c:206
 msgid "Experimental algorithms should not be used!\n"
 msgstr "ˇNo se deberían usar algoritmos experimentales!\n"
 
-#: g10/misc.c:219
-msgid ""
-"RSA keys are deprecated; please consider creating a new key and use this key "
-"in the future\n"
-msgstr ""
-"Las claves RSA están en desuso, considere la creación de una nueva clave "
-"para futuros usos\n"
-
-#: g10/misc.c:241
+#: g10/misc.c:233
 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 "
@@ -2689,7 +2704,7 @@
 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:965
+#: g10/parse-packet.c:986
 #, 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"
@@ -2726,91 +2741,91 @@
 msgid "Repeat passphrase: "
 msgstr "Repita contraseńa: "
 
-#: g10/plaintext.c:63
+#: g10/plaintext.c:67
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "datos no grabados; use la opción \"--output\" para grabarlos\n"
 
-#: g10/plaintext.c:317
+#: g10/plaintext.c:324
 #, fuzzy
 msgid "Detached signature.\n"
 msgstr "%d firmas borradas.\n"
 
-#: g10/plaintext.c:321
+#: g10/plaintext.c:328
 msgid "Please enter name of data file: "
 msgstr "Introduzca el nombre del fichero de datos: "
 
-#: g10/plaintext.c:342
+#: g10/plaintext.c:349
 msgid "reading stdin ...\n"
 msgstr "leyendo stdin...\n"
 
-#: g10/plaintext.c:385
+#: g10/plaintext.c:392
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposible abrir datos firmados `%s'\n"
 
-#: g10/pubkey-enc.c:79
+#: g10/pubkey-enc.c:76
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "destinatario anónimo, probando clave secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:85
+#: g10/pubkey-enc.c:82
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "de acuerdo, somos el destinatario anónimo.\n"
 
-#: g10/pubkey-enc.c:137
+#: g10/pubkey-enc.c:134
 msgid "old encoding of the DEK is not supported\n"
 msgstr "la codificación vieja de DEK no está soportada\n"
 
-#: g10/pubkey-enc.c:156
+#: g10/pubkey-enc.c:153
 #, fuzzy, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "el algoritmo de protección %d no está soportado\n"
 
-#: g10/pubkey-enc.c:195
+#: g10/pubkey-enc.c:192
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "NOTA: algoritmo de cifrado %d no encontrado en las preferencias\n"
 
-#: g10/pubkey-enc.c:201
+#: g10/pubkey-enc.c:198
 #, fuzzy, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTA: clave de la firma caducada el %s\n"
 
-#: g10/hkp.c:62
+#: g10/hkp.c:72
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
 msgstr ""
 
-#: g10/hkp.c:75
+#: g10/hkp.c:85
 #, fuzzy, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "no puede escribirse en el anillo: %s\n"
 
-#: g10/hkp.c:98 g10/hkp.c:136
+#: g10/hkp.c:109 g10/hkp.c:148
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/hkp.c:106
+#: g10/hkp.c:117
 #, fuzzy, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "'%s' no es un identificativo largo de clave válido\n"
 
-#: g10/hkp.c:158
+#: g10/hkp.c:170
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
-#: g10/hkp.c:182
+#: g10/hkp.c:194
 #, fuzzy, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: g10/hkp.c:194
+#: g10/hkp.c:206
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr ""
 
-#: g10/hkp.c:197
+#: g10/hkp.c:209
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
@@ -2825,41 +2840,41 @@
 msgid "protection algorithm %d is not supported\n"
 msgstr "el algoritmo de protección %d no está soportado\n"
 
-#: g10/seckey-cert.c:175
+#: g10/seckey-cert.c:184
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Contraseńa incorrecta, inténtelo de nuevo...\n"
 
-#: g10/seckey-cert.c:231
+#: g10/seckey-cert.c:240
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "ATENCIÓN: detectada clave débil - por favor cambie la contraseńa.\n"
 
-#: g10/sig-check.c:202
+#: g10/sig-check.c:199
 msgid "assuming bad MDC due to an unknown critical bit\n"
 msgstr "asumiendo MDC incorrecto debido a un bit crítico desconocido\n"
 
-#: g10/sig-check.c:300
+#: g10/sig-check.c:297
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "ˇesto es una clave ElGamal generada por PGP que NO es segura para las "
 "firmas!\n"
 
-#: g10/sig-check.c:308
+#: g10/sig-check.c:305
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "la clave pública es %lu segundos más nueva que la firma\n"
 
-#: g10/sig-check.c:309
+#: g10/sig-check.c:306
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "la clave pública es %lu segundos más nueva que la firma\n"
 
-#: g10/sig-check.c:327
+#: g10/sig-check.c:324
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "NOTA: clave de la firma caducada el %s\n"
 
-#: g10/sig-check.c:396
+#: g10/sig-check.c:393
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "asumiendo firma incorrecta debido a un bit crítico desconocido\n"
 
@@ -2868,7 +2883,7 @@
 msgid "%s signature from: %s\n"
 msgstr "firma %s de: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:606
+#: g10/sign.c:290 g10/sign.c:610
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "no puede crearse %s: %s\n"
@@ -2917,7 +2932,7 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: ˇel directorio no existe!\n"
 
-#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1363 g10/tdbio.c:444
+#: g10/openfile.c:226 g10/openfile.c:295 g10/ringedit.c:1369 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: no puede crearse: %s\n"
@@ -3019,288 +3034,298 @@
 "La base de datos de confianza está dańada. Por favor, ejecute\n"
 "\"gpg --fix-trust-db\".\n"
 
-#: g10/trustdb.c:168
+#: g10/trustdb.c:169
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "registro de confianza %lu, petición tipo %d: fallo lectura: %s\n"
 
-#: g10/trustdb.c:183
+#: g10/trustdb.c:184
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "registro de confianza %lu, tipo %d: fallo escritura: %s\n"
 
-#: g10/trustdb.c:197
+#: g10/trustdb.c:198
 #, c-format
 msgid "trust record %lu: delete failed: %s\n"
 msgstr "registro de confianza %lu: fallo al borrar: %s\n"
 
-#: g10/trustdb.c:211
+#: g10/trustdb.c:212
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de datos de confianza: fallo sincronización: %s\n"
 
-#: g10/trustdb.c:376
+#: g10/trustdb.c:377
 #, c-format
 msgid "error reading dir record for LID %lu: %s\n"
 msgstr "error leyendo registro de directorio del LID %lu: %s\n"
 
-#: g10/trustdb.c:383
+#: g10/trustdb.c:384
 #, c-format
 msgid "lid %lu: expected dir record, got type %d\n"
 msgstr "lid %lu: esperaba registro directorio, encontrado tipo %d\n"
 
-#: g10/trustdb.c:388
+#: g10/trustdb.c:389
 #, c-format
 msgid "no primary key for LID %lu\n"
 msgstr "no hay clave primaria para el LID %lu\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:394
 #, c-format
 msgid "error reading primary key for LID %lu: %s\n"
 msgstr "error leyendo clave primaria para el LID %lu: %s\n"
 
-#: g10/trustdb.c:432
+#: g10/trustdb.c:433
 #, c-format
 msgid "get_dir_record: search_record failed: %s\n"
 msgstr "get_dir_record: search_record fallida: %s\n"
 
-#: g10/trustdb.c:487
-#, c-format
-msgid "NOTE: secret key %08lX is NOT protected.\n"
-msgstr "NOTA: la clave secreta %08lX NO está protegida.\n"
-
-#: g10/trustdb.c:495
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr "clave %08lX: clave secreta sin clave pública - ignorada\n"
-
-#: g10/trustdb.c:502
-#, c-format
-msgid "key %08lX: secret and public key don't match\n"
-msgstr "clave %08lX: las claves pública y secreta no se corresponden\n"
+#: g10/trustdb.c:474
+#, fuzzy, c-format
+msgid "'%s' is not a valid long keyID\n"
+msgstr "'%s' no es un identificativo largo de clave válido\n"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:501
 #, c-format
 msgid "key %08lX: can't put it into the trustdb\n"
 msgstr "clave %08lX: imposible incluirla en la base de datos de confianza\n"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:507
 #, c-format
 msgid "key %08lX: query record failed\n"
 msgstr "clave %08lX: petición de registro fallida\n"
 
-#: g10/trustdb.c:529
+#: g10/trustdb.c:516
 #, c-format
 msgid "key %08lX: already in trusted key table\n"
 msgstr "clave %08lX: ya está en la tabla de confianza\n"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:519
 #, c-format
 msgid "key %08lX: accepted as trusted key.\n"
 msgstr "clave %08lX: aceptada como clave de confianza.\n"
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:546
+#, c-format
+msgid "key %08lX: no public key for trusted key - skipped\n"
+msgstr "clave %08lX: clave de confianza sin clave pública - ignorada\n"
+
+#: g10/trustdb.c:565
+#, c-format
+msgid "NOTE: secret key %08lX is NOT protected.\n"
+msgstr "NOTA: la clave secreta %08lX NO está protegida.\n"
+
+#: g10/trustdb.c:577
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr "clave %08lX: clave secreta sin clave pública - ignorada\n"
+
+#: g10/trustdb.c:584
+#, c-format
+msgid "key %08lX: secret and public key don't match\n"
+msgstr "clave %08lX: las claves pública y secreta no se corresponden\n"
+
+#: g10/trustdb.c:597
 #, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr "enumeración de claves secretas fallida: %s\n"
 
-#: g10/trustdb.c:921
+#: g10/trustdb.c:987
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "clave %08lX.%lu: unión de subclave válida\n"
 
-#: g10/trustdb.c:927 g10/trustdb.c:962
+#: g10/trustdb.c:993 g10/trustdb.c:1028
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "clave %08lX.%lu: unión de subclave no válida: %s\n"
 
-#: g10/trustdb.c:939
+#: g10/trustdb.c:1005
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "clave %08lX.%lu: revocación de clave válida\n"
 
-#: g10/trustdb.c:945
+#: g10/trustdb.c:1011
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "clave %08lX.%lu: revocación de clave no válida: %s\n"
 
-#: g10/trustdb.c:956
+#: g10/trustdb.c:1022
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "clave %08lX.%lu: revocación de subclave válida\n"
 
-#: g10/trustdb.c:1067
+#: g10/trustdb.c:1133
 msgid "Good self-signature"
 msgstr "Autofirma válida"
 
-#: g10/trustdb.c:1077
+#: g10/trustdb.c:1143
 msgid "Invalid self-signature"
 msgstr "Autofirma no válida"
 
-#: g10/trustdb.c:1104
+#: g10/trustdb.c:1170
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 "Revocación válida de ID de usuario ignorada debido a autofirma más reciente"
 
-#: g10/trustdb.c:1110
+#: g10/trustdb.c:1176
 msgid "Valid user ID revocation"
 msgstr "Revocación de ID de usuario válida"
 
-#: g10/trustdb.c:1115
+#: g10/trustdb.c:1181
 msgid "Invalid user ID revocation"
 msgstr "Revocación de ID de usuario no válida."
 
-#: g10/trustdb.c:1157
+#: g10/trustdb.c:1223
 msgid "Valid certificate revocation"
 msgstr "Revocación de certificado válida"
 
-#: g10/trustdb.c:1158
+#: g10/trustdb.c:1224
 msgid "Good certificate"
 msgstr "Certificado correcto"
 
-#: g10/trustdb.c:1186
+#: g10/trustdb.c:1252
 msgid "Invalid certificate revocation"
 msgstr "Certificado de revocación incorrecto"
 
-#: g10/trustdb.c:1187
+#: g10/trustdb.c:1253
 msgid "Invalid certificate"
 msgstr "Certificado incorrecto"
 
-#: g10/trustdb.c:1204 g10/trustdb.c:1208
+#: g10/trustdb.c:1270 g10/trustdb.c:1274
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "registro de firma %lu[%d] apunta al registro equivocado.\n"
 
-#: g10/trustdb.c:1267
+#: g10/trustdb.c:1333
 msgid "duplicated certificate - deleted"
 msgstr "certificado duplicado - eliminado"
 
-#: g10/trustdb.c:1584
+#: g10/trustdb.c:1650
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir fallida: %s\n"
 
-#: g10/trustdb.c:1718
+#: g10/trustdb.c:1784
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: inserción fallida: %s\n"
 
-#: g10/trustdb.c:1723
+#: g10/trustdb.c:1789
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: inserción fallida: %s\n"
 
-#: g10/trustdb.c:1729
+#: g10/trustdb.c:1795
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: insertada\n"
 
-#: g10/trustdb.c:1734
+#: g10/trustdb.c:1800
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "error leyendo registro de directorio: %s\n"
 
-#: g10/trustdb.c:1742 g10/trustdb.c:1805
+#: g10/trustdb.c:1808 g10/trustdb.c:1871
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "se han procesado %lu claves\n"
 
-#: g10/trustdb.c:1744 g10/trustdb.c:1811
+#: g10/trustdb.c:1810 g10/trustdb.c:1877
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu claves con errores\n"
 
-#: g10/trustdb.c:1746
+#: g10/trustdb.c:1812
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu claves insertadas\n"
 
-#: g10/trustdb.c:1749
+#: g10/trustdb.c:1815
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "enumeración bloques de clave fallido: %s\n"
 
-#: g10/trustdb.c:1797
+#: g10/trustdb.c:1863
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: registro de directiorio sin clave - ignorado\n"
 
-#: g10/trustdb.c:1807
+#: g10/trustdb.c:1873
 #, fuzzy, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "clave %08lX: %d nuevas subclaves\n"
 
-#: g10/trustdb.c:1809
+#: g10/trustdb.c:1875
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu claves ignoradas\n"
 
-#: g10/trustdb.c:1813
+#: g10/trustdb.c:1879
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu claves actualizadas\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2224
 msgid "Ooops, no keys\n"
 msgstr "Oh oh, no hay claves\n"
 
-#: g10/trustdb.c:2162
+#: g10/trustdb.c:2228
 msgid "Ooops, no user IDs\n"
 msgstr "Oh oh, no hay ningún ID de usuario\n"
 
-#: g10/trustdb.c:2320
+#: g10/trustdb.c:2386
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: búsqueda registro directorio fallida: %s\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2395
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "clave %08lX: inserción del registro de confianza fallida: %s\n"
 
-#: g10/trustdb.c:2333
+#: g10/trustdb.c:2399
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "clave %08lX.%lu: incluida en la base de datos de confianza\n"
 
-#: g10/trustdb.c:2341
+#: g10/trustdb.c:2407
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "clave %08lX.%lu: creada en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2422
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "clave %08lX.%lu: caducada el %s\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2430
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "clave %08lX.%lu: comprobación de confianza fallida: %s\n"
 
-#: g10/trustdb.c:2515
+#: g10/trustdb.c:2581
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "usuario '%s' no encontrado: %s\n"
 
-#: g10/trustdb.c:2517
+#: g10/trustdb.c:2583
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problema buscando '%s' en la tabla de confianza: %s\n"
 
-#: g10/trustdb.c:2520
+#: g10/trustdb.c:2586
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "usuario '%s' no está en la tabla de confianza - insertando\n"
 
-#: g10/trustdb.c:2523
+#: g10/trustdb.c:2589
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "fallo al poner '%s' en la tabla de confianza: %s\n"
 
-#: g10/trustdb.c:2709 g10/trustdb.c:2739
+#: g10/trustdb.c:2775 g10/trustdb.c:2805
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "ATENCÍON: todavía no puedo tratar registros de preferencias largos\n"
 
@@ -3321,26 +3346,26 @@
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: no se puede crear el anillo: %s\n"
 
-#: g10/ringedit.c:319 g10/ringedit.c:1368
+#: g10/ringedit.c:319 g10/ringedit.c:1374
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: anillo creado\n"
 
-#: g10/ringedit.c:1545
+#: g10/ringedit.c:1551
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ATENCIÓN: existen 2 ficheros con información confidencial.\n"
 
-#: g10/ringedit.c:1546
+#: g10/ringedit.c:1552
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s es el que no se ha modificado\n"
 
-#: g10/ringedit.c:1547
+#: g10/ringedit.c:1553
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s es el nuevo\n"
 
-#: g10/ringedit.c:1548
+#: g10/ringedit.c:1554
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor arregle este posible fallo de seguridad\n"
 
@@ -3363,49 +3388,49 @@
 "para las firmas\n"
 
 #. do not overwrite
-#: g10/openfile.c:79
+#: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
 msgstr "El fichero `%s' ya existe. "
 
-#: g10/openfile.c:81
+#: g10/openfile.c:86
 msgid "Overwrite (y/N)? "
 msgstr "żSobreescribir (s/N)? "
 
-#: g10/openfile.c:109
+#: g10/openfile.c:119
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: sufijo desconocido\n"
 
-#: g10/openfile.c:131
+#: g10/openfile.c:141
 msgid "Enter new filename"
 msgstr "Introduzca nuevo nombre de fichero"
 
-#: g10/openfile.c:172
+#: g10/openfile.c:182
 msgid "writing to stdout\n"
 msgstr "escribiendo en stdout\n"
 
-#: g10/openfile.c:250
+#: g10/openfile.c:261
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "asumiendo que hay datos firmados en `%s'\n"
 
-#: g10/openfile.c:300
+#: g10/openfile.c:311
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: se ha creado un nuevo fichero de opciones\n"
 
-#: g10/openfile.c:313
+#: g10/openfile.c:338
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: no puede crearse el directorio: %s\n"
 
-#: g10/openfile.c:316
+#: g10/openfile.c:341
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: directorio creado\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:343
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr ""
 
@@ -3700,6 +3725,13 @@
 msgid "No help available for `%s'"
 msgstr "Ayuda no disponible para `%s'"
 
+#~ msgid ""
+#~ "RSA keys are deprecated; please consider creating a new key and use this key "
+#~ "in the future\n"
+#~ msgstr ""
+#~ "Las claves RSA están en desuso, considere la creación de una nueva clave "
+#~ "para futuros usos\n"
+
 #~ msgid "set debugging flags"
 #~ msgstr "establece los parámetros de depuración"
 
@@ -3852,14 +3884,8 @@
 #~ msgid "usage: gpgm [options] "
 #~ msgstr "uso: gpgm [opciones] "
 
-#~ msgid "|KEYID|ulimately trust this key"
-#~ msgstr "|ID-CLAVE|confía plenamente en esta clave"
-
 #~ msgid "chained sigrec %lu has a wrong owner\n"
 #~ msgstr "registro de firma encadenado %lu tiene el propietario equivocado\n"
-
-#~ msgid "key %08lX: no public key for trusted key - skipped\n"
-#~ msgstr "clave %08lX: clave de confianza sin clave pública - ignorada\n"
 
 #~ msgid "lid %lu: read dir record failed: %s\n"
 #~ msgstr "lid %lu: lectura registro de directorio fallida: %s\n"
diff -urN gnupg-1.0.2/po/fr.po gnupg-1.0.3/po/fr.po
--- gnupg-1.0.2/po/fr.po	Wed Jul 12 14:59:41 2000
+++ gnupg-1.0.3/po/fr.po	Mon Sep 18 12:18:03 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.19 2000/07/12 11:35:09 wkoch Exp $
+# $Id: fr.po,v 1.47.2.23 2000/09/15 16:39:44 wkoch Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.1h\n"
-"POT-Creation-Date: 2000-07-12 12:13+0200\n"
+"POT-Creation-Date: 2000-09-18 12:17+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"
@@ -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:127 g10/keygen.c:1249
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1255
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossible d'ouvrir `%s': %s\n"
@@ -318,12 +318,12 @@
 "une quantité de données aléatoires trop importante a été demandée.\n"
 "La limite est %d bits.\n"
 
-#: cipher/random.c:647
+#: cipher/random.c:650
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "ATTENTION: utilisation d'un générateur de nombres aléatoires peu sűr !!\n"
 
-#: cipher/random.c:648
+#: cipher/random.c:651
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -337,7 +337,7 @@
 "N'UTILISEZ PAS LES DONNÉES GÉNÉRÉES PAR CE PROGRAMME !!\n"
 "\n"
 
-#: cipher/rndlinux.c:141
+#: cipher/rndlinux.c:142
 #, c-format
 msgid ""
 "\n"
@@ -348,7 +348,7 @@
 "Il n'y a pas assez d'octets aléatoires disponibles. Faites autre chose\n"
 "pour que l'OS puisse amasser plus d'entropie ! (il faut %d octets de plus)\n"
 
-#: g10/g10.c:197
+#: g10/g10.c:206
 msgid ""
 "@Commands:\n"
 " "
@@ -356,139 +356,139 @@
 "@Commandes:\n"
 " "
 
-#: g10/g10.c:199
+#: g10/g10.c:208
 msgid "|[file]|make a signature"
 msgstr "|[fichier]|faire une signature"
 
-#: g10/g10.c:200
+#: g10/g10.c:209
 msgid "|[file]|make a clear text signature"
 msgstr "|[fichier]|faire une signature en texte clair"
 
-#: g10/g10.c:201
+#: g10/g10.c:210
 msgid "make a detached signature"
 msgstr "faire une signature détachée"
 
-#: g10/g10.c:202
+#: g10/g10.c:211
 msgid "encrypt data"
 msgstr "chiffrer les données"
 
-#: g10/g10.c:203
+#: g10/g10.c:212
 msgid "encryption only with symmetric cipher"
 msgstr "chiffrement symétrique seulement"
 
-#: g10/g10.c:204
+#: g10/g10.c:213
 msgid "store only"
 msgstr "pas d'action"
 
-#: g10/g10.c:205
+#: g10/g10.c:214
 msgid "decrypt data (default)"
 msgstr "déchiffrer les données (défaut)"
 
-#: g10/g10.c:206
+#: g10/g10.c:215
 msgid "verify a signature"
 msgstr "vérifier une signature"
 
-#: g10/g10.c:208
+#: g10/g10.c:217
 msgid "list keys"
 msgstr "lister les clés"
 
-#: g10/g10.c:210
+#: g10/g10.c:219
 msgid "list keys and signatures"
 msgstr "lister les clés et les signatures"
 
-#: g10/g10.c:211
+#: g10/g10.c:220
 msgid "check key signatures"
 msgstr "vérifier les signatures des clés"
 
-#: g10/g10.c:212
+#: g10/g10.c:221
 msgid "list keys and fingerprints"
 msgstr "lister les clés et les empreintes"
 
-#: g10/g10.c:213
+#: g10/g10.c:222
 msgid "list secret keys"
 msgstr "lister les clés secrčtes"
 
-#: g10/g10.c:214
+#: g10/g10.c:223
 msgid "generate a new key pair"
 msgstr "générer une nouvelle paire de clés"
 
-#: g10/g10.c:215
+#: g10/g10.c:224
 msgid "remove key from the public keyring"
 msgstr "enlever la clé du porte-clés public"
 
-#: g10/g10.c:217
+#: g10/g10.c:226
 msgid "remove key from the secret keyring"
 msgstr "enlever la clé du porte-clés secret"
 
-#: g10/g10.c:218
+#: g10/g10.c:227
 msgid "sign a key"
 msgstr "signer une clé"
 
-#: g10/g10.c:219
+#: g10/g10.c:228
 msgid "sign a key locally"
 msgstr "signer une clé localement"
 
-#: g10/g10.c:220
+#: g10/g10.c:229
 msgid "sign or edit a key"
 msgstr "signer ou éditer une clé"
 
-#: g10/g10.c:221
+#: g10/g10.c:230
 msgid "generate a revocation certificate"
 msgstr "générer un certificat de révocation"
 
-#: g10/g10.c:222
+#: g10/g10.c:231
 msgid "export keys"
 msgstr "exporter les clés"
 
-#: g10/g10.c:223
+#: g10/g10.c:232
 msgid "export keys to a key server"
 msgstr "exporter les clés vers un serveur de clés"
 
-#: g10/g10.c:224
+#: g10/g10.c:233
 msgid "import keys from a key server"
 msgstr "importer les clés d'un serveur de clés"
 
-#: g10/g10.c:228
+#: g10/g10.c:237
 msgid "import/merge keys"
 msgstr "importer/fusionner les clés"
 
-#: g10/g10.c:230
+#: g10/g10.c:239
 msgid "list only the sequence of packets"
 msgstr "ne lister que les paquets"
 
-#: g10/g10.c:232
+#: g10/g10.c:241
 msgid "export the ownertrust values"
 msgstr "exporter les indices de confiance"
 
-#: g10/g10.c:234
+#: g10/g10.c:243
 msgid "import ownertrust values"
 msgstr "importer les indices de confiance"
 
-#: g10/g10.c:236
+#: g10/g10.c:245
 msgid "update the trust database"
 msgstr "mettre la base de confiance ŕ jour"
 
-#: g10/g10.c:238
+#: g10/g10.c:247
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMS]|vérifier la base de confiance"
 
-#: g10/g10.c:239
+#: g10/g10.c:248
 msgid "fix a corrupted trust database"
 msgstr "réparer une base de confiance corrompue"
 
-#: g10/g10.c:240
+#: g10/g10.c:249
 msgid "De-Armor a file or stdin"
 msgstr "Enlever l'armure d'un fichier ou de stdin"
 
-#: g10/g10.c:242
+#: g10/g10.c:251
 msgid "En-Armor a file or stdin"
 msgstr "Mettre une armure ŕ un fichier ou ŕ stdin"
 
-#: g10/g10.c:244
+#: g10/g10.c:253
 msgid "|algo [files]|print message digests"
 msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
 
-#: g10/g10.c:248
+#: g10/g10.c:257
 msgid ""
 "@\n"
 "Options:\n"
@@ -498,148 +498,152 @@
 "Options:\n"
 " "
 
-#: g10/g10.c:250
+#: g10/g10.c:259
 msgid "create ascii armored output"
 msgstr "créer une sortie ascii avec armure"
 
-#: g10/g10.c:252
+#: g10/g10.c:261
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: g10/g10.c:255
+#: g10/g10.c:264
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOM|utiliser NOM comme récipient par défaut"
 
-#: g10/g10.c:257
+#: g10/g10.c:266
 msgid "use the default key as default recipient"
 msgstr "utiliser la clé par déf. comme récipient"
 
-#: g10/g10.c:261
+#: g10/g10.c:270
 msgid "use this user-id to sign or decrypt"
 msgstr "utiliser ce nom pour signer ou déchiffrer"
 
-#: g10/g10.c:262
+#: g10/g10.c:271
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|niveau de compression N (0 désactive)"
 
-#: g10/g10.c:264
+#: g10/g10.c:273
 msgid "use canonical text mode"
 msgstr "utiliser le mode texte canonique"
 
-#: g10/g10.c:265
+#: g10/g10.c:274
 msgid "use as output file"
 msgstr "utiliser comme fichier de sortie"
 
-#: g10/g10.c:266
+#: g10/g10.c:275
 msgid "verbose"
 msgstr "bavard"
 
-#: g10/g10.c:267
+#: g10/g10.c:276
 msgid "be somewhat more quiet"
 msgstr "devenir beaucoup plus silencieux"
 
-#: g10/g10.c:268
+#: g10/g10.c:277
 msgid "don't use the terminal at all"
 msgstr "ne pas utiliser du tout le terminal"
 
-#: g10/g10.c:269
+#: g10/g10.c:278
 msgid "force v3 signatures"
 msgstr "forcer les signatures en v3"
 
-#: g10/g10.c:270
+#: g10/g10.c:279
 msgid "always use a MDC for encryption"
 msgstr "toujours utiliser un sceau pour le chiffrement"
 
-#: g10/g10.c:271
+#: g10/g10.c:280
 msgid "do not make any changes"
 msgstr "ne rien changer"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:273
+#: g10/g10.c:282
 msgid "batch mode: never ask"
 msgstr "mode automatique: ne jamais rien demander"
 
-#: g10/g10.c:274
+#: g10/g10.c:283
 msgid "assume yes on most questions"
 msgstr "répondre oui ŕ la plupart des questions"
 
-#: g10/g10.c:275
+#: g10/g10.c:284
 msgid "assume no on most questions"
 msgstr "répondre non ŕ la plupart des questions"
 
-#: g10/g10.c:276
+#: g10/g10.c:285
 msgid "add this keyring to the list of keyrings"
 msgstr "ajouter ce porte-clés ŕ la liste"
 
-#: g10/g10.c:277
+#: g10/g10.c:286
 msgid "add this secret keyring to the list"
 msgstr "ajouter ce porte-clés secret ŕ la liste"
 
-#: g10/g10.c:278
+#: g10/g10.c:287
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOM|utiliser NOM comme clé secrčte par défaut"
 
-#: g10/g10.c:279
+#: g10/g10.c:288
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HÔTE|utiliser ce serveur pour chercher des clés"
 
-#: g10/g10.c:280
+#: g10/g10.c:289
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOM|le terminal utilise la table de caractčres NOM"
 
-#: g10/g10.c:281
+#: g10/g10.c:290
 msgid "read options from file"
 msgstr "lire les options du fichier"
 
-#: g10/g10.c:285
+#: g10/g10.c:294
 msgid "|FD|write status info to this FD"
 msgstr "|FD|écrire l'état sur ce descripteur"
 
-#: g10/g10.c:290
+#: g10/g10.c:299
+msgid "|KEYID|ulimately trust this key"
+msgstr ""
+
+#: g10/g10.c:300
 msgid "|FILE|load extension module FILE"
 msgstr "|FICH|charger le module d'extension FICH"
 
-#: g10/g10.c:291
+#: g10/g10.c:301
 msgid "emulate the mode described in RFC1991"
 msgstr "imiter le mode décrit dans la RFC1991"
 
-#: g10/g10.c:292
+#: g10/g10.c:302
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "utiliser le comportement défini par OpenPGP"
 
-#: g10/g10.c:293
+#: g10/g10.c:303
 msgid "|N|use passphrase mode N"
 msgstr "|N|coder les mots de passe suivant le mode N"
 
-#: g10/g10.c:295
+#: g10/g10.c:305
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOM|utiliser le hachage NOM pour les mots de passe"
 
-#: g10/g10.c:297
+#: g10/g10.c:307
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOM|utiliser le chiffre NOM pour les mots de passe"
 
-#: g10/g10.c:298
+#: g10/g10.c:308
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOM|utiliser l'algorithme de chiffrement NOM"
 
-#: g10/g10.c:299
+#: g10/g10.c:309
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOM|utiliser la fonction de hachage NOM"
 
-#: g10/g10.c:300
+#: g10/g10.c:310
 msgid "|N|use compress algorithm N"
 msgstr "|N|utiliser l'algorithme de compression N"
 
-#: g10/g10.c:301
+#: g10/g10.c:311
 msgid "throw keyid field of encrypted packets"
 msgstr "supprimer l'ident. des paquets chiffrés"
 
-#: g10/g10.c:302
+#: g10/g10.c:312
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOM=VALEUR|utiliser ces données de notation"
 
-#: g10/g10.c:305
+#: g10/g10.c:315
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -647,7 +651,7 @@
 "@\n"
 "(Voir la page de manuel pour une liste complčte des commandes et options)\n"
 
-#: g10/g10.c:308
+#: g10/g10.c:318
 msgid ""
 "@\n"
 "Examples:\n"
@@ -667,17 +671,17 @@
 " --list-keys [utilisateur]    montrer les clés\n"
 " --fingerprint [utilisateur]  montrer les empreintes\n"
 
-#: g10/g10.c:403
+#: g10/g10.c:418
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Signaler toutes anomalies ŕ <gnupg-bugs@gnu.org> (en anglais)\n"
 "et tout problčme de traduction ŕ <traduc@traduc.org>.\n"
 
-#: g10/g10.c:407
+#: g10/g10.c:422
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: g10/g10.c:410
+#: g10/g10.c:425
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -687,7 +691,7 @@
 "signer, vérifier, chiffrer ou déchiffrer\n"
 "l'opération par défaut dépend des données entrées\n"
 
-#: g10/g10.c:417
+#: g10/g10.c:432
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -695,184 +699,188 @@
 "\n"
 "Algorithmes supportés:\n"
 
-#: g10/g10.c:496
+#: g10/g10.c:511
 msgid "usage: gpg [options] "
 msgstr "utilisation: gpg [options] "
 
-#: g10/g10.c:549
+#: g10/g10.c:564
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/g10.c:692
+#: g10/g10.c:704
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTE: pas de fichier d'options par défaut `%s'\n"
 
-#: g10/g10.c:696
+#: g10/g10.c:708
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s': %s\n"
 
-#: g10/g10.c:703
+#: g10/g10.c:715
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: g10/g10.c:893
+#: g10/g10.c:905
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s n'est pas une table de caractčres valide\n"
 
-#: g10/g10.c:949 g10/g10.c:958
+#: g10/g10.c:970
+msgid "WARNING: program may create a core file!\n"
+msgstr "ATTENTION: Le programme peut créer un fichier «core» !\n"
+
+#: g10/g10.c:974 g10/g10.c:983
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTE: %s n'est pas pour une utilisation normale !\n"
 
-#: g10/g10.c:951
+#: g10/g10.c:976
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: g10/g10.c:954
+#: g10/g10.c:979
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s !\n"
 
-#: g10/g10.c:973 g10/g10.c:985
+#: g10/g10.c:998 g10/g10.c:1010
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement sélectionné est invalide\n"
 
-#: g10/g10.c:979 g10/g10.c:991
+#: g10/g10.c:1004 g10/g10.c:1016
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage sélectionnée est invalide\n"
 
-#: g10/g10.c:995
+#: g10/g10.c:1020
 msgid "the given policy URL is invalid\n"
 msgstr "l'URL de politique donnée est invalide\n"
 
-#: g10/g10.c:998
+#: g10/g10.c:1023
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "l'algorithme de compression doit faire partie de l'intervalle %d..%d\n"
 
-#: g10/g10.c:1000
+#: g10/g10.c:1025
 msgid "completes-needed must be greater than 0\n"
 msgstr "«completes-needed» doit ętre supérieur ŕ 0\n"
 
-#: g10/g10.c:1002
+#: g10/g10.c:1027
 msgid "marginals-needed must be greater than 1\n"
 msgstr "«marginals-needed» doit ętre supérieur ŕ 1\n"
 
-#: g10/g10.c:1004
+#: g10/g10.c:1029
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "«max-cert-depth» doit ętre compris entre 1 et 255\n"
 
-#: g10/g10.c:1007
+#: g10/g10.c:1032
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: le mode S2K simple (0) est fortement déconseillé\n"
 
-#: g10/g10.c:1011
+#: g10/g10.c:1036
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K invalide; ce doit ętre 0, 1 ou 3\n"
 
-#: g10/g10.c:1096
+#: g10/g10.c:1121
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance: %s\n"
 
-#: g10/g10.c:1102
+#: g10/g10.c:1127
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/g10.c:1109
+#: g10/g10.c:1134
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/g10.c:1117
+#: g10/g10.c:1142
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/g10.c:1130
+#: g10/g10.c:1155
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/g10.c:1143
+#: g10/g10.c:1168
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/g10.c:1157
+#: g10/g10.c:1182
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/g10.c:1174
+#: g10/g10.c:1199
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1207
 msgid "--sign-key user-id"
 msgstr "--sign-key utilisateur"
 
-#: g10/g10.c:1190
+#: g10/g10.c:1215
 msgid "--lsign-key user-id"
 msgstr "--lsign-key utilisateur"
 
-#: g10/g10.c:1198
+#: g10/g10.c:1223
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1239
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key utilisateur"
 
-#: g10/g10.c:1217
+#: g10/g10.c:1242
 msgid "--delete-key user-id"
 msgstr "--delete-key utilisateur"
 
-#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393
+#: g10/encode.c:265 g10/g10.c:1279 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossible d'ouvrir %s: %s\n"
 
-#: g10/g10.c:1269
+#: g10/g10.c:1294
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [utilisateur] [porte-clés]"
 
-#: g10/g10.c:1335
+#: g10/g10.c:1360
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "la suppression d'une armure a échoué: %s\n"
 
-#: g10/g10.c:1343
+#: g10/g10.c:1368
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "la construction d'une armure a échoué: %s \n"
 
-#: g10/g10.c:1411
+#: g10/g10.c:1439
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1520
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/g10.c:1496
+#: g10/g10.c:1524
 msgid "Go ahead and type your message ...\n"
 msgstr "Continuez et tapez votre message...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1499 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1527 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossible d'ouvrir `%s'\n"
 
-#: g10/g10.c:1669
+#: g10/g10.c:1700
 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:1675
+#: g10/g10.c:1706
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -881,13 +889,13 @@
 "des points ou des traits de soulignement et doit se terminer par un signe "
 "égal\n"
 
-#: g10/g10.c:1681
+#: g10/g10.c:1712
 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:1689
+#: g10/g10.c:1720
 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"
 
@@ -1271,58 +1279,58 @@
 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:433
+#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:435
 #, 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:438
+#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:440
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "taille arrondie ŕ %u bits\n"
 
-#: g10/keygen.c:537
+#: g10/keygen.c:539
 msgid "Please select what kind of key you want:\n"
 msgstr "Sélectionnez le type de clé désiré:\n"
 
-#: g10/keygen.c:539
+#: g10/keygen.c:541
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA et ElGamal (par défaut)\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:542
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (signature seule)\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:544
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (chiffrement seul)\n"
 
-#: g10/keygen.c:543
+#: g10/keygen.c:545
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signature et chiffrement)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:547
 #, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (signature et chiffrement)\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:551
 msgid "Your selection? "
 msgstr "Votre choix ? "
 
-#: g10/keygen.c:560 g10/keygen.c:568
+#: g10/keygen.c:562 g10/keygen.c:570
 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:582
+#: g10/keygen.c:584
 msgid "Invalid selection.\n"
 msgstr "Choix invalide.\n"
 
-#: g10/keygen.c:594
+#: g10/keygen.c:596
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1335,19 +1343,19 @@
 "          la taille par défaut est 1024 bits\n"
 " la taille maximale conseillée est 2048 bits\n"
 
-#: g10/keygen.c:601
+#: g10/keygen.c:603
 msgid "What keysize do you want? (1024) "
 msgstr "Quelle taille de clé désirez-vous ? (1024) "
 
-#: g10/keygen.c:606
+#: g10/keygen.c:608
 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:608
+#: g10/keygen.c:610
 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:610
+#: g10/keygen.c:612
 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"
 
@@ -1359,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:621
+#: g10/keygen.c:623
 #, 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:626
+#: g10/keygen.c:628
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1372,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:629
+#: g10/keygen.c:631
 msgid "Are you sure that you want this keysize? "
 msgstr "Etes-vous sűr de vouloir cette taille ? "
 
-#: g10/keygen.c:630
+#: g10/keygen.c:632
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1384,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:638
+#: g10/keygen.c:640
 msgid "Do you really need such a large keysize? "
 msgstr "Avez-vous réellement besoin d'une taille aussi grande ? "
 
-#: g10/keygen.c:644
+#: g10/keygen.c:646
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La taille demandée est %u bits\n"
 
-#: g10/keygen.c:647 g10/keygen.c:651
+#: g10/keygen.c:649 g10/keygen.c:653
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrondie ŕ %u bits\n"
 
-#: g10/keygen.c:699
+#: g10/keygen.c:701
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1414,25 +1422,25 @@
 "      <n>m = la clé expire dans n mois\n"
 "      <n>y = la clé expire dans n ans\n"
 
-#: g10/keygen.c:714
+#: g10/keygen.c:716
 msgid "Key is valid for? (0) "
 msgstr "La clé est valide pour ? (0) "
 
-#: g10/keygen.c:719
+#: g10/keygen.c:721
 msgid "invalid value\n"
 msgstr "valeur invalide\n"
 
-#: g10/keygen.c:724
+#: g10/keygen.c:726
 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:730
+#: g10/keygen.c:732
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La clé expire le %s\n"
 
-#: g10/keygen.c:733
+#: g10/keygen.c:735
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1440,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:738
+#: g10/keygen.c:740
 msgid "Is this correct (y/n)? "
 msgstr "Est-ce correct (o/n) ? "
 
-#: g10/keygen.c:781
+#: g10/keygen.c:783
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1460,44 +1468,44 @@
 "   « Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de> »\n"
 "\n"
 
-#: g10/keygen.c:793
+#: g10/keygen.c:795
 msgid "Real name: "
 msgstr "Nom réel: "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:803
 msgid "Invalid character in name\n"
 msgstr "Caractčre invalide dans le nom\n"
 
-#: g10/keygen.c:799
+#: g10/keygen.c:805
 msgid "Name may not start with a digit\n"
 msgstr "Le nom ne doit pas commencer par un chiffre\n"
 
-#: g10/keygen.c:801
+#: g10/keygen.c:807
 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:809
+#: g10/keygen.c:815
 msgid "Email address: "
 msgstr "Adresse e-mail: "
 
-#: g10/keygen.c:820
+#: g10/keygen.c:826
 msgid "Not a valid email address\n"
 msgstr "Ce n'est pas une adresse e-mail valide\n"
 
-#: g10/keygen.c:828
+#: g10/keygen.c:834
 msgid "Comment: "
 msgstr "Commentaire: "
 
-#: g10/keygen.c:834
+#: g10/keygen.c:840
 msgid "Invalid character in comment\n"
 msgstr "Caractčre invalide dans le commentaire\n"
 
-#: g10/keygen.c:857
+#: g10/keygen.c:863
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vous utilisez le jeu de caractčres '%s'.\n"
 
-#: g10/keygen.c:863
+#: g10/keygen.c:869
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1508,28 +1516,28 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:867
+#: g10/keygen.c:873
 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:872
+#: g10/keygen.c:878
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:882
+#: g10/keygen.c:888
 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:883
+#: g10/keygen.c:889
 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:902
+#: g10/keygen.c:908
 msgid "Please correct the error first\n"
 msgstr "Corrigez l'erreur d'abord\n"
 
-#: g10/keygen.c:940
+#: g10/keygen.c:946
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1537,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:948
+#: g10/keyedit.c:468 g10/keygen.c:954
 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:954
+#: g10/keygen.c:960
 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"
@@ -1553,7 +1561,7 @@
 "le désirez, en utilisant ce programme avec l'option « --edit-key ».\n"
 "\n"
 
-#: g10/keygen.c:975
+#: g10/keygen.c:981
 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"
@@ -1565,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:1424
+#: g10/keygen.c:1430
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "La paire de clés DSA fera 1024 bits.\n"
 
-#: g10/keygen.c:1467
+#: g10/keygen.c:1473
 msgid "Key generation canceled.\n"
 msgstr "La génération de clé a été annulée.\n"
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1570
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "écriture de la clé publique vers `%s'\n"
 
-#: g10/keygen.c:1565
+#: g10/keygen.c:1571
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "écriture de la clé secrčte vers `%s'\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1667
 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:1666
+#: g10/keygen.c:1672
 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"
@@ -1596,13 +1604,13 @@
 "utiliser la commande «--edit-key» pour générer une clé secondaire ŕ\n"
 "cette fin.\n"
 
-#: g10/keygen.c:1683 g10/keygen.c:1784
+#: g10/keygen.c:1689 g10/keygen.c:1790
 #, 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:1727 g10/sig-check.c:318 g10/sign.c:112
+#: g10/keygen.c:1733 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"
@@ -1610,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:1729 g10/sig-check.c:320 g10/sign.c:114
+#: g10/keygen.c:1735 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"
@@ -1618,11 +1626,11 @@
 "la clé a été créée %lu secondes dans le futur (rupture spatio-temporelle ou\n"
 "problčme d'horloge\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1768
 msgid "Really create? "
 msgstr "Créer vraiment ? "
 
-#: g10/encode.c:91 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/encode.c:91 g10/openfile.c:178 g10/openfile.c:288 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1633,17 +1641,17 @@
 msgid "error creating passphrase: %s\n"
 msgstr "erreur pendant la création du mot de passe: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:319
+#: g10/encode.c:171 g10/encode.c:324
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ATTENTION: fichier vide\n"
 
-#: g10/encode.c:266
+#: g10/encode.c:271
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lecture de `%s'\n"
 
-#: g10/encode.c:483
+#: g10/encode.c:492
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s chiffré pour: %s\n"
@@ -1692,249 +1700,259 @@
 msgid "No user ID for key\n"
 msgstr "Pas d'utilisateur pour la clé\n"
 
-#: g10/getkey.c:1642 g10/getkey.c:1698
+#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr ""
 "utilisation de la clé secondaire %08lX ŕ la place de la clé\n"
 "principale %08lX\n"
 
-#: g10/getkey.c:2017
+#: g10/getkey.c:2050
 msgid "[User id not found]"
 msgstr "[Nom utilisateur introuvable]"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "un bloc de type %d a été ignoré\n"
 
-#: g10/import.c:188 g10/trustdb.c:1740 g10/trustdb.c:1781
+#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu clés traitées jusqu'ici\n"
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: g10/import.c:203
+#: g10/import.c:204
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "       Quantité totale traitée: %lu\n"
 
-#: g10/import.c:205
+#: g10/import.c:206
+#, fuzzy, c-format
+msgid "      skipped new keys: %lu\n"
+msgstr "           nouvelles sous-clés: %lu\n"
+
+#: g10/import.c:209
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "        sans nom d'utilisateur: %lu\n"
 
-#: g10/import.c:207
+#: g10/import.c:211
 #, c-format
 msgid "              imported: %lu"
 msgstr "                      importée: %lu"
 
-#: g10/import.c:213
+#: g10/import.c:217
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                     inchangée: %lu\n"
 
-#: g10/import.c:215
+#: g10/import.c:219
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "  nouveaux noms d'utilisateurs: %lu\n"
 
-#: g10/import.c:217
+#: g10/import.c:221
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nouvelles sous-clés: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:223
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "          nouvelles signatures: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:225
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr " nouvelles révocations de clés: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:227
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "            clés secrčtes lues: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:229
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "       clés secrčtes importées: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:231
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "      clés secrčtes inchangées: %lu\n"
 
-#: g10/import.c:386 g10/import.c:578
+#: g10/import.c:391 g10/import.c:590
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "clé %08lX: pas de nom d'utilisateur\n"
 
-#: g10/import.c:400
+#: g10/import.c:405
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "clé %08lX: pas de nom d'utilisateur valide\n"
 
-#: g10/import.c:402
+#: g10/import.c:407
 msgid "this may be caused by a missing self-signature\n"
 msgstr "cela peut provenir d'une auto-signature manquante\n"
 
-#: g10/import.c:413 g10/import.c:645
+#: g10/import.c:418 g10/import.c:657
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "clé %08lX: clé publique pas trouvée: %s\n"
 
-#: g10/import.c:419
+#: g10/import.c:423
+#, fuzzy, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "clé %08lX: ce n'est pas une clé rfc2440 - ignorée\n"
+
+#: g10/import.c:431
 msgid "no default public keyring\n"
 msgstr "pas de porte-clés public par défaut\n"
 
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
+#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "écriture de `%s'\n"
 
-#: g10/import.c:426 g10/import.c:484 g10/import.c:593 g10/import.c:694
+#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "impossible de verrouiller le porte-clés `%s': %s\n"
 
-#: g10/import.c:429 g10/import.c:487 g10/import.c:596 g10/import.c:697
+#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erreur durant l'écriture du porte-clés `%s': %s\n"
 
-#: g10/import.c:434
+#: g10/import.c:446
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "clé %08lX: clé publique importée\n"
 
-#: g10/import.c:451
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "clé %08lX: ne ressemble pas ŕ notre copie\n"
 
-#: g10/import.c:460 g10/import.c:653
+#: g10/import.c:472 g10/import.c:665
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "clé %08lX: impossible de trouver le bloc de clés original: %s\n"
 
-#: g10/import.c:466 g10/import.c:659
+#: g10/import.c:478 g10/import.c:671
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "clé %08lX: impossible de lire le bloc de clés original: %s\n"
 
-#: g10/import.c:493
+#: g10/import.c:505
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "clé %08lX: un nouvel utilisateur\n"
 
-#: g10/import.c:496
+#: g10/import.c:508
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "clé %08lX: %d nouveaux utilisateurs\n"
 
-#: g10/import.c:499
+#: g10/import.c:511
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "clé %08lX: une nouvelle signature\n"
 
-#: g10/import.c:502
+#: g10/import.c:514
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "clé %08lX: %d nouvelles signatures\n"
 
-#: g10/import.c:505
+#: g10/import.c:517
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "clé %08lX: une nouvelle sous-clé\n"
 
-#: g10/import.c:508
+#: g10/import.c:520
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "clé %08lX: %d nouvelles sous-clés\n"
 
-#: g10/import.c:518
+#: g10/import.c:530
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "clé %08lX: n'a pas changé\n"
 
-#: g10/import.c:601
+#: g10/import.c:613
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "clé %08lX: clé secrčte importée\n"
 
 #. we can't merge secret keys
-#: g10/import.c:605
+#: g10/import.c:617
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "clé %08lX: déjŕ dans le porte-clés secret\n"
 
-#: g10/import.c:610
+#: g10/import.c:622
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "clé %08lX: clé secrčte pas trouvée: %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:651
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "clé %08lX: pas de clé publique - le certificat de révocation ne peut\n"
 "ętre appliqué\n"
 
-#: g10/import.c:670
+#: g10/import.c:682
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "clé %08lX: certificat de révocation invalide: %s - rejeté\n"
 
-#: g10/import.c:702
+#: g10/import.c:714
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "clé %08lX: certificat de révocation importé\n"
 
-#: g10/import.c:744
+#: g10/import.c:756
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "clé %08lX: pas d'utilisateur pour la signature\n"
 
-#: g10/import.c:751 g10/import.c:775
+#: g10/import.c:763 g10/import.c:787
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "clé %08lX: algorithme de clé publique non supporté\n"
 
-#: g10/import.c:752
+#: g10/import.c:764
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "clé %08lX: auto-signature invalide\n"
 
-#: g10/import.c:767
+#: g10/import.c:779
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "clé %08lX: pas de sous-clé pour relier la clé\n"
 
-#: g10/import.c:776
+#: g10/import.c:788
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "clé %08lX: liaison avec la sous-clé invalide\n"
 
-#: g10/import.c:803
+#: g10/import.c:815
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "clé %08lX: utilisateur non signé par lui-męme accepté: '"
 
-#: g10/import.c:832
+#: g10/import.c:844
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "clé %08lX: utilisateur non pris en compte: '"
 
-#: g10/import.c:855
+#: g10/import.c:867
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "clé %08lX: sous-clé non prise en compte\n"
@@ -1943,32 +1961,32 @@
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:880
+#: g10/import.c:892
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "clé %08lX: signature non exportable (classe %02x) - ignorée\n"
 
-#: g10/import.c:889
+#: g10/import.c:901
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "clé %08lX: certificat de révocation au mauvais endroit - ignorée\n"
 
-#: g10/import.c:897
+#: g10/import.c:909
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "clé %08lX: certificat de révocation invalide: %s - ignorée\n"
 
-#: g10/import.c:997
+#: g10/import.c:1009
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "clé %08lX: nom d'utilisateur en double fusionné\n"
 
-#: g10/import.c:1048
+#: g10/import.c:1060
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "clé %08lX: certificat de révocation ajouté\n"
 
-#: g10/import.c:1162 g10/import.c:1215
+#: g10/import.c:1174 g10/import.c:1227
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "clé %08lX: notre copie n'a pas d'auto-signature\n"
@@ -2546,8 +2564,18 @@
 msgid "no secret key\n"
 msgstr "pas de clé secrčte\n"
 
+#: g10/keylist.c:158
+#, fuzzy
+msgid "invalid"
+msgstr "armure invalide"
+
+#: g10/keylist.c:178
+#, fuzzy
+msgid "revoked"
+msgstr "revclé"
+
 #. of subkey
-#: g10/keylist.c:318 g10/mainproc.c:742
+#: g10/keylist.c:400 g10/mainproc.c:760
 #, c-format
 msgid " [expires: %s]"
 msgstr " [expire: %s]"
@@ -2557,129 +2585,117 @@
 msgid "public key is %08lX\n"
 msgstr "la clé publique est %08lX\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:257
 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:281
+#: g10/mainproc.c:299
 #, 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:291
+#: g10/mainproc.c:309
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "chiffré avec une clé %s, %08lX\n"
 
-#: g10/mainproc.c:297
+#: g10/mainproc.c:315
 msgid "no secret key for decryption available\n"
 msgstr "aucune clé secrčte n'est disponible pour le déchiffrement\n"
 
-#: g10/mainproc.c:306
+#: g10/mainproc.c:324
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "le déchiffrement par clé publique a échoué: %s\n"
 
-#: g10/mainproc.c:343
+#: g10/mainproc.c:361
 msgid "decryption okay\n"
 msgstr "le déchiffrement a réussi\n"
 
-#: g10/mainproc.c:348
+#: g10/mainproc.c:366
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENTION: le message chiffré a été manipulé !\n"
 
-#: g10/mainproc.c:353
+#: g10/mainproc.c:371
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "le déchiffrement a échoué: %s\n"
 
-#: g10/mainproc.c:372
+#: g10/mainproc.c:390
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTE: l'expéditeur a demandé «pour vos yeux seulement»\n"
 
-#: g10/mainproc.c:374
+#: g10/mainproc.c:392
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom de fichier original: '%.*s'\n"
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:544
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "révocation autonome - utilisez «gpg --import» pour l'appliquer\n"
 
-#: g10/mainproc.c:613 g10/mainproc.c:622
+#: g10/mainproc.c:631 g10/mainproc.c:640
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATTENTION: des données de notation invalides ont été détectées\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:643
 msgid "Notation: "
 msgstr "Notation: "
 
-#: g10/mainproc.c:632
+#: g10/mainproc.c:650
 msgid "Policy: "
 msgstr "Politique: "
 
-#: g10/mainproc.c:1062
+#: g10/mainproc.c:1080
 msgid "signature verification suppressed\n"
 msgstr "vérification de signature supprimée\n"
 
-#: g10/mainproc.c:1068
+#: g10/mainproc.c:1086
 #, 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:1094 g10/mainproc.c:1105
+#: g10/mainproc.c:1112 g10/mainproc.c:1123
 msgid "BAD signature from \""
 msgstr "MAUVAISE signature de \""
 
-#: g10/mainproc.c:1095 g10/mainproc.c:1106
+#: g10/mainproc.c:1113 g10/mainproc.c:1124
 msgid "Good signature from \""
 msgstr "Bonne signature de \""
 
-#: g10/mainproc.c:1097
+#: g10/mainproc.c:1115
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1153
+#: g10/mainproc.c:1171
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossible de vérifier la signature: %s\n"
 
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1235
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signature autonome de classe 0x%02x\n"
 
-#: g10/mainproc.c:1263
+#: g10/mainproc.c:1281
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature d'un ancien style (PGP 2.x)\n"
 
-#: g10/mainproc.c:1268
+#: g10/mainproc.c:1286
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquet racine invalide détecté dans proc_tree()\n"
 
-#: g10/misc.c:94
+#: g10/misc.c:96
 #, 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:97
-msgid "WARNING: program may create a core file!\n"
-msgstr "ATTENTION: Le programme peut créer un fichier «core» !\n"
-
-#: g10/misc.c:205
+#: g10/misc.c:206
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Les algorithmes expérimentaux ne devraient pas ętre utilisés !\n"
 
-#: g10/misc.c:219
-msgid ""
-"RSA keys are deprecated; please consider creating a new key and use this key "
-"in the future\n"
-msgstr ""
-"Les clés RSA sont déconseillées: considérez créer une nouvelle clé\n"
-"et l'utiliser dans l'avenir\n"
-
-#: g10/misc.c:241
+#: g10/misc.c:233
 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"
@@ -2690,7 +2706,7 @@
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossible de gérer l'algorithme ŕ clé publique %d\n"
 
-#: g10/parse-packet.c:965
+#: g10/parse-packet.c:986
 #, 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"
@@ -2727,94 +2743,94 @@
 msgid "Repeat passphrase: "
 msgstr "Répétez le mot de passe: "
 
-#: g10/plaintext.c:63
+#: g10/plaintext.c:67
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "les données ne sont pas enregistrées; utilisez l'option «--output» pour\n"
 "les enregistrer\n"
 
-#: g10/plaintext.c:317
+#: g10/plaintext.c:324
 msgid "Detached signature.\n"
 msgstr "Signature détachée.\n"
 
-#: g10/plaintext.c:321
+#: g10/plaintext.c:328
 msgid "Please enter name of data file: "
 msgstr "Entrez le nom du fichier de données: "
 
-#: g10/plaintext.c:342
+#: g10/plaintext.c:349
 msgid "reading stdin ...\n"
 msgstr "lecture de l'entrée standard...\n"
 
-#: g10/plaintext.c:385
+#: g10/plaintext.c:392
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "impossible d'ouvir les données signées `%s'\n"
 
-#: g10/pubkey-enc.c:79
+#: g10/pubkey-enc.c:76
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "destinataire anonyme; essai de la clé secrčte %08lX...\n"
 
-#: g10/pubkey-enc.c:85
+#: g10/pubkey-enc.c:82
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "d'accord, nous sommes le récipient anonyme.\n"
 
-#: g10/pubkey-enc.c:137
+#: g10/pubkey-enc.c:134
 msgid "old encoding of the DEK is not supported\n"
 msgstr "l'ancien codage de la clé de chiffrement (DEK) n'est pas supporté\n"
 
-#: g10/pubkey-enc.c:156
+#: g10/pubkey-enc.c:153
 #, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "l'algorithme de chiffrement %d est inconnu ou désactivé\n"
 
-#: g10/pubkey-enc.c:195
+#: g10/pubkey-enc.c:192
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr ""
 "NOTE: l'algorithme de chiffrement %d n'a pas été trouvé dans les "
 "préférences\n"
 
-#: g10/pubkey-enc.c:201
+#: g10/pubkey-enc.c:198
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTE: la clé secrčte %08lX a expiré le %s\n"
 
-#: g10/hkp.c:62
+#: g10/hkp.c:72
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
 msgstr "requęte de la clé %08lX de %s...\n"
 
-#: g10/hkp.c:75
+#: g10/hkp.c:85
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "impossible d'obtenir les clés du serveur: %s\n"
 
-#: g10/hkp.c:98 g10/hkp.c:136
+#: g10/hkp.c:109 g10/hkp.c:148
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "aucun serveur de clés n'est connu (utilisez l'option «--keyserver»)\n"
 
-#: g10/hkp.c:106
+#: g10/hkp.c:117
 #, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "%s: l'identification de la clé est invalide\n"
 
-#: g10/hkp.c:158
+#: g10/hkp.c:170
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "impossible de se connecter ŕ `%s': %s\n"
 
-#: g10/hkp.c:182
+#: g10/hkp.c:194
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "erreur pendant l'envoi de `%s': %s\n"
 
-#: g10/hkp.c:194
+#: g10/hkp.c:206
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "l'envoi ŕ `%s' s'est déroulé avec succčs (résultat=%u)\n"
 
-#: g10/hkp.c:197
+#: g10/hkp.c:209
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "l'envoi ŕ `%s' a échoué: le résultat est %u\n"
@@ -2828,41 +2844,41 @@
 msgid "protection algorithm %d is not supported\n"
 msgstr "l'algorithme de protection %d n'est pas supporté\n"
 
-#: g10/seckey-cert.c:175
+#: g10/seckey-cert.c:184
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Mot de passe invalide; réessayez...\n"
 
-#: g10/seckey-cert.c:231
+#: g10/seckey-cert.c:240
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "ATTENTION: Clé faible détectée - changez encore le mot de passe.\n"
 
-#: g10/sig-check.c:202
+#: g10/sig-check.c:199
 msgid "assuming bad MDC due to an unknown critical bit\n"
 msgstr "le sceau (MDC) est supposé ętre faux car un bit critique est inconnu\n"
 
-#: g10/sig-check.c:300
+#: g10/sig-check.c:297
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "Ceci est une clé ElGamal générée par PGP qui n'est PAS sűre pour les\n"
 "signatures !\n"
 
-#: g10/sig-check.c:308
+#: g10/sig-check.c:305
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "la clé publique est plus récente de %lu seconde que la signature\n"
 
-#: g10/sig-check.c:309
+#: g10/sig-check.c:306
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "la clé publique est plus récente de %lu secondes que la signature\n"
 
-#: g10/sig-check.c:327
+#: g10/sig-check.c:324
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "NOTE: la clé de signature a expiré le %s\n"
 
-#: g10/sig-check.c:396
+#: g10/sig-check.c:393
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "la signature est supposée ętre fausse car un bit critique est\n"
@@ -2873,7 +2889,7 @@
 msgid "%s signature from: %s\n"
 msgstr "Signature %s de: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:606
+#: g10/sign.c:290 g10/sign.c:610
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "impossible de créer %s: %s\n"
@@ -2922,7 +2938,7 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: le répertoire n'existe pas !\n"
 
-#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1363 g10/tdbio.c:444
+#: g10/openfile.c:226 g10/openfile.c:295 g10/ringedit.c:1369 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: impossible de créer: %s\n"
@@ -3024,296 +3040,306 @@
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "la base de confiance est corrompue; exécutez «gpg --fix-trustdb».\n"
 
-#: g10/trustdb.c:168
+#: g10/trustdb.c:169
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr ""
 "enregistrement de confiance %lu, type de requęte %d: la lecture a échoué: "
 "%s\n"
 
-#: g10/trustdb.c:183
+#: g10/trustdb.c:184
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "enregistrement de confiance %lu, type %d: l'écriture a échoué: %s\n"
 
-#: g10/trustdb.c:197
+#: g10/trustdb.c:198
 #, c-format
 msgid "trust record %lu: delete failed: %s\n"
 msgstr "enregistrement de confiance %lu: la suppression a échoué: %s\n"
 
-#: g10/trustdb.c:211
+#: g10/trustdb.c:212
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de confiance: la synchronisation a échoué: %s\n"
 
-#: g10/trustdb.c:376
+#: g10/trustdb.c:377
 #, c-format
 msgid "error reading dir record for LID %lu: %s\n"
 msgstr ""
 "erreur pendant la lecture de l'enregistrement de répertoire pour\n"
 "le LID %lu: %s\n"
 
-#: g10/trustdb.c:383
+#: g10/trustdb.c:384
 #, c-format
 msgid "lid %lu: expected dir record, got type %d\n"
 msgstr "lid %lu: enregistrement de répertoire attendu, a reçu le type %d\n"
 
-#: g10/trustdb.c:388
+#: g10/trustdb.c:389
 #, c-format
 msgid "no primary key for LID %lu\n"
 msgstr "pas de clé principale pour le LID %lu\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:394
 #, c-format
 msgid "error reading primary key for LID %lu: %s\n"
 msgstr "erreur pendant la lecture de la clé principale pour le LID %lu: %s\n"
 
-#: g10/trustdb.c:432
+#: g10/trustdb.c:433
 #, c-format
 msgid "get_dir_record: search_record failed: %s\n"
 msgstr "get_dir_record: search_record a échoué: %s\n"
 
-#: g10/trustdb.c:487
-#, c-format
-msgid "NOTE: secret key %08lX is NOT protected.\n"
-msgstr "NOTE: la clé secrčte %08lX n'est PAS protégée.\n"
-
-#: g10/trustdb.c:495
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr "clé %08lX: clé secrčte sans clé publique - non prise en compte\n"
-
-#: g10/trustdb.c:502
-#, c-format
-msgid "key %08lX: secret and public key don't match\n"
-msgstr "clé %08lX: les clés secrčte et publique ne correspondent pas\n"
+#: g10/trustdb.c:474
+#, fuzzy, c-format
+msgid "'%s' is not a valid long keyID\n"
+msgstr "%s: l'identification de la clé est invalide\n"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:501
 #, c-format
 msgid "key %08lX: can't put it into the trustdb\n"
 msgstr "clé %08lX: impossible de la mettre dans la base de confiance\n"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:507
 #, c-format
 msgid "key %08lX: query record failed\n"
 msgstr "clé %08lX: l'enregistrement de requęte a échoué\n"
 
-#: g10/trustdb.c:529
+#: g10/trustdb.c:516
 #, c-format
 msgid "key %08lX: already in trusted key table\n"
 msgstr "clé %08lX: déjŕ dans la table des clés certifiées\n"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:519
 #, c-format
 msgid "key %08lX: accepted as trusted key.\n"
 msgstr "clé %08lX: acceptée comme clé certifiée.\n"
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:546
+#, fuzzy, c-format
+msgid "key %08lX: no public key for trusted key - skipped\n"
+msgstr "clé %08lX: non protégée - ignorée\n"
+
+#: g10/trustdb.c:565
+#, c-format
+msgid "NOTE: secret key %08lX is NOT protected.\n"
+msgstr "NOTE: la clé secrčte %08lX n'est PAS protégée.\n"
+
+#: g10/trustdb.c:577
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr "clé %08lX: clé secrčte sans clé publique - non prise en compte\n"
+
+#: g10/trustdb.c:584
+#, c-format
+msgid "key %08lX: secret and public key don't match\n"
+msgstr "clé %08lX: les clés secrčte et publique ne correspondent pas\n"
+
+#: g10/trustdb.c:597
 #, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr "l'énumération des clés secrčtes a échoué: %s\n"
 
-#: g10/trustdb.c:921
+#: g10/trustdb.c:987
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "clé %08lX.%lu: bonne liaison avec la sous-clé\n"
 
-#: g10/trustdb.c:927 g10/trustdb.c:962
+#: g10/trustdb.c:993 g10/trustdb.c:1028
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "clé %08lX.%lu: liaison avec la sous-clé invalide: %s\n"
 
-#: g10/trustdb.c:939
+#: g10/trustdb.c:1005
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "clé %08lX.%lu: révocation de clé valide\n"
 
-#: g10/trustdb.c:945
+#: g10/trustdb.c:1011
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "clé %08lX.%lu: révocation de sous-clé invalide: %s\n"
 
-#: g10/trustdb.c:956
+#: g10/trustdb.c:1022
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "clé %08lX.%lu: révocation de sous-clé valide\n"
 
-#: g10/trustdb.c:1067
+#: g10/trustdb.c:1133
 msgid "Good self-signature"
 msgstr "Bonne auto-signature"
 
-#: g10/trustdb.c:1077
+#: g10/trustdb.c:1143
 msgid "Invalid self-signature"
 msgstr "Auto-signature invalide"
 
-#: g10/trustdb.c:1104
+#: g10/trustdb.c:1170
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 "La révocation valide de nom d'utilisateur a été ignorée car l'auto-\n"
 "signature est plus récente"
 
-#: g10/trustdb.c:1110
+#: g10/trustdb.c:1176
 msgid "Valid user ID revocation"
 msgstr "Révocation de nom d'utilisateur valide"
 
-#: g10/trustdb.c:1115
+#: g10/trustdb.c:1181
 msgid "Invalid user ID revocation"
 msgstr "Révocation de nom d'utilisateur invalide"
 
-#: g10/trustdb.c:1157
+#: g10/trustdb.c:1223
 msgid "Valid certificate revocation"
 msgstr "Certificat de révocation valide"
 
-#: g10/trustdb.c:1158
+#: g10/trustdb.c:1224
 msgid "Good certificate"
 msgstr "Bon certificat"
 
-#: g10/trustdb.c:1186
+#: g10/trustdb.c:1252
 msgid "Invalid certificate revocation"
 msgstr "Révocation de certificat invalide"
 
-#: g10/trustdb.c:1187
+#: g10/trustdb.c:1253
 msgid "Invalid certificate"
 msgstr "Certificat invalide"
 
-#: g10/trustdb.c:1204 g10/trustdb.c:1208
+#: g10/trustdb.c:1270 g10/trustdb.c:1274
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr ""
 "l'enregistrement de signature %lu[%d] pointe vers un mauvais\n"
 "enregistrement de répertoire\n"
 
-#: g10/trustdb.c:1267
+#: g10/trustdb.c:1333
 msgid "duplicated certificate - deleted"
 msgstr "certificat dupliqué - supprimé"
 
-#: g10/trustdb.c:1584
+#: g10/trustdb.c:1650
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir a échoué: %s\n"
 
-#: g10/trustdb.c:1718
+#: g10/trustdb.c:1784
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: l'insertion a échoué: %s\n"
 
-#: g10/trustdb.c:1723
+#: g10/trustdb.c:1789
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: l'insertion a échoué: %s\n"
 
-#: g10/trustdb.c:1729
+#: g10/trustdb.c:1795
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: inséré\n"
 
-#: g10/trustdb.c:1734
+#: g10/trustdb.c:1800
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "erreur pendant la lecture de l'enregistrement de répertoire: %s\n"
 
-#: g10/trustdb.c:1742 g10/trustdb.c:1805
+#: g10/trustdb.c:1808 g10/trustdb.c:1871
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu clés traitées\n"
 
-#: g10/trustdb.c:1744 g10/trustdb.c:1811
+#: g10/trustdb.c:1810 g10/trustdb.c:1877
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu clés avec erreurs\n"
 
-#: g10/trustdb.c:1746
+#: g10/trustdb.c:1812
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu clés insérées\n"
 
-#: g10/trustdb.c:1749
+#: g10/trustdb.c:1815
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "l'énumération des blocs de clés a échoué: %s\n"
 
-#: g10/trustdb.c:1797
+#: g10/trustdb.c:1863
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: enregistrement de répertoire sans clé - ignoré\n"
 
-#: g10/trustdb.c:1807
+#: g10/trustdb.c:1873
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "\t%lu ŕ cause de nouvelles clés publiques\n"
 
-#: g10/trustdb.c:1809
+#: g10/trustdb.c:1875
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu clés ignorées\n"
 
-#: g10/trustdb.c:1813
+#: g10/trustdb.c:1879
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu clés mises ŕ jour\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2224
 msgid "Ooops, no keys\n"
 msgstr "Ooops, pas de clé\n"
 
-#: g10/trustdb.c:2162
+#: g10/trustdb.c:2228
 msgid "Ooops, no user IDs\n"
 msgstr "Ooops, pas de nom d'utilisateur\n"
 
-#: g10/trustdb.c:2320
+#: g10/trustdb.c:2386
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr ""
 "check_trust: la recherche d'enregistrement de répertoire a échoué: %s\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2395
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "clé %08lX: l'insertion d'enregistrement de confiance a échoué: %s\n"
 
-#: g10/trustdb.c:2333
+#: g10/trustdb.c:2399
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "clé %08lX.%lu: insérée dans la base de confiance\n"
 
-#: g10/trustdb.c:2341
+#: g10/trustdb.c:2407
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "clé %08lX.%lu: créée dans le futur (voyage temporel ou\n"
 "problčme d'horloge)\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2422
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "clé %08lX.%lu: a expiré le %s\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2430
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "clé %08lX.%lu: la vérification de confiance a échoué: %s\n"
 
-#: g10/trustdb.c:2515
+#: g10/trustdb.c:2581
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "l'utilisateur '%s' n'a pas été trouvé: %s\n"
 
-#: g10/trustdb.c:2517
+#: g10/trustdb.c:2583
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problčme de recherche de '%s' dans la base de confiance: %s\n"
 
-#: g10/trustdb.c:2520
+#: g10/trustdb.c:2586
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "l'utilisateur '%s' n'est pas dans la base de confiance - insertion\n"
 
-#: g10/trustdb.c:2523
+#: g10/trustdb.c:2589
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "impossible d'insérer '%s' dans la base de confiance: %s\n"
 
-#: g10/trustdb.c:2709 g10/trustdb.c:2739
+#: g10/trustdb.c:2775 g10/trustdb.c:2805
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr ""
 "ATTENTION: les enregistrements de préférences longs ne sont pas encore\n"
@@ -3341,27 +3367,27 @@
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: impossible de créer le porte-clés: %s\n"
 
-#: g10/ringedit.c:319 g10/ringedit.c:1368
+#: g10/ringedit.c:319 g10/ringedit.c:1374
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: porte-clés créé\n"
 
-#: g10/ringedit.c:1545
+#: g10/ringedit.c:1551
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 "ATTENTION: 2 fichiers avec des informations confidentielles existent.\n"
 
-#: g10/ringedit.c:1546
+#: g10/ringedit.c:1552
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s est le fichier original\n"
 
-#: g10/ringedit.c:1547
+#: g10/ringedit.c:1553
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s est le nouveau\n"
 
-#: g10/ringedit.c:1548
+#: g10/ringedit.c:1554
 msgid "Please fix this possible security flaw\n"
 msgstr "Réparez ce problčme de sécurité possible\n"
 
@@ -3386,49 +3412,49 @@
 "sűre pour les signatures !\n"
 
 #. do not overwrite
-#: g10/openfile.c:79
+#: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Le fichier `%s' existe. "
 
-#: g10/openfile.c:81
+#: g10/openfile.c:86
 msgid "Overwrite (y/N)? "
 msgstr "Réécrire (o/N)? "
 
-#: g10/openfile.c:109
+#: g10/openfile.c:119
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: suffixe inconnu\n"
 
-#: g10/openfile.c:131
+#: g10/openfile.c:141
 msgid "Enter new filename"
 msgstr "Entrez le nouveau nom de fichier"
 
-#: g10/openfile.c:172
+#: g10/openfile.c:182
 msgid "writing to stdout\n"
 msgstr "écriture vers la sortie standard\n"
 
-#: g10/openfile.c:250
+#: g10/openfile.c:261
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "les données signées sont supposées ętre dans `%s'\n"
 
-#: g10/openfile.c:300
+#: g10/openfile.c:311
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: nouveau fichier d'options créé\n"
 
-#: g10/openfile.c:313
+#: g10/openfile.c:338
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: impossible de créer le répertoire: %s\n"
 
-#: g10/openfile.c:316
+#: g10/openfile.c:341
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: répertoire créé\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:343
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr ""
 "vous devez redémarrer GnuPG pour qu'il puisse lire le nouveau\n"
@@ -3744,3 +3770,10 @@
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Pas d'aide disponible pour `%s'"
+
+#~ msgid ""
+#~ "RSA keys are deprecated; please consider creating a new key and use this key "
+#~ "in the future\n"
+#~ msgstr ""
+#~ "Les clés RSA sont déconseillées: considérez créer une nouvelle clé\n"
+#~ "et l'utiliser dans l'avenir\n"
diff -urN gnupg-1.0.2/po/gnupg.pot gnupg-1.0.3/po/gnupg.pot
--- gnupg-1.0.2/po/gnupg.pot	Wed Jul 12 12:13:30 2000
+++ gnupg-1.0.3/po/gnupg.pot	Mon Sep 18 12:18:01 2000
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-12 12:13+0200\n"
+"POT-Creation-Date: 2000-09-18 12:17+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"
@@ -256,7 +256,7 @@
 msgid "you found a bug ... (%s:%d)\n"
 msgstr ""
 
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1255
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr ""
@@ -308,11 +308,11 @@
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:647
+#: cipher/random.c:650
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 
-#: cipher/random.c:648
+#: cipher/random.c:651
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -321,7 +321,7 @@
 "\n"
 msgstr ""
 
-#: cipher/rndlinux.c:141
+#: cipher/rndlinux.c:142
 #, c-format
 msgid ""
 "\n"
@@ -329,299 +329,303 @@
 "the OS a chance to collect more entropy! (Need %d more bytes)\n"
 msgstr ""
 
-#: g10/g10.c:197
+#: g10/g10.c:206
 msgid ""
 "@Commands:\n"
 " "
 msgstr ""
 
-#: g10/g10.c:199
+#: g10/g10.c:208
 msgid "|[file]|make a signature"
 msgstr ""
 
-#: g10/g10.c:200
+#: g10/g10.c:209
 msgid "|[file]|make a clear text signature"
 msgstr ""
 
-#: g10/g10.c:201
+#: g10/g10.c:210
 msgid "make a detached signature"
 msgstr ""
 
-#: g10/g10.c:202
+#: g10/g10.c:211
 msgid "encrypt data"
 msgstr ""
 
-#: g10/g10.c:203
+#: g10/g10.c:212
 msgid "encryption only with symmetric cipher"
 msgstr ""
 
-#: g10/g10.c:204
+#: g10/g10.c:213
 msgid "store only"
 msgstr ""
 
-#: g10/g10.c:205
+#: g10/g10.c:214
 msgid "decrypt data (default)"
 msgstr ""
 
-#: g10/g10.c:206
+#: g10/g10.c:215
 msgid "verify a signature"
 msgstr ""
 
-#: g10/g10.c:208
+#: g10/g10.c:217
 msgid "list keys"
 msgstr ""
 
-#: g10/g10.c:210
+#: g10/g10.c:219
 msgid "list keys and signatures"
 msgstr ""
 
-#: g10/g10.c:211
+#: g10/g10.c:220
 msgid "check key signatures"
 msgstr ""
 
-#: g10/g10.c:212
+#: g10/g10.c:221
 msgid "list keys and fingerprints"
 msgstr ""
 
-#: g10/g10.c:213
+#: g10/g10.c:222
 msgid "list secret keys"
 msgstr ""
 
-#: g10/g10.c:214
+#: g10/g10.c:223
 msgid "generate a new key pair"
 msgstr ""
 
-#: g10/g10.c:215
+#: g10/g10.c:224
 msgid "remove key from the public keyring"
 msgstr ""
 
-#: g10/g10.c:217
+#: g10/g10.c:226
 msgid "remove key from the secret keyring"
 msgstr ""
 
-#: g10/g10.c:218
+#: g10/g10.c:227
 msgid "sign a key"
 msgstr ""
 
-#: g10/g10.c:219
+#: g10/g10.c:228
 msgid "sign a key locally"
 msgstr ""
 
-#: g10/g10.c:220
+#: g10/g10.c:229
 msgid "sign or edit a key"
 msgstr ""
 
-#: g10/g10.c:221
+#: g10/g10.c:230
 msgid "generate a revocation certificate"
 msgstr ""
 
-#: g10/g10.c:222
+#: g10/g10.c:231
 msgid "export keys"
 msgstr ""
 
-#: g10/g10.c:223
+#: g10/g10.c:232
 msgid "export keys to a key server"
 msgstr ""
 
-#: g10/g10.c:224
+#: g10/g10.c:233
 msgid "import keys from a key server"
 msgstr ""
 
-#: g10/g10.c:228
+#: g10/g10.c:237
 msgid "import/merge keys"
 msgstr ""
 
-#: g10/g10.c:230
+#: g10/g10.c:239
 msgid "list only the sequence of packets"
 msgstr ""
 
-#: g10/g10.c:232
+#: g10/g10.c:241
 msgid "export the ownertrust values"
 msgstr ""
 
-#: g10/g10.c:234
+#: g10/g10.c:243
 msgid "import ownertrust values"
 msgstr ""
 
-#: g10/g10.c:236
+#: g10/g10.c:245
 msgid "update the trust database"
 msgstr ""
 
-#: g10/g10.c:238
+#: g10/g10.c:247
 msgid "|[NAMES]|check the trust database"
 msgstr ""
 
-#: g10/g10.c:239
+#: g10/g10.c:248
 msgid "fix a corrupted trust database"
 msgstr ""
 
-#: g10/g10.c:240
+#: g10/g10.c:249
 msgid "De-Armor a file or stdin"
 msgstr ""
 
-#: g10/g10.c:242
+#: g10/g10.c:251
 msgid "En-Armor a file or stdin"
 msgstr ""
 
-#: g10/g10.c:244
+#: g10/g10.c:253
 msgid "|algo [files]|print message digests"
 msgstr ""
 
-#: g10/g10.c:248
+#: g10/g10.c:257
 msgid ""
 "@\n"
 "Options:\n"
 " "
 msgstr ""
 
-#: g10/g10.c:250
+#: g10/g10.c:259
 msgid "create ascii armored output"
 msgstr ""
 
-#: g10/g10.c:252
+#: g10/g10.c:261
 msgid "|NAME|encrypt for NAME"
 msgstr ""
 
-#: g10/g10.c:255
+#: g10/g10.c:264
 msgid "|NAME|use NAME as default recipient"
 msgstr ""
 
-#: g10/g10.c:257
+#: g10/g10.c:266
 msgid "use the default key as default recipient"
 msgstr ""
 
-#: g10/g10.c:261
+#: g10/g10.c:270
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 
-#: g10/g10.c:262
+#: g10/g10.c:271
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 
-#: g10/g10.c:264
+#: g10/g10.c:273
 msgid "use canonical text mode"
 msgstr ""
 
-#: g10/g10.c:265
+#: g10/g10.c:274
 msgid "use as output file"
 msgstr ""
 
-#: g10/g10.c:266
+#: g10/g10.c:275
 msgid "verbose"
 msgstr ""
 
-#: g10/g10.c:267
+#: g10/g10.c:276
 msgid "be somewhat more quiet"
 msgstr ""
 
-#: g10/g10.c:268
+#: g10/g10.c:277
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: g10/g10.c:269
+#: g10/g10.c:278
 msgid "force v3 signatures"
 msgstr ""
 
-#: g10/g10.c:270
+#: g10/g10.c:279
 msgid "always use a MDC for encryption"
 msgstr ""
 
-#: g10/g10.c:271
+#: g10/g10.c:280
 msgid "do not make any changes"
 msgstr ""
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:273
+#: g10/g10.c:282
 msgid "batch mode: never ask"
 msgstr ""
 
-#: g10/g10.c:274
+#: g10/g10.c:283
 msgid "assume yes on most questions"
 msgstr ""
 
-#: g10/g10.c:275
+#: g10/g10.c:284
 msgid "assume no on most questions"
 msgstr ""
 
-#: g10/g10.c:276
+#: g10/g10.c:285
 msgid "add this keyring to the list of keyrings"
 msgstr ""
 
-#: g10/g10.c:277
+#: g10/g10.c:286
 msgid "add this secret keyring to the list"
 msgstr ""
 
-#: g10/g10.c:278
+#: g10/g10.c:287
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
-#: g10/g10.c:279
+#: g10/g10.c:288
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: g10/g10.c:280
+#: g10/g10.c:289
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 
-#: g10/g10.c:281
+#: g10/g10.c:290
 msgid "read options from file"
 msgstr ""
 
-#: g10/g10.c:285
+#: g10/g10.c:294
 msgid "|FD|write status info to this FD"
 msgstr ""
 
-#: g10/g10.c:290
+#: g10/g10.c:299
+msgid "|KEYID|ulimately trust this key"
+msgstr ""
+
+#: g10/g10.c:300
 msgid "|FILE|load extension module FILE"
 msgstr ""
 
-#: g10/g10.c:291
+#: g10/g10.c:301
 msgid "emulate the mode described in RFC1991"
 msgstr ""
 
-#: g10/g10.c:292
+#: g10/g10.c:302
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:293
+#: g10/g10.c:303
 msgid "|N|use passphrase mode N"
 msgstr ""
 
-#: g10/g10.c:295
+#: g10/g10.c:305
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 
-#: g10/g10.c:297
+#: g10/g10.c:307
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 
-#: g10/g10.c:298
+#: g10/g10.c:308
 msgid "|NAME|use cipher algorithm NAME"
 msgstr ""
 
-#: g10/g10.c:299
+#: g10/g10.c:309
 msgid "|NAME|use message digest algorithm NAME"
 msgstr ""
 
-#: g10/g10.c:300
+#: g10/g10.c:310
 msgid "|N|use compress algorithm N"
 msgstr ""
 
-#: g10/g10.c:301
+#: g10/g10.c:311
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 
-#: g10/g10.c:302
+#: g10/g10.c:312
 msgid "|NAME=VALUE|use this notation data"
 msgstr ""
 
-#: g10/g10.c:305
+#: g10/g10.c:315
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:308
+#: g10/g10.c:318
 msgid ""
 "@\n"
 "Examples:\n"
@@ -633,213 +637,217 @@
 " --fingerprint [names]      show fingerprints\n"
 msgstr ""
 
-#: g10/g10.c:403
+#: g10/g10.c:418
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 
-#: g10/g10.c:407
+#: g10/g10.c:422
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr ""
 
-#: g10/g10.c:410
+#: g10/g10.c:425
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
 "default operation depends on the input data\n"
 msgstr ""
 
-#: g10/g10.c:417
+#: g10/g10.c:432
 msgid ""
 "\n"
 "Supported algorithms:\n"
 msgstr ""
 
-#: g10/g10.c:496
+#: g10/g10.c:511
 msgid "usage: gpg [options] "
 msgstr ""
 
-#: g10/g10.c:549
+#: g10/g10.c:564
 msgid "conflicting commands\n"
 msgstr ""
 
-#: g10/g10.c:692
+#: g10/g10.c:704
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr ""
 
-#: g10/g10.c:696
+#: g10/g10.c:708
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr ""
 
-#: g10/g10.c:703
+#: g10/g10.c:715
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr ""
 
-#: g10/g10.c:893
+#: g10/g10.c:905
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr ""
 
-#: g10/g10.c:949 g10/g10.c:958
+#: g10/g10.c:970
+msgid "WARNING: program may create a core file!\n"
+msgstr ""
+
+#: g10/g10.c:974 g10/g10.c:983
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/g10.c:951
+#: g10/g10.c:976
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr ""
 
-#: g10/g10.c:954
+#: g10/g10.c:979
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr ""
 
-#: g10/g10.c:973 g10/g10.c:985
+#: g10/g10.c:998 g10/g10.c:1010
 msgid "selected cipher algorithm is invalid\n"
 msgstr ""
 
-#: g10/g10.c:979 g10/g10.c:991
+#: g10/g10.c:1004 g10/g10.c:1016
 msgid "selected digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/g10.c:995
+#: g10/g10.c:1020
 msgid "the given policy URL is invalid\n"
 msgstr ""
 
-#: g10/g10.c:998
+#: g10/g10.c:1023
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr ""
 
-#: g10/g10.c:1000
+#: g10/g10.c:1025
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/g10.c:1002
+#: g10/g10.c:1027
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/g10.c:1004
+#: g10/g10.c:1029
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:1007
+#: g10/g10.c:1032
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 
-#: g10/g10.c:1011
+#: g10/g10.c:1036
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr ""
 
-#: g10/g10.c:1096
+#: g10/g10.c:1121
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr ""
 
-#: g10/g10.c:1102
+#: g10/g10.c:1127
 msgid "--store [filename]"
 msgstr ""
 
-#: g10/g10.c:1109
+#: g10/g10.c:1134
 msgid "--symmetric [filename]"
 msgstr ""
 
-#: g10/g10.c:1117
+#: g10/g10.c:1142
 msgid "--encrypt [filename]"
 msgstr ""
 
-#: g10/g10.c:1130
+#: g10/g10.c:1155
 msgid "--sign [filename]"
 msgstr ""
 
-#: g10/g10.c:1143
+#: g10/g10.c:1168
 msgid "--sign --encrypt [filename]"
 msgstr ""
 
-#: g10/g10.c:1157
+#: g10/g10.c:1182
 msgid "--clearsign [filename]"
 msgstr ""
 
-#: g10/g10.c:1174
+#: g10/g10.c:1199
 msgid "--decrypt [filename]"
 msgstr ""
 
-#: g10/g10.c:1182
+#: g10/g10.c:1207
 msgid "--sign-key user-id"
 msgstr ""
 
-#: g10/g10.c:1190
+#: g10/g10.c:1215
 msgid "--lsign-key user-id"
 msgstr ""
 
-#: g10/g10.c:1198
+#: g10/g10.c:1223
 msgid "--edit-key user-id [commands]"
 msgstr ""
 
-#: g10/g10.c:1214
+#: g10/g10.c:1239
 msgid "--delete-secret-key user-id"
 msgstr ""
 
-#: g10/g10.c:1217
+#: g10/g10.c:1242
 msgid "--delete-key user-id"
 msgstr ""
 
-#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393
+#: g10/encode.c:265 g10/g10.c:1279 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr ""
 
-#: g10/g10.c:1269
+#: g10/g10.c:1294
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr ""
 
-#: g10/g10.c:1335
+#: g10/g10.c:1360
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr ""
 
-#: g10/g10.c:1343
+#: g10/g10.c:1368
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr ""
 
-#: g10/g10.c:1411
+#: g10/g10.c:1439
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1492
+#: g10/g10.c:1520
 msgid "[filename]"
 msgstr ""
 
-#: g10/g10.c:1496
+#: g10/g10.c:1524
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/decrypt.c:59 g10/g10.c:1499 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1527 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1669
+#: g10/g10.c:1700
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 
-#: g10/g10.c:1675
+#: g10/g10.c:1706
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
 msgstr ""
 
-#: g10/g10.c:1681
+#: g10/g10.c:1712
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 
-#: g10/g10.c:1689
+#: g10/g10.c:1720
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 
@@ -1185,58 +1193,58 @@
 msgid "writing key binding signature\n"
 msgstr ""
 
-#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:433
+#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:435
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:438
+#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:440
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:537
+#: g10/keygen.c:539
 msgid "Please select what kind of key you want:\n"
 msgstr ""
 
-#: g10/keygen.c:539
+#: g10/keygen.c:541
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr ""
 
-#: g10/keygen.c:540
+#: g10/keygen.c:542
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr ""
 
-#: g10/keygen.c:542
+#: g10/keygen.c:544
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr ""
 
-#: g10/keygen.c:543
+#: g10/keygen.c:545
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr ""
 
-#: g10/keygen.c:545
+#: g10/keygen.c:547
 #, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr ""
 
-#: g10/keygen.c:549
+#: g10/keygen.c:551
 msgid "Your selection? "
 msgstr ""
 
-#: g10/keygen.c:560 g10/keygen.c:568
+#: g10/keygen.c:562 g10/keygen.c:570
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr ""
 
-#: g10/keygen.c:582
+#: g10/keygen.c:584
 msgid "Invalid selection.\n"
 msgstr ""
 
-#: g10/keygen.c:594
+#: g10/keygen.c:596
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1245,19 +1253,19 @@
 "    highest suggested keysize is 2048 bits\n"
 msgstr ""
 
-#: g10/keygen.c:601
+#: g10/keygen.c:603
 msgid "What keysize do you want? (1024) "
 msgstr ""
 
-#: g10/keygen.c:606
+#: g10/keygen.c:608
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr ""
 
-#: g10/keygen.c:608
+#: g10/keygen.c:610
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr ""
 
-#: g10/keygen.c:610
+#: g10/keygen.c:612
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr ""
 
@@ -1269,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:621
+#: g10/keygen.c:623
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr ""
 
-#: g10/keygen.c:626
+#: g10/keygen.c:628
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
 msgstr ""
 
-#: g10/keygen.c:629
+#: g10/keygen.c:631
 msgid "Are you sure that you want this keysize? "
 msgstr ""
 
-#: g10/keygen.c:630
+#: g10/keygen.c:632
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
 msgstr ""
 
-#: g10/keygen.c:638
+#: g10/keygen.c:640
 msgid "Do you really need such a large keysize? "
 msgstr ""
 
-#: g10/keygen.c:644
+#: g10/keygen.c:646
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:647 g10/keygen.c:651
+#: g10/keygen.c:649 g10/keygen.c:653
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:699
+#: g10/keygen.c:701
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1314,35 +1322,35 @@
 "      <n>y = key expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:714
+#: g10/keygen.c:716
 msgid "Key is valid for? (0) "
 msgstr ""
 
-#: g10/keygen.c:719
+#: g10/keygen.c:721
 msgid "invalid value\n"
 msgstr ""
 
-#: g10/keygen.c:724
+#: g10/keygen.c:726
 msgid "Key does not expire at all\n"
 msgstr ""
 
 #. print the date when the key expires
-#: g10/keygen.c:730
+#: g10/keygen.c:732
 #, c-format
 msgid "Key expires at %s\n"
 msgstr ""
 
-#: g10/keygen.c:733
+#: g10/keygen.c:735
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:738
+#: g10/keygen.c:740
 msgid "Is this correct (y/n)? "
 msgstr ""
 
-#: g10/keygen.c:781
+#: g10/keygen.c:783
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1352,44 +1360,44 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:793
+#: g10/keygen.c:795
 msgid "Real name: "
 msgstr ""
 
-#: g10/keygen.c:797
+#: g10/keygen.c:803
 msgid "Invalid character in name\n"
 msgstr ""
 
-#: g10/keygen.c:799
+#: g10/keygen.c:805
 msgid "Name may not start with a digit\n"
 msgstr ""
 
-#: g10/keygen.c:801
+#: g10/keygen.c:807
 msgid "Name must be at least 5 characters long\n"
 msgstr ""
 
-#: g10/keygen.c:809
+#: g10/keygen.c:815
 msgid "Email address: "
 msgstr ""
 
-#: g10/keygen.c:820
+#: g10/keygen.c:826
 msgid "Not a valid email address\n"
 msgstr ""
 
-#: g10/keygen.c:828
+#: g10/keygen.c:834
 msgid "Comment: "
 msgstr ""
 
-#: g10/keygen.c:834
+#: g10/keygen.c:840
 msgid "Invalid character in comment\n"
 msgstr ""
 
-#: g10/keygen.c:857
+#: g10/keygen.c:863
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr ""
 
-#: g10/keygen.c:863
+#: g10/keygen.c:869
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1397,37 +1405,37 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:867
+#: g10/keygen.c:873
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:872
+#: g10/keygen.c:878
 msgid "NnCcEeOoQq"
 msgstr ""
 
-#: g10/keygen.c:882
+#: g10/keygen.c:888
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:883
+#: g10/keygen.c:889
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:902
+#: g10/keygen.c:908
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:940
+#: g10/keygen.c:946
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:468 g10/keygen.c:948
+#: g10/keyedit.c:468 g10/keygen.c:954
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr ""
 
-#: g10/keygen.c:954
+#: g10/keygen.c:960
 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"
@@ -1435,7 +1443,7 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:975
+#: g10/keygen.c:981
 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"
@@ -1443,56 +1451,56 @@
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:1424
+#: g10/keygen.c:1430
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr ""
 
-#: g10/keygen.c:1467
+#: g10/keygen.c:1473
 msgid "Key generation canceled.\n"
 msgstr ""
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1570
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr ""
 
-#: g10/keygen.c:1565
+#: g10/keygen.c:1571
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr ""
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1667
 msgid "public and secret key created and signed.\n"
 msgstr ""
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1672
 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:1683 g10/keygen.c:1784
+#: g10/keygen.c:1689 g10/keygen.c:1790
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:1727 g10/sig-check.c:318 g10/sign.c:112
+#: g10/keygen.c:1733 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:1729 g10/sig-check.c:320 g10/sign.c:114
+#: g10/keygen.c:1735 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:1762
+#: g10/keygen.c:1768
 msgid "Really create? "
 msgstr ""
 
-#: g10/encode.c:91 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/encode.c:91 g10/openfile.c:178 g10/openfile.c:288 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1503,17 +1511,17 @@
 msgid "error creating passphrase: %s\n"
 msgstr ""
 
-#: g10/encode.c:171 g10/encode.c:319
+#: g10/encode.c:171 g10/encode.c:324
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr ""
 
-#: g10/encode.c:266
+#: g10/encode.c:271
 #, c-format
 msgid "reading from `%s'\n"
 msgstr ""
 
-#: g10/encode.c:483
+#: g10/encode.c:492
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr ""
@@ -1562,245 +1570,255 @@
 msgid "No user ID for key\n"
 msgstr ""
 
-#: g10/getkey.c:1642 g10/getkey.c:1698
+#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr ""
 
-#: g10/getkey.c:2017
+#: g10/getkey.c:2050
 msgid "[User id not found]"
 msgstr ""
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr ""
 
-#: g10/import.c:188 g10/trustdb.c:1740 g10/trustdb.c:1781
+#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr ""
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr ""
 
-#: g10/import.c:203
+#: g10/import.c:204
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr ""
 
-#: g10/import.c:205
+#: g10/import.c:206
+#, c-format
+msgid "      skipped new keys: %lu\n"
+msgstr ""
+
+#: g10/import.c:209
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:207
+#: g10/import.c:211
 #, c-format
 msgid "              imported: %lu"
 msgstr ""
 
-#: g10/import.c:213
+#: g10/import.c:217
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr ""
 
-#: g10/import.c:215
+#: g10/import.c:219
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:217
+#: g10/import.c:221
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr ""
 
-#: g10/import.c:219
+#: g10/import.c:223
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr ""
 
-#: g10/import.c:221
+#: g10/import.c:225
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr ""
 
-#: g10/import.c:223
+#: g10/import.c:227
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr ""
 
-#: g10/import.c:225
+#: g10/import.c:229
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr ""
 
-#: g10/import.c:227
+#: g10/import.c:231
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr ""
 
-#: g10/import.c:386 g10/import.c:578
+#: g10/import.c:391 g10/import.c:590
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr ""
 
-#: g10/import.c:400
+#: g10/import.c:405
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr ""
 
-#: g10/import.c:402
+#: g10/import.c:407
 msgid "this may be caused by a missing self-signature\n"
 msgstr ""
 
-#: g10/import.c:413 g10/import.c:645
+#: g10/import.c:418 g10/import.c:657
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr ""
 
-#: g10/import.c:419
+#: g10/import.c:423
+#, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr ""
+
+#: g10/import.c:431
 msgid "no default public keyring\n"
 msgstr ""
 
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
+#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
 #, c-format
 msgid "writing to `%s'\n"
 msgstr ""
 
-#: g10/import.c:426 g10/import.c:484 g10/import.c:593 g10/import.c:694
+#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr ""
 
-#: g10/import.c:429 g10/import.c:487 g10/import.c:596 g10/import.c:697
+#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr ""
 
-#: g10/import.c:434
+#: g10/import.c:446
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr ""
 
-#: g10/import.c:451
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr ""
 
-#: g10/import.c:460 g10/import.c:653
+#: g10/import.c:472 g10/import.c:665
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr ""
 
-#: g10/import.c:466 g10/import.c:659
+#: g10/import.c:478 g10/import.c:671
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr ""
 
-#: g10/import.c:493
+#: g10/import.c:505
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr ""
 
-#: g10/import.c:496
+#: g10/import.c:508
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr ""
 
-#: g10/import.c:499
+#: g10/import.c:511
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr ""
 
-#: g10/import.c:502
+#: g10/import.c:514
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr ""
 
-#: g10/import.c:505
+#: g10/import.c:517
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr ""
 
-#: g10/import.c:508
+#: g10/import.c:520
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr ""
 
-#: g10/import.c:518
+#: g10/import.c:530
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr ""
 
-#: g10/import.c:601
+#: g10/import.c:613
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr ""
 
 #. we can't merge secret keys
-#: g10/import.c:605
+#: g10/import.c:617
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr ""
 
-#: g10/import.c:610
+#: g10/import.c:622
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr ""
 
-#: g10/import.c:639
+#: g10/import.c:651
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 
-#: g10/import.c:670
+#: g10/import.c:682
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 
-#: g10/import.c:702
+#: g10/import.c:714
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr ""
 
-#: g10/import.c:744
+#: g10/import.c:756
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr ""
 
-#: g10/import.c:751 g10/import.c:775
+#: g10/import.c:763 g10/import.c:787
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr ""
 
-#: g10/import.c:752
+#: g10/import.c:764
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr ""
 
-#: g10/import.c:767
+#: g10/import.c:779
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr ""
 
-#: g10/import.c:776
+#: g10/import.c:788
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr ""
 
-#: g10/import.c:803
+#: g10/import.c:815
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr ""
 
-#: g10/import.c:832
+#: g10/import.c:844
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr ""
 
-#: g10/import.c:855
+#: g10/import.c:867
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr ""
@@ -1809,32 +1827,32 @@
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:880
+#: g10/import.c:892
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr ""
 
-#: g10/import.c:889
+#: g10/import.c:901
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr ""
 
-#: g10/import.c:897
+#: g10/import.c:909
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr ""
 
-#: g10/import.c:997
+#: g10/import.c:1009
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:1048
+#: g10/import.c:1060
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr ""
 
-#: g10/import.c:1162 g10/import.c:1215
+#: g10/import.c:1174 g10/import.c:1227
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr ""
@@ -2401,8 +2419,16 @@
 msgid "no secret key\n"
 msgstr ""
 
+#: g10/keylist.c:158
+msgid "invalid"
+msgstr ""
+
+#: g10/keylist.c:178
+msgid "revoked"
+msgstr ""
+
 #. of subkey
-#: g10/keylist.c:318 g10/mainproc.c:742
+#: g10/keylist.c:400 g10/mainproc.c:760
 #, c-format
 msgid " [expires: %s]"
 msgstr ""
@@ -2412,127 +2438,117 @@
 msgid "public key is %08lX\n"
 msgstr ""
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:257
 msgid "public key encrypted data: good DEK\n"
 msgstr ""
 
-#: g10/mainproc.c:281
+#: g10/mainproc.c:299
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr ""
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:309
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr ""
 
-#: g10/mainproc.c:297
+#: g10/mainproc.c:315
 msgid "no secret key for decryption available\n"
 msgstr ""
 
-#: g10/mainproc.c:306
+#: g10/mainproc.c:324
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:343
+#: g10/mainproc.c:361
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:348
+#: g10/mainproc.c:366
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:353
+#: g10/mainproc.c:371
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:372
+#: g10/mainproc.c:390
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:374
+#: g10/mainproc.c:392
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:544
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:613 g10/mainproc.c:622
+#: g10/mainproc.c:631 g10/mainproc.c:640
 msgid "WARNING: invalid notation data found\n"
 msgstr ""
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:643
 msgid "Notation: "
 msgstr ""
 
-#: g10/mainproc.c:632
+#: g10/mainproc.c:650
 msgid "Policy: "
 msgstr ""
 
-#: g10/mainproc.c:1062
+#: g10/mainproc.c:1080
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1068
+#: g10/mainproc.c:1086
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr ""
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1094 g10/mainproc.c:1105
+#: g10/mainproc.c:1112 g10/mainproc.c:1123
 msgid "BAD signature from \""
 msgstr ""
 
-#: g10/mainproc.c:1095 g10/mainproc.c:1106
+#: g10/mainproc.c:1113 g10/mainproc.c:1124
 msgid "Good signature from \""
 msgstr ""
 
-#: g10/mainproc.c:1097
+#: g10/mainproc.c:1115
 msgid "                aka \""
 msgstr ""
 
-#: g10/mainproc.c:1153
+#: g10/mainproc.c:1171
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1235
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:1263
+#: g10/mainproc.c:1281
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
 
-#: g10/mainproc.c:1268
+#: g10/mainproc.c:1286
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
-#: g10/misc.c:94
+#: g10/misc.c:96
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr ""
 
-#: g10/misc.c:97
-msgid "WARNING: program may create a core file!\n"
-msgstr ""
-
-#: g10/misc.c:205
+#: g10/misc.c:206
 msgid "Experimental algorithms should not be used!\n"
 msgstr ""
 
-#: g10/misc.c:219
-msgid ""
-"RSA keys are deprecated; please consider creating a new key and use this key "
-"in the future\n"
-msgstr ""
-
-#: g10/misc.c:241
+#: g10/misc.c:233
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 
@@ -2541,7 +2557,7 @@
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:965
+#: g10/parse-packet.c:986
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
@@ -2575,90 +2591,90 @@
 msgid "Repeat passphrase: "
 msgstr ""
 
-#: g10/plaintext.c:63
+#: g10/plaintext.c:67
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 
-#: g10/plaintext.c:317
+#: g10/plaintext.c:324
 msgid "Detached signature.\n"
 msgstr ""
 
-#: g10/plaintext.c:321
+#: g10/plaintext.c:328
 msgid "Please enter name of data file: "
 msgstr ""
 
-#: g10/plaintext.c:342
+#: g10/plaintext.c:349
 msgid "reading stdin ...\n"
 msgstr ""
 
-#: g10/plaintext.c:385
+#: g10/plaintext.c:392
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:79
+#: g10/pubkey-enc.c:76
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:85
+#: g10/pubkey-enc.c:82
 msgid "okay, we are the anonymous recipient.\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:137
+#: g10/pubkey-enc.c:134
 msgid "old encoding of the DEK is not supported\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:156
+#: g10/pubkey-enc.c:153
 #, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:195
+#: g10/pubkey-enc.c:192
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:201
+#: g10/pubkey-enc.c:198
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr ""
 
-#: g10/hkp.c:62
+#: g10/hkp.c:72
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
 msgstr ""
 
-#: g10/hkp.c:75
+#: g10/hkp.c:85
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr ""
 
-#: g10/hkp.c:98 g10/hkp.c:136
+#: g10/hkp.c:109 g10/hkp.c:148
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/hkp.c:106
+#: g10/hkp.c:117
 #, c-format
 msgid "%s: not a valid key ID\n"
 msgstr ""
 
-#: g10/hkp.c:158
+#: g10/hkp.c:170
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr ""
 
-#: g10/hkp.c:182
+#: g10/hkp.c:194
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr ""
 
-#: g10/hkp.c:194
+#: g10/hkp.c:206
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr ""
 
-#: g10/hkp.c:197
+#: g10/hkp.c:209
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
@@ -2672,39 +2688,39 @@
 msgid "protection algorithm %d is not supported\n"
 msgstr ""
 
-#: g10/seckey-cert.c:175
+#: g10/seckey-cert.c:184
 msgid "Invalid passphrase; please try again ...\n"
 msgstr ""
 
-#: g10/seckey-cert.c:231
+#: g10/seckey-cert.c:240
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 
-#: g10/sig-check.c:202
+#: g10/sig-check.c:199
 msgid "assuming bad MDC due to an unknown critical bit\n"
 msgstr ""
 
-#: g10/sig-check.c:300
+#: g10/sig-check.c:297
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 
-#: g10/sig-check.c:308
+#: g10/sig-check.c:305
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr ""
 
-#: g10/sig-check.c:309
+#: g10/sig-check.c:306
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr ""
 
-#: g10/sig-check.c:327
+#: g10/sig-check.c:324
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr ""
 
-#: g10/sig-check.c:396
+#: g10/sig-check.c:393
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 
@@ -2713,7 +2729,7 @@
 msgid "%s signature from: %s\n"
 msgstr ""
 
-#: g10/sign.c:290 g10/sign.c:606
+#: g10/sign.c:290 g10/sign.c:610
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr ""
@@ -2761,7 +2777,7 @@
 msgid "%s: directory does not exist!\n"
 msgstr ""
 
-#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1363 g10/tdbio.c:444
+#: g10/openfile.c:226 g10/openfile.c:295 g10/ringedit.c:1369 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr ""
@@ -2861,285 +2877,295 @@
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 
-#: g10/trustdb.c:168
+#: g10/trustdb.c:169
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:183
+#: g10/trustdb.c:184
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:197
+#: g10/trustdb.c:198
 #, c-format
 msgid "trust record %lu: delete failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:211
+#: g10/trustdb.c:212
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:376
+#: g10/trustdb.c:377
 #, c-format
 msgid "error reading dir record for LID %lu: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:383
+#: g10/trustdb.c:384
 #, c-format
 msgid "lid %lu: expected dir record, got type %d\n"
 msgstr ""
 
-#: g10/trustdb.c:388
+#: g10/trustdb.c:389
 #, c-format
 msgid "no primary key for LID %lu\n"
 msgstr ""
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:394
 #, c-format
 msgid "error reading primary key for LID %lu: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:432
+#: g10/trustdb.c:433
 #, c-format
 msgid "get_dir_record: search_record failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:487
+#: g10/trustdb.c:474
 #, c-format
-msgid "NOTE: secret key %08lX is NOT protected.\n"
+msgid "'%s' is not a valid long keyID\n"
 msgstr ""
 
-#: g10/trustdb.c:495
+#: g10/trustdb.c:501
 #, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
+msgid "key %08lX: can't put it into the trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:502
+#: g10/trustdb.c:507
 #, c-format
-msgid "key %08lX: secret and public key don't match\n"
+msgid "key %08lX: query record failed\n"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:516
 #, c-format
-msgid "key %08lX: can't put it into the trustdb\n"
+msgid "key %08lX: already in trusted key table\n"
 msgstr ""
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:519
 #, c-format
-msgid "key %08lX: query record failed\n"
+msgid "key %08lX: accepted as trusted key.\n"
 msgstr ""
 
-#: g10/trustdb.c:529
+#: g10/trustdb.c:546
 #, c-format
-msgid "key %08lX: already in trusted key table\n"
+msgid "key %08lX: no public key for trusted key - skipped\n"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:565
 #, c-format
-msgid "key %08lX: accepted as trusted key.\n"
+msgid "NOTE: secret key %08lX is NOT protected.\n"
+msgstr ""
+
+#: g10/trustdb.c:577
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr ""
+
+#: g10/trustdb.c:584
+#, c-format
+msgid "key %08lX: secret and public key don't match\n"
 msgstr ""
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:597
 #, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:921
+#: g10/trustdb.c:987
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr ""
 
-#: g10/trustdb.c:927 g10/trustdb.c:962
+#: g10/trustdb.c:993 g10/trustdb.c:1028
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:939
+#: g10/trustdb.c:1005
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr ""
 
-#: g10/trustdb.c:945
+#: g10/trustdb.c:1011
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:956
+#: g10/trustdb.c:1022
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr ""
 
-#: g10/trustdb.c:1067
+#: g10/trustdb.c:1133
 msgid "Good self-signature"
 msgstr ""
 
-#: g10/trustdb.c:1077
+#: g10/trustdb.c:1143
 msgid "Invalid self-signature"
 msgstr ""
 
-#: g10/trustdb.c:1104
+#: g10/trustdb.c:1170
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 
-#: g10/trustdb.c:1110
+#: g10/trustdb.c:1176
 msgid "Valid user ID revocation"
 msgstr ""
 
-#: g10/trustdb.c:1115
+#: g10/trustdb.c:1181
 msgid "Invalid user ID revocation"
 msgstr ""
 
-#: g10/trustdb.c:1157
+#: g10/trustdb.c:1223
 msgid "Valid certificate revocation"
 msgstr ""
 
-#: g10/trustdb.c:1158
+#: g10/trustdb.c:1224
 msgid "Good certificate"
 msgstr ""
 
-#: g10/trustdb.c:1186
+#: g10/trustdb.c:1252
 msgid "Invalid certificate revocation"
 msgstr ""
 
-#: g10/trustdb.c:1187
+#: g10/trustdb.c:1253
 msgid "Invalid certificate"
 msgstr ""
 
-#: g10/trustdb.c:1204 g10/trustdb.c:1208
+#: g10/trustdb.c:1270 g10/trustdb.c:1274
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr ""
 
-#: g10/trustdb.c:1267
+#: g10/trustdb.c:1333
 msgid "duplicated certificate - deleted"
 msgstr ""
 
-#: g10/trustdb.c:1584
+#: g10/trustdb.c:1650
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:1718
+#: g10/trustdb.c:1784
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:1723
+#: g10/trustdb.c:1789
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:1729
+#: g10/trustdb.c:1795
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr ""
 
-#: g10/trustdb.c:1734
+#: g10/trustdb.c:1800
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:1742 g10/trustdb.c:1805
+#: g10/trustdb.c:1808 g10/trustdb.c:1871
 #, c-format
 msgid "%lu keys processed\n"
 msgstr ""
 
-#: g10/trustdb.c:1744 g10/trustdb.c:1811
+#: g10/trustdb.c:1810 g10/trustdb.c:1877
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr ""
 
-#: g10/trustdb.c:1746
+#: g10/trustdb.c:1812
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr ""
 
-#: g10/trustdb.c:1749
+#: g10/trustdb.c:1815
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:1797
+#: g10/trustdb.c:1863
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr ""
 
-#: g10/trustdb.c:1807
+#: g10/trustdb.c:1873
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr ""
 
-#: g10/trustdb.c:1809
+#: g10/trustdb.c:1875
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr ""
 
-#: g10/trustdb.c:1813
+#: g10/trustdb.c:1879
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr ""
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2224
 msgid "Ooops, no keys\n"
 msgstr ""
 
-#: g10/trustdb.c:2162
+#: g10/trustdb.c:2228
 msgid "Ooops, no user IDs\n"
 msgstr ""
 
-#: g10/trustdb.c:2320
+#: g10/trustdb.c:2386
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2395
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:2333
+#: g10/trustdb.c:2399
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:2341
+#: g10/trustdb.c:2407
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2422
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr ""
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2430
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:2515
+#: g10/trustdb.c:2581
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:2517
+#: g10/trustdb.c:2583
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:2520
+#: g10/trustdb.c:2586
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr ""
 
-#: g10/trustdb.c:2523
+#: g10/trustdb.c:2589
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:2709 g10/trustdb.c:2739
+#: g10/trustdb.c:2775 g10/trustdb.c:2805
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr ""
 
@@ -3160,26 +3186,26 @@
 msgid "%s: can't create keyring: %s\n"
 msgstr ""
 
-#: g10/ringedit.c:319 g10/ringedit.c:1368
+#: g10/ringedit.c:319 g10/ringedit.c:1374
 #, c-format
 msgid "%s: keyring created\n"
 msgstr ""
 
-#: g10/ringedit.c:1545
+#: g10/ringedit.c:1551
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 
-#: g10/ringedit.c:1546
+#: g10/ringedit.c:1552
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr ""
 
-#: g10/ringedit.c:1547
+#: g10/ringedit.c:1553
 #, c-format
 msgid "%s is the new one\n"
 msgstr ""
 
-#: g10/ringedit.c:1548
+#: g10/ringedit.c:1554
 msgid "Please fix this possible security flaw\n"
 msgstr ""
 
@@ -3200,49 +3226,49 @@
 msgstr ""
 
 #. do not overwrite
-#: g10/openfile.c:79
+#: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
 msgstr ""
 
-#: g10/openfile.c:81
+#: g10/openfile.c:86
 msgid "Overwrite (y/N)? "
 msgstr ""
 
-#: g10/openfile.c:109
+#: g10/openfile.c:119
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr ""
 
-#: g10/openfile.c:131
+#: g10/openfile.c:141
 msgid "Enter new filename"
 msgstr ""
 
-#: g10/openfile.c:172
+#: g10/openfile.c:182
 msgid "writing to stdout\n"
 msgstr ""
 
-#: g10/openfile.c:250
+#: g10/openfile.c:261
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr ""
 
-#: g10/openfile.c:300
+#: g10/openfile.c:311
 #, c-format
 msgid "%s: new options file created\n"
 msgstr ""
 
-#: g10/openfile.c:313
+#: g10/openfile.c:338
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr ""
 
-#: g10/openfile.c:316
+#: g10/openfile.c:341
 #, c-format
 msgid "%s: directory created\n"
 msgstr ""
 
-#: g10/openfile.c:318
+#: g10/openfile.c:343
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr ""
 
diff -urN gnupg-1.0.2/po/id.po gnupg-1.0.3/po/id.po
--- gnupg-1.0.2/po/id.po	Wed Jul 12 14:59:42 2000
+++ gnupg-1.0.3/po/id.po	Mon Sep 18 12:18:04 2000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU Privacy Guard 1.0.1\n"
-"POT-Creation-Date: 2000-07-12 12:13+0200\n"
+"POT-Creation-Date: 2000-09-18 12:17+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"
@@ -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:127 g10/keygen.c:1249
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1255
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
@@ -308,11 +308,11 @@
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:647
+#: cipher/random.c:650
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "PERINGATAN: menggunakan random number generator yang tidak aman!!\n"
 
-#: cipher/random.c:648
+#: cipher/random.c:651
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -326,7 +326,7 @@
 "JANGAN MENGGUNAKAN DATA YANG DIHASILKAN PROGRAM INI!!\n"
 "\n"
 
-#: cipher/rndlinux.c:141
+#: cipher/rndlinux.c:142
 #, c-format
 msgid ""
 "\n"
@@ -337,7 +337,7 @@
 "Tidak tersedia cukup byte random. Silakan melakukan aktivitas lain agar\n"
 "memungkinkan SO mengumpulkan lebih banyak entropi! (Perlu %d byte lagi)\n"
 
-#: g10/g10.c:197
+#: g10/g10.c:206
 msgid ""
 "@Commands:\n"
 " "
@@ -345,140 +345,140 @@
 "@Perintah:\n"
 "  "
 
-#: g10/g10.c:199
+#: g10/g10.c:208
 msgid "|[file]|make a signature"
 msgstr "|[file]|buat signature"
 
-#: g10/g10.c:200
+#: g10/g10.c:209
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|buat signature teks"
 
-#: g10/g10.c:201
+#: g10/g10.c:210
 msgid "make a detached signature"
 msgstr "buat detached signature"
 
-#: g10/g10.c:202
+#: g10/g10.c:211
 msgid "encrypt data"
 msgstr "enkripsi data"
 
-#: g10/g10.c:203
+#: g10/g10.c:212
 msgid "encryption only with symmetric cipher"
 msgstr "enkripsi hanya dengan symmetric cipher"
 
-#: g10/g10.c:204
+#: g10/g10.c:213
 msgid "store only"
 msgstr "hanya disimpan"
 
-#: g10/g10.c:205
+#: g10/g10.c:214
 msgid "decrypt data (default)"
 msgstr "dekripsi data (default)"
 
-#: g10/g10.c:206
+#: g10/g10.c:215
 msgid "verify a signature"
 msgstr "verifikasi signature"
 
-#: g10/g10.c:208
+#: g10/g10.c:217
 msgid "list keys"
 msgstr "tampilkan kunci"
 
-#: g10/g10.c:210
+#: g10/g10.c:219
 msgid "list keys and signatures"
 msgstr "tampilkan kunci dan signature"
 
-#: g10/g10.c:211
+#: g10/g10.c:220
 msgid "check key signatures"
 msgstr "periksa signature kunci"
 
-#: g10/g10.c:212
+#: g10/g10.c:221
 msgid "list keys and fingerprints"
 msgstr "tampilkan kunci dan fingerprint"
 
-#: g10/g10.c:213
+#: g10/g10.c:222
 msgid "list secret keys"
 msgstr "tampilkan kunci rahasia"
 
-#: g10/g10.c:214
+#: g10/g10.c:223
 msgid "generate a new key pair"
 msgstr "buat sepasang kunci baru"
 
-#: g10/g10.c:215
+#: g10/g10.c:224
 msgid "remove key from the public keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: g10/g10.c:217
+#: g10/g10.c:226
 #, fuzzy
 msgid "remove key from the secret keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: g10/g10.c:218
+#: g10/g10.c:227
 msgid "sign a key"
 msgstr "tandai kunci"
 
-#: g10/g10.c:219
+#: g10/g10.c:228
 msgid "sign a key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/g10.c:220
+#: g10/g10.c:229
 msgid "sign or edit a key"
 msgstr "tandai atau edit kunci"
 
-#: g10/g10.c:221
+#: g10/g10.c:230
 msgid "generate a revocation certificate"
 msgstr "buat sertifikat revokasi"
 
-#: g10/g10.c:222
+#: g10/g10.c:231
 msgid "export keys"
 msgstr "ekspor kunci"
 
-#: g10/g10.c:223
+#: g10/g10.c:232
 msgid "export keys to a key server"
 msgstr "ekspor kunci ke key server"
 
-#: g10/g10.c:224
+#: g10/g10.c:233
 msgid "import keys from a key server"
 msgstr "impor kunci dari key server"
 
-#: g10/g10.c:228
+#: g10/g10.c:237
 msgid "import/merge keys"
 msgstr "impor/gabung kunci"
 
-#: g10/g10.c:230
+#: g10/g10.c:239
 msgid "list only the sequence of packets"
 msgstr "tampilkan hanya urutan paket"
 
-#: g10/g10.c:232
+#: g10/g10.c:241
 msgid "export the ownertrust values"
 msgstr "ekspor nilai ownertrust"
 
-#: g10/g10.c:234
+#: g10/g10.c:243
 msgid "import ownertrust values"
 msgstr "impor nilai ownertrust"
 
-#: g10/g10.c:236
+#: g10/g10.c:245
 msgid "update the trust database"
 msgstr "perbarui database trust"
 
-#: g10/g10.c:238
+#: g10/g10.c:247
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMA]|periksa database trust"
 
-#: g10/g10.c:239
+#: g10/g10.c:248
 msgid "fix a corrupted trust database"
 msgstr "perbaiki database trust yang terkorupsi"
 
-#: g10/g10.c:240
+#: g10/g10.c:249
 msgid "De-Armor a file or stdin"
 msgstr "De-Armor file atau stdin"
 
-#: g10/g10.c:242
+#: g10/g10.c:251
 msgid "En-Armor a file or stdin"
 msgstr "En-Armor file atau stdin"
 
-#: g10/g10.c:244
+#: g10/g10.c:253
 msgid "|algo [files]|print message digests"
 msgstr "|algo [file]|cetak digest pesan"
 
-#: g10/g10.c:248
+#: g10/g10.c:257
 msgid ""
 "@\n"
 "Options:\n"
@@ -488,154 +488,158 @@
 "Pilihan:\n"
 "  "
 
-#: g10/g10.c:250
+#: g10/g10.c:259
 msgid "create ascii armored output"
 msgstr "ciptakan output ascii"
 
-#: g10/g10.c:252
+#: g10/g10.c:261
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: g10/g10.c:255
+#: g10/g10.c:264
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: g10/g10.c:257
+#: g10/g10.c:266
 msgid "use the default key as default recipient"
 msgstr "gunakan kunci baku sebagai penerima baku"
 
-#: g10/g10.c:261
+#: g10/g10.c:270
 msgid "use this user-id to sign or decrypt"
 msgstr "gunakan id-user ini untuk menandai/dekripsi"
 
-#: g10/g10.c:262
+#: g10/g10.c:271
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|set tingkat kompresi N (0 tidak ada)"
 
-#: g10/g10.c:264
+#: g10/g10.c:273
 msgid "use canonical text mode"
 msgstr "gunakan mode teks kanonikal"
 
-#: g10/g10.c:265
+#: g10/g10.c:274
 msgid "use as output file"
 msgstr "gunakan sebagai file output"
 
-#: g10/g10.c:266
+#: g10/g10.c:275
 msgid "verbose"
 msgstr "detil"
 
-#: g10/g10.c:267
+#: g10/g10.c:276
 msgid "be somewhat more quiet"
 msgstr "lebih diam"
 
-#: g10/g10.c:268
+#: g10/g10.c:277
 msgid "don't use the terminal at all"
 msgstr "jangan menggunakan terminal"
 
-#: g10/g10.c:269
+#: g10/g10.c:278
 msgid "force v3 signatures"
 msgstr "paksa signature v3"
 
-#: g10/g10.c:270
+#: g10/g10.c:279
 msgid "always use a MDC for encryption"
 msgstr "selalu gunakan MDC untuk enkripsi"
 
-#: g10/g10.c:271
+#: g10/g10.c:280
 msgid "do not make any changes"
 msgstr "jangan buat perubahan"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:273
+#: g10/g10.c:282
 msgid "batch mode: never ask"
 msgstr "mode batch: tanpa tanya"
 
-#: g10/g10.c:274
+#: g10/g10.c:283
 msgid "assume yes on most questions"
 msgstr "asumsikan ya untuk seluruh pertanyaan"
 
-#: g10/g10.c:275
+#: g10/g10.c:284
 msgid "assume no on most questions"
 msgstr "asumsikan tidak untuk seluruh pertanyaan"
 
-#: g10/g10.c:276
+#: g10/g10.c:285
 msgid "add this keyring to the list of keyrings"
 msgstr "tambah keyring ini ke daftar keyring"
 
-#: g10/g10.c:277
+#: g10/g10.c:286
 msgid "add this secret keyring to the list"
 msgstr "tambah keyring rahasia ini ke daftar"
 
-#: g10/g10.c:278
+#: g10/g10.c:287
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
 
-#: g10/g10.c:279
+#: g10/g10.c:288
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|gunakan keyserver ini utk lihat kunci"
 
-#: g10/g10.c:280
+#: g10/g10.c:289
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAMA|set charset terminal ke NAMA"
 
-#: g10/g10.c:281
+#: g10/g10.c:290
 msgid "read options from file"
 msgstr "baca pilihan dari file"
 
-#: g10/g10.c:285
+#: g10/g10.c:294
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tulis info status ke FD ini"
 
-#: g10/g10.c:290
+#: g10/g10.c:299
+msgid "|KEYID|ulimately trust this key"
+msgstr ""
+
+#: g10/g10.c:300
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: g10/g10.c:291
+#: g10/g10.c:301
 msgid "emulate the mode described in RFC1991"
 msgstr "emulasikan mode seperti dalam RFC1991"
 
-#: g10/g10.c:292
+#: g10/g10.c:302
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "set pilihan paket, cipher, digest ke OpenPGP"
 
-#: g10/g10.c:293
+#: g10/g10.c:303
 msgid "|N|use passphrase mode N"
 msgstr "|N|gunakan passphrase mode N"
 
-#: g10/g10.c:295
+#: g10/g10.c:305
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAMA|gunakan algoritma digest NAMA utk passphrase"
 
-#: g10/g10.c:297
+#: g10/g10.c:307
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAMA|gunakan algoritma cipher NAMA untuk passphrase"
 
-#: g10/g10.c:298
+#: g10/g10.c:308
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMA|gunakan algoritma cipher NAMA"
 
-#: g10/g10.c:299
+#: g10/g10.c:309
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMA|gunakan algoritma digest pesan NAMA"
 
-#: g10/g10.c:300
+#: g10/g10.c:310
 msgid "|N|use compress algorithm N"
 msgstr "|N|gunakan algoritma kompresi N"
 
-#: g10/g10.c:301
+#: g10/g10.c:311
 msgid "throw keyid field of encrypted packets"
 msgstr "buang field keyid paket terenkripsi"
 
-#: g10/g10.c:302
+#: g10/g10.c:312
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAMA=NILAI|gunakan notasi data ini"
 
-#: g10/g10.c:305
+#: g10/g10.c:315
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:308
+#: g10/g10.c:318
 msgid ""
 "@\n"
 "Examples:\n"
@@ -655,15 +659,15 @@
 " --list-keys [nama]      tampilkan kunci\n"
 " --fingerprint [nama]    tampilkan fingerprint\n"
 
-#: g10/g10.c:403
+#: g10/g10.c:418
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Silakan laporkan kesalahan ke <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:407
+#: g10/g10.c:422
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: g10/g10.c:410
+#: g10/g10.c:425
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -673,7 +677,7 @@
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/g10.c:417
+#: g10/g10.c:432
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -681,182 +685,186 @@
 "\n"
 "Algoritma yang didukung:\n"
 
-#: g10/g10.c:496
+#: g10/g10.c:511
 msgid "usage: gpg [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/g10.c:549
+#: g10/g10.c:564
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/g10.c:692
+#: g10/g10.c:704
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
-#: g10/g10.c:696
+#: g10/g10.c:708
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: g10/g10.c:703
+#: g10/g10.c:715
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/g10.c:893
+#: g10/g10.c:905
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/g10.c:949 g10/g10.c:958
+#: g10/g10.c:970
+msgid "WARNING: program may create a core file!\n"
+msgstr "PERINGATAN: program mungkin membuat file core!\n"
+
+#: g10/g10.c:974 g10/g10.c:983
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
 
-#: g10/g10.c:951
+#: g10/g10.c:976
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/g10.c:954
+#: g10/g10.c:979
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/g10.c:973 g10/g10.c:985
+#: g10/g10.c:998 g10/g10.c:1010
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/g10.c:979 g10/g10.c:991
+#: g10/g10.c:1004 g10/g10.c:1016
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/g10.c:995
+#: g10/g10.c:1020
 msgid "the given policy URL is invalid\n"
 msgstr "kebijakan URL yang diberikan tidak valid\n"
 
-#: g10/g10.c:998
+#: g10/g10.c:1023
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "algoritma kompresi harus di antara %d..%d\n"
 
-#: g10/g10.c:1000
+#: g10/g10.c:1025
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/g10.c:1002
+#: g10/g10.c:1027
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/g10.c:1004
+#: g10/g10.c:1029
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth harus di antara 1 hingga 255\n"
 
-#: g10/g10.c:1007
+#: g10/g10.c:1032
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/g10.c:1011
+#: g10/g10.c:1036
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K yang tidak valid; harus 0, 1 atau 3\n"
 
-#: g10/g10.c:1096
+#: g10/g10.c:1121
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/g10.c:1102
+#: g10/g10.c:1127
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/g10.c:1109
+#: g10/g10.c:1134
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/g10.c:1117
+#: g10/g10.c:1142
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/g10.c:1130
+#: g10/g10.c:1155
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/g10.c:1143
+#: g10/g10.c:1168
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/g10.c:1157
+#: g10/g10.c:1182
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/g10.c:1174
+#: g10/g10.c:1199
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1207
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/g10.c:1190
+#: g10/g10.c:1215
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/g10.c:1198
+#: g10/g10.c:1223
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1239
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-user"
 
-#: g10/g10.c:1217
+#: g10/g10.c:1242
 msgid "--delete-key user-id"
 msgstr "--delete-key id-user"
 
-#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393
+#: g10/encode.c:265 g10/g10.c:1279 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "tidak dapat membuka %s: %s\n"
 
-#: g10/g10.c:1269
+#: g10/g10.c:1294
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-user] [keyring]"
 
-#: g10/g10.c:1335
+#: g10/g10.c:1360
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/g10.c:1343
+#: g10/g10.c:1368
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/g10.c:1411
+#: g10/g10.c:1439
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1520
 msgid "[filename]"
 msgstr "[namafile]"
 
-#: g10/g10.c:1496
+#: g10/g10.c:1524
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1499 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1527 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
 
-#: g10/g10.c:1669
+#: g10/g10.c:1700
 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:1675
+#: g10/g10.c:1706
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -864,11 +872,11 @@
 "nama notasi hanya terdiri dari huruf, digit, titik atau garis bawah dan "
 "diakhiri dengan sebuah '='\n"
 
-#: g10/g10.c:1681
+#: g10/g10.c:1712
 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:1689
+#: g10/g10.c:1720
 msgid "a notation value must not use any control characters\n"
 msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n"
 
@@ -1244,58 +1252,58 @@
 msgid "writing key binding signature\n"
 msgstr "menulis key binding signature\n"
 
-#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:433
+#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:435
 #, 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:438
+#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:440
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:537
+#: g10/keygen.c:539
 msgid "Please select what kind of key you want:\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
 
-#: g10/keygen.c:539
+#: g10/keygen.c:541
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "  (%d) DSA dan ElGamal (baku)\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:542
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "  (%d) DSA (hanya menandai)\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:544
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "  (%d) ElGamal (hanya enkripsi)\n"
 
-#: g10/keygen.c:543
+#: g10/keygen.c:545
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "  (%d) ElGamal (tandai dan enkripsi)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:547
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "  (%d) ElGamal (tandai dan enkripsi)\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:551
 msgid "Your selection? "
 msgstr "Pilihan anda? "
 
-#: g10/keygen.c:560 g10/keygen.c:568
+#: g10/keygen.c:562 g10/keygen.c:570
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "Anda ingin membuat kunci sign dan enkripsi? "
 
-#: g10/keygen.c:582
+#: g10/keygen.c:584
 msgid "Invalid selection.\n"
 msgstr "Pilihan tidak valid.\n"
 
-#: g10/keygen.c:594
+#: g10/keygen.c:596
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1308,19 +1316,19 @@
 "       keysize default adalah 1024 bit\n"
 " keysize tertinggi dianjurkan 2048 bit\n"
 
-#: g10/keygen.c:601
+#: g10/keygen.c:603
 msgid "What keysize do you want? (1024) "
 msgstr "Keysize yang anda inginkan? (1024) "
 
-#: g10/keygen.c:606
+#: g10/keygen.c:608
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA hanya membolehkan keysize dari 512 hingga 1024\n"
 
-#: g10/keygen.c:608
+#: g10/keygen.c:610
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "keysize terlalu kecil; 768 adalah nilai terendah yang diijinkan.\n"
 
-#: g10/keygen.c:610
+#: g10/keygen.c:612
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "keysize terlalu kecil; 768 adalah nilai terendah yang diijinkan.\n"
@@ -1333,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:621
+#: g10/keygen.c:623
 #, 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:626
+#: g10/keygen.c:628
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1346,11 +1354,11 @@
 "Keysize lebih besar dari 2048 tidak dianjurkan karena\n"
 "komputasi akan sangat lama!\n"
 
-#: g10/keygen.c:629
+#: g10/keygen.c:631
 msgid "Are you sure that you want this keysize? "
 msgstr "Apakah anda yakin memerlukan keysize ini? "
 
-#: g10/keygen.c:630
+#: g10/keygen.c:632
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1358,21 +1366,21 @@
 "Oke, tetapi ingat bahwa radiasi monitor dan keyboard anda juga sangat mudah "
 "diserang!\n"
 
-#: g10/keygen.c:638
+#: g10/keygen.c:640
 msgid "Do you really need such a large keysize? "
 msgstr "Apakah anda perlu keysize berukuran besar tersebut? "
 
-#: g10/keygen.c:644
+#: g10/keygen.c:646
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Keysize yang diminta adalah %u bit\n"
 
-#: g10/keygen.c:647 g10/keygen.c:651
+#: g10/keygen.c:649 g10/keygen.c:653
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:699
+#: g10/keygen.c:701
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1388,35 +1396,35 @@
 "     <n>m = kunci berakhir dalam n bulan\n"
 "     <n>y = kunci berakhir dalam n tahun\n"
 
-#: g10/keygen.c:714
+#: g10/keygen.c:716
 msgid "Key is valid for? (0) "
 msgstr "Kunci valid untuk? (0) "
 
-#: g10/keygen.c:719
+#: g10/keygen.c:721
 msgid "invalid value\n"
 msgstr "nilai yang tidak valid\n"
 
-#: g10/keygen.c:724
+#: g10/keygen.c:726
 msgid "Key does not expire at all\n"
 msgstr "Kunci tidak pernah berakhir\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:730
+#: g10/keygen.c:732
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Kunci berakhir pada %s\n"
 
-#: g10/keygen.c:733
+#: g10/keygen.c:735
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:738
+#: g10/keygen.c:740
 msgid "Is this correct (y/n)? "
 msgstr "Benar (y/t)? "
 
-#: g10/keygen.c:781
+#: g10/keygen.c:783
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1431,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:793
+#: g10/keygen.c:795
 msgid "Real name: "
 msgstr "Nama sebenarnya: "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:803
 msgid "Invalid character in name\n"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: g10/keygen.c:799
+#: g10/keygen.c:805
 msgid "Name may not start with a digit\n"
 msgstr "Nama tidak boleh dimulai dengan digit\n"
 
-#: g10/keygen.c:801
+#: g10/keygen.c:807
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nama harus berukuran minimum 5 karakter\n"
 
-#: g10/keygen.c:809
+#: g10/keygen.c:815
 msgid "Email address: "
 msgstr "Alamat email: "
 
-#: g10/keygen.c:820
+#: g10/keygen.c:826
 msgid "Not a valid email address\n"
 msgstr "Bukan alamat email yang valid\n"
 
-#: g10/keygen.c:828
+#: g10/keygen.c:834
 msgid "Comment: "
 msgstr "Komentar: "
 
-#: g10/keygen.c:834
+#: g10/keygen.c:840
 msgid "Invalid character in comment\n"
 msgstr "Karakter tidak valid dalam komentar\n"
 
-#: g10/keygen.c:857
+#: g10/keygen.c:863
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Anda menggunakan set karakter `%s'.\n"
 
-#: g10/keygen.c:863
+#: g10/keygen.c:869
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1478,28 +1486,28 @@
 "Anda memilih USER-ID ini:\n"
 "   \"%s\"\n"
 
-#: g10/keygen.c:867
+#: g10/keygen.c:873
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:872
+#: g10/keygen.c:878
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoQq"
 
-#: g10/keygen.c:882
+#: g10/keygen.c:888
 #, 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:883
+#: g10/keygen.c:889
 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:902
+#: g10/keygen.c:908
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:940
+#: g10/keygen.c:946
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1507,11 +1515,11 @@
 "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:948
+#: g10/keyedit.c:468 g10/keygen.c:954
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "passphrase tidak diulang dengan benar; coba lagi.\n"
 
-#: g10/keygen.c:954
+#: g10/keygen.c:960
 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"
@@ -1523,7 +1531,7 @@
 "saat,\n"
 "menggunakan program ini dengan pilihan \"--edit-key\".\n"
 
-#: g10/keygen.c:975
+#: g10/keygen.c:981
 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"
@@ -1535,29 +1543,29 @@
 "selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
 "yang baik untuk memperoleh entropi.\n"
 
-#: g10/keygen.c:1424
+#: g10/keygen.c:1430
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "Keypair DSA akan memiliki 1024 bit.\n"
 
-#: g10/keygen.c:1467
+#: g10/keygen.c:1473
 msgid "Key generation canceled.\n"
 msgstr "Pembuatan kunci dibatalkan.\n"
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1570
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "menulis sertifikat publik ke `%s'\n"
 
-#: g10/keygen.c:1565
+#: g10/keygen.c:1571
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "menulis sertifikat rahasia ke `%s'\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1667
 msgid "public and secret key created and signed.\n"
 msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1672
 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"
@@ -1566,30 +1574,30 @@
 "mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
 "untuk tujuan ini.\n"
 
-#: g10/keygen.c:1683 g10/keygen.c:1784
+#: g10/keygen.c:1689 g10/keygen.c:1790
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/keygen.c:1727 g10/sig-check.c:318 g10/sign.c:112
+#: g10/keygen.c:1733 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:1729 g10/sig-check.c:320 g10/sign.c:114
+#: g10/keygen.c:1735 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:1762
+#: g10/keygen.c:1768
 msgid "Really create? "
 msgstr "Ingin diciptakan? "
 
-#: g10/encode.c:91 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/encode.c:91 g10/openfile.c:178 g10/openfile.c:288 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1600,17 +1608,17 @@
 msgid "error creating passphrase: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:319
+#: g10/encode.c:171 g10/encode.c:324
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: PERINGATAN: file kosong\n"
 
-#: g10/encode.c:266
+#: g10/encode.c:271
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "Membaca dari `%s'\n"
 
-#: g10/encode.c:483
+#: g10/encode.c:492
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s dienkripsi untuk: %s\n"
@@ -1659,248 +1667,258 @@
 msgid "No user ID for key\n"
 msgstr "Tidak ada ID user untuk kunci\n"
 
-#: g10/getkey.c:1642 g10/getkey.c:1698
+#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "menggunakan kunci sekunder %08lX selain kunci primer %08lX\n"
 
-#: g10/getkey.c:2017
+#: g10/getkey.c:2050
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: user tidak ditemukan\n"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "melewati blok tipe %d\n"
 
-#: g10/import.c:188 g10/trustdb.c:1740 g10/trustdb.c:1781
+#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu kunci telah diproses\n"
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: g10/import.c:203
+#: g10/import.c:204
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Jumlah yang telah diproses: %lu\n"
 
-#: g10/import.c:205
+#: g10/import.c:206
+#, fuzzy, c-format
+msgid "      skipped new keys: %lu\n"
+msgstr "          subkey baru: %lu\n"
+
+#: g10/import.c:209
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         tanpa ID user: %lu\n"
 
-#: g10/import.c:207
+#: g10/import.c:211
 #, c-format
 msgid "              imported: %lu"
 msgstr "             diimpor: %lu"
 
-#: g10/import.c:213
+#: g10/import.c:217
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "            tidak berubah: %lu\n"
 
-#: g10/import.c:215
+#: g10/import.c:219
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         ID user baru: %lu\n"
 
-#: g10/import.c:217
+#: g10/import.c:221
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "          subkey baru: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:223
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "       signature baru: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:225
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  pembatalan kunci baru: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:227
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     kunci rahasia dibaca: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:229
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  kunci rahasia diimpor: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:231
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " kunci rahasia tetap: %lu\n"
 
-#: g10/import.c:386 g10/import.c:578
+#: g10/import.c:391 g10/import.c:590
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
 
-#: g10/import.c:400
+#: g10/import.c:405
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "kunci %08lX: tidak ada ID user yang valid\n"
 
-#: g10/import.c:402
+#: g10/import.c:407
 msgid "this may be caused by a missing self-signature\n"
 msgstr "mungkin disebabkan oleh self-signature yang tidak ada\n"
 
-#: g10/import.c:413 g10/import.c:645
+#: g10/import.c:418 g10/import.c:657
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "kunci %08lX: kunci publik tidak ditemukan: %s\n"
 
-#: g10/import.c:419
+#: g10/import.c:423
+#, fuzzy, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "kunci %08lX: bukan kunci rfc2440 - dilewati\n"
+
+#: g10/import.c:431
 msgid "no default public keyring\n"
 msgstr "tidak ada keyring publik baku\n"
 
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
+#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "menulis ke `%s'\n"
 
-#: g10/import.c:426 g10/import.c:484 g10/import.c:593 g10/import.c:694
+#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "tidak dapat mengunci keyring `%s': %s\n"
 
-#: g10/import.c:429 g10/import.c:487 g10/import.c:596 g10/import.c:697
+#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/import.c:434
+#: g10/import.c:446
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "kunci %08lX: kunci publik diimpor\n"
 
-#: g10/import.c:451
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "kunci %08lX: tidak cocok dengan duplikat kami\n"
 
-#: g10/import.c:460 g10/import.c:653
+#: g10/import.c:472 g10/import.c:665
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "kunci %08lX: tidak dapat mengalokasi keyblock orisinal: %s\n"
 
-#: g10/import.c:466 g10/import.c:659
+#: g10/import.c:478 g10/import.c:671
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "kunci %08lX: tidak dapat membaca keyblok orisinal: %s\n"
 
-#: g10/import.c:493
+#: g10/import.c:505
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "kunci %08lX: 1 user ID baru\n"
 
-#: g10/import.c:496
+#: g10/import.c:508
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "kunci %08lX: %d user ID baru\n"
 
-#: g10/import.c:499
+#: g10/import.c:511
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "kunci %08lX: 1 signature baru\n"
 
-#: g10/import.c:502
+#: g10/import.c:514
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "kunci %08lX: %d signature baru\n"
 
-#: g10/import.c:505
+#: g10/import.c:517
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "kunci %08lX: 1 subkey baru\n"
 
-#: g10/import.c:508
+#: g10/import.c:520
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "kunci %08lX: %d subkey baru\n"
 
-#: g10/import.c:518
+#: g10/import.c:530
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "kunci %08lX: tidak berubah\n"
 
-#: g10/import.c:601
+#: g10/import.c:613
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "kunci %08lX: kunci rahasia diimpor\n"
 
 #. we can't merge secret keys
-#: g10/import.c:605
+#: g10/import.c:617
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "kunci %08lX: sudah ada di keyring rahasia\n"
 
-#: g10/import.c:610
+#: g10/import.c:622
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "kunci %08lX: kunci rahasia tidak ditemukan: %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:651
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "kunci %08lX: tdk ada kunci publik-tdk dpt mengaplikasikan sertifikat "
 "pembatalan\n"
 
-#: g10/import.c:670
+#: g10/import.c:682
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - ditolak\n"
 
-#: g10/import.c:702
+#: g10/import.c:714
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "kunci %08lX: sertifikat pembatalan diimpor\n"
 
-#: g10/import.c:744
+#: g10/import.c:756
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "kunci %08lX: tidak ada ID user untuk signature\n"
 
-#: g10/import.c:751 g10/import.c:775
+#: g10/import.c:763 g10/import.c:787
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
 
-#: g10/import.c:752
+#: g10/import.c:764
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "kunci %08lX: self-signature tidak valid\n"
 
-#: g10/import.c:767
+#: g10/import.c:779
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "kunci %08lX: tidak ada subkey untuk key binding\n"
 
-#: g10/import.c:776
+#: g10/import.c:788
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "kunci %08lX: subkey binding tidak valid\n"
 
-#: g10/import.c:803
+#: g10/import.c:815
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "kunci %08lX: menerima ID user yang tidak self-signed "
 
-#: g10/import.c:832
+#: g10/import.c:844
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "kunci %08lX: melewati ID user "
 
-#: g10/import.c:855
+#: g10/import.c:867
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "kunci %08lX: melewati subkey\n"
@@ -1909,32 +1927,32 @@
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:880
+#: g10/import.c:892
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "kunci %08lX: signature tidak dapat diekpor (kelas %02x) - dilewati\n"
 
-#: g10/import.c:889
+#: g10/import.c:901
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "kunci %08lX: sertifikat pembatalan di tempat yang salah - dilewati\n"
 
-#: g10/import.c:897
+#: g10/import.c:909
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - dilewati\n"
 
-#: g10/import.c:997
+#: g10/import.c:1009
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "kunci %08lX: terdeteksi ID user duplikat - digabungkan\n"
 
-#: g10/import.c:1048
+#: g10/import.c:1060
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "kunci %08lX: penambahan sertifikat pembatalan\n"
 
-#: g10/import.c:1162 g10/import.c:1215
+#: g10/import.c:1174 g10/import.c:1227
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "kunci %08lX: salinan kita tidak memiliki self-signature\n"
@@ -2511,8 +2529,18 @@
 msgid "no secret key\n"
 msgstr "tidak ada kunci rahasia\n"
 
+#: g10/keylist.c:158
+#, fuzzy
+msgid "invalid"
+msgstr "armor tidak valid"
+
+#: g10/keylist.c:178
+#, fuzzy
+msgid "revoked"
+msgstr "revkey"
+
 #. of subkey
-#: g10/keylist.c:318 g10/mainproc.c:742
+#: g10/keylist.c:400 g10/mainproc.c:760
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "Kunci berakhir pada %s\n"
@@ -2522,129 +2550,117 @@
 msgid "public key is %08lX\n"
 msgstr "kunci publik adalah %08lX\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:257
 msgid "public key encrypted data: good DEK\n"
 msgstr "data terenkripsi dengan kunci publik: DEK baik\n"
 
-#: g10/mainproc.c:281
+#: g10/mainproc.c:299
 #, 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:291
+#: g10/mainproc.c:309
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "dienkripsi dengan kunci %s, ID %08lX\n"
 
-#: g10/mainproc.c:297
+#: g10/mainproc.c:315
 msgid "no secret key for decryption available\n"
 msgstr "tidak tersedia kunci rahasia untuk dekripsi\n"
 
-#: g10/mainproc.c:306
+#: g10/mainproc.c:324
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "gagal dekripsi kunci publik: %s\n"
 
-#: g10/mainproc.c:343
+#: g10/mainproc.c:361
 msgid "decryption okay\n"
 msgstr "dekripsi lancar\n"
 
-#: g10/mainproc.c:348
+#: g10/mainproc.c:366
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "PERINGATAN: pesan terenkripsi telah dimanipulasi!\n"
 
-#: g10/mainproc.c:353
+#: g10/mainproc.c:371
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "gagal dekripsi: %s\n"
 
-#: g10/mainproc.c:372
+#: g10/mainproc.c:390
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "CATATAN: pengirim meminta \"for-your-eyes-only\"\n"
 
-#: g10/mainproc.c:374
+#: g10/mainproc.c:392
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nama file asli='%.*s'\n"
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:544
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:613 g10/mainproc.c:622
+#: g10/mainproc.c:631 g10/mainproc.c:640
 msgid "WARNING: invalid notation data found\n"
 msgstr "PERINGATAN: ditemukan notasi data tidak valid\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:643
 msgid "Notation: "
 msgstr "Notasi: "
 
-#: g10/mainproc.c:632
+#: g10/mainproc.c:650
 msgid "Policy: "
 msgstr "Kebijakan: "
 
-#: g10/mainproc.c:1062
+#: g10/mainproc.c:1080
 msgid "signature verification suppressed\n"
 msgstr "verifikasi signature tidak optimal\n"
 
-#: g10/mainproc.c:1068
+#: g10/mainproc.c:1086
 #, 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:1094 g10/mainproc.c:1105
+#: g10/mainproc.c:1112 g10/mainproc.c:1123
 msgid "BAD signature from \""
 msgstr "signature BURUK dari \""
 
-#: g10/mainproc.c:1095 g10/mainproc.c:1106
+#: g10/mainproc.c:1113 g10/mainproc.c:1124
 msgid "Good signature from \""
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1097
+#: g10/mainproc.c:1115
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1153
+#: g10/mainproc.c:1171
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Tidak dapat memeriksa signature: %s\n"
 
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1235
 #, fuzzy, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "kelas signature tidak dikenal"
 
-#: g10/mainproc.c:1263
+#: g10/mainproc.c:1281
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature model lama (PGP 2.X)\n"
 
-#: g10/mainproc.c:1268
+#: g10/mainproc.c:1286
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "terdeteksi root paket tidak valid dalam proc_tree()\n"
 
-#: g10/misc.c:94
+#: g10/misc.c:96
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "tidak dapat meniadakan core dump: %s\n"
 
-#: g10/misc.c:97
-msgid "WARNING: program may create a core file!\n"
-msgstr "PERINGATAN: program mungkin membuat file core!\n"
-
-#: g10/misc.c:205
+#: g10/misc.c:206
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Algoritma eksperimental sebaiknya tidak dipakai!\n"
 
-#: g10/misc.c:219
-msgid ""
-"RSA keys are deprecated; please consider creating a new key and use this key "
-"in the future\n"
-msgstr ""
-"Kunci RSA didepresiasi; silakan membuat kunci baru dan menggunakannya di "
-"masa depan\n"
-
-#: g10/misc.c:241
+#: g10/misc.c:233
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 "algoritma cipher ini didepresiasi; silakan gunakan yang lebih standar!\n"
@@ -2654,7 +2670,7 @@
 msgid "can't handle public key algorithm %d\n"
 msgstr "tidak dapat menangani algoritma kunci publik %d\n"
 
-#: g10/parse-packet.c:965
+#: g10/parse-packet.c:986
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaket tipe %d memiliki bit kritis terset\n"
@@ -2691,91 +2707,91 @@
 msgid "Repeat passphrase: "
 msgstr "Ulangi passphrase: "
 
-#: g10/plaintext.c:63
+#: g10/plaintext.c:67
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "data tidak disimpan; gunakan pilihan \"--output\" untuk menyimpannya\n"
 
-#: g10/plaintext.c:317
+#: g10/plaintext.c:324
 #, fuzzy
 msgid "Detached signature.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/plaintext.c:321
+#: g10/plaintext.c:328
 msgid "Please enter name of data file: "
 msgstr "Silakan masukkan nama file data: "
 
-#: g10/plaintext.c:342
+#: g10/plaintext.c:349
 msgid "reading stdin ...\n"
 msgstr "membaca stdin ...\n"
 
-#: g10/plaintext.c:385
+#: g10/plaintext.c:392
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "tidak dapat membuka data tertandai `%s'\n"
 
-#: g10/pubkey-enc.c:79
+#: g10/pubkey-enc.c:76
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "penerima anonim; mencoba kunci rahasia %08lX ...\n"
 
-#: g10/pubkey-enc.c:85
+#: g10/pubkey-enc.c:82
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "baik, kita adalah penerima anonim.\n"
 
-#: g10/pubkey-enc.c:137
+#: g10/pubkey-enc.c:134
 msgid "old encoding of the DEK is not supported\n"
 msgstr "encoding lama DEK tidak didukung\n"
 
-#: g10/pubkey-enc.c:156
+#: g10/pubkey-enc.c:153
 #, fuzzy, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "algoritma proteksi %d tidak didukung\n"
 
-#: g10/pubkey-enc.c:195
+#: g10/pubkey-enc.c:192
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "CATATAN: algoritma cipher %d tidak ditemukan dalam preferensi\n"
 
-#: g10/pubkey-enc.c:201
+#: g10/pubkey-enc.c:198
 #, fuzzy, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "CATATAN: kunci signature berakhir %s\n"
 
-#: g10/hkp.c:62
+#: g10/hkp.c:72
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
 msgstr ""
 
-#: g10/hkp.c:75
+#: g10/hkp.c:85
 #, fuzzy, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "impor kunci dari key server"
 
-#: g10/hkp.c:98 g10/hkp.c:136
+#: g10/hkp.c:109 g10/hkp.c:148
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/hkp.c:106
+#: g10/hkp.c:117
 #, fuzzy, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/hkp.c:158
+#: g10/hkp.c:170
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: g10/hkp.c:182
+#: g10/hkp.c:194
 #, fuzzy, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: g10/hkp.c:194
+#: g10/hkp.c:206
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr ""
 
-#: g10/hkp.c:197
+#: g10/hkp.c:209
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
@@ -2790,40 +2806,40 @@
 msgid "protection algorithm %d is not supported\n"
 msgstr "algoritma proteksi %d tidak didukung\n"
 
-#: g10/seckey-cert.c:175
+#: g10/seckey-cert.c:184
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Passphrase tidak valid; silakan coba lagi ...\n"
 
-#: g10/seckey-cert.c:231
+#: g10/seckey-cert.c:240
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "PERINGATAN: terdeteksi kunci lemah - silakan rubah passphrase lagi.\n"
 
-#: g10/sig-check.c:202
+#: g10/sig-check.c:199
 msgid "assuming bad MDC due to an unknown critical bit\n"
 msgstr "mengasumsikan MDC buruk karena ada bit kritis tidak dikenal\n"
 
-#: g10/sig-check.c:300
+#: g10/sig-check.c:297
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "ini adalah kunci ElGamal ciptaan PGP yang tidak aman untuk signature!\n"
 
-#: g10/sig-check.c:308
+#: g10/sig-check.c:305
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "kunci publik adalah %lu detik lebih baru daripada signature\n"
 
-#: g10/sig-check.c:309
+#: g10/sig-check.c:306
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "kunci publik adalah %lu detik lebih baru daripada signature\n"
 
-#: g10/sig-check.c:327
+#: g10/sig-check.c:324
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "CATATAN: kunci signature berakhir %s\n"
 
-#: g10/sig-check.c:396
+#: g10/sig-check.c:393
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "mengasumsikan signature buruk karena ada bit kritik tidak dikenal\n"
 
@@ -2832,7 +2848,7 @@
 msgid "%s signature from: %s\n"
 msgstr "%s signature dari: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:606
+#: g10/sign.c:290 g10/sign.c:610
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
@@ -2880,7 +2896,7 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: direktori tidak ada!\n"
 
-#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1363 g10/tdbio.c:444
+#: g10/openfile.c:226 g10/openfile.c:295 g10/ringedit.c:1369 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: tidak dapat membuat: %s\n"
@@ -2980,286 +2996,296 @@
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "trustdb terkorupsi; silakan jalankan \"gpg --fix-trustdb\".\n"
 
-#: g10/trustdb.c:168
+#: g10/trustdb.c:169
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "trust record %lu, req tipe %d: gagal baca: %s\n"
 
-#: g10/trustdb.c:183
+#: g10/trustdb.c:184
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "trust record %lu, tipe %d: gagal menulis: %s\n"
 
-#: g10/trustdb.c:197
+#: g10/trustdb.c:198
 #, c-format
 msgid "trust record %lu: delete failed: %s\n"
 msgstr "trust record %lu: gagal menghapus: %s\n"
 
-#: g10/trustdb.c:211
+#: g10/trustdb.c:212
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: gagal sync: %s\n"
 
-#: g10/trustdb.c:376
+#: g10/trustdb.c:377
 #, c-format
 msgid "error reading dir record for LID %lu: %s\n"
 msgstr "gagal membaca dir record untuk LID %lu: %s\n"
 
-#: g10/trustdb.c:383
+#: g10/trustdb.c:384
 #, c-format
 msgid "lid %lu: expected dir record, got type %d\n"
 msgstr "lid %lu: diharapkan dir record, didapat tipe %d\n"
 
-#: g10/trustdb.c:388
+#: g10/trustdb.c:389
 #, c-format
 msgid "no primary key for LID %lu\n"
 msgstr "bukan kunci primer untuk LID %lu\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:394
 #, c-format
 msgid "error reading primary key for LID %lu: %s\n"
 msgstr "gagal membaca kunci primer untuk LID %lu: %s\n"
 
-#: g10/trustdb.c:432
+#: g10/trustdb.c:433
 #, c-format
 msgid "get_dir_record: search_record failed: %s\n"
 msgstr "get_dir_record: gagal search_record: %s\n"
 
-#: g10/trustdb.c:487
-#, c-format
-msgid "NOTE: secret key %08lX is NOT protected.\n"
-msgstr "CATATAN: kunci rahasia %08lX tidak diproteksi.\n"
-
-#: g10/trustdb.c:495
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr "kunci %08lX: kunci rahasia tanpa kunci publik - dilewati\n"
-
-#: g10/trustdb.c:502
-#, c-format
-msgid "key %08lX: secret and public key don't match\n"
-msgstr "kunci %08lX: kunci publik dan rahasia tidak cocok\n"
+#: g10/trustdb.c:474
+#, fuzzy, c-format
+msgid "'%s' is not a valid long keyID\n"
+msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:501
 #, c-format
 msgid "key %08lX: can't put it into the trustdb\n"
 msgstr "kunci %08lX: tidak dapat meletakkan ke trustdb\n"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:507
 #, c-format
 msgid "key %08lX: query record failed\n"
 msgstr "kunci %08lX: gagal query record\n"
 
-#: g10/trustdb.c:529
+#: g10/trustdb.c:516
 #, c-format
 msgid "key %08lX: already in trusted key table\n"
 msgstr "kunci %08lX: sudah ada dalam tabel kunci trustdb\n"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:519
 #, c-format
 msgid "key %08lX: accepted as trusted key.\n"
 msgstr "kunci %08lX: diterima sebagai kunci terpercaya.\n"
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:546
+#, fuzzy, c-format
+msgid "key %08lX: no public key for trusted key - skipped\n"
+msgstr "kunci %08lX: bukan kunci rfc2440 - dilewati\n"
+
+#: g10/trustdb.c:565
+#, c-format
+msgid "NOTE: secret key %08lX is NOT protected.\n"
+msgstr "CATATAN: kunci rahasia %08lX tidak diproteksi.\n"
+
+#: g10/trustdb.c:577
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr "kunci %08lX: kunci rahasia tanpa kunci publik - dilewati\n"
+
+#: g10/trustdb.c:584
+#, c-format
+msgid "key %08lX: secret and public key don't match\n"
+msgstr "kunci %08lX: kunci publik dan rahasia tidak cocok\n"
+
+#: g10/trustdb.c:597
 #, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr "gagal enumerasi kunci rahasia: %s\n"
 
-#: g10/trustdb.c:921
+#: g10/trustdb.c:987
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "kunci %08lX.%lu: binding subkey baik\n"
 
-#: g10/trustdb.c:927 g10/trustdb.c:962
+#: g10/trustdb.c:993 g10/trustdb.c:1028
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "kunci %08lX.%lu: binding subkey tidak valid: %s\n"
 
-#: g10/trustdb.c:939
+#: g10/trustdb.c:1005
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "kunci %08lX.%lu: pembatalan kunci valid\n"
 
-#: g10/trustdb.c:945
+#: g10/trustdb.c:1011
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "kunci %08lX.%lu: pembatalan kunci tidak valid: %s\n"
 
-#: g10/trustdb.c:956
+#: g10/trustdb.c:1022
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "kunci %08lX.%lu: pembatalan subkey valid\n"
 
-#: g10/trustdb.c:1067
+#: g10/trustdb.c:1133
 msgid "Good self-signature"
 msgstr "Self-signature yang baik"
 
-#: g10/trustdb.c:1077
+#: g10/trustdb.c:1143
 msgid "Invalid self-signature"
 msgstr "Self-signature tidak valid"
 
-#: g10/trustdb.c:1104
+#: g10/trustdb.c:1170
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 "Pembatalan ID user valid dilewati karena ada self signature yang lebih baru"
 
-#: g10/trustdb.c:1110
+#: g10/trustdb.c:1176
 msgid "Valid user ID revocation"
 msgstr "Pembatalan ID user valid"
 
-#: g10/trustdb.c:1115
+#: g10/trustdb.c:1181
 msgid "Invalid user ID revocation"
 msgstr "Pembatalan ID user tidak valid"
 
-#: g10/trustdb.c:1157
+#: g10/trustdb.c:1223
 msgid "Valid certificate revocation"
 msgstr "Pembatalan sertifikat valid"
 
-#: g10/trustdb.c:1158
+#: g10/trustdb.c:1224
 msgid "Good certificate"
 msgstr "Sertifikat yang baik"
 
-#: g10/trustdb.c:1186
+#: g10/trustdb.c:1252
 msgid "Invalid certificate revocation"
 msgstr "Pembatalan sertifikat tidak valid"
 
-#: g10/trustdb.c:1187
+#: g10/trustdb.c:1253
 msgid "Invalid certificate"
 msgstr "Sertifikat tidak valid"
 
-#: g10/trustdb.c:1204 g10/trustdb.c:1208
+#: g10/trustdb.c:1270 g10/trustdb.c:1274
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "sig record %lu[%d] menunjuk ke record yang salah.\n"
 
-#: g10/trustdb.c:1267
+#: g10/trustdb.c:1333
 msgid "duplicated certificate - deleted"
 msgstr "sertifikat ganda - dihapus"
 
-#: g10/trustdb.c:1584
+#: g10/trustdb.c:1650
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir gagal: %s\n"
 
-#: g10/trustdb.c:1718
+#: g10/trustdb.c:1784
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: gagal menyisipkan: %s\n"
 
-#: g10/trustdb.c:1723
+#: g10/trustdb.c:1789
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: gagal menyisipkan: %s\n"
 
-#: g10/trustdb.c:1729
+#: g10/trustdb.c:1795
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: menyisipkan\n"
 
-#: g10/trustdb.c:1734
+#: g10/trustdb.c:1800
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "kesalahan membaca dir record: %s\n"
 
-#: g10/trustdb.c:1742 g10/trustdb.c:1805
+#: g10/trustdb.c:1808 g10/trustdb.c:1871
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu kunci diproses\n"
 
-#: g10/trustdb.c:1744 g10/trustdb.c:1811
+#: g10/trustdb.c:1810 g10/trustdb.c:1877
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu kunci dengan kesalahan\n"
 
-#: g10/trustdb.c:1746
+#: g10/trustdb.c:1812
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "%lu kunci disisipkan\n"
 
-#: g10/trustdb.c:1749
+#: g10/trustdb.c:1815
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "gagal enumerasi keyblok: %s\n"
 
-#: g10/trustdb.c:1797
+#: g10/trustdb.c:1863
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: dir record tanpa kunci - dilewati\n"
 
-#: g10/trustdb.c:1807
+#: g10/trustdb.c:1873
 #, fuzzy, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "kunci %08lX: %d subkey baru\n"
 
-#: g10/trustdb.c:1809
+#: g10/trustdb.c:1875
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "%lu kunci dilewati\n"
 
-#: g10/trustdb.c:1813
+#: g10/trustdb.c:1879
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "%lu kunci diperbaharui\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2224
 msgid "Ooops, no keys\n"
 msgstr "Ooops, tanpa kunci\n"
 
-#: g10/trustdb.c:2162
+#: g10/trustdb.c:2228
 msgid "Ooops, no user IDs\n"
 msgstr "Ooops, tanpa ID user\n"
 
-#: g10/trustdb.c:2320
+#: g10/trustdb.c:2386
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: gagal mencari di record: %s\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2395
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "kunci %08lX: gagal menyisipkan record trust: %s\n"
 
-#: g10/trustdb.c:2333
+#: g10/trustdb.c:2399
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "kunci %08lX.%lu: menyisipkan ke trustdb\n"
 
-#: g10/trustdb.c:2341
+#: g10/trustdb.c:2407
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr "kunci %08lX.%lu: tercipta di masa datang (masalah waktu atau jam)\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2422
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "kunci %08lX.%lu: berakhir pada %s\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2430
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "kunci %08lX.%lu: gagal periksa trust: %s\n"
 
-#: g10/trustdb.c:2515
+#: g10/trustdb.c:2581
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "user '%s' tidak ditemukan: %s\n"
 
-#: g10/trustdb.c:2517
+#: g10/trustdb.c:2583
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "masalah menemukan '%s' dalam trustdb: %s\n"
 
-#: g10/trustdb.c:2520
+#: g10/trustdb.c:2586
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "pemakai '%s' tidak ada di trustdb - menyisipkan\n"
 
-#: g10/trustdb.c:2523
+#: g10/trustdb.c:2589
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "gagal menaruh '%s' ke dalam trustdb: %s\n"
 
-#: g10/trustdb.c:2709 g10/trustdb.c:2739
+#: g10/trustdb.c:2775 g10/trustdb.c:2805
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "PERINGATAN: belum dapat menangani record pref panjang\n"
 
@@ -3280,26 +3306,26 @@
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: tidak dapat membuat keyring: %s\n"
 
-#: g10/ringedit.c:319 g10/ringedit.c:1368
+#: g10/ringedit.c:319 g10/ringedit.c:1374
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: keyring tercipta\n"
 
-#: g10/ringedit.c:1545
+#: g10/ringedit.c:1551
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "PERINGATAN: terdapat 2 file dengan informasi penting.\n"
 
-#: g10/ringedit.c:1546
+#: g10/ringedit.c:1552
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s adalah yang tidak berubah\n"
 
-#: g10/ringedit.c:1547
+#: g10/ringedit.c:1553
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s adalah yang baru\n"
 
-#: g10/ringedit.c:1548
+#: g10/ringedit.c:1554
 msgid "Please fix this possible security flaw\n"
 msgstr "Silakan perbaikan kemungkinan lubang keamanan\n"
 
@@ -3324,49 +3350,49 @@
 "untuk signature!\n"
 
 #. do not overwrite
-#: g10/openfile.c:79
+#: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
 msgstr "File `%s' ada. "
 
-#: g10/openfile.c:81
+#: g10/openfile.c:86
 msgid "Overwrite (y/N)? "
 msgstr "Ditimpa (y/T)? "
 
-#: g10/openfile.c:109
+#: g10/openfile.c:119
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: suffix tidak dikenal\n"
 
-#: g10/openfile.c:131
+#: g10/openfile.c:141
 msgid "Enter new filename"
 msgstr "Masukkan nama file baru"
 
-#: g10/openfile.c:172
+#: g10/openfile.c:182
 msgid "writing to stdout\n"
 msgstr "menulis ke stdout\n"
 
-#: g10/openfile.c:250
+#: g10/openfile.c:261
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "mengasumsikan data bertanda dalam `%s'\n"
 
-#: g10/openfile.c:300
+#: g10/openfile.c:311
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: file pilihan baru tercipta\n"
 
-#: g10/openfile.c:313
+#: g10/openfile.c:338
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: tidak dapat membuat direktori: %s\n"
 
-#: g10/openfile.c:316
+#: g10/openfile.c:341
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: direktori tercipta\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:343
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr ""
 
@@ -3659,6 +3685,13 @@
 #, fuzzy, c-format
 msgid "No help available for `%s'"
 msgstr "Tidak tersedia bantuan untuk `%s'"
+
+#~ msgid ""
+#~ "RSA keys are deprecated; please consider creating a new key and use this key "
+#~ "in the future\n"
+#~ msgstr ""
+#~ "Kunci RSA didepresiasi; silakan membuat kunci baru dan menggunakannya di "
+#~ "masa depan\n"
 
 #~ msgid "set debugging flags"
 #~ msgstr "set flag debugging"
diff -urN gnupg-1.0.2/po/it.po gnupg-1.0.3/po/it.po
--- gnupg-1.0.2/po/it.po	Wed Jul 12 14:59:42 2000
+++ gnupg-1.0.3/po/it.po	Mon Sep 18 12:18:05 2000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.0.0h\n"
-"POT-Creation-Date: 2000-07-12 12:13+0200\n"
+"POT-Creation-Date: 2000-09-18 12:17+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"
@@ -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:127 g10/keygen.c:1249
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1255
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
@@ -308,12 +308,12 @@
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:647
+#: cipher/random.c:650
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "ATTENZIONE: si sta usando un generatore di numeri casuali non sicuro!!\n"
 
-#: cipher/random.c:648
+#: cipher/random.c:651
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -327,7 +327,7 @@
 "NON USARE ALCUN DATO GENERATO DA QUESTO PROGRAMMA!\n"
 "\n"
 
-#: cipher/rndlinux.c:141
+#: cipher/rndlinux.c:142
 #, c-format
 msgid ""
 "\n"
@@ -339,7 +339,7 @@
 "altra cosa per dare all'OS la possibilitŕ di raccogliere altra entropia!\n"
 "(Servono altri %d byte)\n"
 
-#: g10/g10.c:197
+#: g10/g10.c:206
 msgid ""
 "@Commands:\n"
 " "
@@ -347,139 +347,139 @@
 "@Comandi:\n"
 " "
 
-#: g10/g10.c:199
+#: g10/g10.c:208
 msgid "|[file]|make a signature"
 msgstr "|[file]|fai una firma"
 
-#: g10/g10.c:200
+#: g10/g10.c:209
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: g10/g10.c:201
+#: g10/g10.c:210
 msgid "make a detached signature"
 msgstr "fai una firma separata"
 
-#: g10/g10.c:202
+#: g10/g10.c:211
 msgid "encrypt data"
 msgstr "cifra dati"
 
-#: g10/g10.c:203
+#: g10/g10.c:212
 msgid "encryption only with symmetric cipher"
 msgstr "cifra solo con un cifrario simmetrico"
 
-#: g10/g10.c:204
+#: g10/g10.c:213
 msgid "store only"
 msgstr "immagazzina soltanto"
 
-#: g10/g10.c:205
+#: g10/g10.c:214
 msgid "decrypt data (default)"
 msgstr "decifra dati (predefinito)"
 
-#: g10/g10.c:206
+#: g10/g10.c:215
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:208
+#: g10/g10.c:217
 msgid "list keys"
 msgstr "elenca le chiavi"
 
-#: g10/g10.c:210
+#: g10/g10.c:219
 msgid "list keys and signatures"
 msgstr "elenca le chiavi e le firme"
 
-#: g10/g10.c:211
+#: g10/g10.c:220
 msgid "check key signatures"
 msgstr "controlla le firme delle chiavi"
 
-#: g10/g10.c:212
+#: g10/g10.c:221
 msgid "list keys and fingerprints"
 msgstr "elenca le chiavi e le impronte digitali"
 
-#: g10/g10.c:213
+#: g10/g10.c:222
 msgid "list secret keys"
 msgstr "elenca le chiavi segrete"
 
-#: g10/g10.c:214
+#: g10/g10.c:223
 msgid "generate a new key pair"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/g10.c:215
+#: g10/g10.c:224
 msgid "remove key from the public keyring"
 msgstr "rimuove una chiave dal portachiavi pubblico"
 
-#: g10/g10.c:217
+#: g10/g10.c:226
 msgid "remove key from the secret keyring"
 msgstr "rimuove una chiave dal portachiavi privato"
 
-#: g10/g10.c:218
+#: g10/g10.c:227
 msgid "sign a key"
 msgstr "firma una chiave"
 
-#: g10/g10.c:219
+#: g10/g10.c:228
 msgid "sign a key locally"
 msgstr "firma localmente una chiave"
 
-#: g10/g10.c:220
+#: g10/g10.c:229
 msgid "sign or edit a key"
 msgstr "firma o modifica una chiave"
 
-#: g10/g10.c:221
+#: g10/g10.c:230
 msgid "generate a revocation certificate"
 msgstr "genera un certificato di revoca"
 
-#: g10/g10.c:222
+#: g10/g10.c:231
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/g10.c:223
+#: g10/g10.c:232
 msgid "export keys to a key server"
 msgstr "esporta le chiavi a un key server"
 
-#: g10/g10.c:224
+#: g10/g10.c:233
 msgid "import keys from a key server"
 msgstr "importa le chiavi da un key server"
 
-#: g10/g10.c:228
+#: g10/g10.c:237
 msgid "import/merge keys"
 msgstr "importa/aggiungi delle chiavi"
 
-#: g10/g10.c:230
+#: g10/g10.c:239
 msgid "list only the sequence of packets"
 msgstr "elenca solo la sequenza dei pacchetti"
 
-#: g10/g10.c:232
+#: g10/g10.c:241
 msgid "export the ownertrust values"
 msgstr "esporta i valori di fiducia"
 
-#: g10/g10.c:234
+#: g10/g10.c:243
 msgid "import ownertrust values"
 msgstr "importa i valori di fiducia"
 
-#: g10/g10.c:236
+#: g10/g10.c:245
 msgid "update the trust database"
 msgstr "aggiorna il database della fiducia"
 
-#: g10/g10.c:238
+#: g10/g10.c:247
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMI]|controlla il database della fiducia"
 
-#: g10/g10.c:239
+#: g10/g10.c:248
 msgid "fix a corrupted trust database"
 msgstr "ripara un database della fiducia rovinato"
 
-#: g10/g10.c:240
+#: g10/g10.c:249
 msgid "De-Armor a file or stdin"
 msgstr "rimuovi l'armatura a un file o a stdin"
 
-#: g10/g10.c:242
+#: g10/g10.c:251
 msgid "En-Armor a file or stdin"
 msgstr "crea l'armatura a un file o a stdin"
 
-#: g10/g10.c:244
+#: g10/g10.c:253
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|stampa tutti i message digests"
 
-#: g10/g10.c:248
+#: g10/g10.c:257
 msgid ""
 "@\n"
 "Options:\n"
@@ -489,156 +489,160 @@
 "Opzioni:\n"
 " "
 
-#: g10/g10.c:250
+#: g10/g10.c:259
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/g10.c:252
+#: g10/g10.c:261
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifra per NOME"
 
-#: g10/g10.c:255
+#: g10/g10.c:264
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usa NOME come destinatario predefinito"
 
-#: g10/g10.c:257
+#: g10/g10.c:266
 msgid "use the default key as default recipient"
 msgstr "usa la chiave predefinita come destinatario predefinito"
 
-#: g10/g10.c:261
+#: g10/g10.c:270
 msgid "use this user-id to sign or decrypt"
 msgstr "usa questo user-id per firmare o decifrare"
 
-#: g10/g10.c:262
+#: g10/g10.c:271
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|imposta il livello di compressione (0 disab.)"
 
-#: g10/g10.c:264
+#: g10/g10.c:273
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/g10.c:265
+#: g10/g10.c:274
 msgid "use as output file"
 msgstr "usa come file di output"
 
-#: g10/g10.c:266
+#: g10/g10.c:275
 msgid "verbose"
 msgstr "prolisso"
 
-#: g10/g10.c:267
+#: g10/g10.c:276
 msgid "be somewhat more quiet"
 msgstr "meno prolisso"
 
-#: g10/g10.c:268
+#: g10/g10.c:277
 msgid "don't use the terminal at all"
 msgstr "non usa per niente il terminale"
 
-#: g10/g10.c:269
+#: g10/g10.c:278
 msgid "force v3 signatures"
 msgstr "forza l'uso di firme v3"
 
-#: g10/g10.c:270
+#: g10/g10.c:279
 msgid "always use a MDC for encryption"
 msgstr "usa sempre un MDC per cifrare"
 
-#: g10/g10.c:271
+#: g10/g10.c:280
 msgid "do not make any changes"
 msgstr "non fa cambiamenti"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:273
+#: g10/g10.c:282
 msgid "batch mode: never ask"
 msgstr "modo batch: non fa domande"
 
-#: g10/g10.c:274
+#: g10/g10.c:283
 msgid "assume yes on most questions"
 msgstr "assumi \"sě\" per quasi tutte le domande"
 
-#: g10/g10.c:275
+#: g10/g10.c:284
 msgid "assume no on most questions"
 msgstr "assumi \"no\" per quasi tutte le domande"
 
-#: g10/g10.c:276
+#: g10/g10.c:285
 msgid "add this keyring to the list of keyrings"
 msgstr "aggiungi questo portachiavi alla lista"
 
-#: g10/g10.c:277
+#: g10/g10.c:286
 msgid "add this secret keyring to the list"
 msgstr "aggiungi questo portachiavi segreto alla lista"
 
-#: g10/g10.c:278
+#: g10/g10.c:287
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usa NOME come chiave segreta predefinita"
 
-#: g10/g10.c:279
+#: g10/g10.c:288
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|cerca le chiavi in questo keyserver"
 
-#: g10/g10.c:280
+#: g10/g10.c:289
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOME|imposta il set di caratteri del terminale NOME"
 
-#: g10/g10.c:281
+#: g10/g10.c:290
 msgid "read options from file"
 msgstr "leggi le opzioni dal file"
 
-#: g10/g10.c:285
+#: g10/g10.c:294
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrivi le informazioni di stato su questo FD"
 
-#: g10/g10.c:290
+#: g10/g10.c:299
+msgid "|KEYID|ulimately trust this key"
+msgstr ""
+
+#: g10/g10.c:300
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: g10/g10.c:291
+#: g10/g10.c:301
 msgid "emulate the mode described in RFC1991"
 msgstr "emula il modo descritto in RFC 1991"
 
-#: g10/g10.c:292
+#: g10/g10.c:302
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "imposta tutte le opzioni di pacchetto,\n"
 "cifrario e digest per OpenPGP"
 
-#: g10/g10.c:293
+#: g10/g10.c:303
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa il modo N per la passphrase"
 
-#: g10/g10.c:295
+#: g10/g10.c:305
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOME|usa l'algoritmo di message digest NOME per le passphrase"
 
-#: g10/g10.c:297
+#: g10/g10.c:307
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOME|usa l'alg. di cifratura NOME per le passphrase"
 
-#: g10/g10.c:298
+#: g10/g10.c:308
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di cifratura NOME"
 
-#: g10/g10.c:299
+#: g10/g10.c:309
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di message digest NOME"
 
-#: g10/g10.c:300
+#: g10/g10.c:310
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa l'algoritmo di compressione N"
 
-#: g10/g10.c:301
+#: g10/g10.c:311
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina il campo keyid dei pacchetti cifrati"
 
-#: g10/g10.c:302
+#: g10/g10.c:312
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOME=VALORE|usa questi dati per una nota"
 
-#: g10/g10.c:305
+#: g10/g10.c:315
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:308
+#: g10/g10.c:318
 msgid ""
 "@\n"
 "Examples:\n"
@@ -658,15 +662,15 @@
 " --list-keys [nomi]         mostra le chiavi\n"
 " --fingerprint [nomi]       mostra le impronte digitali\n"
 
-#: g10/g10.c:403
+#: g10/g10.c:418
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Per favore segnala i bug a <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:407
+#: g10/g10.c:422
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: g10/g10.c:410
+#: g10/g10.c:425
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -676,7 +680,7 @@
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/g10.c:417
+#: g10/g10.c:432
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -684,184 +688,188 @@
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/g10.c:496
+#: g10/g10.c:511
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: g10/g10.c:549
+#: g10/g10.c:564
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/g10.c:692
+#: g10/g10.c:704
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
 
-#: g10/g10.c:696
+#: g10/g10.c:708
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: g10/g10.c:703
+#: g10/g10.c:715
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/g10.c:893
+#: g10/g10.c:905
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s non č un set di caratteri valido\n"
 
-#: g10/g10.c:949 g10/g10.c:958
+#: g10/g10.c:970
+msgid "WARNING: program may create a core file!\n"
+msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
+
+#: g10/g10.c:974 g10/g10.c:983
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s normalmente non deve essere usato!\n"
 
-#: g10/g10.c:951
+#: g10/g10.c:976
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non č permesso usare %s con %s!\n"
 
-#: g10/g10.c:954
+#: g10/g10.c:979
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/g10.c:973 g10/g10.c:985
+#: g10/g10.c:998 g10/g10.c:1010
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non č valido\n"
 
-#: g10/g10.c:979 g10/g10.c:991
+#: g10/g10.c:1004 g10/g10.c:1016
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non č valido\n"
 
-#: g10/g10.c:995
+#: g10/g10.c:1020
 msgid "the given policy URL is invalid\n"
 msgstr "L'URL della policy indicato non č valido\n"
 
-#: g10/g10.c:998
+#: g10/g10.c:1023
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "l'algoritmo di compressione deve essere tra %d e %d\n"
 
-#: g10/g10.c:1000
+#: g10/g10.c:1025
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/g10.c:1002
+#: g10/g10.c:1027
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/g10.c:1004
+#: g10/g10.c:1029
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth deve essere tra 1 e 255\n"
 
-#: g10/g10.c:1007
+#: g10/g10.c:1032
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: l'uso del modo S2K semplice (0) č fortemente scoraggiato\n"
 
-#: g10/g10.c:1011
+#: g10/g10.c:1036
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non valido; deve essere 0, 1 o 3\n"
 
-#: g10/g10.c:1096
+#: g10/g10.c:1121
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/g10.c:1102
+#: g10/g10.c:1127
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/g10.c:1109
+#: g10/g10.c:1134
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/g10.c:1117
+#: g10/g10.c:1142
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/g10.c:1130
+#: g10/g10.c:1155
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/g10.c:1143
+#: g10/g10.c:1168
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/g10.c:1157
+#: g10/g10.c:1182
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/g10.c:1174
+#: g10/g10.c:1199
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1207
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:1190
+#: g10/g10.c:1215
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:1198
+#: g10/g10.c:1223
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1239
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key user-id"
 
-#: g10/g10.c:1217
+#: g10/g10.c:1242
 msgid "--delete-key user-id"
 msgstr "--delete-key user-id"
 
-#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393
+#: g10/encode.c:265 g10/g10.c:1279 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: g10/g10.c:1269
+#: g10/g10.c:1294
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [portachiavi]"
 
-#: g10/g10.c:1335
+#: g10/g10.c:1360
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:1343
+#: g10/g10.c:1368
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:1411
+#: g10/g10.c:1439
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1520
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/g10.c:1496
+#: g10/g10.c:1524
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1499 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1527 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
 
-#: g10/g10.c:1669
+#: g10/g10.c:1700
 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:1675
+#: g10/g10.c:1706
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -869,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:1681
+#: g10/g10.c:1712
 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:1689
+#: g10/g10.c:1720
 msgid "a notation value must not use any control characters\n"
 msgstr "il valore di una nota non deve usare caratteri di controllo\n"
 
@@ -1252,58 +1260,58 @@
 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:433
+#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:435
 #, 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:438
+#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:440
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "arrotondate a %u bit\n"
 
-#: g10/keygen.c:537
+#: g10/keygen.c:539
 msgid "Please select what kind of key you want:\n"
 msgstr "Per favore scegli che tipo di chiave vuoi:\n"
 
-#: g10/keygen.c:539
+#: g10/keygen.c:541
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (default)\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:542
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (firma solo)\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:544
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (cifra solo)\n"
 
-#: g10/keygen.c:543
+#: g10/keygen.c:545
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (firma e cifra)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:547
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (firma e cifra)\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:551
 msgid "Your selection? "
 msgstr "Cosa scegli? "
 
-#: g10/keygen.c:560 g10/keygen.c:568
+#: g10/keygen.c:562 g10/keygen.c:570
 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:582
+#: g10/keygen.c:584
 msgid "Invalid selection.\n"
 msgstr "Scelta non valida.\n"
 
-#: g10/keygen.c:594
+#: g10/keygen.c:596
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1316,19 +1324,19 @@
 "          la dimensione predefinita č 1024 bit\n"
 "  la dimensione massima consigliata č 2048 bit\n"
 
-#: g10/keygen.c:601
+#: g10/keygen.c:603
 msgid "What keysize do you want? (1024) "
 msgstr "Di che dimensioni vuoi la chiave? (1024) "
 
-#: g10/keygen.c:606
+#: g10/keygen.c:608
 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:608
+#: g10/keygen.c:610
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "la chiave č troppo corta; 768 č il minimo valore permesso.\n"
 
-#: g10/keygen.c:610
+#: g10/keygen.c:612
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "la chiave č troppo corta; 768 č il minimo valore permesso.\n"
@@ -1341,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:621
+#: g10/keygen.c:623
 #, 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:626
+#: g10/keygen.c:628
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1354,11 +1362,11 @@
 "Chiavi piů lunghe di 2048 non sono consigliate perchč i calcoli sono\n"
 "VERAMENTE lunghi!\n"
 
-#: g10/keygen.c:629
+#: g10/keygen.c:631
 msgid "Are you sure that you want this keysize? "
 msgstr "Sei sicuro di volere una chiave di queste dimensioni? "
 
-#: g10/keygen.c:630
+#: g10/keygen.c:632
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1366,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:638
+#: g10/keygen.c:640
 msgid "Do you really need such a large keysize? "
 msgstr "Ti serve davvero una chiave cosě lunga? "
 
-#: g10/keygen.c:644
+#: g10/keygen.c:646
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La dimensione richiesta della chiave č %u bit\n"
 
-#: g10/keygen.c:647 g10/keygen.c:651
+#: g10/keygen.c:649 g10/keygen.c:653
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrotondate a %u bit\n"
 
-#: g10/keygen.c:699
+#: g10/keygen.c:701
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1396,25 +1404,25 @@
 "      <n>m = la chiave scadrŕ dopo n mesi\n"
 "      <n>y = la chiave scadrŕ dopo n anni\n"
 
-#: g10/keygen.c:714
+#: g10/keygen.c:716
 msgid "Key is valid for? (0) "
 msgstr "Chiave valida per? (0) "
 
-#: g10/keygen.c:719
+#: g10/keygen.c:721
 msgid "invalid value\n"
 msgstr "valore non valido\n"
 
-#: g10/keygen.c:724
+#: g10/keygen.c:726
 msgid "Key does not expire at all\n"
 msgstr "La chiave non scade\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:730
+#: g10/keygen.c:732
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La chiave scadrŕ il %s\n"
 
-#: g10/keygen.c:733
+#: g10/keygen.c:735
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1422,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:738
+#: g10/keygen.c:740
 msgid "Is this correct (y/n)? "
 msgstr "Č giusto (s/n)? "
 
-#: g10/keygen.c:781
+#: g10/keygen.c:783
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1442,44 +1450,44 @@
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:793
+#: g10/keygen.c:795
 msgid "Real name: "
 msgstr "Nome e Cognome: "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:803
 msgid "Invalid character in name\n"
 msgstr "Carattere non valido nel nome\n"
 
-#: g10/keygen.c:799
+#: g10/keygen.c:805
 msgid "Name may not start with a digit\n"
 msgstr "Il nome non puň iniziare con una cifra\n"
 
-#: g10/keygen.c:801
+#: g10/keygen.c:807
 msgid "Name must be at least 5 characters long\n"
 msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
 
-#: g10/keygen.c:809
+#: g10/keygen.c:815
 msgid "Email address: "
 msgstr "Indirizzo di Email: "
 
-#: g10/keygen.c:820
+#: g10/keygen.c:826
 msgid "Not a valid email address\n"
 msgstr "L'indirizzo di email non č valido\n"
 
-#: g10/keygen.c:828
+#: g10/keygen.c:834
 msgid "Comment: "
 msgstr "Commento: "
 
-#: g10/keygen.c:834
+#: g10/keygen.c:840
 msgid "Invalid character in comment\n"
 msgstr "Carattere non valido nel commento\n"
 
-#: g10/keygen.c:857
+#: g10/keygen.c:863
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Stai usando il set di caratteri `%s'.\n"
 
-#: g10/keygen.c:863
+#: g10/keygen.c:869
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1490,28 +1498,28 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:867
+#: g10/keygen.c:873
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:872
+#: g10/keygen.c:878
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:882
+#: g10/keygen.c:888
 #, 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:883
+#: g10/keygen.c:889
 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:902
+#: g10/keygen.c:908
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:940
+#: g10/keygen.c:946
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1519,11 +1527,11 @@
 "Ti serve una passphrase per proteggere la tua chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:948
+#: g10/keyedit.c:468 g10/keygen.c:954
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "passphrase non ripetuta correttamente; riprova.\n"
 
-#: g10/keygen.c:954
+#: g10/keygen.c:960
 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"
@@ -1535,7 +1543,7 @@
 "programma con l'opzione \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:975
+#: g10/keygen.c:981
 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"
@@ -1547,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:1424
+#: g10/keygen.c:1430
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "La coppia DSA avrŕ 1024 bit.\n"
 
-#: g10/keygen.c:1467
+#: g10/keygen.c:1473
 msgid "Key generation canceled.\n"
 msgstr "Generazione della chiave annullata.\n"
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1570
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "scrittura del certificato pubblico in `%s'\n"
 
-#: g10/keygen.c:1565
+#: g10/keygen.c:1571
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "scrittura del certificato segreto in `%s'\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1667
 msgid "public and secret key created and signed.\n"
 msgstr "chiavi pubbliche e segrete create e firmate.\n"
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1672
 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"
@@ -1578,12 +1586,12 @@
 "il comando \"--edit-key\" per generare una chiave secondaria per questo "
 "scopo.\n"
 
-#: g10/keygen.c:1683 g10/keygen.c:1784
+#: g10/keygen.c:1689 g10/keygen.c:1790
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/keygen.c:1727 g10/sig-check.c:318 g10/sign.c:112
+#: g10/keygen.c:1733 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"
@@ -1591,7 +1599,7 @@
 "la chiave č stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:1729 g10/sig-check.c:320 g10/sign.c:114
+#: g10/keygen.c:1735 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"
@@ -1599,11 +1607,11 @@
 "la chiave č stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1768
 msgid "Really create? "
 msgstr "Crea davvero? "
 
-#: g10/encode.c:91 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/encode.c:91 g10/openfile.c:178 g10/openfile.c:288 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1614,17 +1622,17 @@
 msgid "error creating passphrase: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:319
+#: g10/encode.c:171 g10/encode.c:324
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ATTENZIONE: file vuoto\n"
 
-#: g10/encode.c:266
+#: g10/encode.c:271
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lettura da `%s'\n"
 
-#: g10/encode.c:483
+#: g10/encode.c:492
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s cifrato per: %s\n"
@@ -1673,248 +1681,258 @@
 msgid "No user ID for key\n"
 msgstr "Non ci sono user ID per questa chiave\n"
 
-#: g10/getkey.c:1642 g10/getkey.c:1698
+#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n"
 
-#: g10/getkey.c:2017
+#: g10/getkey.c:2050
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: utente non trovato\n"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "salto un blocco di tipo %d\n"
 
-#: g10/import.c:188 g10/trustdb.c:1740 g10/trustdb.c:1781
+#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "Per ora sono state esaminate %lu chiavi\n"
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: g10/import.c:203
+#: g10/import.c:204
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Numero totale esaminato: %lu\n"
 
-#: g10/import.c:205
+#: g10/import.c:206
+#, fuzzy, c-format
+msgid "      skipped new keys: %lu\n"
+msgstr "       nuove subchiavi: %lu\n"
+
+#: g10/import.c:209
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         senza user ID: %lu\n"
 
-#: g10/import.c:207
+#: g10/import.c:211
 #, c-format
 msgid "              imported: %lu"
 msgstr "             importate: %lu"
 
-#: g10/import.c:213
+#: g10/import.c:217
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "        non modificate: %lu\n"
 
-#: g10/import.c:215
+#: g10/import.c:219
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         nuovi user ID: %lu\n"
 
-#: g10/import.c:217
+#: g10/import.c:221
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "       nuove subchiavi: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:223
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "           nuove firme: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:225
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "nuove revoche di chiavi: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:227
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "  chiavi segrete lette: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:229
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "chiavi segrete importate: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:231
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chiavi segrete non cambiate: %lu\n"
 
-#: g10/import.c:386 g10/import.c:578
+#: g10/import.c:391 g10/import.c:590
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "chiave %08lX: nessun user ID\n"
 
-#: g10/import.c:400
+#: g10/import.c:405
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "chiave %08lX: nessun user ID valido\n"
 
-#: g10/import.c:402
+#: g10/import.c:407
 msgid "this may be caused by a missing self-signature\n"
 msgstr "questo puň essere causato da una autofirma mancante\n"
 
-#: g10/import.c:413 g10/import.c:645
+#: g10/import.c:418 g10/import.c:657
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
 
-#: g10/import.c:419
+#: g10/import.c:423
+#, fuzzy, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "chiave %08lX: chiave non rfc2440 - saltata\n"
+
+#: g10/import.c:431
 msgid "no default public keyring\n"
 msgstr "nessun portachiavi pubblico predefinito\n"
 
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
+#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scrittura in `%s'\n"
 
-#: g10/import.c:426 g10/import.c:484 g10/import.c:593 g10/import.c:694
+#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "impossibile fare il lock del portachiavi `%s': %s\n"
 
-#: g10/import.c:429 g10/import.c:487 g10/import.c:596 g10/import.c:697
+#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi `%s': %s\n"
 
-#: g10/import.c:434
+#: g10/import.c:446
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "chiave %08lX: chiave pubblica importata\n"
 
-#: g10/import.c:451
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "chiave %08lX: non corrisponde alla nostra copia\n"
 
-#: g10/import.c:460 g10/import.c:653
+#: g10/import.c:472 g10/import.c:665
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "chiave %08lX: impossibile individuare il keyblock originale: %s\n"
 
-#: g10/import.c:466 g10/import.c:659
+#: g10/import.c:478 g10/import.c:671
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "chiave %08lX: impossibile leggere il keyblock originale: %s\n"
 
-#: g10/import.c:493
+#: g10/import.c:505
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "chiave %08lX: 1 nuovo user ID\n"
 
-#: g10/import.c:496
+#: g10/import.c:508
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "chiave %08lX: %d nuovi user ID\n"
 
-#: g10/import.c:499
+#: g10/import.c:511
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "chiave %08lX: una nuova firma\n"
 
-#: g10/import.c:502
+#: g10/import.c:514
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "chiave %08lX: %d nuove firme\n"
 
-#: g10/import.c:505
+#: g10/import.c:517
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "chiave %08lX: una nuova subchiave\n"
 
-#: g10/import.c:508
+#: g10/import.c:520
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "chiave %08lX: %d nuove subchiavi\n"
 
-#: g10/import.c:518
+#: g10/import.c:530
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "chiave %08lX: non cambiata\n"
 
-#: g10/import.c:601
+#: g10/import.c:613
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "chiave %08lX: chiave segreta importata\n"
 
 #. we can't merge secret keys
-#: g10/import.c:605
+#: g10/import.c:617
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "chiave %08lX: giŕ nel portachiavi segreto\n"
 
-#: g10/import.c:610
+#: g10/import.c:622
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "chiave %08lX: chiave segreta non trovata: %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:651
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chiave %08lX: manca la chiave pubblica - impossibile applicare il\n"
 "certificato di revoca\n"
 
-#: g10/import.c:670
+#: g10/import.c:682
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "chiave %08lX: certificato di revoca non valido: %s - rifiutato\n"
 
-#: g10/import.c:702
+#: g10/import.c:714
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "chiave %08lX: certificato di revoca importato\n"
 
-#: g10/import.c:744
+#: g10/import.c:756
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "chiave %08lX: nessun user ID per la firma\n"
 
-#: g10/import.c:751 g10/import.c:775
+#: g10/import.c:763 g10/import.c:787
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
 
-#: g10/import.c:752
+#: g10/import.c:764
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "chiave %08lX: autofirma non valida\n"
 
-#: g10/import.c:767
+#: g10/import.c:779
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "chiave %08lX: non ci sono subchiavi per il legame con la chiave\n"
 
-#: g10/import.c:776
+#: g10/import.c:788
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "chiave %08lX: legame con la subchiave non valido:\n"
 
-#: g10/import.c:803
+#: g10/import.c:815
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "chiave %08lX: accettato l'user ID non autofirmato '"
 
-#: g10/import.c:832
+#: g10/import.c:844
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "chiave %08lX: saltato l'user ID '"
 
-#: g10/import.c:855
+#: g10/import.c:867
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "chiave %08lX: saltata la subchiave\n"
@@ -1923,32 +1941,32 @@
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:880
+#: g10/import.c:892
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "chiave %08lX: firma non esportabile (classe %02x) - saltata\n"
 
-#: g10/import.c:889
+#: g10/import.c:901
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "chiave %08lX: certificato di revoca nel posto sbagliato - saltato\n"
 
-#: g10/import.c:897
+#: g10/import.c:909
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "chiave %08lX: certificato di revoca non valido: %s - saltato\n"
 
-#: g10/import.c:997
+#: g10/import.c:1009
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "chiave %08lX: trovato un user ID duplicato - unito\n"
 
-#: g10/import.c:1048
+#: g10/import.c:1060
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "chiave %08lX: certificato di revoca aggiunto\n"
 
-#: g10/import.c:1162 g10/import.c:1215
+#: g10/import.c:1174 g10/import.c:1227
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "chiave %08lX: la nostra copia non ha autofirma\n"
@@ -2528,8 +2546,18 @@
 msgid "no secret key\n"
 msgstr "manca la chiave segreta\n"
 
+#: g10/keylist.c:158
+#, fuzzy
+msgid "invalid"
+msgstr "armatura non valida"
+
+#: g10/keylist.c:178
+#, fuzzy
+msgid "revoked"
+msgstr "revkey"
+
 #. of subkey
-#: g10/keylist.c:318 g10/mainproc.c:742
+#: g10/keylist.c:400 g10/mainproc.c:760
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "La chiave scadrŕ il %s\n"
@@ -2539,130 +2567,117 @@
 msgid "public key is %08lX\n"
 msgstr "la chiave pubblica č %08lX\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:257
 msgid "public key encrypted data: good DEK\n"
 msgstr "dati cifrati con la chiave pubblica: DEK corretto\n"
 
-#: g10/mainproc.c:281
+#: g10/mainproc.c:299
 #, 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:291
+#: g10/mainproc.c:309
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "Cifrato con la chiave %s con ID %08lX\n"
 
-#: g10/mainproc.c:297
+#: g10/mainproc.c:315
 msgid "no secret key for decryption available\n"
 msgstr "nessuna chiave disponibile per decifrare\n"
 
-#: g10/mainproc.c:306
+#: g10/mainproc.c:324
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifratura della chiave pubblica fallita: %s\n"
 
-#: g10/mainproc.c:343
+#: g10/mainproc.c:361
 msgid "decryption okay\n"
 msgstr "decifratura corretta\n"
 
-#: g10/mainproc.c:348
+#: g10/mainproc.c:366
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENZIONE: il messaggio cifrato č stato manipolato!\n"
 
-#: g10/mainproc.c:353
+#: g10/mainproc.c:371
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/mainproc.c:372
+#: g10/mainproc.c:390
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: il mittente ha richiesto \"solo-per-i-tuoi-occhi\"\n"
 
-#: g10/mainproc.c:374
+#: g10/mainproc.c:392
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome del file originale='%.*s'\n"
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:544
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca solitaria - usa \"gpg --import\" per applicarla\n"
 
-#: g10/mainproc.c:613 g10/mainproc.c:622
+#: g10/mainproc.c:631 g10/mainproc.c:640
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATTENZIONE: trovati dati di una nota non validi\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:643
 msgid "Notation: "
 msgstr "Nota: "
 
-#: g10/mainproc.c:632
+#: g10/mainproc.c:650
 msgid "Policy: "
 msgstr "Policy: "
 
-#: g10/mainproc.c:1062
+#: g10/mainproc.c:1080
 msgid "signature verification suppressed\n"
 msgstr "verifica della firma soppressa\n"
 
-#: g10/mainproc.c:1068
+#: g10/mainproc.c:1086
 #, 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:1094 g10/mainproc.c:1105
+#: g10/mainproc.c:1112 g10/mainproc.c:1123
 msgid "BAD signature from \""
 msgstr "Firma NON corretta da \""
 
-#: g10/mainproc.c:1095 g10/mainproc.c:1106
+#: g10/mainproc.c:1113 g10/mainproc.c:1124
 msgid "Good signature from \""
 msgstr "Firma valida da \""
 
-#: g10/mainproc.c:1097
+#: g10/mainproc.c:1115
 msgid "                aka \""
 msgstr "    anche noto come \""
 
-#: g10/mainproc.c:1153
+#: g10/mainproc.c:1171
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossibile controllare la firma: %s\n"
 
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1235
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma solitaria di classe 0x%02x\n"
 
-#: g10/mainproc.c:1263
+#: g10/mainproc.c:1281
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma vecchio stile (PGP 2.x)\n"
 
-#: g10/mainproc.c:1268
+#: g10/mainproc.c:1286
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "individuato un pacchetto radice non valido in proc_tree()\n"
 
-#: g10/misc.c:94
+#: g10/misc.c:96
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "impossibile disabilitare i core dump: %s\n"
 
-#: g10/misc.c:97
-msgid "WARNING: program may create a core file!\n"
-msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
-
-#: g10/misc.c:205
+#: g10/misc.c:206
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Gli algoritmi sperimentali non dovrebbero essere usati!\n"
 
-#: g10/misc.c:219
-msgid ""
-"RSA keys are deprecated; please consider creating a new key and use this key "
-"in the future\n"
-msgstr ""
-"Le chiavi RSA sono deprecate; per favore considera di creare una nuova "
-"chiave\n"
-"e usarla in futuro\n"
-
-#: g10/misc.c:241
+#: g10/misc.c:233
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr "questo algoritmo di cifratura č deprecato; usane uno piů standard!\n"
 
@@ -2671,7 +2686,7 @@
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n"
 
-#: g10/parse-packet.c:965
+#: g10/parse-packet.c:986
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
@@ -2708,92 +2723,92 @@
 msgid "Repeat passphrase: "
 msgstr "Ripeti la passphrase: "
 
-#: g10/plaintext.c:63
+#: g10/plaintext.c:67
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "i dati non sono stati salvati; usa l'opzione \"--output\" per salvarli\n"
 
-#: g10/plaintext.c:317
+#: g10/plaintext.c:324
 msgid "Detached signature.\n"
 msgstr "Firma separata.\n"
 
-#: g10/plaintext.c:321
+#: g10/plaintext.c:328
 msgid "Please enter name of data file: "
 msgstr "Inserisci il nome del file di dati: "
 
-#: g10/plaintext.c:342
+#: g10/plaintext.c:349
 msgid "reading stdin ...\n"
 msgstr "viene letto stdin...\n"
 
-#: g10/plaintext.c:385
+#: g10/plaintext.c:392
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "impossibile aprire i dati firmati `%s'\n"
 
-#: g10/pubkey-enc.c:79
+#: g10/pubkey-enc.c:76
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "destinatario anonimo; provo la chiave segreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:85
+#: g10/pubkey-enc.c:82
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "bene, siamo il destinatario anonimo.\n"
 
-#: g10/pubkey-enc.c:137
+#: g10/pubkey-enc.c:134
 msgid "old encoding of the DEK is not supported\n"
 msgstr "la vecchia codifica del DEK non č gestita\n"
 
-#: g10/pubkey-enc.c:156
+#: g10/pubkey-enc.c:153
 #, fuzzy, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "l'algoritmo di protezione %d non č gestito\n"
 
-#: g10/pubkey-enc.c:195
+#: g10/pubkey-enc.c:192
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr ""
 "NOTA: l'algoritmo di cifratura %d non č stato trovato nelle impostazioni\n"
 
-#: g10/pubkey-enc.c:201
+#: g10/pubkey-enc.c:198
 #, fuzzy, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTA: chiave per firmare scaduta il %s\n"
 
-#: g10/hkp.c:62
+#: g10/hkp.c:72
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
 msgstr ""
 
-#: g10/hkp.c:75
+#: g10/hkp.c:85
 #, fuzzy, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "importa le chiavi da un key server"
 
-#: g10/hkp.c:98 g10/hkp.c:136
+#: g10/hkp.c:109 g10/hkp.c:148
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/hkp.c:106
+#: g10/hkp.c:117
 #, fuzzy, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "%s non č un set di caratteri valido\n"
 
-#: g10/hkp.c:158
+#: g10/hkp.c:170
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: g10/hkp.c:182
+#: g10/hkp.c:194
 #, fuzzy, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: g10/hkp.c:194
+#: g10/hkp.c:206
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr ""
 
-#: g10/hkp.c:197
+#: g10/hkp.c:209
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
@@ -2808,42 +2823,42 @@
 msgid "protection algorithm %d is not supported\n"
 msgstr "l'algoritmo di protezione %d non č gestito\n"
 
-#: g10/seckey-cert.c:175
+#: g10/seckey-cert.c:184
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Passphrase non valida; riprova...\n"
 
-#: g10/seckey-cert.c:231
+#: g10/seckey-cert.c:240
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "ATTENZIONE: Individuata una chiave debole - per favore cambia ancora la\n"
 "passphrase.\n"
 
-#: g10/sig-check.c:202
+#: g10/sig-check.c:199
 msgid "assuming bad MDC due to an unknown critical bit\n"
 msgstr "si suppone un MDC non valido a causa di un bit critico sconosciuto\n"
 
-#: g10/sig-check.c:300
+#: g10/sig-check.c:297
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "questa č una chiave ElGamal generata da PGP e NON č sicura per le firme!\n"
 
-#: g10/sig-check.c:308
+#: g10/sig-check.c:305
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "la chiave pubblica č %lu secondo piů recente della firma\n"
 
-#: g10/sig-check.c:309
+#: g10/sig-check.c:306
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "la chiave pubblica č %lu secondi piů recente della firma\n"
 
-#: g10/sig-check.c:327
+#: g10/sig-check.c:324
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "NOTA: chiave per firmare scaduta il %s\n"
 
-#: g10/sig-check.c:396
+#: g10/sig-check.c:393
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "si suppone una firma non valida a causa di un bit critico sconosciuto\n"
@@ -2853,7 +2868,7 @@
 msgid "%s signature from: %s\n"
 msgstr "Firma %s da: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:606
+#: g10/sign.c:290 g10/sign.c:610
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "impossibile creare %s: %s\n"
@@ -2901,7 +2916,7 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: la directory non esiste!\n"
 
-#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1363 g10/tdbio.c:444
+#: g10/openfile.c:226 g10/openfile.c:295 g10/ringedit.c:1369 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: impossibile creare: %s\n"
@@ -3001,290 +3016,300 @@
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "Il trustdb č danneggiato; eseguire \"gpg --fix-trust-db\".\n"
 
-#: g10/trustdb.c:168
+#: g10/trustdb.c:169
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "trust record %lu, tipo %d: read fallita: %s\n"
 
-#: g10/trustdb.c:183
+#: g10/trustdb.c:184
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "trust record %lu, req type %d: write fallita: %s\n"
 
-#: g10/trustdb.c:197
+#: g10/trustdb.c:198
 #, c-format
 msgid "trust record %lu: delete failed: %s\n"
 msgstr "trust record %lu: delete fallita: %s\n"
 
-#: g10/trustdb.c:211
+#: g10/trustdb.c:212
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync fallita: %s\n"
 
-#: g10/trustdb.c:376
+#: g10/trustdb.c:377
 #, c-format
 msgid "error reading dir record for LID %lu: %s\n"
 msgstr "errore durante la lettura del dir record per il LID %lu: %s\n"
 
-#: g10/trustdb.c:383
+#: g10/trustdb.c:384
 #, c-format
 msgid "lid %lu: expected dir record, got type %d\n"
 msgstr "lid %lu: atteso un dir record, trovato uno di tipo %d\n"
 
-#: g10/trustdb.c:388
+#: g10/trustdb.c:389
 #, c-format
 msgid "no primary key for LID %lu\n"
 msgstr "manca una chiave primaria per il LID %lu\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:394
 #, c-format
 msgid "error reading primary key for LID %lu: %s\n"
 msgstr ""
 "errore durante la lettura della chiave primaria per il\n"
 "LID %lu: %s\n"
 
-#: g10/trustdb.c:432
+#: g10/trustdb.c:433
 #, c-format
 msgid "get_dir_record: search_record failed: %s\n"
 msgstr "get_dir_record: search_record fallito: %s\n"
 
-#: g10/trustdb.c:487
-#, c-format
-msgid "NOTE: secret key %08lX is NOT protected.\n"
-msgstr "NOTA: la chiave segreta %08lX NON č protetta.\n"
-
-#: g10/trustdb.c:495
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n"
-
-#: g10/trustdb.c:502
-#, c-format
-msgid "key %08lX: secret and public key don't match\n"
-msgstr "chiave %08lX: le chiavi segreta e pubblica non corrispondono\n"
+#: g10/trustdb.c:474
+#, fuzzy, c-format
+msgid "'%s' is not a valid long keyID\n"
+msgstr "%s non č un set di caratteri valido\n"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:501
 #, c-format
 msgid "key %08lX: can't put it into the trustdb\n"
 msgstr "chiave %08lX: impossibile metterla nel trustdb\n"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:507
 #, c-format
 msgid "key %08lX: query record failed\n"
 msgstr "chiave %08lX: richiesta del record fallita\n"
 
-#: g10/trustdb.c:529
+#: g10/trustdb.c:516
 #, c-format
 msgid "key %08lX: already in trusted key table\n"
 msgstr "chiave %08lX: giŕ nella tabella delle chiavi affidabili\n"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:519
 #, c-format
 msgid "key %08lX: accepted as trusted key.\n"
 msgstr "chiave %08lX: accettata come chiave affidabile\n"
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:546
+#, fuzzy, c-format
+msgid "key %08lX: no public key for trusted key - skipped\n"
+msgstr "chiave %08lX: chiave non rfc2440 - saltata\n"
+
+#: g10/trustdb.c:565
+#, c-format
+msgid "NOTE: secret key %08lX is NOT protected.\n"
+msgstr "NOTA: la chiave segreta %08lX NON č protetta.\n"
+
+#: g10/trustdb.c:577
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n"
+
+#: g10/trustdb.c:584
+#, c-format
+msgid "key %08lX: secret and public key don't match\n"
+msgstr "chiave %08lX: le chiavi segreta e pubblica non corrispondono\n"
+
+#: g10/trustdb.c:597
 #, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr "enumerate secret keys fallito: %s\n"
 
-#: g10/trustdb.c:921
+#: g10/trustdb.c:987
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "chiave %08lX.%lu: Legame con la subchiave corretto\n"
 
-#: g10/trustdb.c:927 g10/trustdb.c:962
+#: g10/trustdb.c:993 g10/trustdb.c:1028
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "chiave %08lX.%lu: Legame con la subchiave non valido: %s\n"
 
-#: g10/trustdb.c:939
+#: g10/trustdb.c:1005
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "chiave %08lX.%lu: Revoca della chiave valida\n"
 
-#: g10/trustdb.c:945
+#: g10/trustdb.c:1011
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "chiave %08lX.%lu: Revoca della chiave non valida: %s\n"
 
-#: g10/trustdb.c:956
+#: g10/trustdb.c:1022
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "chiave %08lX.%lu: Revoca della subchiave valida\n"
 
-#: g10/trustdb.c:1067
+#: g10/trustdb.c:1133
 msgid "Good self-signature"
 msgstr "Autofirma corretta"
 
-#: g10/trustdb.c:1077
+#: g10/trustdb.c:1143
 msgid "Invalid self-signature"
 msgstr "Autofirma non valida"
 
-#: g10/trustdb.c:1104
+#: g10/trustdb.c:1170
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 "Saltata una revoca dell'user ID valida a causa di una autofirma piů recente"
 
-#: g10/trustdb.c:1110
+#: g10/trustdb.c:1176
 msgid "Valid user ID revocation"
 msgstr "Revoca dell'user ID valida"
 
-#: g10/trustdb.c:1115
+#: g10/trustdb.c:1181
 msgid "Invalid user ID revocation"
 msgstr "Revoca dell'user ID non valida"
 
-#: g10/trustdb.c:1157
+#: g10/trustdb.c:1223
 msgid "Valid certificate revocation"
 msgstr "Revoca del certificato valida"
 
-#: g10/trustdb.c:1158
+#: g10/trustdb.c:1224
 msgid "Good certificate"
 msgstr "Certificato corretto"
 
-#: g10/trustdb.c:1186
+#: g10/trustdb.c:1252
 msgid "Invalid certificate revocation"
 msgstr "Certificato di revoca non valido"
 
-#: g10/trustdb.c:1187
+#: g10/trustdb.c:1253
 msgid "Invalid certificate"
 msgstr "Certificato non valido"
 
-#: g10/trustdb.c:1204 g10/trustdb.c:1208
+#: g10/trustdb.c:1270 g10/trustdb.c:1274
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "il sig recor di %lu[%d] punta al record sbagliato.\n"
 
-#: g10/trustdb.c:1267
+#: g10/trustdb.c:1333
 msgid "duplicated certificate - deleted"
 msgstr "certificato doppio - cancellato"
 
-#: g10/trustdb.c:1584
+#: g10/trustdb.c:1650
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir fallita: %s\n"
 
-#: g10/trustdb.c:1718
+#: g10/trustdb.c:1784
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: inserimento fallito: %s\n"
 
-#: g10/trustdb.c:1723
+#: g10/trustdb.c:1789
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: inserimento fallito: %s\n"
 
-#: g10/trustdb.c:1729
+#: g10/trustdb.c:1795
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: inserito\n"
 
-#: g10/trustdb.c:1734
+#: g10/trustdb.c:1800
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "errore durante la lettura del dir record: %s\n"
 
-#: g10/trustdb.c:1742 g10/trustdb.c:1805
+#: g10/trustdb.c:1808 g10/trustdb.c:1871
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu chiavi esaminate\n"
 
-#: g10/trustdb.c:1744 g10/trustdb.c:1811
+#: g10/trustdb.c:1810 g10/trustdb.c:1877
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu chiavi con errori\n"
 
-#: g10/trustdb.c:1746
+#: g10/trustdb.c:1812
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu chiavi inserite\n"
 
-#: g10/trustdb.c:1749
+#: g10/trustdb.c:1815
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "enumerate keyblocks fallito: %s\n"
 
-#: g10/trustdb.c:1797
+#: g10/trustdb.c:1863
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: dir record senza chiave - saltato\n"
 
-#: g10/trustdb.c:1807
+#: g10/trustdb.c:1873
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "\t%lu a causa di nuove chiavi pubbliche\n"
 
-#: g10/trustdb.c:1809
+#: g10/trustdb.c:1875
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu chiavi saltate\n"
 
-#: g10/trustdb.c:1813
+#: g10/trustdb.c:1879
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu chiavi aggiornate\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2224
 msgid "Ooops, no keys\n"
 msgstr "Ooops, mancano le chiavi\n"
 
-#: g10/trustdb.c:2162
+#: g10/trustdb.c:2228
 msgid "Ooops, no user IDs\n"
 msgstr "Ooops, mancano gli user ID\n"
 
-#: g10/trustdb.c:2320
+#: g10/trustdb.c:2386
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: ricerca del dir record fallita: %s\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2395
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "chiave %08lX: inserimento del record della fiducia fallito: %s\n"
 
-#: g10/trustdb.c:2333
+#: g10/trustdb.c:2399
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "chiave %08lX.%lu: inserita nel trustdb\n"
 
-#: g10/trustdb.c:2341
+#: g10/trustdb.c:2407
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "chiave %08lX.%lu: creata nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2422
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "chiave %08lX.%lu: scaduta il %s\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2430
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "chiave %08lX.%lu: controllo della fiducia fallito: %s\n"
 
-#: g10/trustdb.c:2515
+#: g10/trustdb.c:2581
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "utente `%s' non trovato: %s\n"
 
-#: g10/trustdb.c:2517
+#: g10/trustdb.c:2583
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problema cercando `%s' nel trustdb: %s\n"
 
-#: g10/trustdb.c:2520
+#: g10/trustdb.c:2586
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "l'utente `%s' non č nel trustdb - viene inserito\n"
 
-#: g10/trustdb.c:2523
+#: g10/trustdb.c:2589
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "impossibile mettere `%s' nel trustdb: %s\n"
 
-#: g10/trustdb.c:2709 g10/trustdb.c:2739
+#: g10/trustdb.c:2775 g10/trustdb.c:2805
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "ATTENZIONE: non č ancora possibile gestire record pref lunghi\n"
 
@@ -3308,26 +3333,26 @@
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: impossibile creare il portachiavi: %s\n"
 
-#: g10/ringedit.c:319 g10/ringedit.c:1368
+#: g10/ringedit.c:319 g10/ringedit.c:1374
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: portachiavi creato\n"
 
-#: g10/ringedit.c:1545
+#: g10/ringedit.c:1551
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ATTENZIONE: esistono due file con informazioni confidenziali.\n"
 
-#: g10/ringedit.c:1546
+#: g10/ringedit.c:1552
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s č quello non modificato\n"
 
-#: g10/ringedit.c:1547
+#: g10/ringedit.c:1553
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s č quello nuovo\n"
 
-#: g10/ringedit.c:1548
+#: g10/ringedit.c:1554
 msgid "Please fix this possible security flaw\n"
 msgstr "Per favore risolvete questo possibile problema di sicurezza\n"
 
@@ -3352,49 +3377,49 @@
 "le firme!\n"
 
 #. do not overwrite
-#: g10/openfile.c:79
+#: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Il file `%s' esiste. "
 
-#: g10/openfile.c:81
+#: g10/openfile.c:86
 msgid "Overwrite (y/N)? "
 msgstr "Sovrascrivo (s/N)? "
 
-#: g10/openfile.c:109
+#: g10/openfile.c:119
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: suffisso sconosciuto\n"
 
-#: g10/openfile.c:131
+#: g10/openfile.c:141
 msgid "Enter new filename"
 msgstr "Inserire il nuovo nome del file"
 
-#: g10/openfile.c:172
+#: g10/openfile.c:182
 msgid "writing to stdout\n"
 msgstr "scrivo su stdout\n"
 
-#: g10/openfile.c:250
+#: g10/openfile.c:261
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "suppongo che i dati firmati siano in `%s'\n"
 
-#: g10/openfile.c:300
+#: g10/openfile.c:311
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: creato un nuovo file delle opzioni\n"
 
-#: g10/openfile.c:313
+#: g10/openfile.c:338
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: impossibile creare la directory: %s\n"
 
-#: g10/openfile.c:316
+#: g10/openfile.c:341
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: directory creata\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:343
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr ""
 "č necessario eseguire di nuovo GnuPG in modo che possa leggere il nuovo\n"
@@ -3694,6 +3719,14 @@
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Non č disponibile un aiuto per `%s'"
+
+#~ msgid ""
+#~ "RSA keys are deprecated; please consider creating a new key and use this key "
+#~ "in the future\n"
+#~ msgstr ""
+#~ "Le chiavi RSA sono deprecate; per favore considera di creare una nuova "
+#~ "chiave\n"
+#~ "e usarla in futuro\n"
 
 #~ msgid "set debugging flags"
 #~ msgstr "imposta i flag di debugging"
diff -urN gnupg-1.0.2/po/ja.po gnupg-1.0.3/po/ja.po
--- gnupg-1.0.2/po/ja.po	Wed Jul 12 14:59:43 2000
+++ gnupg-1.0.3/po/ja.po	Mon Sep 18 12:18:05 2000
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-07-12 12:13+0200\n"
+"POT-Creation-Date: 2000-09-18 12:17+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"
@@ -257,7 +257,7 @@
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "ĄĐĄ°¤ň¸«¤Ä¤±¤ż¤č¤¦¤Ç¤ą ... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1255
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' ¤¬ł«¤±¤Ţ¤»¤ó: %s\n"
@@ -309,11 +309,11 @@
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:647
+#: cipher/random.c:650
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "·Ůąđ: °ÂÁ´¤Ç¤Ę¤¤ÍđżôŔ¸Ŕ®ÁőĂÖ¤¬»Č¤ď¤ě¤Ć¤¤¤Ţ¤ą!!\n"
 
-#: cipher/random.c:648
+#: cipher/random.c:651
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -327,7 +327,7 @@
 "¤ł¤ÎĄ×ĄíĄ°ĄéĄŕ¤Ë¤č¤ęŔ¸Ŕ®¤µ¤ě¤żĄÇˇĽĄż¤Ď°ěŔÚ»ČÍѤ·¤Ć¤Ď¤¤¤±¤Ţ¤»¤ó!!\n"
 "\n"
 
-#: cipher/rndlinux.c:141
+#: cipher/rndlinux.c:142
 #, c-format
 msgid ""
 "\n"
@@ -338,7 +338,7 @@
 "˝˝Ę¬¤ĘÄą¤µ¤ÎÍđżô¤¬ĆŔ¤é¤ě¤Ţ¤»¤óˇŁĄ¨ĄóĄČĄíĄÔˇĽ¤ňÁý˛Ă¤µ¤»¤ë¤č¤¦¤Ë\n"
 "OS ¤ÎŔßÄę¤ňĘŃąą¤·¤Ć¤Ż¤Ŕ¤µ¤¤ˇŁ(%d bytes °Ęľĺ¤ÎĽţ´ü¤¬É¬ÍפǤą)\n"
 
-#: g10/g10.c:197
+#: g10/g10.c:206
 msgid ""
 "@Commands:\n"
 " "
@@ -346,139 +346,139 @@
 "@ĄłĄŢĄóĄÉ:\n"
 " "
 
-#: g10/g10.c:199
+#: g10/g10.c:208
 msgid "|[file]|make a signature"
 msgstr "|[file]|˝đĚľ¤ňşîŔ®"
 
-#: g10/g10.c:200
+#: g10/g10.c:209
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|ĄŻĄęĄ˘˝đĚľ¤ňşîŔ®"
 
-#: g10/g10.c:201
+#: g10/g10.c:210
 msgid "make a detached signature"
 msgstr "ʬΥ˝đĚľ¤ňşîŔ®"
 
-#: g10/g10.c:202
+#: g10/g10.c:211
 msgid "encrypt data"
 msgstr "ĄÇˇĽĄż¤ň°Ĺąć˛˝"
 
-#: g10/g10.c:203
+#: g10/g10.c:212
 msgid "encryption only with symmetric cipher"
 msgstr "°Ĺąć˛˝¤Ë¤ĎÂоΰŹćˡ¤Î¤ß¤ň»ČÍŃ"
 
-#: g10/g10.c:204
+#: g10/g10.c:213
 msgid "store only"
 msgstr "Ęݸ¤Î¤ß"
 
-#: g10/g10.c:205
+#: g10/g10.c:214
 msgid "decrypt data (default)"
 msgstr "ĄÇˇĽĄż¤ňÉüąć (ĄÇĄŐĄ©ĄëĄČ)"
 
-#: g10/g10.c:206
+#: g10/g10.c:215
 msgid "verify a signature"
 msgstr "˝đĚľ¤ň¸ˇľÚ"
 
-#: g10/g10.c:208
+#: g10/g10.c:217
 msgid "list keys"
 msgstr "¸°¤Î°ěÍ÷"
 
-#: g10/g10.c:210
+#: g10/g10.c:219
 msgid "list keys and signatures"
 msgstr "¸°¤Č˝đĚľ¤Î°ěÍ÷"
 
-#: g10/g10.c:211
+#: g10/g10.c:220
 msgid "check key signatures"
 msgstr "¸°¤Î˝đĚľ¤ň¸ˇľÚ"
 
-#: g10/g10.c:212
+#: g10/g10.c:221
 msgid "list keys and fingerprints"
 msgstr "¸°¤Č»ŘĚć¤Î°ěÍ÷"
 
-#: g10/g10.c:213
+#: g10/g10.c:222
 msgid "list secret keys"
 msgstr "ČëĚ©¸°¤Î°ěÍ÷"
 
-#: g10/g10.c:214
+#: g10/g10.c:223
 msgid "generate a new key pair"
 msgstr "ż·¤·¤¤¸°ĄÚĄ˘¤ňşîŔ®"
 
-#: g10/g10.c:215
+#: g10/g10.c:224
 msgid "remove key from the public keyring"
 msgstr "¸řł«¸°ĄęĄóĄ°¤«¤é¸°¤ňşď˝ü"
 
-#: g10/g10.c:217
+#: g10/g10.c:226
 msgid "remove key from the secret keyring"
 msgstr "ČëĚ©¸°ĄęĄóĄ°¤«¤é¸°¤ňşď˝ü"
 
-#: g10/g10.c:218
+#: g10/g10.c:227
 msgid "sign a key"
 msgstr "¸°¤Ë˝đĚľ"
 
-#: g10/g10.c:219
+#: g10/g10.c:228
 msgid "sign a key locally"
 msgstr "ĄíˇĽĄ«Ąë¤Ë¤Ć¸°¤Ë˝đĚľ"
 
-#: g10/g10.c:220
+#: g10/g10.c:229
 msgid "sign or edit a key"
 msgstr "¸°¤Ř¤Î˝đĚľ¤Ţ¤ż¤ĎĘÔ˝¸"
 
-#: g10/g10.c:221
+#: g10/g10.c:230
 msgid "generate a revocation certificate"
 msgstr "ÇË´ţľÚĚŔ˝ń¤ňşîŔ®"
 
-#: g10/g10.c:222
+#: g10/g10.c:231
 msgid "export keys"
 msgstr "¸°¤ň˝ń¤­˝Đ¤ą"
 
-#: g10/g10.c:223
+#: g10/g10.c:232
 msgid "export keys to a key server"
 msgstr "¸°ĄµˇĽĄĐ¤Ë¸°¤ňĹĐĎż"
 
-#: g10/g10.c:224
+#: g10/g10.c:233
 msgid "import keys from a key server"
 msgstr "¸°ĄµˇĽĄĐˇĽ¤«¤é¸°¤ňĆɤ߹ţ¤ŕ"
 
-#: g10/g10.c:228
+#: g10/g10.c:237
 msgid "import/merge keys"
 msgstr "¸°¤ÎĆɤ߹ţ¤ß/ĄŢˇĽĄ¸"
 
-#: g10/g10.c:230
+#: g10/g10.c:239
 msgid "list only the sequence of packets"
 msgstr "ĄŃĄ±ĄĂĄČÎó¤Î¤ß¤Î°ěÍ÷"
 
-#: g10/g10.c:232
+#: g10/g10.c:241
 msgid "export the ownertrust values"
 msgstr "˝ęÍ­ĽÔ¤ňż®ÍѤ·¤żĂͤň˝ń¤­˝Đ¤ą"
 
-#: g10/g10.c:234
+#: g10/g10.c:243
 msgid "import ownertrust values"
 msgstr "˝ęÍ­ĽÔ¤ňż®ÍѤ·¤żĂͤňĆɤ߹ţ¤ŕ"
 
-#: g10/g10.c:236
+#: g10/g10.c:245
 msgid "update the trust database"
 msgstr "ż®ÍѥǡĽĄżĄŮˇĽĄą¤ňąąż·"
 
-#: g10/g10.c:238
+#: g10/g10.c:247
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMES]|ż®ÍѥǡĽĄżĄŮˇĽĄą¤ňĄÁĄ§ĄĂĄŻ"
 
-#: g10/g10.c:239
+#: g10/g10.c:248
 msgid "fix a corrupted trust database"
 msgstr "˛ő¤ě¤żż®ÍѥǡĽĄżĄŮˇĽĄą¤ň˝¤Éü"
 
-#: g10/g10.c:240
+#: g10/g10.c:249
 msgid "De-Armor a file or stdin"
 msgstr "ĄŐĄˇĄ¤Ąë¤Ţ¤ż¤Ďɸ˝ŕĆţÎϤÎÁőąĂ˝üµî"
 
-#: g10/g10.c:242
+#: g10/g10.c:251
 msgid "En-Armor a file or stdin"
 msgstr "ĄŐĄˇĄ¤Ąë¤Ţ¤ż¤Ďɸ˝ŕĆţÎϤÎÁőąĂ˛˝"
 
-#: g10/g10.c:244
+#: g10/g10.c:253
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|ĄáĄĂĄ»ˇĽĄ¸Í×Ěó¤ň˝ĐÎĎ"
 
-#: g10/g10.c:248
+#: g10/g10.c:257
 msgid ""
 "@\n"
 "Options:\n"
@@ -488,154 +488,158 @@
 "ĄŞĄ×Ą·ĄçĄó:\n"
 " "
 
-#: g10/g10.c:250
+#: g10/g10.c:259
 msgid "create ascii armored output"
 msgstr "Ą˘ĄąĄ­ˇĽ·ÁĽ°¤ÎÁőąĂ¤ňŔ¸Ŕ®"
 
-#: g10/g10.c:252
+#: g10/g10.c:261
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|NAME ÍѤ˰Ź沽"
 
-#: g10/g10.c:255
+#: g10/g10.c:264
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|ĄÇĄŐĄ©ĄëĄČ¤ÎĽőż®ĽÔ¤Č¤·¤Ć NAME ¤ňÍѤ¤¤ë"
 
-#: g10/g10.c:257
+#: g10/g10.c:266
 msgid "use the default key as default recipient"
 msgstr "ĄÇĄŐĄ©ĄëĄČ¤ÎĽőż®ĽÔ¤Č¤·¤ĆĄÇĄŐĄ©ĄëĄČ¤Î¸°¤ňÍѤ¤¤ë"
 
-#: g10/g10.c:261
+#: g10/g10.c:270
 msgid "use this user-id to sign or decrypt"
 msgstr "˝đĚľ¤äÉüąć¤Ë ¤ł¤Î user-id ¤ňÍѤ¤¤ë"
 
-#: g10/g10.c:262
+#: g10/g10.c:271
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|°µ˝ĚĄěĄŮĄë¤ň N ¤ËŔßÄꤹ¤ë (0 ¤ĎČó°µ˝Ě)"
 
-#: g10/g10.c:264
+#: g10/g10.c:273
 msgid "use canonical text mode"
 msgstr "ɸ˝ŕĄĆĄ­ĄąĄČĄâˇĽĄÉ¤ňÍѤ¤¤ë"
 
-#: g10/g10.c:265
+#: g10/g10.c:274
 msgid "use as output file"
 msgstr "˝ĐÎĎĄŐĄˇĄ¤Ąë¤Č¤·¤ĆÍѤ¤¤ë"
 
-#: g10/g10.c:266
+#: g10/g10.c:275
 msgid "verbose"
 msgstr "ľéÄą"
 
-#: g10/g10.c:267
+#: g10/g10.c:276
 msgid "be somewhat more quiet"
 msgstr "¤ä¤äŔŤ«"
 
-#: g10/g10.c:268
+#: g10/g10.c:277
 msgid "don't use the terminal at all"
 msgstr "ĂĽËö¤ň»ČÍѤ·¤Ę¤¤"
 
-#: g10/g10.c:269
+#: g10/g10.c:278
 msgid "force v3 signatures"
 msgstr "¶ŻŔ©ĹŞ¤Ë v3 ˝đĚľ¤ą¤ë"
 
-#: g10/g10.c:270
+#: g10/g10.c:279
 msgid "always use a MDC for encryption"
 msgstr "°Ĺąć˛˝¤Ë¤Ďľď¤Ë MDC ¤ň»ČÍŃ"
 
-#: g10/g10.c:271
+#: g10/g10.c:280
 msgid "do not make any changes"
 msgstr "Á´¤Ć¤ÎĘŃąą¤ňÍѤ¤¤Ę¤¤"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:273
+#: g10/g10.c:282
 msgid "batch mode: never ask"
 msgstr "ĄĐĄĂĄÁĄâˇĽĄÉ: Ě䤤ąç¤ď¤»¤ňąÔ¤ď¤Ę¤¤"
 
-#: g10/g10.c:274
+#: g10/g10.c:283
 msgid "assume yes on most questions"
 msgstr "Á´¤Ć¤ÎĽÁĚä¤Ë yes ¤Č¸«¤Ę¤ą"
 
-#: g10/g10.c:275
+#: g10/g10.c:284
 msgid "assume no on most questions"
 msgstr "Á´¤Ć¤ÎĽÁĚä¤Ë no ¤Č¸«¤Ę¤ą"
 
-#: g10/g10.c:276
+#: g10/g10.c:285
 msgid "add this keyring to the list of keyrings"
 msgstr "¸°ĄęĄóĄ°¤Î°ěÍ÷¤Ë ¤ł¤Î¸°¤ň˛Ă¤¨¤ë"
 
-#: g10/g10.c:277
+#: g10/g10.c:286
 msgid "add this secret keyring to the list"
 msgstr "°ěÍ÷¤Ë ¤ł¤ÎČëĚ©¸°ĄęĄóĄ°¤ň˛Ă¤¨¤ë"
 
-#: g10/g10.c:278
+#: g10/g10.c:287
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|ĄÇĄŐĄ©ĄëĄČ¤ÎČëĚ©¸°¤Č¤·¤Ć NAME ¤ňÍѤ¤¤ë"
 
-#: g10/g10.c:279
+#: g10/g10.c:288
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|¸°¤Î¸ˇş÷¤Ë ¤ł¤Î¸°ĄµˇĽĄĐ¤ňÍѤ¤¤ë"
 
-#: g10/g10.c:280
+#: g10/g10.c:289
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|ĂĽËö¤Îʸ»úĄłˇĽĄÉ¤ň NAME ¤ËŔßÄꤹ¤ë"
 
-#: g10/g10.c:281
+#: g10/g10.c:290
 msgid "read options from file"
 msgstr "ĄŐĄˇĄ¤Ąë¤«¤éĄŞĄ×Ą·ĄçĄó¤ňĆɤ߹ţ¤ŕ"
 
-#: g10/g10.c:285
+#: g10/g10.c:294
 msgid "|FD|write status info to this FD"
 msgstr "|FD|¤ł¤Î FD ¤ËľőÂÖ¤ň˝ń¤­˝Đ¤ą"
 
-#: g10/g10.c:290
+#: g10/g10.c:299
+msgid "|KEYID|ulimately trust this key"
+msgstr ""
+
+#: g10/g10.c:300
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|łČÄĄĄâĄ¸ĄĺˇĽĄë FILE ¤ňĆɤߤł¤ŕ"
 
-#: g10/g10.c:291
+#: g10/g10.c:301
 msgid "emulate the mode described in RFC1991"
 msgstr "RFC1991 ¤Ëµ­˝Ň¤µ¤ě¤żĄâˇĽĄÉ¤ňÍѤ¤¤ë"
 
-#: g10/g10.c:292
+#: g10/g10.c:302
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "Á´¤Ć¤ÎĄŃĄ±ĄĂĄČ¤Č°Ĺąć¤Č˝đĚľ¤ÎĄŞĄ×Ą·ĄçĄó¤ň OpenPGP ¤Îż¶Éń¤ËŔßÄę"
 
-#: g10/g10.c:293
+#: g10/g10.c:303
 msgid "|N|use passphrase mode N"
 msgstr "|N|ĄŃĄąĄŐĄěˇĽĄşĄâˇĽĄÉ N ¤ňÍѤ¤¤ë"
 
-#: g10/g10.c:295
+#: g10/g10.c:305
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAME|ĄŃĄąĄŐĄěˇĽĄş¤ËĄáĄĂĄ»ˇĽĄ¸Í×Ě󥢥르ĄęĄşĄŕ NAME ¤ňÍѤ¤¤ë"
 
-#: g10/g10.c:297
+#: g10/g10.c:307
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAME|ĄŃĄąĄŐĄěˇĽĄş¤Ë°ĹąćĄ˘ĄëĄ´ĄęĄşĄŕ NAME ¤ňÍѤ¤¤ë"
 
-#: g10/g10.c:298
+#: g10/g10.c:308
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|°ĹąćĄ˘ĄëĄ´ĄęĄşĄŕ NAME ¤ňÍѤ¤¤ë"
 
-#: g10/g10.c:299
+#: g10/g10.c:309
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|ĄáĄĂĄ»ˇĽĄ¸Í×Ě󥢥르ĄęĄşĄŕ NAME ¤ňÍѤ¤¤ë"
 
-#: g10/g10.c:300
+#: g10/g10.c:310
 msgid "|N|use compress algorithm N"
 msgstr "|NAME|°µ˝ĚĄ˘ĄëĄ´ĄęĄşĄŕ NAME ¤ňÍѤ¤¤ë"
 
-#: g10/g10.c:301
+#: g10/g10.c:311
 msgid "throw keyid field of encrypted packets"
 msgstr "°ĹąćĄŃĄ±ĄĂĄČ¤Î¸° ID ĄŐĄŁˇĽĄëĄÉ¤ňÁ÷˝Đ¤ą¤ë"
 
-#: g10/g10.c:302
+#: g10/g10.c:312
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAME=VALUE|¤ł¤ÎĂíĽáĄÇˇĽĄż¤ňÍѤ¤¤ë"
 
-#: g10/g10.c:305
+#: g10/g10.c:315
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:308
+#: g10/g10.c:318
 msgid ""
 "@\n"
 "Examples:\n"
@@ -655,15 +659,15 @@
 " --list-keys [names]        ¸°¤ňÉ˝Ľ¨\n"
 " --fingerprint [names]      »ŘĚć¤ňÉ˝Ľ¨\n"
 
-#: g10/g10.c:403
+#: g10/g10.c:418
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "ĄĐĄ°¤ň¸«¤Ä¤±¤ż¤é <gnupg-bugs@gnu.org> ¤Ţ¤ÇĄěĄÝˇĽĄČ¤ňÁ÷¤Ă¤Ć˛Ľ¤µ¤¤ˇŁ\n"
 
-#: g10/g10.c:407
+#: g10/g10.c:422
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "»Č¤¤Ęý: gpg [ĄŞĄ×Ą·ĄçĄó] [ĄŐĄˇĄ¤Ąë] (ĄŘĄëĄ×¤Ď -h)"
 
-#: g10/g10.c:410
+#: g10/g10.c:425
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -673,7 +677,7 @@
 "˝đĚľˇ˘¸ˇľÚˇ˘°Ĺąć˛˝ˇ˘¤Ţ¤ż¤Ď Éüąć\n"
 "ĄÇĄŐĄ©ĄëĄČ¤ÎĆ°şî¤ĎĆţÎϥǡĽĄż¤Ë°Í¸\n"
 
-#: g10/g10.c:417
+#: g10/g10.c:432
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -681,182 +685,186 @@
 "\n"
 "ĄµĄÝˇĽĄČ¤·¤Ć¤¤¤ëĄ˘ĄëĄ´ĄęĄşĄŕ:\n"
 
-#: g10/g10.c:496
+#: g10/g10.c:511
 msgid "usage: gpg [options] "
 msgstr "»Č¤¤Ęý: gpg [options] "
 
-#: g10/g10.c:549
+#: g10/g10.c:564
 msgid "conflicting commands\n"
 msgstr "ĄłĄŢĄóĄÉ¤Îľ×ĆÍ\n"
 
-#: g10/g10.c:692
+#: g10/g10.c:704
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Ăí°Ő: ĄÇĄŐĄ©ĄëĄČĄŞĄ×Ą·ĄçĄóĄŐĄˇĄ¤Ąë `%s' ¤¬¤˘¤ę¤Ţ¤»¤ó\n"
 
-#: g10/g10.c:696
+#: g10/g10.c:708
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ĄŞĄ×Ą·ĄçĄóĄŐĄˇĄ¤Ąë `%s': %s\n"
 
-#: g10/g10.c:703
+#: g10/g10.c:715
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "`%s' ¤«¤éĄŞĄ×Ą·ĄçĄó¤ňĆɤ߹ţ¤ß¤Ţ¤ą\n"
 
-#: g10/g10.c:893
+#: g10/g10.c:905
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ¤ĎŔµ¤·¤¤Ę¸»úĄłˇĽĄÉ¤Ç¤Ď¤˘¤ę¤Ţ¤»¤ó\n"
 
-#: g10/g10.c:949 g10/g10.c:958
+#: g10/g10.c:970
+msgid "WARNING: program may create a core file!\n"
+msgstr "·Ůąđ: Ą×ĄíĄ°ĄéĄŕ¤ĎĄłĄ˘ĄŐĄˇĄ¤Ąë¤ňşîŔ®¤·¤Ţ¤ą!\n"
+
+#: g10/g10.c:974 g10/g10.c:983
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "Ăí°Ő: %s ¤ĎÄĚľď¤ĎÍѤ¤¤Ţ¤»¤ó!\n"
 
-#: g10/g10.c:951
+#: g10/g10.c:976
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ¤Ď %s ¤Č¶¦¤ËÍѤ¤¤ë¤ł¤Č¤Ď¤Ç¤­¤Ţ¤»¤ó!\n"
 
-#: g10/g10.c:954
+#: g10/g10.c:979
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ¤Ď %s ¤Č¶¦¤ËÍѤ¤¤Ć¤â°ŐĚŁ¤¬¤˘¤ę¤Ţ¤»¤ó!\n"
 
-#: g10/g10.c:973 g10/g10.c:985
+#: g10/g10.c:998 g10/g10.c:1010
 msgid "selected cipher algorithm is invalid\n"
 msgstr "ÁŞÂň¤µ¤ě¤ż°ĹąćĄ˘ĄëĄ´ĄęĄşĄŕ¤Ď̵¸ú¤Ç¤ą\n"
 
-#: g10/g10.c:979 g10/g10.c:991
+#: g10/g10.c:1004 g10/g10.c:1016
 msgid "selected digest algorithm is invalid\n"
 msgstr "ÁŞÂň¤µ¤ě¤żÍ×Ě󥢥르ĄęĄşĄŕ¤Ď̵¸ú¤Ç¤ą\n"
 
-#: g10/g10.c:995
+#: g10/g10.c:1020
 msgid "the given policy URL is invalid\n"
 msgstr "Íż¤¨¤é¤ě¤żĄÝĄęĄ·ˇĽ URL ¤Ď̵¸ú¤Ç¤ą\n"
 
-#: g10/g10.c:998
+#: g10/g10.c:1023
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "°µ˝ĚĄ˘ĄëĄ´ĄęĄşĄŕ¤Ď %d..%d ¤ÎČϰϤǤʤ±¤ě¤Đ¤Ę¤ę¤Ţ¤»¤ó\n"
 
-#: g10/g10.c:1000
+#: g10/g10.c:1025
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ¤Ď 0 ¤č¤ęÂ礭¤ĘĂͤ¬É¬ÍפǤą\n"
 
-#: g10/g10.c:1002
+#: g10/g10.c:1027
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ¤Ď 1 ¤č¤ęÂ礭¤ĘĂͤ¬É¬ÍפǤą\n"
 
-#: g10/g10.c:1004
+#: g10/g10.c:1029
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth ¤Ď 1 ¤«¤é 255 ¤ÎČϰϤǤʤ±¤ě¤Đ¤Ę¤ę¤Ţ¤»¤ó\n"
 
-#: g10/g10.c:1007
+#: g10/g10.c:1032
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Ăí°Ő: ñ˝ă¤Ę S2K ĄâˇĽĄÉ (0) ¤Î»ČÍѤˤ϶Ż¤ŻČżÂФ·¤Ţ¤ą\n"
 
-#: g10/g10.c:1011
+#: g10/g10.c:1036
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "̵¸ú¤Ę S2K ĄâˇĽĄÉˇŁ0, 1 ¤Ţ¤ż¤Ď 3 ¤Ç¤Ę¤±¤ě¤Đ¤Ę¤ę¤Ţ¤»¤ó\n"
 
-#: g10/g10.c:1096
+#: g10/g10.c:1121
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "ż®ÍѥǡĽĄżĄŮˇĽĄą¤Î˝é´ü˛˝¤ËĽşÇÔ¤·¤Ţ¤·¤ż: %s\n"
 
-#: g10/g10.c:1102
+#: g10/g10.c:1127
 msgid "--store [filename]"
 msgstr "--store [ĄŐĄˇĄ¤ĄëĚľ]"
 
-#: g10/g10.c:1109
+#: g10/g10.c:1134
 msgid "--symmetric [filename]"
 msgstr "--symmetric [ĄŐĄˇĄ¤ĄëĚľ]"
 
-#: g10/g10.c:1117
+#: g10/g10.c:1142
 msgid "--encrypt [filename]"
 msgstr "--encrypt [ĄŐĄˇĄ¤ĄëĚľ]"
 
-#: g10/g10.c:1130
+#: g10/g10.c:1155
 msgid "--sign [filename]"
 msgstr "--sign [ĄŐĄˇĄ¤ĄëĚľ]"
 
-#: g10/g10.c:1143
+#: g10/g10.c:1168
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [ĄŐĄˇĄ¤ĄëĚľ]"
 
-#: g10/g10.c:1157
+#: g10/g10.c:1182
 msgid "--clearsign [filename]"
 msgstr "--clearsign [ĄŐĄˇĄ¤ĄëĚľ]"
 
-#: g10/g10.c:1174
+#: g10/g10.c:1199
 msgid "--decrypt [filename]"
 msgstr "--decrypt [ĄŐĄˇĄ¤ĄëĚľ]"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1207
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:1190
+#: g10/g10.c:1215
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:1198
+#: g10/g10.c:1223
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [ĄłĄŢĄóĄÉ]"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1239
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key user-id"
 
-#: g10/g10.c:1217
+#: g10/g10.c:1242
 msgid "--delete-key user-id"
 msgstr "--delete-key user-id"
 
-#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393
+#: g10/encode.c:265 g10/g10.c:1279 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "%s ¤¬ł«¤±¤Ţ¤»¤ó: %s\n"
 
-#: g10/g10.c:1269
+#: g10/g10.c:1294
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [¸°ĄęĄóĄ°]"
 
-#: g10/g10.c:1335
+#: g10/g10.c:1360
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ÁőąĂ˝üµî¤ËĽşÇÔ: %s\n"
 
-#: g10/g10.c:1343
+#: g10/g10.c:1368
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ÁőąĂ˛˝¤ËĽşÇÔ: %s\n"
 
-#: g10/g10.c:1411
+#: g10/g10.c:1439
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ĄĎĄĂĄ·ĄĺĄ˘ĄëĄ´ĄęĄşĄŕ `%s' ¤Ď̵¸ú¤Ç¤ą\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1520
 msgid "[filename]"
 msgstr "[ĄŐĄˇĄ¤ĄëĚľ]"
 
-#: g10/g10.c:1496
+#: g10/g10.c:1524
 msgid "Go ahead and type your message ...\n"
 msgstr "ł«»Ď¤·¤Ţ¤ąˇŁĄáĄĂĄ»ˇĽĄ¸¤ňĄżĄ¤Ą×¤·¤Ć˛Ľ¤µ¤¤ ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1499 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1527 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' ¤¬ł«¤±¤Ţ¤»¤ó\n"
 
-#: g10/g10.c:1669
+#: g10/g10.c:1700
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "ĂíĽáĚľ¤ÎŔčƬ¤Ďʸ»ú¤«Ą˘ĄóĄŔˇĽĄąĄłĄ˘(_)¤Ç¤Ę¤±¤ě¤Đ¤Ę¤ę¤Ţ¤»¤ó\n"
 
-#: g10/g10.c:1675
+#: g10/g10.c:1706
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -864,11 +872,11 @@
 "ĂíĽáĚľ¤Ë¤Ďʸ»úˇ˘żô»úˇ˘ĄÉĄĂĄČˇ˘Ą˘ĄóĄŔˇĽĄąĄłĄ˘(_)¤Î¤ß¤ňÍѤ¤ˇ˘'=' "
 "¤ňČĽ¤ď¤Ę¤±¤ě¤Đ¤Ę¤ę¤Ţ¤»¤ó\n"
 
-#: g10/g10.c:1681
+#: g10/g10.c:1712
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "ĂíĽáĚľ¤ÎĄÉĄĂĄČ¤ĎÂľ¤Îʸ»ú¤Ç°Ď¤Ţ¤ě¤Ę¤±¤ě¤Đ¤Ę¤ę¤Ţ¤»¤ó\n"
 
-#: g10/g10.c:1689
+#: g10/g10.c:1720
 msgid "a notation value must not use any control characters\n"
 msgstr "ĂíĽáĚľ¤ÎĂͤËŔ©¸ćʸ»ú¤ňÍѤ¤¤Ć¤Ď¤¤¤±¤Ţ¤»¤ó\n"
 
@@ -1241,58 +1249,58 @@
 msgid "writing key binding signature\n"
 msgstr "˝đĚľ¤ËÂбţ¤ą¤ë¸°¤ň˝ń¤­ąţ¤ß¤Ţ¤ą\n"
 
-#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:433
+#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:435
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Í׵ᤵ¤ě¤ż¸°ĄµĄ¤Ąş¤Ď %u ĄÓĄĂĄČ\n"
 
-#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:438
+#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:440
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "%u ĄÓĄĂĄČ¤Ë´Ý¤á¤Ţ¤ą\n"
 
-#: g10/keygen.c:537
+#: g10/keygen.c:539
 msgid "Please select what kind of key you want:\n"
 msgstr "¸°¤ÎĽďÎŕ¤ňÁŞÂň¤·¤Ć˛Ľ¤µ¤¤:\n"
 
-#: g10/keygen.c:539
+#: g10/keygen.c:541
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA ¤Č ElGamal (ĄÇĄŐĄ©ĄëĄČ)\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:542
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (˝đĚľ¤Î¤ß)\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:544
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (°Ĺąć˛˝¤Î¤ß)\n"
 
-#: g10/keygen.c:543
+#: g10/keygen.c:545
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (˝đĚľ¤Č°Ĺąć˛˝)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:547
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (˝đĚľ¤Č°Ĺąć˛˝)\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:551
 msgid "Your selection? "
 msgstr "¤É¤ě¤ňÁŞ¤Ó¤Ţ¤ą¤«? "
 
-#: g10/keygen.c:560 g10/keygen.c:568
+#: g10/keygen.c:562 g10/keygen.c:570
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "ËÜĹö¤Ë˝đĚľ¤Č°ĹąćÍѤθ°¤ňşî¤ę¤Ţ¤ą¤«? "
 
-#: g10/keygen.c:582
+#: g10/keygen.c:584
 msgid "Invalid selection.\n"
 msgstr "̵¸ú¤ĘÁŞÂň¤Ç¤ąˇŁ\n"
 
-#: g10/keygen.c:594
+#: g10/keygen.c:596
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1305,19 +1313,19 @@
 "          ĄÇĄŐĄ©ĄëĄČ¤Î¸°ĄµĄ¤Ąş¤Ď 1024 ĄÓĄĂĄČ\n"
 "                şÇÂç¤Î¸°ĄµĄ¤Ąş¤Ď 2048 ĄÓĄĂĄČ\n"
 
-#: g10/keygen.c:601
+#: g10/keygen.c:603
 msgid "What keysize do you want? (1024) "
 msgstr "¤É¤Î¸°ĄµĄ¤Ąş¤ňÁŞÂň¤·¤Ţ¤ą¤«? (1024) "
 
-#: g10/keygen.c:606
+#: g10/keygen.c:608
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA ¤Î¸°ĄµĄ¤Ąş¤Ď 512 ¤«¤é 1024 ¤Ţ¤Ç¤Ç¤ą\n"
 
-#: g10/keygen.c:608
+#: g10/keygen.c:610
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "¸°ĄµĄ¤Ąş¤¬ľ®¤µ¤ą¤®¤Ţ¤ą; 768 ¤¬şÇľ®¤Ç¤ąˇŁ\n"
 
-#: g10/keygen.c:610
+#: g10/keygen.c:612
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "¸°ĄµĄ¤Ąş¤¬ľ®¤µ¤ą¤®¤Ţ¤ą; 768 ¤¬şÇľ®¤Ç¤ąˇŁ\n"
@@ -1330,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:621
+#: g10/keygen.c:623
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "¸°ĄµĄ¤Ąş¤¬Â礭¤ą¤®¤Ţ¤ą; %d ¤¬şÇÂç¤Ç¤ąˇŁ\n"
 
-#: g10/keygen.c:626
+#: g10/keygen.c:628
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1343,11 +1351,11 @@
 "2048 °Ęľĺ¤Î¸°ĄµĄ¤Ąş¤Ďˇ˘·×»»»ţ´Ö¤¬ Čóľď¤Ë Äą¤Ż¤Ę¤ë¤Î¤Ç\n"
 "żäľ©¤·¤Ţ¤»¤ó!\n"
 
-#: g10/keygen.c:629
+#: g10/keygen.c:631
 msgid "Are you sure that you want this keysize? "
 msgstr "¤ł¤Î¸°ĄµĄ¤Ąş¤ÇËÜĹö¤ËÎɤ¤¤Ç¤ą¤«? "
 
-#: g10/keygen.c:630
+#: g10/keygen.c:632
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1355,21 +1363,21 @@
 "¤ď¤«¤ę¤Ţ¤·¤żˇŁ¤·¤«¤·ˇ˘¤˘¤Ę¤ż¤ÎĄâĄËĄżˇĽ¤äĄ­ˇĽĄÜˇĽĄÉĆţÎϤϡ˘ą¶·â¤ËÂФ·¤Ć "
 "¤ą¤­¤Ŕ¤é¤±¤Ç¤˘¤ë¤ł¤Č¤ňż´¤Ëα¤á¤Ć¤Ş¤¤¤Ć˛Ľ¤µ¤¤!\n"
 
-#: g10/keygen.c:638
+#: g10/keygen.c:640
 msgid "Do you really need such a large keysize? "
 msgstr "¤˘¤Ę¤ż¤ĎËÜĹö¤Ë¤ł¤Î¤č¤¦¤ĘÄą¤¤¸°¤¬É¬ÍפǤą¤«? "
 
-#: g10/keygen.c:644
+#: g10/keygen.c:646
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Í׵ᤵ¤ě¤ż¸°ĄµĄ¤Ąş¤Ď %u ĄÓĄĂĄČ\n"
 
-#: g10/keygen.c:647 g10/keygen.c:651
+#: g10/keygen.c:649 g10/keygen.c:653
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%u ĄÓĄĂĄČ¤Ë´Ý¤á¤Ţ¤ą\n"
 
-#: g10/keygen.c:699
+#: g10/keygen.c:701
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1385,25 +1393,25 @@
 "      <n>m = Í­¸ú´ü¸Â n ·î\n"
 "      <n>y = Í­¸ú´ü¸Â n ÇŻ\n"
 
-#: g10/keygen.c:714
+#: g10/keygen.c:716
 msgid "Key is valid for? (0) "
 msgstr "¸°¤ÎÍ­¸úŔ­¤Ď? (0)"
 
-#: g10/keygen.c:719
+#: g10/keygen.c:721
 msgid "invalid value\n"
 msgstr "̵¸ú¤ĘĂÍ\n"
 
-#: g10/keygen.c:724
+#: g10/keygen.c:726
 msgid "Key does not expire at all\n"
 msgstr "¸°¤Ď̵´ü¸Â¤Ç¤ą\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:730
+#: g10/keygen.c:732
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "¸°¤Ď %s ¤Ë¤Ć´ü¸ÂŔÚ¤ě¤Ë¤Ę¤ę¤Ţ¤ą\n"
 
-#: g10/keygen.c:733
+#: g10/keygen.c:735
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1411,11 +1419,11 @@
 "¤ł¤ÎĄ·ĄąĄĆĄŕ¤Ç¤Ďˇ˘2038ÇŻ°Ęąß¤ÎĆüÉŐ¤ňÉ˝Ľ¨¤Ç¤­¤Ţ¤»¤ó¤¬ˇ˘\n"
 "2106ÇŻ¤Ţ¤Ç¤Ę¤éŔµ¤·¤Ż˝čÍý¤Ç¤­¤Ţ¤ąˇŁ\n"
 
-#: g10/keygen.c:738
+#: g10/keygen.c:740
 msgid "Is this correct (y/n)? "
 msgstr "¤ł¤ě¤ÇÎɤ¤¤Ç¤ą¤« (y/n)? "
 
-#: g10/keygen.c:781
+#: g10/keygen.c:783
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1431,44 +1439,44 @@
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:793
+#: g10/keygen.c:795
 msgid "Real name: "
 msgstr "ËÜĚľ: "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:803
 msgid "Invalid character in name\n"
 msgstr "ĚľÁ°¤Ë̵¸ú¤Ęʸ»ú¤¬¤˘¤ę¤Ţ¤ą\n"
 
-#: g10/keygen.c:799
+#: g10/keygen.c:805
 msgid "Name may not start with a digit\n"
 msgstr "ĚľÁ°¤Ďżô»ú¤Ç»Ď¤Ţ¤Ă¤Ć¤Ď¤¤¤±¤Ţ¤»¤ó\n"
 
-#: g10/keygen.c:801
+#: g10/keygen.c:807
 msgid "Name must be at least 5 characters long\n"
 msgstr "ĚľÁ°¤Ď 5 ʸ»ú°Ęľĺ¤Ç¤Ę¤±¤ě¤Đ¤Ę¤ę¤Ţ¤»¤ó\n"
 
-#: g10/keygen.c:809
+#: g10/keygen.c:815
 msgid "Email address: "
 msgstr "ĹŻҥ᡼ĄëĄ˘ĄÉĄěĄą: "
 
-#: g10/keygen.c:820
+#: g10/keygen.c:826
 msgid "Not a valid email address\n"
 msgstr "Í­¸ú¤ĘĹŻҥ᡼ĄëĄ˘ĄÉĄěĄą¤Ç¤Ď¤˘¤ę¤Ţ¤»¤ó\n"
 
-#: g10/keygen.c:828
+#: g10/keygen.c:834
 msgid "Comment: "
 msgstr "ĂíĽá: "
 
-#: g10/keygen.c:834
+#: g10/keygen.c:840
 msgid "Invalid character in comment\n"
 msgstr "ĂíĽá¤Ë̵¸ú¤Ęʸ»ú¤¬¤˘¤ę¤Ţ¤ą\n"
 
-#: g10/keygen.c:857
+#: g10/keygen.c:863
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "¤˘¤Ę¤ż¤Ďʸ»úĄłˇĽĄÉ `%s' ¤ň»Č¤Ă¤Ć¤¤¤Ţ¤ąˇŁ\n"
 
-#: g10/keygen.c:863
+#: g10/keygen.c:869
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1479,28 +1487,28 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:867
+#: g10/keygen.c:873
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:872
+#: g10/keygen.c:878
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:882
+#: g10/keygen.c:888
 #, 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:883
+#: g10/keygen.c:889
 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:902
+#: g10/keygen.c:908
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:940
+#: g10/keygen.c:946
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1508,11 +1516,11 @@
 "ČëĚ©¸°¤ňĘݸ¤ë¤ż¤á¤ËĄŃĄąĄŐĄěˇĽĄş¤¬É¬ÍפǤąˇŁ\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:948
+#: g10/keyedit.c:468 g10/keygen.c:954
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "ĄŃĄąĄŐĄěˇĽĄş¤¬°Ű¤Ę¤ę¤Ţ¤ąˇŁ¤â¤¦°ěĹŮŔßÄꤷ¤Ć˛Ľ¤µ¤¤ˇŁ\n"
 
-#: g10/keygen.c:954
+#: g10/keygen.c:960
 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"
@@ -1524,7 +1532,7 @@
 "ĄŞĄ×Ą·ĄçĄó¤Ë¤č¤Ă¤Ćˇ˘¤¤¤Ä¤Ç¤âĘŃąą¤Ç¤­¤Ţ¤ąˇŁ\n"
 "\n"
 
-#: g10/keygen.c:975
+#: g10/keygen.c:981
 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"
@@ -1535,29 +1543,29 @@
 "ĄÇĄŁĄąĄŻ¤ËĄ˘ĄŻĄ»Ąą¤ą¤ë¤Ę¤É¤ÎÂľ¤ÎąÔĆ°¤ňƱ»ţ¤ËąÔ¤¦¤Čˇ˘ÍđżôŔ¸Ŕ®ÁőĂ֤ˤĆ\n"
 "Í𻨤µ¤ÎÂ礭¤ĘÎɤ¤Íđżô¤ňŔ¸Ŕ®¤·¤ä¤ą¤Ż¤Ę¤ę¤Ţ¤ą¤Î¤Çˇ˘¤Ş´«¤á¤·¤Ţ¤ąˇŁ\n"
 
-#: g10/keygen.c:1424
+#: g10/keygen.c:1430
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA ¸°ĄÚĄ˘¤Ď 1024 ĄÓĄĂĄČ¤Ë¤Ę¤ę¤Ţ¤ą\n"
 
-#: g10/keygen.c:1467
+#: g10/keygen.c:1473
 msgid "Key generation canceled.\n"
 msgstr "¸°¤ÎŔ¸Ŕ®¤¬Ăć»ß¤µ¤ě¤Ţ¤·¤żˇŁ\n"
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1570
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "`%s' ¤Ř¤Î¸řł«ľÚĚŔ˝ń¤ň˝ń¤­ąţ¤ß¤Ţ¤ą\n"
 
-#: g10/keygen.c:1565
+#: g10/keygen.c:1571
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "`%s' ¤Ř¤ÎČëĚ©ľÚĚŔ˝ń¤ň˝ń¤­ąţ¤ß¤Ţ¤ą\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1667
 msgid "public and secret key created and signed.\n"
 msgstr "¸řł«¸°¤ČČëĚ©¸°¤¬şîŔ®¤µ¤ěˇ˘˝đĚľ¤µ¤ě¤Ţ¤·¤żˇŁ\n"
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1672
 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"
@@ -1565,28 +1573,28 @@
 "¤ł¤Î¸°¤Ď°Ĺąć˛˝¤Ë¤Ď»ČÍѤǤ­¤Ę¤¤¤ł¤Č¤ËĂí°Ő¤·¤Ć¤Ż¤Ŕ¤µ¤¤ˇŁ°Ĺąć˛˝¤ňąÔ¤¦¤Ë¤Ďˇ˘\n"
 "\"--edit-key\" ĄłĄŢĄóĄÉ¤ňÍѤ¤¤ĆÉű¸°¤ňşîŔ®¤·¤Ć¤Ż¤Ŕ¤µ¤¤ˇŁ\n"
 
-#: g10/keygen.c:1683 g10/keygen.c:1784
+#: g10/keygen.c:1689 g10/keygen.c:1790
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "¸°¤ÎşîŔ®¤ËĽşÇÔ: %s\n"
 
-#: g10/keygen.c:1727 g10/sig-check.c:318 g10/sign.c:112
+#: g10/keygen.c:1733 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:1729 g10/sig-check.c:320 g10/sign.c:114
+#: g10/keygen.c:1735 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:1762
+#: g10/keygen.c:1768
 msgid "Really create? "
 msgstr "ËÜĹö¤ËşîŔ®¤·¤Ţ¤ą¤«? "
 
-#: g10/encode.c:91 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/encode.c:91 g10/openfile.c:178 g10/openfile.c:288 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1597,17 +1605,17 @@
 msgid "error creating passphrase: %s\n"
 msgstr "ĄŃĄąĄŐĄěˇĽĄş¤ÎŔ¸Ŕ®¤ËĽşÇÔ: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:319
+#: g10/encode.c:171 g10/encode.c:324
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ·Ůąđ: ¶ő¤ÎĄŐĄˇĄ¤Ąë¤Ç¤ą\n"
 
-#: g10/encode.c:266
+#: g10/encode.c:271
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "`%s' ¤«¤éĆɤ߹ţ¤ß¤Ţ¤ą\n"
 
-#: g10/encode.c:483
+#: g10/encode.c:492
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s °Ĺąć˛˝ Ľőż®ĽÔ: %s\n"
@@ -1656,246 +1664,256 @@
 msgid "No user ID for key\n"
 msgstr "¸°¤ÎĄćˇĽĄ¶ ID ¤¬¤˘¤ę¤Ţ¤»¤ó\n"
 
-#: g10/getkey.c:1642 g10/getkey.c:1698
+#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "Éű¸° %08lX ¤ň»ČÍѤ·¤Ţ¤ą - Ľç¸° %08lX ¤ÎÂĺÍŃ\n"
 
-#: g10/getkey.c:2017
+#: g10/getkey.c:2050
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: ĄćˇĽĄ¶¤¬¸«¤Ä¤«¤ę¤Ţ¤»¤ó\n"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ĄżĄ¤Ą× %d ¤ÎĄÖĄíĄĂĄŻ¤ňĄąĄ­ĄĂĄ×¤·¤Ţ¤ą\n"
 
-#: g10/import.c:188 g10/trustdb.c:1740 g10/trustdb.c:1781
+#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu ¸°¤Ţ¤Ç˝čÍý\n"
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "`%s' ¤ÎĆɤ߹ţ¤ß¤ËĽşÇÔ: %s\n"
 
-#: g10/import.c:203
+#: g10/import.c:204
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "˝čÍýżô¤Îąç·×: %lu\n"
 
-#: g10/import.c:205
+#: g10/import.c:206
+#, fuzzy, c-format
+msgid "      skipped new keys: %lu\n"
+msgstr "            ż·¤ż¤ĘÉű¸°: %lu\n"
+
+#: g10/import.c:209
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         ĄćˇĽĄ¶ ID ¤Ę¤·: %lu\n"
 
-#: g10/import.c:207
+#: g10/import.c:211
 #, c-format
 msgid "              imported: %lu"
 msgstr "              Ćɤ߹ţ¤ß: %lu"
 
-#: g10/import.c:213
+#: g10/import.c:217
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "              ĘŃąą¤Ę¤·: %lu\n"
 
-#: g10/import.c:215
+#: g10/import.c:219
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "       ż·¤ż¤ĘĄćˇĽĄ¶ ID: %lu\n"
 
-#: g10/import.c:217
+#: g10/import.c:221
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "            ż·¤ż¤ĘÉű¸°: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:223
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "            ż·¤ż¤Ę˝đĚľ: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:225
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "        ż·¤ż¤Ę¸°¤ÎÇË´ţ: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:227
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      ČëĚ©¸°¤ÎĆɤ߽Ф·: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:229
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "      ČëĚ©¸°¤ÎĆɤ߹ţ¤ß: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:231
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "      ĘŃąą¤Î̵¤¤ČëĚ©¸°: %lu\n"
 
-#: g10/import.c:386 g10/import.c:578
+#: g10/import.c:391 g10/import.c:590
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "¸° %08lX: ĄćˇĽĄ¶ ID ¤¬¤˘¤ę¤Ţ¤»¤ó\n"
 
-#: g10/import.c:400
+#: g10/import.c:405
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "¸° %08lX: ż®ÍѤǤ­¤ëĄćˇĽĄ¶ ID ¤¬¤˘¤ę¤Ţ¤»¤ó\n"
 
-#: g10/import.c:402
+#: g10/import.c:407
 msgid "this may be caused by a missing self-signature\n"
 msgstr "Ľ«¸Ę˝đĚľ¤¬¤µ¤ě¤Ć¤¤¤Ę¤¤¤ż¤á¤Ç¤·¤ç¤¦\n"
 
-#: g10/import.c:413 g10/import.c:645
+#: g10/import.c:418 g10/import.c:657
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "¸° %08lX: ¸řł«¸°¤¬¸«¤Ä¤«¤ę¤Ţ¤»¤ó: %s\n"
 
-#: g10/import.c:419
+#: g10/import.c:423
+#, fuzzy, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "¸° %08lX: rfc2440 ¤Î¸°¤Ç¤Ď¤˘¤ę¤Ţ¤»¤ó - ĄąĄ­ĄĂĄ×¤·¤Ţ¤ą\n"
+
+#: g10/import.c:431
 msgid "no default public keyring\n"
 msgstr "ĄÇĄŐĄ©ĄëĄČ¤Î¸řł«¸°ĄęĄóĄ°¤¬¤˘¤ę¤Ţ¤»¤ó\n"
 
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
+#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "`%s' ¤Ř¤Î˝ń¤­˝Đ¤·\n"
 
-#: g10/import.c:426 g10/import.c:484 g10/import.c:593 g10/import.c:694
+#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "¸°ĄęĄóĄ° `%s' ¤ÎĄíĄĂĄŻ¤¬¤Ç¤­¤Ţ¤»¤ó: %s\n"
 
-#: g10/import.c:429 g10/import.c:487 g10/import.c:596 g10/import.c:697
+#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "¸°ĄęĄóĄ° `%s' ¤Î˝ń¤­ąţ¤ß¤ËĽşÇÔ: %s\n"
 
-#: g10/import.c:434
+#: g10/import.c:446
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "¸° %08lX: ¸řł«¸°¤ňĆɤ߹ţ¤ß¤Ţ¤·¤ż\n"
 
-#: g10/import.c:451
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "¸° %08lX: ˛ćˇą¤ÎĘÝÍ­¤ą¤ë¸°¤Č°Ű¤Ę¤ę¤Ţ¤ą\n"
 
-#: g10/import.c:460 g10/import.c:653
+#: g10/import.c:472 g10/import.c:665
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "¸° %08lX: ĄŞĄęĄ¸ĄĘĄë¤Î¸°ĄÖĄíĄĂĄŻ¤Ë°ĚĂ֤Ǥ­¤Ţ¤»¤ó: %s\n"
 
-#: g10/import.c:466 g10/import.c:659
+#: g10/import.c:478 g10/import.c:671
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "¸° %08lX: ĄŞĄęĄ¸ĄĘĄë¤Î¸°ĄÖĄíĄĂĄŻ¤ňĆɤá¤Ţ¤»¤ó: %s\n"
 
-#: g10/import.c:493
+#: g10/import.c:505
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "¸° %08lX: ż·¤ż¤ĘĄćˇĽĄ¶ ID ¤ň 1 ¸Ä\n"
 
-#: g10/import.c:496
+#: g10/import.c:508
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "¸° %08lX: ż·¤ż¤ĘĄćˇĽĄ¶ ID ¤ň %d ¸Ä\n"
 
-#: g10/import.c:499
+#: g10/import.c:511
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "¸° %08lX: ż·¤ż¤Ę˝đĚľ¤ň 1 ¸Ä\n"
 
-#: g10/import.c:502
+#: g10/import.c:514
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "¸° %08lX: ż·¤ż¤Ę˝đĚľ¤ň %d ¸Ä\n"
 
-#: g10/import.c:505
+#: g10/import.c:517
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "¸° %08lX: ż·¤ż¤ĘÉű¸°¤ň 1 ¸Ä\n"
 
-#: g10/import.c:508
+#: g10/import.c:520
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "¸° %08lX: ż·¤ż¤ĘÉű¸°¤ň %d ¸Ä\n"
 
-#: g10/import.c:518
+#: g10/import.c:530
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "¸° %08lX: ĘŃąą¤Ę¤·\n"
 
-#: g10/import.c:601
+#: g10/import.c:613
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "¸° %08lX: ČëĚ©¸°¤ňĆɤ߹ţ¤ß¤Ţ¤·¤ż\n"
 
 #. we can't merge secret keys
-#: g10/import.c:605
+#: g10/import.c:617
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "¸° %08lX: ´ű¤ËČëĚ©¸°ĄęĄóĄ°¤Ë¤˘¤ę¤Ţ¤ą\n"
 
-#: g10/import.c:610
+#: g10/import.c:622
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "¸° %08lX: ČëĚ©¸°¤¬¸«¤Ä¤«¤ę¤Ţ¤»¤ó: %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:651
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr "¸° %08lX: ¸řł«¸°¤¬¤˘¤ę¤Ţ¤»¤ó - ÇË´ţľÚĚŔ˝ń¤ÎŬÍѤ¬¤Ç¤­¤Ţ¤»¤ó\n"
 
-#: g10/import.c:670
+#: g10/import.c:682
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "¸° %08lX: ̵¸ú¤ĘÇË´ţľÚĚŔ˝ń: %s - µńČݤ·¤Ţ¤·¤ż\n"
 
-#: g10/import.c:702
+#: g10/import.c:714
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "¸° %08lX: ÇË´ţľÚĚŔ˝ń¤ňĆɤ߹ţ¤ß¤Ţ¤·¤ż\n"
 
-#: g10/import.c:744
+#: g10/import.c:756
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "¸° %08lX: ˝đĚľ¤ËÂбţ¤ą¤ëĄćˇĽĄ¶ ID ¤¬¤˘¤ę¤Ţ¤»¤ó\n"
 
-#: g10/import.c:751 g10/import.c:775
+#: g10/import.c:763 g10/import.c:787
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "¸° %08lX: ĄµĄÝˇĽĄČ¤·¤Ć¤¤¤Ę¤¤¸řł«¸°Ą˘ĄëĄ´ĄęĄşĄŕ¤Ç¤ą\n"
 
-#: g10/import.c:752
+#: g10/import.c:764
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "¸° %08lX: Ľ«¸Ę˝đĚľ¤¬Ěµ¸ú¤Ç¤ą\n"
 
-#: g10/import.c:767
+#: g10/import.c:779
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "¸° %08lX: ¸°¤ËÂбţ¤ą¤ëÉű¸°¤¬¤˘¤ę¤Ţ¤»¤ó\n"
 
-#: g10/import.c:776
+#: g10/import.c:788
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "¸° %08lX: ̵¸ú¤ĘÉű¸°¤ÎÂбţ¤Ç¤ą\n"
 
-#: g10/import.c:803
+#: g10/import.c:815
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "¸° %08lX: Ľő¤±Ćţ¤ě¤żĽ«¸Ę˝đĚľ¤µ¤ě¤Ć¤¤¤Ę¤¤ĄćˇĽĄ¶ ID '"
 
-#: g10/import.c:832
+#: g10/import.c:844
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "¸° %08lX: ĄąĄ­ĄĂĄ×¤·¤żĄćˇĽĄ¶ ID '"
 
-#: g10/import.c:855
+#: g10/import.c:867
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "¸° %08lX: ĄąĄ­ĄĂĄ×¤·¤żÉű¸°\n"
@@ -1904,32 +1922,32 @@
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:880
+#: g10/import.c:892
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "¸° %08lX: ˝ń¤­˝Đ¤·ÉԲĤʽđĚľ (class %02x) - ĄąĄ­ĄĂĄ×\n"
 
-#: g10/import.c:889
+#: g10/import.c:901
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "¸° %08lX: ÇË´ţľÚĚŔ˝ń¤¬´Ö°ă¤Ă¤ĆŔßÄꤵ¤ě¤Ć¤¤¤Ţ¤ą - ĄąĄ­ĄĂĄ×\n"
 
-#: g10/import.c:897
+#: g10/import.c:909
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "¸° %08lX: ̵¸ú¤ĘÇË´ţľÚĚŔ˝ń: %s - ĄąĄ­ĄĂĄ×\n"
 
-#: g10/import.c:997
+#: g10/import.c:1009
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "¸° %08lX: ˝ĹĘŁ¤·¤żĄćˇĽĄ¶ ID ¤Î¸ˇ˝Đ - ÄɲĂ\n"
 
-#: g10/import.c:1048
+#: g10/import.c:1060
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "¸° %08lX: ÇË´ţľÚĚŔ˝ń¤ÎÄɲĂ\n"
 
-#: g10/import.c:1162 g10/import.c:1215
+#: g10/import.c:1174 g10/import.c:1227
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "¸° %08lX: ˛ćˇą¤ÎĄłĄÔˇĽ¤Ë¤ĎĽ«¸Ę˝đĚľ¤¬¤˘¤ę¤Ţ¤»¤ó\n"
@@ -2506,8 +2524,18 @@
 msgid "no secret key\n"
 msgstr "ČëĚ©¸°¤¬¤˘¤ę¤Ţ¤»¤ó\n"
 
+#: g10/keylist.c:158
+#, fuzzy
+msgid "invalid"
+msgstr "̵¸ú¤ĘÁőąĂ¤Ç¤ą"
+
+#: g10/keylist.c:178
+#, fuzzy
+msgid "revoked"
+msgstr "revkey"
+
 #. of subkey
-#: g10/keylist.c:318 g10/mainproc.c:742
+#: g10/keylist.c:400 g10/mainproc.c:760
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "¸°¤Ď %s ¤Ë¤Ć´ü¸ÂŔÚ¤ě¤Ë¤Ę¤ę¤Ţ¤ą\n"
@@ -2517,130 +2545,117 @@
 msgid "public key is %08lX\n"
 msgstr "¸řł«¸°¤Ď %08lX ¤Ç¤ą\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:257
 msgid "public key encrypted data: good DEK\n"
 msgstr "¸řł«¸°¤Ç°Ĺąć˛˝¤µ¤ě¤żĄÇˇĽĄż: Ŕµ¤·¤¤ DEK ¤Ç¤ą\n"
 
-#: g10/mainproc.c:281
+#: g10/mainproc.c:299
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "%u ĄÓĄĂĄČ %s ¸°, ID %08lX ¤Ë¤č¤Ă¤Ć°Ĺąć˛˝¤µ¤ě¤Ţ¤·¤ż %s\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:309
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "%s ¸°, ID %08lX ¤Ë¤č¤Ă¤Ć°Ĺąć˛˝¤µ¤ě¤Ţ¤·¤ż\n"
 
-#: g10/mainproc.c:297
+#: g10/mainproc.c:315
 msgid "no secret key for decryption available\n"
 msgstr "Éüąć¤ËɬÍפĘČëĚ©¸°¤¬¤˘¤ę¤Ţ¤»¤ó\n"
 
-#: g10/mainproc.c:306
+#: g10/mainproc.c:324
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "¸řł«¸°¤ÎÉüąć¤ËĽşÇÔ: %s\n"
 
-#: g10/mainproc.c:343
+#: g10/mainproc.c:361
 msgid "decryption okay\n"
 msgstr "Éüąć¤ËŔ®¸ů\n"
 
-#: g10/mainproc.c:348
+#: g10/mainproc.c:366
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "·Ůąđ: °Ĺąć˛˝¤µ¤ě¤żĄáĄĂĄ»ˇĽĄ¸¤Ď˛ţă⤵¤ě¤Ć¤¤¤Ţ¤ą!\n"
 
-#: g10/mainproc.c:353
+#: g10/mainproc.c:371
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Éüąć¤ËĽşÇÔ: %s\n"
 
-#: g10/mainproc.c:372
+#: g10/mainproc.c:390
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "Ăí°Ő: Á÷ż®ĽÔ¤ĎˇÖĆÉ¤ß˝Ş¤¨¤ż¤éşď˝ü¤ą¤ëˇ×¤č¤¦¤Ëµá¤á¤Ć¤¤¤Ţ¤ą\n"
 
-#: g10/mainproc.c:374
+#: g10/mainproc.c:392
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "¸µ¤ÎĄŐĄˇĄ¤ĄëĚľ='%.*s'\n"
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:544
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "ĆČΩÇË´ţˇŁˇÖgpg --importˇ×¤ň»Č¤Ă¤ĆŬÍѤ·¤Ć¤Ż¤Ŕ¤µ¤¤\n"
 
-#: g10/mainproc.c:613 g10/mainproc.c:622
+#: g10/mainproc.c:631 g10/mainproc.c:640
 msgid "WARNING: invalid notation data found\n"
 msgstr "·Ůąđ: ̵¸ú¤ĘĂíĽáĄÇˇĽĄż¤¬¤˘¤ę¤Ţ¤ą\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:643
 msgid "Notation: "
 msgstr "ĂíĽá: "
 
-#: g10/mainproc.c:632
+#: g10/mainproc.c:650
 msgid "Policy: "
 msgstr "ĄÝĄęĄ·ˇĽ: "
 
-#: g10/mainproc.c:1062
+#: g10/mainproc.c:1080
 msgid "signature verification suppressed\n"
 msgstr "˝đĚľ¤Î¸ˇľÚ¤¬¤Ç¤­¤Ţ¤»¤ó\n"
 
-#: g10/mainproc.c:1068
+#: g10/mainproc.c:1086
 #, 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:1094 g10/mainproc.c:1105
+#: g10/mainproc.c:1112 g10/mainproc.c:1123
 msgid "BAD signature from \""
 msgstr "ÉÔŔµ¤Ę˝đĚľ: \""
 
-#: g10/mainproc.c:1095 g10/mainproc.c:1106
+#: g10/mainproc.c:1113 g10/mainproc.c:1124
 msgid "Good signature from \""
 msgstr "Ŕµ¤·¤¤˝đĚľ: \""
 
-#: g10/mainproc.c:1097
+#: g10/mainproc.c:1115
 msgid "                aka \""
 msgstr "                ĘĚĚľ \""
 
-#: g10/mainproc.c:1153
+#: g10/mainproc.c:1171
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "˝đĚľ¤Î¸ˇľÚ¤¬¤Ç¤­¤Ţ¤»¤ó: %s\n"
 
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1235
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "ĄŻĄéĄą0x%02x¤ÎĆČΩ˝đĚľ\n"
 
-#: g10/mainproc.c:1263
+#: g10/mainproc.c:1281
 msgid "old style (PGP 2.x) signature\n"
 msgstr "¸Ĺ¤¤·ÁĽ° (PGP 2.x) ¤Ë¤č¤ë˝đĚľ\n"
 
-#: g10/mainproc.c:1268
+#: g10/mainproc.c:1286
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() ¤ÎĂć¤Ë̵¸ú¤ĘĄŃĄ±ĄĂĄČ¤¬¸ˇ˝Đ¤µ¤ě¤Ţ¤·¤ż\n"
 
-#: g10/misc.c:94
+#: g10/misc.c:96
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "ĄłĄ˘ĄŔĄóĄ×¤ň̵¸ú¤Ë¤Ç¤­¤Ţ¤»¤ó: %s\n"
 
-#: g10/misc.c:97
-msgid "WARNING: program may create a core file!\n"
-msgstr "·Ůąđ: Ą×ĄíĄ°ĄéĄŕ¤ĎĄłĄ˘ĄŐĄˇĄ¤Ąë¤ňşîŔ®¤·¤Ţ¤ą!\n"
-
-#: g10/misc.c:205
+#: g10/misc.c:206
 msgid "Experimental algorithms should not be used!\n"
 msgstr "ĽÂ¸łĂć¤ÎĄ˘ĄëĄ´ĄęĄşĄŕ¤Ď»ČÍѤą¤Ů¤­¤Ç¤Ď¤˘¤ę¤Ţ¤»¤ó!\n"
 
-#: g10/misc.c:219
-msgid ""
-"RSA keys are deprecated; please consider creating a new key and use this key "
-"in the future\n"
-msgstr ""
-"RSA "
-"¸°¤ĎČżÂФµ¤ě¤Ć¤¤¤Ţ¤ąˇŁż·¤·¤¤¸°¤ňşîŔ®¤·¤ĆşŁ¸ĺ¤Ď¤˝¤Î¸°¤ňÍѤ¤¤ë¤ł¤Č¤ň¸ˇĆ¤¤·¤Ć¤Ż¤"
-"Ŕ¤µ¤¤\n"
-
-#: g10/misc.c:241
+#: g10/misc.c:233
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr "¤ł¤Î°ĹąćĄ˘ĄëĄ´ĄęĄşĄŕ¤ĎČżÂФµ¤ě¤Ć¤¤¤Ţ¤ąˇŁ°ěČĚĹŞ¤ĘĘýˡ¤ňÍѤ¤¤Ć˛Ľ¤µ¤¤!\n"
 
@@ -2649,7 +2664,7 @@
 msgid "can't handle public key algorithm %d\n"
 msgstr "¸řł«¸°¤ÎĄ˘ĄëĄ´ĄęĄşĄŕ %d ¤Ď»ČÍѤǤ­¤Ţ¤»¤ó\n"
 
-#: g10/parse-packet.c:965
+#: g10/parse-packet.c:986
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacket of type %d has critical bit set\n"
@@ -2686,92 +2701,92 @@
 msgid "Repeat passphrase: "
 msgstr "ĄŃĄąĄŐĄěˇĽĄş¤ňşĆĆţÎĎ: "
 
-#: g10/plaintext.c:63
+#: g10/plaintext.c:67
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "ĄÇˇĽĄż¤ĎĘݸ¤µ¤ě¤Ć¤¤¤Ţ¤»¤óˇŁĘݸ¤ą¤ë¤Ë¤Ď \"--output\" "
 "ĄŞĄ×Ą·ĄçĄó¤ň»ČÍѤ·¤Ć˛Ľ¤µ¤¤ˇŁ\n"
 
-#: g10/plaintext.c:317
+#: g10/plaintext.c:324
 msgid "Detached signature.\n"
 msgstr "ʬΥ˝đĚľˇŁ\n"
 
-#: g10/plaintext.c:321
+#: g10/plaintext.c:328
 msgid "Please enter name of data file: "
 msgstr "ĄÇˇĽĄżĄŐĄˇĄ¤Ąë¤ÎĚľÁ°¤ňĆţÎĎ: "
 
-#: g10/plaintext.c:342
+#: g10/plaintext.c:349
 msgid "reading stdin ...\n"
 msgstr "ɸ˝ŕĆţÎϤč¤ęĆɤ߹ţ¤ßĂć ...\n"
 
-#: g10/plaintext.c:385
+#: g10/plaintext.c:392
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "˝đĚľ¤µ¤ě¤żĄÇˇĽĄż `%s' ¤¬ł«¤±¤Ţ¤»¤ó\n"
 
-#: g10/pubkey-enc.c:79
+#: g10/pubkey-enc.c:76
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "ÉÔĆĂÄę¤ÎĽőż®ĽÔÍѤǤąˇŁČëĚ©¸° %08lX ¤ňÍѤ¤¤Ţ¤ą ...\n"
 
-#: g10/pubkey-enc.c:85
+#: g10/pubkey-enc.c:82
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "˝ŞÎ»ˇŁÉÔĆĂÄę¤ÎĽőż®ĽÔÍѤǤąˇŁ\n"
 
-#: g10/pubkey-enc.c:137
+#: g10/pubkey-enc.c:134
 msgid "old encoding of the DEK is not supported\n"
 msgstr "DEK ¤Ë¤č¤ëµěĽ°¤Î°Ĺąć¤ĎĄµĄÝˇĽĄČ¤·¤Ć¤¤¤Ţ¤»¤ó\n"
 
-#: g10/pubkey-enc.c:156
+#: g10/pubkey-enc.c:153
 #, fuzzy, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "ĘݸĄëĄ´ĄęĄşĄŕ %d ¤ĎĄµĄÝˇĽĄČ¤·¤Ć¤¤¤Ţ¤»¤ó\n"
 
-#: g10/pubkey-enc.c:195
+#: g10/pubkey-enc.c:192
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "Ăí°Ő: °ĹąćĄ˘ĄëĄ´ĄęĄşĄŕ %d ¤ĎÍĄŔč˝ç¤ËĆţ¤Ă¤Ć¤¤¤Ţ¤»¤ó\n"
 
-#: g10/pubkey-enc.c:201
+#: g10/pubkey-enc.c:198
 #, fuzzy, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "Ăí°Ő: ˝đĚľ¤Î¸°¤Ď´ü¸ÂŔÚ¤ě¤Ç¤ą %s\n"
 
-#: g10/hkp.c:62
+#: g10/hkp.c:72
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
 msgstr ""
 
-#: g10/hkp.c:75
+#: g10/hkp.c:85
 #, fuzzy, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "¸°ĄµˇĽĄĐˇĽ¤«¤é¸°¤ňĆɤ߹ţ¤ŕ"
 
-#: g10/hkp.c:98 g10/hkp.c:136
+#: g10/hkp.c:109 g10/hkp.c:148
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/hkp.c:106
+#: g10/hkp.c:117
 #, fuzzy, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "%s ¤ĎŔµ¤·¤¤Ę¸»úĄłˇĽĄÉ¤Ç¤Ď¤˘¤ę¤Ţ¤»¤ó\n"
 
-#: g10/hkp.c:158
+#: g10/hkp.c:170
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "`%s' ¤¬ł«¤±¤Ţ¤»¤ó: %s\n"
 
-#: g10/hkp.c:182
+#: g10/hkp.c:194
 #, fuzzy, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "`%s' ¤ÎĆɤ߹ţ¤ß¤ËĽşÇÔ: %s\n"
 
-#: g10/hkp.c:194
+#: g10/hkp.c:206
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr ""
 
-#: g10/hkp.c:197
+#: g10/hkp.c:209
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
@@ -2786,41 +2801,41 @@
 msgid "protection algorithm %d is not supported\n"
 msgstr "ĘݸĄëĄ´ĄęĄşĄŕ %d ¤ĎĄµĄÝˇĽĄČ¤·¤Ć¤¤¤Ţ¤»¤ó\n"
 
-#: g10/seckey-cert.c:175
+#: g10/seckey-cert.c:184
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "̵¸ú¤ĘĄŃĄąĄŐĄěˇĽĄş¤Ç¤ąˇŁşĆĆţÎϤ·¤Ć˛Ľ¤µ¤¤ ...\n"
 
-#: g10/seckey-cert.c:231
+#: g10/seckey-cert.c:240
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "·Ůąđ: Ľĺ¤¤¸°¤¬¸ˇ˝Đ¤µ¤ě¤Ţ¤·¤żˇŁĄŃĄąĄŐĄěˇĽĄş¤ňĘŃąą¤·¤Ć˛Ľ¤µ¤¤ˇŁ\n"
 
-#: g10/sig-check.c:202
+#: g10/sig-check.c:199
 msgid "assuming bad MDC due to an unknown critical bit\n"
 msgstr "ÉÔĚŔ¤ĘĄŻĄęĄĆĄŁĄ«ĄëĄÓĄĂĄČ¤¬¤˘¤Ă¤ż¤Î¤Çˇ˘MDC ¤ĎÉÔŔµ¤Ŕ¤Č¸«¤Ę¤·¤Ţ¤ą\n"
 
-#: g10/sig-check.c:300
+#: g10/sig-check.c:297
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "¤ł¤ě¤Ď PGP ¤Ë¤č¤Ă¤ĆşîŔ®¤µ¤ě¤ż ElGamal "
 "¸°¤Ç¤ąˇŁ¤ł¤Î¸°¤Ď˝đĚľ¤ËÍѤ¤¤ë¤Ë¤Ď°ÂÁ´¤Ç¤Ď¤˘¤ę¤Ţ¤»¤ó!\n"
 
-#: g10/sig-check.c:308
+#: g10/sig-check.c:305
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "¸řł«¸°¤Ď˝đĚľ¤č¤ę¤â %lu Éøĺ¤ËşîŔ®¤µ¤ě¤Ć¤¤¤Ţ¤ą\n"
 
-#: g10/sig-check.c:309
+#: g10/sig-check.c:306
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "¸řł«¸°¤Ď˝đĚľ¤č¤ę¤â %lu Éøĺ¤ËşîŔ®¤µ¤ě¤Ć¤¤¤Ţ¤ą\n"
 
-#: g10/sig-check.c:327
+#: g10/sig-check.c:324
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "Ăí°Ő: ˝đĚľ¤Î¸°¤Ď´ü¸ÂŔÚ¤ě¤Ç¤ą %s\n"
 
-#: g10/sig-check.c:396
+#: g10/sig-check.c:393
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "ÉÔĚŔ¤ĘĄŻĄęĄĆĄŁĄ«ĄëĄÓĄĂĄČ¤¬¤˘¤Ă¤ż¤Î¤Çˇ˘˝đĚľ¤ĎÉÔŔµ¤Ŕ¤Č¸«¤Ę¤·¤Ţ¤ą\n"
 
@@ -2829,7 +2844,7 @@
 msgid "%s signature from: %s\n"
 msgstr "%s ˝đĚľˇŁ˝đĚľĽÔ: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:606
+#: g10/sign.c:290 g10/sign.c:610
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s ¤¬şîŔ®¤Ç¤­¤Ţ¤»¤ó: %s\n"
@@ -2877,7 +2892,7 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: Ľ­˝ń¤¬¤˘¤ę¤Ţ¤»¤ó!\n"
 
-#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1363 g10/tdbio.c:444
+#: g10/openfile.c:226 g10/openfile.c:295 g10/ringedit.c:1369 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: şîŔ®¤Ç¤­¤Ţ¤»¤ó: %s\n"
@@ -2978,286 +2993,296 @@
 msgstr ""
 "ż®ÍѥǡĽĄżĄŮˇĽĄą¤¬˛ő¤ě¤Ć¤¤¤Ţ¤ąˇŁ\"gpg --fix-trustdb\" ¤ňĽÂąÔ¤·¤Ć˛Ľ¤µ¤¤ˇŁ\n"
 
-#: g10/trustdb.c:168
+#: g10/trustdb.c:169
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "ż®Íѥ쥳ˇĽĄÉ %lu, ĄęĄŻĄ¨ĄąĄČĄżĄ¤Ą× %d: Ćɤ߽Ф·¤ËĽşÇÔ: %s\n"
 
-#: g10/trustdb.c:183
+#: g10/trustdb.c:184
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "ż®Íѥ쥳ˇĽĄÉ %lu, ĄżĄ¤Ą× %d: ˝ń¤­ąţ¤ß¤ËĽşÇÔ: %s\n"
 
-#: g10/trustdb.c:197
+#: g10/trustdb.c:198
 #, c-format
 msgid "trust record %lu: delete failed: %s\n"
 msgstr "ż®Íѥ쥳ˇĽĄÉ %lu: şď˝ü¤ËĽşÇÔ: %s\n"
 
-#: g10/trustdb.c:211
+#: g10/trustdb.c:212
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "ż®ÍѥǡĽĄżĄŮˇĽĄą: Ʊ´ü¤ËĽşÇÔ: %s\n"
 
-#: g10/trustdb.c:376
+#: g10/trustdb.c:377
 #, c-format
 msgid "error reading dir record for LID %lu: %s\n"
 msgstr "LID %lu ¤ÎĄÇĄŁĄěĄŻĄČĄęĄěĄłˇĽĄÉ¤ÎĆɤ߽Ф·Ą¨ĄéˇĽ: %s\n"
 
-#: g10/trustdb.c:383
+#: g10/trustdb.c:384
 #, c-format
 msgid "lid %lu: expected dir record, got type %d\n"
 msgstr "lid %lu: ´üÂÔ¤µ¤ě¤żĄÇĄŁĄěĄŻĄČĄęĄěĄłˇĽĄÉˇ˘ĄżĄ¤Ą× %d\n"
 
-#: g10/trustdb.c:388
+#: g10/trustdb.c:389
 #, c-format
 msgid "no primary key for LID %lu\n"
 msgstr "LID %lu ¤ÎĽç¸°¤¬¤˘¤ę¤Ţ¤»¤ó\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:394
 #, c-format
 msgid "error reading primary key for LID %lu: %s\n"
 msgstr "LID %lu ¤ÎĽç¸°¤ÎĆɤ߽Ф·Ą¨ĄéˇĽ: %s\n"
 
-#: g10/trustdb.c:432
+#: g10/trustdb.c:433
 #, c-format
 msgid "get_dir_record: search_record failed: %s\n"
 msgstr "get_dir_record: search_record ¤ËĽşÇÔ: %s\n"
 
-#: g10/trustdb.c:487
-#, c-format
-msgid "NOTE: secret key %08lX is NOT protected.\n"
-msgstr "Ăí°Ő: ČëĚ©¸° %08lX ¤ĎĘݸ¤ě¤Ć¤¤¤Ţ¤»¤óˇŁ\n"
-
-#: g10/trustdb.c:495
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr "¸° %08lX: ¸řł«¸°¤Î¤Ę¤¤ČëĚ©¸°¤Ç¤ąˇŁĄąĄ­ĄĂĄ×\n"
-
-#: g10/trustdb.c:502
-#, c-format
-msgid "key %08lX: secret and public key don't match\n"
-msgstr "¸° %08lX: ČëĚ©¸°¤Č¸řł«¸°¤¬Âбţ¤·¤Ć¤¤¤Ţ¤»¤ó\n"
+#: g10/trustdb.c:474
+#, fuzzy, c-format
+msgid "'%s' is not a valid long keyID\n"
+msgstr "%s ¤ĎŔµ¤·¤¤Ę¸»úĄłˇĽĄÉ¤Ç¤Ď¤˘¤ę¤Ţ¤»¤ó\n"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:501
 #, c-format
 msgid "key %08lX: can't put it into the trustdb\n"
 msgstr "¸° %08lX: ż®ÍѥǡĽĄżĄŮˇĽĄą¤ËĹĐĎż¤Ç¤­¤Ţ¤»¤ó\n"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:507
 #, c-format
 msgid "key %08lX: query record failed\n"
 msgstr "¸° %08lX: ĄŻĄ¨ĄęˇĽĄěĄłˇĽĄÉ¤ËĽşÇÔ\n"
 
-#: g10/trustdb.c:529
+#: g10/trustdb.c:516
 #, c-format
 msgid "key %08lX: already in trusted key table\n"
 msgstr "¸° %08lX: ´ű¤Ëż®ÍѤą¤ë¸°¤ÎÉ˝¤Ë¤˘¤ę¤Ţ¤ą\n"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:519
 #, c-format
 msgid "key %08lX: accepted as trusted key.\n"
 msgstr "¸° %08lX: ż®ÍѤą¤ë¸°¤Č¤·¤ĆĽőÍý¤µ¤ě¤Ţ¤·¤żˇŁ\n"
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:546
+#, fuzzy, c-format
+msgid "key %08lX: no public key for trusted key - skipped\n"
+msgstr "¸° %08lX: rfc2440 ¤Î¸°¤Ç¤Ď¤˘¤ę¤Ţ¤»¤ó - ĄąĄ­ĄĂĄ×¤·¤Ţ¤ą\n"
+
+#: g10/trustdb.c:565
+#, c-format
+msgid "NOTE: secret key %08lX is NOT protected.\n"
+msgstr "Ăí°Ő: ČëĚ©¸° %08lX ¤ĎĘݸ¤ě¤Ć¤¤¤Ţ¤»¤óˇŁ\n"
+
+#: g10/trustdb.c:577
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr "¸° %08lX: ¸řł«¸°¤Î¤Ę¤¤ČëĚ©¸°¤Ç¤ąˇŁĄąĄ­ĄĂĄ×\n"
+
+#: g10/trustdb.c:584
+#, c-format
+msgid "key %08lX: secret and public key don't match\n"
+msgstr "¸° %08lX: ČëĚ©¸°¤Č¸řł«¸°¤¬Âбţ¤·¤Ć¤¤¤Ţ¤»¤ó\n"
+
+#: g10/trustdb.c:597
 #, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr "ČëĚ©¸°¤Î°ěÍ÷¤ËĽşÇÔ: %s\n"
 
-#: g10/trustdb.c:921
+#: g10/trustdb.c:987
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "¸° %08lX.%lu: Éű¸°¤ÎÂбţ¤ĎÍ­¸ú¤Ç¤ą\n"
 
-#: g10/trustdb.c:927 g10/trustdb.c:962
+#: g10/trustdb.c:993 g10/trustdb.c:1028
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "¸° %08lX.%lu: Éű¸°¤ÎÂбţ¤¬Ěµ¸ú¤Ç¤ą: %s\n"
 
-#: g10/trustdb.c:939
+#: g10/trustdb.c:1005
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "¸° %08lX.%lu: Í­¸ú¤Ę¸°¤ÎÇŃ»ß\n"
 
-#: g10/trustdb.c:945
+#: g10/trustdb.c:1011
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "¸° %08lX.%lu: ̵¸ú¤Ę¸°¤ÎÇË´ţ: %s\n"
 
-#: g10/trustdb.c:956
+#: g10/trustdb.c:1022
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "¸° %08lX.%lu: Í­¸ú¤ĘÉű¸°¤ÎÇË´ţ\n"
 
-#: g10/trustdb.c:1067
+#: g10/trustdb.c:1133
 msgid "Good self-signature"
 msgstr "Í­¸ú¤ĘĽ«¸Ę˝đĚľ"
 
-#: g10/trustdb.c:1077
+#: g10/trustdb.c:1143
 msgid "Invalid self-signature"
 msgstr "̵¸ú¤ĘĽ«¸Ę˝đĚľ"
 
-#: g10/trustdb.c:1104
+#: g10/trustdb.c:1170
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr "ż·¤·¤ŻĽ«¸Ę˝đĚľ¤µ¤ě¤Ć¤¤¤ë¤Î¤Çˇ˘Í­¸ú¤ĘĄćˇĽĄ¶ ID ¤ÎÇË´ţ¤ĎąÔ¤¤¤Ţ¤»¤ó"
 
-#: g10/trustdb.c:1110
+#: g10/trustdb.c:1176
 msgid "Valid user ID revocation"
 msgstr "Í­¸ú¤ĘĄćˇĽĄ¶ ID ¤ÎÇË´ţ"
 
-#: g10/trustdb.c:1115
+#: g10/trustdb.c:1181
 msgid "Invalid user ID revocation"
 msgstr "̵¸ú¤ĘĄćˇĽĄ¶ ID ¤ÎÇË´ţ"
 
-#: g10/trustdb.c:1157
+#: g10/trustdb.c:1223
 msgid "Valid certificate revocation"
 msgstr "Í­¸ú¤ĘľÚĚŔ˝ń¤ÎÇË´ţ"
 
-#: g10/trustdb.c:1158
+#: g10/trustdb.c:1224
 msgid "Good certificate"
 msgstr "Í­¸ú¤ĘľÚĚŔ˝ń"
 
-#: g10/trustdb.c:1186
+#: g10/trustdb.c:1252
 msgid "Invalid certificate revocation"
 msgstr "̵¸ú¤ĘľÚĚŔ˝ń¤ÎÇË´ţ"
 
-#: g10/trustdb.c:1187
+#: g10/trustdb.c:1253
 msgid "Invalid certificate"
 msgstr "̵¸ú¤ĘľÚĚŔ˝ń"
 
-#: g10/trustdb.c:1204 g10/trustdb.c:1208
+#: g10/trustdb.c:1270 g10/trustdb.c:1274
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "˝đĚľĄěĄłˇĽĄÉ %lu[%d] ¤Ď¸í¤Ă¤żĄěĄłˇĽĄÉ¤ň»Ř¤·¤Ć¤¤¤Ţ¤ąˇŁ\n"
 
-#: g10/trustdb.c:1267
+#: g10/trustdb.c:1333
 msgid "duplicated certificate - deleted"
 msgstr "˝ĹĘŁ¤·¤żľÚĚŔ˝ń - şď˝ü¤·¤Ţ¤·¤ż"
 
-#: g10/trustdb.c:1584
+#: g10/trustdb.c:1650
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir ¤ËĽşÇÔ: %s\n"
 
-#: g10/trustdb.c:1718
+#: g10/trustdb.c:1784
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: ÁŢĆţ¤ËĽşÇÔ: %s\n"
 
-#: g10/trustdb.c:1723
+#: g10/trustdb.c:1789
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: ÁŢĆţ¤ËĽşÇÔ: %s\n"
 
-#: g10/trustdb.c:1729
+#: g10/trustdb.c:1795
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: ÁŢĆţ¤·¤Ţ¤·¤ż\n"
 
-#: g10/trustdb.c:1734
+#: g10/trustdb.c:1800
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "ĄÇĄŁĄěĄŻĄČĄęĄěĄłˇĽĄÉ¤ÎĆɤ߽Ф·Ą¨ĄéˇĽ: %s\n"
 
-#: g10/trustdb.c:1742 g10/trustdb.c:1805
+#: g10/trustdb.c:1808 g10/trustdb.c:1871
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu ¸°¤ň˝čÍý¤·¤Ţ¤·¤ż\n"
 
-#: g10/trustdb.c:1744 g10/trustdb.c:1811
+#: g10/trustdb.c:1810 g10/trustdb.c:1877
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu ¸°¤Ë¤ĎĄ¨ĄéˇĽ¤¬¤˘¤ę¤Ţ¤ą\n"
 
-#: g10/trustdb.c:1746
+#: g10/trustdb.c:1812
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu ¸°¤ňÁŢĆţ¤·¤Ţ¤·¤ż\n"
 
-#: g10/trustdb.c:1749
+#: g10/trustdb.c:1815
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "¸°ĄÖĄíĄĂĄŻ¤Î°ěÍ÷¤ËĽşÇÔ: %s\n"
 
-#: g10/trustdb.c:1797
+#: g10/trustdb.c:1863
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: ¸°¤Ę¤·¤ÎĄÇĄŁĄěĄŻĄČĄęĄěĄłˇĽĄÉ - ĄąĄ­ĄĂĄ×\n"
 
-#: g10/trustdb.c:1807
+#: g10/trustdb.c:1873
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "\t%lu ż·¤ż¤Ę¸řł«¸°\n"
 
-#: g10/trustdb.c:1809
+#: g10/trustdb.c:1875
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu ¸°¤ňĄąĄ­ĄĂĄ×¤·¤Ţ¤·¤ż\n"
 
-#: g10/trustdb.c:1813
+#: g10/trustdb.c:1879
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu ¸°¤ňąąż·¤·¤Ţ¤·¤ż\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2224
 msgid "Ooops, no keys\n"
 msgstr "¤Ş¤Ă¤Čˇ˘¸°¤¬¤˘¤ę¤Ţ¤»¤ó\n"
 
-#: g10/trustdb.c:2162
+#: g10/trustdb.c:2228
 msgid "Ooops, no user IDs\n"
 msgstr "¤Ş¤Ă¤Čˇ˘ĄćˇĽĄ¶ ID ¤¬¤˘¤ę¤Ţ¤»¤ó\n"
 
-#: g10/trustdb.c:2320
+#: g10/trustdb.c:2386
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: ĄÇĄŁĄěĄŻĄČĄęĄěĄłˇĽĄÉ¤Î¸ˇş÷¤ËĽşÇÔ: %s\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2395
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "¸° %08lX: ż®Íѥ쥳ˇĽĄÉ¤ÎÁŢĆţ¤ËĽşÇÔ: %s\n"
 
-#: g10/trustdb.c:2333
+#: g10/trustdb.c:2399
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "¸° %08lX.%lu: ż®Íѥ쥳ˇĽĄÉ¤ËÁŢĆţ¤·¤Ţ¤·¤ż\n"
 
-#: g10/trustdb.c:2341
+#: g10/trustdb.c:2407
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "¸° %08lX.%lu: ̤Íč¤ËşîŔ®¤µ¤ě¤Ć¤¤¤Ţ¤ą (»ţ´ÖÎąąÔ¤«»ţ·×¤Î¤Ż¤ë¤¤¤Ç¤·¤ç¤¦)\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2422
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "¸° %08lX.%lu: %s ¤Ç´ü¸ÂŔÚ¤ě¤Ç¤ą\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2430
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "¸° %08lX.%lu: ż®ÍѤθˇľÚ¤ËĽşÇÔ: %s\n"
 
-#: g10/trustdb.c:2515
+#: g10/trustdb.c:2581
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "ĄćˇĽĄ¶ '%s' ¤¬¸«¤Ä¤«¤ę¤Ţ¤»¤ó: %s\n"
 
-#: g10/trustdb.c:2517
+#: g10/trustdb.c:2583
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "ż®ÍѥǡĽĄżĄŮˇĽĄą¤«¤é '%s' ¤Î¸ˇş÷¤Ëľăł˛: %s\n"
 
-#: g10/trustdb.c:2520
+#: g10/trustdb.c:2586
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "ĄćˇĽĄ¶ '%s' ¤Ďż®ÍѥǡĽĄżĄŮˇĽĄą¤ËĹĐĎż¤µ¤ě¤Ć¤¤¤Ţ¤»¤ó - ÁŢĆţ¤·¤Ţ¤·¤ż\n"
 
-#: g10/trustdb.c:2523
+#: g10/trustdb.c:2589
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "'%s' ¤Îż®ÍѥǡĽĄżĄŮˇĽĄą¤Ř¤ÎĹĐĎż¤ËĽşÇÔ: %s\n"
 
-#: g10/trustdb.c:2709 g10/trustdb.c:2739
+#: g10/trustdb.c:2775 g10/trustdb.c:2805
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "·Ůąđ: ¤Ţ¤Ŕ long pref ĄěĄłˇĽĄÉ¤ĎĽč¤ę°·¤¨¤Ţ¤»¤ó\n"
 
@@ -3281,26 +3306,26 @@
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: ¸°ĄęĄóĄ°¤ňşîŔ®¤Ç¤­¤Ţ¤»¤ó: %s\n"
 
-#: g10/ringedit.c:319 g10/ringedit.c:1368
+#: g10/ringedit.c:319 g10/ringedit.c:1374
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: ¸°ĄęĄóĄ°¤ňşîŔ®¤·¤Ţ¤·¤ż\n"
 
-#: g10/ringedit.c:1545
+#: g10/ringedit.c:1551
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "·Ůąđ: ż®ÍŃľđĘó¤ň»ý¤Ă¤ż 2 ¤Ä¤ÎĄŐĄˇĄ¤Ąë¤¬Â¸şß¤·¤Ţ¤ąˇŁ\n"
 
-#: g10/ringedit.c:1546
+#: g10/ringedit.c:1552
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s ¤ĎĘŃąą¤µ¤ě¤Ć¤¤¤Ę¤¤Ęý¤Ç¤ą\n"
 
-#: g10/ringedit.c:1547
+#: g10/ringedit.c:1553
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s ¤Ďż·¤·¤¤Ęý¤Ç¤ą\n"
 
-#: g10/ringedit.c:1548
+#: g10/ringedit.c:1554
 msgid "Please fix this possible security flaw\n"
 msgstr "¤ł¤Î°ÂÁ´ľĺ¤Î·ç´Ů¤ň˝¤Ŕµ¤·¤Ć˛Ľ¤µ¤¤\n"
 
@@ -3325,49 +3350,49 @@
 "¸°¤Ç¤ąˇŁ¤ł¤Î¸°¤Ď˝đĚľ¤ËÍѤ¤¤ë¤Ë¤Ď°ÂÁ´¤Ç¤Ď¤˘¤ę¤Ţ¤»¤ó!\n"
 
 #. do not overwrite
-#: g10/openfile.c:79
+#: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
 msgstr "ĄŐĄˇĄ¤Ąë `%s' ¤Ď´ű¤Ë¸şß¤·¤Ţ¤ąˇŁ"
 
-#: g10/openfile.c:81
+#: g10/openfile.c:86
 msgid "Overwrite (y/N)? "
 msgstr "ľĺ˝ń¤­¤·¤Ţ¤ą¤« (y/N)? "
 
-#: g10/openfile.c:109
+#: g10/openfile.c:119
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: ÉÔĚŔ¤ĘłČÄĄ»Ň\n"
 
-#: g10/openfile.c:131
+#: g10/openfile.c:141
 msgid "Enter new filename"
 msgstr "ż·¤·¤¤ĄŐĄˇĄ¤ĄëĚľ¤ňĆţÎϤ·¤Ć˛Ľ¤µ¤¤"
 
-#: g10/openfile.c:172
+#: g10/openfile.c:182
 msgid "writing to stdout\n"
 msgstr "ɸ˝ŕ˝ĐÎϤ˽ń¤­˝Đ¤·¤Ţ¤ą\n"
 
-#: g10/openfile.c:250
+#: g10/openfile.c:261
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "˝đĚľ¤µ¤ě¤żĄÇˇĽĄż¤¬ `%s' ¤Ë¤˘¤ë¤ČÁŰÄꤷ¤Ţ¤ą\n"
 
-#: g10/openfile.c:300
+#: g10/openfile.c:311
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: ż·¤·¤¤ĄŞĄ×Ą·ĄçĄóĄŐĄˇĄ¤Ąë¤ňşîŔ®¤·¤Ţ¤·¤ż\n"
 
-#: g10/openfile.c:313
+#: g10/openfile.c:338
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: Ľ­˝ń¤¬şîŔ®¤Ç¤­¤Ţ¤»¤ó: %s\n"
 
-#: g10/openfile.c:316
+#: g10/openfile.c:341
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: Ľ­˝ń¤ňşîŔ®¤·¤Ţ¤·¤ż\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:343
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr "ĄŞĄ×Ą·ĄçĄóˇ¦ĄŐĄˇĄ¤Ąë¤ňĆɤßÄľ¤ą¤č¤¦ˇ˘GnuPG¤ňşĆµŻĆ°¤·¤Ć¤Ż¤Ŕ¤µ¤¤\n"
 
@@ -3655,6 +3680,14 @@
 #, c-format
 msgid "No help available for `%s'"
 msgstr "`%s' ¤Ř¤ÎĄŘĄëĄ×¤Ď¤˘¤ę¤Ţ¤»¤ó"
+
+#~ msgid ""
+#~ "RSA keys are deprecated; please consider creating a new key and use this key "
+#~ "in the future\n"
+#~ msgstr ""
+#~ "RSA "
+#~ "¸°¤ĎČżÂФµ¤ě¤Ć¤¤¤Ţ¤ąˇŁż·¤·¤¤¸°¤ňşîŔ®¤·¤ĆşŁ¸ĺ¤Ď¤˝¤Î¸°¤ňÍѤ¤¤ë¤ł¤Č¤ň¸ˇĆ¤¤·¤Ć¤Ż¤"
+#~ "Ŕ¤µ¤¤\n"
 
 #~ msgid "set debugging flags"
 #~ msgstr "ĄÇĄĐĄĂĄ°ĄŐĄéĄ°¤ňĄ»ĄĂĄČ¤ą¤ë"
diff -urN gnupg-1.0.2/po/nl.po gnupg-1.0.3/po/nl.po
--- gnupg-1.0.2/po/nl.po	Wed Jul 12 14:59:43 2000
+++ gnupg-1.0.3/po/nl.po	Mon Sep 18 12:18:06 2000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-07-12 12:13+0200\n"
+"POT-Creation-Date: 2000-09-18 12:17+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"
@@ -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:127 g10/keygen.c:1249
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1255
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
@@ -307,11 +307,11 @@
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:647
+#: cipher/random.c:650
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "LET OP: de willekeurige getallengenerator is niet veilig!!\n"
 
-#: cipher/random.c:648
+#: cipher/random.c:651
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -325,7 +325,7 @@
 "Gebruik geen enkele gegevens die door dit programma gegenereerd zijn!!\n"
 "\n"
 
-#: cipher/rndlinux.c:141
+#: cipher/rndlinux.c:142
 #, c-format
 msgid ""
 "\n"
@@ -337,7 +337,7 @@
 "om het besturingssysteem de kans te geven om meer entropie te\n"
 "verzamelen! (Nog %d bytes nodig)\n"
 
-#: g10/g10.c:197
+#: g10/g10.c:206
 msgid ""
 "@Commands:\n"
 " "
@@ -345,139 +345,139 @@
 "@Opdrachten:\n"
 " "
 
-#: g10/g10.c:199
+#: g10/g10.c:208
 msgid "|[file]|make a signature"
 msgstr "|[bestand]|maak een ondertekening"
 
-#: g10/g10.c:200
+#: g10/g10.c:209
 msgid "|[file]|make a clear text signature"
 msgstr "|[bestand]|maak een niet versleutelde ondertekening"
 
-#: g10/g10.c:201
+#: g10/g10.c:210
 msgid "make a detached signature"
 msgstr "maak een losstaande ondertekening"
 
-#: g10/g10.c:202
+#: g10/g10.c:211
 msgid "encrypt data"
 msgstr "versleutel gegevens"
 
-#: g10/g10.c:203
+#: g10/g10.c:212
 msgid "encryption only with symmetric cipher"
 msgstr "versleutel slechts met een symmetrische versleutelmethode"
 
-#: g10/g10.c:204
+#: g10/g10.c:213
 msgid "store only"
 msgstr "alleen bewaren"
 
-#: g10/g10.c:205
+#: g10/g10.c:214
 msgid "decrypt data (default)"
 msgstr "gegevens decoderen (standaard)"
 
-#: g10/g10.c:206
+#: g10/g10.c:215
 msgid "verify a signature"
 msgstr "ondertekening controleren"
 
-#: g10/g10.c:208
+#: g10/g10.c:217
 msgid "list keys"
 msgstr "lijst van sleutels genereren"
 
-#: g10/g10.c:210
+#: g10/g10.c:219
 msgid "list keys and signatures"
 msgstr "sleutels en ondertekeningen opnoemen"
 
-#: g10/g10.c:211
+#: g10/g10.c:220
 msgid "check key signatures"
 msgstr "sleutelverificaties controleren"
 
-#: g10/g10.c:212
+#: g10/g10.c:221
 msgid "list keys and fingerprints"
 msgstr "sleutels en vingerafdrukken opnoemen"
 
-#: g10/g10.c:213
+#: g10/g10.c:222
 msgid "list secret keys"
 msgstr "geheime sleutels opnoemen"
 
-#: g10/g10.c:214
+#: g10/g10.c:223
 msgid "generate a new key pair"
 msgstr "nieuw sleutelpaar genereren"
 
-#: g10/g10.c:215
+#: g10/g10.c:224
 msgid "remove key from the public keyring"
 msgstr "sleutel weghalen uit de publieke sleutelbos"
 
-#: g10/g10.c:217
+#: g10/g10.c:226
 msgid "remove key from the secret keyring"
 msgstr "sleutel weghalen uit de geheime sleutelbos"
 
-#: g10/g10.c:218
+#: g10/g10.c:227
 msgid "sign a key"
 msgstr "onderteken een sleutel"
 
-#: g10/g10.c:219
+#: g10/g10.c:228
 msgid "sign a key locally"
 msgstr "onderteken een sleutel lokaal"
 
-#: g10/g10.c:220
+#: g10/g10.c:229
 msgid "sign or edit a key"
 msgstr "onderteken of bewerk een sleutel"
 
-#: g10/g10.c:221
+#: g10/g10.c:230
 msgid "generate a revocation certificate"
 msgstr "genereer een terugtrekkings-certificaat"
 
-#: g10/g10.c:222
+#: g10/g10.c:231
 msgid "export keys"
 msgstr "exporteer sleutels"
 
-#: g10/g10.c:223
+#: g10/g10.c:232
 msgid "export keys to a key server"
 msgstr "exporteer sleutels naar een sleutelserver"
 
-#: g10/g10.c:224
+#: g10/g10.c:233
 msgid "import keys from a key server"
 msgstr "importeer sleutels van een sleutelserver"
 
-#: g10/g10.c:228
+#: g10/g10.c:237
 msgid "import/merge keys"
 msgstr "sleutels importeren/samenvoegen"
 
-#: g10/g10.c:230
+#: g10/g10.c:239
 msgid "list only the sequence of packets"
 msgstr "noem alleen de volgorde van pakketten"
 
-#: g10/g10.c:232
+#: g10/g10.c:241
 msgid "export the ownertrust values"
 msgstr "exporteer het vertrouwen in de eigenaars"
 
-#: g10/g10.c:234
+#: g10/g10.c:243
 msgid "import ownertrust values"
 msgstr "importeer het vertrouwen in de eigenaars"
 
-#: g10/g10.c:236
+#: g10/g10.c:245
 msgid "update the trust database"
 msgstr "werk de vertrouwensdatabase bij"
 
-#: g10/g10.c:238
+#: g10/g10.c:247
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMEN]|controleer de vertrouwensdatabase"
 
-#: g10/g10.c:239
+#: g10/g10.c:248
 msgid "fix a corrupted trust database"
 msgstr "repareer een beschadigde vertrouwensdatabase"
 
-#: g10/g10.c:240
+#: g10/g10.c:249
 msgid "De-Armor a file or stdin"
 msgstr "Verwijder de beveiliging op bestand of standaard invoer"
 
-#: g10/g10.c:242
+#: g10/g10.c:251
 msgid "En-Armor a file or stdin"
 msgstr "Voeg beveiliging toe aan bestad of standaard invoer"
 
-#: g10/g10.c:244
+#: g10/g10.c:253
 msgid "|algo [files]|print message digests"
 msgstr "|algo [bestanden]|geef controlegetal van berichten weer"
 
-#: g10/g10.c:248
+#: g10/g10.c:257
 msgid ""
 "@\n"
 "Options:\n"
@@ -487,155 +487,159 @@
 "Opties:\n"
 " "
 
-#: g10/g10.c:250
+#: g10/g10.c:259
 msgid "create ascii armored output"
 msgstr "genereer beveiliging in ASCII"
 
-#: g10/g10.c:252
+#: g10/g10.c:261
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAAM|versleutel voor NAAM"
 
-#: g10/g10.c:255
+#: g10/g10.c:264
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAAM|gebruik NAAM als standaard ontvanger"
 
-#: g10/g10.c:257
+#: g10/g10.c:266
 msgid "use the default key as default recipient"
 msgstr "gebruik de standaard sleutel als standaard ontvanger"
 
-#: g10/g10.c:261
+#: g10/g10.c:270
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "gebruik deze gebruikersidentificatie om te ondertekenen of te decoderen"
 
-#: g10/g10.c:262
+#: g10/g10.c:271
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|stel compressieniveau in op N (uitzetten met 0)"
 
-#: g10/g10.c:264
+#: g10/g10.c:273
 msgid "use canonical text mode"
 msgstr "gebruik de verkorte tekstmodus"
 
-#: g10/g10.c:265
+#: g10/g10.c:274
 msgid "use as output file"
 msgstr "gebruik als uitvoerbestand"
 
-#: g10/g10.c:266
+#: g10/g10.c:275
 msgid "verbose"
 msgstr "geef meer informatie"
 
-#: g10/g10.c:267
+#: g10/g10.c:276
 msgid "be somewhat more quiet"
 msgstr "wees iets stiller"
 
-#: g10/g10.c:268
+#: g10/g10.c:277
 msgid "don't use the terminal at all"
 msgstr "gebruik de terminal helemaal niet"
 
-#: g10/g10.c:269
+#: g10/g10.c:278
 msgid "force v3 signatures"
 msgstr "forcees v3 ondertekening"
 
-#: g10/g10.c:270
+#: g10/g10.c:279
 msgid "always use a MDC for encryption"
 msgstr "gebruik altijd een MDC voor versleuteling"
 
-#: g10/g10.c:271
+#: g10/g10.c:280
 msgid "do not make any changes"
 msgstr "maak geen enkele verandering"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:273
+#: g10/g10.c:282
 msgid "batch mode: never ask"
 msgstr "doorlopende modus: vraag nooit"
 
-#: g10/g10.c:274
+#: g10/g10.c:283
 msgid "assume yes on most questions"
 msgstr "veronderstel ja als antwoord op de meeste vragen"
 
-#: g10/g10.c:275
+#: g10/g10.c:284
 msgid "assume no on most questions"
 msgstr "veronderstel nee als antwoord op de meeste vragen"
 
-#: g10/g10.c:276
+#: g10/g10.c:285
 msgid "add this keyring to the list of keyrings"
 msgstr "voeg deze sleutelbos toe aan de lijst van sleutelbossen"
 
-#: g10/g10.c:277
+#: g10/g10.c:286
 msgid "add this secret keyring to the list"
 msgstr "voeg deze geheime sleutelbos toe aan de lijst"
 
-#: g10/g10.c:278
+#: g10/g10.c:287
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAAM|gebruik NAAM als standaard geheime sleutel"
 
-#: g10/g10.c:279
+#: g10/g10.c:288
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVER|gebruik deze sleutelserver om sleutels op te zoeken"
 
-#: g10/g10.c:280
+#: g10/g10.c:289
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAAM|zet tekenverzameling van terminal op NAAM"
 
-#: g10/g10.c:281
+#: g10/g10.c:290
 msgid "read options from file"
 msgstr "lees opties uit bestand"
 
-#: g10/g10.c:285
+#: g10/g10.c:294
 msgid "|FD|write status info to this FD"
 msgstr "|BB|schrijf status naar deze bestandsbeschrijver"
 
-#: g10/g10.c:290
+#: g10/g10.c:299
+msgid "|KEYID|ulimately trust this key"
+msgstr ""
+
+#: g10/g10.c:300
 msgid "|FILE|load extension module FILE"
 msgstr "|BESTAND|laad extensiemodule BESTAND"
 
-#: g10/g10.c:291
+#: g10/g10.c:301
 msgid "emulate the mode described in RFC1991"
 msgstr "doe als RFC1991 voorschrijft"
 
-#: g10/g10.c:292
+#: g10/g10.c:302
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "zet alle pakket-, versleutel- en controle-opties naar OpenPGP gedrag"
 
-#: g10/g10.c:293
+#: g10/g10.c:303
 msgid "|N|use passphrase mode N"
 msgstr "|N|gebruik sleuteltekst modus N"
 
-#: g10/g10.c:295
+#: g10/g10.c:305
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAAM|gebruik berichtsamenvattingsalgoritme NAAM voor sleutelteksten"
 
-#: g10/g10.c:297
+#: g10/g10.c:307
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAAM|gebruik versleutelalgoritme NAAM voor sleutelteksten"
 
-#: g10/g10.c:298
+#: g10/g10.c:308
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAAM|gebruik versleutelalgoritme NAAM"
 
-#: g10/g10.c:299
+#: g10/g10.c:309
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAAM|gebruik berichtsamenvattingsalgoritme NAAM"
 
-#: g10/g10.c:300
+#: g10/g10.c:310
 msgid "|N|use compress algorithm N"
 msgstr "|N|gebruik compressiealgoritme N"
 
-#: g10/g10.c:301
+#: g10/g10.c:311
 msgid "throw keyid field of encrypted packets"
 msgstr "plaats geen sleutelidentificatieveld in versleutelde pakketten"
 
-#: g10/g10.c:302
+#: g10/g10.c:312
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAAM=WAARDE|gebruik deze notitiegegevens"
 
-#: g10/g10.c:305
+#: g10/g10.c:315
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:308
+#: g10/g10.c:318
 msgid ""
 "@\n"
 "Examples:\n"
@@ -655,17 +659,17 @@
 " --list-keys [namen]         toon sleutels\n"
 " --fingerprints [namen]      toon vingerafdrukken\n"
 
-#: g10/g10.c:403
+#: g10/g10.c:418
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Meld fouten in het programma a.u.b. aan <gnupg-bugs@gnu.org>;\n"
 "fouten in de vertaling aan <nl@li.org>.\n"
 
-#: g10/g10.c:407
+#: g10/g10.c:422
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Gebruik: gpg [opties] [bestanden] (-h voor hulp)"
 
-#: g10/g10.c:410
+#: g10/g10.c:425
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -675,7 +679,7 @@
 "onderteken, controleer, versleutel of decodeer de ingevoerde gegevens\n"
 "standaardactie hangt af van de gegevens\n"
 
-#: g10/g10.c:417
+#: g10/g10.c:432
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -683,184 +687,188 @@
 "\n"
 "Ondersteunde algoritmes:\n"
 
-#: g10/g10.c:496
+#: g10/g10.c:511
 msgid "usage: gpg [options] "
 msgstr "gebruik: gpg [opties] "
 
-#: g10/g10.c:549
+#: g10/g10.c:564
 msgid "conflicting commands\n"
 msgstr "tegenstrijdige commando's\n"
 
-#: g10/g10.c:692
+#: g10/g10.c:704
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "LET OP: geen bestand `%s' met standaardopties\n"
 
-#: g10/g10.c:696
+#: g10/g10.c:708
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "optiebestand `%s': %s\n"
 
-#: g10/g10.c:703
+#: g10/g10.c:715
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "opties inlezen van `%s'\n"
 
-#: g10/g10.c:893
+#: g10/g10.c:905
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s is een onbekende tekenverzameling\n"
 
-#: g10/g10.c:949 g10/g10.c:958
+#: g10/g10.c:970
+msgid "WARNING: program may create a core file!\n"
+msgstr "LET OP: programma zou een geheugendump kunnen maken!\n"
+
+#: g10/g10.c:974 g10/g10.c:983
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "LET OP: %s is niet voor gewoon gebruik!\n"
 
-#: g10/g10.c:951
+#: g10/g10.c:976
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s is niet toegestaan met deze %s!\n"
 
-#: g10/g10.c:954
+#: g10/g10.c:979
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s heeft geen betekenis met %s!\n"
 
-#: g10/g10.c:973 g10/g10.c:985
+#: g10/g10.c:998 g10/g10.c:1010
 msgid "selected cipher algorithm is invalid\n"
 msgstr "geselecteerd versleutelalgoritme is ongeldig\n"
 
-#: g10/g10.c:979 g10/g10.c:991
+#: g10/g10.c:1004 g10/g10.c:1016
 msgid "selected digest algorithm is invalid\n"
 msgstr "geselecteerd controle-algoritme is ongeldig\n"
 
-#: g10/g10.c:995
+#: g10/g10.c:1020
 msgid "the given policy URL is invalid\n"
 msgstr "de gegeven beleids-URL is ongeldig\n"
 
-#: g10/g10.c:998
+#: g10/g10.c:1023
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "compressie-algoritme moet in het bereik %d..%d liggen\n"
 
-#: g10/g10.c:1000
+#: g10/g10.c:1025
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed(?) moet groter zijn dan 0\n"
 
-#: g10/g10.c:1002
+#: g10/g10.c:1027
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed(?) moet groter zijn dan 1\n"
 
-#: g10/g10.c:1004
+#: g10/g10.c:1029
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth moet tussen de 1 en de 255 (inclusief) liggen\n"
 
-#: g10/g10.c:1007
+#: g10/g10.c:1032
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "LET OP: simpele S2K mode (0) wordt met klem afgeraden\n"
 
-#: g10/g10.c:1011
+#: g10/g10.c:1036
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ongeldige S2K modus; moet 0, 1 of 3 zijn\n"
 
-#: g10/g10.c:1096
+#: g10/g10.c:1121
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "fout bij het initialiseren van de vertrouwensdatabase: %s\n"
 
-#: g10/g10.c:1102
+#: g10/g10.c:1127
 msgid "--store [filename]"
 msgstr "--store [bestandsnaam]"
 
-#: g10/g10.c:1109
+#: g10/g10.c:1134
 msgid "--symmetric [filename]"
 msgstr "--symmetric [bestandsnaam]"
 
-#: g10/g10.c:1117
+#: g10/g10.c:1142
 msgid "--encrypt [filename]"
 msgstr "--encrypt [bestandsnaam]"
 
-#: g10/g10.c:1130
+#: g10/g10.c:1155
 msgid "--sign [filename]"
 msgstr "--sign [bestandsnaam]"
 
-#: g10/g10.c:1143
+#: g10/g10.c:1168
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [bestandsnaam]"
 
-#: g10/g10.c:1157
+#: g10/g10.c:1182
 msgid "--clearsign [filename]"
 msgstr "--clearsign [bestandsnaam]"
 
-#: g10/g10.c:1174
+#: g10/g10.c:1199
 msgid "--decrypt [filename]"
 msgstr "--decrypt [bestandsnaam]"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1207
 msgid "--sign-key user-id"
 msgstr "--sign-key gebruikersidentificatie"
 
-#: g10/g10.c:1190
+#: g10/g10.c:1215
 msgid "--lsign-key user-id"
 msgstr "--lsign-key gebruikers-identificatie"
 
-#: g10/g10.c:1198
+#: g10/g10.c:1223
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key gebruikersidentificatie [opdrachten]"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1239
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key gebruikersidentificatie"
 
-#: g10/g10.c:1217
+#: g10/g10.c:1242
 msgid "--delete-key user-id"
 msgstr "--delete-key gebruikersidentificatie"
 
-#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393
+#: g10/encode.c:265 g10/g10.c:1279 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "kan %s niet openen: %s\n"
 
-#: g10/g10.c:1269
+#: g10/g10.c:1294
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [gebruikersidentificatie] [sleutelbos]"
 
-#: g10/g10.c:1335
+#: g10/g10.c:1360
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "opheffen van beveiliging mislukt: %s\n"
 
-#: g10/g10.c:1343
+#: g10/g10.c:1368
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "beveiligen mislukt: %s\n"
 
-#: g10/g10.c:1411
+#: g10/g10.c:1439
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ongeldig frommelalgoritme `%s'\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1520
 msgid "[filename]"
 msgstr "[bestandsnaam]"
 
-#: g10/g10.c:1496
+#: g10/g10.c:1524
 msgid "Go ahead and type your message ...\n"
 msgstr "Gaat uw gang, type het bericht ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1499 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1527 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan `%s' niet openen\n"
 
-#: g10/g10.c:1669
+#: g10/g10.c:1700
 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:1675
+#: g10/g10.c:1706
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -868,11 +876,11 @@
 "een notitienaam mag alleen letters, cijfers, punten of underscores bevatten "
 "en eindig met een =\n"
 
-#: g10/g10.c:1681
+#: g10/g10.c:1712
 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:1689
+#: g10/g10.c:1720
 msgid "a notation value must not use any control characters\n"
 msgstr "een notitienaam mag geen controletekens bevatten\n"
 
@@ -1262,58 +1270,58 @@
 msgid "writing key binding signature\n"
 msgstr "schrijven van sleutelbindingsondertekening\n"
 
-#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:433
+#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:435
 #, 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:438
+#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:440
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "afgerond naar %u bits\n"
 
-#: g10/keygen.c:537
+#: g10/keygen.c:539
 msgid "Please select what kind of key you want:\n"
 msgstr "Selecteer aub wat voor sleutel u wilt:\n"
 
-#: g10/keygen.c:539
+#: g10/keygen.c:541
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA en ElGamal (standaard)\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:542
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (alleen ondertekenen)\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:544
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (alleen versleutelen)\n"
 
-#: g10/keygen.c:543
+#: g10/keygen.c:545
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (ondertekenen en versleutelen)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:547
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (ondertekenen en versleutelen)\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:551
 msgid "Your selection? "
 msgstr "Uw keuze? "
 
-#: g10/keygen.c:560 g10/keygen.c:568
+#: g10/keygen.c:562 g10/keygen.c:570
 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:582
+#: g10/keygen.c:584
 msgid "Invalid selection.\n"
 msgstr "Ongeldige keuze.\n"
 
-#: g10/keygen.c:594
+#: g10/keygen.c:596
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1326,19 +1334,19 @@
 "                standaard sleutellengte is 1024 bits\n"
 "     hoogste aan te raden sleutellengte is 2048 bits\n"
 
-#: g10/keygen.c:601
+#: g10/keygen.c:603
 msgid "What keysize do you want? (1024) "
 msgstr "Hoe lang wil je de sleutel maken? (1024) "
 
-#: g10/keygen.c:606
+#: g10/keygen.c:608
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA staat alleen sleutellengtes toe van 512 tot 1024\n"
 
-#: g10/keygen.c:608
+#: g10/keygen.c:610
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "sleutel te kort; 768 is de kleinste toegestane waarde.\n"
 
-#: g10/keygen.c:610
+#: g10/keygen.c:612
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "sleutel te kort; 768 is de kleinste toegestane waarde.\n"
@@ -1351,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:621
+#: g10/keygen.c:623
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "sleutel te lang; %d is de maximumlengte.\n"
 
-#: g10/keygen.c:626
+#: g10/keygen.c:628
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1364,11 +1372,11 @@
 "Sleutels langer dan 2048 worden afgeraden omdat berekeningen dan ERG\n"
 "lang duren!\n"
 
-#: g10/keygen.c:629
+#: g10/keygen.c:631
 msgid "Are you sure that you want this keysize? "
 msgstr "Weet je zeker dat je deze sleutellengte wilt gebruiken? "
 
-#: g10/keygen.c:630
+#: g10/keygen.c:632
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1376,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:638
+#: g10/keygen.c:640
 msgid "Do you really need such a large keysize? "
 msgstr "Heb je echt een sleutel nodig die zo lang is? "
 
-#: g10/keygen.c:644
+#: g10/keygen.c:646
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Gevraagde sleutellengte is %u bits\n"
 
-#: g10/keygen.c:647 g10/keygen.c:651
+#: g10/keygen.c:649 g10/keygen.c:653
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "afgerond naar %u bits\n"
 
-#: g10/keygen.c:699
+#: g10/keygen.c:701
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1406,26 +1414,26 @@
 "    <n>m = sleutel verloopt over n maanden\n"
 "    <n>y = sleutel verloopt over n jaar\n"
 
-#: g10/keygen.c:714
+#: g10/keygen.c:716
 msgid "Key is valid for? (0) "
 msgstr "Sleutel is geldig gedurende? (0) "
 
-#: g10/keygen.c:719
+#: g10/keygen.c:721
 msgid "invalid value\n"
 msgstr "ongeldige waarde\n"
 
-#: g10/keygen.c:724
+#: g10/keygen.c:726
 msgid "Key does not expire at all\n"
 msgstr "Sleutel verloopt nooit\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:730
+#: g10/keygen.c:732
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Sleutel verloopt op %s\n"
 
 # fixme
-#: g10/keygen.c:733
+#: g10/keygen.c:735
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1433,11 +1441,11 @@
 "Uw systeem kan geen data weergeven van na 2038.\n"
 "Desondanks wordt het goed behandeld tot 2106.\n"
 
-#: g10/keygen.c:738
+#: g10/keygen.c:740
 msgid "Is this correct (y/n)? "
 msgstr "Klopt dit (j/n)? "
 
-#: g10/keygen.c:781
+#: g10/keygen.c:783
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1453,44 +1461,44 @@
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:793
+#: g10/keygen.c:795
 msgid "Real name: "
 msgstr "Echte naam: "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:803
 msgid "Invalid character in name\n"
 msgstr "Ongeldig teken in naam\n"
 
-#: g10/keygen.c:799
+#: g10/keygen.c:805
 msgid "Name may not start with a digit\n"
 msgstr "Naam mag niet beginnen met een cijfer\n"
 
-#: g10/keygen.c:801
+#: g10/keygen.c:807
 msgid "Name must be at least 5 characters long\n"
 msgstr "Naam moet ten minste 5 tekens lang zijn\n"
 
-#: g10/keygen.c:809
+#: g10/keygen.c:815
 msgid "Email address: "
 msgstr "Email Adres: "
 
-#: g10/keygen.c:820
+#: g10/keygen.c:826
 msgid "Not a valid email address\n"
 msgstr "Ongeldig email adres\n"
 
-#: g10/keygen.c:828
+#: g10/keygen.c:834
 msgid "Comment: "
 msgstr "Kommentaar: "
 
-#: g10/keygen.c:834
+#: g10/keygen.c:840
 msgid "Invalid character in comment\n"
 msgstr "Ongeldig teken in kommentaar\n"
 
-#: g10/keygen.c:857
+#: g10/keygen.c:863
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Je gebruik tekenverzameling `%s'.\n"
 
-#: g10/keygen.c:863
+#: g10/keygen.c:869
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1501,28 +1509,28 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:867
+#: g10/keygen.c:873
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:872
+#: g10/keygen.c:878
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoEe"
 
-#: g10/keygen.c:882
+#: g10/keygen.c:888
 #, 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:883
+#: g10/keygen.c:889
 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:902
+#: g10/keygen.c:908
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:940
+#: g10/keygen.c:946
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1530,11 +1538,11 @@
 "Je hebt een sleuteltekst nodig om je geheime sleutel te bewaken.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:948
+#: g10/keyedit.c:468 g10/keygen.c:954
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "sleuteltekst is niet goed herhaald; probeer het opnieuw.\n"
 
-#: g10/keygen.c:954
+#: g10/keygen.c:960
 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"
@@ -1546,7 +1554,7 @@
 "nog aanpassen, gebruik dit programma met de optie \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:975
+#: g10/keygen.c:981
 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"
@@ -1559,29 +1567,29 @@
 "dit geeft de generator een grotere kans om genoeg entropie te\n"
 "verzamelen.\n"
 
-#: g10/keygen.c:1424
+#: g10/keygen.c:1430
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA sleutelpaar zal 1024 bits lang zijn.\n"
 
-#: g10/keygen.c:1467
+#: g10/keygen.c:1473
 msgid "Key generation canceled.\n"
 msgstr "Sleutelgeneratie afgebroken.\n"
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1570
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "Openbaar certificaat wordt geschreven naar `%s'\n"
 
-#: g10/keygen.c:1565
+#: g10/keygen.c:1571
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "Geheim certificaat wordt weggeschreven naar `%s'\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1667
 msgid "public and secret key created and signed.\n"
 msgstr "openbare en geheime sleutels zijn gemaakt en getekend.\n"
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1672
 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"
@@ -1590,12 +1598,12 @@
 "U wilt misschien het commando \"--edit-key\" gebruiken om een tweede\n"
 "sleutel te maken hiervoor.\n"
 
-#: g10/keygen.c:1683 g10/keygen.c:1784
+#: g10/keygen.c:1689 g10/keygen.c:1790
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Sleutelgeneratie is mislukt: %s\n"
 
-#: g10/keygen.c:1727 g10/sig-check.c:318 g10/sign.c:112
+#: g10/keygen.c:1733 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"
@@ -1603,7 +1611,7 @@
 "Sleutel is %lu seconden in de toekomst gemaakt (tijdsverschuiving of\n"
 "klokprobleem)\n"
 
-#: g10/keygen.c:1729 g10/sig-check.c:320 g10/sign.c:114
+#: g10/keygen.c:1735 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"
@@ -1611,11 +1619,11 @@
 "sleutel is %lu seconden in de toekomst gemaakt (tijdsverschuiving of\n"
 "klokprobleem)\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1768
 msgid "Really create? "
 msgstr "Echt maken? "
 
-#: g10/encode.c:91 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/encode.c:91 g10/openfile.c:178 g10/openfile.c:288 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1626,17 +1634,17 @@
 msgid "error creating passphrase: %s\n"
 msgstr "fout tijdens aanmake sleuteltekst: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:319
+#: g10/encode.c:171 g10/encode.c:324
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: LET OP: leeg bestand\n"
 
-#: g10/encode.c:266
+#: g10/encode.c:271
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lezen uit `%s'\n"
 
-#: g10/encode.c:483
+#: g10/encode.c:492
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s versleuteld voor: %s\n"
@@ -1685,250 +1693,260 @@
 msgid "No user ID for key\n"
 msgstr "Geen gebruikersidentificatie voor sleutel\n"
 
-#: g10/getkey.c:1642 g10/getkey.c:1698
+#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "gebruik secundaire sleutel %08lx in plaats van de primaire %08lx\n"
 
-#: g10/getkey.c:2017
+#: g10/getkey.c:2050
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: gebruiker niet gevonden\n"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok van type %d wordt overgeslagen\n"
 
-#: g10/import.c:188 g10/trustdb.c:1740 g10/trustdb.c:1781
+#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu sleutels zijn tot nu toe behandeld\n"
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fout bij lezen `%s': %s\n"
 
-#: g10/import.c:203
+#: g10/import.c:204
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Totaal aantal behandeld: %lu\n"
 
-#: g10/import.c:205
+#: g10/import.c:206
+#, fuzzy, c-format
+msgid "      skipped new keys: %lu\n"
+msgstr "nieuwe subsleutels: %lu\n"
+
+#: g10/import.c:209
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          zonder identificatie: %lu\n"
 
-#: g10/import.c:207
+#: g10/import.c:211
 #, c-format
 msgid "              imported: %lu"
 msgstr "geďmporteerd: %lu"
 
-#: g10/import.c:213
+#: g10/import.c:217
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "onveranderd: %lu\n"
 
-#: g10/import.c:215
+#: g10/import.c:219
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "nieuwe gebruikers: %lu\n"
 
-#: g10/import.c:217
+#: g10/import.c:221
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "nieuwe subsleutels: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:223
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "nieuwe ondertekeningen: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:225
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "nieuwe sleutelterugtrekkingen: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:227
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "geheime sleutels gelezen: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:229
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "geheime sleutels geďmporteerd: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:231
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "onveranderde geheime sleutels: %lu\n"
 
-#: g10/import.c:386 g10/import.c:578
+#: g10/import.c:391 g10/import.c:590
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "sleutel %08lX: geen gebruikersidentificatie\n"
 
-#: g10/import.c:400
+#: g10/import.c:405
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "sleutel %08lX: geen geldige gebruikersidentificaties\n"
 
-#: g10/import.c:402
+#: g10/import.c:407
 msgid "this may be caused by a missing self-signature\n"
 msgstr ""
 "dit zou veroorzaakt kunnen worden door een ontbrekende zelf-ondertkening\n"
 
-#: g10/import.c:413 g10/import.c:645
+#: g10/import.c:418 g10/import.c:657
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "sleutel %08lX: openbare sleutel niet gevonden: %s\n"
 
-#: g10/import.c:419
+#: g10/import.c:423
+#, fuzzy, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n"
+
+#: g10/import.c:431
 msgid "no default public keyring\n"
 msgstr "geen standaard openbare sleutelbos\n"
 
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
+#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "schrijven naar `%s'\n"
 
-#: g10/import.c:426 g10/import.c:484 g10/import.c:593 g10/import.c:694
+#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "kan sleutelbos `%s' niet vergrendelen: %s\n"
 
-#: g10/import.c:429 g10/import.c:487 g10/import.c:596 g10/import.c:697
+#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fout bij schrijven van de sleutelbos `%s': %s\n"
 
-#: g10/import.c:434
+#: g10/import.c:446
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "sleutel %08lX: openbare sleutel geďmporteerd\n"
 
-#: g10/import.c:451
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "sleutel %08lX: komt niet overeen met onze kopie\n"
 
-#: g10/import.c:460 g10/import.c:653
+#: g10/import.c:472 g10/import.c:665
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "sleutel %08lX: kan originele sleutelblok niet vinden: %s\n"
 
-#: g10/import.c:466 g10/import.c:659
+#: g10/import.c:478 g10/import.c:671
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "sleutel %08lX: kan origineel sleutelblok niet lezen: %s\n"
 
-#: g10/import.c:493
+#: g10/import.c:505
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "sleutel %08lX: 1 nieuwe gebruiker\n"
 
-#: g10/import.c:496
+#: g10/import.c:508
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "sleutel %08lX: %d nieuwe gebruikers\n"
 
-#: g10/import.c:499
+#: g10/import.c:511
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "sleutel %08lX: 1 nieuwe ondertekening\n"
 
-#: g10/import.c:502
+#: g10/import.c:514
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "sleutel %08lX: %d nieuwe ondertekeningen\n"
 
-#: g10/import.c:505
+#: g10/import.c:517
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "sleutel %08lX: 1 nieuwe subsleutel\n"
 
-#: g10/import.c:508
+#: g10/import.c:520
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "sleutel %08lX: %d nieuwe subsleutels\n"
 
-#: g10/import.c:518
+#: g10/import.c:530
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "sleutel %08lX: niet veranderd\n"
 
-#: g10/import.c:601
+#: g10/import.c:613
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "sleutel %08lX: geheime sleutel geďmporteerd\n"
 
 #. we can't merge secret keys
-#: g10/import.c:605
+#: g10/import.c:617
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "sleutel %08lX: reeds aanwezig in de geheime sleutelbos\n"
 
-#: g10/import.c:610
+#: g10/import.c:622
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "sleutel %08lX: geheime sleutel niet gevonden: %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:651
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "sleutel %08lX: geen openbare sleutel - kan terugtrekkingscertificaat niet "
 "toepassen\n"
 
-#: g10/import.c:670
+#: g10/import.c:682
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "sleutel %08lX: ongeldig terugtrekkingscertificaat: %s - afgewezen\n"
 
-#: g10/import.c:702
+#: g10/import.c:714
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "sleutel %08lX: terugtrekkingscertificaat geďmporteerd\n"
 
-#: g10/import.c:744
+#: g10/import.c:756
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "sleutel %08lX: geen gebruikersidentificatie voor ondertekening\n"
 
-#: g10/import.c:751 g10/import.c:775
+#: g10/import.c:763 g10/import.c:787
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "sleutel %08lX: openbaar sleutel algoritme niet ondersteund\n"
 
-#: g10/import.c:752
+#: g10/import.c:764
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "sleutel %08lX: ongeldige eigen ondertekening\n"
 
-#: g10/import.c:767
+#: g10/import.c:779
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "sleutel %08lX: geen subsleutel voor sleutelbinding\n"
 
-#: g10/import.c:776
+#: g10/import.c:788
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "sleutel %08lX: ongeldige subsleutelbinding\n"
 
-#: g10/import.c:803
+#: g10/import.c:815
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr ""
 "sleutel %08lX: niet zelfondertekende gebruikersidentificatie geaccepteerd '"
 
-#: g10/import.c:832
+#: g10/import.c:844
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "sleutel %08lX: gebruikersidentificatie overgeslagen '"
 
-#: g10/import.c:855
+#: g10/import.c:867
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "sleutel %08lX: subsleutel overgeslagen\n"
@@ -1937,37 +1955,37 @@
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:880
+#: g10/import.c:892
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr ""
 "sleutel %08lX: niet exporteerbare ondertekening (klasse %02x) - "
 "overgeslagen\n"
 
-#: g10/import.c:889
+#: g10/import.c:901
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "sleutel %08lX: terugtrekkingscertificaat op de verkeerde plek - "
 "overgeslagen\n"
 
-#: g10/import.c:897
+#: g10/import.c:909
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "sleutel %08lX: ongeldig terugtrekkingscertificaat: %s - overgeslagen\n"
 
-#: g10/import.c:997
+#: g10/import.c:1009
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr ""
 "sleutel %08lX: dubbele gebruikersidentificatie gevonden - samengevoegd\n"
 
-#: g10/import.c:1048
+#: g10/import.c:1060
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "sleutel %08lX: terugtrekkingscertificaat toegevoegd\n"
 
-#: g10/import.c:1162 g10/import.c:1215
+#: g10/import.c:1174 g10/import.c:1227
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "sleutel %08lX: onze versie heeft geen zelfondertekening\n"
@@ -2547,8 +2565,18 @@
 msgid "no secret key\n"
 msgstr "geen geheime sleutel\n"
 
+#: g10/keylist.c:158
+#, fuzzy
+msgid "invalid"
+msgstr "ongeldige versleuteling"
+
+#: g10/keylist.c:178
+#, fuzzy
+msgid "revoked"
+msgstr "revkey"
+
 #. of subkey
-#: g10/keylist.c:318 g10/mainproc.c:742
+#: g10/keylist.c:400 g10/mainproc.c:760
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "Sleutel verloopt op %s\n"
@@ -2558,130 +2586,118 @@
 msgid "public key is %08lX\n"
 msgstr "openbare sleutel is %08lX\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:257
 msgid "public key encrypted data: good DEK\n"
 msgstr "gegevens versleuteld met een openbare sleutel: goede DEK\n"
 
-#: g10/mainproc.c:281
+#: g10/mainproc.c:299
 #, 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:291
+#: g10/mainproc.c:309
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "versleuteld met %s sleutel, nummer %08lX\n"
 
-#: g10/mainproc.c:297
+#: g10/mainproc.c:315
 msgid "no secret key for decryption available\n"
 msgstr "geheime sleutel voor ontsleuteling is niet beschikbaar\n"
 
-#: g10/mainproc.c:306
+#: g10/mainproc.c:324
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "openbare sleutel-ontsleuteling ging niet: %s\n"
 
-#: g10/mainproc.c:343
+#: g10/mainproc.c:361
 msgid "decryption okay\n"
 msgstr "ontsleutelen ging goed\n"
 
-#: g10/mainproc.c:348
+#: g10/mainproc.c:366
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "LET OP: het versleutelde bericht is veranderd!\n"
 
-#: g10/mainproc.c:353
+#: g10/mainproc.c:371
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "ontsleuteling mislukte: %s\n"
 
 # Dit kan wel Engels blijven.. toch?
-#: g10/mainproc.c:372
+#: g10/mainproc.c:390
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "LET OP: afzender vroeg om \"for-your-eyes-only\"\n"
 
-#: g10/mainproc.c:374
+#: g10/mainproc.c:392
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "originele bestandsnaam='%.*s'\n"
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:544
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "alleenstaande intrekking - gebruik \"gpg --import\" om uit te voeren\n"
 
-#: g10/mainproc.c:613 g10/mainproc.c:622
+#: g10/mainproc.c:631 g10/mainproc.c:640
 msgid "WARNING: invalid notation data found\n"
 msgstr "LET OP: ongeldige aantekeningen gevonden\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:643
 msgid "Notation: "
 msgstr "Aantekening: "
 
-#: g10/mainproc.c:632
+#: g10/mainproc.c:650
 msgid "Policy: "
 msgstr "Beleid: "
 
-#: g10/mainproc.c:1062
+#: g10/mainproc.c:1080
 msgid "signature verification suppressed\n"
 msgstr "controle van de ondertekening overgeslagen\n"
 
-#: g10/mainproc.c:1068
+#: g10/mainproc.c:1086
 #, 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:1094 g10/mainproc.c:1105
+#: g10/mainproc.c:1112 g10/mainproc.c:1123
 msgid "BAD signature from \""
 msgstr "FOUTE ondertekening van \""
 
-#: g10/mainproc.c:1095 g10/mainproc.c:1106
+#: g10/mainproc.c:1113 g10/mainproc.c:1124
 msgid "Good signature from \""
 msgstr "Correcte ondertekening van \""
 
-#: g10/mainproc.c:1097
+#: g10/mainproc.c:1115
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1153
+#: g10/mainproc.c:1171
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ondertekening niet controleren: %s\n"
 
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1235
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "losstaande ondertekening van type 0x%02x\n"
 
-#: g10/mainproc.c:1263
+#: g10/mainproc.c:1281
 msgid "old style (PGP 2.x) signature\n"
 msgstr "oude stijl (PGP 2.x) ondertekening\n"
 
-#: g10/mainproc.c:1268
+#: g10/mainproc.c:1286
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ongeldig hoofdpakket gevonden in proc_tree()\n"
 
-#: g10/misc.c:94
+#: g10/misc.c:96
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "kan geheugendumps niet uitzetten: %s\n"
 
-#: g10/misc.c:97
-msgid "WARNING: program may create a core file!\n"
-msgstr "LET OP: programma zou een geheugendump kunnen maken!\n"
-
-#: g10/misc.c:205
+#: g10/misc.c:206
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Experimentele algoritmes dienen niet gebruikt te worden!\n"
 
-#: g10/misc.c:219
-msgid ""
-"RSA keys are deprecated; please consider creating a new key and use this key "
-"in the future\n"
-msgstr ""
-"RSA sleutels zijn verouderd; overweeg a.u.b. het aanmaken van een\n"
-"nieuwe sleutel om in de toekomst te gebruiken\n"
-
-#: g10/misc.c:241
+#: g10/misc.c:233
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr "dit versleutelalgoritme is verouderd; gebruik een meer algemene!\n"
 
@@ -2690,7 +2706,7 @@
 msgid "can't handle public key algorithm %d\n"
 msgstr "kan openbare sleutel-algoritme %d niet behandelen\n"
 
-#: g10/parse-packet.c:965
+#: g10/parse-packet.c:986
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpakket type %d heeft kritische bit gezet\n"
@@ -2727,91 +2743,91 @@
 msgid "Repeat passphrase: "
 msgstr "Herhaal de sleuteltekst: "
 
-#: g10/plaintext.c:63
+#: g10/plaintext.c:67
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "gegevens niet bewaard; gebruik de optie \"--output\" om het op te slaan in\n"
 
-#: g10/plaintext.c:317
+#: g10/plaintext.c:324
 msgid "Detached signature.\n"
 msgstr "Losstaande ondertekening.\n"
 
-#: g10/plaintext.c:321
+#: g10/plaintext.c:328
 msgid "Please enter name of data file: "
 msgstr "Geef de naam van het gegevensbestand: "
 
-#: g10/plaintext.c:342
+#: g10/plaintext.c:349
 msgid "reading stdin ...\n"
 msgstr "lezen uit standaard invoer ...\n"
 
-#: g10/plaintext.c:385
+#: g10/plaintext.c:392
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "kan ondertekende gegevens `%s' niet openen\n"
 
-#: g10/pubkey-enc.c:79
+#: g10/pubkey-enc.c:76
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "anonieme ontvanger; ik probeer geheime sleutel %08lX ...\n"
 
-#: g10/pubkey-enc.c:85
+#: g10/pubkey-enc.c:82
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "okee, wij zijn de anonieme ontvanger.\n"
 
-#: g10/pubkey-enc.c:137
+#: g10/pubkey-enc.c:134
 msgid "old encoding of the DEK is not supported\n"
 msgstr "oude codering van de DEK wordt niet ondersteund.\n"
 
-#: g10/pubkey-enc.c:156
+#: g10/pubkey-enc.c:153
 #, fuzzy, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "beschermingsalgoritme %d wordt niet ondersteund\n"
 
-#: g10/pubkey-enc.c:195
+#: g10/pubkey-enc.c:192
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "LET OP: versleutelalgoritme %d niet gevonden in de voorkeuren\n"
 
-#: g10/pubkey-enc.c:201
+#: g10/pubkey-enc.c:198
 #, fuzzy, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "LET OP: sleutel voor ondertekening is vervallen op %s\n"
 
-#: g10/hkp.c:62
+#: g10/hkp.c:72
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
 msgstr "opvragen van sleutel %08lX van %s ...\n"
 
-#: g10/hkp.c:75
+#: g10/hkp.c:85
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "kan de sleutel niet opvragen van de server: %s\n"
 
-#: g10/hkp.c:98 g10/hkp.c:136
+#: g10/hkp.c:109 g10/hkp.c:148
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "geen sleutelserver bekend (gebruik de optie --keyserver)\n"
 
-#: g10/hkp.c:106
+#: g10/hkp.c:117
 #, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "%s: ongeldig sleutelnummer\n"
 
-#: g10/hkp.c:158
+#: g10/hkp.c:170
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan geen verbinding maken met `%s': %s\n"
 
-#: g10/hkp.c:182
+#: g10/hkp.c:194
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "fout bij versturen naar `%s': %s\n"
 
-#: g10/hkp.c:194
+#: g10/hkp.c:206
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "versturen naar `%s' gelukt (status=%u)\n"
 
-#: g10/hkp.c:197
+#: g10/hkp.c:209
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "fout bij versturen naar `%s': status=%u\n"
@@ -2826,43 +2842,43 @@
 msgid "protection algorithm %d is not supported\n"
 msgstr "beschermingsalgoritme %d wordt niet ondersteund\n"
 
-#: g10/seckey-cert.c:175
+#: g10/seckey-cert.c:184
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Foutieve sleuteltekst; probeer a.u.b. opnieuw ...\n"
 
-#: g10/seckey-cert.c:231
+#: g10/seckey-cert.c:240
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "LET OP: Kwetsbare sleutel gevonden - verander a.u.b. de sleuteltekst "
 "opnieuw.\n"
 
-#: g10/sig-check.c:202
+#: g10/sig-check.c:199
 msgid "assuming bad MDC due to an unknown critical bit\n"
 msgstr "foutieve MDC aangenomen wegens een onbekende kritische bit\n"
 
-#: g10/sig-check.c:300
+#: g10/sig-check.c:297
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "dit is een ElGamal sleutel van PGP, die NIET veilig is voor "
 "ondertekeningen!\n"
 
-#: g10/sig-check.c:308
+#: g10/sig-check.c:305
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "openbare sleutel is %lu seconde nieuwer dan de ondertekening\n"
 
-#: g10/sig-check.c:309
+#: g10/sig-check.c:306
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "openbare sleutel is %lu seconden nieuwer dan de ondertekening\n"
 
-#: g10/sig-check.c:327
+#: g10/sig-check.c:324
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "LET OP: sleutel voor ondertekening is vervallen op %s\n"
 
-#: g10/sig-check.c:396
+#: g10/sig-check.c:393
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "foutieve ondertekening aangenomen wegens een onbekende kritische bit\n"
 
@@ -2871,7 +2887,7 @@
 msgid "%s signature from: %s\n"
 msgstr "%s ondertekening van: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:606
+#: g10/sign.c:290 g10/sign.c:610
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "kan %s niet aanmaken: %s\n"
@@ -2920,7 +2936,7 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: map bestaat niet!\n"
 
-#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1363 g10/tdbio.c:444
+#: g10/openfile.c:226 g10/openfile.c:295 g10/ringedit.c:1369 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: kan hem niet aanmaken: %s\n"
@@ -3022,291 +3038,301 @@
 msgstr ""
 "de vertrouwensdatabase is beschadigd; draai a.u.b. \"gpg --fix-trustdb\".\n"
 
-#: g10/trustdb.c:168
+#: g10/trustdb.c:169
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "vertrouwensveld %lu, req type %d: lezen mislukte: %s\n"
 
-#: g10/trustdb.c:183
+#: g10/trustdb.c:184
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "vertrouwensveld %lu, type %d: schrijven mislukte: %s\n"
 
-#: g10/trustdb.c:197
+#: g10/trustdb.c:198
 #, c-format
 msgid "trust record %lu: delete failed: %s\n"
 msgstr "vertrouwensveld %lu: verwijderen mislukte: %s\n"
 
-#: g10/trustdb.c:211
+#: g10/trustdb.c:212
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "vertrouwensdatabase: synchronisatie mislukte: %s\n"
 
-#: g10/trustdb.c:376
+#: g10/trustdb.c:377
 #, c-format
 msgid "error reading dir record for LID %lu: %s\n"
 msgstr "fout tijdens lezen van indexveld voor LID %lu: %s\n"
 
-#: g10/trustdb.c:383
+#: g10/trustdb.c:384
 #, c-format
 msgid "lid %lu: expected dir record, got type %d\n"
 msgstr "lid %lu: verwachtte indexveld, kreeg type %d\n"
 
-#: g10/trustdb.c:388
+#: g10/trustdb.c:389
 #, c-format
 msgid "no primary key for LID %lu\n"
 msgstr "geen pimaire sleutel voor LID %lu\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:394
 #, c-format
 msgid "error reading primary key for LID %lu: %s\n"
 msgstr "fout tijdens het lezen van primaire sleutel voor LID %lu: %s\n"
 
-#: g10/trustdb.c:432
+#: g10/trustdb.c:433
 #, c-format
 msgid "get_dir_record: search_record failed: %s\n"
 msgstr "get_dir_record: search_record mislukte: %s\n"
 
-#: g10/trustdb.c:487
-#, c-format
-msgid "NOTE: secret key %08lX is NOT protected.\n"
-msgstr "LET OP: geheime sleutel %08lX is NIET beveiligd.\n"
-
-#: g10/trustdb.c:495
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr ""
-"sleutel %08lX: geheime sleutel zonder openbare sleutel - overgeslagen\n"
-
-#: g10/trustdb.c:502
-#, c-format
-msgid "key %08lX: secret and public key don't match\n"
-msgstr "sleutel %08lX: geheime en openbare sleutel horen niet bij elkaar\n"
+#: g10/trustdb.c:474
+#, fuzzy, c-format
+msgid "'%s' is not a valid long keyID\n"
+msgstr "%s: ongeldig sleutelnummer\n"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:501
 #, c-format
 msgid "key %08lX: can't put it into the trustdb\n"
 msgstr "sleutel %08lX: kan niet toevoegen aan de vertrouwensdatabase\n"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:507
 #, c-format
 msgid "key %08lX: query record failed\n"
 msgstr "sleutel %08lX: opvragen van veld mislukte\n"
 
-#: g10/trustdb.c:529
+#: g10/trustdb.c:516
 #, c-format
 msgid "key %08lX: already in trusted key table\n"
 msgstr "sleutel %08lX: reeds aanwezig in de betrouwbare sleutel-tabel\n"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:519
 #, c-format
 msgid "key %08lX: accepted as trusted key.\n"
 msgstr "sleutel %08lX: geaccepteerd als een betrouwbare sleutel.\n"
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:546
+#, fuzzy, c-format
+msgid "key %08lX: no public key for trusted key - skipped\n"
+msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n"
+
+#: g10/trustdb.c:565
+#, c-format
+msgid "NOTE: secret key %08lX is NOT protected.\n"
+msgstr "LET OP: geheime sleutel %08lX is NIET beveiligd.\n"
+
+#: g10/trustdb.c:577
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr ""
+"sleutel %08lX: geheime sleutel zonder openbare sleutel - overgeslagen\n"
+
+#: g10/trustdb.c:584
+#, c-format
+msgid "key %08lX: secret and public key don't match\n"
+msgstr "sleutel %08lX: geheime en openbare sleutel horen niet bij elkaar\n"
+
+#: g10/trustdb.c:597
 #, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr "nummeren van de geheime sleutels mislukte: %s\n"
 
-#: g10/trustdb.c:921
+#: g10/trustdb.c:987
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "sleutel %08lX.%lu: Goede subsleutelbinding\n"
 
-#: g10/trustdb.c:927 g10/trustdb.c:962
+#: g10/trustdb.c:993 g10/trustdb.c:1028
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "sleutel %08lX.%lu: Foutieve subsleutelbinding: %s\n"
 
-#: g10/trustdb.c:939
+#: g10/trustdb.c:1005
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "sleutel %08lX.%lu: Geldige sleutelterugtrekking\n"
 
-#: g10/trustdb.c:945
+#: g10/trustdb.c:1011
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "sleutel %08lX.%lu: Ongeldige sleutelterugtrekking: %s\n"
 
-#: g10/trustdb.c:956
+#: g10/trustdb.c:1022
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "sleutel %08lX.%lu: Geldige subsleutelterugtrekking\n"
 
-#: g10/trustdb.c:1067
+#: g10/trustdb.c:1133
 msgid "Good self-signature"
 msgstr "Correcte zelfondertekening"
 
-#: g10/trustdb.c:1077
+#: g10/trustdb.c:1143
 msgid "Invalid self-signature"
 msgstr "Ongeldige zelfondertekening"
 
 # User ID onvertaald
-#: g10/trustdb.c:1104
+#: g10/trustdb.c:1170
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 "Geldig terugtrekkingscertificaat overgeslagen wegens een nieuwere "
 "zelfondertekening"
 
-#: g10/trustdb.c:1110
+#: g10/trustdb.c:1176
 msgid "Valid user ID revocation"
 msgstr "Geldig terugtrekkingscertificaat voor gebruiker"
 
-#: g10/trustdb.c:1115
+#: g10/trustdb.c:1181
 msgid "Invalid user ID revocation"
 msgstr "Ongeldig terugtrekkingscertificaat voor gebruiker"
 
-#: g10/trustdb.c:1157
+#: g10/trustdb.c:1223
 msgid "Valid certificate revocation"
 msgstr "Geldige terugtrekking van certificaat"
 
-#: g10/trustdb.c:1158
+#: g10/trustdb.c:1224
 msgid "Good certificate"
 msgstr "Correct certificaat"
 
-#: g10/trustdb.c:1186
+#: g10/trustdb.c:1252
 msgid "Invalid certificate revocation"
 msgstr "Ongeldige terugtrekking van certificaat"
 
-#: g10/trustdb.c:1187
+#: g10/trustdb.c:1253
 msgid "Invalid certificate"
 msgstr "Ongeldig certificaat"
 
-#: g10/trustdb.c:1204 g10/trustdb.c:1208
+#: g10/trustdb.c:1270 g10/trustdb.c:1274
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "ondert. veld %lu[%d] wijst naar een verkeerd veld.\n"
 
-#: g10/trustdb.c:1267
+#: g10/trustdb.c:1333
 msgid "duplicated certificate - deleted"
 msgstr "dubbel certificaat - verwijderd"
 
-#: g10/trustdb.c:1584
+#: g10/trustdb.c:1650
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir mislukte: %s\n"
 
-#: g10/trustdb.c:1718
+#: g10/trustdb.c:1784
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: invoegen mislukte: %s\n"
 
-#: g10/trustdb.c:1723
+#: g10/trustdb.c:1789
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: invoegen mislukte: %s\n"
 
-#: g10/trustdb.c:1729
+#: g10/trustdb.c:1795
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: ingevoegd\n"
 
-#: g10/trustdb.c:1734
+#: g10/trustdb.c:1800
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "fout bij het lezen van indexveld: %s\n"
 
-#: g10/trustdb.c:1742 g10/trustdb.c:1805
+#: g10/trustdb.c:1808 g10/trustdb.c:1871
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu sleutels verwerkt\n"
 
-#: g10/trustdb.c:1744 g10/trustdb.c:1811
+#: g10/trustdb.c:1810 g10/trustdb.c:1877
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "        %lu sleutels met fouten\n"
 
-#: g10/trustdb.c:1746
+#: g10/trustdb.c:1812
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "        %lu sleutels ingevoegd\n"
 
-#: g10/trustdb.c:1749
+#: g10/trustdb.c:1815
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "nummeren van de sleutelblokken mislukte: %s\n"
 
-#: g10/trustdb.c:1797
+#: g10/trustdb.c:1863
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: indexveld zonder sleutel - overgeslagen\n"
 
-#: g10/trustdb.c:1807
+#: g10/trustdb.c:1873
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "        %lu vanwege nieuwe openbare sleutels\n"
 
-#: g10/trustdb.c:1809
+#: g10/trustdb.c:1875
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "        %lu sleutels overgeslagen\n"
 
-#: g10/trustdb.c:1813
+#: g10/trustdb.c:1879
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "        %lu sleutels bijgewerkt\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2224
 msgid "Ooops, no keys\n"
 msgstr "Ooeeps, geen sleutels\n"
 
-#: g10/trustdb.c:2162
+#: g10/trustdb.c:2228
 msgid "Ooops, no user IDs\n"
 msgstr "Ooeeps, geen gebruikersidentificaties\n"
 
-#: g10/trustdb.c:2320
+#: g10/trustdb.c:2386
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: zoeken naar indexveld mislukte: %s\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2395
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "sleutel %08lX: invoegen van vertrouwensveld mislukte: %s\n"
 
-#: g10/trustdb.c:2333
+#: g10/trustdb.c:2399
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "sleutel %08lX.%lu: ingevoegd in de vertrouwensdatabase\n"
 
-#: g10/trustdb.c:2341
+#: g10/trustdb.c:2407
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "sleutel %08lX.%lu: aangemaakt in de toekomst (tijdsverschuiving of "
 "klokprobleem)\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2422
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "sleutel %08lX.%lu: vervallen op %s\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2430
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "sleutel %08lX.%lu: betrouwbaarheidscontrole mislukt: %s\n"
 
-#: g10/trustdb.c:2515
+#: g10/trustdb.c:2581
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "gebruiker `%s' niet gevonden: %s\n"
 
-#: g10/trustdb.c:2517
+#: g10/trustdb.c:2583
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "kon `%s' niet opzoeken in de vertrouwensdatabase: %s\n"
 
-#: g10/trustdb.c:2520
+#: g10/trustdb.c:2586
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "gebruiker '%s' komt niet voor in de vertrouwensdatabase - invoegen\n"
 
-#: g10/trustdb.c:2523
+#: g10/trustdb.c:2589
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "kon '%s' niet invoegen in de vertrouwensdatabase: %s\n"
 
-#: g10/trustdb.c:2709 g10/trustdb.c:2739
+#: g10/trustdb.c:2775 g10/trustdb.c:2805
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "LET OP: kan nog geen lange voorkeursblokken verwerken\n"
 
@@ -3330,26 +3356,26 @@
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: kan sleutelbos niet aanmaken: %s\n"
 
-#: g10/ringedit.c:319 g10/ringedit.c:1368
+#: g10/ringedit.c:319 g10/ringedit.c:1374
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: sleutelbos aangemaakt\n"
 
-#: g10/ringedit.c:1545
+#: g10/ringedit.c:1551
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "LET OP: er zijn 2 bestanden met vertrouwelijke informatie.\n"
 
-#: g10/ringedit.c:1546
+#: g10/ringedit.c:1552
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s is de onveranderde\n"
 
-#: g10/ringedit.c:1547
+#: g10/ringedit.c:1553
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s is de nieuwe\n"
 
-#: g10/ringedit.c:1548
+#: g10/ringedit.c:1554
 msgid "Please fix this possible security flaw\n"
 msgstr "Dicht dit mogelijke beveiligingsgat\n"
 
@@ -3374,49 +3400,49 @@
 "niet veilig genoeg voor ondertekeningen!\n"
 
 #. do not overwrite
-#: g10/openfile.c:79
+#: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Bestand `%s' bestaat al. "
 
-#: g10/openfile.c:81
+#: g10/openfile.c:86
 msgid "Overwrite (y/N)? "
 msgstr "Overschrijven (j/N)? "
 
-#: g10/openfile.c:109
+#: g10/openfile.c:119
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: onbekend achtervoegsel\n"
 
-#: g10/openfile.c:131
+#: g10/openfile.c:141
 msgid "Enter new filename"
 msgstr "Geef een nieuwe bestandsnaam"
 
-#: g10/openfile.c:172
+#: g10/openfile.c:182
 msgid "writing to stdout\n"
 msgstr "naar standaard uitvoer schrijven\n"
 
-#: g10/openfile.c:250
+#: g10/openfile.c:261
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "ik neem aan dat de getekende gegevens zich in `%s' bevinden\n"
 
-#: g10/openfile.c:300
+#: g10/openfile.c:311
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: nieuw optiebestand aangemaakt\n"
 
-#: g10/openfile.c:313
+#: g10/openfile.c:338
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: kan map niet aamaken: %s\n"
 
-#: g10/openfile.c:316
+#: g10/openfile.c:341
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: map aangemaakt\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:343
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr ""
 "u moet GnuPG opnieuw starten, zodat het het nieuwe optiebestand kan inlezen\n"
@@ -3719,6 +3745,13 @@
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Geen hulp beschikbaar voor `%s'"
+
+#~ msgid ""
+#~ "RSA keys are deprecated; please consider creating a new key and use this key "
+#~ "in the future\n"
+#~ msgstr ""
+#~ "RSA sleutels zijn verouderd; overweeg a.u.b. het aanmaken van een\n"
+#~ "nieuwe sleutel om in de toekomst te gebruiken\n"
 
 #~ msgid "set debugging flags"
 #~ msgstr "zet afluistervlaggen"
diff -urN gnupg-1.0.2/po/pl.po gnupg-1.0.3/po/pl.po
--- gnupg-1.0.2/po/pl.po	Wed Jul 12 14:59:44 2000
+++ gnupg-1.0.3/po/pl.po	Mon Sep 18 12:18:06 2000
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-07-12 12:13+0200\n"
+"POT-Creation-Date: 2000-09-18 12:17+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"
@@ -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:127 g10/keygen.c:1249
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1255
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nie można otworzyć %s: %s\n"
@@ -317,13 +317,13 @@
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:647
+#: cipher/random.c:650
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "OSTRZEŻENIE: używany generator liczb losowych\n"
 "nie jest kryptograficznie bezpieczny!!\n"
 
-#: cipher/random.c:648
+#: cipher/random.c:651
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -337,7 +337,7 @@
 "JAKIEKOLWIEK DANE GENEROWANE PRZEZ TEN PROGRAM NIE NADAJˇ SIĘ DO \n"
 "NORMALNEGO UŻYTKU I NIE ZAPEWNIAJˇ BEZPIECZEŃSTWA!!\n"
 
-#: cipher/rndlinux.c:141
+#: cipher/rndlinux.c:142
 #, c-format
 msgid ""
 "\n"
@@ -349,7 +349,7 @@
 "Proszę kontynuować inne działania aby system mógł zebrać odpowiedni±\n"
 "ilo¶ć entropii do ich wygenerowania (brakuje %d bajtów).\n"
 
-#: g10/g10.c:197
+#: g10/g10.c:206
 msgid ""
 "@Commands:\n"
 " "
@@ -357,139 +357,139 @@
 "@Polecenia:\n"
 " "
 
-#: g10/g10.c:199
+#: g10/g10.c:208
 msgid "|[file]|make a signature"
 msgstr "|[plik]|złożenie podpisu"
 
-#: g10/g10.c:200
+#: g10/g10.c:209
 msgid "|[file]|make a clear text signature"
 msgstr "|[plik]|złożenie podpisu na czytelnym dokumencie"
 
-#: g10/g10.c:201
+#: g10/g10.c:210
 msgid "make a detached signature"
 msgstr "sporz±dzenie podpisu oddzielonego od dokumentu"
 
-#: g10/g10.c:202
+#: g10/g10.c:211
 msgid "encrypt data"
 msgstr "szyfrowanie danych"
 
-#: g10/g10.c:203
+#: g10/g10.c:212
 msgid "encryption only with symmetric cipher"
 msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
-#: g10/g10.c:204
+#: g10/g10.c:213
 msgid "store only"
 msgstr "tylko zapis do pliku"
 
-#: g10/g10.c:205
+#: g10/g10.c:214
 msgid "decrypt data (default)"
 msgstr "odszyfrowywanie danych (domy¶lnie)"
 
-#: g10/g10.c:206
+#: g10/g10.c:215
 msgid "verify a signature"
 msgstr "sprawdzenie podpisu"
 
-#: g10/g10.c:208
+#: g10/g10.c:217
 msgid "list keys"
 msgstr "lista kluczy"
 
-#: g10/g10.c:210
+#: g10/g10.c:219
 msgid "list keys and signatures"
 msgstr "lista kluczy i podpisów"
 
-#: g10/g10.c:211
+#: g10/g10.c:220
 msgid "check key signatures"
 msgstr "sprawdzenie podpisów kluczy"
 
-#: g10/g10.c:212
+#: g10/g10.c:221
 msgid "list keys and fingerprints"
 msgstr "lista kluczy i ich odcisków"
 
-#: g10/g10.c:213
+#: g10/g10.c:222
 msgid "list secret keys"
 msgstr "lista kluczy tajnych"
 
-#: g10/g10.c:214
+#: g10/g10.c:223
 msgid "generate a new key pair"
 msgstr "generacja nowej pary klucza"
 
-#: g10/g10.c:215
+#: g10/g10.c:224
 msgid "remove key from the public keyring"
 msgstr "usunięcie klucza ze zbioru kluczy publicznych"
 
-#: g10/g10.c:217
+#: g10/g10.c:226
 msgid "remove key from the secret keyring"
 msgstr "usunięcie klucza ze zbioru kluczy tajnych"
 
-#: g10/g10.c:218
+#: g10/g10.c:227
 msgid "sign a key"
 msgstr "złożenie podpisu na kluczu"
 
-#: g10/g10.c:219
+#: g10/g10.c:228
 msgid "sign a key locally"
 msgstr "złożenie lokalnego podpisu na kluczu"
 
-#: g10/g10.c:220
+#: g10/g10.c:229
 msgid "sign or edit a key"
 msgstr "podpisanie lub modyfikacja klucza"
 
-#: g10/g10.c:221
+#: g10/g10.c:230
 msgid "generate a revocation certificate"
 msgstr "tworzenie certyfikatu unieważnienia klucza"
 
-#: g10/g10.c:222
+#: g10/g10.c:231
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/g10.c:223
+#: g10/g10.c:232
 msgid "export keys to a key server"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/g10.c:224
+#: g10/g10.c:233
 msgid "import keys from a key server"
 msgstr "import kluczy z serwera kluczy"
 
-#: g10/g10.c:228
+#: g10/g10.c:237
 msgid "import/merge keys"
 msgstr "import/doł±czanie kluczy"
 
-#: g10/g10.c:230
+#: g10/g10.c:239
 msgid "list only the sequence of packets"
 msgstr "wypisane sekwencji pakietów"
 
-#: g10/g10.c:232
+#: g10/g10.c:241
 msgid "export the ownertrust values"
 msgstr "eksport warto¶ci zaufania"
 
-#: g10/g10.c:234
+#: g10/g10.c:243
 msgid "import ownertrust values"
 msgstr "wczytanie warto¶ći zaufania"
 
-#: g10/g10.c:236
+#: g10/g10.c:245
 msgid "update the trust database"
 msgstr "uaktualnienie bazy zaufania"
 
-#: g10/g10.c:238
+#: g10/g10.c:247
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAZWY]|sprawdzenie bazy zaufania"
 
-#: g10/g10.c:239
+#: g10/g10.c:248
 msgid "fix a corrupted trust database"
 msgstr "naprawa uszkodzonej bazy zaufania"
 
-#: g10/g10.c:240
+#: g10/g10.c:249
 msgid "De-Armor a file or stdin"
 msgstr "zdjęcie opakowania ASCII pliku lub potoku"
 
-#: g10/g10.c:242
+#: g10/g10.c:251
 msgid "En-Armor a file or stdin"
 msgstr "opakowanie ASCII pliku lub potoku"
 
-#: g10/g10.c:244
+#: g10/g10.c:253
 msgid "|algo [files]|print message digests"
 msgstr "|algo [pliki]|skróty wiadomo¶ci"
 
-#: g10/g10.c:248
+#: g10/g10.c:257
 msgid ""
 "@\n"
 "Options:\n"
@@ -499,154 +499,158 @@
 "Opcje:\n"
 " "
 
-#: g10/g10.c:250
+#: g10/g10.c:259
 msgid "create ascii armored output"
 msgstr "plik wynikowy będzie w opakowaniu ASCII"
 
-#: g10/g10.c:252
+#: g10/g10.c:261
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAZWA|szyfrowanie dla adresata NAZWA"
 
-#: g10/g10.c:255
+#: g10/g10.c:264
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAZWA|użycie NAZWA jako domy¶lnego adresata"
 
-#: g10/g10.c:257
+#: g10/g10.c:266
 msgid "use the default key as default recipient"
 msgstr "domy¶lny klucz jest domy¶lnym adresatem"
 
-#: g10/g10.c:261
+#: g10/g10.c:270
 msgid "use this user-id to sign or decrypt"
 msgstr "identyfikator do podpisania lub odszyfrowania"
 
-#: g10/g10.c:262
+#: g10/g10.c:271
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|poziom kompresji N (0 - brak)"
 
-#: g10/g10.c:264
+#: g10/g10.c:273
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/g10.c:265
+#: g10/g10.c:274
 msgid "use as output file"
 msgstr "plik wyj¶ciowy"
 
-#: g10/g10.c:266
+#: g10/g10.c:275
 msgid "verbose"
 msgstr "z informacjami dodatkowymi"
 
-#: g10/g10.c:267
+#: g10/g10.c:276
 msgid "be somewhat more quiet"
 msgstr "mniej komunikatóww"
 
-#: g10/g10.c:268
+#: g10/g10.c:277
 msgid "don't use the terminal at all"
 msgstr "bez odwołań do terminala"
 
-#: g10/g10.c:269
+#: g10/g10.c:278
 msgid "force v3 signatures"
 msgstr "wymuszenie trzeciej wersji formatu podpisów"
 
-#: g10/g10.c:270
+#: g10/g10.c:279
 msgid "always use a MDC for encryption"
 msgstr "do szyfrowania będzie używany MDC"
 
-#: g10/g10.c:271
+#: g10/g10.c:280
 msgid "do not make any changes"
 msgstr "pozostawienie bez zmian"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:273
+#: g10/g10.c:282
 msgid "batch mode: never ask"
 msgstr "tryb wsadowy: żadnych pytań"
 
-#: g10/g10.c:274
+#: g10/g10.c:283
 msgid "assume yes on most questions"
 msgstr "automatyczna odpowiedĽ tak na większo¶ć pytań"
 
-#: g10/g10.c:275
+#: g10/g10.c:284
 msgid "assume no on most questions"
 msgstr "automatyczna odpowiedĽ nie na większo¶ć pytań"
 
-#: g10/g10.c:276
+#: g10/g10.c:285
 msgid "add this keyring to the list of keyrings"
 msgstr "dodać zbiór kluczy do listy używanych"
 
-#: g10/g10.c:277
+#: g10/g10.c:286
 msgid "add this secret keyring to the list"
 msgstr "dodać zbiór kluczy tajnych do listy"
 
-#: g10/g10.c:278
+#: g10/g10.c:287
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAZWA|użycie NAZWA jako domy¶lnego klucza tajnego"
 
-#: g10/g10.c:279
+#: g10/g10.c:288
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|serwer kluczy w którym będ± poszukiwane"
 
-#: g10/g10.c:280
+#: g10/g10.c:289
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAZWA|zestaw znaków terminala NAZWA"
 
-#: g10/g10.c:281
+#: g10/g10.c:290
 msgid "read options from file"
 msgstr "wczytanie opcji z pliku"
 
-#: g10/g10.c:285
+#: g10/g10.c:294
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapisać opis stanu do FD"
 
-#: g10/g10.c:290
+#: g10/g10.c:299
+msgid "|KEYID|ulimately trust this key"
+msgstr "|KLUCZ|całkowite zaufanie dla tego klucza"
+
+#: g10/g10.c:300
 msgid "|FILE|load extension module FILE"
 msgstr "|PLIK|ładowanie modułu rozszerzenia z PLIK"
 
-#: g10/g10.c:291
+#: g10/g10.c:301
 msgid "emulate the mode described in RFC1991"
 msgstr "emulacja trybu opisanego w RFC1991"
 
-#: g10/g10.c:292
+#: g10/g10.c:302
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "zgodno¶ć ustawień pakietów, szyfrów i skrótów z OpenPGP"
 
-#: g10/g10.c:293
+#: g10/g10.c:303
 msgid "|N|use passphrase mode N"
 msgstr "|N|N-ty tryb wprowadzania wyrażenia przej¶ciowego"
 
-#: g10/g10.c:295
+#: g10/g10.c:305
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|ALG|algorytm obliczania skrótów wiadomo¶ci ALG"
 
-#: g10/g10.c:297
+#: g10/g10.c:307
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|ALG|algorytmu szyfruj±cy ALG dla hasła"
 
-#: g10/g10.c:298
+#: g10/g10.c:308
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAZWA|algorytm szyfruj±cy NAZWA"
 
-#: g10/g10.c:299
+#: g10/g10.c:309
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAZWA|algorytm obliczania skrótów wiadomo¶ci NAZWA"
 
-#: g10/g10.c:300
+#: g10/g10.c:310
 msgid "|N|use compress algorithm N"
 msgstr "|N|algorytm kompresji N"
 
-#: g10/g10.c:301
+#: g10/g10.c:311
 msgid "throw keyid field of encrypted packets"
 msgstr "usunięcie identyfikatorów kluczy z pakietów"
 
-#: g10/g10.c:302
+#: g10/g10.c:312
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAZWA=TRE¦Ć|adnotacje"
 
-#: g10/g10.c:305
+#: g10/g10.c:315
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:308
+#: g10/g10.c:318
 msgid ""
 "@\n"
 "Examples:\n"
@@ -667,15 +671,15 @@
 " --list-keys [nazwy]        pokazuje klucze\n"
 " --fingerprint [nazwy]      pokazuje odciski kluczy\n"
 
-#: g10/g10.c:403
+#: g10/g10.c:418
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Błędy prosimy zgłaszać na adres <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:407
+#: g10/g10.c:422
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Wywołanie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/g10.c:410
+#: g10/g10.c:425
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -685,7 +689,7 @@
 "podpisywanie, sprawdzanie podpisów, szyfrowanie, deszyfrowanie\n"
 "domy¶lnie wykonywana operacja zależy od danych wej¶ciowych\n"
 
-#: g10/g10.c:417
+#: g10/g10.c:432
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -693,182 +697,186 @@
 "\n"
 "Obsługiwane algorytmy:\n"
 
-#: g10/g10.c:496
+#: g10/g10.c:511
 msgid "usage: gpg [options] "
 msgstr "wywołanie: gpg [opcje]"
 
-#: g10/g10.c:549
+#: g10/g10.c:564
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/g10.c:692
+#: g10/g10.c:704
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy¶lnego pliku opcji '%s'\n"
 
-#: g10/g10.c:696
+#: g10/g10.c:708
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji '%s': %s\n"
 
-#: g10/g10.c:703
+#: g10/g10.c:715
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z '%s'\n"
 
-#: g10/g10.c:893
+#: g10/g10.c:905
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s nie jest poprawn± nazw± zestawu znaków\n"
 
-#: g10/g10.c:949 g10/g10.c:958
+#: g10/g10.c:970
+msgid "WARNING: program may create a core file!\n"
+msgstr "OSTRZEŻENIE: program może stworzyć plik zrzutu pamięci!\n"
+
+#: g10/g10.c:974 g10/g10.c:983
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "UWAGA: %s nie jest do normalnego użytku!\n"
 
-#: g10/g10.c:951
+#: g10/g10.c:976
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s jest niedozwolony z %s!\n"
 
-#: g10/g10.c:954
+#: g10/g10.c:979
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu z %s!\n"
 
-#: g10/g10.c:973 g10/g10.c:985
+#: g10/g10.c:998 g10/g10.c:1010
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj±cy jest niepoprawny\n"
 
-#: g10/g10.c:979 g10/g10.c:991
+#: g10/g10.c:1004 g10/g10.c:1016
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm geenracji skrótów wiadomo¶ci jest niepoprawny\n"
 
-#: g10/g10.c:995
+#: g10/g10.c:1020
 msgid "the given policy URL is invalid\n"
 msgstr "podany URL regulaminu jest niepoprawny\n"
 
-#: g10/g10.c:998
+#: g10/g10.c:1023
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "ustawienie algortytmu kompresji musi pochodzić z zakresu %d..%d\n"
 
-#: g10/g10.c:1000
+#: g10/g10.c:1025
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto¶ć completes-needed musi być większa od 0\n"
 
-#: g10/g10.c:1002
+#: g10/g10.c:1027
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto¶ć marginals-needed musi być większa od 1\n"
 
-#: g10/g10.c:1004
+#: g10/g10.c:1029
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "warto¶ć max-cert-depth musi mie¶cić się w zakresie od 1 do 255\n"
 
-#: g10/g10.c:1007
+#: g10/g10.c:1032
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/g10.c:1011
+#: g10/g10.c:1036
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "niepoprawny tryb S2K; musi mieć warto¶ć 0, 1 lub 3\n"
 
-#: g10/g10.c:1096
+#: g10/g10.c:1121
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiodło się: %s\n"
 
-#: g10/g10.c:1102
+#: g10/g10.c:1127
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/g10.c:1109
+#: g10/g10.c:1134
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/g10.c:1117
+#: g10/g10.c:1142
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/g10.c:1130
+#: g10/g10.c:1155
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/g10.c:1143
+#: g10/g10.c:1168
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/g10.c:1157
+#: g10/g10.c:1182
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]"
 
-#: g10/g10.c:1174
+#: g10/g10.c:1199
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1207
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa użytkownika"
 
-#: g10/g10.c:1190
+#: g10/g10.c:1215
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa użytkownika"
 
-#: g10/g10.c:1198
+#: g10/g10.c:1223
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa użytkownika [polecenia]"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1239
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key nazwa użytkownika"
 
-#: g10/g10.c:1217
+#: g10/g10.c:1242
 msgid "--delete-key user-id"
 msgstr "--delete-key nazwa użytkownika"
 
-#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393
+#: g10/encode.c:265 g10/g10.c:1279 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "nie można otworzyć %s: %s\n"
 
-#: g10/g10.c:1269
+#: g10/g10.c:1294
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [identyfikator] [zbiór kluczy]"
 
-#: g10/g10.c:1335
+#: g10/g10.c:1360
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "usunięcie opakowania ASCII nie powiodło się: %s\n"
 
-#: g10/g10.c:1343
+#: g10/g10.c:1368
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiodło się: %s\n"
 
-#: g10/g10.c:1411
+#: g10/g10.c:1439
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niewła¶ciwy algorytm skrótu '%s'\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1520
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/g10.c:1496
+#: g10/g10.c:1524
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj± wiadomo¶ć ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1499 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1527 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nie można otworzyć '%s'\n"
 
-#: g10/g10.c:1669
+#: g10/g10.c:1700
 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:1675
+#: g10/g10.c:1706
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -876,11 +884,11 @@
 "nazwa adnotacji może zawierać tylko litery, cyfry, kropki,\n"
 "podkre¶lenia, i musi kończyć się '='\n"
 
-#: g10/g10.c:1681
+#: g10/g10.c:1712
 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:1689
+#: g10/g10.c:1720
 msgid "a notation value must not use any control characters\n"
 msgstr "warto¶ć adnotacji nie może zawierać znaków steruj±cych\n"
 
@@ -1264,58 +1272,58 @@
 msgid "writing key binding signature\n"
 msgstr "zapis podpisu wi±ż±cego klucz\n"
 
-#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:433
+#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:435
 #, 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:438
+#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:440
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "zaokr±glono do %u bitów\n"
 
-#: g10/keygen.c:537
+#: g10/keygen.c:539
 msgid "Please select what kind of key you want:\n"
 msgstr "Proszę wybrać rodzaj klucza:\n"
 
-#: g10/keygen.c:539
+#: g10/keygen.c:541
 #, 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:540
+#: g10/keygen.c:542
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (tylko do podpisywania)\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:544
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) Klucz dla algorytmu ElGamala (tylko do szyfrowanie)\n"
 
-#: g10/keygen.c:543
+#: g10/keygen.c:545
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) Klucz dla algorytmu ElGamala (do szyfrowania i podpisywania)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:547
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) Klucz dla algorytmu ElGamala (do szyfrowania i podpisywania)\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:551
 msgid "Your selection? "
 msgstr "Twój wybór? "
 
-#: g10/keygen.c:560 g10/keygen.c:568
+#: g10/keygen.c:562 g10/keygen.c:570
 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:582
+#: g10/keygen.c:584
 msgid "Invalid selection.\n"
 msgstr "Niewła¶ciwy wybór.\n"
 
-#: g10/keygen.c:594
+#: g10/keygen.c:596
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1328,19 +1336,19 @@
 "               domy¶lny rozmiar klucza wynosi 1024 bity\n"
 "  największy sugerowany rozmiar klucza wynosi 2048 bitów\n"
 
-#: g10/keygen.c:601
+#: g10/keygen.c:603
 msgid "What keysize do you want? (1024) "
 msgstr "Jakiej długo¶ci klucz wygenerować? (1024) "
 
-#: g10/keygen.c:606
+#: g10/keygen.c:608
 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:608
+#: g10/keygen.c:610
 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:610
+#: g10/keygen.c:612
 #, 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"
@@ -1353,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:621
+#: g10/keygen.c:623
 #, 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:626
+#: g10/keygen.c:628
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1366,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:629
+#: g10/keygen.c:631
 msgid "Are you sure that you want this keysize? "
 msgstr "Na pewno wygenerować klucz takiej długo¶ci? "
 
-#: g10/keygen.c:630
+#: g10/keygen.c:632
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1378,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:638
+#: g10/keygen.c:640
 msgid "Do you really need such a large keysize? "
 msgstr "Czy naprawdę potrzebujesz takiego długiego klucza? "
 
-#: g10/keygen.c:644
+#: g10/keygen.c:646
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Ż±dana długo¶ć klucza to %u bity.\n"
 
-#: g10/keygen.c:647 g10/keygen.c:651
+#: g10/keygen.c:649 g10/keygen.c:653
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokr±glono do %u bitów\n"
 
-#: g10/keygen.c:699
+#: g10/keygen.c:701
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1408,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:714
+#: g10/keygen.c:716
 msgid "Key is valid for? (0) "
 msgstr "Okres ważno¶ci klucza ? (0) "
 
-#: g10/keygen.c:719
+#: g10/keygen.c:721
 msgid "invalid value\n"
 msgstr "niepoprawna warto¶ć\n"
 
-#: g10/keygen.c:724
+#: g10/keygen.c:726
 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:730
+#: g10/keygen.c:732
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Data ważno¶ci klucza: %s\n"
 
-#: g10/keygen.c:733
+#: g10/keygen.c:735
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1434,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:738
+#: g10/keygen.c:740
 msgid "Is this correct (y/n)? "
 msgstr "Dane poprawne (t/n)? "
 
-#: g10/keygen.c:781
+#: g10/keygen.c:783
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1454,44 +1462,44 @@
 "    \"Tadeusz Żeleński (Boy) <tzb@provider.com.pl>\"\n"
 "\n"
 
-#: g10/keygen.c:793
+#: g10/keygen.c:795
 msgid "Real name: "
 msgstr "Imię i nazwisko: "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:803
 msgid "Invalid character in name\n"
 msgstr "Niewła¶ciwy znak w imieniu lub nazwisku\n"
 
-#: g10/keygen.c:799
+#: g10/keygen.c:805
 msgid "Name may not start with a digit\n"
 msgstr "Imię lub nazwisko nie może zaczynać się od cyfry\n"
 
-#: g10/keygen.c:801
+#: g10/keygen.c:807
 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:809
+#: g10/keygen.c:815
 msgid "Email address: "
 msgstr "Adres poczty elektronicznej: "
 
-#: g10/keygen.c:820
+#: g10/keygen.c:826
 msgid "Not a valid email address\n"
 msgstr "to nie jest poprawny adres poczty elektronicznej\n"
 
-#: g10/keygen.c:828
+#: g10/keygen.c:834
 msgid "Comment: "
 msgstr "Komentarz: "
 
-#: g10/keygen.c:834
+#: g10/keygen.c:840
 msgid "Invalid character in comment\n"
 msgstr "Niewła¶ciwy znak w komentarzu\n"
 
-#: g10/keygen.c:857
+#: g10/keygen.c:863
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Używasz zestawu znaków %s.\n"
 
-#: g10/keygen.c:863
+#: g10/keygen.c:869
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1502,46 +1510,46 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:867
+#: g10/keygen.c:873
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:872
+#: g10/keygen.c:878
 msgid "NnCcEeOoQq"
 msgstr "IiKkEeDdWw"
 
-#: g10/keygen.c:882
+#: g10/keygen.c:888
 #, 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:883
+#: g10/keygen.c:889
 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:902
+#: g10/keygen.c:908
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:940
+#: g10/keygen.c:946
 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:948
+#: g10/keyedit.c:468 g10/keygen.c:954
 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:954
+#: g10/keygen.c:960
 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"
@@ -1553,7 +1561,7 @@
 "i opcji \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:975
+#: g10/keygen.c:981
 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 +1575,29 @@
 "generator liczb losowych ma możliwo¶ć zebrania odpowiedniej ilo¶ci entropii. "
 "\n"
 
-#: g10/keygen.c:1424
+#: g10/keygen.c:1430
 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:1467
+#: g10/keygen.c:1473
 msgid "Key generation canceled.\n"
 msgstr "Procedura generacji klucza została anulowana.\n"
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1570
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapis certyfikatu publicznego w '%s'\n"
 
-#: g10/keygen.c:1565
+#: g10/keygen.c:1571
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapis tajnego certyfikatu w '%s'\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1667
 msgid "public and secret key created and signed.\n"
 msgstr "klucze publiczny i tajny zostały stworzone i podpisane.\n"
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1672
 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"
@@ -1597,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:1683 g10/keygen.c:1784
+#: g10/keygen.c:1689 g10/keygen.c:1790
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generacja klucza nie powiodła się: %s\n"
 
-#: g10/keygen.c:1727 g10/sig-check.c:318 g10/sign.c:112
+#: g10/keygen.c:1733 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"
@@ -1610,7 +1618,7 @@
 "klucz został stworzony %lu sekund w przyszło¶ci (zaburzenia\n"
 "czasoprzestrzeni, lub Ľle ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:1729 g10/sig-check.c:320 g10/sign.c:114
+#: g10/keygen.c:1735 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"
@@ -1618,11 +1626,11 @@
 "klucz został stworzony %lu sekund w przyszło¶ci (zaburzenia\n"
 "czasoprzestrzeni, lub Ľle ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1768
 msgid "Really create? "
 msgstr "Na pewno generować? "
 
-#: g10/encode.c:91 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/encode.c:91 g10/openfile.c:178 g10/openfile.c:288 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1633,17 +1641,17 @@
 msgid "error creating passphrase: %s\n"
 msgstr "bł±d podczs tworzenia wyrażenia przej¶ciowego (hasła): %s\n"
 
-#: g10/encode.c:171 g10/encode.c:319
+#: g10/encode.c:171 g10/encode.c:324
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: OSTRZEŻENIE: plik jest pusty\n"
 
-#: g10/encode.c:266
+#: g10/encode.c:271
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "odczyt z '%s'\n"
 
-#: g10/encode.c:483
+#: g10/encode.c:492
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s zaszyfrowany dla: %s\n"
@@ -1692,251 +1700,261 @@
 msgid "No user ID for key\n"
 msgstr "Brak identyfikatora użytkownika dla klucza.\n"
 
-#: g10/getkey.c:1642 g10/getkey.c:1698
+#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "używany jest podklucz %08lX zamiast klucza głównego %08lX\n"
 
-#: g10/getkey.c:2017
+#: g10/getkey.c:2050
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: nie znaleziono użytkownika\n"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d zostaje pominięty\n"
 
-#: g10/import.c:188 g10/trustdb.c:1740 g10/trustdb.c:1781
+#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu kluczy przetworzonych do tej chwili\n"
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "bł±d odczytu '%s': %s\n"
 
-#: g10/import.c:203
+#: g10/import.c:204
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Ogółem przetworzonych kluczy: %lu\n"
 
-#: g10/import.c:205
+#: g10/import.c:206
+#, fuzzy, c-format
+msgid "      skipped new keys: %lu\n"
+msgstr "            nowych podkluczy: %lu\n"
+
+#: g10/import.c:209
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          bez identyfikatora: %lu\n"
 
-#: g10/import.c:207
+#: g10/import.c:211
 #, c-format
 msgid "              imported: %lu"
 msgstr "         doł±czono do zbioru: %lu"
 
-#: g10/import.c:213
+#: g10/import.c:217
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                   bez zmian: %lu\n"
 
-#: g10/import.c:215
+#: g10/import.c:219
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      nowych identyfikatorów: %lu\n"
 
-#: g10/import.c:217
+#: g10/import.c:221
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "            nowych podkluczy: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:223
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "             nowych podpisów: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:225
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   nowych unieważnień kluczy: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:227
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   tajnych kluczy wczytanych: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:229
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "     tajnych kluczy dodanych: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:231
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "    tajnych kluczy bez zmian: %lu\n"
 
-#: g10/import.c:386 g10/import.c:578
+#: g10/import.c:391 g10/import.c:590
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "klucz %08lX: brak identyfikatora użytkownika\n"
 
-#: g10/import.c:400
+#: g10/import.c:405
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "klucz %08lX: brak poprawnych identyfikatorów użytkownika\n"
 
-#: g10/import.c:402
+#: g10/import.c:407
 msgid "this may be caused by a missing self-signature\n"
 msgstr "to może być spowodowane brakiem podpisu wła¶ciciela klucza\n"
 
-#: g10/import.c:413 g10/import.c:645
+#: g10/import.c:418 g10/import.c:657
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "klucz %08lX: brak klucza publicznego: %s\n"
 
-#: g10/import.c:419
+#: g10/import.c:423
+#, fuzzy, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "klucz %08lX: nie jest w formacie RFC 2440 - pominięty\n"
+
+#: g10/import.c:431
 msgid "no default public keyring\n"
 msgstr "brak domy¶lnego zbioru kluczy publicznych\n"
 
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
+#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapis do '%s'\n"
 
-#: g10/import.c:426 g10/import.c:484 g10/import.c:593 g10/import.c:694
+#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "nie można zablokować zbioru kluczy publicznych '%s': %s\n"
 
-#: g10/import.c:429 g10/import.c:487 g10/import.c:596 g10/import.c:697
+#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "bł±d zapisu zbioru kluczy '%s': %s\n"
 
-#: g10/import.c:434
+#: g10/import.c:446
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "klucz %08lX: klucz publiczny doł±czony do zbioru\n"
 
-#: g10/import.c:451
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "klucz %08lX: nie zgadza się z lokalnie posiadan± kopi±\n"
 
-#: g10/import.c:460 g10/import.c:653
+#: g10/import.c:472 g10/import.c:665
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "klucz %08lX: brak oryginalnego bloku klucza; %s\n"
 
-#: g10/import.c:466 g10/import.c:659
+#: g10/import.c:478 g10/import.c:671
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "klucz %08lX: nie można odczytać oryginalnego bloku klucza; %s\n"
 
-#: g10/import.c:493
+#: g10/import.c:505
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "klucz %08lX: 1 nowy identyfikator użytkownika\n"
 
-#: g10/import.c:496
+#: g10/import.c:508
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "klucz %08lX: %d nowych identyfikatorów użytkownika\n"
 
-#: g10/import.c:499
+#: g10/import.c:511
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "klucz %08lX: 1 nowy podpis\n"
 
-#: g10/import.c:502
+#: g10/import.c:514
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "klucz %08lX: %d nowych podpisów\n"
 
-#: g10/import.c:505
+#: g10/import.c:517
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "klucz %08lX: 1 nowy podklucz\n"
 
-#: g10/import.c:508
+#: g10/import.c:520
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "klucz %08lX: %d nowych podkluczy\n"
 
-#: g10/import.c:518
+#: g10/import.c:530
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "klucz %08lX: bez zmian\n"
 
-#: g10/import.c:601
+#: g10/import.c:613
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "Klucz %08lX: klucz tajny wczytany do zbioru\n"
 
 #. we can't merge secret keys
-#: g10/import.c:605
+#: g10/import.c:617
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "Klucz %08lX: ten klucz już znajduje się w zbiorze\n"
 
-#: g10/import.c:610
+#: g10/import.c:622
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "klucz %08lX: brak klucza tajnego: %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:651
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "klucz %08lX: brak klucza publicznego - wczytany certyfikat \n"
 "uniważnienia nie może być zastosowany\n"
 
-#: g10/import.c:670
+#: g10/import.c:682
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 "klucz %08lX: niepoprawny certyfikat unieważnienia:\n"
 "%s - odrzucony\n"
 
-#: g10/import.c:702
+#: g10/import.c:714
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "klucz %08lX: wczytany certyfikat unieważnienia\n"
 
-#: g10/import.c:744
+#: g10/import.c:756
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "klucz %08lX: brak identyfikatora użytkownika do podpisu\n"
 
-#: g10/import.c:751 g10/import.c:775
+#: g10/import.c:763 g10/import.c:787
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr ""
 "klucz %08lX: nie obsługiwany algorytm szyfrowania z kluczem publicznym\n"
 
-#: g10/import.c:752
+#: g10/import.c:764
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "klucz %08lX: niepoprawny podpis wła¶ciciela klucza\n"
 
-#: g10/import.c:767
+#: g10/import.c:779
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "klucz %08lX: brak podklucza do dowi±zania\n"
 
-#: g10/import.c:776
+#: g10/import.c:788
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "klucz %08lX: niepoprawne dowi±zanie podklucza\n"
 
-#: g10/import.c:803
+#: g10/import.c:815
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "klucz %08lX: przyjęto identyfikator nie podpisany nim samym '"
 
-#: g10/import.c:832
+#: g10/import.c:844
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "klucz %08lX: pominięto identyfikator użytkownika '"
 
-#: g10/import.c:855
+#: g10/import.c:867
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "klucz %08lX: podklucz pominięty\n"
@@ -1945,34 +1963,34 @@
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:880
+#: g10/import.c:892
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "klucz %08lX: podpis nieeksportowalny (klasa %02x) - pominięty\n"
 
-#: g10/import.c:889
+#: g10/import.c:901
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "klucz %08lX: certyfikat unieważnienia umieszczony w niewła¶ciwym \n"
 "miejscu - został pominięty\n"
 
-#: g10/import.c:897
+#: g10/import.c:909
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "klucz %08lX: niepoprawny certyfikat unieważnienia: %s - pominięty\n"
 
-#: g10/import.c:997
+#: g10/import.c:1009
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "key %08lX: powtórzony identyfikator użytkownika - doł±czony\n"
 
-#: g10/import.c:1048
+#: g10/import.c:1060
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "klucz %08lX: dodany certyfikat unieważnienia\n"
 
-#: g10/import.c:1162 g10/import.c:1215
+#: g10/import.c:1174 g10/import.c:1227
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "klucz %08lX: dostępna kopia nie jest podpisana ni± sam±\n"
@@ -2553,8 +2571,18 @@
 msgid "no secret key\n"
 msgstr "brak klucza tajnego\n"
 
+#: g10/keylist.c:158
+#, fuzzy
+msgid "invalid"
+msgstr "bł±d w opakowaniu ASCII"
+
+#: g10/keylist.c:178
+#, fuzzy
+msgid "revoked"
+msgstr "unpkl"
+
 #. of subkey
-#: g10/keylist.c:318 g10/mainproc.c:742
+#: g10/keylist.c:400 g10/mainproc.c:760
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "Data ważno¶ci klucza: %s\n"
@@ -2564,73 +2592,73 @@
 msgid "public key is %08lX\n"
 msgstr "klucz publiczny %08lX\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:257
 msgid "public key encrypted data: good DEK\n"
 msgstr "dane zaszyfrowane kluczem publicznym: poprawny klucz sesyjny\n"
 
-#: g10/mainproc.c:281
+#: g10/mainproc.c:299
 #, 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:291
+#: g10/mainproc.c:309
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "zaszyfrowane kluczem %s, o identyfikatorze %08lX\n"
 
-#: g10/mainproc.c:297
+#: g10/mainproc.c:315
 msgid "no secret key for decryption available\n"
 msgstr "odszyfrowuj±cy klucz tajny do jest niedostępny\n"
 
-#: g10/mainproc.c:306
+#: g10/mainproc.c:324
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "bł±d odszyfrowywania kluczem publicznym: %s\n"
 
-#: g10/mainproc.c:343
+#: g10/mainproc.c:361
 msgid "decryption okay\n"
 msgstr "odszyfrowane poprawnie\n"
 
-#: g10/mainproc.c:348
+#: g10/mainproc.c:366
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "OSTRZEŻENIE: dokonano manipulacji zaszyfrowan± wiadomo¶ci±!\n"
 
-#: g10/mainproc.c:353
+#: g10/mainproc.c:371
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "bł±d odszyfrowywania: %s\n"
 
-#: g10/mainproc.c:372
+#: g10/mainproc.c:390
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "UWAGA: nadawca zaznaczył że wiadomo¶ć nie powinna być zapisywana!\n"
 
-#: g10/mainproc.c:374
+#: g10/mainproc.c:392
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "pierwotna nazwa pliku='%.*s'\n"
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:544
 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:613 g10/mainproc.c:622
+#: g10/mainproc.c:631 g10/mainproc.c:640
 msgid "WARNING: invalid notation data found\n"
 msgstr "OSTRZEŻENIE: niepoprawne dane w adnotacji\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:643
 msgid "Notation: "
 msgstr "Adnotacja: "
 
-#: g10/mainproc.c:632
+#: g10/mainproc.c:650
 msgid "Policy: "
 msgstr "Regulamin: "
 
-#: g10/mainproc.c:1062
+#: g10/mainproc.c:1080
 msgid "signature verification suppressed\n"
 msgstr "wymuszono pominięcie sprawdzenia podpisu\n"
 
-#: g10/mainproc.c:1068
+#: g10/mainproc.c:1086
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr ""
@@ -2638,58 +2666,46 @@
 "z użyciem klucza o identyfikatorze %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1094 g10/mainproc.c:1105
+#: g10/mainproc.c:1112 g10/mainproc.c:1123
 msgid "BAD signature from \""
 msgstr "NIEPOPRAWNY podpis złożony przez \""
 
-#: g10/mainproc.c:1095 g10/mainproc.c:1106
+#: g10/mainproc.c:1113 g10/mainproc.c:1124
 msgid "Good signature from \""
 msgstr "Poprawny podpis złożony przez \""
 
-#: g10/mainproc.c:1097
+#: g10/mainproc.c:1115
 msgid "                aka \""
 msgstr "                        alias \""
 
-#: g10/mainproc.c:1153
+#: g10/mainproc.c:1171
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nie można sprawdzić podpisu: %s\n"
 
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1235
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "oddzielony podpis klasy 0x%02x\n"
 
-#: g10/mainproc.c:1263
+#: g10/mainproc.c:1281
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starego typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:1268
+#: g10/mainproc.c:1286
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n"
 
-#: g10/misc.c:94
+#: g10/misc.c:96
 #, 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:97
-msgid "WARNING: program may create a core file!\n"
-msgstr "OSTRZEŻENIE: program może stworzyć plik zrzutu pamięci!\n"
-
-#: g10/misc.c:205
+#: g10/misc.c:206
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Nie należy używać algorytmów do¶wiadczalnych!\n"
 
-#: g10/misc.c:219
-msgid ""
-"RSA keys are deprecated; please consider creating a new key and use this key "
-"in the future\n"
-msgstr ""
-"Klucze RSA s± odradzane; proszę rozważyć przej¶cie na inne algorytmy po\n"
-"wygenerowaniu odpowiednich kluczy.\n"
-
-#: g10/misc.c:241
+#: g10/misc.c:233
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 "ten algorytm szyfruj±cy jest odradzany; proszę używać bardziej "
@@ -2700,7 +2716,7 @@
 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:965
+#: g10/parse-packet.c:986
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
@@ -2739,91 +2755,91 @@
 msgid "Repeat passphrase: "
 msgstr "Powtórzone wyrażenie przej¶ciowe: "
 
-#: g10/plaintext.c:63
+#: g10/plaintext.c:67
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "dane nie zostały zapisane; należy użyć opcji \"--output\" aby je zapisać\n"
 
-#: g10/plaintext.c:317
+#: g10/plaintext.c:324
 msgid "Detached signature.\n"
 msgstr "Podpis oddzielony.\n"
 
-#: g10/plaintext.c:321
+#: g10/plaintext.c:328
 msgid "Please enter name of data file: "
 msgstr "Nazwa pliku danych: "
 
-#: g10/plaintext.c:342
+#: g10/plaintext.c:349
 msgid "reading stdin ...\n"
 msgstr "odczyt ze strumienia standardowego wej¶cia...\n"
 
-#: g10/plaintext.c:385
+#: g10/plaintext.c:392
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nie można otworzyć podpisanego pliku '%s'\n"
 
-#: g10/pubkey-enc.c:79
+#: g10/pubkey-enc.c:76
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "adresat anonimowy; próba klucza tajnego %08lX ...\n"
 
-#: g10/pubkey-enc.c:85
+#: g10/pubkey-enc.c:82
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "OK, to my jeste¶my adresatem anonimowym.\n"
 
-#: g10/pubkey-enc.c:137
+#: g10/pubkey-enc.c:134
 msgid "old encoding of the DEK is not supported\n"
 msgstr "stary, nie obsługiwany algorytm szyfrowania klucza sesyjnego\n"
 
-#: g10/pubkey-enc.c:156
+#: g10/pubkey-enc.c:153
 #, fuzzy, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "%d - algorytm ochrony nie obsługiwany\n"
 
-#: g10/pubkey-enc.c:195
+#: g10/pubkey-enc.c:192
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "UWAGA: brak algorytmu szyfruj±cego %d w ustawieniach\n"
 
-#: g10/pubkey-enc.c:201
+#: g10/pubkey-enc.c:198
 #, fuzzy, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "UWAGA: klucz podpisuj±cy przekroczył datę ważno¶ci %s\n"
 
-#: g10/hkp.c:62
+#: g10/hkp.c:72
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
 msgstr ""
 
-#: g10/hkp.c:75
+#: g10/hkp.c:85
 #, fuzzy, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "niemożliwy jest zapis do zbioru kluczy: %s\n"
 
-#: g10/hkp.c:98 g10/hkp.c:136
+#: g10/hkp.c:109 g10/hkp.c:148
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/hkp.c:106
+#: g10/hkp.c:117
 #, fuzzy, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "'%s\" nie jest wła¶ciwym identyfikatorem klucza\n"
 
-#: g10/hkp.c:158
+#: g10/hkp.c:170
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nie można otworzyć %s: %s\n"
 
-#: g10/hkp.c:182
+#: g10/hkp.c:194
 #, fuzzy, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "bł±d odczytu '%s': %s\n"
 
-#: g10/hkp.c:194
+#: g10/hkp.c:206
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr ""
 
-#: g10/hkp.c:197
+#: g10/hkp.c:209
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
@@ -2838,45 +2854,45 @@
 msgid "protection algorithm %d is not supported\n"
 msgstr "%d - algorytm ochrony nie obsługiwany\n"
 
-#: g10/seckey-cert.c:175
+#: g10/seckey-cert.c:184
 msgid "Invalid passphrase; please try again ...\n"
 msgstr ""
 "Niepoprawne wyrażenie przej¶ciowe (hasło); proszę spróbować ponownie ...\n"
 
-#: g10/seckey-cert.c:231
+#: g10/seckey-cert.c:240
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "OSTRZEŻENIE: Wykryto klucz słaby algorytmu - należy ponownie zmienić \n"
 "             wyrażenie przej¶ciowe (hasło).\n"
 
-#: g10/sig-check.c:202
+#: g10/sig-check.c:199
 msgid "assuming bad MDC due to an unknown critical bit\n"
 msgstr ""
 "przyjęto niepoprawno¶ć MDC z powonu ustawienia nieznanego bitu krytycznego\n"
 
-#: g10/sig-check.c:300
+#: g10/sig-check.c:297
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "Klucz algorytmu ElGamala wygenerowany przez PGP - podpisy nim składane\n"
 "nie zapewniaj± bezpieczeństwa!\n"
 
-#: g10/sig-check.c:308
+#: g10/sig-check.c:305
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "klucz publiczny jest o %lu sekund młodszy od podpisu\n"
 
-#: g10/sig-check.c:309
+#: g10/sig-check.c:306
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "klucz publiczny jest o %lu sekund młodszy od podpisu\n"
 
-#: g10/sig-check.c:327
+#: g10/sig-check.c:324
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "UWAGA: klucz podpisuj±cy przekroczył datę ważno¶ci %s\n"
 
-#: g10/sig-check.c:396
+#: g10/sig-check.c:393
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "przyjęto nieważno¶ć podpisu z powodu ustawienia nieznanego bitu krytycznego\n"
@@ -2886,7 +2902,7 @@
 msgid "%s signature from: %s\n"
 msgstr "%s podpis złożony przez: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:606
+#: g10/sign.c:290 g10/sign.c:610
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "nie można stworzyć %s: %s\n"
@@ -2934,7 +2950,7 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: katalog nie istnieje!\n"
 
-#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1363 g10/tdbio.c:444
+#: g10/openfile.c:226 g10/openfile.c:295 g10/ringedit.c:1369 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: nie można utworzyć: %s\n"
@@ -3035,289 +3051,300 @@
 msgstr ""
 "Baza zaufania jest uszkodzona; proszę uruchomić \"gpgm --fix-trust-db\".\n"
 
-#: g10/trustdb.c:168
+#: g10/trustdb.c:169
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "wpis zaufania %lu, typ zapytania %d: odczyt nie powiódł się: %s\n"
 
-#: g10/trustdb.c:183
+#: g10/trustdb.c:184
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "wpis zaufania %lu, typ zapytania %d: zapis nie powiódł się: %s\n"
 
-#: g10/trustdb.c:197
+#: g10/trustdb.c:198
 #, c-format
 msgid "trust record %lu: delete failed: %s\n"
 msgstr "wpis zaufania %lu: usunięcie nie powiodło się %s\n"
 
-#: g10/trustdb.c:211
+#: g10/trustdb.c:212
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "baza zaufania: synchronizacja nie powiodła się %s\n"
 
-#: g10/trustdb.c:376
+#: g10/trustdb.c:377
 #, c-format
 msgid "error reading dir record for LID %lu: %s\n"
 msgstr "bł±d odczytu wpisu katalogowego dla LID %lu: %s\n"
 
-#: g10/trustdb.c:383
+#: g10/trustdb.c:384
 #, c-format
 msgid "lid %lu: expected dir record, got type %d\n"
 msgstr "lid %lu: oczekiwany wpis katalogowy, napotkano typ %d\n"
 
-#: g10/trustdb.c:388
+#: g10/trustdb.c:389
 #, c-format
 msgid "no primary key for LID %lu\n"
 msgstr "brak klucza głównego dla LID %lu\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:394
 #, c-format
 msgid "error reading primary key for LID %lu: %s\n"
 msgstr "bł±d odczytu głównego klucza dla LID %lu: %s\n"
 
-#: g10/trustdb.c:432
+#: g10/trustdb.c:433
 #, c-format
 msgid "get_dir_record: search_record failed: %s\n"
 msgstr "get_dir_record: funkcja search_record zawiodła: %s\n"
 
-#: g10/trustdb.c:487
-#, c-format
-msgid "NOTE: secret key %08lX is NOT protected.\n"
-msgstr "UWAGA: klucz tajny %08lX NIE jest chroniony.\n"
-
-#: g10/trustdb.c:495
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr "klucz %08lX: klucz tajny bez klucza jawnego - pominięty\n"
-
-#: g10/trustdb.c:502
-#, c-format
-msgid "key %08lX: secret and public key don't match\n"
-msgstr "klucz %08lX: klucz tajny nie pasuje do klucza jawnego\n"
+#: g10/trustdb.c:474
+#, fuzzy, c-format
+msgid "'%s' is not a valid long keyID\n"
+msgstr "'%s\" nie jest wła¶ciwym identyfikatorem klucza\n"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:501
 #, c-format
 msgid "key %08lX: can't put it into the trustdb\n"
 msgstr "klucz %08lX: wpisanie do bazy zaufania niemożliwe\n"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:507
 #, c-format
 msgid "key %08lX: query record failed\n"
 msgstr "klucz %08lX: wyszukanie zapisu nie powiodło się\n"
 
-#: g10/trustdb.c:529
+#: g10/trustdb.c:516
 #, c-format
 msgid "key %08lX: already in trusted key table\n"
 msgstr "klucz %08lX: już znajduje się w tablicy kluczy zaufanych\n"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:519
 #, c-format
 msgid "key %08lX: accepted as trusted key.\n"
 msgstr "Klucz %08lX: zaakceptowany jako klucz zaufany.\n"
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:546
+#, c-format
+msgid "key %08lX: no public key for trusted key - skipped\n"
+msgstr ""
+"klucz %08lX: brak klucza publicznego dla klucza zaufanego - pominięty\n"
+
+#: g10/trustdb.c:565
+#, c-format
+msgid "NOTE: secret key %08lX is NOT protected.\n"
+msgstr "UWAGA: klucz tajny %08lX NIE jest chroniony.\n"
+
+#: g10/trustdb.c:577
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr "klucz %08lX: klucz tajny bez klucza jawnego - pominięty\n"
+
+#: g10/trustdb.c:584
+#, c-format
+msgid "key %08lX: secret and public key don't match\n"
+msgstr "klucz %08lX: klucz tajny nie pasuje do klucza jawnego\n"
+
+#: g10/trustdb.c:597
 #, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr "wyliczenie kluczy tajnych nie powiodło się %s\n"
 
-#: g10/trustdb.c:921
+#: g10/trustdb.c:987
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "klucz %08lX.%lu Dobre dowi±zanie podklucza\n"
 
-#: g10/trustdb.c:927 g10/trustdb.c:962
+#: g10/trustdb.c:993 g10/trustdb.c:1028
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "klucz %08lX.%lu: Niepoprawne dowi±zanie podklucza %s\n"
 
-#: g10/trustdb.c:939
+#: g10/trustdb.c:1005
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "klucz %08lX.%lu: Poprawne unieważnienie klucza\n"
 
-#: g10/trustdb.c:945
+#: g10/trustdb.c:1011
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "klucz %08lX.%lu: Niewła¶ciwe unieważnienie klucza: %s\n"
 
-#: g10/trustdb.c:956
+#: g10/trustdb.c:1022
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "klucz %08lX.%lu: Poprawne unieważnienie podklucza\n"
 
-#: g10/trustdb.c:1067
+#: g10/trustdb.c:1133
 msgid "Good self-signature"
 msgstr "Poprawny podpis klucza nim samym"
 
-#: g10/trustdb.c:1077
+#: g10/trustdb.c:1143
 msgid "Invalid self-signature"
 msgstr "Niepoprawny podpis klucza nim samym"
 
-#: g10/trustdb.c:1104
+#: g10/trustdb.c:1170
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 "Poprawne unieważnienie identyfikatora użytkownika pominięte z powodu\n"
 "nowszego podpisu tym samym kluczem"
 
-#: g10/trustdb.c:1110
+#: g10/trustdb.c:1176
 msgid "Valid user ID revocation"
 msgstr "Poprawne unieważnienie identyfikatora użytkownika"
 
-#: g10/trustdb.c:1115
+#: g10/trustdb.c:1181
 msgid "Invalid user ID revocation"
 msgstr "Niepoprawne unieważnienie identyfikatora użytkownika"
 
-#: g10/trustdb.c:1157
+#: g10/trustdb.c:1223
 msgid "Valid certificate revocation"
 msgstr "Poprawne unieważnienie certyfikatu"
 
-#: g10/trustdb.c:1158
+#: g10/trustdb.c:1224
 msgid "Good certificate"
 msgstr "Poprawny certyfikat"
 
-#: g10/trustdb.c:1186
+#: g10/trustdb.c:1252
 msgid "Invalid certificate revocation"
 msgstr "Niepoprawne unieważnienie certyfikatu"
 
-#: g10/trustdb.c:1187
+#: g10/trustdb.c:1253
 msgid "Invalid certificate"
 msgstr "Niepoprawny certyfikat"
 
-#: g10/trustdb.c:1204 g10/trustdb.c:1208
+#: g10/trustdb.c:1270 g10/trustdb.c:1274
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "zapis o podpisach %lu[%d] wskazuje na zły wpis.\n"
 
-#: g10/trustdb.c:1267
+#: g10/trustdb.c:1333
 msgid "duplicated certificate - deleted"
 msgstr "podwójny certyfikat - usunięty"
 
-#: g10/trustdb.c:1584
+#: g10/trustdb.c:1650
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "Procedura tdbio_search_dir nie powiodła się: %s\n"
 
-#: g10/trustdb.c:1718
+#: g10/trustdb.c:1784
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: wpisanie nie powiodło się: %s\n"
 
-#: g10/trustdb.c:1723
+#: g10/trustdb.c:1789
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: wpisanie nie powiodło się: %s\n"
 
-#: g10/trustdb.c:1729
+#: g10/trustdb.c:1795
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: wpisany\n"
 
-#: g10/trustdb.c:1734
+#: g10/trustdb.c:1800
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "bł±d podczas odczytu wpisu katalogowego: %s\n"
 
-#: g10/trustdb.c:1742 g10/trustdb.c:1805
+#: g10/trustdb.c:1808 g10/trustdb.c:1871
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu kluczy przetworzonych\n"
 
-#: g10/trustdb.c:1744 g10/trustdb.c:1811
+#: g10/trustdb.c:1810 g10/trustdb.c:1877
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu kluczy z błędami\n"
 
-#: g10/trustdb.c:1746
+#: g10/trustdb.c:1812
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu kluczy wpisanych\n"
 
-#: g10/trustdb.c:1749
+#: g10/trustdb.c:1815
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "wyliczenie bloków kluczy nie powiodło się: %s\n"
 
-#: g10/trustdb.c:1797
+#: g10/trustdb.c:1863
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: wpis katalogowy bez bloku klucza - pominięty\n"
 
-#: g10/trustdb.c:1807
+#: g10/trustdb.c:1873
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "\t%lu z powodu nowych kluczy publicznych\n"
 
-#: g10/trustdb.c:1809
+#: g10/trustdb.c:1875
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu kluczy pominiętych\n"
 
-#: g10/trustdb.c:1813
+#: g10/trustdb.c:1879
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu kluczy uaktualnionych\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2224
 msgid "Ooops, no keys\n"
 msgstr "Oops, brak kluczy\n"
 
-#: g10/trustdb.c:2162
+#: g10/trustdb.c:2228
 msgid "Ooops, no user IDs\n"
 msgstr "Oops, brak identyfikatorów użytkowników\n"
 
-#: g10/trustdb.c:2320
+#: g10/trustdb.c:2386
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: poszukiwanie wpisu katalogowego nie powiodło się: %s\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2395
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "klucz %08lX: wprowadzenie wpisu zaufania nie powiodło się: %s\n"
 
-#: g10/trustdb.c:2333
+#: g10/trustdb.c:2399
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "Klucz %08lX.%lu: wprowadzony do bazy zaufania\n"
 
-#: g10/trustdb.c:2341
+#: g10/trustdb.c:2407
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "Klucz %08lX.%lu: stworzony w przyszło¶ci (zaburzenia czasoprzestrzeni,\n"
 "lub Ľle ustawiony zegar systemowy)\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2422
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "klucz %08lX.%lu: okres ważno¶ci upłyn±ł %s\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2430
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "klucz %08lX.%lu: bł±d przy sprawdzaniu zaufania: %s\n"
 
-#: g10/trustdb.c:2515
+#: g10/trustdb.c:2581
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "użytkownik '%s' nie odnaleziony: %s\n"
 
-#: g10/trustdb.c:2517
+#: g10/trustdb.c:2583
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problem podczas szukania '%s' w bazie zaufania: %s\n"
 
-#: g10/trustdb.c:2520
+#: g10/trustdb.c:2586
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "brak użytkownika '%s' w bazie zaufania - dodano\n"
 
-#: g10/trustdb.c:2523
+#: g10/trustdb.c:2589
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "umieszczenie '%s' w bazie zaufania nie powiodło się: %s\n"
 
-#: g10/trustdb.c:2709 g10/trustdb.c:2739
+#: g10/trustdb.c:2775 g10/trustdb.c:2805
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "OSTRZEŻENIE: długie wpisy ustawień jeszcze nie s± obsługiwane.\n"
 
@@ -3341,26 +3368,26 @@
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: stworzenie zbioru kluczy jest niemożliwe: %s\n"
 
-#: g10/ringedit.c:319 g10/ringedit.c:1368
+#: g10/ringedit.c:319 g10/ringedit.c:1374
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: zbiór kluczy utworzony\n"
 
-#: g10/ringedit.c:1545
+#: g10/ringedit.c:1551
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "OSTRZEŻENIE: Istniej± dwa pliki z poufnymi informacjami.\n"
 
-#: g10/ringedit.c:1546
+#: g10/ringedit.c:1552
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s pozostał bez zmian\n"
 
-#: g10/ringedit.c:1547
+#: g10/ringedit.c:1553
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s został utworzony\n"
 
-#: g10/ringedit.c:1548
+#: g10/ringedit.c:1554
 msgid "Please fix this possible security flaw\n"
 msgstr "Proszę usun±ć to naruszenie zasad bezpieczeństwa.\n"
 
@@ -3385,49 +3412,49 @@
 "podpisy składane tym kluczem nie zapewniaj± bezpieczeństwa!\n"
 
 #. do not overwrite
-#: g10/openfile.c:79
+#: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Plik '%s' już istnieje. "
 
-#: g10/openfile.c:81
+#: g10/openfile.c:86
 msgid "Overwrite (y/N)? "
 msgstr "Nadpisać (t/N)? "
 
-#: g10/openfile.c:109
+#: g10/openfile.c:119
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: nieznana końcówka\n"
 
-#: g10/openfile.c:131
+#: g10/openfile.c:141
 msgid "Enter new filename"
 msgstr "Nazwa pliku"
 
-#: g10/openfile.c:172
+#: g10/openfile.c:182
 msgid "writing to stdout\n"
 msgstr "zapisywanie na wyj¶cie standardowe\n"
 
-#: g10/openfile.c:250
+#: g10/openfile.c:261
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "przyjęto obecno¶ć podpisanych danych w '%s'\n"
 
-#: g10/openfile.c:300
+#: g10/openfile.c:311
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: stworzono nowy plik ustawień\n"
 
-#: g10/openfile.c:313
+#: g10/openfile.c:338
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: nie można utworzyć katalogu: %s\n"
 
-#: g10/openfile.c:316
+#: g10/openfile.c:341
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: katalog utworzony\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:343
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr "musisz uruchomić GnuPG od nowa aby wczytać nowe ustawienia\n"
 
@@ -3727,6 +3754,13 @@
 msgid "No help available for `%s'"
 msgstr "Brak pomocy o '%s'"
 
+#~ msgid ""
+#~ "RSA keys are deprecated; please consider creating a new key and use this key "
+#~ "in the future\n"
+#~ msgstr ""
+#~ "Klucze RSA s± odradzane; proszę rozważyć przej¶cie na inne algorytmy po\n"
+#~ "wygenerowaniu odpowiednich kluczy.\n"
+
 #~ msgid "set debugging flags"
 #~ msgstr "ustawienie opcji ¶ledzenia wykonania programu"
 
@@ -4005,15 +4039,8 @@
 #~ msgid "usage: gpgm [options] "
 #~ msgstr "sposób użycia: gpgm [opcje]"
 
-#~ msgid "|KEYID|ulimately trust this key"
-#~ msgstr "|KLUCZ|całkowite zaufanie dla tego klucza"
-
 #~ msgid "chained sigrec %lu has a wrong owner\n"
 #~ msgstr "powi±zany rekord podpisu %lu ma niewła¶ciwego wła¶ciciela\n"
-
-#~ msgid "key %08lX: no public key for trusted key - skipped\n"
-#~ msgstr ""
-#~ "klucz %08lX: brak klucza publicznego dla klucza zaufanego - pominięty\n"
 
 #~ msgid "lid %lu: read dir record failed: %s\n"
 #~ msgstr "lid %lu: odczyt wpisu katalogowego nie powiódł się: %s\n"
diff -urN gnupg-1.0.2/po/pt_BR.po gnupg-1.0.3/po/pt_BR.po
--- gnupg-1.0.2/po/pt_BR.po	Wed Jul 12 14:59:44 2000
+++ gnupg-1.0.3/po/pt_BR.po	Mon Sep 18 12:18:07 2000
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-07-12 12:13+0200\n"
+"POT-Creation-Date: 2000-09-18 12:17+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"
@@ -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:127 g10/keygen.c:1249
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1255
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
@@ -313,11 +313,11 @@
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:647
+#: cipher/random.c:650
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVISO: usando gerador de números aleatórios inseguro!\n"
 
-#: cipher/random.c:648
+#: cipher/random.c:651
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -331,7 +331,7 @@
 "NĂO USE NENHUM DADO GERADO POR ESTE PROGRAMA!\n"
 "\n"
 
-#: cipher/rndlinux.c:141
+#: cipher/rndlinux.c:142
 #, c-format
 msgid ""
 "\n"
@@ -343,7 +343,7 @@
 "para que o sistema possa coletar mais entropia!\n"
 "(Săo necessários mais %d bytes)\n"
 
-#: g10/g10.c:197
+#: g10/g10.c:206
 msgid ""
 "@Commands:\n"
 " "
@@ -351,144 +351,144 @@
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:199
+#: g10/g10.c:208
 msgid "|[file]|make a signature"
 msgstr "|[arquivo]|fazer uma assinatura"
 
-#: g10/g10.c:200
+#: g10/g10.c:209
 msgid "|[file]|make a clear text signature"
 msgstr "|[arquivo]|fazer uma assinatura em texto puro"
 
-#: g10/g10.c:201
+#: g10/g10.c:210
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/g10.c:202
+#: g10/g10.c:211
 msgid "encrypt data"
 msgstr "criptografar dados"
 
-#: g10/g10.c:203
+#: g10/g10.c:212
 msgid "encryption only with symmetric cipher"
 msgstr ""
 "criptografar apenas com criptografia\n"
 "simétrica"
 
-#: g10/g10.c:204
+#: g10/g10.c:213
 msgid "store only"
 msgstr "apenas armazenar"
 
-#: g10/g10.c:205
+#: g10/g10.c:214
 msgid "decrypt data (default)"
 msgstr "descriptografar dados (padrăo)"
 
-#: g10/g10.c:206
+#: g10/g10.c:215
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/g10.c:208
+#: g10/g10.c:217
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/g10.c:210
+#: g10/g10.c:219
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/g10.c:211
+#: g10/g10.c:220
 msgid "check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/g10.c:212
+#: g10/g10.c:221
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impressőes digitais"
 
-#: g10/g10.c:213
+#: g10/g10.c:222
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/g10.c:214
+#: g10/g10.c:223
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/g10.c:215
+#: g10/g10.c:224
 msgid "remove key from the public keyring"
 msgstr "remover a chave do chaveiro público"
 
-#: g10/g10.c:217
+#: g10/g10.c:226
 msgid "remove key from the secret keyring"
 msgstr "remover a chave do chaveiro secreto"
 
-#: g10/g10.c:218
+#: g10/g10.c:227
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/g10.c:219
+#: g10/g10.c:228
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:220
+#: g10/g10.c:229
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/g10.c:221
+#: g10/g10.c:230
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revogaçăo"
 
-#: g10/g10.c:222
+#: g10/g10.c:231
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:223
+#: g10/g10.c:232
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/g10.c:224
+#: g10/g10.c:233
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
-#: g10/g10.c:228
+#: g10/g10.c:237
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/g10.c:230
+#: g10/g10.c:239
 msgid "list only the sequence of packets"
 msgstr "listar apenas as seqüęncias de pacotes"
 
 # ownertrust ???
-#: g10/g10.c:232
+#: g10/g10.c:241
 msgid "export the ownertrust values"
 msgstr "exportar os valores de confiança"
 
-#: g10/g10.c:234
+#: g10/g10.c:243
 msgid "import ownertrust values"
 msgstr "importar os valores de confiança"
 
-#: g10/g10.c:236
+#: g10/g10.c:245
 msgid "update the trust database"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: g10/g10.c:238
+#: g10/g10.c:247
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMES]|verificar o banco de dados de confiabilidade"
 
-#: g10/g10.c:239
+#: g10/g10.c:248
 msgid "fix a corrupted trust database"
 msgstr ""
 "consertar um banco de dados de confiabilidade\n"
 "danificado"
 
-#: g10/g10.c:240
+#: g10/g10.c:249
 msgid "De-Armor a file or stdin"
 msgstr "retirar a armadura de um arquivo ou de \"stdin\""
 
-#: g10/g10.c:242
+#: g10/g10.c:251
 msgid "En-Armor a file or stdin"
 msgstr "criar armadura para um arquivo ou \"stdin\""
 
-#: g10/g10.c:244
+#: g10/g10.c:253
 msgid "|algo [files]|print message digests"
 msgstr "|algo [arquivos]|imprimir \"digests\" de mensagens"
 
-#: g10/g10.c:248
+#: g10/g10.c:257
 msgid ""
 "@\n"
 "Options:\n"
@@ -498,171 +498,175 @@
 "Opçőes:\n"
 " "
 
-#: g10/g10.c:250
+#: g10/g10.c:259
 msgid "create ascii armored output"
 msgstr "criar saída com armadura ascii"
 
-#: g10/g10.c:252
+#: g10/g10.c:261
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|criptografar para NOME"
 
-#: g10/g10.c:255
+#: g10/g10.c:264
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usar NOME como destinatário padrăo"
 
-#: g10/g10.c:257
+#: g10/g10.c:266
 msgid "use the default key as default recipient"
 msgstr "usar a chave padrăo como destinatário padrăo"
 
-#: g10/g10.c:261
+#: g10/g10.c:270
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de usuário para\n"
 "assinar ou descriptografar"
 
-#: g10/g10.c:262
+#: g10/g10.c:271
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer nível de compressăo N\n"
 "(0 desabilita)"
 
-#: g10/g10.c:264
+#: g10/g10.c:273
 msgid "use canonical text mode"
 msgstr "usar modo de texto canônico"
 
-#: g10/g10.c:265
+#: g10/g10.c:274
 msgid "use as output file"
 msgstr "usar como arquivo de saída"
 
-#: g10/g10.c:266
+#: g10/g10.c:275
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/g10.c:267
+#: g10/g10.c:276
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/g10.c:268
+#: g10/g10.c:277
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: g10/g10.c:269
+#: g10/g10.c:278
 msgid "force v3 signatures"
 msgstr "forçar assinaturas v3"
 
-#: g10/g10.c:270
+#: g10/g10.c:279
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para criptografar"
 
-#: g10/g10.c:271
+#: g10/g10.c:280
 msgid "do not make any changes"
 msgstr "năo fazer alteraçőes"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:273
+#: g10/g10.c:282
 msgid "batch mode: never ask"
 msgstr "modo năo-interativo: nunca perguntar"
 
-#: g10/g10.c:274
+#: g10/g10.c:283
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: g10/g10.c:275
+#: g10/g10.c:284
 msgid "assume no on most questions"
 msgstr "assumir năo para a maioria das perguntas"
 
-#: g10/g10.c:276
+#: g10/g10.c:285
 msgid "add this keyring to the list of keyrings"
 msgstr "adicionar este chaveiro ŕ lista de chaveiros"
 
-#: g10/g10.c:277
+#: g10/g10.c:286
 msgid "add this secret keyring to the list"
 msgstr "adicionar este chaveiro secreto ŕ lista"
 
-#: g10/g10.c:278
+#: g10/g10.c:287
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta padrăo"
 
-#: g10/g10.c:279
+#: g10/g10.c:288
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDEREÇO|usar este servidor para buscar chaves"
 
-#: g10/g10.c:280
+#: g10/g10.c:289
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: g10/g10.c:281
+#: g10/g10.c:290
 msgid "read options from file"
 msgstr "ler opçőes do arquivo"
 
-#: g10/g10.c:285
+#: g10/g10.c:294
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|DA|escrever informaçőes de estado para o\n"
 "descritor de arquivo DA"
 
-#: g10/g10.c:290
+#: g10/g10.c:299
+msgid "|KEYID|ulimately trust this key"
+msgstr ""
+
+#: g10/g10.c:300
 msgid "|FILE|load extension module FILE"
 msgstr "|ARQUIVO|carregar módulo de extensăo ARQUIVO"
 
-#: g10/g10.c:291
+#: g10/g10.c:301
 msgid "emulate the mode described in RFC1991"
 msgstr "emular o modo descrito no RFC1991"
 
-#: g10/g10.c:292
+#: g10/g10.c:302
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "configurar todas as opçőes de pacote,\n"
 "criptografia e \"digest\" para comportamento\n"
 "OpenPGP"
 
-#: g10/g10.c:293
+#: g10/g10.c:303
 msgid "|N|use passphrase mode N"
 msgstr "|N|usar frase secreta modo N"
 
-#: g10/g10.c:295
+#: g10/g10.c:305
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de \"digest\" de mensagens NOME\n"
 "para frases secretas"
 
-#: g10/g10.c:297
+#: g10/g10.c:307
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: g10/g10.c:298
+#: g10/g10.c:308
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: g10/g10.c:299
+#: g10/g10.c:309
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: g10/g10.c:300
+#: g10/g10.c:310
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compressăo N"
 
-#: g10/g10.c:301
+#: g10/g10.c:311
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 "eliminar o campo keyid dos pacotes\n"
 "criptografados"
 
-#: g10/g10.c:302
+#: g10/g10.c:312
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOME=VALOR|usar estes dados de notaçăo"
 
-#: g10/g10.c:305
+#: g10/g10.c:315
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:308
+#: g10/g10.c:318
 msgid ""
 "@\n"
 "Examples:\n"
@@ -682,15 +686,15 @@
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impressőes digitais\n"
 
-#: g10/g10.c:403
+#: g10/g10.c:418
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:407
+#: g10/g10.c:422
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opçőes] [arquivos] (-h para ajuda)"
 
-#: g10/g10.c:410
+#: g10/g10.c:425
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -700,7 +704,7 @@
 "assina, verifica, criptografa ou descriptografa\n"
 "a operaçăo padrăo depende dos dados de entrada\n"
 
-#: g10/g10.c:417
+#: g10/g10.c:432
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -708,185 +712,189 @@
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:496
+#: g10/g10.c:511
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opçőes] "
 
-#: g10/g10.c:549
+#: g10/g10.c:564
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/g10.c:692
+#: g10/g10.c:704
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: arquivo de opçőes padrăo `%s' inexistente\n"
 
-#: g10/g10.c:696
+#: g10/g10.c:708
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de opçőes `%s': %s\n"
 
-#: g10/g10.c:703
+#: g10/g10.c:715
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo opçőes de `%s'\n"
 
-#: g10/g10.c:893
+#: g10/g10.c:905
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s năo é um conjunto de caracteres válido\n"
 
-#: g10/g10.c:949 g10/g10.c:958
+#: g10/g10.c:970
+msgid "WARNING: program may create a core file!\n"
+msgstr "AVISO: O programa pode criar um arquivo core!\n"
+
+#: g10/g10.c:974 g10/g10.c:983
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s năo é para uso normal!\n"
 
-#: g10/g10.c:951
+#: g10/g10.c:976
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s năo é permitido com %s!\n"
 
-#: g10/g10.c:954
+#: g10/g10.c:979
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s năo faz sentido com %s!\n"
 
-#: g10/g10.c:973 g10/g10.c:985
+#: g10/g10.c:998 g10/g10.c:1010
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado năo é válido\n"
 
-#: g10/g10.c:979 g10/g10.c:991
+#: g10/g10.c:1004 g10/g10.c:1016
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado năo é válido\n"
 
-#: g10/g10.c:995
+#: g10/g10.c:1020
 msgid "the given policy URL is invalid\n"
 msgstr "a URL de política dada é inválida\n"
 
-#: g10/g10.c:998
+#: g10/g10.c:1023
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "o algoritmo de compressăo deve estar na faixa %d..%d\n"
 
-#: g10/g10.c:1000
+#: g10/g10.c:1025
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:1002
+#: g10/g10.c:1027
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:1004
+#: g10/g10.c:1029
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth deve estar na entre 1 e 255\n"
 
-#: g10/g10.c:1007
+#: g10/g10.c:1032
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) năo é recomendável\n"
 
-#: g10/g10.c:1011
+#: g10/g10.c:1036
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inválido: deve ser 0, 1 ou 3\n"
 
-#: g10/g10.c:1096
+#: g10/g10.c:1121
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: g10/g10.c:1102
+#: g10/g10.c:1127
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/g10.c:1109
+#: g10/g10.c:1134
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/g10.c:1117
+#: g10/g10.c:1142
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1130
+#: g10/g10.c:1155
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/g10.c:1143
+#: g10/g10.c:1168
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1157
+#: g10/g10.c:1182
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/g10.c:1174
+#: g10/g10.c:1199
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1207
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuário"
 
-#: g10/g10.c:1190
+#: g10/g10.c:1215
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuário"
 
-#: g10/g10.c:1198
+#: g10/g10.c:1223
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuário [comandos]"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1239
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-usuário"
 
-#: g10/g10.c:1217
+#: g10/g10.c:1242
 msgid "--delete-key user-id"
 msgstr "--delete-key id-usuário"
 
-#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393
+#: g10/encode.c:265 g10/g10.c:1279 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossível abrir %s: %s\n"
 
-#: g10/g10.c:1269
+#: g10/g10.c:1294
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usuário] [chaveiro]"
 
-#: g10/g10.c:1335
+#: g10/g10.c:1360
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:1343
+#: g10/g10.c:1368
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "criaçăo de armadura falhou: %s\n"
 
 # "hash" poderia ser "espalhamento", mas năo fica claro
-#: g10/g10.c:1411
+#: g10/g10.c:1439
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inválido `%s'\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1520
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/g10.c:1496
+#: g10/g10.c:1524
 msgid "Go ahead and type your message ...\n"
 msgstr "Vá em frente e digite sua mensagem ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1499 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1527 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossível abrir `%s'\n"
 
-#: g10/g10.c:1669
+#: g10/g10.c:1700
 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:1675
+#: g10/g10.c:1706
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -894,12 +902,12 @@
 "um nome de notaçăo deve ter apenas letras, dígitos, pontos ou sublinhados e "
 "terminar com '='\n"
 
-#: g10/g10.c:1681
+#: g10/g10.c:1712
 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:1689
+#: g10/g10.c:1720
 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"
 
@@ -1279,58 +1287,58 @@
 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:433
+#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:435
 #, 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:438
+#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:440
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:537
+#: g10/keygen.c:539
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/keygen.c:539
+#: g10/keygen.c:541
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (padrăo)\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:542
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:544
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:543
+#: g10/keygen.c:545
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (assinatura e criptografia)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:547
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (assinatura e criptografia)\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:551
 msgid "Your selection? "
 msgstr "Sua opçăo? "
 
-#: g10/keygen.c:560 g10/keygen.c:568
+#: g10/keygen.c:562 g10/keygen.c:570
 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:582
+#: g10/keygen.c:584
 msgid "Invalid selection.\n"
 msgstr "Opçăo inválida.\n"
 
-#: g10/keygen.c:594
+#: g10/keygen.c:596
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1343,19 +1351,19 @@
 "              tamanho padrăo é 1024 bits\n"
 "     tamanho máximo sugerido é 2048 bits\n"
 
-#: g10/keygen.c:601
+#: g10/keygen.c:603
 msgid "What keysize do you want? (1024) "
 msgstr "Que tamanho de chave vocę quer? (1024) "
 
-#: g10/keygen.c:606
+#: g10/keygen.c:608
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA permite apenas tamanhos de 512 a 1024\n"
 
-#: g10/keygen.c:608
+#: g10/keygen.c:610
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "tamanho muito pequeno; 768 é o valor mínimo permitido.\n"
 
-#: g10/keygen.c:610
+#: g10/keygen.c:612
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "tamanho muito pequeno; 768 é o valor mínimo permitido.\n"
@@ -1368,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:621
+#: g10/keygen.c:623
 #, 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:626
+#: g10/keygen.c:628
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1381,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:629
+#: g10/keygen.c:631
 msgid "Are you sure that you want this keysize? "
 msgstr "Vocę tem certeza de que quer este tamanho de chave? "
 
-#: g10/keygen.c:630
+#: g10/keygen.c:632
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1393,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:638
+#: g10/keygen.c:640
 msgid "Do you really need such a large keysize? "
 msgstr "Vocę realmente precisa de uma chave tăo grande? "
 
-#: g10/keygen.c:644
+#: g10/keygen.c:646
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido é %u bits\n"
 
-#: g10/keygen.c:647 g10/keygen.c:651
+#: g10/keygen.c:649 g10/keygen.c:653
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:699
+#: g10/keygen.c:701
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1423,25 +1431,25 @@
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:714
+#: g10/keygen.c:716
 msgid "Key is valid for? (0) "
 msgstr "A chave é valida por? (0) "
 
-#: g10/keygen.c:719
+#: g10/keygen.c:721
 msgid "invalid value\n"
 msgstr "valor inválido\n"
 
-#: g10/keygen.c:724
+#: g10/keygen.c:726
 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:730
+#: g10/keygen.c:732
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "A chave expira em %s\n"
 
-#: g10/keygen.c:733
+#: g10/keygen.c:735
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1449,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:738
+#: g10/keygen.c:740
 msgid "Is this correct (y/n)? "
 msgstr "Está correto (s/n)? "
 
-#: g10/keygen.c:781
+#: g10/keygen.c:783
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1469,44 +1477,44 @@
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:793
+#: g10/keygen.c:795
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:803
 msgid "Invalid character in name\n"
 msgstr "Caractere inválido no nome\n"
 
-#: g10/keygen.c:799
+#: g10/keygen.c:805
 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:801
+#: g10/keygen.c:807
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:809
+#: g10/keygen.c:815
 msgid "Email address: "
 msgstr "Endereço de correio eletrônico: "
 
-#: g10/keygen.c:820
+#: g10/keygen.c:826
 msgid "Not a valid email address\n"
 msgstr "Endereço eletrônico inválido\n"
 
-#: g10/keygen.c:828
+#: g10/keygen.c:834
 msgid "Comment: "
 msgstr "Comentário: "
 
-#: g10/keygen.c:834
+#: g10/keygen.c:840
 msgid "Invalid character in comment\n"
 msgstr "Caractere inválido no comentário\n"
 
-#: g10/keygen.c:857
+#: g10/keygen.c:863
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vocę está usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:863
+#: g10/keygen.c:869
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1517,28 +1525,28 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:867
+#: g10/keygen.c:873
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:872
+#: g10/keygen.c:878
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:882
+#: g10/keygen.c:888
 #, 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:883
+#: g10/keygen.c:889
 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:902
+#: g10/keygen.c:908
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:940
+#: g10/keygen.c:946
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1546,11 +1554,11 @@
 "Vocę precisa de uma frase secreta para proteger sua chave.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:948
+#: g10/keyedit.c:468 g10/keygen.c:954
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "A frase secreta năo foi repetida corretamente; tente outra vez.\n"
 
-#: g10/keygen.c:954
+#: g10/keygen.c:960
 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"
@@ -1562,7 +1570,7 @@
 "qualquer hora, usando este programa com a opçăo \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:975
+#: g10/keygen.c:981
 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"
@@ -1574,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:1424
+#: g10/keygen.c:1430
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "O par de chaves DSA terá 1024 bits.\n"
 
-#: g10/keygen.c:1467
+#: g10/keygen.c:1473
 msgid "Key generation canceled.\n"
 msgstr "Geraçăo de chave cancelada.\n"
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1570
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escrevendo certificado público para `%s'\n"
 
-#: g10/keygen.c:1565
+#: g10/keygen.c:1571
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1667
 msgid "public and secret key created and signed.\n"
 msgstr "chaves pública e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1672
 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,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:1683 g10/keygen.c:1784
+#: g10/keygen.c:1689 g10/keygen.c:1790
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A geraçăo de chaves falhou: %s\n"
 
-#: g10/keygen.c:1727 g10/sig-check.c:318 g10/sign.c:112
+#: g10/keygen.c:1733 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"
@@ -1617,7 +1625,7 @@
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no relógio)\n"
 
-#: g10/keygen.c:1729 g10/sig-check.c:320 g10/sign.c:114
+#: g10/keygen.c:1735 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"
@@ -1625,11 +1633,11 @@
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no relógio)\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1768
 msgid "Really create? "
 msgstr "Realmente criar? "
 
-#: g10/encode.c:91 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/encode.c:91 g10/openfile.c:178 g10/openfile.c:288 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1640,17 +1648,17 @@
 msgid "error creating passphrase: %s\n"
 msgstr "erro na criaçăo da frase secreta: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:319
+#: g10/encode.c:171 g10/encode.c:324
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: AVISO: arquivo vazio\n"
 
-#: g10/encode.c:266
+#: g10/encode.c:271
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encode.c:483
+#: g10/encode.c:492
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s criptografado para: %s\n"
@@ -1699,248 +1707,258 @@
 msgid "No user ID for key\n"
 msgstr "Nenhum identificador de usuário para chave\n"
 
-#: g10/getkey.c:1642 g10/getkey.c:1698
+#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "usando chave secundária %08lX ao invés de chave primária %08lX\n"
 
-#: g10/getkey.c:2017
+#: g10/getkey.c:2050
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: usuário năo encontrado\n"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloco do tipo %d\n"
 
-#: g10/import.c:188 g10/trustdb.c:1740 g10/trustdb.c:1781
+#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu chaves processadas até agora\n"
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/import.c:203
+#: g10/import.c:204
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Número total processado: %lu\n"
 
-#: g10/import.c:205
+#: g10/import.c:206
+#, fuzzy, c-format
+msgid "      skipped new keys: %lu\n"
+msgstr "           novas subchaves: %lu\n"
+
+#: g10/import.c:209
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sem IDs de usuários: %lu\n"
 
-#: g10/import.c:207
+#: g10/import.c:211
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importados: %lu"
 
-#: g10/import.c:213
+#: g10/import.c:217
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             năo modificados: %lu\n"
 
-#: g10/import.c:215
+#: g10/import.c:219
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          novos IDs de usuários: %lu\n"
 
-#: g10/import.c:217
+#: g10/import.c:221
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:223
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        novas assinaturas: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:225
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   novas revogaçőes de chaves: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:227
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:229
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chaves secretas importadas: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:231
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " chaves secretas năo modificadas: %lu\n"
 
-#: g10/import.c:386 g10/import.c:578
+#: g10/import.c:391 g10/import.c:590
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "chave %08lX: sem ID de usuário\n"
 
-#: g10/import.c:400
+#: g10/import.c:405
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "chave %08lX: sem IDs de usuários válidos\n"
 
-#: g10/import.c:402
+#: g10/import.c:407
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
 
-#: g10/import.c:413 g10/import.c:645
+#: g10/import.c:418 g10/import.c:657
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "chave %08lX: chave pública năo encontrada: %s\n"
 
-#: g10/import.c:419
+#: g10/import.c:423
+#, fuzzy, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "chave %08lX: năo é uma chave rfc2440 - ignorada\n"
+
+#: g10/import.c:431
 msgid "no default public keyring\n"
 msgstr "sem chaveiro público padrăo\n"
 
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
+#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escrevendo para `%s'\n"
 
-#: g10/import.c:426 g10/import.c:484 g10/import.c:593 g10/import.c:694
+#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "impossível bloquear chaveiro `%s': %s\n"
 
-#: g10/import.c:429 g10/import.c:487 g10/import.c:596 g10/import.c:697
+#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/import.c:434
+#: g10/import.c:446
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "chave %08lX: chave pública importada\n"
 
-#: g10/import.c:451
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "chave %08lX: năo corresponde ŕ nossa cópia\n"
 
-#: g10/import.c:460 g10/import.c:653
+#: g10/import.c:472 g10/import.c:665
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "chave %08lX: impossível localizar bloco de chaves original: %s\n"
 
-#: g10/import.c:466 g10/import.c:659
+#: g10/import.c:478 g10/import.c:671
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "chave %08lX: impossível ler bloco de chaves original: %s\n"
 
-#: g10/import.c:493
+#: g10/import.c:505
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "chave %8lX: 1 novo ID de usuário\n"
 
-#: g10/import.c:496
+#: g10/import.c:508
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "chave %08lX: %d novos IDs de usuários\n"
 
-#: g10/import.c:499
+#: g10/import.c:511
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "chave %08lX: 1 nova assinatura\n"
 
-#: g10/import.c:502
+#: g10/import.c:514
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:505
+#: g10/import.c:517
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "chave %08lX: 1 nova subchave\n"
 
-#: g10/import.c:508
+#: g10/import.c:520
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "chave %08lX: %d novas subchaves\n"
 
-#: g10/import.c:518
+#: g10/import.c:530
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "chave %08lX: năo modificada\n"
 
-#: g10/import.c:601
+#: g10/import.c:613
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
 #. we can't merge secret keys
-#: g10/import.c:605
+#: g10/import.c:617
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "chave %08lX: já está no chaveiro secreto\n"
 
-#: g10/import.c:610
+#: g10/import.c:622
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta năo encontrada: %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:651
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chave %08lX: sem chave pública - impossível aplicar certificado\n"
 "de revogaçăo\n"
 
-#: g10/import.c:670
+#: g10/import.c:682
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "chave %08lX: certificado de revogaçăo inválido: %s - rejeitado\n"
 
-#: g10/import.c:702
+#: g10/import.c:714
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "chave %08lX: certificado de revogaçăo importado\n"
 
-#: g10/import.c:744
+#: g10/import.c:756
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "chave %08lX: nenhum ID de usuário para assinatura\n"
 
-#: g10/import.c:751 g10/import.c:775
+#: g10/import.c:763 g10/import.c:787
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave pública năo suportado\n"
 
-#: g10/import.c:752
+#: g10/import.c:764
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "chave %08lX: auto-assinatura inválida\n"
 
-#: g10/import.c:767
+#: g10/import.c:779
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "chave %08lX: sem subchave para ligaçăo de chaves\n"
 
-#: g10/import.c:776
+#: g10/import.c:788
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "chave %08lX: ligaçăo de subchave inválida\n"
 
-#: g10/import.c:803
+#: g10/import.c:815
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "chave %08lX: aceito ID de usuário sem auto-assinatura '"
 
-#: g10/import.c:832
+#: g10/import.c:844
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "chave %08lX: ignorado ID de usuário '"
 
-#: g10/import.c:855
+#: g10/import.c:867
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
@@ -1949,32 +1967,32 @@
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:880
+#: g10/import.c:892
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "chave %08lX: assinatura năo exportável (classe %02x) - ignorada\n"
 
-#: g10/import.c:889
+#: g10/import.c:901
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revogaçăo no local errado - ignorada\n"
 
-#: g10/import.c:897
+#: g10/import.c:909
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revogaçăo inválido: %s - ignorada\n"
 
-#: g10/import.c:997
+#: g10/import.c:1009
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: detectado ID de usuário duplicado - unido\n"
 
-#: g10/import.c:1048
+#: g10/import.c:1060
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "chave %08lX: certificado de revogaçăo adicionado\n"
 
-#: g10/import.c:1162 g10/import.c:1215
+#: g10/import.c:1174 g10/import.c:1227
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "chave %08lX: nossa cópia năo tem auto-assinatura\n"
@@ -2554,8 +2572,18 @@
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
+#: g10/keylist.c:158
+#, fuzzy
+msgid "invalid"
+msgstr "armadura inválida"
+
+#: g10/keylist.c:178
+#, fuzzy
+msgid "revoked"
+msgstr "revkey"
+
 #. of subkey
-#: g10/keylist.c:318 g10/mainproc.c:742
+#: g10/keylist.c:400 g10/mainproc.c:760
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "A chave expira em %s\n"
@@ -2565,129 +2593,117 @@
 msgid "public key is %08lX\n"
 msgstr "a chave pública é %08lX\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:257
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados criptografados com chave pública: DEK válido\n"
 
-#: g10/mainproc.c:281
+#: g10/mainproc.c:299
 #, 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:291
+#: g10/mainproc.c:309
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "criptografado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:297
+#: g10/mainproc.c:315
 msgid "no secret key for decryption available\n"
 msgstr "nenhuma chave secreta para descriptografia disponível\n"
 
-#: g10/mainproc.c:306
+#: g10/mainproc.c:324
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descriptografia de chave pública falhou: %s\n"
 
-#: g10/mainproc.c:343
+#: g10/mainproc.c:361
 msgid "decryption okay\n"
 msgstr "descriptografia correta\n"
 
-#: g10/mainproc.c:348
+#: g10/mainproc.c:366
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem criptografada foi manipulada!\n"
 
-#: g10/mainproc.c:353
+#: g10/mainproc.c:371
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/mainproc.c:372
+#: g10/mainproc.c:390
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:374
+#: g10/mainproc.c:392
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome de arquivo original='%.*s'\n"
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:544
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revogaçăo isolada - use \"gpg --import\" para aplicá-la\n"
 
-#: g10/mainproc.c:613 g10/mainproc.c:622
+#: g10/mainproc.c:631 g10/mainproc.c:640
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: dados de notaçăo inválidos encontrados\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:643
 msgid "Notation: "
 msgstr "Notaçăo: "
 
-#: g10/mainproc.c:632
+#: g10/mainproc.c:650
 msgid "Policy: "
 msgstr "Política: "
 
-#: g10/mainproc.c:1062
+#: g10/mainproc.c:1080
 msgid "signature verification suppressed\n"
 msgstr "verificaçăo de assinatura suprimida\n"
 
-#: g10/mainproc.c:1068
+#: g10/mainproc.c:1086
 #, 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:1094 g10/mainproc.c:1105
+#: g10/mainproc.c:1112 g10/mainproc.c:1123
 msgid "BAD signature from \""
 msgstr "Assinatura INCORRETA de \""
 
-#: g10/mainproc.c:1095 g10/mainproc.c:1106
+#: g10/mainproc.c:1113 g10/mainproc.c:1124
 msgid "Good signature from \""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1097
+#: g10/mainproc.c:1115
 msgid "                aka \""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1153
+#: g10/mainproc.c:1171
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossível verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1235
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura isolada da classe 0x%02x\n"
 
-#: g10/mainproc.c:1263
+#: g10/mainproc.c:1281
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:1268
+#: g10/mainproc.c:1286
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inválido detectado em proc_tree()\n"
 
-#: g10/misc.c:94
+#: g10/misc.c:96
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "impossível desativar core dumps: %s\n"
 
-#: g10/misc.c:97
-msgid "WARNING: program may create a core file!\n"
-msgstr "AVISO: O programa pode criar um arquivo core!\n"
-
-#: g10/misc.c:205
+#: g10/misc.c:206
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Algoritmos experimentais năo devem ser usados!\n"
 
-#: g10/misc.c:219
-msgid ""
-"RSA keys are deprecated; please consider creating a new key and use this key "
-"in the future\n"
-msgstr ""
-"Chaves RSA năo săo recomendáveis; por favor considere criar uma nova chave e "
-"usá-la no futuro\n"
-
-#: g10/misc.c:241
+#: g10/misc.c:233
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 "este algoritmo de criptografia é depreciado; por favor use algum\n"
@@ -2698,7 +2714,7 @@
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossível manipular algoritmo de chave pública %d\n"
 
-#: g10/parse-packet.c:965
+#: g10/parse-packet.c:986
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit crítico ligado\n"
@@ -2735,90 +2751,90 @@
 msgid "Repeat passphrase: "
 msgstr "Repita a frase secreta: "
 
-#: g10/plaintext.c:63
+#: g10/plaintext.c:67
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "dados năo salvos; use a opçăo \"--output\" para salvá-los\n"
 
-#: g10/plaintext.c:317
+#: g10/plaintext.c:324
 msgid "Detached signature.\n"
 msgstr "Assinatura separada.\n"
 
-#: g10/plaintext.c:321
+#: g10/plaintext.c:328
 msgid "Please enter name of data file: "
 msgstr "Por favor digite o nome do arquivo de dados: "
 
-#: g10/plaintext.c:342
+#: g10/plaintext.c:349
 msgid "reading stdin ...\n"
 msgstr "lendo de \"stdin\" ...\n"
 
-#: g10/plaintext.c:385
+#: g10/plaintext.c:392
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "impossível abrir dados assinados `%s'\n"
 
-#: g10/pubkey-enc.c:79
+#: g10/pubkey-enc.c:76
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "destinatário anônimo; tentando chave secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:85
+#: g10/pubkey-enc.c:82
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "certo, nós somos o destinatário anônimo.\n"
 
-#: g10/pubkey-enc.c:137
+#: g10/pubkey-enc.c:134
 msgid "old encoding of the DEK is not supported\n"
 msgstr "codificaçăo antiga do DEK năo suportada\n"
 
-#: g10/pubkey-enc.c:156
+#: g10/pubkey-enc.c:153
 #, fuzzy, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "algoritmo de proteçăo %d năo é suportado\n"
 
-#: g10/pubkey-enc.c:195
+#: g10/pubkey-enc.c:192
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "NOTA: algoritmo de criptografia %d năo encontrado nas preferęncias\n"
 
-#: g10/pubkey-enc.c:201
+#: g10/pubkey-enc.c:198
 #, fuzzy, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTA: chave de assinatura expirou %s\n"
 
-#: g10/hkp.c:62
+#: g10/hkp.c:72
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
 msgstr ""
 
-#: g10/hkp.c:75
+#: g10/hkp.c:85
 #, fuzzy, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "impossível escrever para o chaveiro: %s\n"
 
-#: g10/hkp.c:98 g10/hkp.c:136
+#: g10/hkp.c:109 g10/hkp.c:148
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/hkp.c:106
+#: g10/hkp.c:117
 #, fuzzy, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "%s năo é um mapa de caracteres válido\n"
 
-#: g10/hkp.c:158
+#: g10/hkp.c:170
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
 
-#: g10/hkp.c:182
+#: g10/hkp.c:194
 #, fuzzy, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/hkp.c:194
+#: g10/hkp.c:206
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr ""
 
-#: g10/hkp.c:197
+#: g10/hkp.c:209
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
@@ -2833,41 +2849,41 @@
 msgid "protection algorithm %d is not supported\n"
 msgstr "algoritmo de proteçăo %d năo é suportado\n"
 
-#: g10/seckey-cert.c:175
+#: g10/seckey-cert.c:184
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Frase secreta inválida; por favor tente novamente ...\n"
 
-#: g10/seckey-cert.c:231
+#: g10/seckey-cert.c:240
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVISO: Chave fraca detectada - por favor mude a frase secreta novamente.\n"
 
-#: g10/sig-check.c:202
+#: g10/sig-check.c:199
 msgid "assuming bad MDC due to an unknown critical bit\n"
 msgstr "assumindo MDC incorreto devido a um bit crítico desconhecido\n"
 
-#: g10/sig-check.c:300
+#: g10/sig-check.c:297
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "esta é uma chave ElGamal gerada pelo PGP que NĂO é segura para assinaturas!\n"
 
-#: g10/sig-check.c:308
+#: g10/sig-check.c:305
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "a chave pública é %lu segundo mais nova que a assinatura\n"
 
-#: g10/sig-check.c:309
+#: g10/sig-check.c:306
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "a chave pública é %lu segundos mais nova que a assinatura\n"
 
-#: g10/sig-check.c:327
+#: g10/sig-check.c:324
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "NOTA: chave de assinatura expirou %s\n"
 
-#: g10/sig-check.c:396
+#: g10/sig-check.c:393
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "assumindo assinatura incorreta devido a um bit crítico desconhecido\n"
 
@@ -2876,7 +2892,7 @@
 msgid "%s signature from: %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:606
+#: g10/sign.c:290 g10/sign.c:610
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "impossível criar %s: %s\n"
@@ -2924,7 +2940,7 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: diretório inexistente!\n"
 
-#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1363 g10/tdbio.c:444
+#: g10/openfile.c:226 g10/openfile.c:295 g10/ringedit.c:1369 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: impossível criar: %s\n"
@@ -3026,289 +3042,299 @@
 "O banco de dados de confiabilidade está danificado; por favor rode\n"
 "\"gpg --fix-trust-db\".\n"
 
-#: g10/trustdb.c:168
+#: g10/trustdb.c:169
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "registro de confiança %lu, tipo req %d: falha na leitura: %s\n"
 
-#: g10/trustdb.c:183
+#: g10/trustdb.c:184
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "registro de confiança %lu, tipo %d: escrita falhou: %s\n"
 
-#: g10/trustdb.c:197
+#: g10/trustdb.c:198
 #, c-format
 msgid "trust record %lu: delete failed: %s\n"
 msgstr "registro de confiança %lu: remoçăo falhou: %s\n"
 
-#: g10/trustdb.c:211
+#: g10/trustdb.c:212
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "banco de dados de confiabilidade: sincronizaçăo falhou: %s\n"
 
-#: g10/trustdb.c:376
+#: g10/trustdb.c:377
 #, c-format
 msgid "error reading dir record for LID %lu: %s\n"
 msgstr "erro lendo registro de diretório para LID %lu: %s\n"
 
-#: g10/trustdb.c:383
+#: g10/trustdb.c:384
 #, c-format
 msgid "lid %lu: expected dir record, got type %d\n"
 msgstr "lid %lu: registro de diretório esperado, tipo %d recebido\n"
 
-#: g10/trustdb.c:388
+#: g10/trustdb.c:389
 #, c-format
 msgid "no primary key for LID %lu\n"
 msgstr "nenhuma chave primária para LID %lu\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:394
 #, c-format
 msgid "error reading primary key for LID %lu: %s\n"
 msgstr "erro lendo chave primária para LID %lu: %s\n"
 
-#: g10/trustdb.c:432
+#: g10/trustdb.c:433
 #, c-format
 msgid "get_dir_record: search_record failed: %s\n"
 msgstr "get_dir_record: search_record falhou: %s\n"
 
-#: g10/trustdb.c:487
-#, c-format
-msgid "NOTE: secret key %08lX is NOT protected.\n"
-msgstr "NOTA: a chave secreta %08lX NĂO está protegida.\n"
-
-#: g10/trustdb.c:495
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr "chave %08lX: chave secreta sem chave pública - ignorada\n"
-
-#: g10/trustdb.c:502
-#, c-format
-msgid "key %08lX: secret and public key don't match\n"
-msgstr "chave %08lX: chaves secreta e pública năo săo correspondentes\n"
+#: g10/trustdb.c:474
+#, fuzzy, c-format
+msgid "'%s' is not a valid long keyID\n"
+msgstr "%s năo é um mapa de caracteres válido\n"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:501
 #, c-format
 msgid "key %08lX: can't put it into the trustdb\n"
 msgstr ""
 "chave %08lX: impossível colocá-la no banco de dados de confiabilidade\n"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:507
 #, c-format
 msgid "key %08lX: query record failed\n"
 msgstr "chave %08lX: pedido de registro falhou\n"
 
-#: g10/trustdb.c:529
+#: g10/trustdb.c:516
 #, c-format
 msgid "key %08lX: already in trusted key table\n"
 msgstr "chave %08lX: já está na tabela de chaves confiáveis\n"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:519
 #, c-format
 msgid "key %08lX: accepted as trusted key.\n"
 msgstr "chave %08lX: aceita como chave confiável.\n"
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:546
+#, fuzzy, c-format
+msgid "key %08lX: no public key for trusted key - skipped\n"
+msgstr "chave %08lX: chave secreta sem chave pública - ignorada\n"
+
+#: g10/trustdb.c:565
+#, c-format
+msgid "NOTE: secret key %08lX is NOT protected.\n"
+msgstr "NOTA: a chave secreta %08lX NĂO está protegida.\n"
+
+#: g10/trustdb.c:577
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr "chave %08lX: chave secreta sem chave pública - ignorada\n"
+
+#: g10/trustdb.c:584
+#, c-format
+msgid "key %08lX: secret and public key don't match\n"
+msgstr "chave %08lX: chaves secreta e pública năo săo correspondentes\n"
+
+#: g10/trustdb.c:597
 #, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr "enumeraçăo de chaves secretas falhou: %s\n"
 
-#: g10/trustdb.c:921
+#: g10/trustdb.c:987
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "chave %08lX.%lu: Ligaçăo de subchave válida\n"
 
-#: g10/trustdb.c:927 g10/trustdb.c:962
+#: g10/trustdb.c:993 g10/trustdb.c:1028
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "chave %08lX.%lu: Ligaçăo de subchave inválida: %s\n"
 
-#: g10/trustdb.c:939
+#: g10/trustdb.c:1005
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "chave %08lX.%lu: Revogaçăo de chave válida\n"
 
-#: g10/trustdb.c:945
+#: g10/trustdb.c:1011
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "chave %08lX.%lu: Revogaçăo de chave inválida: %s\n"
 
-#: g10/trustdb.c:956
+#: g10/trustdb.c:1022
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "chave %08lX.%lu: Revogaçăo de subchave válida\n"
 
-#: g10/trustdb.c:1067
+#: g10/trustdb.c:1133
 msgid "Good self-signature"
 msgstr "Auto-assinatura válida"
 
-#: g10/trustdb.c:1077
+#: g10/trustdb.c:1143
 msgid "Invalid self-signature"
 msgstr "Auto-assinatura inválida"
 
-#: g10/trustdb.c:1104
+#: g10/trustdb.c:1170
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 "Revogaçăo válida de ID de usuário ignorada devido a nova auto-assinatura"
 
-#: g10/trustdb.c:1110
+#: g10/trustdb.c:1176
 msgid "Valid user ID revocation"
 msgstr "Revogaçăo de ID de usuário válida"
 
-#: g10/trustdb.c:1115
+#: g10/trustdb.c:1181
 msgid "Invalid user ID revocation"
 msgstr "Revogaçăo de ID de usuário inválida"
 
-#: g10/trustdb.c:1157
+#: g10/trustdb.c:1223
 msgid "Valid certificate revocation"
 msgstr "Certificado de revogaçăo válido"
 
-#: g10/trustdb.c:1158
+#: g10/trustdb.c:1224
 msgid "Good certificate"
 msgstr "Certificado correto"
 
-#: g10/trustdb.c:1186
+#: g10/trustdb.c:1252
 msgid "Invalid certificate revocation"
 msgstr "Certificado de revogaçăo inválido"
 
-#: g10/trustdb.c:1187
+#: g10/trustdb.c:1253
 msgid "Invalid certificate"
 msgstr "Certificado inválido"
 
-#: g10/trustdb.c:1204 g10/trustdb.c:1208
+#: g10/trustdb.c:1270 g10/trustdb.c:1274
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "registro de assinatura %lu[%d] aponta para registro errado.\n"
 
-#: g10/trustdb.c:1267
+#: g10/trustdb.c:1333
 msgid "duplicated certificate - deleted"
 msgstr "certificado duplicado - removido"
 
-#: g10/trustdb.c:1584
+#: g10/trustdb.c:1650
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir falhou: %s\n"
 
-#: g10/trustdb.c:1718
+#: g10/trustdb.c:1784
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: inserçăo falhou: %s\n"
 
-#: g10/trustdb.c:1723
+#: g10/trustdb.c:1789
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: inserçăo falhou: %s\n"
 
-#: g10/trustdb.c:1729
+#: g10/trustdb.c:1795
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: inserido\n"
 
-#: g10/trustdb.c:1734
+#: g10/trustdb.c:1800
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "erro lendo registro de diretório: %s\n"
 
-#: g10/trustdb.c:1742 g10/trustdb.c:1805
+#: g10/trustdb.c:1808 g10/trustdb.c:1871
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu chaves processadas\n"
 
-#: g10/trustdb.c:1744 g10/trustdb.c:1811
+#: g10/trustdb.c:1810 g10/trustdb.c:1877
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu chaves com erros\n"
 
-#: g10/trustdb.c:1746
+#: g10/trustdb.c:1812
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu chaves inseridas\n"
 
-#: g10/trustdb.c:1749
+#: g10/trustdb.c:1815
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "enumeraçăo de blocos de chaves falhou: %s\n"
 
-#: g10/trustdb.c:1797
+#: g10/trustdb.c:1863
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: registro de diretório sem chave - ignorado\n"
 
-#: g10/trustdb.c:1807
+#: g10/trustdb.c:1873
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "\t%lu devido a novas chaves públicas\n"
 
-#: g10/trustdb.c:1809
+#: g10/trustdb.c:1875
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu chaves ignoradas\n"
 
-#: g10/trustdb.c:1813
+#: g10/trustdb.c:1879
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu chaves atualizadas\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2224
 msgid "Ooops, no keys\n"
 msgstr "Ooops, nenhuma chave\n"
 
-#: g10/trustdb.c:2162
+#: g10/trustdb.c:2228
 msgid "Ooops, no user IDs\n"
 msgstr "Ooops, nenhum ID de usuário\n"
 
-#: g10/trustdb.c:2320
+#: g10/trustdb.c:2386
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: busca de registro de diretório falhou: %s\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2395
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "chave %08lX: inserçăo de registro de confiança falhou: %s\n"
 
-#: g10/trustdb.c:2333
+#: g10/trustdb.c:2399
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "chave %08lX.%lu: inserida no banco de dados de confiabilidade\n"
 
-#: g10/trustdb.c:2341
+#: g10/trustdb.c:2407
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "chave %08lX.%lu: criada no futuro (viagem no tempo ou problema no relogio)\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2422
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "chave %08lX.%lu: expirou em %s\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2430
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "chave %08lX.%lu: verificaçăo de confiança falhou: %s\n"
 
-#: g10/trustdb.c:2515
+#: g10/trustdb.c:2581
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "usuário `%s' năo encontrado: %s\n"
 
-#: g10/trustdb.c:2517
+#: g10/trustdb.c:2583
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problemas na procura de `%s' no banco de dados de confiabilidade: %s\n"
 
-#: g10/trustdb.c:2520
+#: g10/trustdb.c:2586
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr ""
 "usuário `%s' năo encontrado no banco de dados de confiabilidade - inserindo\n"
 
-#: g10/trustdb.c:2523
+#: g10/trustdb.c:2589
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "falha ao colocar `%s' no banco de dados de confiabilidade: %s\n"
 
-#: g10/trustdb.c:2709 g10/trustdb.c:2739
+#: g10/trustdb.c:2775 g10/trustdb.c:2805
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "AVISO: ainda é impossível manipular registros de preferęncias longos\n"
 
@@ -3332,26 +3358,26 @@
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: impossível criar chaveiro: %s\n"
 
-#: g10/ringedit.c:319 g10/ringedit.c:1368
+#: g10/ringedit.c:319 g10/ringedit.c:1374
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: chaveiro criado\n"
 
-#: g10/ringedit.c:1545
+#: g10/ringedit.c:1551
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVISO: existem 2 arquivos com informaçőes confidenciais.\n"
 
-#: g10/ringedit.c:1546
+#: g10/ringedit.c:1552
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s é o năo modificado\n"
 
-#: g10/ringedit.c:1547
+#: g10/ringedit.c:1553
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s é o novo\n"
 
-#: g10/ringedit.c:1548
+#: g10/ringedit.c:1554
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor conserte este possível furo de segurança\n"
 
@@ -3376,49 +3402,49 @@
 "para assinaturas!\n"
 
 #. do not overwrite
-#: g10/openfile.c:79
+#: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Arquivo `%s' já existe. "
 
-#: g10/openfile.c:81
+#: g10/openfile.c:86
 msgid "Overwrite (y/N)? "
 msgstr "Sobrescrever (s/N)? "
 
-#: g10/openfile.c:109
+#: g10/openfile.c:119
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: sufixo desconhecido\n"
 
-#: g10/openfile.c:131
+#: g10/openfile.c:141
 msgid "Enter new filename"
 msgstr "Digite novo nome de arquivo"
 
-#: g10/openfile.c:172
+#: g10/openfile.c:182
 msgid "writing to stdout\n"
 msgstr "escrevendo em \"stdout\"\n"
 
-#: g10/openfile.c:250
+#: g10/openfile.c:261
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "assumindo dados assinados em `%s'\n"
 
-#: g10/openfile.c:300
+#: g10/openfile.c:311
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: novo arquivo de opçőes criado\n"
 
-#: g10/openfile.c:313
+#: g10/openfile.c:338
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: impossível criar diretório: %s\n"
 
-#: g10/openfile.c:316
+#: g10/openfile.c:341
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: diretório criado\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:343
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr ""
 "vocę deve reiniciar o GnuPG, para que ele possa ler o novo arquivo\n"
@@ -3715,6 +3741,13 @@
 msgid "No help available for `%s'"
 msgstr "Nenhuma ajuda disponível para `%s'"
 
+#~ msgid ""
+#~ "RSA keys are deprecated; please consider creating a new key and use this key "
+#~ "in the future\n"
+#~ msgstr ""
+#~ "Chaves RSA năo săo recomendáveis; por favor considere criar uma nova chave e "
+#~ "usá-la no futuro\n"
+
 #~ msgid "set debugging flags"
 #~ msgstr "definir parâmetros de depuraçăo"
 
@@ -3874,10 +3907,6 @@
 #, fuzzy
 #~ msgid "chained sigrec %lu has a wrong owner\n"
 #~ msgstr "sigrec em cadeia %lu possui dono errado\n"
-
-#, fuzzy
-#~ msgid "key %08lX: no public key for trusted key - skipped\n"
-#~ msgstr "chave %08lX: chave secreta sem chave pública - ignorada\n"
 
 #, fuzzy
 #~ msgid "lid %lu: read dir record failed: %s\n"
diff -urN gnupg-1.0.2/po/pt_PT.po gnupg-1.0.3/po/pt_PT.po
--- gnupg-1.0.2/po/pt_PT.po	Wed Jul 12 14:59:45 2000
+++ gnupg-1.0.3/po/pt_PT.po	Mon Sep 18 12:18:07 2000
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
-"POT-Creation-Date: 2000-07-12 12:13+0200\n"
+"POT-Creation-Date: 2000-09-18 12:17+0200\n"
 "PO-Revision-Date: 1999-09-09 20:28+0000\n"
 "Last-Translator: Pedro Morais <morais@poli.org>\n"
 "Language-Team: pt\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:127 g10/keygen.c:1249
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1255
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
@@ -310,11 +310,11 @@
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:647
+#: cipher/random.c:650
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVISO: a utilizar gerador de números aleatórios inseguro!\n"
 
-#: cipher/random.c:648
+#: cipher/random.c:651
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -328,7 +328,7 @@
 "NĂO USE NENHUM DADO GERADO POR ESTE PROGRAMA!\n"
 "\n"
 
-#: cipher/rndlinux.c:141
+#: cipher/rndlinux.c:142
 #, c-format
 msgid ""
 "\n"
@@ -339,7 +339,7 @@
 "Năo há bytes aleatórios suficientes. Por favor, faça outro trabalho para\n"
 "que o sistema possa recolher mais entropia! (Săo necessários mais %d bytes)\n"
 
-#: g10/g10.c:197
+#: g10/g10.c:206
 msgid ""
 "@Commands:\n"
 " "
@@ -347,140 +347,140 @@
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:199
+#: g10/g10.c:208
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|fazer uma assinatura"
 
-#: g10/g10.c:200
+#: g10/g10.c:209
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
 
-#: g10/g10.c:201
+#: g10/g10.c:210
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/g10.c:202
+#: g10/g10.c:211
 msgid "encrypt data"
 msgstr "encriptar dados"
 
-#: g10/g10.c:203
+#: g10/g10.c:212
 msgid "encryption only with symmetric cipher"
 msgstr "encriptar apenas com cifra simétrica"
 
-#: g10/g10.c:204
+#: g10/g10.c:213
 msgid "store only"
 msgstr "apenas armazenar"
 
-#: g10/g10.c:205
+#: g10/g10.c:214
 msgid "decrypt data (default)"
 msgstr "desencriptar dados (acçăo por omissăo)"
 
-#: g10/g10.c:206
+#: g10/g10.c:215
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/g10.c:208
+#: g10/g10.c:217
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/g10.c:210
+#: g10/g10.c:219
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/g10.c:211
+#: g10/g10.c:220
 msgid "check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/g10.c:212
+#: g10/g10.c:221
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impressőes digitais"
 
-#: g10/g10.c:213
+#: g10/g10.c:222
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/g10.c:214
+#: g10/g10.c:223
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/g10.c:215
+#: g10/g10.c:224
 msgid "remove key from the public keyring"
 msgstr "remover a chave do porta-chaves público"
 
-#: g10/g10.c:217
+#: g10/g10.c:226
 msgid "remove key from the secret keyring"
 msgstr "remover a chave do porta-chaves secreto"
 
-#: g10/g10.c:218
+#: g10/g10.c:227
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/g10.c:219
+#: g10/g10.c:228
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:220
+#: g10/g10.c:229
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/g10.c:221
+#: g10/g10.c:230
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revogaçăo"
 
-#: g10/g10.c:222
+#: g10/g10.c:231
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:223
+#: g10/g10.c:232
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/g10.c:224
+#: g10/g10.c:233
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
-#: g10/g10.c:228
+#: g10/g10.c:237
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/g10.c:230
+#: g10/g10.c:239
 msgid "list only the sequence of packets"
 msgstr "listar apenas as sequęncias de pacotes"
 
 # ownertrust ???
-#: g10/g10.c:232
+#: g10/g10.c:241
 msgid "export the ownertrust values"
 msgstr "exportar os valores de confiança"
 
-#: g10/g10.c:234
+#: g10/g10.c:243
 msgid "import ownertrust values"
 msgstr "importar os valores de confiança"
 
-#: g10/g10.c:236
+#: g10/g10.c:245
 msgid "update the trust database"
 msgstr "actualizar a base de dados de confiança"
 
-#: g10/g10.c:238
+#: g10/g10.c:247
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMES]|verificar a base de dados de confiança"
 
-#: g10/g10.c:239
+#: g10/g10.c:248
 msgid "fix a corrupted trust database"
 msgstr "consertar uma base de dados de confiança"
 
-#: g10/g10.c:240
+#: g10/g10.c:249
 msgid "De-Armor a file or stdin"
 msgstr "retirar armadura de um ficheiro ou do \"stdin\""
 
-#: g10/g10.c:242
+#: g10/g10.c:251
 msgid "En-Armor a file or stdin"
 msgstr "criar armadura para um ficheiro ou \"stdin\""
 
-#: g10/g10.c:244
+#: g10/g10.c:253
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
-#: g10/g10.c:248
+#: g10/g10.c:257
 msgid ""
 "@\n"
 "Options:\n"
@@ -490,171 +490,175 @@
 "Opçőes:\n"
 " "
 
-#: g10/g10.c:250
+#: g10/g10.c:259
 msgid "create ascii armored output"
 msgstr "criar saída com armadura ascii"
 
-#: g10/g10.c:252
+#: g10/g10.c:261
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|encriptar para NOME"
 
-#: g10/g10.c:255
+#: g10/g10.c:264
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usar NOME como destinatário padrăo"
 
-#: g10/g10.c:257
+#: g10/g10.c:266
 msgid "use the default key as default recipient"
 msgstr "usar a chave padrăo como destinatário padrăo"
 
-#: g10/g10.c:261
+#: g10/g10.c:270
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de utilizador para\n"
 "assinar ou desencriptar"
 
-#: g10/g10.c:262
+#: g10/g10.c:271
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer nível de compressăo N\n"
 "(0 desactiva)"
 
-#: g10/g10.c:264
+#: g10/g10.c:273
 msgid "use canonical text mode"
 msgstr "usar modo de texto canônico"
 
-#: g10/g10.c:265
+#: g10/g10.c:274
 msgid "use as output file"
 msgstr "usar como ficheiro de saída"
 
-#: g10/g10.c:266
+#: g10/g10.c:275
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/g10.c:267
+#: g10/g10.c:276
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/g10.c:268
+#: g10/g10.c:277
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: g10/g10.c:269
+#: g10/g10.c:278
 msgid "force v3 signatures"
 msgstr "forçar assinaturas v3"
 
-#: g10/g10.c:270
+#: g10/g10.c:279
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para encriptar"
 
-#: g10/g10.c:271
+#: g10/g10.c:280
 msgid "do not make any changes"
 msgstr "năo fazer alteraçőes"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:273
+#: g10/g10.c:282
 msgid "batch mode: never ask"
 msgstr "modo năo-interactivo: nunca perguntar"
 
-#: g10/g10.c:274
+#: g10/g10.c:283
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: g10/g10.c:275
+#: g10/g10.c:284
 msgid "assume no on most questions"
 msgstr "assumir năo para a maioria das perguntas"
 
-#: g10/g10.c:276
+#: g10/g10.c:285
 msgid "add this keyring to the list of keyrings"
 msgstr ""
 "adicionar este porta-chaves\n"
 "ŕ lista de porta-chaves"
 
-#: g10/g10.c:277
+#: g10/g10.c:286
 msgid "add this secret keyring to the list"
 msgstr "adicionar este porta-chaves secreto ŕ lista"
 
-#: g10/g10.c:278
+#: g10/g10.c:287
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta por omissăo"
 
-#: g10/g10.c:279
+#: g10/g10.c:288
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDEREÇO|usar este servidor para buscar chaves"
 
-#: g10/g10.c:280
+#: g10/g10.c:289
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: g10/g10.c:281
+#: g10/g10.c:290
 msgid "read options from file"
 msgstr "ler opçőes do ficheiro"
 
-#: g10/g10.c:285
+#: g10/g10.c:294
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|DF|escrever informaçőes de estado para o\n"
 "descritor de ficheiro DF"
 
-#: g10/g10.c:290
+#: g10/g10.c:299
+msgid "|KEYID|ulimately trust this key"
+msgstr ""
+
+#: g10/g10.c:300
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHEIRO|carregar módulo de extensăo FICHEIRO"
 
-#: g10/g10.c:291
+#: g10/g10.c:301
 msgid "emulate the mode described in RFC1991"
 msgstr "emular o modo descrito no RFC1991"
 
-#: g10/g10.c:292
+#: g10/g10.c:302
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "configurar todas as opçőes de pacote,\n"
 "criptografia e \"digest\" para comportamento\n"
 "OpenPGP"
 
-#: g10/g10.c:293
+#: g10/g10.c:303
 msgid "|N|use passphrase mode N"
 msgstr "|N|usar mode de frase secreta N"
 
-#: g10/g10.c:295
+#: g10/g10.c:305
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de \"digest\" de mensagens NOME\n"
 "para frases secretas"
 
-#: g10/g10.c:297
+#: g10/g10.c:307
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: g10/g10.c:298
+#: g10/g10.c:308
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: g10/g10.c:299
+#: g10/g10.c:309
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: g10/g10.c:300
+#: g10/g10.c:310
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compressăo N"
 
-#: g10/g10.c:301
+#: g10/g10.c:311
 msgid "throw keyid field of encrypted packets"
 msgstr "eliminar campo keyid dos pacotes encriptados"
 
-#: g10/g10.c:302
+#: g10/g10.c:312
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOME=VALOR|usar estes dados de notaçăo"
 
-#: g10/g10.c:305
+#: g10/g10.c:315
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:308
+#: g10/g10.c:318
 msgid ""
 "@\n"
 "Examples:\n"
@@ -674,15 +678,15 @@
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impressőes digitais\n"
 
-#: g10/g10.c:403
+#: g10/g10.c:418
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:407
+#: g10/g10.c:422
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opçőes] [ficheiros] (-h para ajuda)"
 
-#: g10/g10.c:410
+#: g10/g10.c:425
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -692,7 +696,7 @@
 "assina, verifica, encripta ou desencripta\n"
 "a operaçăo por omissăo depende dos dados de entrada\n"
 
-#: g10/g10.c:417
+#: g10/g10.c:432
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -700,185 +704,189 @@
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:496
+#: g10/g10.c:511
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opçőes] "
 
-#: g10/g10.c:549
+#: g10/g10.c:564
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
-#: g10/g10.c:692
+#: g10/g10.c:704
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: ficheiro de opçőes por omissăo `%s' inexistente\n"
 
-#: g10/g10.c:696
+#: g10/g10.c:708
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de opçőes `%s': %s\n"
 
-#: g10/g10.c:703
+#: g10/g10.c:715
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler opçőes de `%s'\n"
 
-#: g10/g10.c:893
+#: g10/g10.c:905
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s năo é um conjunto de caracteres válido\n"
 
-#: g10/g10.c:949 g10/g10.c:958
+#: g10/g10.c:970
+msgid "WARNING: program may create a core file!\n"
+msgstr "AVISO: O programa pode criar um ficheiro core!\n"
+
+#: g10/g10.c:974 g10/g10.c:983
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s năo é para uso normal!\n"
 
-#: g10/g10.c:951
+#: g10/g10.c:976
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s năo é permitido com %s!\n"
 
-#: g10/g10.c:954
+#: g10/g10.c:979
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s năo faz sentido com %s!\n"
 
-#: g10/g10.c:973 g10/g10.c:985
+#: g10/g10.c:998 g10/g10.c:1010
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado năo é válido\n"
 
-#: g10/g10.c:979 g10/g10.c:991
+#: g10/g10.c:1004 g10/g10.c:1016
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado năo é válido\n"
 
-#: g10/g10.c:995
+#: g10/g10.c:1020
 msgid "the given policy URL is invalid\n"
 msgstr "a URL de política dada é inválida\n"
 
-#: g10/g10.c:998
+#: g10/g10.c:1023
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "o algoritmo de compressăo deve estar na faixa %d..%d\n"
 
-#: g10/g10.c:1000
+#: g10/g10.c:1025
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:1002
+#: g10/g10.c:1027
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:1004
+#: g10/g10.c:1029
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth deve estar na entre 1 e 255\n"
 
-#: g10/g10.c:1007
+#: g10/g10.c:1032
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) năo é recomendável\n"
 
-#: g10/g10.c:1011
+#: g10/g10.c:1036
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inválido: deve ser 0, 1 ou 3\n"
 
-#: g10/g10.c:1096
+#: g10/g10.c:1121
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar a base de dados de confiança: %s\n"
 
-#: g10/g10.c:1102
+#: g10/g10.c:1127
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
-#: g10/g10.c:1109
+#: g10/g10.c:1134
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/g10.c:1117
+#: g10/g10.c:1142
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1130
+#: g10/g10.c:1155
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/g10.c:1143
+#: g10/g10.c:1168
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1157
+#: g10/g10.c:1182
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/g10.c:1174
+#: g10/g10.c:1199
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1207
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/g10.c:1190
+#: g10/g10.c:1215
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/g10.c:1198
+#: g10/g10.c:1223
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1239
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-utilizador"
 
-#: g10/g10.c:1217
+#: g10/g10.c:1242
 msgid "--delete-key user-id"
 msgstr "--delete-key id-utilizador"
 
-#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393
+#: g10/encode.c:265 g10/g10.c:1279 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossível abrir %s: %s\n"
 
-#: g10/g10.c:1269
+#: g10/g10.c:1294
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizador] [porta-chaves]"
 
-#: g10/g10.c:1335
+#: g10/g10.c:1360
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:1343
+#: g10/g10.c:1368
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "criaçăo de armadura falhou: %s\n"
 
 # "hash" poderia ser "espalhamento", mas năo fica claro
-#: g10/g10.c:1411
+#: g10/g10.c:1439
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inválido `%s'\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1520
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
-#: g10/g10.c:1496
+#: g10/g10.c:1524
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1499 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1527 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossível abrir `%s'\n"
 
-#: g10/g10.c:1669
+#: g10/g10.c:1700
 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:1675
+#: g10/g10.c:1706
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -886,12 +894,12 @@
 "um nome de notaçăo deve ter apenas letras, dígitos, pontos ou sublinhados e "
 "terminar com '='\n"
 
-#: g10/g10.c:1681
+#: g10/g10.c:1712
 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:1689
+#: g10/g10.c:1720
 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"
 
@@ -1272,58 +1280,58 @@
 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:433
+#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:435
 #, 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:438
+#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:440
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:537
+#: g10/keygen.c:539
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/keygen.c:539
+#: g10/keygen.c:541
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (por omissăo)\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:542
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:544
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas encripçăo)\n"
 
-#: g10/keygen.c:543
+#: g10/keygen.c:545
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (assinatura e encriptaçăo)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:547
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (assinatura e encriptaçăo)\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:551
 msgid "Your selection? "
 msgstr "Opçăo? "
 
-#: g10/keygen.c:560 g10/keygen.c:568
+#: g10/keygen.c:562 g10/keygen.c:570
 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:582
+#: g10/keygen.c:584
 msgid "Invalid selection.\n"
 msgstr "Opçăo inválida.\n"
 
-#: g10/keygen.c:594
+#: g10/keygen.c:596
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1336,19 +1344,19 @@
 "         tamanho por omissăo é 1024 bits\n"
 "     tamanho máximo sugerido é 2048 bits\n"
 
-#: g10/keygen.c:601
+#: g10/keygen.c:603
 msgid "What keysize do you want? (1024) "
 msgstr "Qual o tamanho de chave desejado? (1024) "
 
-#: g10/keygen.c:606
+#: g10/keygen.c:608
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA permite apenas tamanhos de 512 a 1024\n"
 
-#: g10/keygen.c:608
+#: g10/keygen.c:610
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "tamanho muito pequeno; 768 é o valor mínimo permitido.\n"
 
-#: g10/keygen.c:610
+#: g10/keygen.c:612
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "tamanho muito pequeno; 768 é o valor mínimo permitido.\n"
@@ -1361,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:621
+#: g10/keygen.c:623
 #, 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:626
+#: g10/keygen.c:628
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1374,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:629
+#: g10/keygen.c:631
 msgid "Are you sure that you want this keysize? "
 msgstr "Vocę tem certeza de que quer este tamanho de chave? "
 
-#: g10/keygen.c:630
+#: g10/keygen.c:632
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1386,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:638
+#: g10/keygen.c:640
 msgid "Do you really need such a large keysize? "
 msgstr "Vocę precisa realmente de uma chave tăo grande? "
 
-#: g10/keygen.c:644
+#: g10/keygen.c:646
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido é %u bits\n"
 
-#: g10/keygen.c:647 g10/keygen.c:651
+#: g10/keygen.c:649 g10/keygen.c:653
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:699
+#: g10/keygen.c:701
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1416,25 +1424,25 @@
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:714
+#: g10/keygen.c:716
 msgid "Key is valid for? (0) "
 msgstr "A chave é valida por? (0) "
 
-#: g10/keygen.c:719
+#: g10/keygen.c:721
 msgid "invalid value\n"
 msgstr "valor inválido\n"
 
-#: g10/keygen.c:724
+#: g10/keygen.c:726
 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:730
+#: g10/keygen.c:732
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "A chave expira em %s\n"
 
-#: g10/keygen.c:733
+#: g10/keygen.c:735
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1442,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:738
+#: g10/keygen.c:740
 msgid "Is this correct (y/n)? "
 msgstr "Está correto (s/n)? "
 
-#: g10/keygen.c:781
+#: g10/keygen.c:783
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1463,44 +1471,44 @@
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:793
+#: g10/keygen.c:795
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:803
 msgid "Invalid character in name\n"
 msgstr "Caracter inválido no nome\n"
 
-#: g10/keygen.c:799
+#: g10/keygen.c:805
 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:801
+#: g10/keygen.c:807
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:809
+#: g10/keygen.c:815
 msgid "Email address: "
 msgstr "Endereço de correio eletrónico: "
 
-#: g10/keygen.c:820
+#: g10/keygen.c:826
 msgid "Not a valid email address\n"
 msgstr "Endereço eletrónico inválido\n"
 
-#: g10/keygen.c:828
+#: g10/keygen.c:834
 msgid "Comment: "
 msgstr "Comentário: "
 
-#: g10/keygen.c:834
+#: g10/keygen.c:840
 msgid "Invalid character in comment\n"
 msgstr "Caracter inválido no comentário\n"
 
-#: g10/keygen.c:857
+#: g10/keygen.c:863
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vocę está usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:863
+#: g10/keygen.c:869
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1511,28 +1519,28 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:867
+#: g10/keygen.c:873
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:872
+#: g10/keygen.c:878
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:882
+#: g10/keygen.c:888
 #, 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:883
+#: g10/keygen.c:889
 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:902
+#: g10/keygen.c:908
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:940
+#: g10/keygen.c:946
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1540,11 +1548,11 @@
 "Vocę precisa de uma frase secreta para proteger a sua chave.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:948
+#: g10/keyedit.c:468 g10/keygen.c:954
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "a frase secreta năo foi repetida corretamente; tente outra vez.\n"
 
-#: g10/keygen.c:954
+#: g10/keygen.c:960
 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"
@@ -1556,7 +1564,7 @@
 "qualquer hora, usando este programa com a opçăo \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:975
+#: g10/keygen.c:981
 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"
@@ -1568,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:1424
+#: g10/keygen.c:1430
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "O par de chaves DSA terá 1024 bits.\n"
 
-#: g10/keygen.c:1467
+#: g10/keygen.c:1473
 msgid "Key generation canceled.\n"
 msgstr "Geraçăo de chave cancelada.\n"
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1570
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escrevendo certificado público para `%s'\n"
 
-#: g10/keygen.c:1565
+#: g10/keygen.c:1571
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1667
 msgid "public and secret key created and signed.\n"
 msgstr "chaves pública e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1672
 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 +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:1683 g10/keygen.c:1784
+#: g10/keygen.c:1689 g10/keygen.c:1790
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A geraçăo de chaves falhou: %s\n"
 
-#: g10/keygen.c:1727 g10/sig-check.c:318 g10/sign.c:112
+#: g10/keygen.c:1733 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 +1619,7 @@
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no relógio)\n"
 
-#: g10/keygen.c:1729 g10/sig-check.c:320 g10/sign.c:114
+#: g10/keygen.c:1735 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,11 +1627,11 @@
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no relógio)\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1768
 msgid "Really create? "
 msgstr "Realmente criar? "
 
-#: g10/encode.c:91 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/encode.c:91 g10/openfile.c:178 g10/openfile.c:288 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1634,17 +1642,17 @@
 msgid "error creating passphrase: %s\n"
 msgstr "erro na criaçăo da frase secreta: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:319
+#: g10/encode.c:171 g10/encode.c:324
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: AVISO: ficheiro vazio\n"
 
-#: g10/encode.c:266
+#: g10/encode.c:271
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encode.c:483
+#: g10/encode.c:492
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s encriptado para: %s\n"
@@ -1693,248 +1701,258 @@
 msgid "No user ID for key\n"
 msgstr "Nenhum identificador de utilizador para chave\n"
 
-#: g10/getkey.c:1642 g10/getkey.c:1698
+#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "usando chave secundária %08lX ao invés de chave primária %08lX\n"
 
-#: g10/getkey.c:2017
+#: g10/getkey.c:2050
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: utilizador năo encontrado\n"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloco do tipo %d\n"
 
-#: g10/import.c:188 g10/trustdb.c:1740 g10/trustdb.c:1781
+#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu chaves processadas até agora\n"
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/import.c:203
+#: g10/import.c:204
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Número total processado: %lu\n"
 
-#: g10/import.c:205
+#: g10/import.c:206
+#, fuzzy, c-format
+msgid "      skipped new keys: %lu\n"
+msgstr "           novas subchaves: %lu\n"
+
+#: g10/import.c:209
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sem IDs de utilizadores: %lu\n"
 
-#: g10/import.c:207
+#: g10/import.c:211
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importados: %lu"
 
-#: g10/import.c:213
+#: g10/import.c:217
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             năo modificados: %lu\n"
 
-#: g10/import.c:215
+#: g10/import.c:219
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          novos IDs de utilizadores: %lu\n"
 
-#: g10/import.c:217
+#: g10/import.c:221
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:223
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        novas assinaturas: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:225
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   novas revogaçőes de chaves: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:227
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:229
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chaves secretas importadas: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:231
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " chaves secretas năo modificadas: %lu\n"
 
-#: g10/import.c:386 g10/import.c:578
+#: g10/import.c:391 g10/import.c:590
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
 
-#: g10/import.c:400
+#: g10/import.c:405
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "chave %08lX: sem IDs de utilizadores válidos\n"
 
-#: g10/import.c:402
+#: g10/import.c:407
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
 
-#: g10/import.c:413 g10/import.c:645
+#: g10/import.c:418 g10/import.c:657
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "chave %08lX: chave pública năo encontrada: %s\n"
 
-#: g10/import.c:419
+#: g10/import.c:423
+#, fuzzy, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "chave %08lX: năo é uma chave rfc2440 - ignorada\n"
+
+#: g10/import.c:431
 msgid "no default public keyring\n"
 msgstr "sem porta-chaves público padrăo\n"
 
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
+#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "a escrever para `%s'\n"
 
-#: g10/import.c:426 g10/import.c:484 g10/import.c:593 g10/import.c:694
+#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "impossível trancar porta-chaves `%s': %s\n"
 
-#: g10/import.c:429 g10/import.c:487 g10/import.c:596 g10/import.c:697
+#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
-#: g10/import.c:434
+#: g10/import.c:446
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "chave %08lX: chave pública importada\n"
 
-#: g10/import.c:451
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "chave %08lX: năo corresponde ŕ nossa cópia\n"
 
-#: g10/import.c:460 g10/import.c:653
+#: g10/import.c:472 g10/import.c:665
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "chave %08lX: impossível localizar bloco de chaves original: %s\n"
 
-#: g10/import.c:466 g10/import.c:659
+#: g10/import.c:478 g10/import.c:671
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "chave %08lX: impossível ler bloco de chaves original: %s\n"
 
-#: g10/import.c:493
+#: g10/import.c:505
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "chave %8lX: 1 novo ID de utilizador\n"
 
-#: g10/import.c:496
+#: g10/import.c:508
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "chave %08lX: %d novos IDs de utilizadores\n"
 
-#: g10/import.c:499
+#: g10/import.c:511
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "chave %08lX: 1 nova assinatura\n"
 
-#: g10/import.c:502
+#: g10/import.c:514
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:505
+#: g10/import.c:517
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "chave %08lX: 1 nova subchave\n"
 
-#: g10/import.c:508
+#: g10/import.c:520
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "chave %08lX: %d novas subchaves\n"
 
-#: g10/import.c:518
+#: g10/import.c:530
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "chave %08lX: năo modificada\n"
 
-#: g10/import.c:601
+#: g10/import.c:613
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
 #. we can't merge secret keys
-#: g10/import.c:605
+#: g10/import.c:617
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "chave %08lX: já está no porta-chaves secreto\n"
 
-#: g10/import.c:610
+#: g10/import.c:622
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta năo encontrada: %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:651
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chave %08lX: sem chave pública - impossível aplicar certificado\n"
 "de revogaçăo\n"
 
-#: g10/import.c:670
+#: g10/import.c:682
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "chave %08lX: certificado de revogaçăo inválido: %s - rejeitado\n"
 
-#: g10/import.c:702
+#: g10/import.c:714
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "chave %08lX: certificado de revogaçăo importado\n"
 
-#: g10/import.c:744
+#: g10/import.c:756
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "chave %08lX: nenhum ID de utilizador para assinatura\n"
 
-#: g10/import.c:751 g10/import.c:775
+#: g10/import.c:763 g10/import.c:787
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave pública năo suportado\n"
 
-#: g10/import.c:752
+#: g10/import.c:764
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "chave %08lX: auto-assinatura inválida\n"
 
-#: g10/import.c:767
+#: g10/import.c:779
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "chave %08lX: sem subchave para ligaçăo de chaves\n"
 
-#: g10/import.c:776
+#: g10/import.c:788
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "chave %08lX: ligaçăo de subchave inválida\n"
 
-#: g10/import.c:803
+#: g10/import.c:815
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "chave %08lX: aceite ID de utilizador sem auto-assinatura '"
 
-#: g10/import.c:832
+#: g10/import.c:844
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "chave %08lX: ignorado ID de utilizador '"
 
-#: g10/import.c:855
+#: g10/import.c:867
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
@@ -1943,32 +1961,32 @@
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:880
+#: g10/import.c:892
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "chave %08lX: assinatura năo exportável (classe %02x) - ignorada\n"
 
-#: g10/import.c:889
+#: g10/import.c:901
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revogaçăo no local errado - ignorado\n"
 
-#: g10/import.c:897
+#: g10/import.c:909
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revogaçăo inválido: %s - ignorado\n"
 
-#: g10/import.c:997
+#: g10/import.c:1009
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: detectado ID de utilizador duplicado - fundido\n"
 
-#: g10/import.c:1048
+#: g10/import.c:1060
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "chave %08lX: certificado de revogaçăo adicionado\n"
 
-#: g10/import.c:1162 g10/import.c:1215
+#: g10/import.c:1174 g10/import.c:1227
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "chave %08lX: a nossa cópia năo tem auto-assinatura\n"
@@ -2548,8 +2566,18 @@
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
+#: g10/keylist.c:158
+#, fuzzy
+msgid "invalid"
+msgstr "armadura inválida"
+
+#: g10/keylist.c:178
+#, fuzzy
+msgid "revoked"
+msgstr "revkey"
+
 #. of subkey
-#: g10/keylist.c:318 g10/mainproc.c:742
+#: g10/keylist.c:400 g10/mainproc.c:760
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "A chave expira em %s\n"
@@ -2559,129 +2587,117 @@
 msgid "public key is %08lX\n"
 msgstr "a chave pública é %08lX\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:257
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados encriptados com chave pública: DEK válido\n"
 
-#: g10/mainproc.c:281
+#: g10/mainproc.c:299
 #, 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:291
+#: g10/mainproc.c:309
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "encriptado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:297
+#: g10/mainproc.c:315
 msgid "no secret key for decryption available\n"
 msgstr "nenhuma chave secreta para desencriptaçăo disponível\n"
 
-#: g10/mainproc.c:306
+#: g10/mainproc.c:324
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "desencriptaçăo de chave pública falhou: %s\n"
 
-#: g10/mainproc.c:343
+#: g10/mainproc.c:361
 msgid "decryption okay\n"
 msgstr "desencriptaçăo correcta\n"
 
-#: g10/mainproc.c:348
+#: g10/mainproc.c:366
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem encriptada foi manipulada!\n"
 
-#: g10/mainproc.c:353
+#: g10/mainproc.c:371
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "desencriptaçăo falhou: %s\n"
 
-#: g10/mainproc.c:372
+#: g10/mainproc.c:390
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:374
+#: g10/mainproc.c:392
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro original='%.*s'\n"
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:544
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocaçăo solitária - utilize \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:613 g10/mainproc.c:622
+#: g10/mainproc.c:631 g10/mainproc.c:640
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: dados de notaçăo inválidos encontrados\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:643
 msgid "Notation: "
 msgstr "Notaçăo: "
 
-#: g10/mainproc.c:632
+#: g10/mainproc.c:650
 msgid "Policy: "
 msgstr "Política: "
 
-#: g10/mainproc.c:1062
+#: g10/mainproc.c:1080
 msgid "signature verification suppressed\n"
 msgstr "verificaçăo de assinatura suprimida\n"
 
-#: g10/mainproc.c:1068
+#: g10/mainproc.c:1086
 #, 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:1094 g10/mainproc.c:1105
+#: g10/mainproc.c:1112 g10/mainproc.c:1123
 msgid "BAD signature from \""
 msgstr "Assinatura INCORRECTA de \""
 
-#: g10/mainproc.c:1095 g10/mainproc.c:1106
+#: g10/mainproc.c:1113 g10/mainproc.c:1124
 msgid "Good signature from \""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1097
+#: g10/mainproc.c:1115
 msgid "                aka \""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1153
+#: g10/mainproc.c:1171
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossível verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1235
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura de classe 0x%02x\n"
 
-#: g10/mainproc.c:1263
+#: g10/mainproc.c:1281
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:1268
+#: g10/mainproc.c:1286
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inválido detectado em proc_tree()\n"
 
-#: g10/misc.c:94
+#: g10/misc.c:96
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "impossível desactivar core dumps: %s\n"
 
-#: g10/misc.c:97
-msgid "WARNING: program may create a core file!\n"
-msgstr "AVISO: O programa pode criar um ficheiro core!\n"
-
-#: g10/misc.c:205
+#: g10/misc.c:206
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Algoritmos experimentais năo devem ser usados!\n"
 
-#: g10/misc.c:219
-msgid ""
-"RSA keys are deprecated; please consider creating a new key and use this key "
-"in the future\n"
-msgstr ""
-"Chaves RSA năo săo recomendáveis; por favor considere criar uma nova chave e "
-"usá-la no futuro\n"
-
-#: g10/misc.c:241
+#: g10/misc.c:233
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 "este algoritmo de criptografia năo é recomendado;\n"
@@ -2692,7 +2708,7 @@
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossível manipular algoritmo de chave pública %d\n"
 
-#: g10/parse-packet.c:965
+#: g10/parse-packet.c:986
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit crítico ligado\n"
@@ -2729,90 +2745,90 @@
 msgid "Repeat passphrase: "
 msgstr "Repita a frase secreta: "
 
-#: g10/plaintext.c:63
+#: g10/plaintext.c:67
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "dados năo gravados; use a opçăo \"--output\" para gravá-los\n"
 
-#: g10/plaintext.c:317
+#: g10/plaintext.c:324
 msgid "Detached signature.\n"
 msgstr "Assinatura desacoplada.\n"
 
-#: g10/plaintext.c:321
+#: g10/plaintext.c:328
 msgid "Please enter name of data file: "
 msgstr "Por favor digite o nome do ficheiro de dados: "
 
-#: g10/plaintext.c:342
+#: g10/plaintext.c:349
 msgid "reading stdin ...\n"
 msgstr "lendo do \"stdin\" ...\n"
 
-#: g10/plaintext.c:385
+#: g10/plaintext.c:392
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "impossível abrir dados assinados `%s'\n"
 
-#: g10/pubkey-enc.c:79
+#: g10/pubkey-enc.c:76
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "destinatário anónimo; a tentar chave secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:85
+#: g10/pubkey-enc.c:82
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "certo, nós somos o destinatário anónimo.\n"
 
-#: g10/pubkey-enc.c:137
+#: g10/pubkey-enc.c:134
 msgid "old encoding of the DEK is not supported\n"
 msgstr "codificaçăo antiga do DEK năo suportada\n"
 
-#: g10/pubkey-enc.c:156
+#: g10/pubkey-enc.c:153
 #, fuzzy, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "algoritmo de protecçăo %d năo é suportado\n"
 
-#: g10/pubkey-enc.c:195
+#: g10/pubkey-enc.c:192
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "NOTA: algoritmo de cifragem %d năo encontrado nas preferęncias\n"
 
-#: g10/pubkey-enc.c:201
+#: g10/pubkey-enc.c:198
 #, fuzzy, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTA: chave de assinatura expirou %s\n"
 
-#: g10/hkp.c:62
+#: g10/hkp.c:72
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
 msgstr ""
 
-#: g10/hkp.c:75
+#: g10/hkp.c:85
 #, fuzzy, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "importar chaves de um servidor"
 
-#: g10/hkp.c:98 g10/hkp.c:136
+#: g10/hkp.c:109 g10/hkp.c:148
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/hkp.c:106
+#: g10/hkp.c:117
 #, fuzzy, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "%s năo é um conjunto de caracteres válido\n"
 
-#: g10/hkp.c:158
+#: g10/hkp.c:170
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
 
-#: g10/hkp.c:182
+#: g10/hkp.c:194
 #, fuzzy, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/hkp.c:194
+#: g10/hkp.c:206
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr ""
 
-#: g10/hkp.c:197
+#: g10/hkp.c:209
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
@@ -2827,41 +2843,41 @@
 msgid "protection algorithm %d is not supported\n"
 msgstr "algoritmo de protecçăo %d năo é suportado\n"
 
-#: g10/seckey-cert.c:175
+#: g10/seckey-cert.c:184
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Frase secreta inválida; por favor tente novamente ...\n"
 
-#: g10/seckey-cert.c:231
+#: g10/seckey-cert.c:240
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVISO: Chave fraca detectada - por favor mude a frase secreta novamente.\n"
 
-#: g10/sig-check.c:202
+#: g10/sig-check.c:199
 msgid "assuming bad MDC due to an unknown critical bit\n"
 msgstr "assumindo MDC incorrecto devido a um bit crítico desconhecido\n"
 
-#: g10/sig-check.c:300
+#: g10/sig-check.c:297
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "esta é uma chave ElGamal gerada pelo PGP que NĂO é segura para assinaturas!\n"
 
-#: g10/sig-check.c:308
+#: g10/sig-check.c:305
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "a chave pública é %lu segundo mais nova que a assinatura\n"
 
-#: g10/sig-check.c:309
+#: g10/sig-check.c:306
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "a chave pública é %lu segundos mais nova que a assinatura\n"
 
-#: g10/sig-check.c:327
+#: g10/sig-check.c:324
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "NOTA: chave de assinatura expirou %s\n"
 
-#: g10/sig-check.c:396
+#: g10/sig-check.c:393
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "assumindo assinatura incorrecta devido a um bit crítico desconhecido\n"
 
@@ -2870,7 +2886,7 @@
 msgid "%s signature from: %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:606
+#: g10/sign.c:290 g10/sign.c:610
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "impossível criar %s: %s\n"
@@ -2918,7 +2934,7 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: diretoria inexistente!\n"
 
-#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1363 g10/tdbio.c:444
+#: g10/openfile.c:226 g10/openfile.c:295 g10/ringedit.c:1369 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: impossível criar: %s\n"
@@ -3020,288 +3036,298 @@
 "A base de dados de confiança está danificada; por favor execute\n"
 "\"gpg --fix-trustdb\".\n"
 
-#: g10/trustdb.c:168
+#: g10/trustdb.c:169
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "registo de confiança %lu, tipo req %d: falha na leitura: %s\n"
 
-#: g10/trustdb.c:183
+#: g10/trustdb.c:184
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "registo de confiança %lu, tipo %d: escrita falhou: %s\n"
 
-#: g10/trustdb.c:197
+#: g10/trustdb.c:198
 #, c-format
 msgid "trust record %lu: delete failed: %s\n"
 msgstr "registo de confiança %lu: remoçăo falhou: %s\n"
 
-#: g10/trustdb.c:211
+#: g10/trustdb.c:212
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de dados de confiança: sincronizaçăo falhou: %s\n"
 
-#: g10/trustdb.c:376
+#: g10/trustdb.c:377
 #, c-format
 msgid "error reading dir record for LID %lu: %s\n"
 msgstr "erro lendo registo de directório para LID %lu: %s\n"
 
-#: g10/trustdb.c:383
+#: g10/trustdb.c:384
 #, c-format
 msgid "lid %lu: expected dir record, got type %d\n"
 msgstr "lid %lu: registo de directório esperado, tipo %d recebido\n"
 
-#: g10/trustdb.c:388
+#: g10/trustdb.c:389
 #, c-format
 msgid "no primary key for LID %lu\n"
 msgstr "nenhuma chave primária para LID %lu\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:394
 #, c-format
 msgid "error reading primary key for LID %lu: %s\n"
 msgstr "erro ao ler chave primária para LID %lu: %s\n"
 
-#: g10/trustdb.c:432
+#: g10/trustdb.c:433
 #, c-format
 msgid "get_dir_record: search_record failed: %s\n"
 msgstr "get_dir_record: search_record falhou: %s\n"
 
-#: g10/trustdb.c:487
-#, c-format
-msgid "NOTE: secret key %08lX is NOT protected.\n"
-msgstr "NOTA: a chave secreta %08lX NĂO está protegida.\n"
-
-#: g10/trustdb.c:495
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr "chave %08lX: chave secreta sem chave pública - ignorada\n"
-
-#: g10/trustdb.c:502
-#, c-format
-msgid "key %08lX: secret and public key don't match\n"
-msgstr "chave %08lX: chaves secreta e pública năo săo correspondentes\n"
+#: g10/trustdb.c:474
+#, fuzzy, c-format
+msgid "'%s' is not a valid long keyID\n"
+msgstr "%s năo é um conjunto de caracteres válido\n"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:501
 #, c-format
 msgid "key %08lX: can't put it into the trustdb\n"
 msgstr "chave %08lX: impossível colocá-la na base de dados de confiança\n"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:507
 #, c-format
 msgid "key %08lX: query record failed\n"
 msgstr "chave %08lX: pedido de registo falhou\n"
 
-#: g10/trustdb.c:529
+#: g10/trustdb.c:516
 #, c-format
 msgid "key %08lX: already in trusted key table\n"
 msgstr "chave %08lX: já está na tabela de chaves confiáveis\n"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:519
 #, c-format
 msgid "key %08lX: accepted as trusted key.\n"
 msgstr "chave %08lX: aceite como chave confiável.\n"
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:546
+#, fuzzy, c-format
+msgid "key %08lX: no public key for trusted key - skipped\n"
+msgstr "chave %08lX: năo é uma chave rfc2440 - ignorada\n"
+
+#: g10/trustdb.c:565
+#, c-format
+msgid "NOTE: secret key %08lX is NOT protected.\n"
+msgstr "NOTA: a chave secreta %08lX NĂO está protegida.\n"
+
+#: g10/trustdb.c:577
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr "chave %08lX: chave secreta sem chave pública - ignorada\n"
+
+#: g10/trustdb.c:584
+#, c-format
+msgid "key %08lX: secret and public key don't match\n"
+msgstr "chave %08lX: chaves secreta e pública năo săo correspondentes\n"
+
+#: g10/trustdb.c:597
 #, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr "enumeraçăo de chaves secretas falhou: %s\n"
 
-#: g10/trustdb.c:921
+#: g10/trustdb.c:987
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "chave %08lX.%lu: Ligaçăo de subchave válida\n"
 
-#: g10/trustdb.c:927 g10/trustdb.c:962
+#: g10/trustdb.c:993 g10/trustdb.c:1028
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "chave %08lX.%lu: Ligaçăo de subchave inválida: %s\n"
 
-#: g10/trustdb.c:939
+#: g10/trustdb.c:1005
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "chave %08lX.%lu: Revogaçăo de chave válida\n"
 
-#: g10/trustdb.c:945
+#: g10/trustdb.c:1011
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "chave %08lX.%lu: Revogaçăo de chave inválida: %s\n"
 
-#: g10/trustdb.c:956
+#: g10/trustdb.c:1022
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "chave %08lX.%lu: Revogaçăo de subchave válida\n"
 
-#: g10/trustdb.c:1067
+#: g10/trustdb.c:1133
 msgid "Good self-signature"
 msgstr "Auto-assinatura válida"
 
-#: g10/trustdb.c:1077
+#: g10/trustdb.c:1143
 msgid "Invalid self-signature"
 msgstr "Auto-assinatura inválida"
 
-#: g10/trustdb.c:1104
+#: g10/trustdb.c:1170
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 "Revogaçăo válida de ID de utilizador ignorada devido a nova auto-assinatura"
 
-#: g10/trustdb.c:1110
+#: g10/trustdb.c:1176
 msgid "Valid user ID revocation"
 msgstr "Revogaçăo de ID de utilizador válida"
 
-#: g10/trustdb.c:1115
+#: g10/trustdb.c:1181
 msgid "Invalid user ID revocation"
 msgstr "Revogaçăo de ID de utilizador inválida"
 
-#: g10/trustdb.c:1157
+#: g10/trustdb.c:1223
 msgid "Valid certificate revocation"
 msgstr "Certificado de revogaçăo válido"
 
-#: g10/trustdb.c:1158
+#: g10/trustdb.c:1224
 msgid "Good certificate"
 msgstr "Certificado correcto"
 
-#: g10/trustdb.c:1186
+#: g10/trustdb.c:1252
 msgid "Invalid certificate revocation"
 msgstr "Certificado de revogaçăo inválido"
 
-#: g10/trustdb.c:1187
+#: g10/trustdb.c:1253
 msgid "Invalid certificate"
 msgstr "Certificado inválido"
 
-#: g10/trustdb.c:1204 g10/trustdb.c:1208
+#: g10/trustdb.c:1270 g10/trustdb.c:1274
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "registo de assinatura %lu[%d] aponta para registo errado.\n"
 
-#: g10/trustdb.c:1267
+#: g10/trustdb.c:1333
 msgid "duplicated certificate - deleted"
 msgstr "certificado duplicado - removido"
 
-#: g10/trustdb.c:1584
+#: g10/trustdb.c:1650
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir falhou: %s\n"
 
-#: g10/trustdb.c:1718
+#: g10/trustdb.c:1784
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: inserçăo falhou: %s\n"
 
-#: g10/trustdb.c:1723
+#: g10/trustdb.c:1789
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: inserçăo falhou: %s\n"
 
-#: g10/trustdb.c:1729
+#: g10/trustdb.c:1795
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: inserido\n"
 
-#: g10/trustdb.c:1734
+#: g10/trustdb.c:1800
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "erro ao ler registo de directório: %s\n"
 
-#: g10/trustdb.c:1742 g10/trustdb.c:1805
+#: g10/trustdb.c:1808 g10/trustdb.c:1871
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu chaves processadas\n"
 
-#: g10/trustdb.c:1744 g10/trustdb.c:1811
+#: g10/trustdb.c:1810 g10/trustdb.c:1877
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu chaves com erros\n"
 
-#: g10/trustdb.c:1746
+#: g10/trustdb.c:1812
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu chaves inseridas\n"
 
-#: g10/trustdb.c:1749
+#: g10/trustdb.c:1815
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "enumeraçăo de blocos de chaves falhou: %s\n"
 
-#: g10/trustdb.c:1797
+#: g10/trustdb.c:1863
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: registo de directório sem chave - ignorado\n"
 
-#: g10/trustdb.c:1807
+#: g10/trustdb.c:1873
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "\t%lu devido a novas chaves públicas\n"
 
-#: g10/trustdb.c:1809
+#: g10/trustdb.c:1875
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu chaves ignoradas\n"
 
-#: g10/trustdb.c:1813
+#: g10/trustdb.c:1879
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu chaves actualizadas\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2224
 msgid "Ooops, no keys\n"
 msgstr "Ooops, nenhuma chave\n"
 
-#: g10/trustdb.c:2162
+#: g10/trustdb.c:2228
 msgid "Ooops, no user IDs\n"
 msgstr "Ooops, nenhum ID de utilizador\n"
 
-#: g10/trustdb.c:2320
+#: g10/trustdb.c:2386
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: busca de registo de directório falhou: %s\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2395
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "chave %08lX: inserçăo de registo de confiança falhou: %s\n"
 
-#: g10/trustdb.c:2333
+#: g10/trustdb.c:2399
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "chave %08lX.%lu: inserida na base de dados de confiança\n"
 
-#: g10/trustdb.c:2341
+#: g10/trustdb.c:2407
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "chave %08lX.%lu: criada no futuro (viagem no tempo ou problema no relogio)\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2422
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "chave %08lX.%lu: expirou em %s\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2430
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "chave %08lX.%lu: verificaçăo de confiança falhou: %s\n"
 
-#: g10/trustdb.c:2515
+#: g10/trustdb.c:2581
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "utilizador `%s' năo encontrado: %s\n"
 
-#: g10/trustdb.c:2517
+#: g10/trustdb.c:2583
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problemas na procura de `%s' na base de dados de confiança: %s\n"
 
-#: g10/trustdb.c:2520
+#: g10/trustdb.c:2586
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr ""
 "utilizador `%s' năo encontrado na base de dados de confiança - a inserir\n"
 
-#: g10/trustdb.c:2523
+#: g10/trustdb.c:2589
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "falha ao colocar `%s' na base de dados de confiança: %s\n"
 
-#: g10/trustdb.c:2709 g10/trustdb.c:2739
+#: g10/trustdb.c:2775 g10/trustdb.c:2805
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "AVISO: ainda é impossível manipular registos de preferęncias longos\n"
 
@@ -3325,26 +3351,26 @@
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: impossível criar porta-chaves: %s\n"
 
-#: g10/ringedit.c:319 g10/ringedit.c:1368
+#: g10/ringedit.c:319 g10/ringedit.c:1374
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: porta-chaves criado\n"
 
-#: g10/ringedit.c:1545
+#: g10/ringedit.c:1551
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVISO: existem 2 ficheiros com informaçőes confidenciais.\n"
 
-#: g10/ringedit.c:1546
+#: g10/ringedit.c:1552
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s é o năo modificado\n"
 
-#: g10/ringedit.c:1547
+#: g10/ringedit.c:1553
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s é o novo\n"
 
-#: g10/ringedit.c:1548
+#: g10/ringedit.c:1554
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor conserte esta possível falha de segurança\n"
 
@@ -3368,49 +3394,49 @@
 "para assinaturas!\n"
 
 #. do not overwrite
-#: g10/openfile.c:79
+#: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Arquivo `%s' já existe. "
 
-#: g10/openfile.c:81
+#: g10/openfile.c:86
 msgid "Overwrite (y/N)? "
 msgstr "Escrever por cima (s/N)? "
 
-#: g10/openfile.c:109
+#: g10/openfile.c:119
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: sufixo desconhecido\n"
 
-#: g10/openfile.c:131
+#: g10/openfile.c:141
 msgid "Enter new filename"
 msgstr "Digite novo nome de ficheiro"
 
-#: g10/openfile.c:172
+#: g10/openfile.c:182
 msgid "writing to stdout\n"
 msgstr "a escrever em \"stdout\"\n"
 
-#: g10/openfile.c:250
+#: g10/openfile.c:261
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "a assumir dados assinados em `%s'\n"
 
-#: g10/openfile.c:300
+#: g10/openfile.c:311
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: novo ficheiro de opçőes criado\n"
 
-#: g10/openfile.c:313
+#: g10/openfile.c:338
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: impossível criar directoria: %s\n"
 
-#: g10/openfile.c:316
+#: g10/openfile.c:341
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: directoria criada\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:343
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr "vai ter de reiniciar o GnuPG, para poder ler as novas opçőes\n"
 
@@ -3703,6 +3729,13 @@
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Nenhuma ajuda disponível para `%s'"
+
+#~ msgid ""
+#~ "RSA keys are deprecated; please consider creating a new key and use this key "
+#~ "in the future\n"
+#~ msgstr ""
+#~ "Chaves RSA năo săo recomendáveis; por favor considere criar uma nova chave e "
+#~ "usá-la no futuro\n"
 
 #~ msgid "set debugging flags"
 #~ msgstr "definir parâmetros de depuraçăo"
diff -urN gnupg-1.0.2/po/ru.po gnupg-1.0.3/po/ru.po
--- gnupg-1.0.2/po/ru.po	Wed Jul 12 14:59:46 2000
+++ gnupg-1.0.3/po/ru.po	Mon Sep 18 12:18:08 2000
@@ -9,7 +9,7 @@
 # QingLong <qinglong@Bolizm> (couldn't send an email to let you know)
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-07-12 12:13+0200\n"
+"POT-Creation-Date: 2000-09-18 12:17+0200\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-01-26 22:08:36+0100\n"
 "From: Gregory Steuck <steuck@iname.com>\n"
@@ -313,7 +313,7 @@
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "÷Ů ÎÁŰĚÉ ĎŰÉÂËŐ × ĐŇĎÇŇÁÍÍĹ ... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1255
 #, fuzzy, c-format
 msgid "can't open `%s': %s\n"
 msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ ĆÁĘĚ `%s': %s\n"
@@ -365,12 +365,12 @@
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:647
+#: cipher/random.c:650
 #, fuzzy
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "÷ÎÉÍÁÎÉĹ: ÉÓĐĎĚŘÚŐĹÔÓŃ ÎĹÎÁÄĹÖÎŮĘ ÇĹÎĹŇÁÔĎŇ ÓĚŐŢÁĘÎŮČ ŢÉÓĹĚ!\n"
 
-#: cipher/random.c:648
+#: cipher/random.c:651
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -384,7 +384,7 @@
 "îĺ đďěřúőęôĺóř äáîîůíé óďúäáîîůíé üôďę đňďçňáííďę!\n"
 "\n"
 
-#: cipher/rndlinux.c:141
+#: cipher/rndlinux.c:142
 #, c-format
 msgid ""
 "\n"
@@ -395,7 +395,7 @@
 "îĹÄĎÓÔÁÔĎŢÎĎ ÓĚŐŢÁĘÎŮČ ÄÁÎÎŮČ. đĎÖÁĚŐĘÓÔÁ, ĐĎÄĹĚÁĘÔĹ ŢÔĎ-ÎÉÂŐÄŘ, ŢÔĎÂŮ\n"
 "ďó ÍĎÇĚÁ ÎÁÂŇÁÔŘ ÄĎĐĎĚÎÉÔĹĚŘÎŮĹ ÓĚŐŢÁĘÎŮĹ ŢÉÓĚÁ! (ÎŐÖÎĎ ĹÝĹ %d ÂÁĘÔ)\n"
 
-#: g10/g10.c:197
+#: g10/g10.c:206
 msgid ""
 "@Commands:\n"
 " "
@@ -403,147 +403,147 @@
 "@ëĎÍÁÎÄŮ:\n"
 " "
 
-#: g10/g10.c:199
+#: g10/g10.c:208
 #, fuzzy
 msgid "|[file]|make a signature"
 msgstr "|[ĆÁĘĚ]|ÓĎÚÄÁÔŘ ĐĎÄĐÉÓŘ"
 
-#: g10/g10.c:200
+#: g10/g10.c:209
 #, fuzzy
 msgid "|[file]|make a clear text signature"
 msgstr "|[ĆÁĘĚ]|ÓĎÚÄÁÔŘ ÔĹËÓÔĎ×ŐŔ ĐĎÄĐÉÓŘ"
 
-#: g10/g10.c:201
+#: g10/g10.c:210
 msgid "make a detached signature"
 msgstr "ÓĎÚÄÁÔŘ ĎÔÄĹĚŘÎŐŔ ĐĎÄĐÉÓŘ"
 
-#: g10/g10.c:202
+#: g10/g10.c:211
 msgid "encrypt data"
 msgstr "ÚÁŰÉĆŇĎ×ÁÔŘ ÄÁÎÎŮĹ"
 
-#: g10/g10.c:203
+#: g10/g10.c:212
 msgid "encryption only with symmetric cipher"
 msgstr "ÚÁŰÉĆŇĎ×ÁÔŘ ÓÉÍÍĹÔŇÉŢÎŮÍ ÁĚÇĎŇÉÔÍĎÍ"
 
-#: g10/g10.c:204
+#: g10/g10.c:213
 msgid "store only"
 msgstr "ÔĎĚŘËĎ ÓĎČŇÁÎÉÔŘ"
 
-#: g10/g10.c:205
+#: g10/g10.c:214
 msgid "decrypt data (default)"
 msgstr "ŇÁÓŰÉĆŇĎ×ÁÔŘ ÄÁÎÎŮĹ (ĐĎ ŐÍĎĚŢÁÎÉŔ)"
 
-#: g10/g10.c:206
+#: g10/g10.c:215
 msgid "verify a signature"
 msgstr "ĐŇĎ×ĹŇÉÔŘ ĐĎÄĐÉÓŘ"
 
-#: g10/g10.c:208
+#: g10/g10.c:217
 msgid "list keys"
 msgstr "ÓĐÉÓĎË ËĚŔŢĹĘ"
 
-#: g10/g10.c:210
+#: g10/g10.c:219
 msgid "list keys and signatures"
 msgstr "ÓĐÉÓĎË ËĚŔŢĹĘ É ĐĎÄĐÉÓĹĘ"
 
-#: g10/g10.c:211
+#: g10/g10.c:220
 msgid "check key signatures"
 msgstr "ĐŇĎ×ĹŇÉÔŘ ĐĎÄĐÉÓŘ ÎÁ ËĚŔŢĹ"
 
-#: g10/g10.c:212
+#: g10/g10.c:221
 msgid "list keys and fingerprints"
 msgstr "ÓĐÉÓĎË ËĚŔŢĹĘ Ó ÉČ \"ĎÔĐĹŢÁÔËÁÍÉ ĐÁĚŘĂĹ×\""
 
-#: g10/g10.c:213
+#: g10/g10.c:222
 msgid "list secret keys"
 msgstr "ÓĐÉÓĎË ÓĹËŇĹÔÎŮČ ËĚŔŢĹĘ"
 
-#: g10/g10.c:214
+#: g10/g10.c:223
 msgid "generate a new key pair"
 msgstr "ÓÇĹÎĹŇÉŇĎ×ÁÔŘ ÎĎ×ŐŔ ĐÁŇŐ ËĚŔŢĹĘ (ĎÔËŇŮÔŮĘ É ÓĹËŇĹÔÎŮĘ)"
 
-#: g10/g10.c:215
+#: g10/g10.c:224
 msgid "remove key from the public keyring"
 msgstr "ŐÄÁĚÉÔŘ ËĚŔŢ ÓĎ Ó×ŃÚËÉ"
 
-#: g10/g10.c:217
+#: g10/g10.c:226
 #, fuzzy
 msgid "remove key from the secret keyring"
 msgstr "ŐÄÁĚÉÔŘ ËĚŔŢ ÓĎ Ó×ŃÚËÉ"
 
-#: g10/g10.c:218
+#: g10/g10.c:227
 #, fuzzy
 msgid "sign a key"
 msgstr "ĐĎÄĐÉÓÁÔŘ ËĚŔŢ"
 
-#: g10/g10.c:219
+#: g10/g10.c:228
 #, fuzzy
 msgid "sign a key locally"
 msgstr "ĐĎÄĐÉÓÁÔŘ ËĚŔŢ"
 
-#: g10/g10.c:220
+#: g10/g10.c:229
 msgid "sign or edit a key"
 msgstr "ĐĎÄĐÉÓÁÔŘ ÉĚÉ ŇĹÄÁËÔÉŇĎ×ÁÔŘ ËĚŔŢ"
 
-#: g10/g10.c:221
+#: g10/g10.c:230
 msgid "generate a revocation certificate"
 msgstr "ÓÇĹÎĹŇÉŇĎ×ÁÔŘ ĎÔÚŮ×ÁŔÝÉĘ ÓĹŇÔÉĆÉËÁÔ"
 
-#: g10/g10.c:222
+#: g10/g10.c:231
 msgid "export keys"
 msgstr "ÜËÓĐĎŇÔÉŇĎ×ÁÔŘ ËĚŔŢÉ"
 
-#: g10/g10.c:223
+#: g10/g10.c:232
 msgid "export keys to a key server"
 msgstr ""
 
-#: g10/g10.c:224
+#: g10/g10.c:233
 msgid "import keys from a key server"
 msgstr ""
 
-#: g10/g10.c:228
+#: g10/g10.c:237
 msgid "import/merge keys"
 msgstr "ÉÍĐĎŇÔÉŇĎ×ÁÔŘ/ÄĎÂÁ×ÉÔŘ ËĚŔŢÉ"
 
-#: g10/g10.c:230
+#: g10/g10.c:239
 msgid "list only the sequence of packets"
 msgstr "ÎÁĐĹŢÁÔÁÔŘ ÔĎĚŘËĎ ĐĎÓĚĹÄĎ×ÁÔĹĚŘÎĎÓÔŘ ĐÁËĹÔĎ×"
 
-#: g10/g10.c:232
+#: g10/g10.c:241
 #, fuzzy
 msgid "export the ownertrust values"
 msgstr "ÜËÓĐĎŇÔÉŇĎ×ÁÔŘ ĐÁŇÁÍĹÔŇŮ ÄĎ×ĹŇÉŃ\n"
 
-#: g10/g10.c:234
+#: g10/g10.c:243
 #, fuzzy
 msgid "import ownertrust values"
 msgstr "ÉÍĐĎŇÔÉŇĎ×ÁÔŘ ĐÁŇÁÍĹÔŇŮ ÄĎ×ĹŇÉŃ\n"
 
-#: g10/g10.c:236
+#: g10/g10.c:245
 #, fuzzy
 msgid "update the trust database"
 msgstr "|[éíĺîá]|ĐŇĎ×ĹŇÉÔŘ ÂÁÚŐ ÄÁÎÎŮČ ÄĎ×ĹŇÉŃ"
 
-#: g10/g10.c:238
+#: g10/g10.c:247
 msgid "|[NAMES]|check the trust database"
 msgstr "|[éíĺîá]|ĐŇĎ×ĹŇÉÔŘ ÂÁÚŐ ÄÁÎÎŮČ ÄĎ×ĹŇÉŃ"
 
-#: g10/g10.c:239
+#: g10/g10.c:248
 msgid "fix a corrupted trust database"
 msgstr "ÉÓĐŇÁ×ÉÔŘ ŇÁÚŇŐŰĹÎÎŐŔ ÂÁÚŐ ÄÁÎÎŮČ ÄĎ×ĹŇÉŃ"
 
-#: g10/g10.c:240
+#: g10/g10.c:249
 msgid "De-Armor a file or stdin"
 msgstr "äĹËĎÄÉŇĎ×ÁÔŘ stdin ÉĚÉ ĆÁĘĚ ÉÚ ASCII-ĐŇĹÄÓÔÁ×ĚĹÎÉŃ"
 
-#: g10/g10.c:242
+#: g10/g10.c:251
 msgid "En-Armor a file or stdin"
 msgstr "úÁËĎÄÉŇĎ×ÁÔŘ stdin ÉĚÉ ĆÁĘĚ × ASCII-ĐŇĹÄÓÔÁ×ĚĹÎÉĹ"
 
-#: g10/g10.c:244
+#: g10/g10.c:253
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|ÎÁĐĹŢÁÔÁÔŘ ÄÁĘÄÖĹÓÔ ÓĎĎÂÝĹÎÉŃ"
 
-#: g10/g10.c:248
+#: g10/g10.c:257
 msgid ""
 "@\n"
 "Options:\n"
@@ -553,164 +553,168 @@
 "đÁŇÁÍĹÔŇŮ:\n"
 " "
 
-#: g10/g10.c:250
+#: g10/g10.c:259
 msgid "create ascii armored output"
 msgstr "×Ů×ĎÄ × ASCII-ĐŇĹÄÓÔÁ×ĚĹÎÉÉ"
 
-#: g10/g10.c:252
+#: g10/g10.c:261
 #, fuzzy
 msgid "|NAME|encrypt for NAME"
 msgstr "|éíń|ÉÓĐĎĚŘÚĎ×ÁÔŘ ŰÉĆŇĎ×ÁĚŘÎŮĘ ÁĚÇĎŇÉÔÍĎÍ éíń"
 
-#: g10/g10.c:255
+#: g10/g10.c:264
 #, fuzzy
 msgid "|NAME|use NAME as default recipient"
 msgstr "|éíń|ÉÓĐĎĚŘÚĎ×ÁÔŘ éíń × ËÁŢĹÓÔ×Ĺ ÓĹËŇĹÔÎĎÇĎ ËĚŔŢÁ ĐĎ ŐÍĎĚŢÁÎÉŔ"
 
-#: g10/g10.c:257
+#: g10/g10.c:266
 msgid "use the default key as default recipient"
 msgstr ""
 
-#: g10/g10.c:261
+#: g10/g10.c:270
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "ÉÓĐĎĚŘÚĎ×ÁÔŘ ŐËÁÚÁÎÎŮĘ ÉÄĹÎÔÉĆÉËÁÔĎŇ ĐĎĚŘÚĎ×ÁÔĹĚŃ ÄĚŃ ĐĎÄĐÉÓÉ ÉĚÉ ŇÁÓŰÉĆŇĎ×ËÉ"
 
-#: g10/g10.c:262
+#: g10/g10.c:271
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|ŐÓÔÁÎĎ×ÉÔŘ ŐŇĎ×ĹÎŘ ÓÖÁÔÉŃ (0 - ÎĹ ÓÖÉÍÁÔŘ)"
 
-#: g10/g10.c:264
+#: g10/g10.c:273
 msgid "use canonical text mode"
 msgstr "ÉÓĐĎĚŘÚĎ×ÁÔŘ ËÁÎĎÎÉŢĹÓËÉĘ ÔĹËÓÔĎ×ŮĘ ŇĹÖÉÍ"
 
-#: g10/g10.c:265
+#: g10/g10.c:274
 msgid "use as output file"
 msgstr "ÉÓĐĎĚŘÚĎ×ÁÔŘ × ËÁŢĹÓÔ×Ĺ ×ŮČĎÄÎĎÇĎ ĆÁĘĚÁ"
 
-#: g10/g10.c:266
+#: g10/g10.c:275
 msgid "verbose"
 msgstr "ÍÎĎÇĎÓĚĎ×ÎŮĘ"
 
-#: g10/g10.c:267
+#: g10/g10.c:276
 msgid "be somewhat more quiet"
 msgstr ""
 
-#: g10/g10.c:268
+#: g10/g10.c:277
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: g10/g10.c:269
+#: g10/g10.c:278
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "ĐŇĎ×ĹŇÉÔŘ ĐĎÄĐÉÓŘ ÎÁ ËĚŔŢĹ"
 
-#: g10/g10.c:270
+#: g10/g10.c:279
 #, fuzzy
 msgid "always use a MDC for encryption"
 msgstr "ÉÓĐĎĚŘÚĎ×ÁÔŘ ŐËÁÚÁÎÎŮĘ ÉÄĹÎÔÉĆÉËÁÔĎŇ ĐĎĚŘÚĎ×ÁÔĹĚŃ ÄĚŃ ŰÉĆŇĎ×ÁÎÉŃ"
 
-#: g10/g10.c:271
+#: g10/g10.c:280
 msgid "do not make any changes"
 msgstr "Keine wirklichen Änderungen durchführen"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:273
+#: g10/g10.c:282
 msgid "batch mode: never ask"
 msgstr "ĐÁËĹÔÎŮĘ ŇĹÖÉÍ: ÎÉŢĹÇĎ ÎĹ ÓĐŇÁŰÉ×ÁÔŘ"
 
-#: g10/g10.c:274
+#: g10/g10.c:283
 msgid "assume yes on most questions"
 msgstr "ĎÔ×ĹŢÁÔŘ \"ÄÁ\" ÎÁ ÂĎĚŘŰÉÎÓÔ×Ď ×ĎĐŇĎÓĎ×"
 
-#: g10/g10.c:275
+#: g10/g10.c:284
 msgid "assume no on most questions"
 msgstr "ĎÔ×ĹŢÁÔŘ \"ÎĹÔ\" ÎÁ ÂĎĚŘŰÉÎÓÔ×Ď ×ĎĐŇĎÓĎ×"
 
-#: g10/g10.c:276
+#: g10/g10.c:285
 msgid "add this keyring to the list of keyrings"
 msgstr "ÄĎÂÁ×ÉÔŘ ÜÔŐ Ó×ŃÚËŐ Ë ÓĐÉÓËŐ Ó×ŃÚĎË ËĚŔŢĹĘ"
 
-#: g10/g10.c:277
+#: g10/g10.c:286
 msgid "add this secret keyring to the list"
 msgstr "ÄĎÂÁ×ÉÔŘ ÜÔŐ ÓĹËŇĹÔÎŐŔ Ó×ŃÚËŐ Ë ÓĐÉÓËŐ Ó×ŃÚĎË ËĚŔŢĹĘ"
 
-#: g10/g10.c:278
+#: g10/g10.c:287
 msgid "|NAME|use NAME as default secret key"
 msgstr "|éíń|ÉÓĐĎĚŘÚĎ×ÁÔŘ éíń × ËÁŢĹÓÔ×Ĺ ÓĹËŇĹÔÎĎÇĎ ËĚŔŢÁ ĐĎ ŐÍĎĚŢÁÎÉŔ"
 
-#: g10/g10.c:279
+#: g10/g10.c:288
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: g10/g10.c:280
+#: g10/g10.c:289
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|éíń|ÉÓĐĎĚŘÚĎ×ÁÔŘ ŰÉĆŇĎ×ÁĚŘÎŮĘ ÁĚÇĎŇÉÔÍĎÍ éíń"
 
-#: g10/g10.c:281
+#: g10/g10.c:290
 msgid "read options from file"
 msgstr "ŢÉÔÁÔŘ ĐÁŇÁÍĹÔŇŮ ÉÚ ĆÁĘĚÁ"
 
-#: g10/g10.c:285
+#: g10/g10.c:294
 msgid "|FD|write status info to this FD"
 msgstr "|FD| ÚÁĐÉÓŮ×ÁÔŘ ÉÎĆĎŇÍÁĂÉŔ Ď ÓĎÓÔĎŃÎÉÉ × ÄĹÓËŇÉĐÔĎŇ (FD)"
 
-#: g10/g10.c:290
+#: g10/g10.c:299
+msgid "|KEYID|ulimately trust this key"
+msgstr ""
+
+#: g10/g10.c:300
 #, fuzzy
 msgid "|FILE|load extension module FILE"
 msgstr "|ćáęě|ÚÁÇŇŐÚÉÔŘ ćáęě Ó ŇÁÓŰÉŇŃŔÝÉÍÉ ÍĎÄŐĚŃÍÉ"
 
-#: g10/g10.c:291
+#: g10/g10.c:301
 msgid "emulate the mode described in RFC1991"
 msgstr "ÜÍŐĚÉŇĎ×ÁÔŘ ŇĹÖÉÍ ĎĐÉÓÁÎÎŮĘ × RFC1991"
 
-#: g10/g10.c:292
+#: g10/g10.c:302
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:293
+#: g10/g10.c:303
 #, fuzzy
 msgid "|N|use passphrase mode N"
 msgstr "|N|ÉÓĐĎĚŘÚĎ×ÁÔŘ ËĚŔŢĹ×ŐŔ ĆŇÁÚŐ ŇĹÖÉÍÁ N\n"
 
-#: g10/g10.c:295
+#: g10/g10.c:305
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|éíń|ÉÓĐĎĚŘÚĎ×ÁÔŘ ČÜŰ-ÁĚÇĎŇÉÔÍ éíń ÄĚŃ ËĚŔŢĹ×ŮČ ĆŇÁÚ"
 
-#: g10/g10.c:297
+#: g10/g10.c:307
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|éíń|ÉÓĐĎĚŘÚĎ×ÁÔŘ ŰÉĆŇĎ×ÁĚŘÎŮĘ ÁĚÇĎŇÉÔÍĎÍ éíń ÄĚŃ ËĚŔŢĹ×ŮČ ĆŇÁÚ"
 
-#: g10/g10.c:298
+#: g10/g10.c:308
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|éíń|ÉÓĐĎĚŘÚĎ×ÁÔŘ ŰÉĆŇĎ×ÁĚŘÎŮĘ ÁĚÇĎŇÉÔÍĎÍ éíń"
 
-#: g10/g10.c:299
+#: g10/g10.c:309
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|éíń|ÉÓĐĎĚŘÚĎ×ÁÔŘ ČÜŰ-ÁĚÇĎŇÉÔÍ éíń"
 
-#: g10/g10.c:300
+#: g10/g10.c:310
 msgid "|N|use compress algorithm N"
 msgstr "|N|ÉÓĐĎĚŘÚĎ×ÁÔŘ ÁĚÇĎŇÉÔÍ ÓÖÁÔÉŃ N"
 
-#: g10/g10.c:301
+#: g10/g10.c:311
 msgid "throw keyid field of encrypted packets"
 msgstr "×ŮÂŇÁÓŮ×ÁÔŘ ĐĎĚĹ keyid Ő ÚÁŰÉĆŇĎ×ÁÎÎŮČ ĐÁËĹÔĎ×"
 
-#: g10/g10.c:302
+#: g10/g10.c:312
 msgid "|NAME=VALUE|use this notation data"
 msgstr ""
 
-#: g10/g10.c:305
+#: g10/g10.c:315
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:308
+#: g10/g10.c:318
 #, fuzzy
 msgid ""
 "@\n"
@@ -731,17 +735,17 @@
 " --list-keys [names]        ĐĎËÁÚÁÔŘ ÓĐÉÓĎË ËĚŔŢĹĘ\n"
 " --fingerprint [names]      ĐĎËÁÚÁÔŘ \"ĎÔĐĹŢÁÔËÉ ĐÁĚŘĂĹ×\" ËĚŔŢĹĘ\n"
 
-#: g10/g10.c:403
+#: g10/g10.c:418
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "đĎÖÁĚŐĘÓÔÁ, ĎÔĐŇÁ×ĚŃĘÔĹ ÓĎĎÂÝĹÎÉŃ Ď ĎŰÉÂËÁČ ĐĎ ÁÄŇĹÓŐ "
 "<gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:407
+#: g10/g10.c:422
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "éÓĐĎĚŘÚĎ×ÁÎÉĹ: gpg [ĐÁŇÁÍĹÔŇŮ] [ĆÁĘĚŮ] (-h ÄĚŃ ĐĎÍĎÝÉ)"
 
-#: g10/g10.c:410
+#: g10/g10.c:425
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -751,7 +755,7 @@
 "ĐĎÄĐÉÓŮ×ÁĹÔ, ĐŇĎ×ĹŇŃĹÔ ĐĎÄĐÉÓÉ, ŰÉĆŇŐĹÔ ÉĚÉ ŇÁÓŰÉĆŇĎ×Ů×ÁĹÔ\n"
 "ŇĹÖÉÍ ŇÁÂĎÔŮ ÚÁ×ÉÓÉÔ ĎÔ ×ČĎÄÎŮČ ÄÁÎÎŮČ\n"
 
-#: g10/g10.c:417
+#: g10/g10.c:432
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -759,198 +763,202 @@
 "\n"
 "đĎÄÄĹŇÖÉ×ÁĹÍŮĹ ÁĚÇĎŇÉÔÍŮ:\n"
 
-#: g10/g10.c:496
+#: g10/g10.c:511
 msgid "usage: gpg [options] "
 msgstr "éÓĐĎĚŘÚĎ×ÁÎÉĹ: gpg [ĐÁŇÁÍĹÔŇŮ] "
 
-#: g10/g10.c:549
+#: g10/g10.c:564
 msgid "conflicting commands\n"
 msgstr "Widersprüchliche Kommandos\n"
 
-#: g10/g10.c:692
+#: g10/g10.c:704
 #, fuzzy, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "ÚÁÍĹŢÁÎÉĹ: ĆÁĘĚ ĐÁŇÁÍĹÔŇĎ× ĐĎ ŐÍĎĚŢÁÎÉŔ `%s' ĎÔÓŐÔÓÔ×ŐĹÔ\n"
 
-#: g10/g10.c:696
+#: g10/g10.c:708
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ĆÁĘĚ ĐÁŇÁÍĹÔŇĎ× `%s': %s\n"
 
-#: g10/g10.c:703
+#: g10/g10.c:715
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "ŢÉÔÁŔÔÓŃ ĐÁŇÁÍĹÔŇŮ ÉÚ `%s'\n"
 
-#: g10/g10.c:893
+#: g10/g10.c:905
 #, fuzzy, c-format
 msgid "%s is not a valid character set\n"
 msgstr "îĹÄĎĐŐÓÔÉÍŮĘ ÓÉÍ×ĎĚ × ËĎÍÍĹÎÔÁŇÉÉ.\n"
 
-#: g10/g10.c:949 g10/g10.c:958
+#: g10/g10.c:970
+msgid "WARNING: program may create a core file!\n"
+msgstr ""
+
+#: g10/g10.c:974 g10/g10.c:983
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/g10.c:951
+#: g10/g10.c:976
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr ""
 
-#: g10/g10.c:954
+#: g10/g10.c:979
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr ""
 
-#: g10/g10.c:973 g10/g10.c:985
+#: g10/g10.c:998 g10/g10.c:1010
 msgid "selected cipher algorithm is invalid\n"
 msgstr "×ŮÂŇÁÎ ÎĹÄĎĐŐÓÔÉÍŮĘ ÁĚÇĎŇÉÔÍ ŰÉĆŇĎ×ÁÎÉŃ\n"
 
-#: g10/g10.c:979 g10/g10.c:991
+#: g10/g10.c:1004 g10/g10.c:1016
 msgid "selected digest algorithm is invalid\n"
 msgstr "×ŮÂŇÁÎ ÎĹÄĎĐŐÓÔÉÍŮĘ ÄÁĘÄÖĹÓÔ-ÁĚÇĎŇÉÔÍ\n"
 
-#: g10/g10.c:995
+#: g10/g10.c:1020
 msgid "the given policy URL is invalid\n"
 msgstr ""
 
-#: g10/g10.c:998
+#: g10/g10.c:1023
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "ÁĚÇĎŇÉÔÍ ŐĐÁËĎ×ËÉ ÍĎÖĹÔ ÉÍĹÔŘ ÚÎÁŢĹÎÉŃ ĎÔ %d ÄĎ %d\n"
 
-#: g10/g10.c:1000
+#: g10/g10.c:1025
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ÄĎĚÖĹÎ ÂŮÔŘ ÂĎĚŘŰĹ 0\n"
 
-#: g10/g10.c:1002
+#: g10/g10.c:1027
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ÄĎĚÖĹÎ ÂŮÔŘ ÂĎĚŘŰĹ 1\n"
 
-#: g10/g10.c:1004
+#: g10/g10.c:1029
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:1007
+#: g10/g10.c:1032
 #, fuzzy
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "ÚÁÍĹŢÁÎÉĹ: ĐŇĎÓÔĎĘ S2K ŇĹÖÉÍ (0) ĎŢĹÎŘ ÎĹ ŇĹËĎÍĹÎÄŐĹÔÓŃ\n"
 
-#: g10/g10.c:1011
+#: g10/g10.c:1036
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ÎĹÄĎĐŐÓÔÉÍŮĘ ŇĹÖÉÍ S2K: ÄĎĚÖĹÎ ÂŮÔŘ 0, 1 ÉĚÉ 3\n"
 
-#: g10/g10.c:1096
+#: g10/g10.c:1121
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "ďŰÉÂËÁ ÉÎÉĂÉÁĚÉÚÁĂÉÉ ÂÁÚŮ ÄÁÎÎŮČ ÄĎ×ĹŇÉŃ: %s\n"
 
-#: g10/g10.c:1102
+#: g10/g10.c:1127
 msgid "--store [filename]"
 msgstr "--store [ÉÍŃ ĆÁĘĚÁ]"
 
-#: g10/g10.c:1109
+#: g10/g10.c:1134
 msgid "--symmetric [filename]"
 msgstr "--symmetric [ÉÍŃ ĆÁĘĚÁ]"
 
-#: g10/g10.c:1117
+#: g10/g10.c:1142
 msgid "--encrypt [filename]"
 msgstr "--encrypt [ÉÍŃ ĆÁĘĚÁ]"
 
-#: g10/g10.c:1130
+#: g10/g10.c:1155
 msgid "--sign [filename]"
 msgstr "--sign [ÉÍŃ ĆÁĘĚÁ]"
 
-#: g10/g10.c:1143
+#: g10/g10.c:1168
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [ÉÍŃ ĆÁĘĚÁ]"
 
-#: g10/g10.c:1157
+#: g10/g10.c:1182
 msgid "--clearsign [filename]"
 msgstr "--clearsign [ÉÍŃ ĆÁĘĚÁ]"
 
-#: g10/g10.c:1174
+#: g10/g10.c:1199
 msgid "--decrypt [filename]"
 msgstr "--decrypt [ÉÍŃ ĆÁĘĚÁ]"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1207
 msgid "--sign-key user-id"
 msgstr ""
 
-#: g10/g10.c:1190
+#: g10/g10.c:1215
 #, fuzzy
 msgid "--lsign-key user-id"
 msgstr "--delete-key ÉÍŃ-ĐĎĚŘÚĎ×ÁÔĹĚŃ"
 
-#: g10/g10.c:1198
+#: g10/g10.c:1223
 #, fuzzy
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key ÉÍŃ-ĐĎĚŘÚĎ×ÁÔĹĚŃ"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1239
 #, fuzzy
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key ÉÍŃ-ĐĎĚŘÚĎ×ÁÔĹĚŃ"
 
-#: g10/g10.c:1217
+#: g10/g10.c:1242
 #, fuzzy
 msgid "--delete-key user-id"
 msgstr "--delete-key ÉÍŃ-ĐĎĚŘÚĎ×ÁÔĹĚŃ"
 
-#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393
+#: g10/encode.c:265 g10/g10.c:1279 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ ĆÁĘĚ `%s': %s\n"
 
-#: g10/g10.c:1269
+#: g10/g10.c:1294
 #, fuzzy
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [ÉÄĹÎÔÉĆÉËÁÔĎŇ ĐĎĚŘÚĎ×ÁÔĹĚŃ] [Ó×ŃÚËÁ ËĚŔŢĹĘ]"
 
-#: g10/g10.c:1335
+#: g10/g10.c:1360
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ĎŰÉÂËÁ ÄĹËĎÄÉŇĎ×ÁÎÉŃ: %s\n"
 
-#: g10/g10.c:1343
+#: g10/g10.c:1368
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ĎŰÉÂËÁ ËĎÄÉŇĎ×ÁÎÉŃ: %s\n"
 
-#: g10/g10.c:1411
+#: g10/g10.c:1439
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ÎĹÄĎĐŐÓÔÉÍŮĘ ČÜŰ-ÁĚÇĎŇÉÔÍ `%s'\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1520
 msgid "[filename]"
 msgstr "[ÉÍŃ ĆÁĘĚÁ]"
 
-#: g10/g10.c:1496
+#: g10/g10.c:1524
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/decrypt.c:59 g10/g10.c:1499 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1527 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ ĆÁĘĚ `%s'\n"
 
-#: g10/g10.c:1669
+#: g10/g10.c:1700
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 
-#: g10/g10.c:1675
+#: g10/g10.c:1706
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
 msgstr ""
 
-#: g10/g10.c:1681
+#: g10/g10.c:1712
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 
-#: g10/g10.c:1689
+#: g10/g10.c:1720
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 
@@ -1333,59 +1341,59 @@
 msgid "writing key binding signature\n"
 msgstr "ĐÉŰĹÔÓŃ \"key-binding\" ĐĎÄĐÉÓŘ\n"
 
-#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:433
+#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:435
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "úÁĐŇĎŰĹÎÎŮĘ ËĚŔŢ ÉÍĹĹÔ ÄĚÉÎŐ %u ÂÉÔ\n"
 
-#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:438
+#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:440
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "ĎËŇŐÇĚĹÎĎ ÄĎ %u ÂÉÔ\n"
 
-#: g10/keygen.c:537
+#: g10/keygen.c:539
 msgid "Please select what kind of key you want:\n"
 msgstr "÷ŮÂĹŇÉÔĹ ÖĹĚÁĹÍŮĘ ÔÉĐ ËĚŔŢÁ:\n"
 
-#: g10/keygen.c:539
+#: g10/keygen.c:541
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA É ElGamal (ĐĎ ŐÍĎĚŢÁÎÉŔ)\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:542
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (ÔĎĚŘËĎ ĐĎÄĐÉÓŘ)\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:544
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (ÔĎĚŘËĎ ŰÉĆŇĎ×ÁÎÉĹ)\n"
 
-#: g10/keygen.c:543
+#: g10/keygen.c:545
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (ĐĎÄĐÉÓŘ É ŰÉĆŇĎ×ÁÎÉĹ)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:547
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (ĐĎÄĐÉÓŘ É ŰÉĆŇĎ×ÁÎÉĹ)\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:551
 msgid "Your selection? "
 msgstr "÷ÁŰ ×ŮÂĎŇ? "
 
-#: g10/keygen.c:560 g10/keygen.c:568
+#: g10/keygen.c:562 g10/keygen.c:570
 #, fuzzy
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "÷Ů ÄĹĘÓÔ×ÉÔĹĚŘÎĎ ČĎÔÉÔĹ ŐÄÁĚÉÔŘ ×ŮÂŇÁÎÎŮĹ ËĚŔŢÉ? "
 
-#: g10/keygen.c:582
+#: g10/keygen.c:584
 msgid "Invalid selection.\n"
 msgstr "îĹÄĎĐŐÓÔÉÍŮĘ ×ŮÂĎŇ.\n"
 
-#: g10/keygen.c:594
+#: g10/keygen.c:596
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1398,19 +1406,19 @@
 "               ÄĚÉÎÁ ËĚŔŢÁ ĐĎ ŐÍĎĚŢÁÎÉŔ: 1024 ÂÉÔÁ\n"
 " ÍÁËÓÉÍÁĚŘÎÁŃ ŇĹËĎÍĹÎÄŐĹÍÁŃ ÄĚÉÎÁ ËĚŔŢÁ: 2048 ÂÉÔ\n"
 
-#: g10/keygen.c:601
+#: g10/keygen.c:603
 msgid "What keysize do you want? (1024) "
 msgstr "ëÁËĎÇĎ ŇÁÚÍĹŇÁ ËĚŔŢ ×Ů ÖĹĚÁĹÔĹ? (1024)"
 
-#: g10/keygen.c:606
+#: g10/keygen.c:608
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "äĎĐŐÓÔÉÍŮĘ ŇÁÚÍĹŇ DSA ËĚŔŢĹĘ - ĎÔ 512 ÄĎ 1024 ÂÉÔ\n"
 
-#: g10/keygen.c:608
+#: g10/keygen.c:610
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "ÓĚÉŰËĎÍ ÍÁĚĹÎŘËÁŃ ÄĚÉÎÁ ËĚŔŢÁ, ÎÁÉÍĹÎŘŰĹĹ ÚÎÁŢĹÎÉĹ - 768.\n"
 
-#: g10/keygen.c:610
+#: g10/keygen.c:612
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "ÓĚÉŰËĎÍ ÍÁĚĹÎŘËÁŃ ÄĚÉÎÁ ËĚŔŢÁ, ÎÁÉÍĹÎŘŰĹĹ ÚÎÁŢĹÎÉĹ - 768.\n"
@@ -1423,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:621
+#: g10/keygen.c:623
 #, fuzzy, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "ÓĚÉŰËĎÍ ÍÁĚĹÎŘËÁŃ ÄĚÉÎÁ ËĚŔŢÁ, ÎÁÉÍĹÎŘŰĹĹ ÚÎÁŢĹÎÉĹ - 768.\n"
 
-#: g10/keygen.c:626
+#: g10/keygen.c:628
 #, fuzzy
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
@@ -1437,11 +1445,11 @@
 "ëĚŔŢÉ ÄĚÉÎĎĘ ÂĎĚŘŰĹ 2048 ÎĹ ŇĹËĎÍĹÎÄŐŔÔÓŃ, ĐĎÔĎÍŐ ŢÔĎ ×ŮŢÉÓĚĹÎÉŃÚÁÎÉÍÁŔÔ "
 "ďţĺîř ÍÎĎÇĎ ×ŇĹÍĹÎÉ!\n"
 
-#: g10/keygen.c:629
+#: g10/keygen.c:631
 msgid "Are you sure that you want this keysize? "
 msgstr "÷Ů ÄĹĘÓÔ×ÉÔĹĚŘÎĎ ČĎÔÉÔĹ ËĚŔŢ ÔÁËĎĘ ÄĚÉÎŮ? "
 
-#: g10/keygen.c:630
+#: g10/keygen.c:632
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1449,21 +1457,21 @@
 "ďË, ÔĎĚŘËĎ ÎĹ ÚÁÂŮ×ÁĘÔĹ, ŢÔĎ ÉÚĚŐŢĹÎÉĹ ×ÁŰÉČ ËĚÁ×ÉÁÔŐŇŮ É ÍĎÎÉÔĎŇÁ ÔĎÖĹ\n"
 "ÄĹĚÁŔÔ ×ÁÓ ŐŃÚ×ÉÍŮÍ ÄĚŃ ÁÔÁË.\n"
 
-#: g10/keygen.c:638
+#: g10/keygen.c:640
 msgid "Do you really need such a large keysize? "
 msgstr "÷ÁÍ ÄĹĘÓÔ×ÉÔĹĚŘÎĎ ÎŐÖĹÎ ÔÁËĎĘ ÄĚÉÎÎŮĘ ËĚŔŢ? "
 
-#: g10/keygen.c:644
+#: g10/keygen.c:646
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "úÁĐŇĎŰĹÎÎŮĘ ËĚŔŢ ÉÍĹĹÔ ÄĚÉÎŐ %u ÂÉÔ\n"
 
-#: g10/keygen.c:647 g10/keygen.c:651
+#: g10/keygen.c:649 g10/keygen.c:653
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "ĎËŇŐÇĚĹÎĎ ÄĎ %u ÂÉÔ\n"
 
-#: g10/keygen.c:699
+#: g10/keygen.c:701
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1479,35 +1487,35 @@
 "      <n>m = ÓŇĎË ÄĹĘÓÔ×ÉŃ ËĚŔŢÁ n ÍĹÓŃĂĹ×\n"
 "      <n>y = ÓŇĎË ÄĹĘÓÔ×ÉŃ ËĚŔŢÁ n ĚĹÔ\n"
 
-#: g10/keygen.c:714
+#: g10/keygen.c:716
 msgid "Key is valid for? (0) "
 msgstr "ëĚŔŢ ÄĹĘÓÔ×ÉÔĹĚĹÎ × ÔĹŢĹÎÉĹ? (0) "
 
-#: g10/keygen.c:719
+#: g10/keygen.c:721
 msgid "invalid value\n"
 msgstr "ÎĹÄĎĐŐÓÔÉÍĎĹ ÚÎÁŢĹÎÉĹ.\n"
 
-#: g10/keygen.c:724
+#: g10/keygen.c:726
 msgid "Key does not expire at all\n"
 msgstr "âĹÓÓŇĎŢÎŮĘ ËĚŔŢ.\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:730
+#: g10/keygen.c:732
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "ëĚŔŢ ÄĹĘÓÔ×ŐĹÔ ÄĎ %s\n"
 
-#: g10/keygen.c:733
+#: g10/keygen.c:735
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:738
+#: g10/keygen.c:740
 msgid "Is this correct (y/n)? "
 msgstr "üÔĎ ×ĹŇÎĎ? (y/n) "
 
-#: g10/keygen.c:781
+#: g10/keygen.c:783
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1523,44 +1531,44 @@
 "    \"Vasya Pupkin (KRUTOI) <vasya@mega-cool.ru>\"\n"
 "\n"
 
-#: g10/keygen.c:793
+#: g10/keygen.c:795
 msgid "Real name: "
 msgstr "÷ÁŰĹ ÉÍŃ (\"éÍŃ ćÁÍÉĚÉŃ\"): "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:803
 msgid "Invalid character in name\n"
 msgstr "îĹÄĎĐŐÓÔÉÍŮĘ ÓÉÍ×ĎĚ × ÉÍĹÎÉ\n"
 
-#: g10/keygen.c:799
+#: g10/keygen.c:805
 msgid "Name may not start with a digit\n"
 msgstr "đĎĚÎĎĹ ÉÍŃ ÎĹ ÍĎÖĹÔ ÎÁŢÉÎÁÔŘÓŃ Ó ĂÉĆŇŮ.\n"
 
-#: g10/keygen.c:801
+#: g10/keygen.c:807
 msgid "Name must be at least 5 characters long\n"
 msgstr "đĎĚÎĎĹ ÉÍŃ ÄĎĚÖÎĎ ÓĎÓÔĎŃÔŘ ÎĹ ÍĹÎĹĹ ŢĹÍ ÉÚ 5ÔÉ ÓÉÍ×ĎĚĎ×.\n"
 
-#: g10/keygen.c:809
+#: g10/keygen.c:815
 msgid "Email address: "
 msgstr "E-Mail: "
 
-#: g10/keygen.c:820
+#: g10/keygen.c:826
 msgid "Not a valid email address\n"
 msgstr "îĹÄĎĐŐÓÔÉÍŮĘ E-Mail\n"
 
-#: g10/keygen.c:828
+#: g10/keygen.c:834
 msgid "Comment: "
 msgstr "ëĎÍÍĹÎÔÁŇÉĘ: "
 
-#: g10/keygen.c:834
+#: g10/keygen.c:840
 msgid "Invalid character in comment\n"
 msgstr "îĹÄĎĐŐÓÔÉÍŮĘ ÓÉÍ×ĎĚ × ËĎÍÍĹÎÔÁŇÉÉ.\n"
 
-#: g10/keygen.c:857
+#: g10/keygen.c:863
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr ""
 
-#: g10/keygen.c:863
+#: g10/keygen.c:869
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1571,29 +1579,29 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:867
+#: g10/keygen.c:873
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:872
+#: g10/keygen.c:878
 msgid "NnCcEeOoQq"
 msgstr ""
 
-#: g10/keygen.c:882
+#: g10/keygen.c:888
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "éÚÍĹÎÉÔŘ: N=éÍŃ, C=ëĎÍÍĹÎÔÁŇÉĘ, E=E-Mail, O=Okay/Q=÷ŮČĎÄ? "
 
-#: g10/keygen.c:883
+#: g10/keygen.c:889
 #, 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:902
+#: g10/keygen.c:908
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:940
+#: g10/keygen.c:946
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1601,11 +1609,11 @@
 "äĚŃ ÚÁÝÉÔŮ ×ÁŰĹÇĎ ËĚŔŢÁ ÎŐÖÎÁ ËĚŔŢĹ×ÁŃ ĆŇÁÚÁ.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:948
+#: g10/keyedit.c:468 g10/keygen.c:954
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "ËĚŔŢĹ×ÁŃ ĆŇÁÚÁ ÎĹ ÂŮĚÁ ×ĎÓĐŇĎÉÚ×ĹÄĹÎÁ, ĐĎĐŇĎÂŐĘÔĹ ÓÎĎ×Á.\n"
 
-#: g10/keygen.c:954
+#: g10/keygen.c:960
 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"
@@ -1617,7 +1625,7 @@
 "×ŇĹÍŃ, ÚÁĐŐÓÔÉ× ÜÔŐ ĐŇĎÇŇÁÍÍŐ Ó ĐÁŇÁÍĹÔŇĎÍ \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:975
+#: g10/keygen.c:981
 #, fuzzy
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
@@ -1630,30 +1638,30 @@
 "ÎÁÇŇŐÚÉÔŘ ÓĹÔĹ×ŐŔ ÉĚÉ ÄÉÓËĎ×ŐŔ ĐĎÄÓÉÓÔĹÍŐ). üÔĎ ÄÁÓÔ ÇĹÎĹŇÁÔĎŇŐ ÓĚŐŢÁĘÎŮČ\n"
 "ŢÉÓĹĚ ×ĎÚÍĎÖÎĎÓÔŘ ÎÁÂŇÁÔŘ ÄĎÓÔÁÔĎŢÎĎ ÜÎÔŇĎĐÉÉ.\n"
 
-#: g10/keygen.c:1424
+#: g10/keygen.c:1430
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "ëĚŔŢĹ×ÁŃ ĐÁŇÁ DSA ÂŐÄĹÔ ÉÍĹÔŘ ÄĚÉÎŐ 1024 ÂÉÔÁ.\n"
 
-#: g10/keygen.c:1467
+#: g10/keygen.c:1473
 #, fuzzy
 msgid "Key generation canceled.\n"
 msgstr "çĹÎĹŇÁĂÉŃ ËĚŔŢÁ ĎÔÍĹÎĹÎÁ: %s\n"
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1570
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "ĎÔËŇŮÔŮĘ ÓĹŇÔÉĆÉËÁÔ ÚÁĐÉÓŮ×ÁĹÔÓŃ × `%s'\n"
 
-#: g10/keygen.c:1565
+#: g10/keygen.c:1571
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "ÓĹËŇĹÔÎŮĘ ÓĹŇÔÉĆÉËÁÔ ÚÁĐÉÓŮ×ÁĹÔÓŃ × `%s'\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1667
 msgid "public and secret key created and signed.\n"
 msgstr "ĎÔËŇŮÔŮĘ É ÓĹËŇĹÔÎŮĘ ËĚŔŢÉ ÓĎÚÄÁÎŮ É ĐĎÄĐÉÓÁÎŮ.\n"
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1672
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -1664,12 +1672,12 @@
 "ÄĎĐĎĚÎÉÔĹĚŘÎĎÇĎ\n"
 "ËĚŔŢÁ ÄĚŃ ŰÉĆŇĎ×ÁÎÉŃ.\n"
 
-#: g10/keygen.c:1683 g10/keygen.c:1784
+#: g10/keygen.c:1689 g10/keygen.c:1790
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "çĹÎĹŇÁĂÉŃ ËĚŔŢÁ ÎĹ ŐÄÁĚÁÓŘ: %s\n"
 
-#: g10/keygen.c:1727 g10/sig-check.c:318 g10/sign.c:112
+#: g10/keygen.c:1733 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"
@@ -1677,7 +1685,7 @@
 "ĎÔËŇŮÔŮĘ ËĚŔŢ ÓÇĹÎĹŇÉŇĎ×ÁÎ × ÂŐÄŐÝĹÍ (ÉÓËŇÉ×ĚĹÎÉĹ ×ŇĹÍĹÎÉ ÉĚÉ ÎĹĐŇÁ×ÉĚŘÎĎ "
 "ŐÓÔÁÎĎ×ĚĹÎŮ ŢÁÓŮ)\n"
 
-#: g10/keygen.c:1729 g10/sig-check.c:320 g10/sign.c:114
+#: g10/keygen.c:1735 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"
@@ -1685,12 +1693,12 @@
 "ĎÔËŇŮÔŮĘ ËĚŔŢ ÓÇĹÎĹŇÉŇĎ×ÁÎ × ÂŐÄŐÝĹÍ (ÉÓËŇÉ×ĚĹÎÉĹ ×ŇĹÍĹÎÉ ÉĚÉ ÎĹĐŇÁ×ÉĚŘÎĎ "
 "ŐÓÔÁÎĎ×ĚĹÎŮ ŢÁÓŮ)\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1768
 #, fuzzy
 msgid "Really create? "
 msgstr "äĹĘÓÔ×ÉÔĹĚŘÎĎ ÓĎÚÄÁÔŘ? "
 
-#: g10/encode.c:91 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/encode.c:91 g10/openfile.c:178 g10/openfile.c:288 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1701,17 +1709,17 @@
 msgid "error creating passphrase: %s\n"
 msgstr "ĎŰÉÂËÁ ĐŇÉ ÓĎÚÄÁÎÉÉ ËĚŔŢĹ×ĎĘ ĆŇÁÚŮ: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:319
+#: g10/encode.c:171 g10/encode.c:324
 #, fuzzy, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ĐŇĹÄŐĐŇĹÖÄĹÎÉĹ: ĐŐÓÔĎĘ ĆÁĘĚ.\n"
 
-#: g10/encode.c:266
+#: g10/encode.c:271
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "ţÉÔÁĹÔÓŃ ÉÚ `%s'\n"
 
-#: g10/encode.c:483
+#: g10/encode.c:492
 #, fuzzy, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s ÚÁŰÉĆŇĎ×ÁÎĎ ÄĚŃ: %s\n"
@@ -1763,248 +1771,258 @@
 msgid "No user ID for key\n"
 msgstr "đĚĎČĎĘ ÓĹËŇĹÔÎŮĘ ËĚŔŢ"
 
-#: g10/getkey.c:1642 g10/getkey.c:1698
+#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "ÉÓĐĎĚŘÚŐĹÔÓŃ ÄĎĐĎĚÎÉÔĹĚŘÎŮĘ ËĚŔŢ %09lX ×ÍĹÓÔĎ ĎÓÎĎ×ÎĎÇĎ %08lX%\n"
 
-#: g10/getkey.c:2017
+#: g10/getkey.c:2050
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: ĐĎĚŘÚĎ×ÁÔĹĚŘ ÎĹ ÎÁĘÄĹÎ\n"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ĐŇĎĐŐÓËÁĹÍ ÂĚĎË ÔÉĐÁ %d\n"
 
-#: g10/import.c:188 g10/trustdb.c:1740 g10/trustdb.c:1781
+#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr ""
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, fuzzy, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
-#: g10/import.c:203
+#: g10/import.c:204
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr ""
 
-#: g10/import.c:205
+#: g10/import.c:206
+#, fuzzy, c-format
+msgid "      skipped new keys: %lu\n"
+msgstr "ËĚŔŢ %08lX: %d ÎĎ×ŮČ ĐĎÄĐÉÓĹĘ\n"
+
+#: g10/import.c:209
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:207
+#: g10/import.c:211
 #, c-format
 msgid "              imported: %lu"
 msgstr ""
 
-#: g10/import.c:213
+#: g10/import.c:217
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr ""
 
-#: g10/import.c:215
+#: g10/import.c:219
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:217
+#: g10/import.c:221
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr ""
 
-#: g10/import.c:219
+#: g10/import.c:223
 #, fuzzy, c-format
 msgid "        new signatures: %lu\n"
 msgstr "ËĚŔŢ %08lX: %d ÎĎ×ŮČ ĐĎÄĐÉÓĹĘ\n"
 
-#: g10/import.c:221
+#: g10/import.c:225
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr ""
 
-#: g10/import.c:223
+#: g10/import.c:227
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr ""
 
-#: g10/import.c:225
+#: g10/import.c:229
 #, fuzzy, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "ËĚŔŢ %08lX: ÓĹËŇĹÔÎŮĘ ËĚŔŢ ÉÍĐĎŇÔÉŇĎ×ÁÎ\n"
 
-#: g10/import.c:227
+#: g10/import.c:231
 #, fuzzy, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "éÓĐĎĚŘÚĎ×ÁÎ ÎĹĐŇÁ×ÉĚŘÎŮĘ ÓĹËŇĹÔÎŮĘ ËĚŔŢ"
 
-#: g10/import.c:386 g10/import.c:578
+#: g10/import.c:391 g10/import.c:590
 #, fuzzy, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "ËĚŔŢ %08lX: ÎĹÔ ÉÄĹÎÔÉĆÉËÁÔĎŇÁ ĐĎĚŘÚĎ×ÁÔĹĚŃ\n"
 
-#: g10/import.c:400
+#: g10/import.c:405
 #, fuzzy, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "ËĚŔŢ %08lX: ÎĹÔ ÄĎĐŐÓÔÉÍŮČ ÉÄĹÎÔÉĆÉËÁÔĎŇĎ× ĐĎĚŘÚĎ×ÁÔĹĚĹĘ\n"
 
-#: g10/import.c:402
+#: g10/import.c:407
 msgid "this may be caused by a missing self-signature\n"
 msgstr "ÜÔĎ ÍĎÖĹÔ ÂŮÔŘ ×ŮÚ×ÁÎĎ ĎÔÓŐÔÓÔ×ÉĹÍ ÓÁÍĎ-ĐĎÄĐÉÓÉ\n"
 
-#: g10/import.c:413 g10/import.c:645
+#: g10/import.c:418 g10/import.c:657
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "ËĚŔŢ %08lX: ĎÔËŇŮÔŮĘ ËĚŔŢ ÎĹ ÎÁĘÄĹÎ: %s\n"
 
-#: g10/import.c:419
+#: g10/import.c:423
+#, fuzzy, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "ÓĹËŇĹÔÎŮĘ ËĚŔŢ %08lX: ÎĹ ÉÍĹĹÔ ÓĎĎÔ×ĹÔÓÔ×ŐŔÝĹÇĎ ĎÔËŇŮÔĎÇĎ ËĚŔŢÁ.\n"
+
+#: g10/import.c:431
 msgid "no default public keyring\n"
 msgstr "ÎĹÔ Ó×ŃÚËÉ ĎÔËŇŮÔŮČ ËĚŔŢĹĘ ĐĎ ŐÍĎĚŢÁÎÉŔ\n"
 
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
+#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "ÚÁĐÉÓŮ×ÁĹÔÓŃ × `%s'\n"
 
-#: g10/import.c:426 g10/import.c:484 g10/import.c:593 g10/import.c:694
+#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
 #, fuzzy, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "ÎĹ×ĎÚÍĎÖÎĎ ÚÁÂĚĎËÉŇĎ×ÁÔŘ Ó×ŃÚËŐ ĎÔËŇŮÔŮČ ËĚŔŢĹĘ: %s\n"
 
-#: g10/import.c:429 g10/import.c:487 g10/import.c:596 g10/import.c:697
+#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
 #, fuzzy, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
-#: g10/import.c:434
+#: g10/import.c:446
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "ËĚŔŢ %08lX: ĎÔËŇŮÔŮĘ ËĚŔŢ ÉÍĐĎŇÔÉŇĎ×ÁÎ\n"
 
-#: g10/import.c:451
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "ËĚŔŢ %08lX: ÎĹ ÓĎ×ĐÁÄÁĹÔ Ó ÎÁŰĹĘ ËĎĐÉĹĘ\n"
 
-#: g10/import.c:460 g10/import.c:653
+#: g10/import.c:472 g10/import.c:665
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "ËĚŔŢ %08lX: ÎĹ×ĎÚÍĎÖÎĎ ĎÂÎÁŇŐÖÉÔŘ original keyblock: %s\n"
 
-#: g10/import.c:466 g10/import.c:659
+#: g10/import.c:478 g10/import.c:671
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "ËĚŔŢ %08lX: ÎĹ×ĎÚÍĎÖÎĎ ĐŇĎŢÉÔÁÔŘ original keyblock: %s\n"
 
-#: g10/import.c:493
+#: g10/import.c:505
 #, fuzzy, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "ËĚŔŢ %08lX: 1 ÎĎ×ŮĘ ÉÄĹÎÔÉĆÉËÁÔĎŇ ĐĎĚŘÚĎ×ÁÔĹĚŃ\n"
 
-#: g10/import.c:496
+#: g10/import.c:508
 #, fuzzy, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "ËĚŔŢ %08lX: %d ÎĎ×ŮČ ÉÄĹÎÔÉĆÉËÁÔĎŇĎ× ĐĎĚŘÚĎ×ÁÔĹĚĹĘ\n"
 
-#: g10/import.c:499
+#: g10/import.c:511
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "ËĚŔŢ %08lX: 1 ÎĎ×ÁŃ ĐĎÄĐÉÓŘ\n"
 
-#: g10/import.c:502
+#: g10/import.c:514
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "ËĚŔŢ %08lX: %d ÎĎ×ŮČ ĐĎÄĐÉÓĹĘ\n"
 
-#: g10/import.c:505
+#: g10/import.c:517
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "ËĚŔŢ %08lX: 1 ÎĎ×ŮĘ ĐĎÄ-ËĚŔŢ\n"
 
-#: g10/import.c:508
+#: g10/import.c:520
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "ËĚŔŢ %08lX: %d ÎĎ×ŮČ ĐĎÄ-ËĚŔŢĹĘ\n"
 
-#: g10/import.c:518
+#: g10/import.c:530
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "ËĚŔŢ %08lX: ÎĹ ÉÚÍĹÎĹÎ\n"
 
-#: g10/import.c:601
+#: g10/import.c:613
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "ËĚŔŢ %08lX: ÓĹËŇĹÔÎŮĘ ËĚŔŢ ÉÍĐĎŇÔÉŇĎ×ÁÎ\n"
 
 #. we can't merge secret keys
-#: g10/import.c:605
+#: g10/import.c:617
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "ËĚŔŢ %08lX: ŐÖĹ ÎÁ Ó×ŃÚËĹ ÓĹËŇĹÔÎŮČ ËĚŔŢĹĘ\n"
 
-#: g10/import.c:610
+#: g10/import.c:622
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "ËĚŔŢ %08lX: ÓĹËŇĹÔÎŮĘ ËĚŔŢ ÎĹ ÎÁĘÄĹÎ: %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:651
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "ËĚŔŢ %08lX: ÎĹÔ ĎÔËŇŮÔĎÇĎ ËĚŔŢÁ - ÎĹ×ĎÚÍĎÖÎĎ ĐŇÉÍĹÎÉÔŘ ĎÔÚŮ×ÁŔÝÉĘ "
 "ÓĹŇÔÉĆÉËÁÔ\n"
 
-#: g10/import.c:670
+#: g10/import.c:682
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "ËĚŔŢ %08lX: ÎĹÄĎĐŐÓÔÉÍŮĘ ĎÔÚŮ×ÁŔÝÉĘ ÓĹŇÔÉĆÉËÁÔ: %s - ĎÔ×ĹŇÇÎŐÔ\n"
 
-#: g10/import.c:702
+#: g10/import.c:714
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "ËĚŔŢ %08lX: ĎÔÚŮ×ÁŔÝÉĘ ÓĹŇÔÉĆÉËÁÔ ÉÍĐĎŇÔÉŇĎ×ÁÎ\n"
 
-#: g10/import.c:744
+#: g10/import.c:756
 #, fuzzy, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "ËĚŔŢ %08lX: ÎĹÔ ÉÄĹÎÔÉĆÉËÁÔĎŇÁ ĐĎĚŘÚĎ×ÁÔĹĚŃ ÄĚŃ ĐĎÄĐÉÓÉ\n"
 
-#: g10/import.c:751 g10/import.c:775
+#: g10/import.c:763 g10/import.c:787
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "ËĚŔŢ %08lX: ÎĹĐĎÄÄĹŇÖÉ×ÁĹÍŮĘ ÁĚÇĎŇÉÔÍ ĎÔËŇŮÔĎÇĎ ËĚŔŢÁ\n"
 
-#: g10/import.c:752
+#: g10/import.c:764
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "ËĚŔŢ %08lX: ÎĹÄĎĐŐÓÔÉÍÁŃ ÓÁÍĎ-ĐĎÄĐÉÓŘ\n"
 
-#: g10/import.c:767
+#: g10/import.c:779
 #, fuzzy, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "ËĚŔŢ %08lX: ÎĹÔ ÉÄĹÎÔÉĆÉËÁÔĎŇÁ ĐĎĚŘÚĎ×ÁÔĹĚŃ\n"
 
-#: g10/import.c:776
+#: g10/import.c:788
 #, fuzzy, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "ËĚŔŢ %08lX: ÎĹÔ ÄĎĐŐÓÔÉÍŮČ ÉÄĹÎÔÉĆÉËÁÔĎŇĎ× ĐĎĚŘÚĎ×ÁÔĹĚĹĘ\n"
 
-#: g10/import.c:803
+#: g10/import.c:815
 #, fuzzy, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "ËĚŔŢ %08lX: ĐŇĎĐŐÝĹÎ ÉÄĹÎÔÉĆÉËÁÔĎŇ ĐĎĚŘÚĎ×ÁÔĹĚŃ '"
 
-#: g10/import.c:832
+#: g10/import.c:844
 #, fuzzy, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "ËĚŔŢ %08lX: ĐŇĎĐŐÝĹÎ ÉÄĹÎÔÉĆÉËÁÔĎŇ ĐĎĚŘÚĎ×ÁÔĹĚŃ '"
 
-#: g10/import.c:855
+#: g10/import.c:867
 #, fuzzy, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "ËĚŔŢ %08lX: 1 ÎĎ×ŮĘ ĐĎÄ-ËĚŔŢ\n"
@@ -2013,32 +2031,32 @@
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:880
+#: g10/import.c:892
 #, fuzzy, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "ËĚŔŢ %08lX: ĎÔÚŮ×ÁŔÝÉĘ ÓĹŇÔÉĆÉËÁÔ × ÎĹĐŇÁ×ÉĚŘÎĎÍ ÍĹÓÔĹ - ĐŇĎĐŐÝĹÎ\n"
 
-#: g10/import.c:889
+#: g10/import.c:901
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "ËĚŔŢ %08lX: ĎÔÚŮ×ÁŔÝÉĘ ÓĹŇÔÉĆÉËÁÔ × ÎĹĐŇÁ×ÉĚŘÎĎÍ ÍĹÓÔĹ - ĐŇĎĐŐÝĹÎ\n"
 
-#: g10/import.c:897
+#: g10/import.c:909
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "ËĚŔŢ %08lX: ÎĹÄĎĐŐÓÔÉÍŮĘ ĎÔÚŮ×ÁŔÝÉĘ ÓĹŇÔÉĆÉËÁÔ: %s - ĐŇĎĐŐÝĹÎ\n"
 
-#: g10/import.c:997
+#: g10/import.c:1009
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:1048
+#: g10/import.c:1060
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "ËĚŔŢ %08lX: ĎÔÚŮ×ÁŔÝÉĘ ÓĹŇÔÉĆÉËÁÔ ÄĎÂÁ×ĚĹÎ\n"
 
-#: g10/import.c:1162 g10/import.c:1215
+#: g10/import.c:1174 g10/import.c:1227
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "ËĚŔŢ %08lX: ÎÁŰÁ ËĎĐÉŃ ÎĹ ÉÍĹĹÔ ÓÁÍĎ-ĐĎÄĐÉÓÉ\n"
@@ -2663,8 +2681,18 @@
 msgid "no secret key\n"
 msgstr "đĚĎČĎĘ ÓĹËŇĹÔÎŮĘ ËĚŔŢ"
 
+#: g10/keylist.c:158
+#, fuzzy
+msgid "invalid"
+msgstr "îĹÄĎĐŐÓÔÉÍÁŃ ASCII-ËĎÄÉŇĎ×ËÁ"
+
+#: g10/keylist.c:178
+#, fuzzy
+msgid "revoked"
+msgstr "ËĚŔŢ"
+
 #. of subkey
-#: g10/keylist.c:318 g10/mainproc.c:742
+#: g10/keylist.c:400 g10/mainproc.c:760
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "ëĚŔŢ ÄĹĘÓÔ×ŐĹÔ ÄĎ %s\n"
@@ -2674,134 +2702,122 @@
 msgid "public key is %08lX\n"
 msgstr "ďÔËŇŮÔŮĘ ËĚŔŢ ÎĹ ÎÁĘÄĹÎ"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:257
 #, fuzzy
 msgid "public key encrypted data: good DEK\n"
 msgstr "ŇÁÓŰÉĆŇĎ×ËÁ ĎÔËŇŮÔŮÍ ËĚŔŢĎÍ ÎĹ ŐÄÁĚÁÓŘ %s\n"
 
-#: g10/mainproc.c:281
+#: g10/mainproc.c:299
 #, 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:291
+#: g10/mainproc.c:309
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "đĎÄĐÉÓŘ ÓÄĹĚÁÎÁ %.*s, ÉÓĐĎĚŘÚŐŃ %s ËĚŔŢ %08lX\n"
 
-#: g10/mainproc.c:297
+#: g10/mainproc.c:315
 #, fuzzy
 msgid "no secret key for decryption available\n"
 msgstr "óĹËŇĹÔÎŮĘ ËĚŔŢ ÎĹ ÓŐÝĹÓÔ×ŐĹÔ"
 
-#: g10/mainproc.c:306
+#: g10/mainproc.c:324
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "ŇÁÓŰÉĆŇĎ×ËÁ ĎÔËŇŮÔŮÍ ËĚŔŢĎÍ ÎĹ ŐÄÁĚÁÓŘ %s\n"
 
-#: g10/mainproc.c:343
+#: g10/mainproc.c:361
 #, fuzzy
 msgid "decryption okay\n"
 msgstr "ŇÁÓŰÉĆŇĎ×ËÁ ÎĹ ŐÄÁĚÁÓŘ: %s\n"
 
-#: g10/mainproc.c:348
+#: g10/mainproc.c:366
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:353
+#: g10/mainproc.c:371
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "ŇÁÓŰÉĆŇĎ×ËÁ ÎĹ ŐÄÁĚÁÓŘ: %s\n"
 
-#: g10/mainproc.c:372
+#: g10/mainproc.c:390
 #, fuzzy
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "ÚÁÍĹŢÁÎÉĹ: ĎÔĐŇÁ×ÉÔĹĚŘ ÚÁĐŇĎÓÉĚ \"ÔĎĚŘËĎ-ÄĚŃ-÷ÁŰÉČ-ÇĚÁÚ\"\n"
 
-#: g10/mainproc.c:374
+#: g10/mainproc.c:392
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:544
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:613 g10/mainproc.c:622
+#: g10/mainproc.c:631 g10/mainproc.c:640
 #, fuzzy
 msgid "WARNING: invalid notation data found\n"
 msgstr "ÎĹ ÎÁĘÄĹÎĎ ÄĎĐŐÓÔÉÍŮČ RFC1991 ÉĚÉ OpenPGP ÄÁÎÎŮČ.\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:643
 msgid "Notation: "
 msgstr ""
 
-#: g10/mainproc.c:632
+#: g10/mainproc.c:650
 msgid "Policy: "
 msgstr ""
 
-#: g10/mainproc.c:1062
+#: g10/mainproc.c:1080
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1068
+#: g10/mainproc.c:1086
 #, 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:1094 g10/mainproc.c:1105
+#: g10/mainproc.c:1112 g10/mainproc.c:1123
 msgid "BAD signature from \""
 msgstr "đěďčáń ĐĎÄĐÉÓŘ ĎÔ \""
 
-#: g10/mainproc.c:1095 g10/mainproc.c:1106
+#: g10/mainproc.c:1113 g10/mainproc.c:1124
 msgid "Good signature from \""
 msgstr "čĎŇĎŰÁŃ ĐĎÄĐÉÓŘ ĎÔ \""
 
-#: g10/mainproc.c:1097
+#: g10/mainproc.c:1115
 msgid "                aka \""
 msgstr ""
 
-#: g10/mainproc.c:1153
+#: g10/mainproc.c:1171
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "îĹ×ĎÚÍĎÖÎĎ ĐŇĎ×ĹŇÉÔŘ ĐĎÄĐÉÓŘ: %s\n"
 
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1235
 #, fuzzy, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "đĎÄĐÉÓŘ ÎĹÉÚ×ĹÓÔÎĎÇĎ ÔÉĐÁ"
 
-#: g10/mainproc.c:1263
+#: g10/mainproc.c:1281
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
 
-#: g10/mainproc.c:1268
+#: g10/mainproc.c:1286
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
-#: g10/misc.c:94
+#: g10/misc.c:96
 #, fuzzy, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ ĆÁĘĚ `%s': %s\n"
 
-#: g10/misc.c:97
-msgid "WARNING: program may create a core file!\n"
-msgstr ""
-
-#: g10/misc.c:205
+#: g10/misc.c:206
 msgid "Experimental algorithms should not be used!\n"
 msgstr ""
 
-#: g10/misc.c:219
-msgid ""
-"RSA keys are deprecated; please consider creating a new key and use this key "
-"in the future\n"
-msgstr ""
-"đĎĚŘÚĎ×ÁÎÉĹ RSA ËĚŔŢÁÍÉ ÎĹ ŇĹËĎÍĹÎÄŐĹÔÓŃ, ĐĎÖÁĚŐĘÓÔÁ, ĐĎÄŐÍÁĘÔĹ Ď ÓĎÚÄÁÎÉÉ\n"
-"ÎĎ×ĎÇĎ ËĚŔŢÁ ÄĚŃ ÉÓĐĎĚŘÚĎ×ÁÎÉŃ × ÂŐÄŐÝĹÍ\n"
-
-#: g10/misc.c:241
+#: g10/misc.c:233
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 
@@ -2810,7 +2826,7 @@
 msgid "can't handle public key algorithm %d\n"
 msgstr "ÎĹ×ĎÚÍĎÖÎĎ ÚÁÂĚĎËÉŇĎ×ÁÔŘ Ó×ŃÚËŐ ĎÔËŇŮÔŮČ ËĚŔŢĹĘ: %s\n"
 
-#: g10/parse-packet.c:965
+#: g10/parse-packet.c:986
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
@@ -2850,93 +2866,93 @@
 msgid "Repeat passphrase: "
 msgstr "đĎ×ÔĎŇÉÔĹ ËĚŔŢĹ×ŐŔ ĆŇÁÚŐ: %s\n"
 
-#: g10/plaintext.c:63
+#: g10/plaintext.c:67
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "ÄÁÎÎŮĹ ÎĹ ÂŮĚÉ ÓĎČŇÁÎĹÎŮ; ×ĎÓĐĎĚŘÚŐĘÔĹÓŘ --\"output\" ÄĚŃ ÓĎČŇÁÎĹÎÉŃ\n"
 
-#: g10/plaintext.c:317
+#: g10/plaintext.c:324
 #, fuzzy
 msgid "Detached signature.\n"
 msgstr "%d ĐĚĎČÉČ ĐĎÄĐÉÓĹĘ\n"
 
-#: g10/plaintext.c:321
+#: g10/plaintext.c:328
 msgid "Please enter name of data file: "
 msgstr "đĎÖÁĚŐĘÓÔÁ, ××ĹÄÉÔĹ ÉÍŃ ĆÁĘĚÁ ÄÁÎÎŮČ: "
 
-#: g10/plaintext.c:342
+#: g10/plaintext.c:349
 msgid "reading stdin ...\n"
 msgstr ""
 
-#: g10/plaintext.c:385
+#: g10/plaintext.c:392
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ ĐĎÄĐÉÓÁÎÎŮĹ ÄÁÎÎŮĹ `%s' .\n"
 
-#: g10/pubkey-enc.c:79
+#: g10/pubkey-enc.c:76
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "ÁÎĎÎÉÍÎŮĘ ĐĎĚŐŢÁÔĹĚŘ, ĐŇĎÂŐĹÍ ÓĹËŇĹÔÎŮĘ ËĚŔŢ %08lX ...\n"
 
-#: g10/pubkey-enc.c:85
+#: g10/pubkey-enc.c:82
 #, fuzzy
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "ďË, ÍŮ -- ÁÎĎÎÉÍÎŮĘ ĐĎĚŐŢÁÔĹĚŘ.\n"
 
-#: g10/pubkey-enc.c:137
+#: g10/pubkey-enc.c:134
 #, fuzzy
 msgid "old encoding of the DEK is not supported\n"
 msgstr "ÁĚÇĎŇÉÔÍ ÚÁÝÉÔŮ %d ÎĹ ĐĎÄÄĹŇÖÉ×ÁĹÔÓŃ\n"
 
-#: g10/pubkey-enc.c:156
+#: g10/pubkey-enc.c:153
 #, fuzzy, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "ÁĚÇĎŇÉÔÍ ÚÁÝÉÔŮ %d ÎĹ ĐĎÄÄĹŇÖÉ×ÁĹÔÓŃ\n"
 
-#: g10/pubkey-enc.c:195
+#: g10/pubkey-enc.c:192
 #, fuzzy, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "ÚÁÍĹŢÁÎÉĹ: ŰÉĆŇĎ×ÁĚŘÎŮĘ ÁĚÇĎŇÉÔÍ %d ÎĹ ÎÁĘÄĹÎ × ĐŇĹÄĐĎŢÔĹÎÉŃČ\n"
 
-#: g10/pubkey-enc.c:201
+#: g10/pubkey-enc.c:198
 #, fuzzy, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "ĐŇĹÄŐĐŇĹÖÄĹÎÉĹ: ËĚŔŢ ĐĎÄĐÉÓÉ ŐÓÔÁŇĹĚ %s\n"
 
-#: g10/hkp.c:62
+#: g10/hkp.c:72
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
 msgstr ""
 
-#: g10/hkp.c:75
+#: g10/hkp.c:85
 #, fuzzy, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "ÎĹ×ĎÚÍĎÖÎĎ ÚÁĐÉÓÁÔŘ × Ó×ŃÚËŐ ËĚŔŢĹĘ: %s\n"
 
-#: g10/hkp.c:98 g10/hkp.c:136
+#: g10/hkp.c:109 g10/hkp.c:148
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/hkp.c:106
+#: g10/hkp.c:117
 #, fuzzy, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "îĹÄĎĐŐÓÔÉÍŮĘ ÓÉÍ×ĎĚ × ËĎÍÍĹÎÔÁŇÉÉ.\n"
 
-#: g10/hkp.c:158
+#: g10/hkp.c:170
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ ĆÁĘĚ `%s': %s\n"
 
-#: g10/hkp.c:182
+#: g10/hkp.c:194
 #, fuzzy, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
-#: g10/hkp.c:194
+#: g10/hkp.c:206
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr ""
 
-#: g10/hkp.c:197
+#: g10/hkp.c:209
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
@@ -2951,40 +2967,40 @@
 msgid "protection algorithm %d is not supported\n"
 msgstr "ÁĚÇĎŇÉÔÍ ÚÁÝÉÔŮ %d ÎĹ ĐĎÄÄĹŇÖÉ×ÁĹÔÓŃ\n"
 
-#: g10/seckey-cert.c:175
+#: g10/seckey-cert.c:184
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "îĹĐŇÁ×ÉĚŘÎÁŃ ËĚŔŢĹ×ÁŃ ĆŇÁÚÁ, ĐĎĐŇĎÂŐĘÔĹ ÓÎĎ×Á ...\n"
 
-#: g10/seckey-cert.c:231
+#: g10/seckey-cert.c:240
 #, fuzzy
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "đŇĹÄŐĐŇĹÖÄĹÎÉĹ: ĎÂÎÁŇŐÖĹÎ ÓĚÁÂŮĘ ËĚŔŢ - ÓÍĹÎÉÔĹ ËĚŔŢĹ×ŐŔ ĆŇÁÚŐ.\n"
 
-#: g10/sig-check.c:202
+#: g10/sig-check.c:199
 msgid "assuming bad MDC due to an unknown critical bit\n"
 msgstr ""
 
-#: g10/sig-check.c:300
+#: g10/sig-check.c:297
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr "ÜÔĎÔ ElGamal ËĚŔŢ, ÓĎÚÄÁÎÎŮĘ PGP, ÎĹ ÎÁÄĹÖĹÎ ÄĚŃ ÓĎÚÄÁÎÉŃ ĐĎÄĐÉÓĹĘ!\n"
 
-#: g10/sig-check.c:308
+#: g10/sig-check.c:305
 #, fuzzy, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "ËĚŔŢ %08lX: ÎĹÔ ÉÄĹÎÔÉĆÉËÁÔĎŇÁ ĐĎĚŘÚĎ×ÁÔĹĚŃ ÄĚŃ ĐĎÄĐÉÓÉ\n"
 
-#: g10/sig-check.c:309
+#: g10/sig-check.c:306
 #, fuzzy, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "ËĚŔŢ %08lX: ÎĹÔ ÉÄĹÎÔÉĆÉËÁÔĎŇÁ ĐĎĚŘÚĎ×ÁÔĹĚŃ ÄĚŃ ĐĎÄĐÉÓÉ\n"
 
-#: g10/sig-check.c:327
+#: g10/sig-check.c:324
 #, fuzzy, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "ĐŇĹÄŐĐŇĹÖÄĹÎÉĹ: ËĚŔŢ ĐĎÄĐÉÓÉ ŐÓÔÁŇĹĚ %s\n"
 
-#: g10/sig-check.c:396
+#: g10/sig-check.c:393
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 
@@ -2993,7 +3009,7 @@
 msgid "%s signature from: %s\n"
 msgstr "đěďčáń ĐĎÄĐÉÓŘ ĎÔ \""
 
-#: g10/sign.c:290 g10/sign.c:606
+#: g10/sign.c:290 g10/sign.c:610
 #, fuzzy, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s: ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ: %s\n"
@@ -3042,7 +3058,7 @@
 msgid "%s: directory does not exist!\n"
 msgstr ""
 
-#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1363 g10/tdbio.c:444
+#: g10/openfile.c:226 g10/openfile.c:295 g10/ringedit.c:1369 g10/tdbio.c:444
 #, fuzzy, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ: %s\n"
@@ -3143,296 +3159,306 @@
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "âÁÚÁ ÄÁÎÎŮČ ÄĎ×ĹŇÉŃ ŇÁÚŇŐŰĹÎÁ: ÚÁĐŐÓÔÉÔĹ \"gpgm --fix-trust-db\".\n"
 
-#: g10/trustdb.c:168
+#: g10/trustdb.c:169
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:183
+#: g10/trustdb.c:184
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:197
+#: g10/trustdb.c:198
 #, fuzzy, c-format
 msgid "trust record %lu: delete failed: %s\n"
 msgstr "ĎÂÎĎ×ĚĹÎÉĹ ÓĹËŇĹÔÁ ÎĹ ŐÄÁĚĎÓŘ: %s\n"
 
-#: g10/trustdb.c:211
+#: g10/trustdb.c:212
 #, fuzzy, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "ĎÂÎĎ×ĚĹÎÉĹ ÂÁÚŮ ÄÁÎÎŮČ ÄĎ×ĹŇÉŃ ÎĹ ŐÄÁĚĎÓŘ: %s\n"
 
-#: g10/trustdb.c:376
+#: g10/trustdb.c:377
 #, fuzzy, c-format
 msgid "error reading dir record for LID %lu: %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
-#: g10/trustdb.c:383
+#: g10/trustdb.c:384
 #, c-format
 msgid "lid %lu: expected dir record, got type %d\n"
 msgstr ""
 
-#: g10/trustdb.c:388
+#: g10/trustdb.c:389
 #, c-format
 msgid "no primary key for LID %lu\n"
 msgstr ""
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:394
 #, fuzzy, c-format
 msgid "error reading primary key for LID %lu: %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
-#: g10/trustdb.c:432
+#: g10/trustdb.c:433
 #, fuzzy, c-format
 msgid "get_dir_record: search_record failed: %s\n"
 msgstr "ĎÂÎĎ×ĚĹÎÉĹ ÓĹËŇĹÔÁ ÎĹ ŐÄÁĚĎÓŘ: %s\n"
 
-#: g10/trustdb.c:487
-#, fuzzy, c-format
-msgid "NOTE: secret key %08lX is NOT protected.\n"
-msgstr "üÔĎÔ ËĚŔŢ ÎĹ ÚÁÝÉÝĹÎ.\n"
-
-#: g10/trustdb.c:495
+#: g10/trustdb.c:474
 #, fuzzy, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr "ÓĹËŇĹÔÎŮĘ ËĚŔŢ %08lX: ÎĹ ÉÍĹĹÔ ÓĎĎÔ×ĹÔÓÔ×ŐŔÝĹÇĎ ĎÔËŇŮÔĎÇĎ ËĚŔŢÁ.\n"
-
-#: g10/trustdb.c:502
-#, c-format
-msgid "key %08lX: secret and public key don't match\n"
-msgstr "ËĚŔŢ %08lX: ÓĹËŇĹÔÎŮĘ É ĎÔËŇŮÔĎÇĎ ËĚŔŢÉ ÎĹ ÓĎ×ĐÁÄÁŔÔ.\n"
+msgid "'%s' is not a valid long keyID\n"
+msgstr "îĹÄĎĐŐÓÔÉÍŮĘ ÓÉÍ×ĎĚ × ËĎÍÍĹÎÔÁŇÉÉ.\n"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:501
 #, fuzzy, c-format
 msgid "key %08lX: can't put it into the trustdb\n"
 msgstr "ËĚŔŢ %08lX.%lu: ÎĹ×ĎÚÍĎÖÎĎ ĐĎĚĎÖÉÔŘ × ÂÁÚŐ ÄÁÎÎŮČ ÄĎ×ĹŇÉŃ\n"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:507
 #, fuzzy, c-format
 msgid "key %08lX: query record failed\n"
 msgstr "ËĚŔŢ %08lX: ÚÁĐŇĎÓ ÚÁĐÉÓÉ ÎĹ ŐÄÁĚÓŃ\n"
 
-#: g10/trustdb.c:529
+#: g10/trustdb.c:516
 #, fuzzy, c-format
 msgid "key %08lX: already in trusted key table\n"
 msgstr "ËĚŔŢ %08lX: ŐÖĹ ÎÁ Ó×ŃÚËĹ ÓĹËŇĹÔÎŮČ ËĚŔŢĹĘ\n"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:519
 #, fuzzy, c-format
 msgid "key %08lX: accepted as trusted key.\n"
 msgstr "ËĚŔŢ %08lX: ŐÖĹ ÎÁ Ó×ŃÚËĹ ÓĹËŇĹÔÎŮČ ËĚŔŢĹĘ\n"
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:546
+#, fuzzy, c-format
+msgid "key %08lX: no public key for trusted key - skipped\n"
+msgstr "ÓĹËŇĹÔÎŮĘ ËĚŔŢ %08lX: ÎĹ ÉÍĹĹÔ ÓĎĎÔ×ĹÔÓÔ×ŐŔÝĹÇĎ ĎÔËŇŮÔĎÇĎ ËĚŔŢÁ.\n"
+
+#: g10/trustdb.c:565
+#, fuzzy, c-format
+msgid "NOTE: secret key %08lX is NOT protected.\n"
+msgstr "üÔĎÔ ËĚŔŢ ÎĹ ÚÁÝÉÝĹÎ.\n"
+
+#: g10/trustdb.c:577
+#, fuzzy, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr "ÓĹËŇĹÔÎŮĘ ËĚŔŢ %08lX: ÎĹ ÉÍĹĹÔ ÓĎĎÔ×ĹÔÓÔ×ŐŔÝĹÇĎ ĎÔËŇŮÔĎÇĎ ËĚŔŢÁ.\n"
+
+#: g10/trustdb.c:584
+#, c-format
+msgid "key %08lX: secret and public key don't match\n"
+msgstr "ËĚŔŢ %08lX: ÓĹËŇĹÔÎŮĘ É ĎÔËŇŮÔĎÇĎ ËĚŔŢÉ ÎĹ ÓĎ×ĐÁÄÁŔÔ.\n"
+
+#: g10/trustdb.c:597
 #, fuzzy, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr "ĎÂÎĎ×ĚĹÎÉĹ ÓĹËŇĹÔÁ ÎĹ ŐÄÁĚĎÓŘ: %s\n"
 
-#: g10/trustdb.c:921
+#: g10/trustdb.c:987
 #, fuzzy, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "ËĚŔŢ %08lX: ÎĹÔ ÉÄĹÎÔÉĆÉËÁÔĎŇÁ ĐĎĚŘÚĎ×ÁÔĹĚŃ\n"
 
-#: g10/trustdb.c:927 g10/trustdb.c:962
+#: g10/trustdb.c:993 g10/trustdb.c:1028
 #, fuzzy, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "ËĚŔŢ %08lX: ÎĹÔ ÄĎĐŐÓÔÉÍŮČ ÉÄĹÎÔÉĆÉËÁÔĎŇĎ× ĐĎĚŘÚĎ×ÁÔĹĚĹĘ\n"
 
-#: g10/trustdb.c:939
+#: g10/trustdb.c:1005
 #, fuzzy, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "ËĚŔŢ %08lX.%lu: ÓŇĎË ÄĹĘÓÔ×ÉŃ ÉÓÔĹË %s\n"
 
-#: g10/trustdb.c:945
+#: g10/trustdb.c:1011
 #, fuzzy, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "ËĚŔŢ %08lX: ĎÔËŇŮÔŮĘ ËĚŔŢ ÎĹ ÎÁĘÄĹÎ: %s\n"
 
-#: g10/trustdb.c:956
+#: g10/trustdb.c:1022
 #, fuzzy, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "ËĚŔŢ %08lX: ÎĹÔ ÄĎĐŐÓÔÉÍŮČ ÉÄĹÎÔÉĆÉËÁÔĎŇĎ× ĐĎĚŘÚĎ×ÁÔĹĚĹĘ\n"
 
-#: g10/trustdb.c:1067
+#: g10/trustdb.c:1133
 #, fuzzy
 msgid "Good self-signature"
 msgstr "[ÓÁÍĎ-ĐĎÄĐÉÓŘ]\n"
 
-#: g10/trustdb.c:1077
+#: g10/trustdb.c:1143
 #, fuzzy
 msgid "Invalid self-signature"
 msgstr "ËĚŔŢ %08lX: ÎĹÄĎĐŐÓÔÉÍÁŃ ÓÁÍĎ-ĐĎÄĐÉÓŘ\n"
 
-#: g10/trustdb.c:1104
+#: g10/trustdb.c:1170
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 
-#: g10/trustdb.c:1110
+#: g10/trustdb.c:1176
 #, fuzzy
 msgid "Valid user ID revocation"
 msgstr "îĹÄĎĐŐÓÔÉÍŮĘ ×ŮÂĎŇ.\n"
 
-#: g10/trustdb.c:1115
+#: g10/trustdb.c:1181
 #, fuzzy
 msgid "Invalid user ID revocation"
 msgstr "îĹÄĎĐŐÓÔÉÍŮĘ ×ŮÂĎŇ.\n"
 
-#: g10/trustdb.c:1157
+#: g10/trustdb.c:1223
 #, fuzzy
 msgid "Valid certificate revocation"
 msgstr "đĚĎČĎĘ ÓĹŇÔÉĆÉËÁÔ"
 
-#: g10/trustdb.c:1158
+#: g10/trustdb.c:1224
 #, fuzzy
 msgid "Good certificate"
 msgstr "đĚĎČĎĘ ÓĹŇÔÉĆÉËÁÔ"
 
-#: g10/trustdb.c:1186
+#: g10/trustdb.c:1252
 #, fuzzy
 msgid "Invalid certificate revocation"
 msgstr "đĚĎČĎĘ ÓĹŇÔÉĆÉËÁÔ"
 
-#: g10/trustdb.c:1187
+#: g10/trustdb.c:1253
 #, fuzzy
 msgid "Invalid certificate"
 msgstr "đĚĎČĎĘ ÓĹŇÔÉĆÉËÁÔ"
 
-#: g10/trustdb.c:1204 g10/trustdb.c:1208
+#: g10/trustdb.c:1270 g10/trustdb.c:1274
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr ""
 
-#: g10/trustdb.c:1267
+#: g10/trustdb.c:1333
 #, fuzzy
 msgid "duplicated certificate - deleted"
 msgstr "đĚĎČĎĘ ÓĹŇÔÉĆÉËÁÔ"
 
-#: g10/trustdb.c:1584
+#: g10/trustdb.c:1650
 #, fuzzy, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "ĎŰÉÂËÁ ÄĹËĎÄÉŇĎ×ÁÎÉŃ: %s\n"
 
-#: g10/trustdb.c:1718
+#: g10/trustdb.c:1784
 #, fuzzy, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "ĎÂÎĎ×ĚĹÎÉĹ ÓĹËŇĹÔÁ ÎĹ ŐÄÁĚĎÓŘ: %s\n"
 
-#: g10/trustdb.c:1723
+#: g10/trustdb.c:1789
 #, fuzzy, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "ĎÂÎĎ×ĚĹÎÉĹ ÓĹËŇĹÔÁ ÎĹ ŐÄÁĚĎÓŘ: %s\n"
 
-#: g10/trustdb.c:1729
+#: g10/trustdb.c:1795
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr ""
 
-#: g10/trustdb.c:1734
+#: g10/trustdb.c:1800
 #, fuzzy, c-format
 msgid "error reading dir record: %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
-#: g10/trustdb.c:1742 g10/trustdb.c:1805
+#: g10/trustdb.c:1808 g10/trustdb.c:1871
 #, c-format
 msgid "%lu keys processed\n"
 msgstr ""
 
-#: g10/trustdb.c:1744 g10/trustdb.c:1811
+#: g10/trustdb.c:1810 g10/trustdb.c:1877
 #, fuzzy, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "ďŰÉÂËÁ ÚÁĐÉÓÉ ĆÁĘĚÁ"
 
-#: g10/trustdb.c:1746
+#: g10/trustdb.c:1812
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr ""
 
-#: g10/trustdb.c:1749
+#: g10/trustdb.c:1815
 #, fuzzy, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "ĎÂÎĎ×ĚĹÎÉĹ ÓĹËŇĹÔÁ ÎĹ ŐÄÁĚĎÓŘ: %s\n"
 
-#: g10/trustdb.c:1797
+#: g10/trustdb.c:1863
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr ""
 
-#: g10/trustdb.c:1807
+#: g10/trustdb.c:1873
 #, fuzzy, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "ËĚŔŢ %08lX: %d ÎĎ×ŮČ ĐĎÄ-ËĚŔŢĹĘ\n"
 
-#: g10/trustdb.c:1809
+#: g10/trustdb.c:1875
 #, fuzzy, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "%s: ĐŇĎĐŐÝĹÎ: %s\n"
 
-#: g10/trustdb.c:1813
+#: g10/trustdb.c:1879
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr ""
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2224
 msgid "Ooops, no keys\n"
 msgstr ""
 
-#: g10/trustdb.c:2162
+#: g10/trustdb.c:2228
 #, fuzzy
 msgid "Ooops, no user IDs\n"
 msgstr "ÓĐÉÓĎË ËĚŔŢĹĘ É ÉÄĹÎÔÉĆÉËÁÔĎŇĎ× ĐĎĚŘÚĎ×ÁÔĹĚĹĘ"
 
-#: g10/trustdb.c:2320
+#: g10/trustdb.c:2386
 #, fuzzy, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "ËĚŔŢ %08lX.%lu: ×ÓÔÁ×ËÁ ÄĎ×ĹŇÉÔĹĚŘÎĎĘ ÚÁĐÉÓÉ ÎĹ ŐÄÁĚÁÓŘ: %s\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2395
 #, fuzzy, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "ËĚŔŢ %08lX.%lu: ×ÓÔÁ×ËÁ ÄĎ×ĹŇÉÔĹĚŘÎĎĘ ÚÁĐÉÓÉ ÎĹ ŐÄÁĚÁÓŘ: %s\n"
 
-#: g10/trustdb.c:2333
+#: g10/trustdb.c:2399
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "ËĚŔŢ %08lX.%lu: ×ÓÔÁ×ĚĹÎ × ÂÁÚŐ ÄÁÎÎŮČ ÄĎ×ĹŇÉŃ\n"
 
-#: g10/trustdb.c:2341
+#: g10/trustdb.c:2407
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "ËĚŔŢ %08lX.%lu: ÓÇĹÎĹŇÉŇĎ×ÁÎ × ÂŐÄŐÝĹÍ (ÎĹĐŇÁ×ÉĚŘÎĎ ŐÓÔÁÎĎ×ĚĹÎŮ ŢÁÓŮ)\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2422
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "ËĚŔŢ %08lX.%lu: ÓŇĎË ÄĹĘÓÔ×ÉŃ ÉÓÔĹË %s\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2430
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "ËĚŔŢ %08lX.%lu: ĐŇĎ×ĹŇËÁ ÄĎ×ĹŇÉŃ ÎĹ ŐÄÁĚÁÓŘ: %s\n"
 
-#: g10/trustdb.c:2515
+#: g10/trustdb.c:2581
 #, fuzzy, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "%s: ĐĎĚŘÚĎ×ÁÔĹĚŘ ÎĹ ÎÁĘÄĹÎ\n"
 
-#: g10/trustdb.c:2517
+#: g10/trustdb.c:2583
 #, fuzzy, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "ďŰÉÂËÁ ÉÎÉĂÉÁĚÉÚÁĂÉÉ ÂÁÚŮ ÄÁÎÎŮČ ÄĎ×ĹŇÉŃ: %s\n"
 
-#: g10/trustdb.c:2520
+#: g10/trustdb.c:2586
 #, fuzzy, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "ĎÂÎĎ×ĚĹÎÉĹ ÂÁÚŮ ÄÁÎÎŮČ ÄĎ×ĹŇÉŃ ÎĹ ŐÄÁĚĎÓŘ: %s\n"
 
-#: g10/trustdb.c:2523
+#: g10/trustdb.c:2589
 #, fuzzy, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "ďŰÉÂËÁ ÉÎÉĂÉÁĚÉÚÁĂÉÉ ÂÁÚŮ ÄÁÎÎŮČ ÄĎ×ĹŇÉŃ: %s\n"
 
-#: g10/trustdb.c:2709 g10/trustdb.c:2739
+#: g10/trustdb.c:2775 g10/trustdb.c:2805
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr ""
 
@@ -3453,26 +3479,26 @@
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ: %s\n"
 
-#: g10/ringedit.c:319 g10/ringedit.c:1368
+#: g10/ringedit.c:319 g10/ringedit.c:1374
 #, fuzzy, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ: %s\n"
 
-#: g10/ringedit.c:1545
+#: g10/ringedit.c:1551
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 
-#: g10/ringedit.c:1546
+#: g10/ringedit.c:1552
 #, fuzzy, c-format
 msgid "%s is the unchanged one\n"
 msgstr "éÓĐĎĚŘÚĎ×ÁÎ ÎĹĐŇÁ×ÉĚŘÎŮĘ ÓĹËŇĹÔÎŮĘ ËĚŔŢ"
 
-#: g10/ringedit.c:1547
+#: g10/ringedit.c:1553
 #, c-format
 msgid "%s is the new one\n"
 msgstr ""
 
-#: g10/ringedit.c:1548
+#: g10/ringedit.c:1554
 msgid "Please fix this possible security flaw\n"
 msgstr ""
 
@@ -3493,51 +3519,51 @@
 msgstr "ÜÔĎÔ ElGamal ËĚŔŢ, ÓĎÚÄÁÎÎŮĘ PGP, ÎĹ ÎÁÄĹÖĹÎ ÄĚŃ ÓĎÚÄÁÎÉŃ ĐĎÄĐÉÓĹĘ!\n"
 
 #. do not overwrite
-#: g10/openfile.c:79
+#: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
 msgstr "ćÁĘĚ `%s' ÓŐÝĹÓÔ×ŐĹÔ. "
 
-#: g10/openfile.c:81
+#: g10/openfile.c:86
 msgid "Overwrite (y/N)? "
 msgstr "đĹŇĹĐÉÓÁÔŘ (y/N)? "
 
-#: g10/openfile.c:109
+#: g10/openfile.c:119
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr ""
 
-#: g10/openfile.c:131
+#: g10/openfile.c:141
 #, fuzzy
 msgid "Enter new filename"
 msgstr "--store [ÉÍŃ ĆÁĘĚÁ]"
 
-#: g10/openfile.c:172
+#: g10/openfile.c:182
 #, fuzzy
 msgid "writing to stdout\n"
 msgstr "ÚÁĐÉÓŮ×ÁĹÔÓŃ × `%s'\n"
 
-#: g10/openfile.c:250
+#: g10/openfile.c:261
 #, fuzzy, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ ĐĎÄĐÉÓÁÎÎŮĹ ÄÁÎÎŮĹ `%s' .\n"
 
-#: g10/openfile.c:300
+#: g10/openfile.c:311
 #, c-format
 msgid "%s: new options file created\n"
 msgstr ""
 
-#: g10/openfile.c:313
+#: g10/openfile.c:338
 #, fuzzy, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ: %s\n"
 
-#: g10/openfile.c:316
+#: g10/openfile.c:341
 #, fuzzy, c-format
 msgid "%s: directory created\n"
 msgstr "%s: ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ: %s\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:343
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr ""
 
@@ -3790,6 +3816,13 @@
 msgid "No help available for `%s'"
 msgstr "đĎÍĎÝŘ ÄĚŃ `%s' ĎÔÓŐÔÓÔ×ŐĹÔ."
 
+#~ msgid ""
+#~ "RSA keys are deprecated; please consider creating a new key and use this key "
+#~ "in the future\n"
+#~ msgstr ""
+#~ "đĎĚŘÚĎ×ÁÎÉĹ RSA ËĚŔŢÁÍÉ ÎĹ ŇĹËĎÍĹÎÄŐĹÔÓŃ, ĐĎÖÁĚŐĘÓÔÁ, ĐĎÄŐÍÁĘÔĹ Ď ÓĎÚÄÁÎÉÉ\n"
+#~ "ÎĎ×ĎÇĎ ËĚŔŢÁ ÄĚŃ ÉÓĐĎĚŘÚĎ×ÁÎÉŃ × ÂŐÄŐÝĹÍ\n"
+
 #~ msgid "set debugging flags"
 #~ msgstr "ŐÓÔÁÎĎ×ÉÔŘ ĎÔĚÁÄĎŢÎŮĹ ĆĚÁÇÉ"
 
@@ -3933,10 +3966,6 @@
 
 #~ msgid "usage: gpgm [options] "
 #~ msgstr "éÓĐĎĚŘÚĎ×ÁÎÉĹ: gpgm [ĐÁŇÁÍĹÔŇŮ] "
-
-#, fuzzy
-#~ msgid "key %08lX: no public key for trusted key - skipped\n"
-#~ msgstr "ÓĹËŇĹÔÎŮĘ ËĚŔŢ %08lX: ÎĹ ÉÍĹĹÔ ÓĎĎÔ×ĹÔÓÔ×ŐŔÝĹÇĎ ĎÔËŇŮÔĎÇĎ ËĚŔŢÁ.\n"
 
 #, fuzzy
 #~ msgid "lid %lu: read dir record failed: %s\n"
diff -urN gnupg-1.0.2/po/sv.po gnupg-1.0.3/po/sv.po
--- gnupg-1.0.2/po/sv.po	Wed Jul 12 14:59:46 2000
+++ gnupg-1.0.3/po/sv.po	Mon Sep 18 12:18:08 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.10 2000/07/12 11:35:30 wkoch Exp $
+# $Id: sv.po,v 1.1.2.14 2000/09/15 16:40:20 wkoch Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.1e\n"
-"POT-Creation-Date: 2000-07-12 12:13+0200\n"
+"POT-Creation-Date: 2000-09-18 12:17+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"
@@ -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:127 g10/keygen.c:1249
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1255
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan inte öppna \"%s\": %s\n"
@@ -320,11 +320,11 @@
 msgid "too many random bits requested; the limit is %d\n"
 msgstr "för mĺnga slumpmässiga bitar efterfrĺgades; maximalt antal är %d\n"
 
-#: cipher/random.c:647
+#: cipher/random.c:650
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "VARNING: använder en osäker slumptalsgenerator!!\n"
 
-#: cipher/random.c:648
+#: cipher/random.c:651
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -339,7 +339,7 @@
 "ANVÄND INGEN DATA GENERERAD AV DETTA PROGRAM!!\n"
 "\n"
 
-#: cipher/rndlinux.c:141
+#: cipher/rndlinux.c:142
 #, c-format
 msgid ""
 "\n"
@@ -351,7 +351,7 @@
 "en stund för att ge operativsystemet en chans att samla mer entropi!\n"
 "(Behöver %d fler byte)\n"
 
-#: g10/g10.c:197
+#: g10/g10.c:206
 msgid ""
 "@Commands:\n"
 " "
@@ -359,139 +359,139 @@
 "@Kommandon:\n"
 " "
 
-#: g10/g10.c:199
+#: g10/g10.c:208
 msgid "|[file]|make a signature"
 msgstr "|[fil]|skapa en signatur"
 
-#: g10/g10.c:200
+#: g10/g10.c:209
 msgid "|[file]|make a clear text signature"
 msgstr "|[fil]|skapa en klartext-signatur"
 
-#: g10/g10.c:201
+#: g10/g10.c:210
 msgid "make a detached signature"
 msgstr "skapa en signatur i en separat fil"
 
-#: g10/g10.c:202
+#: g10/g10.c:211
 msgid "encrypt data"
 msgstr "kryptera data"
 
-#: g10/g10.c:203
+#: g10/g10.c:212
 msgid "encryption only with symmetric cipher"
 msgstr "endast kryptering med symmetriskt chiffer"
 
-#: g10/g10.c:204
+#: g10/g10.c:213
 msgid "store only"
 msgstr "endast lagring"
 
-#: g10/g10.c:205
+#: g10/g10.c:214
 msgid "decrypt data (default)"
 msgstr "dekryptera data (normalläge)"
 
-#: g10/g10.c:206
+#: g10/g10.c:215
 msgid "verify a signature"
 msgstr "verifiera en signatur"
 
-#: g10/g10.c:208
+#: g10/g10.c:217
 msgid "list keys"
 msgstr "räkna upp nycklar"
 
-#: g10/g10.c:210
+#: g10/g10.c:219
 msgid "list keys and signatures"
 msgstr "räkna upp nycklar och signaturer"
 
-#: g10/g10.c:211
+#: g10/g10.c:220
 msgid "check key signatures"
 msgstr "verifiera nyckelsignaturer"
 
-#: g10/g10.c:212
+#: g10/g10.c:221
 msgid "list keys and fingerprints"
 msgstr "räkna upp nycklar och fingeravtryck"
 
-#: g10/g10.c:213
+#: g10/g10.c:222
 msgid "list secret keys"
 msgstr "räkna upp hemliga nycklar"
 
-#: g10/g10.c:214
+#: g10/g10.c:223
 msgid "generate a new key pair"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/g10.c:215
+#: g10/g10.c:224
 msgid "remove key from the public keyring"
 msgstr "ta bort en nyckel frĺn den publika nyckelringen"
 
-#: g10/g10.c:217
+#: g10/g10.c:226
 msgid "remove key from the secret keyring"
 msgstr "ta bort en nyckel frĺn den hemliga nyckelringen"
 
-#: g10/g10.c:218
+#: g10/g10.c:227
 msgid "sign a key"
 msgstr "signera en nyckel"
 
-#: g10/g10.c:219
+#: g10/g10.c:228
 msgid "sign a key locally"
 msgstr "signera en nyckel lokalt"
 
-#: g10/g10.c:220
+#: g10/g10.c:229
 msgid "sign or edit a key"
 msgstr "signera eller redigera en nyckel"
 
-#: g10/g10.c:221
+#: g10/g10.c:230
 msgid "generate a revocation certificate"
 msgstr "generera ett ĺterkallelesecertifikat"
 
-#: g10/g10.c:222
+#: g10/g10.c:231
 msgid "export keys"
 msgstr "exportera nycklar"
 
-#: g10/g10.c:223
+#: g10/g10.c:232
 msgid "export keys to a key server"
 msgstr "exportera nycklar till en nyckelserver"
 
-#: g10/g10.c:224
+#: g10/g10.c:233
 msgid "import keys from a key server"
 msgstr "importera nycklar frĺn en nyckelserver"
 
-#: g10/g10.c:228
+#: g10/g10.c:237
 msgid "import/merge keys"
 msgstr "importera/slĺ ihop nycklar"
 
-#: g10/g10.c:230
+#: g10/g10.c:239
 msgid "list only the sequence of packets"
 msgstr "skriv endast ut paketsekvensen"
 
-#: g10/g10.c:232
+#: g10/g10.c:241
 msgid "export the ownertrust values"
 msgstr "exportera de värden som representerar ägartillit"
 
-#: g10/g10.c:234
+#: g10/g10.c:243
 msgid "import ownertrust values"
 msgstr "importera värden som representerar ägartillit"
 
-#: g10/g10.c:236
+#: g10/g10.c:245
 msgid "update the trust database"
 msgstr "uppdatera tillitsdatabasen"
 
-#: g10/g10.c:238
+#: g10/g10.c:247
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMN]|kontrollera tillitsdatabasen"
 
-#: g10/g10.c:239
+#: g10/g10.c:248
 msgid "fix a corrupted trust database"
 msgstr "reparera en korrupt tillitsdatabas"
 
-#: g10/g10.c:240
+#: g10/g10.c:249
 msgid "De-Armor a file or stdin"
 msgstr "Skala av en fil eller standard in"
 
-#: g10/g10.c:242
+#: g10/g10.c:251
 msgid "En-Armor a file or stdin"
 msgstr "Skapa ett skal för en fil eller standard in"
 
-#: g10/g10.c:244
+#: g10/g10.c:253
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|skriv ut kontrollsummor"
 
-#: g10/g10.c:248
+#: g10/g10.c:257
 msgid ""
 "@\n"
 "Options:\n"
@@ -501,148 +501,152 @@
 "Flaggor:\n"
 " "
 
-#: g10/g10.c:250
+#: g10/g10.c:259
 msgid "create ascii armored output"
 msgstr "skapa utdata med ett ascii-skal"
 
-#: g10/g10.c:252
+#: g10/g10.c:261
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMN|kryptera för NAMN"
 
-#: g10/g10.c:255
+#: g10/g10.c:264
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAMN|använd NAMN som standardvärdet för mottagare"
 
-#: g10/g10.c:257
+#: g10/g10.c:266
 msgid "use the default key as default recipient"
 msgstr "använd standardnyckeln som standardmottagare"
 
-#: g10/g10.c:261
+#: g10/g10.c:270
 msgid "use this user-id to sign or decrypt"
 msgstr "använd denna användaridentitet för att signera eller dekryptera"
 
-#: g10/g10.c:262
+#: g10/g10.c:271
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|sätt kompressionsnivĺn till N (0 för att slĺ av kompression)"
 
-#: g10/g10.c:264
+#: g10/g10.c:273
 msgid "use canonical text mode"
 msgstr "använd \"ursprunglig text\"-läget"
 
-#: g10/g10.c:265
+#: g10/g10.c:274
 msgid "use as output file"
 msgstr "använd som fil för utdata"
 
-#: g10/g10.c:266
+#: g10/g10.c:275
 msgid "verbose"
 msgstr "utförlig"
 
-#: g10/g10.c:267
+#: g10/g10.c:276
 msgid "be somewhat more quiet"
 msgstr "var nĺgot tystare"
 
-#: g10/g10.c:268
+#: g10/g10.c:277
 msgid "don't use the terminal at all"
 msgstr "använd inte terminalen alls"
 
-#: g10/g10.c:269
+#: g10/g10.c:278
 msgid "force v3 signatures"
 msgstr "använd v3-signaturer"
 
-#: g10/g10.c:270
+#: g10/g10.c:279
 msgid "always use a MDC for encryption"
 msgstr "använd alltid en MDC för kryptering"
 
-#: g10/g10.c:271
+#: g10/g10.c:280
 msgid "do not make any changes"
 msgstr "gör inga ändringar"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:273
+#: g10/g10.c:282
 msgid "batch mode: never ask"
 msgstr "batch-läge: frĺga aldrig"
 
-#: g10/g10.c:274
+#: g10/g10.c:283
 msgid "assume yes on most questions"
 msgstr "anta att svaret är ja pĺ de flesta frĺgor"
 
-#: g10/g10.c:275
+#: g10/g10.c:284
 msgid "assume no on most questions"
 msgstr "anta att svaret är nej pĺ de flesta frĺgor"
 
-#: g10/g10.c:276
+#: g10/g10.c:285
 msgid "add this keyring to the list of keyrings"
 msgstr "lägg till denna nyckelring till listan av nyckelringar"
 
-#: g10/g10.c:277
+#: g10/g10.c:286
 msgid "add this secret keyring to the list"
 msgstr "lägg till denna hemliga nyckelring till listan"
 
-#: g10/g10.c:278
+#: g10/g10.c:287
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMN|använd NAMN som förvald hemlig nyckel"
 
-#: g10/g10.c:279
+#: g10/g10.c:288
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|VÄRD|använd denna nyckelserver för att slĺ upp nycklar"
 
-#: g10/g10.c:280
+#: g10/g10.c:289
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAMN|sätt teckentabellen för terminalen till NAMN"
 
-#: g10/g10.c:281
+#: g10/g10.c:290
 msgid "read options from file"
 msgstr "läs flaggor frĺn fil"
 
-#: g10/g10.c:285
+#: g10/g10.c:294
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinformation till denna FD"
 
-#: g10/g10.c:290
+#: g10/g10.c:299
+msgid "|KEYID|ulimately trust this key"
+msgstr ""
+
+#: g10/g10.c:300
 msgid "|FILE|load extension module FILE"
 msgstr "|FIL|ladda tilläggsmodul FIL"
 
-#: g10/g10.c:291
+#: g10/g10.c:301
 msgid "emulate the mode described in RFC1991"
 msgstr "imitera läget som beskrivs i RFC1991"
 
-#: g10/g10.c:292
+#: g10/g10.c:302
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "ställ om alla flaggor sĺ att gpg följer OpenPGP-standarden"
 
-#: g10/g10.c:293
+#: g10/g10.c:303
 msgid "|N|use passphrase mode N"
 msgstr "|N|använd lösenordsläget N"
 
-#: g10/g10.c:295
+#: g10/g10.c:305
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAMN|använd kontrollsummealgoritmen NAMN för lösenordsfraser"
 
-#: g10/g10.c:297
+#: g10/g10.c:307
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAMN|använd chifferalgoritmen NAMN för lösenordsfraser"
 
-#: g10/g10.c:298
+#: g10/g10.c:308
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMN|använd chifferalgoritmen NAMN"
 
-#: g10/g10.c:299
+#: g10/g10.c:309
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMN|använd kontrollsummealgoritmen NAMN"
 
-#: g10/g10.c:300
+#: g10/g10.c:310
 msgid "|N|use compress algorithm N"
 msgstr "|N|använd komprimeringsalgoritmen N"
 
-#: g10/g10.c:301
+#: g10/g10.c:311
 msgid "throw keyid field of encrypted packets"
 msgstr "släng bort nyckelidentitetsfältet frĺn krypterade paket"
 
-#: g10/g10.c:302
+#: g10/g10.c:312
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAMN=VÄRDE|använd detta sätt för att beskriva data"
 
-#: g10/g10.c:305
+#: g10/g10.c:315
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -650,7 +654,7 @@
 "@\n"
 "(Se manualsidan för en komplett lista pĺ alla kommandon och flaggor)\n"
 
-#: g10/g10.c:308
+#: g10/g10.c:318
 msgid ""
 "@\n"
 "Examples:\n"
@@ -670,17 +674,17 @@
 "--list-keys [namn]          visa nycklar\n"
 "--fingerprint [namn]        visa fingeravtryck\n"
 
-#: g10/g10.c:403
+#: g10/g10.c:418
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Rapportera gärna fel till <gnupg-bugs@gnu.org>.\n"
 "Rapportera gärna fel eller synpunkter pĺ översättningen till <sv@li.org>.\n"
 
-#: g10/g10.c:407
+#: g10/g10.c:422
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
 
-#: g10/g10.c:410
+#: g10/g10.c:425
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -690,7 +694,7 @@
 "signera, kontrollera, kryptera eller dekryptera\n"
 "vilken operation som utförs beror pĺ programmets indata\n"
 
-#: g10/g10.c:417
+#: g10/g10.c:432
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -698,62 +702,66 @@
 "\n"
 "Stödda algoritmer:\n"
 
-#: g10/g10.c:496
+#: g10/g10.c:511
 msgid "usage: gpg [options] "
 msgstr "användning: gpg [flaggor] "
 
-#: g10/g10.c:549
+#: g10/g10.c:564
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\n"
 
-#: g10/g10.c:692
+#: g10/g10.c:704
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTERA: inställningsfilen \"%s\" saknas\n"
 
-#: g10/g10.c:696
+#: g10/g10.c:708
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "inställningsfil \"%s\": %s\n"
 
-#: g10/g10.c:703
+#: g10/g10.c:715
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "läser flaggor frĺn \"%s\"\n"
 
-#: g10/g10.c:893
+#: g10/g10.c:905
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s är ingen giltig teckentabell\n"
 
-#: g10/g10.c:949 g10/g10.c:958
+#: g10/g10.c:970
+msgid "WARNING: program may create a core file!\n"
+msgstr "VARNING: programmet kan komma att skapa en minnesutskrift!\n"
+
+#: g10/g10.c:974 g10/g10.c:983
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTERA: %s är inte för normal användning!\n"
 
-#: g10/g10.c:951
+#: g10/g10.c:976
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s är inte tillĺten tillsammans med %s!\n"
 
-#: g10/g10.c:954
+#: g10/g10.c:979
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "det är ingen poäng att använda %s tillsammans med %s!\n"
 
-#: g10/g10.c:973 g10/g10.c:985
+#: g10/g10.c:998 g10/g10.c:1010
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda chifferalgoritmen är ogiltig\n"
 
-#: g10/g10.c:979 g10/g10.c:991
+#: g10/g10.c:1004 g10/g10.c:1016
 msgid "selected digest algorithm is invalid\n"
 msgstr "den valda kontrollsummealgoritmen är ogiltig\n"
 
-#: g10/g10.c:995
+#: g10/g10.c:1020
 msgid "the given policy URL is invalid\n"
 msgstr "angiven URL är ogiltig\n"
 
-#: g10/g10.c:998
+#: g10/g10.c:1023
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "kompressionsalgoritmen mĺste vara i intervallet %d..%d\n"
@@ -764,127 +772,127 @@
 # är ändĺ litet. Eventuellt borde meddelandena inte alls
 # översättas för att göra eventuell felsökning lättare
 # för internationella felsökare
-#: g10/g10.c:1000
+#: g10/g10.c:1025
 msgid "completes-needed must be greater than 0\n"
 msgstr "variabeln \"completes-needed\" mĺste ha ett värde som är större än 0\n"
 
-#: g10/g10.c:1002
+#: g10/g10.c:1027
 msgid "marginals-needed must be greater than 1\n"
 msgstr "variabeln \"marginals-needed\" mĺste vara större än 1\n"
 
-#: g10/g10.c:1004
+#: g10/g10.c:1029
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "variabeln \"max-cert-depth\" mĺste ha ett värde mellan 1 och 255\n"
 
-#: g10/g10.c:1007
+#: g10/g10.c:1032
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTERA: enkelt S2K-läge (0) rekommenderas inte\n"
 
-#: g10/g10.c:1011
+#: g10/g10.c:1036
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ogiltigt S2K-läge; mĺste vara 0, 1 eller 3\n"
 
-#: g10/g10.c:1096
+#: g10/g10.c:1121
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/g10.c:1102
+#: g10/g10.c:1127
 msgid "--store [filename]"
 msgstr "--store [filnamn]"
 
-#: g10/g10.c:1109
+#: g10/g10.c:1134
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/g10.c:1117
+#: g10/g10.c:1142
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnamn]"
 
-#: g10/g10.c:1130
+#: g10/g10.c:1155
 msgid "--sign [filename]"
 msgstr "--sign [filnamn]"
 
-#: g10/g10.c:1143
+#: g10/g10.c:1168
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/g10.c:1157
+#: g10/g10.c:1182
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnamn]"
 
-#: g10/g10.c:1174
+#: g10/g10.c:1199
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnamn]"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1207
 msgid "--sign-key user-id"
 msgstr "--sign-key användaridentitet"
 
-#: g10/g10.c:1190
+#: g10/g10.c:1215
 msgid "--lsign-key user-id"
 msgstr "--lsign-key användaridentitet"
 
-#: g10/g10.c:1198
+#: g10/g10.c:1223
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key användaridentitet [kommandon]"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1239
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key användaridentitet"
 
-#: g10/g10.c:1217
+#: g10/g10.c:1242
 msgid "--delete-key user-id"
 msgstr "--delete-key användaridentitet"
 
 # Filnamn bĺde med och utan fnuttar finns. lite ologiskt. Vill nĺgon
 # fixa en patch?
-#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393
+#: g10/encode.c:265 g10/g10.c:1279 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "kan inte öppna %s: %s\n"
 
-#: g10/g10.c:1269
+#: g10/g10.c:1294
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [användaridentitet] [nyckelring]"
 
-#: g10/g10.c:1335
+#: g10/g10.c:1360
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort skalet: %s\n"
 
-#: g10/g10.c:1343
+#: g10/g10.c:1368
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa skal: %s\n"
 
-#: g10/g10.c:1411
+#: g10/g10.c:1439
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "felaktig hash-algoritm \"%s\"\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1520
 msgid "[filename]"
 msgstr "[filnamn]"
 
-#: g10/g10.c:1496
+#: g10/g10.c:1524
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande här ...\n"
 
 # se förra kommentaren
-#: g10/decrypt.c:59 g10/g10.c:1499 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1527 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan inte öppna \"%s\"\n"
 
-#: g10/g10.c:1669
+#: g10/g10.c:1700
 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:1675
+#: g10/g10.c:1706
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -892,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:1681
+#: g10/g10.c:1712
 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:1689
+#: g10/g10.c:1720
 msgid "a notation value must not use any control characters\n"
 msgstr "ett notationsvärde fĺr inte inehĺlla nĺgra kontrolltecken\n"
 
@@ -1281,58 +1289,58 @@
 msgid "writing key binding signature\n"
 msgstr "skriver signatur knuten till nyckeln\n"
 
-#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:433
+#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:435
 #, 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:438
+#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:440
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "nyckelstorleken avrundad uppĺt till %u bitar\n"
 
-#: g10/keygen.c:537
+#: g10/keygen.c:539
 msgid "Please select what kind of key you want:\n"
 msgstr "Välj vilken typ av nyckel du vill ha:\n"
 
-#: g10/keygen.c:539
+#: g10/keygen.c:541
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA och ElGamal (standardvalet)\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:542
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (endast signering)\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:544
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (endast kryptering)\n"
 
-#: g10/keygen.c:543
+#: g10/keygen.c:545
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signering och kryptering)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:547
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signering och kryptering)\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:551
 msgid "Your selection? "
 msgstr "Vad väljer du? "
 
-#: g10/keygen.c:560 g10/keygen.c:568
+#: g10/keygen.c:562 g10/keygen.c:570
 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:582
+#: g10/keygen.c:584
 msgid "Invalid selection.\n"
 msgstr "Felaktigt val.\n"
 
-#: g10/keygen.c:594
+#: g10/keygen.c:596
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1345,19 +1353,19 @@
 "              den förvalda nyckelstorleken är 1024 bitar\n"
 "    den största föreslagna nyckelstorleken är 2048 bitar\n"
 
-#: g10/keygen.c:601
+#: g10/keygen.c:603
 msgid "What keysize do you want? (1024) "
 msgstr "Vilken nyckelstorlek vill du ha? (1024) "
 
-#: g10/keygen.c:606
+#: g10/keygen.c:608
 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:608
+#: g10/keygen.c:610
 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:610
+#: g10/keygen.c:612
 #, 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"
@@ -1370,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:621
+#: g10/keygen.c:623
 #, 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:626
+#: g10/keygen.c:628
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1383,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:629
+#: g10/keygen.c:631
 msgid "Are you sure that you want this keysize? "
 msgstr "Är du säker pĺ att du vill ha denna nyckelstorlek? "
 
-#: g10/keygen.c:630
+#: g10/keygen.c:632
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1395,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:638
+#: g10/keygen.c:640
 msgid "Do you really need such a large keysize? "
 msgstr "Behöver du verkligen en sĺ stor nyckelstorlek? "
 
-#: g10/keygen.c:644
+#: g10/keygen.c:646
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Den efterfrĺgade nyckelstorleken är %u bitar\n"
 
-#: g10/keygen.c:647 g10/keygen.c:651
+#: g10/keygen.c:649 g10/keygen.c:653
 #, 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:699
+#: g10/keygen.c:701
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1426,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:714
+#: g10/keygen.c:716
 msgid "Key is valid for? (0) "
 msgstr "För hur lĺng tid är nyckeln giltig? (0) "
 
-#: g10/keygen.c:719
+#: g10/keygen.c:721
 msgid "invalid value\n"
 msgstr "ogiltigt värde\n"
 
-#: g10/keygen.c:724
+#: g10/keygen.c:726
 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:730
+#: g10/keygen.c:732
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Nyckeln gĺr ut vid följande tidpunkt: %s\n"
 
-#: g10/keygen.c:733
+#: g10/keygen.c:735
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1452,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:738
+#: g10/keygen.c:740
 msgid "Is this correct (y/n)? "
 msgstr "Stämmer detta (j/n)? "
 
-#: g10/keygen.c:781
+#: g10/keygen.c:783
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1472,44 +1480,44 @@
 "     \"Gustav Vasa (Brutal kung) <gustav@trekronor.se>\"\n"
 "\n"
 
-#: g10/keygen.c:793
+#: g10/keygen.c:795
 msgid "Real name: "
 msgstr "Namn: "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:803
 msgid "Invalid character in name\n"
 msgstr "Ogiltigt tecken i namnet\n"
 
-#: g10/keygen.c:799
+#: g10/keygen.c:805
 msgid "Name may not start with a digit\n"
 msgstr "Namnet fĺr inte börja med en siffra\n"
 
-#: g10/keygen.c:801
+#: g10/keygen.c:807
 msgid "Name must be at least 5 characters long\n"
 msgstr "Namnet mĺste vara ĺtminstone 5 tecken lĺngt\n"
 
-#: g10/keygen.c:809
+#: g10/keygen.c:815
 msgid "Email address: "
 msgstr "Epostadress: "
 
-#: g10/keygen.c:820
+#: g10/keygen.c:826
 msgid "Not a valid email address\n"
 msgstr "Epostadressen är ogiltig\n"
 
-#: g10/keygen.c:828
+#: g10/keygen.c:834
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:834
+#: g10/keygen.c:840
 msgid "Invalid character in comment\n"
 msgstr "Ogiltigt tecken i kommentaren\n"
 
-#: g10/keygen.c:857
+#: g10/keygen.c:863
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du använder teckenuppsättningen \"%s\"\n"
 
-#: g10/keygen.c:863
+#: g10/keygen.c:869
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1520,28 +1528,28 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:867
+#: g10/keygen.c:873
 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:872
+#: g10/keygen.c:878
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoAa"
 
-#: g10/keygen.c:882
+#: g10/keygen.c:888
 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:883
+#: g10/keygen.c:889
 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:902
+#: g10/keygen.c:908
 msgid "Please correct the error first\n"
 msgstr "Rätta först felet\n"
 
 # fel kapitalisering i originalet?
-#: g10/keygen.c:940
+#: g10/keygen.c:946
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1549,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:948
+#: g10/keyedit.c:468 g10/keygen.c:954
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "lösenordsfrasen upprepades ej korrekt; försök igen.\n"
 
-#: g10/keygen.c:954
+#: g10/keygen.c:960
 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 +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:975
+#: g10/keygen.c:981
 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 +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:1424
+#: g10/keygen.c:1430
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA-nyckelparet kommer att ha 1024 bitar.\n"
 
-#: g10/keygen.c:1467
+#: g10/keygen.c:1473
 msgid "Key generation canceled.\n"
 msgstr "Skapandet av nycklar avbröts.\n"
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1570
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver publik nyckel till \"%s\"\n"
 
-#: g10/keygen.c:1565
+#: g10/keygen.c:1571
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1667
 msgid "public and secret key created and signed.\n"
 msgstr "publik och hemlig nyckel skapad och signerad.\n"
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1672
 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"
@@ -1607,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:1683 g10/keygen.c:1784
+#: g10/keygen.c:1689 g10/keygen.c:1790
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
 # c-format behövs inte i singularis
-#: g10/keygen.c:1727 g10/sig-check.c:318 g10/sign.c:112
+#: g10/keygen.c:1733 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 +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:1729 g10/sig-check.c:320 g10/sign.c:114
+#: g10/keygen.c:1735 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,11 +1637,11 @@
 "nyckeln är skapad %lu sekunder in i framtiden (problemet är\n"
 "relaterat till tidsresande eller en felställd klocka)\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1768
 msgid "Really create? "
 msgstr "Vill du verkligen skapa? "
 
-#: g10/encode.c:91 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/encode.c:91 g10/openfile.c:178 g10/openfile.c:288 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1644,17 +1652,17 @@
 msgid "error creating passphrase: %s\n"
 msgstr "fel vid skapandet av lösenordsfras: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:319
+#: g10/encode.c:171 g10/encode.c:324
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: VARNING: tom fil\n"
 
-#: g10/encode.c:266
+#: g10/encode.c:271
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "läser frĺn \"%s\"\n"
 
-#: g10/encode.c:483
+#: g10/encode.c:492
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s krypterad för: %s\n"
@@ -1703,249 +1711,259 @@
 msgid "No user ID for key\n"
 msgstr "Inget användarid för nyckel\n"
 
-#: g10/getkey.c:1642 g10/getkey.c:1698
+#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "använder sekundära nyckeln %08lX istället för primärnyckeln %08lX\n"
 
-#: g10/getkey.c:2017
+#: g10/getkey.c:2050
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: hittade inte användaren\n"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "hoppar över block av typen %d\n"
 
-#: g10/import.c:188 g10/trustdb.c:1740 g10/trustdb.c:1781
+#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "har behandlat %lu nycklar hittills\n"
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fel vid läsning av \"%s\": %s\n"
 
-#: g10/import.c:203
+#: g10/import.c:204
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "  Totalt antal behandlade enheter: %lu\n"
 
-#: g10/import.c:205
+#: g10/import.c:206
+#, fuzzy, c-format
+msgid "      skipped new keys: %lu\n"
+msgstr "                 nya undernycklar: %lu\n"
+
+#: g10/import.c:209
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         utan användaridentiteter: %lu\n"
 
-#: g10/import.c:207
+#: g10/import.c:211
 #, c-format
 msgid "              imported: %lu"
 msgstr "                      importerade: %lu"
 
-#: g10/import.c:213
+#: g10/import.c:217
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                      oförändrade: %lu\n"
 
-#: g10/import.c:215
+#: g10/import.c:219
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          nya användaridentiteter: %lu\n"
 
-#: g10/import.c:217
+#: g10/import.c:221
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "                 nya undernycklar: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:223
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                   nya signaturer: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:225
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "     nya ĺterkallelser av nycklar: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:227
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      antal lästa hemliga nycklar: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:229
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "antal importerade hemliga nycklar: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:231
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "antal oförändrade hemliga nycklar: %lu\n"
 
-#: g10/import.c:386 g10/import.c:578
+#: g10/import.c:391 g10/import.c:590
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "nyckel %08lX: ingen användaridentitet\n"
 
-#: g10/import.c:400
+#: g10/import.c:405
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "nyckel %08lX: inga giltiga användaridentiteter\n"
 
-#: g10/import.c:402
+#: g10/import.c:407
 msgid "this may be caused by a missing self-signature\n"
 msgstr "detta kan bero pĺ att det saknas en självsignatur\n"
 
-#: g10/import.c:413 g10/import.c:645
+#: g10/import.c:418 g10/import.c:657
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "nyckel %08lX: hittade ingen publik nyckel: %s\n"
 
-#: g10/import.c:419
+#: g10/import.c:423
+#, fuzzy, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "nyckeln %08lX följer inte standarden RFC2440 - överhoppad\n"
+
+#: g10/import.c:431
 msgid "no default public keyring\n"
 msgstr "ingen förvald publik nyckel\n"
 
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
+#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver till \"%s\"\n"
 
-#: g10/import.c:426 g10/import.c:484 g10/import.c:593 g10/import.c:694
+#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "kan inte lĺsa nyckelringen \"%s\": %s\n"
 
-#: g10/import.c:429 g10/import.c:487 g10/import.c:596 g10/import.c:697
+#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
 
-#: g10/import.c:434
+#: g10/import.c:446
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "nyckel %08lX: importerade publik nyckel\n"
 
-#: g10/import.c:451
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "nyckel %08lX: matchar inte vĺr lokala kopia\n"
 
-#: g10/import.c:460 g10/import.c:653
+#: g10/import.c:472 g10/import.c:665
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "nyckel %08lX: kan inte hitta det ursprungliga nyckelblocket: %s\n"
 
-#: g10/import.c:466 g10/import.c:659
+#: g10/import.c:478 g10/import.c:671
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "nyckel %08lX: kan inte läsa det ursprungliga nyckelblocket %s\n"
 
-#: g10/import.c:493
+#: g10/import.c:505
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "nyckel %08lX: 1 ny användaridentitet\n"
 
-#: g10/import.c:496
+#: g10/import.c:508
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "nyckel %08lX: %d nya användaridentiteter\n"
 
-#: g10/import.c:499
+#: g10/import.c:511
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "nyckel %08lX: 1 ny signatur\n"
 
-#: g10/import.c:502
+#: g10/import.c:514
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "nyckel %08lX: %d nya signaturer\n"
 
-#: g10/import.c:505
+#: g10/import.c:517
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "nyckel %08lX: 1 ny undernyckel\n"
 
-#: g10/import.c:508
+#: g10/import.c:520
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "nyckel %08lX: %d nya undernycklar\n"
 
-#: g10/import.c:518
+#: g10/import.c:530
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "nyckel %08lX: inte förändrad\n"
 
-#: g10/import.c:601
+#: g10/import.c:613
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "nyckel %08lX: den hemliga nyckeln är importerad\n"
 
 #. we can't merge secret keys
-#: g10/import.c:605
+#: g10/import.c:617
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "nyckel %08lX: finns redan i den hemliga nyckelringen\n"
 
-#: g10/import.c:610
+#: g10/import.c:622
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "nyckel %08lX: hittade inte den hemliga nyckeln: %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:651
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "nyckel %08lX: ingen publik nyckel - kan inte tillämpa "
 "ĺterkallelsecertifikatet\n"
 
-#: g10/import.c:670
+#: g10/import.c:682
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "nyckel %08lX: ogiltigt ĺterkallelsecertifikat: %s - avvisat\n"
 
-#: g10/import.c:702
+#: g10/import.c:714
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "nyckel %08lX: ĺterkallelsecertifikat importerat\n"
 
-#: g10/import.c:744
+#: g10/import.c:756
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "nyckel %08lX: ingen användaridentitet för signaturen\n"
 
-#: g10/import.c:751 g10/import.c:775
+#: g10/import.c:763 g10/import.c:787
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "nyckel %08lX: algoritmen för publik nyckel ej stödd\n"
 
-#: g10/import.c:752
+#: g10/import.c:764
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "nyckel %08lX: ogiltig självsignatur\n"
 
-#: g10/import.c:767
+#: g10/import.c:779
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "nyckel %08lX: ingen undernyckel för nyckelbindning\n"
 
-#: g10/import.c:776
+#: g10/import.c:788
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "nyckel %08lX: ogiltig undernyckelbindning\n"
 
 # vad innebär fnutten i slutet?
-#: g10/import.c:803
+#: g10/import.c:815
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "nyckel %08lX: accepterade icke självsignerad användaridentitet '"
 
-#: g10/import.c:832
+#: g10/import.c:844
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "nyckel %08lX: hoppade över användaridentitet '"
 
-#: g10/import.c:855
+#: g10/import.c:867
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "nyckel %08lX: hoppade över undernyckel\n"
@@ -1954,32 +1972,32 @@
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:880
+#: g10/import.c:892
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "nyckel %08lX: icke exporterbar signatur (klass %02x) - hoppade över\n"
 
-#: g10/import.c:889
+#: g10/import.c:901
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "nyckel %08lX: ĺterkallelsecertifikat pĺ fel plats - hoppade över\n"
 
-#: g10/import.c:897
+#: g10/import.c:909
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "nyckel %08lX: felaktigt ĺterkallelsecertifikat: %s - hoppade över\n"
 
-#: g10/import.c:997
+#: g10/import.c:1009
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "nyckel %08lX: användaridentitet hittades tvĺ gĺnger - slog ihop\n"
 
-#: g10/import.c:1048
+#: g10/import.c:1060
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "nyckel %08lX: lade till ĺterkallelsecertifikat\n"
 
-#: g10/import.c:1162 g10/import.c:1215
+#: g10/import.c:1174 g10/import.c:1227
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "nyckel %08lX: vĺr kopia har ingen självsignatur\n"
@@ -2560,8 +2578,18 @@
 msgid "no secret key\n"
 msgstr "ingen hemlig nyckel\n"
 
+#: g10/keylist.c:158
+#, fuzzy
+msgid "invalid"
+msgstr "felaktigt skal"
+
+#: g10/keylist.c:178
+#, fuzzy
+msgid "revoked"
+msgstr "revkey"
+
 #. of subkey
-#: g10/keylist.c:318 g10/mainproc.c:742
+#: g10/keylist.c:400 g10/mainproc.c:760
 #, c-format
 msgid " [expires: %s]"
 msgstr "[gĺr ut: %s]"
@@ -2578,134 +2606,121 @@
 # 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:248
+#: g10/mainproc.c:257
 msgid "public key encrypted data: good DEK\n"
 msgstr "data krypterad med publik nyckel: korrekt krypteringsnyckel\n"
 
-#: g10/mainproc.c:281
+#: g10/mainproc.c:299
 #, 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:291
+#: g10/mainproc.c:309
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "krypterad med %s-nyckel, ID %08lX\n"
 
-#: g10/mainproc.c:297
+#: g10/mainproc.c:315
 msgid "no secret key for decryption available\n"
 msgstr "det finns ingen hemlig nyckel tillgänglig för dekryptering\n"
 
-#: g10/mainproc.c:306
+#: g10/mainproc.c:324
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "dekryptering med publik nyckel misslyckades: %s\n"
 
-#: g10/mainproc.c:343
+#: g10/mainproc.c:361
 msgid "decryption okay\n"
 msgstr "dekrypteringen lyckades\n"
 
-#: g10/mainproc.c:348
+#: g10/mainproc.c:366
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VARNING: det krypterade meddelandet har ändrats!\n"
 
-#: g10/mainproc.c:353
+#: g10/mainproc.c:371
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekrypteringen misslyckades: %s\n"
 
-#: g10/mainproc.c:372
+#: g10/mainproc.c:390
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTERA: avsändaren efterfrĺgade \"endast-för-dina-ögon\"\n"
 
-#: g10/mainproc.c:374
+#: g10/mainproc.c:392
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "ursprungligt filnamn=\"%.*s\"\n"
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:544
 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:613 g10/mainproc.c:622
+#: g10/mainproc.c:631 g10/mainproc.c:640
 msgid "WARNING: invalid notation data found\n"
 msgstr "VARNING: ogiltig notationsdata hittades\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:643
 msgid "Notation: "
 msgstr "Notation: "
 
 # finns det nĺgon bra svensk översättning av policy?
-#: g10/mainproc.c:632
+#: g10/mainproc.c:650
 msgid "Policy: "
 msgstr "Policy: "
 
-#: g10/mainproc.c:1062
+#: g10/mainproc.c:1080
 msgid "signature verification suppressed\n"
 msgstr "signaturen verifierades inte\n"
 
-#: g10/mainproc.c:1068
+#: g10/mainproc.c:1086
 #, 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:1094 g10/mainproc.c:1105
+#: g10/mainproc.c:1112 g10/mainproc.c:1123
 msgid "BAD signature from \""
 msgstr "FELAKTIG signatur frĺn \""
 
-#: g10/mainproc.c:1095 g10/mainproc.c:1106
+#: g10/mainproc.c:1113 g10/mainproc.c:1124
 msgid "Good signature from \""
 msgstr "Korrekt signatur frĺn \""
 
-#: g10/mainproc.c:1097
+#: g10/mainproc.c:1115
 msgid "                aka \""
 msgstr "      även känd som \""
 
-#: g10/mainproc.c:1153
+#: g10/mainproc.c:1171
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan inte verifiera signaturen: %s\n"
 
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1235
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "fristĺende signatur av klassen 0x%02x\n"
 
-#: g10/mainproc.c:1263
+#: g10/mainproc.c:1281
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatur av den gamla (PGP 2.x) typen\n"
 
-#: g10/mainproc.c:1268
+#: g10/mainproc.c:1286
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "felaktigt rotpaket hittades i proc_tree()\n"
 
-#: g10/misc.c:94
+#: g10/misc.c:96
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "kan inte deaktivera minnesutskrifter: %s\n"
 
-#: g10/misc.c:97
-msgid "WARNING: program may create a core file!\n"
-msgstr "VARNING: programmet kan komma att skapa en minnesutskrift!\n"
-
-#: g10/misc.c:205
+#: g10/misc.c:206
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Experimentella algoritmer bör inte användas!\n"
 
-# maila gnupg-bugs om konstigt felmeddelande, man skapar nycklar i pluralis
-#: g10/misc.c:219
-msgid ""
-"RSA keys are deprecated; please consider creating a new key and use this key "
-"in the future\n"
-msgstr ""
-"RSA-nycklar är förlegade; överväg att skapa nya nycklar och använd dessa i "
-"framtiden\n"
-
 # XXX
-#: g10/misc.c:241
+#: g10/misc.c:233
 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"
@@ -2715,7 +2730,7 @@
 msgid "can't handle public key algorithm %d\n"
 msgstr "kan inte hantera algoritm %d för publik nyckelhantering\n"
 
-#: g10/parse-packet.c:965
+#: g10/parse-packet.c:986
 #, 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"
@@ -2752,90 +2767,90 @@
 msgid "Repeat passphrase: "
 msgstr "Repetera lösenordsfrasen: "
 
-#: g10/plaintext.c:63
+#: g10/plaintext.c:67
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "data sparades inte, använd flaggan \"--output\" för att spara den\n"
 
-#: g10/plaintext.c:317
+#: g10/plaintext.c:324
 msgid "Detached signature.\n"
 msgstr "Löskopplad signatur.\n"
 
-#: g10/plaintext.c:321
+#: g10/plaintext.c:328
 msgid "Please enter name of data file: "
 msgstr "Ange namnet pĺ datafilen: "
 
-#: g10/plaintext.c:342
+#: g10/plaintext.c:349
 msgid "reading stdin ...\n"
 msgstr "läser frĺn standard in ...\n"
 
-#: g10/plaintext.c:385
+#: g10/plaintext.c:392
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "kan inte öppna signerad data \"%s\"\n"
 
-#: g10/pubkey-enc.c:79
+#: g10/pubkey-enc.c:76
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "anonym mottagare, försöker använda den hemliga nyckeln %08lX ...\n"
 
-#: g10/pubkey-enc.c:85
+#: g10/pubkey-enc.c:82
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "ok, vi är den hemliga mottagaren.\n"
 
-#: g10/pubkey-enc.c:137
+#: g10/pubkey-enc.c:134
 msgid "old encoding of the DEK is not supported\n"
 msgstr "gammal kodning av krypteringsnyckeln stöds inte\n"
 
-#: g10/pubkey-enc.c:156
+#: g10/pubkey-enc.c:153
 #, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "chifferalgoritmen %d är okänd eller avslagen\n"
 
-#: g10/pubkey-enc.c:195
+#: g10/pubkey-enc.c:192
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "NOTERA: chifferalgoritmen %d finns inte i inställningarna\n"
 
-#: g10/pubkey-enc.c:201
+#: g10/pubkey-enc.c:198
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTERA: den hemliga nyckeln %08lX gick ut %s\n"
 
-#: g10/hkp.c:62
+#: g10/hkp.c:72
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
 msgstr "frĺga efter nyckeln %08lX frĺn %s ...\n"
 
-#: g10/hkp.c:75
+#: g10/hkp.c:85
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "kan inte hämta nyckeln frĺn en nyckelserver: %s\n"
 
-#: g10/hkp.c:98 g10/hkp.c:136
+#: g10/hkp.c:109 g10/hkp.c:148
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "känner inte till nĺgon nyckelserver (använd flaggan --keyserver)\n"
 
-#: g10/hkp.c:106
+#: g10/hkp.c:117
 #, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "%s: ogiltig nyckelidentitet\n"
 
-#: g10/hkp.c:158
+#: g10/hkp.c:170
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan inte ansluta till \"%s\": %s\n"
 
-#: g10/hkp.c:182
+#: g10/hkp.c:194
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "fel vid sändning till \"%s\": %s\n"
 
-#: g10/hkp.c:194
+#: g10/hkp.c:206
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "lyckades sända till \"%s\" (status=%u)\n"
 
-#: g10/hkp.c:197
+#: g10/hkp.c:209
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "misslyckades sända till \"%s\": status=%u\n"
@@ -2849,42 +2864,42 @@
 msgid "protection algorithm %d is not supported\n"
 msgstr "skyddsalgoritmen %d stöds inte\n"
 
-#: g10/seckey-cert.c:175
+#: g10/seckey-cert.c:184
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Ogiltig lösenordsfras, försök igen ...\n"
 
 # är det nyckeln som är svag, konstigt
-#: g10/seckey-cert.c:231
+#: g10/seckey-cert.c:240
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "VARNING: Upptäckte en svag nyckel - byt lösenordsfras igen.\n"
 
-#: g10/sig-check.c:202
+#: g10/sig-check.c:199
 msgid "assuming bad MDC due to an unknown critical bit\n"
 msgstr "antar att MDC är felaktig eftersom en okänd kritisk bit är satt\n"
 
-#: g10/sig-check.c:300
+#: g10/sig-check.c:297
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "detta är en PGP-genererad ElGamal-nyckel som INTE är säker för signaturer!\n"
 
 # behövs verkligen c-format här?
-#: g10/sig-check.c:308
+#: g10/sig-check.c:305
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "den publika nyckeln är %lu sekund nyare än signaturen\n"
 
-#: g10/sig-check.c:309
+#: g10/sig-check.c:306
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "den publika nyckeln är %lu sekunder nyare än signaturen\n"
 
-#: g10/sig-check.c:327
+#: g10/sig-check.c:324
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "NOTERA: signaturnyckeln är för gammal, gick ut vid %s\n"
 
-#: g10/sig-check.c:396
+#: g10/sig-check.c:393
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "antar att signaturen är felaktig eftersom en okänd kritisk bit är satt\n"
@@ -2894,7 +2909,7 @@
 msgid "%s signature from: %s\n"
 msgstr "%s-signatur frĺn: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:606
+#: g10/sign.c:290 g10/sign.c:610
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "kan inte skapa %s: %s\n"
@@ -2942,7 +2957,7 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s: katalogen finns inte!\n"
 
-#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1363 g10/tdbio.c:444
+#: g10/openfile.c:226 g10/openfile.c:295 g10/ringedit.c:1369 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: kan inte skapa: %s\n"
@@ -3044,293 +3059,303 @@
 
 # req är nog felstavat i originalet dĺ det syftar pĺ record och inte
 # request
-#: g10/trustdb.c:168
+#: g10/trustdb.c:169
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "tillitspost %lu, posttyp %d: kunde inte läsa: %s\n"
 
-#: g10/trustdb.c:183
+#: g10/trustdb.c:184
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "tillitspost: %lu, typ %d: kunde inte skriva: %s\n"
 
-#: g10/trustdb.c:197
+#: g10/trustdb.c:198
 #, c-format
 msgid "trust record %lu: delete failed: %s\n"
 msgstr "tillitspost %lu: kunde inte radera: %s\n"
 
-#: g10/trustdb.c:211
+#: g10/trustdb.c:212
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "tillitsdatabas: synkronisering misslyckades: %s\n"
 
 # LID betyder local id och är serienumret i den lokala databasen
 # för en given nyckel
-#: g10/trustdb.c:376
+#: g10/trustdb.c:377
 #, c-format
 msgid "error reading dir record for LID %lu: %s\n"
 msgstr "fel vid läsning av katalogpost för lokalt id %lu: %s\n"
 
-#: g10/trustdb.c:383
+#: g10/trustdb.c:384
 #, c-format
 msgid "lid %lu: expected dir record, got type %d\n"
 msgstr "lokalt id %lu: väntade en katalogpost, fick en post av typen %d\n"
 
-#: g10/trustdb.c:388
+#: g10/trustdb.c:389
 #, c-format
 msgid "no primary key for LID %lu\n"
 msgstr "ingen primär nyckel för lokalt id %lu\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:394
 #, c-format
 msgid "error reading primary key for LID %lu: %s\n"
 msgstr "fel vid läsning av primär nyckel för lokalt id %lu: %s\n"
 
-#: g10/trustdb.c:432
+#: g10/trustdb.c:433
 #, c-format
 msgid "get_dir_record: search_record failed: %s\n"
 msgstr "get_dir_record: search_record misslyckades: %s\n"
 
-#: g10/trustdb.c:487
-#, c-format
-msgid "NOTE: secret key %08lX is NOT protected.\n"
-msgstr "NOTERA: den hemliga nyckeln %08lX är INTE skyddad.\n"
-
-#: g10/trustdb.c:495
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr "nyckel %08lX: hemlig nyckel utan publik nyckel - hoppade över\n"
-
-#: g10/trustdb.c:502
-#, c-format
-msgid "key %08lX: secret and public key don't match\n"
-msgstr "nyckel %08lX: hemlig och publik nyckel stämmer inte överens\n"
+#: g10/trustdb.c:474
+#, fuzzy, c-format
+msgid "'%s' is not a valid long keyID\n"
+msgstr "%s: ogiltig nyckelidentitet\n"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:501
 #, c-format
 msgid "key %08lX: can't put it into the trustdb\n"
 msgstr "nyckel %08lX: kan inte lägga till i tillitsdatabasen\n"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:507
 #, c-format
 msgid "key %08lX: query record failed\n"
 msgstr "nyckel %08lX: uppslagning av post misslyckades\n"
 
-#: g10/trustdb.c:529
+#: g10/trustdb.c:516
 #, c-format
 msgid "key %08lX: already in trusted key table\n"
 msgstr "nyckel %08lX: finns redan i tabellen över pĺlitliga nycklar\n"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:519
 #, c-format
 msgid "key %08lX: accepted as trusted key.\n"
 msgstr "nyckel %08lX: accepterad som en pĺlitlig nyckel\n"
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:546
+#, fuzzy, c-format
+msgid "key %08lX: no public key for trusted key - skipped\n"
+msgstr "nyckeln %08lX är inte skyddad - överhoppad\n"
+
+#: g10/trustdb.c:565
+#, c-format
+msgid "NOTE: secret key %08lX is NOT protected.\n"
+msgstr "NOTERA: den hemliga nyckeln %08lX är INTE skyddad.\n"
+
+#: g10/trustdb.c:577
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr "nyckel %08lX: hemlig nyckel utan publik nyckel - hoppade över\n"
+
+#: g10/trustdb.c:584
+#, c-format
+msgid "key %08lX: secret and public key don't match\n"
+msgstr "nyckel %08lX: hemlig och publik nyckel stämmer inte överens\n"
+
+#: g10/trustdb.c:597
 #, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr "numrering av hemliga nycklar misslyckades: %s\n"
 
-#: g10/trustdb.c:921
+#: g10/trustdb.c:987
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "nyckel: %08lX.%lu: Korrekt bindning till undernyckel\n"
 
-#: g10/trustdb.c:927 g10/trustdb.c:962
+#: g10/trustdb.c:993 g10/trustdb.c:1028
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "nyckel %08lX.%lu: Felaktig bindning till undernyckel: %s\n"
 
-#: g10/trustdb.c:939
+#: g10/trustdb.c:1005
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "nyckel %08lX.%lu: Giltig ĺterkallelse av nyckel\n"
 
-#: g10/trustdb.c:945
+#: g10/trustdb.c:1011
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "nyckel %08lX.%lu: Felaktig ĺterkallelse av nyckel: %s\n"
 
-#: g10/trustdb.c:956
+#: g10/trustdb.c:1022
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "nyckel %08lX.%lu: Giltig ĺterkallelse av undernyckel\n"
 
-#: g10/trustdb.c:1067
+#: g10/trustdb.c:1133
 msgid "Good self-signature"
 msgstr "Korrekt självsignatur"
 
-#: g10/trustdb.c:1077
+#: g10/trustdb.c:1143
 msgid "Invalid self-signature"
 msgstr "Felaktig självsignatur"
 
 # detta verkar mycket märkligt. Nĺgon borde kanske fĺ en förklaring frĺn
 # gnupg-utvecklarna?
-#: g10/trustdb.c:1104
+#: g10/trustdb.c:1170
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 "Hoppade över en giltig ĺterkallelse av användaridentiteten pĺ\n"
 "grund av en nyare självsignatur"
 
-#: g10/trustdb.c:1110
+#: g10/trustdb.c:1176
 msgid "Valid user ID revocation"
 msgstr "Giltig ĺterkallelse av användaridentitet"
 
-#: g10/trustdb.c:1115
+#: g10/trustdb.c:1181
 msgid "Invalid user ID revocation"
 msgstr "Ogiltig ĺterkallelse av användaridentitet"
 
-#: g10/trustdb.c:1157
+#: g10/trustdb.c:1223
 msgid "Valid certificate revocation"
 msgstr "Giltig ĺterkallelse av certifikat"
 
-#: g10/trustdb.c:1158
+#: g10/trustdb.c:1224
 msgid "Good certificate"
 msgstr "Korrekt certifikat"
 
-#: g10/trustdb.c:1186
+#: g10/trustdb.c:1252
 msgid "Invalid certificate revocation"
 msgstr "Ogiltig ĺterkallelse av certifikat "
 
-#: g10/trustdb.c:1187
+#: g10/trustdb.c:1253
 msgid "Invalid certificate"
 msgstr "Ogiltigt certifikat"
 
-#: g10/trustdb.c:1204 g10/trustdb.c:1208
+#: g10/trustdb.c:1270 g10/trustdb.c:1274
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "signaturpost %lu[%d] pekar mot fel post.\n"
 
-#: g10/trustdb.c:1267
+#: g10/trustdb.c:1333
 msgid "duplicated certificate - deleted"
 msgstr "dubblett av certifikat - borttaget"
 
-#: g10/trustdb.c:1584
+#: g10/trustdb.c:1650
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir misslyckades: %s\n"
 
-#: g10/trustdb.c:1718
+#: g10/trustdb.c:1784
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lokalt id ?: tillägg misslyckades: %s\n"
 
-#: g10/trustdb.c:1723
+#: g10/trustdb.c:1789
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lokalt id %lu: tillägg misslyckades: %s\n"
 
-#: g10/trustdb.c:1729
+#: g10/trustdb.c:1795
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lokalt id %lu: lades till\n"
 
-#: g10/trustdb.c:1734
+#: g10/trustdb.c:1800
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "fel vid läsning av katalogpost: %s\n"
 
-#: g10/trustdb.c:1742 g10/trustdb.c:1805
+#: g10/trustdb.c:1808 g10/trustdb.c:1871
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu nycklar behandlade\n"
 
-#: g10/trustdb.c:1744 g10/trustdb.c:1811
+#: g10/trustdb.c:1810 g10/trustdb.c:1877
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu nycklar med fel\n"
 
-#: g10/trustdb.c:1746
+#: g10/trustdb.c:1812
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu nycklar tillagda\n"
 
-#: g10/trustdb.c:1749
+#: g10/trustdb.c:1815
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "numrering av nyckelblock misslyckades: %s\n"
 
-#: g10/trustdb.c:1797
+#: g10/trustdb.c:1863
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lokalt id %lu: katalogpost utan nyckel - hoppade över\n"
 
-#: g10/trustdb.c:1807
+#: g10/trustdb.c:1873
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "\t%lu pĺ grund av nya publika nycklar\n"
 
-#: g10/trustdb.c:1809
+#: g10/trustdb.c:1875
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu nycklar hoppades över\n"
 
-#: g10/trustdb.c:1813
+#: g10/trustdb.c:1879
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu nycklar uppdaterades\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2224
 msgid "Ooops, no keys\n"
 msgstr "Ooops, inga nycklar\n"
 
-#: g10/trustdb.c:2162
+#: g10/trustdb.c:2228
 msgid "Ooops, no user IDs\n"
 msgstr "Ooops, inga användaridentiteter\n"
 
-#: g10/trustdb.c:2320
+#: g10/trustdb.c:2386
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: sökning av katalogpost misslyckades: %s\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2395
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "nyckel %08lX: tillägg av tillitspost misslyckades: %s\n"
 
-#: g10/trustdb.c:2333
+#: g10/trustdb.c:2399
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "nyckel %08lX.%lu: lades till i tillitsdatabasen\n"
 
-#: g10/trustdb.c:2341
+#: g10/trustdb.c:2407
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "nyckel %08lX.%lu: skapad i framtiden (problemet är relaterat till\n"
 "tidsresande eller en felställd klocka)\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2422
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "nyckel %08lX.%lu: gick ut %s\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2430
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "nyckel %08lX.%lu: tillitskontroll misslyckades: %s\n"
 
-#: g10/trustdb.c:2515
+#: g10/trustdb.c:2581
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "användaren \"%s\" hittades inte: %s\n"
 
-#: g10/trustdb.c:2517
+#: g10/trustdb.c:2583
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problem att hitta \"%s\" i tillitsdatabasen: %s\n"
 
-#: g10/trustdb.c:2520
+#: g10/trustdb.c:2586
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "användaren \"%s\" finns inte tillitsdatabasen - lägger till\n"
 
-#: g10/trustdb.c:2523
+#: g10/trustdb.c:2589
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "misslyckades med att placera \"%s\" i tillitsdatabasen: %s\n"
 
-#: g10/trustdb.c:2709 g10/trustdb.c:2739
+#: g10/trustdb.c:2775 g10/trustdb.c:2805
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "VARNING: kan ännu inte hantera lĺnga inställningsposter\n"
 
@@ -3354,27 +3379,27 @@
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: kan inte skapa nyckelring: %s\n"
 
-#: g10/ringedit.c:319 g10/ringedit.c:1368
+#: g10/ringedit.c:319 g10/ringedit.c:1374
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: nyckelring skapad\n"
 
 # märkligt felmeddelande, kolla upp
-#: g10/ringedit.c:1545
+#: g10/ringedit.c:1551
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "VARNING: det finns 2 filer med konfidentiell information.\n"
 
-#: g10/ringedit.c:1546
+#: g10/ringedit.c:1552
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s är den oförändrade\n"
 
-#: g10/ringedit.c:1547
+#: g10/ringedit.c:1553
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s är den nya\n"
 
-#: g10/ringedit.c:1548
+#: g10/ringedit.c:1554
 msgid "Please fix this possible security flaw\n"
 msgstr "Lös detta potentiella säkerhetsproblem\n"
 
@@ -3399,50 +3424,50 @@
 "som inte är säker för signaturer!\n"
 
 #. do not overwrite
-#: g10/openfile.c:79
+#: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Filen \"%s\" finns. "
 
-#: g10/openfile.c:81
+#: g10/openfile.c:86
 msgid "Overwrite (y/N)? "
 msgstr "Skriv över (j/N)? "
 
-#: g10/openfile.c:109
+#: g10/openfile.c:119
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: okänt suffix\n"
 
-#: g10/openfile.c:131
+#: g10/openfile.c:141
 msgid "Enter new filename"
 msgstr "Ange nytt filnamn"
 
-#: g10/openfile.c:172
+#: g10/openfile.c:182
 msgid "writing to stdout\n"
 msgstr "skriver till standard ut\n"
 
-#: g10/openfile.c:250
+#: g10/openfile.c:261
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "antar att signera data finns i filen \"%s\"\n"
 
-#: g10/openfile.c:300
+#: g10/openfile.c:311
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: ny inställningsfil skapad\n"
 
-#: g10/openfile.c:313
+#: g10/openfile.c:338
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: kan inte skapa katalog: %s\n"
 
-#: g10/openfile.c:316
+#: g10/openfile.c:341
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: katalog skapad\n"
 
 # GnuPG borde väl ersättas med %s?
-#: g10/openfile.c:318
+#: g10/openfile.c:343
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr "du mĺste starta om GnuPG, sĺ att den nya inställningsfilen kan läsas\n"
 
@@ -3761,3 +3786,11 @@
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Det finns ingen hjälp tillgänglig för \"%s\""
+
+# maila gnupg-bugs om konstigt felmeddelande, man skapar nycklar i pluralis
+#~ msgid ""
+#~ "RSA keys are deprecated; please consider creating a new key and use this key "
+#~ "in the future\n"
+#~ msgstr ""
+#~ "RSA-nycklar är förlegade; överväg att skapa nya nycklar och använd dessa i "
+#~ "framtiden\n"
diff -urN gnupg-1.0.2/scripts/ChangeLog gnupg-1.0.3/scripts/ChangeLog
--- gnupg-1.0.2/scripts/ChangeLog	Fri May 12 14:01:23 2000
+++ gnupg-1.0.3/scripts/ChangeLog	Thu Sep 14 17:45:13 2000
@@ -1,3 +1,12 @@
+Thu Sep 14 17:45:11 CEST 2000  Werner Koch  <wk@openit.de>
+
+        * gnupg.spec.in: Updated.
+
+Wed Sep  6 17:55:47 CEST 2000  Werner Koch  <wk@openit.de>
+
+        * config.guess, config.sub: Replaced with the latest version from the
+        CVS archive.  Hope that does not break too much.
+
 Fri May 12 14:01:20 CEST 2000  Werner Koch  <wk@openit.de>
 
 	* gnupg.spec.in: New version from Fabio with some updated descriptions.
diff -urN gnupg-1.0.2/scripts/config.guess gnupg-1.0.3/scripts/config.guess
--- gnupg-1.0.2/scripts/config.guess	Fri Mar 17 16:17:46 2000
+++ gnupg-1.0.3/scripts/config.guess	Wed Sep  6 16:05:52 2000
@@ -1,8 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
 #   Free Software Foundation, Inc.
-#
+
+version='2000-07-27'
+
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
@@ -10,7 +12,7 @@
 #
 # This program is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the GNU
+# 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
@@ -23,8 +25,7 @@
 # the same distribution terms that you use for the rest of that program.
 
 # Written by Per Bothner <bothner@cygnus.com>.
-# The master version of this file is at the FSF in /home/gd/gnu/lib.
-# Please send patches to the Autoconf mailing list <autoconf@gnu.org>.
+# Please send patches to <config-patches@gnu.org>.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
@@ -37,6 +38,46 @@
 # (but try to keep the structure clean).
 #
 
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of this system.
+
+Operation modes:
+  -h, --help               print this help, then exit
+  -V, --version            print version number, then exit"
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case "$1" in
+    --version | --vers* | -V )
+       echo "$version" ; exit 0 ;;
+    --help | --h* | -h )
+       echo "$usage"; exit 0 ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       exec >&2
+       echo "$me: invalid option $1"
+       echo "$help"
+       exit 1 ;;
+    * )
+       break ;;
+  esac
+done
+
+if test $# != 0; then
+  echo "$me: too many arguments$help" >&2
+  exit 1
+fi
+
 # Use $HOST_CC if defined. $CC may point to a cross-compiler
 if test x"$CC_FOR_BUILD" = x; then
   if test x"$HOST_CC" != x; then
@@ -68,8 +109,42 @@
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:QNX:*:*)
-	echo i386-pc-qnx
+    *:NetBSD:*:*)
+	# Netbsd (nbsd) targets should (where applicable) match one or
+	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+	# switched to ELF, *-*-netbsd* would select the old
+	# object file format.  This provides both forward
+	# compatibility and a consistent mechanism for selecting the
+	# object file format.
+	# Determine the machine/vendor (is the vendor relevant).
+	case "${UNAME_MACHINE}" in
+	    amiga) machine=m68k-unknown ;;
+	    arm32) machine=arm-unknown ;;
+	    atari*) machine=m68k-atari ;;
+	    sun3*) machine=m68k-sun ;;
+	    mac68k) machine=m68k-apple ;;
+	    macppc) machine=powerpc-apple ;;
+	    hp3[0-9][05]) machine=m68k-hp ;;
+	    ibmrt|romp-ibm) machine=romp-ibm ;;
+	    *) machine=${UNAME_MACHINE}-unknown ;;
+	esac
+	# The Operating System including object format.
+	if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep __ELF__ >/dev/null
+	then
+	    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+	    # Return netbsd for either.  FIX?
+	    os=netbsd
+	else
+	    os=netbsdelf
+	fi
+	# The OS release
+	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+	# contains redundant information, the shorter form:
+	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+	echo "${machine}-${os}${release}"
 	exit 0 ;;
     alpha:OSF1:*:*)
 	if test $UNAME_RELEASE = "V4.0"; then
@@ -80,41 +155,51 @@
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	cat <<EOF >$dummy.s
+	.data
+\$Lformat:
+	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
+
+	.text
 	.globl main
+	.align 4
 	.ent main
 main:
-	.frame \$30,0,\$26,0
-	.prologue 0
-	.long 0x47e03d80 # implver $0
-	lda \$2,259
-	.long 0x47e20c21 # amask $2,$1
-	srl \$1,8,\$2
-	sll \$2,2,\$2
-	sll \$0,3,\$0
-	addl \$1,\$0,\$0
-	addl \$2,\$0,\$0
-	ret \$31,(\$26),1
+	.frame \$30,16,\$26,0
+	ldgp \$29,0(\$27)
+	.prologue 1
+	.long 0x47e03d80 # implver \$0
+	lda \$2,-1
+	.long 0x47e20c21 # amask \$2,\$1
+	lda \$16,\$Lformat
+	mov \$0,\$17
+	not \$1,\$18
+	jsr \$26,printf
+	ldgp \$29,0(\$26)
+	mov 0,\$16
+	jsr \$26,exit
 	.end main
 EOF
 	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
 	if test "$?" = 0 ; then
-		./$dummy
-		case "$?" in
-			7)
+		case `./$dummy` in
+			0-0)
 				UNAME_MACHINE="alpha"
 				;;
-			15)
+			1-0)
 				UNAME_MACHINE="alphaev5"
 				;;
-			14)
+			1-1)
 				UNAME_MACHINE="alphaev56"
 				;;
-			10)
+			1-101)
 				UNAME_MACHINE="alphapca56"
 				;;
-			16)
+			2-303)
 				UNAME_MACHINE="alphaev6"
 				;;
+			2-307)
+				UNAME_MACHINE="alphaev67"
+				;;
 		esac
 	fi
 	rm -f $dummy.s $dummy
@@ -130,11 +215,8 @@
 	echo alpha-dec-winnt3.5
 	exit 0 ;;
     Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-cbm-sysv4
+	echo m68k-unknown-sysv4
 	exit 0;;
-    amiga:NetBSD:*:*)
-      echo m68k-cbm-netbsd${UNAME_RELEASE}
-      exit 0 ;;
     amiga:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -159,12 +241,12 @@
     wgrisc:OpenBSD:*:*)
 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    *:OS/390:*:*)
+	echo i370-ibm-openedition
+	exit 0 ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit 0;;
-    arm32:NetBSD:*:*)
-	echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-	exit 0 ;;
     SR2?01:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
 	exit 0;;
@@ -221,9 +303,6 @@
     aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
 	exit 0 ;;
-    atari*:NetBSD:*:*)
-	echo m68k-atari-netbsd${UNAME_RELEASE}
-	exit 0 ;;
     atari*:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -236,32 +315,26 @@
     # MiNT.  But MiNT is downward compatible to TOS, so this should
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
+        echo m68k-atari-mint${UNAME_RELEASE}
 	exit 0 ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
+        exit 0 ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
+        echo m68k-atari-mint${UNAME_RELEASE}
 	exit 0 ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-	echo m68k-milan-mint${UNAME_RELEASE}
-	exit 0 ;;
+        echo m68k-milan-mint${UNAME_RELEASE}
+        exit 0 ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-	echo m68k-hades-mint${UNAME_RELEASE}
-	exit 0 ;;
+        echo m68k-hades-mint${UNAME_RELEASE}
+        exit 0 ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-	echo m68k-unknown-mint${UNAME_RELEASE}
-	exit 0 ;;
-    sun3*:NetBSD:*:*)
-	echo m68k-sun-netbsd${UNAME_RELEASE}
-	exit 0 ;;
+        echo m68k-unknown-mint${UNAME_RELEASE}
+        exit 0 ;;
     sun3*:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    mac68k:NetBSD:*:*)
-	echo m68k-apple-netbsd${UNAME_RELEASE}
-	exit 0 ;;
     mac68k:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -274,9 +347,6 @@
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
 	exit 0 ;;
-    macppc:NetBSD:*:*)
-	echo powerpc-apple-netbsd${UNAME_RELEASE}
-	exit 0 ;;
     RISC*:Mach:*:*)
 	echo mips-dec-mach_bsd4.3
 	exit 0 ;;
@@ -290,8 +360,9 @@
 	echo clipper-intergraph-clix${UNAME_RELEASE}
 	exit 0 ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
-	sed 's/^        //' << EOF >$dummy.c
+	sed 's/^	//' << EOF >$dummy.c
 #ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
 	int main (int argc, char *argv[]) {
 #else
 	int main (argc, argv) int argc; char *argv[]; {
@@ -329,19 +400,22 @@
 	echo m88k-motorola-sysv3
 	exit 0 ;;
     AViiON:dgux:*:*)
-	# DG/UX returns AViiON for all architectures
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
-	if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
-	     -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
+        # DG/UX returns AViiON for all architectures
+        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+	then
+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+	       [ ${TARGET_BINARY_INTERFACE}x = x ]
+	    then
 		echo m88k-dg-dgux${UNAME_RELEASE}
-	else
+	    else
 		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+	    fi
+	else
+	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
-	else echo i586-dg-dgux${UNAME_RELEASE}
-	fi
-	exit 0 ;;
-    M88*:DolphinOS:*:*) # DolphinOS (SVR3)
+ 	exit 0 ;;
+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
 	exit 0 ;;
     M88*:*:R3*:*)
@@ -359,13 +433,13 @@
 	exit 0 ;;
     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
 	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
-	exit 0 ;;	       # Note that: echo "'`uname -s`'" gives 'AIX '
+	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
     i?86:AIX:*:*)
 	echo i386-ibm-aix
 	exit 0 ;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		sed 's/^                //' << EOF >$dummy.c
+		sed 's/^		//' << EOF >$dummy.c
 		#include <sys/systemcfg.h>
 
 		main()
@@ -405,9 +479,9 @@
     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
 	echo romp-ibm-bsd4.4
 	exit 0 ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)	    # covers RT/PC NetBSD and
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit 0 ;;			    # report: romp-ibm BSD 4.3
+	exit 0 ;;                           # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
 	echo rs6000-bull-bosx
 	exit 0 ;;
@@ -422,48 +496,50 @@
 	exit 0 ;;
     9000/[34678]??:HP-UX:*:*)
 	case "${UNAME_MACHINE}" in
-	    9000/31? )		  HP_ARCH=m68000 ;;
-	    9000/[34]?? )	  HP_ARCH=m68k ;;
+	    9000/31? )            HP_ARCH=m68000 ;;
+	    9000/[34]?? )         HP_ARCH=m68k ;;
 	    9000/[678][0-9][0-9])
-	      sed 's/^              //' << EOF >$dummy.c
-	      #include <stdlib.h>
-	      #include <unistd.h>
-
-	      int main ()
-	      {
-	      #if defined(_SC_KERNEL_BITS)
-		  long bits = sysconf(_SC_KERNEL_BITS);
-	      #endif
-		  long cpu  = sysconf (_SC_CPU_VERSION);
+              sed 's/^              //' << EOF >$dummy.c
 
-		  switch (cpu)
-		{
-		case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-		case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-		case CPU_PA_RISC2_0:
-	      #if defined(_SC_KERNEL_BITS)
-		    switch (bits)
-			{
-			case 64: puts ("hppa2.0w"); break;
-			case 32: puts ("hppa2.0n"); break;
-			default: puts ("hppa2.0"); break;
-			} break;
-	      #else  /* !defined(_SC_KERNEL_BITS) */
-		    puts ("hppa2.0"); break;
-	      #endif
-		default: puts ("hppa1.0"); break;
-		}
-		  exit (0);
-	      }
+              #define _HPUX_SOURCE
+              #include <stdlib.h>
+              #include <unistd.h>
+
+              int main ()
+              {
+              #if defined(_SC_KERNEL_BITS)
+                  long bits = sysconf(_SC_KERNEL_BITS);
+              #endif
+                  long cpu  = sysconf (_SC_CPU_VERSION);
+
+                  switch (cpu)
+              	{
+              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+              	case CPU_PA_RISC2_0:
+              #if defined(_SC_KERNEL_BITS)
+              	    switch (bits)
+              		{
+              		case 64: puts ("hppa2.0w"); break;
+              		case 32: puts ("hppa2.0n"); break;
+              		default: puts ("hppa2.0"); break;
+              		} break;
+              #else  /* !defined(_SC_KERNEL_BITS) */
+              	    puts ("hppa2.0"); break;
+              #endif
+              	default: puts ("hppa1.0"); break;
+              	}
+                  exit (0);
+              }
 EOF
-	($CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
+	(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
 	rm -f $dummy.c $dummy
 	esac
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
 	exit 0 ;;
     3050*:HI-UX:*:*)
-	sed 's/^        //' << EOF >$dummy.c
+	sed 's/^	//' << EOF >$dummy.c
 	#include <unistd.h>
 	int
 	main ()
@@ -471,7 +547,7 @@
 	  long cpu = sysconf (_SC_CPU_VERSION);
 	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
 	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.	*/
+	     results, however.  */
 	  if (CPU_IS_PA_RISC (cpu))
 	    {
 	      switch (cpu)
@@ -522,25 +598,25 @@
 	exit 0 ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-	exit 0 ;;
+        exit 0 ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-	exit 0 ;;
+        exit 0 ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-	exit 0 ;;
+        exit 0 ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-	exit 0 ;;
+        exit 0 ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-	exit 0 ;;
+        exit 0 ;;
     CRAY*X-MP:*:*:*)
 	echo xmp-cray-unicos
-	exit 0 ;;
+        exit 0 ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE}
 	exit 0 ;;
@@ -550,29 +626,29 @@
 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
 	exit 0 ;;
     CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE}
+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     CRAY*T3E:*:*:*)
-	echo t3e-cray-unicosmk${UNAME_RELEASE}
+	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    CRAY*SV1:*:*:*)
+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     CRAY-2:*:*:*)
 	echo cray2-cray-unicos
-	exit 0 ;;
+        exit 0 ;;
     F300:UNIX_System_V:*:*)
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-	echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit 0 ;;
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+        echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        exit 0 ;;
     F301:UNIX_System_V:*:*)
        echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
        exit 0 ;;
-    hp3[0-9][05]:NetBSD:*:*)
-	echo m68k-hp-netbsd${UNAME_RELEASE}
-	exit 0 ;;
     hp300:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    i?86:BSD/386:*:* | i?86:BSD/OS:*:*)
+    i?86:BSD/386:*:* | i?86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit 0 ;;
     sparc*:BSD/OS:*:*)
@@ -582,17 +658,8 @@
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit 0 ;;
     *:FreeBSD:*:*)
-	if test -x /usr/bin/objformat; then
-	    if test "elf" = "`/usr/bin/objformat`"; then
-		echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
-		exit 0
-	    fi
-	fi
 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit 0 ;;
-    *:NetBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-	exit 0 ;;
     *:OpenBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
 	exit 0 ;;
@@ -620,13 +687,10 @@
     *:GNU:*:*)
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit 0 ;;
+    i*86:Minix:*:*)
+	echo ${UNAME_MACHINE}-pc-minix
+	exit 0 ;;
     *:Linux:*:*)
-	# uname on the ARM produces all sorts of strangeness, and we need to
-	# filter it out.
-	case "$UNAME_MACHINE" in
-	  armv*)		      UNAME_MACHINE=$UNAME_MACHINE ;;
-	  arm* | sa110*)	      UNAME_MACHINE="arm" ;;
-	esac
 
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
@@ -634,18 +698,47 @@
 	ld_help_string=`cd /; ld --help 2>&1`
 	ld_supported_emulations=`echo $ld_help_string \
 			 | sed -ne '/supported emulations:/!d
-				    s/[ 	][	]*/ /g
+				    s/[ 	][ 	]*/ /g
 				    s/.*supported emulations: *//
 				    s/ .*//
 				    p'`
-	case "$ld_supported_emulations" in
-	  i?86linux)  echo "${UNAME_MACHINE}-pc-linux-gnuaout"      ; exit 0 ;;
-	  i?86coff)   echo "${UNAME_MACHINE}-pc-linux-gnucoff"      ; exit 0 ;;
-	  sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
-	  armlinux)   echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
-	  m68klinux)  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
-	  elf_s390)   echo "${UNAME_MACHINE}-ibm-linux-gnu"         ; exit 0 ;;
-	  elf32ppc)
+        case "$ld_supported_emulations" in
+	  *ia64)
+		echo "${UNAME_MACHINE}-unknown-linux"
+		exit 0
+		;;
+	  i?86linux)
+		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+		exit 0
+		;;
+	  elf_i?86)
+		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+		;;
+	  i?86coff)
+		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+		exit 0
+		;;
+	  sparclinux)
+		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
+		exit 0
+		;;
+	  armlinux)
+		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
+		exit 0
+		;;
+	  elf32arm*)
+		echo "${UNAME_MACHINE}-unknown-linux-gnuoldld"
+		exit 0
+		;;
+	  armelf_linux*)
+		echo "${UNAME_MACHINE}-unknown-linux-gnu"
+		exit 0
+		;;
+	  m68klinux)
+		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
+		exit 0
+		;;
+	  elf32ppc | elf32ppclinux)
 		# Determine Lib Version
 		cat >$dummy.c <<EOF
 #include <features.h>
@@ -674,47 +767,63 @@
 			fi
 		fi
 		rm -f $dummy.c $dummy
-		echo powerpc-unknown-linux-gnu${LIBC} ; exit 0 ;;
+		echo powerpc-unknown-linux-gnu${LIBC}
+		exit 0
+		;;
+	  shelf_linux)
+		echo "${UNAME_MACHINE}-unknown-linux-gnu"
+		exit 0
+		;;
 	esac
 
 	if test "${UNAME_MACHINE}" = "alpha" ; then
-		sed 's/^        //'  <<EOF >$dummy.s
-		.globl main
-		.ent main
-	main:
-		.frame \$30,0,\$26,0
-		.prologue 0
-		.long 0x47e03d80 # implver $0
-		lda \$2,259
-		.long 0x47e20c21 # amask $2,$1
-		srl \$1,8,\$2
-		sll \$2,2,\$2
-		sll \$0,3,\$0
-		addl \$1,\$0,\$0
-		addl \$2,\$0,\$0
-		ret \$31,(\$26),1
-		.end main
+		cat <<EOF >$dummy.s
+			.data
+		\$Lformat:
+			.byte 37,100,45,37,120,10,0	# "%d-%x\n"
+
+			.text
+			.globl main
+			.align 4
+			.ent main
+		main:
+			.frame \$30,16,\$26,0
+			ldgp \$29,0(\$27)
+			.prologue 1
+			.long 0x47e03d80 # implver \$0
+			lda \$2,-1
+			.long 0x47e20c21 # amask \$2,\$1
+			lda \$16,\$Lformat
+			mov \$0,\$17
+			not \$1,\$18
+			jsr \$26,printf
+			ldgp \$29,0(\$26)
+			mov 0,\$16
+			jsr \$26,exit
+			.end main
 EOF
 		LIBC=""
 		$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
 		if test "$?" = 0 ; then
-			./$dummy
-			case "$?" in
-			7)
+			case `./$dummy` in
+			0-0)
 				UNAME_MACHINE="alpha"
 				;;
-			15)
+			1-0)
 				UNAME_MACHINE="alphaev5"
 				;;
-			14)
+			1-1)
 				UNAME_MACHINE="alphaev56"
 				;;
-			10)
+			1-101)
 				UNAME_MACHINE="alphapca56"
 				;;
-			16)
+			2-303)
 				UNAME_MACHINE="alphaev6"
 				;;
+			2-307)
+				UNAME_MACHINE="alphaev67"
+				;;
 			esac
 
 			objdump --private-headers $dummy | \
@@ -728,6 +837,7 @@
 	elif test "${UNAME_MACHINE}" = "mips" ; then
 	  cat >$dummy.c <<EOF
 #ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
 	int main (int argc, char *argv[]) {
 #else
 	int main (argc, argv) int argc; char *argv[]; {
@@ -743,6 +853,8 @@
 EOF
 	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
 	  rm -f $dummy.c $dummy
+	elif test "${UNAME_MACHINE}" = "s390"; then
+	  echo s390-ibm-linux && exit 0
 	else
 	  # Either a pre-BFD a.out linker (linux-gnuoldld)
 	  # or one that does not give us useful --help.
@@ -764,6 +876,7 @@
 	  cat >$dummy.c <<EOF
 #include <features.h>
 #ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
 	int main (int argc, char *argv[]) {
 #else
 	int main (argc, argv) int argc; char *argv[]; {
@@ -786,6 +899,7 @@
 EOF
 	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
 	  rm -f $dummy.c $dummy
+	  test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
 	fi ;;
 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
 # are messed up and put the nodename in both sysname and nodename.
@@ -793,27 +907,29 @@
 	echo i386-sequent-sysv4
 	exit 0 ;;
     i?86:UNIX_SV:4.2MP:2.*)
-	# Unixware is an offshoot of SVR4, but it has its own version
-	# number series starting with 2...
-	# I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.	-- rms.
-	# Use sysv4.2uw... so that sysv4* matches it.
+        # Unixware is an offshoot of SVR4, but it has its own version
+        # number series starting with 2...
+        # I am not positive that other SVR4 systems won't match this,
+	# I just have to hope.  -- rms.
+        # Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit 0 ;;
     i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
+	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
 	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
 	fi
 	exit 0 ;;
     i?86:*:5:7*)
-	UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
-	(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
-	(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) && UNAME_MACHINE=i586
-	(/bin/uname -X|egrep '^Machine.*Pent.*II' >/dev/null) && UNAME_MACHINE=i686
-	(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) && UNAME_MACHINE=i585
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}${UNAME_VERSION}-sysv${UNAME_RELEASE}
+        # Fixed at (any) Pentium or better
+        UNAME_MACHINE=i586
+        if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
+	    echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
+	else
+	    echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
+	fi
 	exit 0 ;;
     i?86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
@@ -833,11 +949,15 @@
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
 	exit 0 ;;
+    i?86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit 0 ;;
     pc:*:*:*)
-	# uname -m prints for DJGPP always 'pc', but it prints nothing about
-	# the processor, so we play safe by assuming i386.
+	# Left here for compatibility:
+        # uname -m prints for DJGPP always 'pc', but it prints nothing about
+        # the processor, so we play safe by assuming i386.
 	echo i386-pc-msdosdjgpp
-	exit 0 ;;
+        exit 0 ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
 	exit 0 ;;
@@ -866,8 +986,8 @@
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && echo i486-ncr-sysv4 && exit 0 ;;
+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+          && echo i486-ncr-sysv4 && exit 0 ;;
     m68*:LynxOS:2.*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
@@ -901,9 +1021,9 @@
 	fi
 	exit 0 ;;
     PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-			   # says <Richard.M.Bartel@ccMail.Census.GOV>
-	echo i586-unisys-sysv4
-	exit 0 ;;
+                           # says <Richard.M.Bartel@ccMail.Census.GOV>
+        echo i586-unisys-sysv4
+        exit 0 ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
@@ -921,11 +1041,11 @@
 	exit 0 ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
-		echo mips-nec-sysv${UNAME_RELEASE}
+	        echo mips-nec-sysv${UNAME_RELEASE}
 	else
-		echo mips-unknown-sysv${UNAME_RELEASE}
+	        echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-	exit 0 ;;
+        exit 0 ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
 	exit 0 ;;
@@ -947,6 +1067,38 @@
     *:Rhapsody:*:*)
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
 	exit 0 ;;
+    *:Darwin:*:*)
+	echo `uname -p`-apple-darwin${UNAME_RELEASE}
+	exit 0 ;;
+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
+	if test "${UNAME_MACHINE}" = "x86pc"; then
+		UNAME_MACHINE=pc
+	fi
+	echo `uname -p`-${UNAME_MACHINE}-nto-qnx
+	exit 0 ;;
+    *:QNX:*:4*)
+	echo i386-pc-qnx
+	exit 0 ;;
+    NSR-W:NONSTOP_KERNEL:*:*)
+	echo nsr-tandem-nsk${UNAME_RELEASE}
+	exit 0 ;;
+    BS2000:POSIX*:*:*)
+	echo bs2000-siemens-sysv
+	exit 0 ;;
+    DS/*:UNIX_System_V:*:*)
+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+	exit 0 ;;
+    *:Plan9:*:*)
+	# "uname -m" is not consistent, so use $cputype instead. 386
+	# is converted to i386 for consistency with other x86
+	# operating systems.
+	if test "$cputype" = "386"; then
+	    UNAME_MACHINE=i386
+	else
+	    UNAME_MACHINE="$cputype"
+	fi
+	echo ${UNAME_MACHINE}-unknown-plan9
+	exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -968,11 +1120,11 @@
 #include <sys/param.h>
   printf ("m68k-sony-newsos%s\n",
 #ifdef NEWSOS4
-	  "4"
+          "4"
 #else
 	  ""
 #endif
-	 ); exit (0);
+         ); exit (0);
 #endif
 #endif
 
@@ -1049,10 +1201,6 @@
   printf ("i860-alliant-bsd\n"); exit (0);
 #endif
 
-#if defined(__EMX__)
-  printf ("i386-pc-os2_emx"); exit(0);
-#endif
-
   exit (1);
 }
 EOF
@@ -1090,6 +1238,47 @@
     esac
 fi
 
-#echo '(Unable to guess system type)' 1>&2
+cat >&2 <<EOF
+$0: unable to guess system type
+
+The $version version of this script cannot recognize your system type.
+Please download the most up to date version of the config scripts:
+
+    ftp://ftp.gnu.org/pub/gnu/config/
+
+If the version you run ($0) is already up to date, please
+send the following data and any information you think might be
+pertinent to <config-patches@gnu.org> in order to provide the needed
+information to handle your system.
+
+config.guess version = $version
+
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo               = `(hostinfo) 2>/dev/null`
+/bin/universe          = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch              = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = ${UNAME_MACHINE}
+UNAME_RELEASE = ${UNAME_RELEASE}
+UNAME_SYSTEM  = ${UNAME_SYSTEM}
+UNAME_VERSION = ${UNAME_VERSION}
+EOF
 
 exit 1
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "version='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff -urN gnupg-1.0.2/scripts/config.sub gnupg-1.0.3/scripts/config.sub
--- gnupg-1.0.2/scripts/config.sub	Fri Mar 17 16:22:14 2000
+++ gnupg-1.0.3/scripts/config.sub	Wed Sep  6 15:44:28 2000
@@ -1,6 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script, version 1.1.
-#   Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
+#   Free Software Foundation, Inc.
+
+version='2000-07-27'
+
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
 # can handle that machine.  It does not imply ALL GNU software can.
@@ -12,7 +16,7 @@
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# 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
@@ -25,6 +29,8 @@
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+# Please send patches to <config-patches@gnu.org>.
+#
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
@@ -34,7 +40,7 @@
 # and recognize all the CPU types, system types and aliases
 # that are meaningful with *any* GNU software.
 # Each package is responsible for reporting which valid configurations
-# it does not support.	The user should be able to distinguish
+# it does not support.  The user should be able to distinguish
 # a failure to support a valid configuration from a meaningless
 # configuration.
 
@@ -45,30 +51,61 @@
 #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
 # It is wrong to echo any other type of specification.
 
-if [ x$1 = x ]
-then
-	echo Configuration name missing. 1>&2
-	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
-	echo "or     $0 ALIAS" 1>&2
-	echo where ALIAS is a recognized configuration type. 1>&2
-	exit 1
-fi
+me=`echo "$0" | sed -e 's,.*/,,'`
 
-# First pass through any local machine types.
-case $1 in
-	*local*)
-		echo $1
-		exit 0
-		;;
-	*)
-	;;
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+  -h, --help               print this help, then exit
+  -V, --version            print version number, then exit"
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case "$1" in
+    --version | --vers* | -V )
+       echo "$version" ; exit 0 ;;
+    --help | --h* | -h )
+       echo "$usage"; exit 0 ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       exec >&2
+       echo "$me: invalid option $1"
+       echo "$help"
+       exit 1 ;;
+
+    *local*)
+       # First pass through any local machine types.
+       echo $1
+       exit 0;;
+
+    * )
+       break ;;
+  esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+    exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;
 esac
 
 # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  linux-gnu*)
+  nto-qnx* | linux-gnu*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -94,7 +131,7 @@
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple)
+	-apple | -axis)
 		os=
 		basic_machine=$1
 		;;
@@ -105,7 +142,7 @@
 	-scout)
 		;;
 	-wrs)
-		os=vxworks
+		os=-vxworks
 		basic_machine=$1
 		;;
 	-hiux*)
@@ -156,64 +193,76 @@
 	-psos*)
 		os=-psos
 		;;
+	-mint | -mint[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
 esac
 
 # Decode aliases for certain CPU-COMPANY combinations.
 case $basic_machine in
 	# Recognize the basic CPU types without company name.
 	# Some are omitted here because they have special meanings below.
-	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
+	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
 		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
 		| 580 | i960 | h8300 \
+		| x86 | ppcbe | mipsbe | mipsle | shbe | shle | armbe | armle \
 		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
-		| alpha | alphaev[4-7] | alphaev56 | alphapca5[67] | s390 \
-		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
+		| hppa64 \
+		| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
+		| alphaev6[78] \
+		| we32k | ns16k | clipper | i370 | sh | sh[34] \
+		| powerpc | powerpcle \
 		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
 		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
 		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
-		| mips64vr5000 | miprs64vr5000el \
+		| mips64vr5000 | miprs64vr5000el | mcore \
 		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
-		| thumb | d10v)
+		| thumb | d10v | d30v | fr30 | avr)
+		basic_machine=$basic_machine-unknown
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12)
+		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
+		os=-none
 		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65)
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
 		;;
 
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
-	i[34567]86)
+	i[234567]86)
 	  basic_machine=$basic_machine-pc
 	  ;;
-	s390 | s390-ibm)
-	  basic_machine=s390-ibm
-	  ;;
-	s390-redhat)
-	  basic_machine=s390-redhat
-	  ;;
 	# Object if more than one company name word.
 	*-*-*)
 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
 		exit 1
 		;;
 	# Recognize the basic CPU types with company name.
-	vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
+	# FIXME: clean up the formatting here.
+	vax-* | tahoe-* | i[234567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
 	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
 	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
 	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
 	      | xmp-* | ymp-* \
-	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
-	      | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \
+	      | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* | armbe-* | armle-* \
+	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
+	      | hppa2.0n-* | hppa64-* \
+	      | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
+	      | alphaev6[78]-* \
 	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
 	      | clipper-* | orion-* \
 	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
 	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
 	      | mips64el-* | mips64orion-* | mips64orionel-* \
 	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
-	      | mipstx39-* | mipstx39el-* \
-	      | f301-* | armv*-* | t3e-* \
+	      | mipstx39-* | mipstx39el-* | mcore-* \
+	      | f301-* | armv*-* | s390-* | sv1-* | t3e-* \
 	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
-	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* )
+	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* \
+	      | bs2000-* | tic54x-* | c54x-*)
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
@@ -250,14 +299,14 @@
 		os=-sysv
 		;;
 	amiga | amiga-*)
-		basic_machine=m68k-cbm
+		basic_machine=m68k-unknown
 		;;
 	amigaos | amigados)
-		basic_machine=m68k-cbm
+		basic_machine=m68k-unknown
 		os=-amigaos
 		;;
 	amigaunix | amix)
-		basic_machine=m68k-cbm
+		basic_machine=m68k-unknown
 		os=-sysv4
 		;;
 	apollo68)
@@ -311,6 +360,9 @@
 	crds | unos)
 		basic_machine=m68k-crds
 		;;
+	cris | cris-* | etrax*)
+		basic_machine=cris-axis
+		;;
 	da30 | da30-*)
 		basic_machine=m68k-da30
 		;;
@@ -431,7 +483,6 @@
 		;;
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
-		os=-mvs
 		;;
 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
 	i[34567]86v32)
@@ -494,7 +545,7 @@
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
-	*mint | *MiNT)
+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
 		basic_machine=m68k-atari
 		os=-mint
 		;;
@@ -512,6 +563,10 @@
 	mips3*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
 		;;
+	mmix*)
+		basic_machine=mmix-knuth
+		os=-mmixware
+		;;
 	monitor)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -520,6 +575,10 @@
 		basic_machine=i386-unknown
 		os=-msdos
 		;;
+	mvs)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
@@ -529,7 +588,7 @@
 		os=-netbsd
 		;;
 	netwinder)
-		basic_machine=armv4l-corel
+		basic_machine=armv4l-rebel
 		os=-linux
 		;;
 	news | news700 | news800 | news900)
@@ -580,6 +639,9 @@
 	np1)
 		basic_machine=np1-gould
 		;;
+	nsr-tandem)
+		basic_machine=nsr-tandem
+		;;
 	op50n-* | op60c-*)
 		basic_machine=hppa1.1-oki
 		os=-proelf
@@ -606,13 +668,13 @@
 	pbb)
 		basic_machine=m68k-tti
 		;;
-	pc532 | pc532-*)
+        pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
 	pentium | p5 | k5 | k6 | nexen)
 		basic_machine=i586-pc
 		;;
-	pentiumpro | p6 | 6x86)
+	pentiumpro | p6 | 6x86 | athlon)
 		basic_machine=i686-pc
 		;;
 	pentiumii | pentium2)
@@ -621,7 +683,7 @@
 	pentium-* | p5-* | k5-* | k6-* | nexen-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumpro-* | p6-* | 6x86-*)
+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumii-* | pentium2-*)
@@ -633,12 +695,12 @@
 	power)	basic_machine=rs6000-ibm
 		;;
 	ppc)	basic_machine=powerpc-unknown
-		;;
+	        ;;
 	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
-		;;
+	        ;;
 	ppcle-* | powerpclittle-*)
 		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
@@ -724,6 +786,10 @@
 	sun386 | sun386i | roadrunner)
 		basic_machine=i386-sun
 		;;
+	sv1)
+		basic_machine=sv1-cray
+		os=-unicos
+		;;
 	symmetry)
 		basic_machine=i386-sequent
 		os=-dynix
@@ -732,6 +798,10 @@
 		basic_machine=t3e-cray
 		os=-unicos
 		;;
+	tic54x | c54x*)
+		basic_machine=tic54x-unknown
+		os=-coff
+		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
@@ -762,8 +832,8 @@
 		os=-vms
 		;;
 	vpp*|vx|vx-*)
-	       basic_machine=f301-fujitsu
-	       ;;
+               basic_machine=f301-fujitsu
+               ;;
 	vxworks960)
 		basic_machine=i960-wrs
 		os=-vxworks
@@ -788,7 +858,7 @@
 		basic_machine=xmp-cray
 		os=-unicos
 		;;
-	xps | xps100)
+        xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
 	z8k-*-coff)
@@ -833,10 +903,13 @@
 	we32k)
 		basic_machine=we32k-att
 		;;
+	sh3 | sh4)
+		base_machine=sh-unknown
+		;;
 	sparc | sparcv9)
 		basic_machine=sparc-sun
 		;;
-	cydra)
+        cydra)
 		basic_machine=cydra-cydrome
 		;;
 	orion)
@@ -878,8 +951,8 @@
 if [ x"$os" != x"" ]
 then
 case $os in
-	# First match some system type aliases
-	# that might get confused with valid system types.
+        # First match some system type aliases
+        # that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
@@ -887,9 +960,6 @@
 	-solaris)
 		os=-solaris2
 		;;
-	-qnx)
-		os=-qnx
-		;;
 	-svr4*)
 		os=-sysv4
 		;;
@@ -916,12 +986,25 @@
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*)
+	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+	      | -openstep* | -oskit*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
+	-qnx*)
+		case $basic_machine in
+		    x86-* | i[34567]86-*)
+			;;
+		    *)
+			os=-nto$os
+			;;
+		esac
+		;;
+	-nto*)
+		os=-nto-qnx
+		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
 	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-	      | -macos* | -mpw* | -magic* | -mon960* | -lnews*)
+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
 		os=`echo $os | sed -e 's|mac|macos|'`
@@ -935,6 +1018,12 @@
 	-sunos6*)
 		os=`echo $os | sed -e 's|sunos6|solaris3|'`
 		;;
+	-opened*)
+		os=-openedition
+		;;
+	-wince*)
+		os=-wince
+		;;
 	-osfrose*)
 		os=-osfrose
 		;;
@@ -957,7 +1046,10 @@
 		os=-sysv
 		;;
 	-ns2 )
-		os=-nextstep2
+	        os=-nextstep2
+		;;
+	-nsk)
+		os=-nsk
 		;;
 	# Preserve the version number of sinix5.
 	-sinix5.*)
@@ -993,8 +1085,8 @@
 	-xenix)
 		os=-xenix
 		;;
-	-*mint | -*MiNT)
-		os=-mint
+        -*mint | -*MiNT)
+	        os=-mint
 		;;
 	-none)
 		;;
@@ -1021,13 +1113,13 @@
 	*-acorn)
 		os=-riscix1.2
 		;;
-	arm*-corel)
+	arm*-rebel)
 		os=-linux
 		;;
 	arm*-semi)
 		os=-aout
 		;;
-	pdp11-*)
+        pdp11-*)
 		os=-none
 		;;
 	*-dec | vax-*)
@@ -1117,19 +1209,19 @@
 	*-next)
 		os=-nextstep3
 		;;
-	*-gould)
+        *-gould)
 		os=-sysv
 		;;
-	*-highlevel)
+        *-highlevel)
 		os=-bsd
 		;;
 	*-encore)
 		os=-bsd
 		;;
-	*-sgi)
+        *-sgi)
 		os=-irix
 		;;
-	*-siemens)
+        *-siemens)
 		os=-sysv4
 		;;
 	*-masscomp)
@@ -1195,7 +1287,7 @@
 			-genix*)
 				vendor=ns
 				;;
-			-mvs*)
+			-mvs* | -opened*)
 				vendor=ibm
 				;;
 			-ptx*)
@@ -1222,3 +1314,11 @@
 esac
 
 echo $basic_machine$os
+exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "version='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff -urN gnupg-1.0.2/scripts/gnupg.spec gnupg-1.0.3/scripts/gnupg.spec
--- gnupg-1.0.2/scripts/gnupg.spec	Wed Jul 12 14:59:56 2000
+++ gnupg-1.0.3/scripts/gnupg.spec	Mon Sep 18 12:18:20 2000
@@ -2,12 +2,13 @@
 # gnupg -- gnu privacy guard
 # This is a template.  The dist target uses it to create the real file.
 #
-%define version 1.0.2
+%define version 1.0.3
 %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.
 Summary(cs): GNU nástroj pro ąifrovanou komunikaci a bezpečné ukládání dat
 Summary(fr): Utilitaire GNU de chiffrement et d'authentification des communications et des données
+Summary(pl): Narzedzie GNU do szyfrowania i podpisywania danych
 Vendor: GNU Privacy Guard Project
 Name: %{name}
 Version: %{version}
@@ -16,15 +17,23 @@
 Group: Applications/Cryptography
 Group(cs): Aplikace/©ifrování
 Group(fr): Applications/Cryptographie
+Group(it): Applicazioni/Crittografia
 Source: ftp://ftp.gnupg.org/pub/gcrypt/%{name}-%{version}.tar.gz
 URL: http://www.gnupg.org
 Provides: gpg openpgp
 BuildRoot: /tmp/rpmbuild_%{name}
 
 %changelog
+* Wed Sep 06 2000 Fabio Coatti <cova@ferrara.linux.it>
+- Added Polish description and summary (Kindly provided by  
+  Lukasz Stelmach <stelmacl@ee.pw.edu.pl>)
+  
+* Thu Jul 13 2000 Fabio Coatti <cova@ferrara.linux.it>
+- Added a * to catch all formats for man pages (plain, gz, bz2...)    
+
 * Mon May 01 2000 Fabio Coatti <cova@ferrara.linux.it>
 - Some corrections in French description, thanks to Gaël Quéri
-<gqueri@mail.dotcom.fr>; Some corrections to Italian descriptions.
+  <gqueri@mail.dotcom.fr>; Some corrections to Italian descriptions.
 
 * Tue Apr 25 2000 Fabio Coatti <cova@ferrara.linux.it>
 - Removed the no longer needed patch for man page by Keith Owens
@@ -43,7 +52,7 @@
 
 * Mon May 17 1999 Fabio Coatti <cova@felix.unife.it>
 - Added French description, provided by 
-Christophe Labouisse <labouiss@cybercable.fr>
+  Christophe Labouisse <labouiss@cybercable.fr>
 
 * Thu May 06 1999 Fabio Coatti <cova@felix.unife.it> 
 - Upgraded for 0.9.6 (removed gpgm)
@@ -58,7 +67,7 @@
 * Sat Dec 19 1998 Fabio Coatti <cova@felix.unife.it>
 - Modified the spec file provided by Caskey L. Dickson <caskey-at-technocage.com>
 - Now it can be built also by non-root. Installation has to be done as
-root, gpg is suid.
+  root, gpg is suid.
 - Added some changes by  Ross Golder <rossigee@bigfoot.com>
 - Updates for version 0.4.5 of GnuPG (.mo files)
 
@@ -101,6 +110,14 @@
 celosvětově) a RSA (patentováno ve Spojených státech do 20. září
 2000). Tyto algoritmy lze zavést do GnuPG pomocí externích modulů.
 
+%description -l pl
+GnuPG (GNU Privacy Guard) jest nazedziem do szfrowania danych i tworzenia
+cyfrowych podpisów. GnuPG posiada zaawansowane mozliwosci obslugi kluczy
+i jest zgodne z OpenPGP, proponowanym standardem internetowym opisanym
+w RFC2440. Poniewaz GnuPG nie uzywa zadnych opatentowanych algorytmów
+nie jest wiec zgodne z jaka kolwiek wersja PGP2 (PGP2.x kozysta jedynie
+z algorytmów: IDEA, opatentowanego na calym swiecie, oraz RSA, którego
+patent na terenie Stanów Zjednoczonych wygasa 20 wrzesnia 2000).         
 
 %prep
 rm -rf $RPM_BUILD_ROOT
@@ -136,7 +153,7 @@
 %doc %attr (-,root,root) g10/pubring.asc
 %doc %attr (-,root,root) g10/OPTIONS
 
-%attr (-,root,root) /usr/man/man1/gpg.1
+%attr (-,root,root) /usr/man/man1/gpg.1*
 %attr (4755,root,root) /usr/bin/gpg
 
 %attr (-,root,root) /usr/share/locale/*/*/%{name}.mo
diff -urN gnupg-1.0.2/scripts/gnupg.spec.in gnupg-1.0.3/scripts/gnupg.spec.in
--- gnupg-1.0.2/scripts/gnupg.spec.in	Thu May  4 11:18:32 2000
+++ gnupg-1.0.3/scripts/gnupg.spec.in	Thu Sep 14 17:41:53 2000
@@ -8,6 +8,7 @@
 Summary(it): Utility GNU per la sicurezza nelle comunicazioni e nell'archiviazione dei dati.
 Summary(cs): GNU nástroj pro ąifrovanou komunikaci a bezpečné ukládání dat
 Summary(fr): Utilitaire GNU de chiffrement et d'authentification des communications et des données
+Summary(pl): Narzedzie GNU do szyfrowania i podpisywania danych
 Vendor: GNU Privacy Guard Project
 Name: %{name}
 Version: %{version}
@@ -16,15 +17,23 @@
 Group: Applications/Cryptography
 Group(cs): Aplikace/©ifrování
 Group(fr): Applications/Cryptographie
+Group(it): Applicazioni/Crittografia
 Source: ftp://ftp.gnupg.org/pub/gcrypt/%{name}-%{version}.tar.gz
 URL: http://www.gnupg.org
 Provides: gpg openpgp
 BuildRoot: /tmp/rpmbuild_%{name}
 
 %changelog
+* Wed Sep 06 2000 Fabio Coatti <cova@ferrara.linux.it>
+- Added Polish description and summary (Kindly provided by  
+  Lukasz Stelmach <stelmacl@ee.pw.edu.pl>)
+  
+* Thu Jul 13 2000 Fabio Coatti <cova@ferrara.linux.it>
+- Added a * to catch all formats for man pages (plain, gz, bz2...)    
+
 * Mon May 01 2000 Fabio Coatti <cova@ferrara.linux.it>
 - Some corrections in French description, thanks to Gaël Quéri
-<gqueri@mail.dotcom.fr>; Some corrections to Italian descriptions.
+  <gqueri@mail.dotcom.fr>; Some corrections to Italian descriptions.
 
 * Tue Apr 25 2000 Fabio Coatti <cova@ferrara.linux.it>
 - Removed the no longer needed patch for man page by Keith Owens
@@ -43,7 +52,7 @@
 
 * Mon May 17 1999 Fabio Coatti <cova@felix.unife.it>
 - Added French description, provided by 
-Christophe Labouisse <labouiss@cybercable.fr>
+  Christophe Labouisse <labouiss@cybercable.fr>
 
 * Thu May 06 1999 Fabio Coatti <cova@felix.unife.it> 
 - Upgraded for 0.9.6 (removed gpgm)
@@ -58,7 +67,7 @@
 * Sat Dec 19 1998 Fabio Coatti <cova@felix.unife.it>
 - Modified the spec file provided by Caskey L. Dickson <caskey-at-technocage.com>
 - Now it can be built also by non-root. Installation has to be done as
-root, gpg is suid.
+  root, gpg is suid.
 - Added some changes by  Ross Golder <rossigee@bigfoot.com>
 - Updates for version 0.4.5 of GnuPG (.mo files)
 
@@ -101,6 +110,14 @@
 celosvětově) a RSA (patentováno ve Spojených státech do 20. září
 2000). Tyto algoritmy lze zavést do GnuPG pomocí externích modulů.
 
+%description -l pl
+GnuPG (GNU Privacy Guard) jest nazedziem do szfrowania danych i tworzenia
+cyfrowych podpisów. GnuPG posiada zaawansowane mozliwosci obslugi kluczy
+i jest zgodne z OpenPGP, proponowanym standardem internetowym opisanym
+w RFC2440. Poniewaz GnuPG nie uzywa zadnych opatentowanych algorytmów
+nie jest wiec zgodne z jaka kolwiek wersja PGP2 (PGP2.x kozysta jedynie
+z algorytmów: IDEA, opatentowanego na calym swiecie, oraz RSA, którego
+patent na terenie Stanów Zjednoczonych wygasa 20 wrzesnia 2000).         
 
 %prep
 rm -rf $RPM_BUILD_ROOT
@@ -136,7 +153,7 @@
 %doc %attr (-,root,root) g10/pubring.asc
 %doc %attr (-,root,root) g10/OPTIONS
 
-%attr (-,root,root) /usr/man/man1/gpg.1
+%attr (-,root,root) /usr/man/man1/gpg.1*
 %attr (4755,root,root) /usr/bin/gpg
 
 %attr (-,root,root) /usr/share/locale/*/*/%{name}.mo
diff -urN gnupg-1.0.2/tools/ChangeLog gnupg-1.0.3/tools/ChangeLog
--- gnupg-1.0.2/tools/ChangeLog	Wed Jul  5 13:28:50 2000
+++ gnupg-1.0.3/tools/ChangeLog	Fri Sep 15 18:40:38 2000
@@ -1,3 +1,12 @@
+Fri Sep 15 18:40:36 CEST 2000  Werner Koch  <wk@openit.de>
+
+        * ring-a-party: An array start at offset 1 no 0.  Many thanks to Mike
+        for finding this bug.
+
+Thu Sep 14 14:20:38 CEST 2000  Werner Koch  <wk@openit.de>
+
+        * ring-a-party: Flush the last key.
+
 Wed Jul  5 13:28:45 CEST 2000  Werner Koch  <wk@>
 
   * mail-signed-keys: New.
diff -urN gnupg-1.0.2/tools/Makefile.in gnupg-1.0.3/tools/Makefile.in
--- gnupg-1.0.2/tools/Makefile.in	Wed Jul 12 14:59:36 2000
+++ gnupg-1.0.3/tools/Makefile.in	Mon Sep 18 12:17:57 2000
@@ -75,6 +75,7 @@
 DYNAMIC_CIPHER_MODS = @DYNAMIC_CIPHER_MODS@
 DYNLINK_LDFLAGS = @DYNLINK_LDFLAGS@
 DYNLINK_MOD_CFLAGS = @DYNLINK_MOD_CFLAGS@
+FAQPROG = @FAQPROG@
 GENCAT = @GENCAT@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
diff -urN gnupg-1.0.2/tools/ring-a-party gnupg-1.0.3/tools/ring-a-party
--- gnupg-1.0.2/tools/ring-a-party	Tue May 23 01:45:57 2000
+++ gnupg-1.0.3/tools/ring-a-party	Fri Sep 15 16:28:01 2000
@@ -31,6 +31,9 @@
 	page = 0;
 	now = strftime("%b %d %H:%M %Y");
       }
+END { 
+    if (any) myflush(); 
+}
 $1 == "pub" {
 	      if( any ) myflush();
 	      uidcount = 0;
@@ -84,7 +87,7 @@
     printf "f16    Fingerprint16 =";
     for(i=0; i < 16; i++ ) {
 	if( i == 8 ) printf " ";
-	printf " %s", substr( s, i*2, 2 );
+	printf " %s", substr( s, i*2+1, 2 );
     }
     printf "\n"
 }
@@ -94,10 +97,13 @@
     printf "f20    Fingerprint20 =";
     for(i=0; i < 10; i++ ) {
 	if( i == 5 ) printf " ";
-	printf " %s", substr( s, i*4, 4 );
+	printf " %s", substr( s, i*4+1, 4 );
     }
     printf "\n"
 }
 
 ' | tee a.pub | gpg --print-mds
+
+
+
 
diff -urN gnupg-1.0.2/util/ChangeLog gnupg-1.0.3/util/ChangeLog
--- gnupg-1.0.2/util/ChangeLog	Fri Jun  9 10:09:54 2000
+++ gnupg-1.0.3/util/ChangeLog	Thu Sep 14 14:20:39 2000
@@ -1,3 +1,29 @@
+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
+        so that no is returned for an empty input. By David Champion.
+
+Wed Sep  6 17:55:47 CEST 2000  Werner Koch  <wk@openit.de>
+
+        * iobuf.c: Use fopen64 insead of fopen when available.
+        (iobuf_get_filelength): Use fstat64 when available but return
+        2^32-1 if the file is larger than this value.
+
+Wed Sep  6 14:59:09 CEST 2000  Werner Koch  <wk@openit.de>
+
+        * secmem.c (secmem_realloc): check for failed secmem_malloc.  By
+        Matt Kraai.
+
+        * strgutil.c (utf8_to_native): Fixed null ptr problem.  By
+        Giampaolo Tomassoni.
+
+Thu Jul 27 10:02:38 CEST 2000  Werner Koch  <wk@openit.de>
+
+  * iobuf.c: Use setmode() at several places to set stdin and stdout
+  to binary mode for MSDOS based systems
+
+  * iobuf.c (underflow): Initialize dummy_len to keep memory checker happy.
+
 Fri Jun  9 10:09:52 CEST 2000  Werner Koch  <wk@openit.de>
 
   * ttyio.c: Simulate termios with termios.  By Dave Dykstra.
diff -urN gnupg-1.0.2/util/Makefile.in gnupg-1.0.3/util/Makefile.in
--- gnupg-1.0.2/util/Makefile.in	Wed Jul 12 14:59:29 2000
+++ gnupg-1.0.3/util/Makefile.in	Mon Sep 18 12:17:51 2000
@@ -75,6 +75,7 @@
 DYNAMIC_CIPHER_MODS = @DYNAMIC_CIPHER_MODS@
 DYNLINK_LDFLAGS = @DYNLINK_LDFLAGS@
 DYNLINK_MOD_CFLAGS = @DYNLINK_MOD_CFLAGS@
+FAQPROG = @FAQPROG@
 GENCAT = @GENCAT@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
@@ -243,10 +244,7 @@
 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 ../include/util.h \
-	../include/types.h ../include/errors.h ../include/mpi.h \
-	../include/iobuf.h ../include/memory.h ../include/i18n.h \
-	../include/http.h
+http.o: http.c ../config.h ../g10defs.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
@@ -262,14 +260,18 @@
 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
+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
 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
+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
 
 info-am:
 info: info-am
diff -urN gnupg-1.0.2/util/iobuf.c gnupg-1.0.3/util/iobuf.c
--- gnupg-1.0.2/util/iobuf.c	Tue May 30 13:55:34 2000
+++ gnupg-1.0.3/util/iobuf.c	Wed Sep  6 17:16:47 2000
@@ -27,11 +27,20 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#ifdef HAVE_DOSISH_SYSTEM
+  #include <fcntl.h> /* for setmode() */
+#endif
 
 #include "memory.h"
 #include "util.h"
 #include "iobuf.h"
 
+#if defined (HAVE_FOPEN64) && defined (HAVE_FSTAT64)
+  #define fopen(a,b)  fopen64 ((a),(b))
+  #define fstat(a,b)  fstat64 ((a),(b))
+#endif
+
+
 typedef struct {
     FILE *fp;	   /* open file handle */
     int  print_only_name; /* flags indicating that fname is not a real file*/
@@ -467,7 +476,7 @@
 iobuf_close( IOBUF a )
 {
     IOBUF a2;
-    size_t dummy_len;
+    size_t dummy_len=0;
     int rc=0;
 
     if( a && a->directfp ) {
@@ -579,7 +588,10 @@
     int print_only = 0;
 
     if( !fname || (*fname=='-' && !fname[1])  ) {
-	fp = stdin; /* fixme: set binary mode for msdoze */
+	fp = stdin;
+      #ifdef HAVE_DOSISH_SYSTEM
+	setmode ( fileno(fp) , O_BINARY );
+      #endif
 	fname = "[stdin]";
 	print_only = 1;
     }
@@ -646,6 +658,9 @@
 
     if( !fname || (*fname=='-' && !fname[1]) ) {
 	fp = stdout;
+      #ifdef HAVE_DOSISH_SYSTEM
+	setmode ( fileno(fp) , O_BINARY );
+      #endif
 	fname = "[stdout]";
 	print_only = 1;
     }
@@ -741,7 +756,10 @@
     int print_only = 0;
 
     if( !fname || (*fname=='-' && !fname[1])  ) {
-	fp = stdin; /* fixme: set binary mode for msdoze */
+	fp = stdin;
+      #ifdef HAVE_DOSISH_SYSTEM
+	setmode ( fileno(fp) , O_BINARY );
+      #endif
 	fname = "[stdin]";
 	print_only = 1;
     }
@@ -985,7 +1003,7 @@
 
 	}
 	if( a->use == 1 && rc == -1 ) { /* EOF: we can remove the filter */
-	    size_t dummy_len;
+	    size_t dummy_len=0;
 
 	    /* and tell the filter to free itself */
 	    if( (rc = a->filter(a->filter_ov, IOBUFCTRL_FREE, a->chain,
@@ -1299,13 +1317,22 @@
 u32
 iobuf_get_filelength( IOBUF a )
 {
+#if defined (HAVE_FOPEN64) && defined (HAVE_FSTAT64)
+    struct stat64 st;
+#else
     struct stat st;
+#endif
 
     if( a->directfp )  {
 	FILE *fp = a->directfp;
 
-	if( !fstat(fileno(fp), &st) )
-	    return st.st_size;
+	if( !fstat(fileno(fp), &st) ) {
+          #if defined (HAVE_FOPEN64) && defined (HAVE_FSTAT64)
+            if( st.st_size >= IOBUF_FILELENGTH_LIMIT )
+                return IOBUF_FILELENGTH_LIMIT;
+          #endif
+	    return (u32)st.st_size;
+        }
 	log_error("fstat() failed: %s\n", strerror(errno) );
 	return 0;
     }
@@ -1316,8 +1343,13 @@
 	    file_filter_ctx_t *b = a->filter_ov;
 	    FILE *fp = b->fp;
 
-	    if( !fstat(fileno(fp), &st) )
+	    if( !fstat(fileno(fp), &st) ) {
+              #if defined (HAVE_FOPEN64) && defined (HAVE_FSTAT64)
+                if( st.st_size >= IOBUF_FILELENGTH_LIMIT )
+                    return IOBUF_FILELENGTH_LIMIT;
+              #endif
 		return st.st_size;
+            }
 	    log_error("fstat() failed: %s\n", strerror(errno) );
 	    break;
 	}
diff -urN gnupg-1.0.2/util/miscutil.c gnupg-1.0.3/util/miscutil.c
--- gnupg-1.0.2/util/miscutil.c	Thu Mar  2 15:45:22 2000
+++ gnupg-1.0.3/util/miscutil.c	Mon Sep 18 11:08:36 2000
@@ -274,10 +274,10 @@
 int
 answer_is_yes( const char *s )
 {
-    char *long_yes = _("yes");
-    char *short_yes = _("yY");
-    char *long_no = _("no");
-    char *short_no = _("nN");
+    const char *long_yes = _("yes");
+    const char *short_yes = _("yY");
+    const char *long_no = _("no");
+    const char *short_no = _("nN");
 
     if( !stricmp(s, long_yes ) )
 	return 1;
@@ -303,23 +303,23 @@
 int
 answer_is_yes_no_quit( const char *s )
 {
-    char *long_yes = _("yes");
-    char *long_no = _("no");
-    char *long_quit = _("quit");
-    char *short_yes = _("yY");
-    char *short_no = _("nN");
-    char *short_quit = _("qQ");
+    const char *long_yes = _("yes");
+    const char *long_no = _("no");
+    const char *long_quit = _("quit");
+    const char *short_yes = _("yY");
+    const char *short_no = _("nN");
+    const char *short_quit = _("qQ");
 
-    if( !stricmp(s, long_yes ) )
-	return 1;
     if( !stricmp(s, long_no ) )
 	return 0;
+    if( !stricmp(s, long_yes ) )
+	return 1;
     if( !stricmp(s, long_quit ) )
 	return -1;
-    if( strchr( short_yes, *s ) && !s[1] )
-	return 1;
     if( strchr( short_no, *s ) && !s[1] )
 	return 0;
+    if( strchr( short_yes, *s ) && !s[1] )
+	return 1;
     if( strchr( short_quit, *s ) && !s[1] )
 	return -1;
     if( !stricmp(s, "yes" ) )
diff -urN gnupg-1.0.2/util/secmem.c gnupg-1.0.3/util/secmem.c
--- gnupg-1.0.2/util/secmem.c	Thu Jun  8 10:18:23 2000
+++ gnupg-1.0.3/util/secmem.c	Thu Aug 31 10:01:52 2000
@@ -347,9 +347,11 @@
     if( newsize < size )
 	return p; /* it is easier not to shrink the memory */
     a = secmem_malloc( newsize );
-    memcpy(a, p, size);
-    memset((char*)a+size, 0, newsize-size);
-    secmem_free(p);
+    if ( a ) {
+        memcpy(a, p, size);
+        memset((char*)a+size, 0, newsize-size);
+        secmem_free(p);
+    }
     return a;
 }
 
diff -urN gnupg-1.0.2/util/strgutil.c gnupg-1.0.3/util/strgutil.c
--- gnupg-1.0.2/util/strgutil.c	Mon Nov 22 11:10:27 1999
+++ gnupg-1.0.3/util/strgutil.c	Mon Sep  4 10:25:57 2000
@@ -424,7 +424,8 @@
 			  case	 0 : n++; if( p ) *p++ = '0'; break;
 			  default: n += 3;
 				   sprintf( p, "x%02x", *s );
-				   p += 3;
+                                   if ( p )
+                                       p += 3;
 				   break;
 			}
 		    }
diff -urN gnupg-1.0.2/util/ttyio.c gnupg-1.0.3/util/ttyio.c
--- gnupg-1.0.2/util/ttyio.c	Thu Jun  8 22:09:31 2000
+++ gnupg-1.0.3/util/ttyio.c	Mon Sep 18 11:25:04 2000
@@ -193,7 +193,7 @@
 	if( !WriteConsoleA( con.out, buf, n, &nwritten, NULL ) )
 	    log_fatal("WriteConsole failed: rc=%d", (int)GetLastError() );
 	if( n != nwritten )
-	    log_fatal("WriteConsole failed: %d != %ld\n", n, nwritten );
+	    log_fatal("WriteConsole failed: %d != %d\n", n, nwritten );
 	last_prompt_len += n;
     }
   #else
diff -urN gnupg-1.0.2/zlib/Makefile.in gnupg-1.0.3/zlib/Makefile.in
--- gnupg-1.0.2/zlib/Makefile.in	Wed Jul 12 14:59:27 2000
+++ gnupg-1.0.3/zlib/Makefile.in	Mon Sep 18 12:17:49 2000
@@ -80,6 +80,7 @@
 DYNAMIC_CIPHER_MODS = @DYNAMIC_CIPHER_MODS@
 DYNLINK_LDFLAGS = @DYNLINK_LDFLAGS@
 DYNLINK_MOD_CFLAGS = @DYNLINK_MOD_CFLAGS@
+FAQPROG = @FAQPROG@
 GENCAT = @GENCAT@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
@@ -238,6 +239,23 @@
 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
 	  fi; \
 	done
+adler32.o: adler32.c zlib.h zconf.h
+compress.o: compress.c zlib.h zconf.h
+crc32.o: crc32.c zlib.h zconf.h
+deflate.o: deflate.c deflate.h zutil.h zlib.h zconf.h
+infblock.o: infblock.c zutil.h zlib.h zconf.h infblock.h inftrees.h \
+	infcodes.h infutil.h
+infcodes.o: infcodes.c zutil.h zlib.h zconf.h inftrees.h infblock.h \
+	infcodes.h infutil.h inffast.h
+inffast.o: inffast.c zutil.h zlib.h zconf.h inftrees.h infblock.h \
+	infcodes.h infutil.h inffast.h
+inflate.o: inflate.c zutil.h zlib.h zconf.h infblock.h
+inftrees.o: inftrees.c zutil.h zlib.h zconf.h inftrees.h inffixed.h
+infutil.o: infutil.c zutil.h zlib.h zconf.h infblock.h inftrees.h \
+	infcodes.h infutil.h
+trees.o: trees.c deflate.h zutil.h zlib.h zconf.h trees.h
+uncompr.o: uncompr.c zlib.h zconf.h
+zutil.o: zutil.c zutil.h zlib.h zconf.h
 
 info-am:
 info: info-am
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.2c (GNU/Linux)
Comment: For info see http://www.gnupg.org

iD8DBQE5xfCxaLeriVdUjc0RAuKFAJ9+nEoNkFioap8Y+q9Jc1KyMSgtiQCfbUU8
AZIQFLsH5SRJmtCuZv/KtYE=
=2Kbs
-----END PGP SIGNATURE-----